build: 支持转换 importModule 语句多行

Honye · Honye · commit ed95ca3edc6d · 2023-09-24T17:52:13.000+08:00
diff --git a/babel.config.js b/babel.config.js
@@ -1,3 +1,6 @@
 module.exports = {
-  plugins: ['@babel/plugin-syntax-top-level-await']
+  plugins: [
+    '@babel/plugin-syntax-top-level-await',
+    '@babel/plugin-syntax-import-assertions'
+  ]
 }
diff --git a/package.json b/package.json
@@ -27,16 +27,17 @@
   "devDependencies": {
     "@babel/core": "^7.14.0",
     "@babel/eslint-parser": "^7.13.14",
+    "@babel/plugin-syntax-import-assertions": "^7.22.5",
     "@babel/plugin-syntax-top-level-await": "^7.12.13",
-    "@types/node": "^17.0.23",
+    "@types/node": "^18.14.6",
     "@types/scriptable-ios": "^1.7.0",
     "eslint": "^7.26.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.3.1",
     "glob": "^7.2.0",
-    "rollup": "^2.45.2",
-    "rollup-plugin-serve": "^1.1.0"
+    "rollup": "^3.29.2",
+    "rollup-plugin-serve": "^2.0.2"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -1,8 +1,9 @@
 import path from 'path'
 import glob from 'glob'
 import serve from 'rollup-plugin-serve'
-import { version } from './package.json'
+import pkg from './package.json' assert { type: 'json' }
 
+const { version } = pkg
 console.info(`Scriptable Template v${version}\r\n`)
 
 const config = {
@@ -93,6 +94,10 @@ for (const filename of files) {
               return `import ${imported.replace(/:/g, ' as ')} from "./${moduleName}"`
             }
           )
+            .replace(
+              /(?:let|const)\s*{([\s\S]*?)\}\s*=\s*(?:importModule|require)\('(.*?)'\)/,
+              "import {$1} from '$2'"
+            )
         }
       }
     ]

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`module.exports = {`
`2`		`- plugins: ['@babel/plugin-syntax-top-level-await']`
	`2`	`+ plugins: [`
	`3`	`+ '@babel/plugin-syntax-top-level-await',`
	`4`	`+ '@babel/plugin-syntax-import-assertions'`
	`5`	`+ ]`
`3`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`import path from 'path'`
`2`	`2`	`import glob from 'glob'`
`3`	`3`	`import serve from 'rollup-plugin-serve'`
`4`		`-import { version } from './package.json'`
	`4`	`+import pkg from './package.json' assert { type: 'json' }`
`5`	`5`
	`6`	`+const { version } = pkg`
`6`	`7`	console.info(`Scriptable Template v${version}\r\n`)
`7`	`8`
`8`	`9`	`const config = {`
`@@ -93,6 +94,10 @@ for (const filename of files) {`
`93`	`94`	return `import ${imported.replace(/:/g, ' as ')} from "./${moduleName}"`
`94`	`95`	`}`
`95`	`96`	`)`
	`97`	`+ .replace(`
	`98`	`+ /(?:let\|const)\s{([\s\S]?)\}\s=\s(?:importModule\|require)\('(.*?)'\)/,`
	`99`	`+ "import {$1} from '$2'"`
	`100`	`+ )`
`96`	`101`	`}`
`97`	`102`	`}`
`98`	`103`	`]`