Merge pull request #79 from davidmyersdev/74-fix-import-error

davidmyersdev · web-flow · commit a2ae1510eb49 · 2024-02-09T01:46:04.000-05:00
Fix Buffer import error during Vite deps scan
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       - run: pnpm build:core
       - run: pnpm build:shims
       - run: pnpm playwright install --with-deps
-      - run: pnpm -r test
+      - run: pnpm -r test:e2e
   test-unit:
     needs:
       - install-dependencies
@@ -39,7 +39,7 @@ jobs:
       - uses: ./.github/actions/install-dependencies
       - run: pnpm build:core
       - run: pnpm build:shims
-      - run: pnpm test:build
+      - run: pnpm -r test
   typecheck:
     needs:
       - install-dependencies
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "files.eol": "\n"
 }
diff --git a/examples/vanilla/package.json b/examples/vanilla/package.json
@@ -4,9 +4,9 @@
   "scripts": {
     "build": "vite build",
     "dev": "vite",
-    "test": "CI=true run-p test:build test:dev",
-    "test:build": "VITE_COMMAND=build WEB_SERVER_COMMAND='vite build && vite preview --port 15174' WEB_SERVER_URL='http://localhost:15174' playwright test",
-    "test:dev": "VITE_COMMAND=dev WEB_SERVER_COMMAND='vite dev --port 15173' WEB_SERVER_URL='http://localhost:15173' playwright test",
+    "test:e2e": "CI=true run-p test:e2e:*",
+    "test:e2e:build": "VITE_COMMAND=build WEB_SERVER_COMMAND='vite build && vite preview --port 15174' WEB_SERVER_URL='http://localhost:15174' playwright test",
+    "test:e2e:dev": "VITE_COMMAND=dev WEB_SERVER_COMMAND='vite dev --port 15173' WEB_SERVER_URL='http://localhost:15173' playwright test",
     "typecheck": "tsc"
   },
   "devDependencies": {
diff --git a/package.json b/package.json
@@ -73,14 +73,16 @@
     "build:types": "run-s typecheck",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
-    "test": "run-p test:build test:unit",
+    "test": "run-p test:build test:error-repros test:unit",
     "test:build": "run-p test:build:*",
     "test:build:react": "pnpm -C ./examples/react run build",
     "test:build:vanilla": "pnpm -C ./examples/vanilla run build",
     "test:build:vue": "pnpm -C ./examples/vue run build",
     "test:dev:react": "pnpm -C ./examples/react run dev",
     "test:dev:vanilla": "pnpm -C ./examples/vanilla run dev",
     "test:dev:vue": "pnpm -C ./examples/vue run dev",
+    "test:error-repros": "run-p test:error-repros:*",
+    "test:error-repros:vite-scan-buffer-import-error": "pnpm --filter vite-scan-buffer-import-error test",
     "test:unit": "vitest run --dir ./test",
     "typecheck": "run-p typecheck:*",
     "typecheck:core": "tsc",
@@ -111,7 +113,7 @@
     "vite-plugin-externalize-deps": "^0.1.5",
     "vite-plugin-inspect": "^0.7.42",
     "vite-plugin-node-polyfills": "workspace:*",
-    "vitest": "^1.1.0"
+    "vitest": "^1.2.2"
   },
   "publishConfig": {
     "access": "public"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,3 +1,4 @@
 packages:
   - .
   - './examples/*'
+  - './test/error-repros/*'
diff --git a/shims/buffer/package.json b/shims/buffer/package.json
@@ -8,5 +8,6 @@
     }
   },
   "main": "./dist/index.cjs",
-  "module": "./dist/index.js"
+  "module": "./dist/index.js",
+  "browser": "./dist/index.js"
 }
diff --git a/shims/global/package.json b/shims/global/package.json
@@ -8,5 +8,6 @@
     }
   },
   "main": "./dist/index.cjs",
-  "module": "./dist/index.js"
+  "module": "./dist/index.js",
+  "browser": "./dist/index.js"
 }
diff --git a/shims/process/package.json b/shims/process/package.json
@@ -8,5 +8,6 @@
     }
   },
   "main": "./dist/index.cjs",
-  "module": "./dist/index.js"
+  "module": "./dist/index.js",
+  "browser": "./dist/index.js"
 }
diff --git a/test/error-repros/vite-scan-buffer-import-error/index.html b/test/error-repros/vite-scan-buffer-import-error/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>vite-scan-buffer-import-error</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/test.ts"></script>
+  </body>
+</html>
diff --git a/test/error-repros/vite-scan-buffer-import-error/package.json b/test/error-repros/vite-scan-buffer-import-error/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "vite-scan-buffer-import-error",
+  "type": "module",
+  "private": true,
+  "scripts": {
+    "test": "vite optimize"
+  },
+  "devDependencies": {
+    "vite-plugin-node-polyfills": "workspace:*",
+    "vite@5.1.0": "npm:vite@5.1.0"
+  }
+}
diff --git a/test/error-repros/vite-scan-buffer-import-error/test.ts b/test/error-repros/vite-scan-buffer-import-error/test.ts
@@ -0,0 +1,4 @@
+import { Buffer } from 'node:buffer'
+
+// eslint-disable-next-line no-console
+console.log(Buffer.from('hello').toString())
diff --git a/test/error-repros/vite-scan-buffer-import-error/vite.config.ts b/test/error-repros/vite-scan-buffer-import-error/vite.config.ts
@@ -0,0 +1,10 @@
+import { nodePolyfills } from 'vite-plugin-node-polyfills'
+
+export default {
+  optimizeDeps: {
+    force: true,
+  },
+  plugins: [
+    nodePolyfills(),
+  ],
+}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
`2`		`- "typescript.tsdk": "node_modules/typescript/lib"`
	`2`	`+ "typescript.tsdk": "node_modules/typescript/lib",`
	`3`	`+ "files.eol": "\n"`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`"main": "./dist/index.cjs",`
`11`		`- "module": "./dist/index.js"`
	`11`	`+ "module": "./dist/index.js",`
	`12`	`+ "browser": "./dist/index.js"`
`12`	`13`	`}`