Skip to content

Commit 54b11e1

Browse files
fi3eworkfi3ework
committed
fix!: change to commonjs-static library type of commonjs format
1 parent 2aa95c1 commit 54b11e1

File tree

19 files changed

+220
-435
lines changed

19 files changed

+220
-435
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
"simple-git-hooks"
7575
],
7676
"overrides": {
77+
"@rspack/core": "link:../rspack/packages/rspack/",
7778
"zx>@types/node": "-"
7879
}
7980
}

‎packages/core/src/config.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,8 @@ const composeFormatConfig = ({
626626
iife: false,
627627
chunkFormat: 'commonjs',
628628
library: {
629-
type: 'commonjs',
629+
// type: 'commonjs',
630+
type: 'commonjs-static',
630631
},
631632
chunkLoading: 'require',
632633
workerChunkLoading: 'async-node',

‎packages/core/tests/__snapshots__/config.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
449449
"chunkLoading": "require",
450450
"iife": false,
451451
"library": {
452-
"type": "commonjs",
452+
"type": "commonjs-static",
453453
},
454454
"wasmLoading": "async-node",
455455
"workerChunkLoading": "async-node",

‎pnpm-lock.yaml‎

Lines changed: 36 additions & 329 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/integration/alias/__snapshots__/index.test.ts.snap‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ exports[`source.alias 2`] = `
1111
var __webpack_exports__ = {};
1212
const a = 'hello world';
1313
console.info(a);
14-
var __webpack_export_target__ = exports;
15-
for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
16-
if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
14+
for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
15+
Object.defineProperty(exports, '__esModule', {
1716
value: true
1817
});
1918
"
@@ -30,9 +29,8 @@ exports[`source.alias 4`] = `
3029
var __webpack_exports__ = {};
3130
const external_a_cjs_namespaceObject = require("./a.cjs");
3231
console.info(external_a_cjs_namespaceObject.a);
33-
var __webpack_export_target__ = exports;
34-
for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
35-
if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
32+
for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
33+
Object.defineProperty(exports, '__esModule', {
3634
value: true
3735
});
3836
"

‎tests/integration/asset/__snapshots__/index.test.ts.snap‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,13 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg
128128
})
129129
});
130130
const logo_rslib_entry_ = require("../static/svg/logo.svg");
131-
var __webpack_export_target__ = exports;
132-
for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
133-
if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
131+
exports.ReactComponent = __webpack_exports__.ReactComponent;
132+
exports["default"] = __webpack_exports__["default"];
133+
for(var __webpack_i__ in __webpack_exports__)if (-1 === [
134+
"ReactComponent",
135+
"default"
136+
].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
137+
Object.defineProperty(exports, '__esModule', {
134138
value: true
135139
});
136140
"
@@ -218,9 +222,11 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg
218222
})
219223
});
220224
const logo_rslib_entry_ = SvgLogo;
221-
var __webpack_export_target__ = exports;
222-
for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
223-
if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
225+
exports["default"] = __webpack_exports__["default"];
226+
for(var __webpack_i__ in __webpack_exports__)if (-1 === [
227+
"default"
228+
].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
229+
Object.defineProperty(exports, '__esModule', {
224230
value: true
225231
});
226232
"
@@ -250,9 +256,11 @@ function __webpack_require__(moduleId) {
250256
return module.exports;
251257
}
252258
var __webpack_exports__ = __webpack_require__("./src/assets/logo2.svg?__rslib_entry__");
253-
var __webpack_export_target__ = exports;
254-
for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
255-
if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
259+
exports["default"] = __webpack_exports__["default"];
260+
for(var __webpack_i__ in __webpack_exports__)if (-1 === [
261+
"default"
262+
].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
263+
Object.defineProperty(exports, '__esModule', {
256264
value: true
257265
});
258266
"
@@ -368,9 +376,8 @@ const logo_SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)
368376
const logo = require("./static/svg/logo.svg");
369377
console.log('namedImport', 'ReactComponent', logo_SvgLogo);
370378
console.log('defaultImport', 'Url', logo);
371-
var __webpack_export_target__ = exports;
372-
for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
373-
if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
379+
for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
380+
Object.defineProperty(exports, '__esModule', {
374381
value: true
375382
});
376383
"

‎tests/integration/asset/index.test.ts‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ test('set the size threshold to inline static assets', async () => {
7272
return module.exports;
7373
}
7474
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+
for(var __webpack_i__ in __webpack_exports__)if (-1 === [
77+
"default"
78+
].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
79+
Object.defineProperty(exports, '__esModule', {
7880
value: true
7981
});
8082
"
@@ -130,9 +132,11 @@ test('set the assets filename with hash', async () => {
130132
return module.exports;
131133
}
132134
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', {
135+
exports["default"] = __webpack_exports__["default"];
136+
for(var __webpack_i__ in __webpack_exports__)if (-1 === [
137+
"default"
138+
].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
139+
Object.defineProperty(exports, '__esModule', {
136140
value: true
137141
});
138142
"
@@ -188,9 +192,11 @@ test('set the assets output path', async () => {
188192
return module.exports;
189193
}
190194
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', {
195+
exports["default"] = __webpack_exports__["default"];
196+
for(var __webpack_i__ in __webpack_exports__)if (-1 === [
197+
"default"
198+
].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
199+
Object.defineProperty(exports, '__esModule', {
194200
value: true
195201
});
196202
"

‎tests/integration/auto-extension/index.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ describe('should respect output.filename.js and output.filenameHash to override
4242
// override output.filename.js
4343
expect(extname(entryFiles.esm0!)).toEqual('.mjs');
4444
expect(entryFiles.cjs0).toMatchInlineSnapshot(
45-
`"<ROOT>/tests/integration/auto-extension/type-commonjs/config-override/dist/cjs-override-filename/index.d6fcc5d4.js"`,
45+
`"<ROOT>/tests/integration/auto-extension/type-commonjs/config-override/dist/cjs-override-filename/index.df02628a.js"`,
4646
);
4747

4848
// override output.filenameHash
4949
expect(entryFiles.esm1).toMatchInlineSnapshot(
5050
`"<ROOT>/tests/integration/auto-extension/type-commonjs/config-override/dist/esm-override-filename-hash/index.996a7edd.js"`,
5151
);
5252
expect(entryFiles.cjs1).toMatchInlineSnapshot(
53-
`"<ROOT>/tests/integration/auto-extension/type-commonjs/config-override/dist/cjs-override-filename-hash/index.d6fcc5d4.js"`,
53+
`"<ROOT>/tests/integration/auto-extension/type-commonjs/config-override/dist/cjs-override-filename-hash/index.df02628a.js"`,
5454
);
5555
});
5656

@@ -69,7 +69,7 @@ describe('should respect output.filename.js and output.filenameHash to override
6969
`"<ROOT>/tests/integration/auto-extension/type-module/config-override/dist/esm-override-filename-hash/index.996a7edd.js"`,
7070
);
7171
expect(entryFiles.cjs1).toMatchInlineSnapshot(
72-
`"<ROOT>/tests/integration/auto-extension/type-module/config-override/dist/cjs-override-filename-hash/index.d6fcc5d4.js"`,
72+
`"<ROOT>/tests/integration/auto-extension/type-module/config-override/dist/cjs-override-filename-hash/index.df02628a.js"`,
7373
);
7474
});
7575
});

‎tests/integration/bundle-false/__snapshots__/index.test.ts.snap‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,13 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg
8484
})
8585
});
8686
const logo_rslib_entry_ = require("../static/svg/logo.svg");
87-
var __webpack_export_target__ = exports;
88-
for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
89-
if (__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, '__esModule', {
87+
exports.ReactComponent = __webpack_exports__.ReactComponent;
88+
exports["default"] = __webpack_exports__["default"];
89+
for(var __webpack_i__ in __webpack_exports__)if (-1 === [
90+
"ReactComponent",
91+
"default"
92+
].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
93+
Object.defineProperty(exports, '__esModule', {
9094
value: true
9195
});
9296
"

‎tests/integration/bundle-false/index.test.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,11 @@ test('asset in bundleless', async () => {
217217
return module.exports;
218218
}
219219
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+
for(var __webpack_i__ in __webpack_exports__)if (-1 === [
222+
"default"
223+
].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
224+
Object.defineProperty(exports, '__esModule', {
223225
value: true
224226
});
225227
"
@@ -242,9 +244,11 @@ test('asset in bundleless', async () => {
242244
return module.exports;
243245
}
244246
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', {
247+
exports["default"] = __webpack_exports__["default"];
248+
for(var __webpack_i__ in __webpack_exports__)if (-1 === [
249+
"default"
250+
].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
251+
Object.defineProperty(exports, '__esModule', {
248252
value: true
249253
});
250254
"

0 commit comments

Comments
 (0)