Merge pull request #25 from vite-plugin/v0.7.1

V0.7.1

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.1 (2023-05-14)
+
+- ddfbfeb fix: bump vite-plugin-dynamic-import to 1.4.0 for `pnpm`
+- 356c22e chore: cleanup
+- 4e4f807 docs: update
+
 ## 0.7.0 (2023-04-30)
 
 - e9eb5f0 refactor(test): integrate vitest 🌱

README.md

@@ -60,7 +60,7 @@ export interface Options {
 commonjs({
   filter(id) {
     // `node_modules` is exclude by default, so we need to include it explicitly
-    // https://github.com/vite-plugin/vite-plugin-commonjs/blob/v0.7.0/src/index.ts#L123-L125
+    // https://github.com/vite-plugin/vite-plugin-commonjs/blob/v0.7.0/src/index.ts#L125-L127
     if (id.includes('node_modules/xxx')) {
       return true
     }

README.zh-CN.md

@@ -60,7 +60,7 @@ export interface Options {
 commonjs({
   filter(id) {
     // 默认会排除 `node_modules`，所以必须显式的包含它explicitly
-    // https://github.com/vite-plugin/vite-plugin-commonjs/blob/v0.7.0/src/index.ts#L123-L125
+    // https://github.com/vite-plugin/vite-plugin-commonjs/blob/v0.7.0/src/index.ts#L125-L127
     if (id.includes('node_modules/xxx')) {
       return true
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-commonjs",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "A pure JavaScript implementation of CommonJs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,12 +23,12 @@
     "build": "vite build",
     "test": "vitest run",
     "types": "tsc",
-    "prepublishOnly": "npm run test && npm run build"
+    "prepublishOnly": "npm run build && npm run test"
   },
   "dependencies": {
     "acorn": "^8.8.2",
     "fast-glob": "^3.2.12",
-    "vite-plugin-dynamic-import": "^1.3.2"
+    "vite-plugin-dynamic-import": "^1.4.0"
   },
   "devDependencies": {
     "@types/node": "^18.16.2",
@@ -47,4 +47,4 @@
   "files": [
     "dist"
   ]
-}
+}

src/analyze.ts

@@ -74,7 +74,8 @@ export function analyzer(ast: AcornNode, code: string, id: string): Analyzed {
     },
     AssignmentExpression(node) {
       if (node.left.type !== 'MemberExpression') return
-      if (!(node.left.object.type === 'Identifier' && ['module', 'exports'].includes(node.left.object.name))) return
+      // only `module.exports`, `exports.xxx`
+      if (!['module', 'exports'].includes(node.left.object.name)) return
 
       analyzed.exports.push({
         node,

src/index.ts

@@ -67,7 +67,7 @@ export default function commonjs(options: Options = {}): Plugin {
       _config.optimizeDeps.esbuildOptions ??= {}
       _config.optimizeDeps.esbuildOptions.plugins ??= []
       _config.optimizeDeps.esbuildOptions.plugins.push({
-        name: 'vite-plugin-dynamic-import:pre-bundle',
+        name: 'vite-plugin-commonjs:pre-bundle',
         setup(build) {
           build.onLoad({ filter: /.*/ }, async ({ path: id }) => {
             let code: string

test/fixtures/vite.config.ts

@@ -11,7 +11,7 @@ export default defineConfig({
       name: 'vite-plugin-commonjs-test',
       transform(code, id) {
         if (/\/src\//.test(id)) {
-          // Write transformed code to output/
+          // write transformed code to dist/
           const filename = id.replace('src', 'dist')
           const dirname = path.dirname(filename)
           if (!fs.existsSync(dirname)) fs.mkdirSync(dirname)

test/serve.test.ts

@@ -16,19 +16,21 @@ 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 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 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')
 

vite.config.ts

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