fix(optimizer): non object module.exports for Node builtin modules in CJS external facade

packages/vite/src/node/optimizer/esbuildDepPlugin.ts

@@ -8,6 +8,7 @@ import {
   isBuiltin,
   isCSSRequest,
   isExternalUrl,
+  isNodeBuiltin,
   moduleListContains,
   normalizePath,
 } from '../utils'
@@ -337,10 +338,10 @@ export function esbuildCjsExternalPlugin(
       build.onLoad(
         { filter: /.*/, namespace: cjsExternalFacadeNamespace },
         (args) => ({
-          contents:
-            `import * as m from ${JSON.stringify(
-              nonFacadePrefix + args.path,
-            )};` + `module.exports = { ...m };`,
+          contents: `\
+import * as m from ${JSON.stringify(nonFacadePrefix + args.path)};
+module.exports = ${isNodeBuiltin(args.path) ? 'm.default' : '{ ...m }'};
+`,
         }),
       )
     },

playground/optimize-deps/__tests__/optimize-deps.spec.ts

@@ -365,8 +365,11 @@ test('external package name with asset extension', async () => {
   ).toBe(String(isServe))
 })
 
-test('dependency with external sub-dependency', async () => {
+test('dependency with external sub-dependencies', async () => {
   await expectWithRetry(() =>
-    page.textContent('.dep-cjs-with-external-dep'),
+    page.textContent('.dep-cjs-with-external-deps-object'),
   ).toBe('ok')
+  await expectWithRetry(() =>
+    page.textContent('.dep-cjs-with-external-deps-node-builtin'),
+  ).toBe('foo bar')
 })

playground/optimize-deps/dep-cjs-with-external-deps/index.js

@@ -0,0 +1,8 @@
+// `stream` is used as the package name for `@vitejs/test-dep-esm-dummy-node-builtin` so that it is treated like a Node builtin
+// eslint-disable-next-line import-x/no-nodejs-modules
+const externalDummyNodeBuiltin = require('stream')
+const external = require('@vitejs/test-dep-esm-external')
+// eslint-disable-next-line no-prototype-builtins
+const externalResult = external.hasOwnProperty('foo') ? 'ok' : 'error'
+const externalDummyNodeBuiltinResult = `${externalDummyNodeBuiltin()} ${externalDummyNodeBuiltin.bar}`
+module.exports = { externalResult, externalDummyNodeBuiltinResult }

playground/optimize-deps/dep-cjs-with-external-deps/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@vitejs/test-dep-cjs-with-external-deps",
+  "private": true,
+  "version": "0.0.0",
+  "main": "index.js",
+  "dependencies": {
+    "@vitejs/test-dep-esm-external": "file:../dep-esm-external",
+    "stream": "file:../dep-esm-dummy-node-builtin"
+  }
+}

playground/optimize-deps/dep-esm-dummy-node-builtin/index.js

@@ -0,0 +1,9 @@
+function foo() {
+  return 'foo'
+}
+
+foo.bar = 'bar'
+
+export const bar = 'bar'
+
+export default foo

playground/optimize-deps/dep-esm-dummy-node-builtin/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@vitejs/test-dep-esm-dummy-node-builtin",
+  "private": true,
+  "version": "0.0.0",
+  "main": "index.js",
+  "type": "module"
+}

playground/optimize-deps/index.html

@@ -310,12 +310,22 @@ <h2>Pre-bundle transitive dependency 'some-package.pdf'</h2>
   import * as all from '@vitejs/test-dep-source-map-no-sources/all.js'
 </script>
 
-<h2>Pre-bundle dependency with external sub-dependency</h2>
+<h2>Pre-bundle dependency with external sub-dependencies</h2>
 <div>
-  require('some-external-sub-dependency') returns a plain object:
-  <span class="dep-cjs-with-external-dep">???</span>
+  require('some-external-sub-dependency') returns a plain object rather than a
+  module namespace object:
+  <span class="dep-cjs-with-external-deps-object">???</span>
+</div>
+<div>
+  require('some-external-sub-dependency') returns the default export if the
+  dependency is a Node builtin:
+  <span class="dep-cjs-with-external-deps-node-builtin">???</span>
 </div>
 <script type="module">
-  import * as optimized from '@vitejs/test-dep-cjs-with-external-dep'
-  text('.dep-cjs-with-external-dep', optimized.result)
+  import * as optimized from '@vitejs/test-dep-cjs-with-external-deps'
+  text('.dep-cjs-with-external-deps-object', optimized.externalResult)
+  text(
+    '.dep-cjs-with-external-deps-node-builtin',
+    optimized.externalDummyNodeBuiltinResult,
+  )
 </script>

playground/optimize-deps/package.json

@@ -18,7 +18,7 @@
     "@vitejs/test-dep-cjs-compiled-from-cjs": "file:./dep-cjs-compiled-from-cjs",
     "@vitejs/test-dep-cjs-compiled-from-esm": "file:./dep-cjs-compiled-from-esm",
     "@vitejs/test-dep-cjs-with-assets": "file:./dep-cjs-with-assets",
-    "@vitejs/test-dep-cjs-with-external-dep": "file:./dep-cjs-with-external-dep",
+    "@vitejs/test-dep-cjs-with-external-deps": "file:./dep-cjs-with-external-deps",
     "@vitejs/test-dep-css-require": "file:./dep-css-require",
     "@vitejs/test-dep-esbuild-plugin-transform": "file:./dep-esbuild-plugin-transform",
     "@vitejs/test-dep-incompatible": "file:./dep-incompatible",

playground/optimize-deps/vite.config.js

@@ -23,12 +23,13 @@ export default defineConfig({
       '@vitejs/test-dep-optimize-exports-with-glob/**/*',
       '@vitejs/test-dep-optimize-exports-with-root-glob/**/*.js',
       '@vitejs/test-dep-optimize-with-glob/**/*.js',
-      '@vitejs/test-dep-cjs-with-external-dep',
+      '@vitejs/test-dep-cjs-with-external-deps',
     ],
     exclude: [
       '@vitejs/test-nested-exclude',
       '@vitejs/test-dep-non-optimized',
       '@vitejs/test-dep-esm-external',
+      'stream',
     ],
     esbuildOptions: {
       plugins: [