Merge pull request #54 from vite-plugin/v1.3.4

V1.3.4

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2023-05-04] v1.3.4
+
+- 1e7aeed v1.3.4
+- fe75572 chore(test): cleanup
+- bcac9ab feat: built into `node14`
+- 3cdf718 fix: v1.3.3
+
 ## [2023-05-04] v1.3.3
 
 - 9397f17 v1.3.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-dynamic-import",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Enhance Vite builtin dynamic import",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/index.ts

@@ -189,7 +189,7 @@ async function transformDynamicImport({
     // https://github.com/vitejs/vite/blob/v4.3.0/packages/vite/src/node/plugins/importAnalysis.ts#L663
     if (viteIgnoreRE.test(importExpression)) continue
 
-    const ast = parseAst(code, { sourceType: 'module', ecmaVersion: 2020 }) as AcornNode
+    const ast = parseAst(importExpression, { sourceType: 'module', ecmaVersion: 2020 }) as AcornNode
     const importExpressionAst = ast.body[0]./* ImportExpression */expression as AcornNode
 
     // maybe `import.meta`

test/fixtures/__snapshots__/main.js test/fixtures/__snapshots__/main.tstest/fixtures/__snapshots__/main.js renamed to test/fixtures/__snapshots__/main.ts

@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.json",
+  "exclude": ["__snapshots__", "dist"]
+}

test/fixtures/tsconfig.json

@@ -11,11 +11,11 @@ export default defineConfig({
       name: 'vite-plugin-dynamic-import:test',
       transform(code, id) {
         if (/src\/main\.ts$/.test(id)) {
-          const { dir, name } = path.parse(id)
-          const dist = dir.replace('src', 'dist')
-          !fs.existsSync(dist) && fs.mkdirSync(dist, { recursive: true })
-          // Write transformed code to dist
-          fs.writeFileSync(path.join(dist, `${name}.js`), code)
+          // write transformed code to dist/
+          const filename = id.replace('src', 'dist')
+          const dirname = path.dirname(filename)
+          if (!fs.existsSync(dirname)) fs.mkdirSync(dirname)
+          fs.writeFileSync(filename, code)
         }
       },
     },

test/fixtures/vite.config.ts

@@ -12,25 +12,31 @@ import {
   it,
 } from 'vitest'
 import fetch from 'node-fetch'
+import fastGlob from 'fast-glob'
 
 const root = path.join(__dirname, 'fixtures')
 let server: ViteDevServer | null = null
-const PORT = 4000
+let port = 4000
 
 beforeAll(async () => {
   fs.rmSync(path.join(root, 'dist'), { recursive: true, force: true })
   server = await createServer({ configFile: path.join(root, 'vite.config.ts') })
-  await server.listen(PORT)
+  await server.listen(port)
+  // @ts-ignore
+  port = server.httpServer?.address().port
 })
 
 describe('vite serve', async () => {
   it('__snapshots__', async () => {
-    const mainTs = await (await fetch(`http://localhost:${PORT}/src/main.ts`)).text()
-    const mainJs = fs.readFileSync(path.join(root, 'dist/main.js'), 'utf8')
-    const mainJsSnap = fs.readFileSync(path.join(root, '__snapshots__/main.js'), 'utf8')
+    const files = fastGlob.sync('__snapshots__/**/*', { cwd: root })
+    for (const file of files) {
+      const response = await (await fetch(`http://localhost:${port}/${file.replace('__snapshots__', 'src')}`)).text()
+      const distFile = fs.readFileSync(path.join(root, file.replace('__snapshots__', 'dist')), 'utf8')
+      const snapFile = fs.readFileSync(path.join(root, file), 'utf8')
 
-    expect(mainTs).string
-    expect(mainJs).eq(mainJsSnap)
+      expect(response).string
+      expect(distFile).eq(snapFile)
+    }
   })
 })
 

test/serve.test.ts

@@ -11,6 +11,7 @@ export default defineConfig({
   build: {
     minify: false,
     emptyOutDir: !isdev,
+    target: 'node14',
     lib: {
       entry: 'src/index.ts',
       formats: ['cjs', 'es'],