fix!: change to commonjs-static library type of commonjs format

fi3ework · fi3ework · commit 0c551f9b036d · 2025-03-05T21:28:46.000+08:00
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -624,7 +624,8 @@ const composeFormatConfig = ({
               iife: false,
               chunkFormat: 'commonjs',
               library: {
-                type: 'commonjs',
+                // type: 'commonjs',
+                type: 'commonjs-static',
               },
               chunkLoading: 'require',
               workerChunkLoading: 'async-node',
diff --git a/packages/core/tests/__snapshots__/config.test.ts.snap b/packages/core/tests/__snapshots__/config.test.ts.snap
@@ -450,7 +450,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
               "chunkLoading": "require",
               "iife": false,
               "library": {
-                "type": "commonjs",
+                "type": "commonjs-static",
               },
               "wasmLoading": "async-node",
               "workerChunkLoading": "async-node",
diff --git a/tests/integration/alias/__snapshots__/index.test.ts.snap b/tests/integration/alias/__snapshots__/index.test.ts.snap
@@ -8,12 +8,9 @@ console.info(a);
 
 exports[`source.alias 2`] = `
 ""use strict";
-var __webpack_exports__ = {};
 const a = 'hello world';
 console.info(a);
-var __webpack_export_target__ = exports;
-for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+Object.defineProperty(exports, '__esModule', {
     value: true
 });
 "
@@ -27,12 +24,9 @@ console.info(__WEBPACK_EXTERNAL_MODULE__a_js_256e6de1__.a);
 
 exports[`source.alias 4`] = `
 ""use strict";
-var __webpack_exports__ = {};
 const external_a_cjs_namespaceObject = require("./a.cjs");
 console.info(external_a_cjs_namespaceObject.a);
-var __webpack_export_target__ = exports;
-for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+Object.defineProperty(exports, '__esModule', {
     value: true
 });
 "
diff --git a/tests/integration/asset/__snapshots__/index.test.ts.snap b/tests/integration/asset/__snapshots__/index.test.ts.snap
@@ -128,9 +128,9 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg
         })
     });
 const logo_rslib_entry_ = require("../static/svg/logo.svg");
-var __webpack_export_target__ = exports;
-for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+exports.ReactComponent = __webpack_exports__.ReactComponent;
+exports["default"] = __webpack_exports__["default"];
+Object.defineProperty(exports, '__esModule', {
     value: true
 });
 "
@@ -218,9 +218,8 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg
         })
     });
 const logo_rslib_entry_ = SvgLogo;
-var __webpack_export_target__ = exports;
-for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+exports["default"] = __webpack_exports__["default"];
+Object.defineProperty(exports, '__esModule', {
     value: true
 });
 "
@@ -250,9 +249,8 @@ function __webpack_require__(moduleId) {
     return module.exports;
 }
 var __webpack_exports__ = __webpack_require__("./src/assets/logo2.svg?__rslib_entry__");
-var __webpack_export_target__ = exports;
-for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+exports["default"] = __webpack_exports__["default"];
+Object.defineProperty(exports, '__esModule', {
     value: true
 });
 "
@@ -316,7 +314,6 @@ console.log('defaultImport', 'Url', logo);
 
 exports[`use svgr 2`] = `
 ""use strict";
-var __webpack_exports__ = {};
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
 const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg", {
@@ -368,9 +365,7 @@ const logo_SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)
 const logo = require("./static/svg/logo.svg");
 console.log('namedImport', 'ReactComponent', logo_SvgLogo);
 console.log('defaultImport', 'Url', logo);
-var __webpack_export_target__ = exports;
-for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+Object.defineProperty(exports, '__esModule', {
     value: true
 });
 "
diff --git a/tests/integration/asset/index.test.ts b/tests/integration/asset/index.test.ts
@@ -72,9 +72,8 @@ test('set the size threshold to inline static assets', async () => {
         return module.exports;
     }
     var __webpack_exports__ = __webpack_require__("./src/assets/logo.svg?__rslib_entry__");
-    var __webpack_export_target__ = exports;
-    for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-    if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+    exports["default"] = __webpack_exports__["default"];
+    Object.defineProperty(exports, '__esModule', {
         value: true
     });
     "
@@ -130,9 +129,8 @@ test('set the assets filename with hash', async () => {
         return module.exports;
     }
     var __webpack_exports__ = __webpack_require__("./src/assets/image.png?__rslib_entry__");
-    var __webpack_export_target__ = exports;
-    for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-    if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+    exports["default"] = __webpack_exports__["default"];
+    Object.defineProperty(exports, '__esModule', {
         value: true
     });
     "
@@ -188,9 +186,8 @@ test('set the assets output path', async () => {
         return module.exports;
     }
     var __webpack_exports__ = __webpack_require__("./src/assets/image.png?__rslib_entry__");
-    var __webpack_export_target__ = exports;
-    for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-    if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+    exports["default"] = __webpack_exports__["default"];
+    Object.defineProperty(exports, '__esModule', {
         value: true
     });
     "
diff --git a/tests/integration/auto-extension/index.test.ts b/tests/integration/auto-extension/index.test.ts
@@ -40,7 +40,7 @@ describe('should respect output.filename.js to override builtin logic', () => {
     const { entryFiles } = await buildAndGetResults({ fixturePath });
     expect(extname(entryFiles.esm!)).toEqual('.mjs');
     expect(entryFiles.cjs).toMatchInlineSnapshot(
-      `"<ROOT>/tests/integration/auto-extension/type-commonjs/config-override/dist/cjs/index.58a9daaa.js"`,
+      `"<ROOT>/tests/integration/auto-extension/type-commonjs/config-override/dist/cjs/index.b2c849e6.js"`,
     );
   });
 
diff --git a/tests/integration/bundle-false/__snapshots__/index.test.ts.snap b/tests/integration/bundle-false/__snapshots__/index.test.ts.snap
@@ -84,9 +84,9 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg
         })
     });
 const logo_rslib_entry_ = require("../static/svg/logo.svg");
-var __webpack_export_target__ = exports;
-for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+exports.ReactComponent = __webpack_exports__.ReactComponent;
+exports["default"] = __webpack_exports__["default"];
+Object.defineProperty(exports, '__esModule', {
     value: true
 });
 "
diff --git a/tests/integration/bundle-false/index.test.ts b/tests/integration/bundle-false/index.test.ts
@@ -217,9 +217,8 @@ test('asset in bundleless', async () => {
         return module.exports;
     }
     var __webpack_exports__ = __webpack_require__("./src/assets/image.png?__rslib_entry__");
-    var __webpack_export_target__ = exports;
-    for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-    if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+    exports["default"] = __webpack_exports__["default"];
+    Object.defineProperty(exports, '__esModule', {
         value: true
     });
     "
@@ -242,9 +241,8 @@ test('asset in bundleless', async () => {
         return module.exports;
     }
     var __webpack_exports__ = __webpack_require__("./src/assets/logo.svg?__rslib_entry__");
-    var __webpack_export_target__ = exports;
-    for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-    if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+    exports["default"] = __webpack_exports__["default"];
+    Object.defineProperty(exports, '__esModule', {
         value: true
     });
     "
diff --git a/tests/integration/extension-alias/__snapshots__/index.test.ts.snap b/tests/integration/extension-alias/__snapshots__/index.test.ts.snap
@@ -2,13 +2,10 @@
 
 exports[`resolve.extensionAlias should work 1`] = `
 ""use strict";
-var __webpack_exports__ = {};
 const bar = 'bar';
 const foo = 'foo';
 console.log(foo + bar);
-var __webpack_export_target__ = exports;
-for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
-if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
+Object.defineProperty(exports, '__esModule', {
     value: true
 });
 "
diff --git a/tests/integration/format/cjs-static-export/rslib.config.ts b/tests/integration/format/cjs-static-export/rslib.config.ts
@@ -0,0 +1,22 @@
+import { defineConfig } from '@rslib/core';
+import { generateBundleCjsConfig } from 'test-helper';
+
+export default defineConfig({
+  lib: [
+    generateBundleCjsConfig({
+      output: {
+        distPath: {
+          root: './dist/cjs',
+        },
+        filename: {
+          js: '[name].cjs',
+        },
+      },
+    }),
+  ],
+  source: {
+    entry: {
+      index: './src/index.js',
+    },
+  },
+});
diff --git a/tests/integration/format/cjs-static-export/src/index.js b/tests/integration/format/cjs-static-export/src/index.js
@@ -0,0 +1 @@
+export { foo, bar } from './value.js';
diff --git a/tests/integration/format/cjs-static-export/src/value.js b/tests/integration/format/cjs-static-export/src/value.js
@@ -0,0 +1,2 @@
+export const foo = 'foo';
+export const bar = 'bar';
diff --git a/tests/integration/format/import-meta-url/rslib.config.ts b/tests/integration/format/import-meta-url/rslib.config.ts
diff --git a/tests/integration/format/import-meta-url/src/index.js b/tests/integration/format/import-meta-url/src/index.js
diff --git a/tests/integration/format/import-meta-url/src/value.js b/tests/integration/format/import-meta-url/src/value.js
diff --git a/tests/integration/format/index.test.ts b/tests/integration/format/index.test.ts
@@ -1,8 +1,10 @@
+import path from 'node:path';
 import { buildAndGetResults } from 'test-helper';
 import { expect, test } from 'vitest';
+import { a } from 'vitest/dist/chunks/suite.qtkXWc6R.js';
 
-test('esm', async () => {
-  const fixturePath = __dirname;
+test('import.meta.url should be preserved', async () => {
+  const fixturePath = path.resolve(__dirname, 'import-meta-url');
   const { files, entries, entryFiles } = await buildAndGetResults({
     fixturePath,
   });
@@ -29,3 +31,26 @@ test('esm', async () => {
     }
   `);
 });
+
+test('CJS exports should be statically analyzable (cjs-module-lexer for Node.js)', async () => {
+  const fixturePath = path.resolve(__dirname, 'cjs-static-export');
+  const { entryFiles } = await buildAndGetResults({
+    fixturePath,
+  });
+
+  const { bar, foo } = await import(entryFiles.cjs);
+  expect(bar).toBe('bar');
+  expect(foo).toBe('foo');
+
+  const cjs = await import(entryFiles.cjs);
+  expect(cjs).toMatchInlineSnapshot(`
+    {
+      "bar": "bar",
+      "default": {
+        "bar": "bar",
+        "foo": "foo",
+      },
+      "foo": "foo",
+    }
+  `);
+});

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,8 @@ test('set the size threshold to inline static assets', async () => {`
`72`	`72`	`return module.exports;`
`73`	`73`	`}`
`74`	`74`	`var __webpack_exports__ = __webpack_require__("./src/assets/logo.svg?__rslib_entry__");`
`75`		`- var __webpack_export_target__ = exports;`
`76`		`- for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];`
`77`		`- if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {`
	`75`	`+ exports["default"] = __webpack_exports__["default"];`
	`76`	`+ Object.defineProperty(exports, '__esModule', {`
`78`	`77`	`value: true`
`79`	`78`	`});`
`80`	`79`	`"`
`@@ -130,9 +129,8 @@ test('set the assets filename with hash', async () => {`
`130`	`129`	`return module.exports;`
`131`	`130`	`}`
`132`	`131`	`var __webpack_exports__ = __webpack_require__("./src/assets/image.png?__rslib_entry__");`
`133`		`- var __webpack_export_target__ = exports;`
`134`		`- for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];`
`135`		`- if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {`
	`132`	`+ exports["default"] = __webpack_exports__["default"];`
	`133`	`+ Object.defineProperty(exports, '__esModule', {`
`136`	`134`	`value: true`
`137`	`135`	`});`
`138`	`136`	`"`
`@@ -188,9 +186,8 @@ test('set the assets output path', async () => {`
`188`	`186`	`return module.exports;`
`189`	`187`	`}`
`190`	`188`	`var __webpack_exports__ = __webpack_require__("./src/assets/image.png?__rslib_entry__");`
`191`		`- var __webpack_export_target__ = exports;`
`192`		`- for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];`
`193`		`- if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {`
	`189`	`+ exports["default"] = __webpack_exports__["default"];`
	`190`	`+ Object.defineProperty(exports, '__esModule', {`
`194`	`191`	`value: true`
`195`	`192`	`});`
`196`	`193`	`"`
Original file line number	Diff line number	Diff line change
`@@ -217,9 +217,8 @@ test('asset in bundleless', async () => {`
`217`	`217`	`return module.exports;`
`218`	`218`	`}`
`219`	`219`	`var __webpack_exports__ = __webpack_require__("./src/assets/image.png?__rslib_entry__");`
`220`		`- var __webpack_export_target__ = exports;`
`221`		`- for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];`
`222`		`- if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {`
	`220`	`+ exports["default"] = __webpack_exports__["default"];`
	`221`	`+ Object.defineProperty(exports, '__esModule', {`
`223`	`222`	`value: true`
`224`	`223`	`});`
`225`	`224`	`"`
`@@ -242,9 +241,8 @@ test('asset in bundleless', async () => {`
`242`	`241`	`return module.exports;`
`243`	`242`	`}`
`244`	`243`	`var __webpack_exports__ = __webpack_require__("./src/assets/logo.svg?__rslib_entry__");`
`245`		`- var __webpack_export_target__ = exports;`
`246`		`- for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];`
`247`		`- if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {`
	`244`	`+ exports["default"] = __webpack_exports__["default"];`
	`245`	`+ Object.defineProperty(exports, '__esModule', {`
`248`	`246`	`value: true`
`249`	`247`	`});`
`250`	`248`	`"`