Skip to content

perf: parallel find new name in concatenated code generation #10874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

perf: parallel find new name in concatenated code generation #10874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
481 changes: 285 additions & 196 deletions crates/rspack_core/src/concatenated_module.rs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/rspack_plugin_javascript/src/plugin/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ impl JsPlugin {
let context = compilation.options.context.clone();
let readable_identifier = module.readable_identifier(&context).to_string();
let splitted_readable_identifier = split_readable_identifier(&readable_identifier);
let new_name = find_new_name(name, &all_used_names, &splitted_readable_identifier);
let new_name = find_new_name("", name, &all_used_names, &splitted_readable_identifier);

for identifier in refs.iter() {
let span = identifier.id.span();
Expand Down
4 changes: 2 additions & 2 deletions packages/rspack-test-tools/tests/__snapshots__/StatsAPI.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ Object {
main.js,
],
filteredModules: undefined,
hash: cfe10b32fa6df1ab,
hash: f2679505795e0dc5,
id: 909,
idHints: Array [],
initial: true,
Expand Down Expand Up @@ -718,7 +718,7 @@ Object {
errorsCount: 0,
filteredAssets: undefined,
filteredModules: undefined,
hash: de56093745c27934,
hash: 2252b7b6fa0bc796,
modules: Array [
Object {
assets: Array [],
Expand Down
2 changes: 1 addition & 1 deletion packages/rspack-test-tools/tests/__snapshots__/StatsOutput.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ runtime modules xx KiB
[no exports]
[used exports unknown]

Rspack compiled successfully (cb468c46ad9d7f18)
Rspack compiled successfully (b6a6c74437c67e0f)
`;

exports[`statsOutput statsOutput/builtin-swc-loader-parse-error should print correct stats for 1`] = `
Expand Down
8 changes: 4 additions & 4 deletions ...k-test-tools/tests/builtinCases/samples/concatenate-modules/__snapshots__/output.snap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"./index.js": (function () {

;// CONCATENATED MODULE: ./answer.js
const answer = 103330;
const _0_answer = 103330;

;// CONCATENATED MODULE: ./index.js

answer;
_0_answer;

function index_answer() {}
function _1_answer() {}

index_answer();
_1_answer();

function test() {}

Expand Down
6 changes: 4 additions & 2 deletions ...es/rspack-test-tools/tests/configCases/library/modern-module-asset-entry/rspack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@ module.exports = {
const jsContent = assets[js].source().toString();

const preseveImport =
/import\simg_namespaceObject\sfrom ['"]\.\/static\/img\/img\.png['"]/.test(
/import\s_0_img_namespaceObject\sfrom ['"]\.\/static\/img\/img\.png['"]/.test(
jsContent
);
assert(preseveImport);
const hasExports =
/export\s{\simg_namespaceObject\sas\sdefault\s}/.test(jsContent);
/export\s{\s_0_img_namespaceObject\sas\sdefault\s}/.test(
jsContent
);
assert(hasExports);
});
});
Expand Down
2 changes: 1 addition & 1 deletion ...es/rspack-test-tools/tests/configCases/library/modern-module-export-char/rspack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports = {
compilation.hooks.afterProcessAssets.tap("testcase", assets => {
const bundle = Object.values(assets)[0]._value;
expect(bundle)
.toContain(`var __webpack_exports__cjsInterop = (foo_default());
.toContain(`var __webpack_exports__cjsInterop = (_1_foo_default());
export { external_module as defaultImport, namedImport, __webpack_exports__cjsInterop as cjsInterop };`);
expect(bundle).toContain(
'import external_module, { namedImport } from "external-module";'
Expand Down
6 changes: 3 additions & 3 deletions ...k-test-tools/tests/configCases/library/modern-module-force-concaten/__snapshot__/e.js.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj
const foo = 'foo'

// EXTERNAL MODULE: ./e/bar.cjs
var bar = __webpack_require__(997);
var bar_default = /*#__PURE__*/__webpack_require__.n(bar);
var _1_bar = __webpack_require__(997);
var _1_bar_default = /*#__PURE__*/__webpack_require__.n(_1_bar);
;// CONCATENATED MODULE: ./e/index.js





var __webpack_exports__bar = (bar_default());
var __webpack_exports__bar = (_1_bar_default());
export { foo, __webpack_exports__bar as bar };
6 changes: 3 additions & 3 deletions ...k-test-tools/tests/configCases/library/modern-module-force-concaten/__snapshot__/f.js.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,16 @@ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj
/************************************************************************/

// EXTERNAL MODULE: ./f/bar.cjs
var bar = __webpack_require__(441);
var bar_default = /*#__PURE__*/__webpack_require__.n(bar);
var _0_bar = __webpack_require__(441);
var _0_bar_default = /*#__PURE__*/__webpack_require__.n(_0_bar);
;// CONCATENATED MODULE: ./f/foo.js
const foo = 'foo'

;// CONCATENATED MODULE: ./f/index.js



const value = foo + (bar_default())
const value = foo + (_0_bar_default())



Expand Down
6 changes: 3 additions & 3 deletions ...k-test-tools/tests/configCases/library/modern-module-force-concaten/__snapshot__/g.js.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj
/************************************************************************/

// EXTERNAL MODULE: ./g/foo.js
var foo = __webpack_require__(974);
var foo_default = /*#__PURE__*/__webpack_require__.n(foo);
var _0_foo = __webpack_require__(974);
var _0_foo_default = /*#__PURE__*/__webpack_require__.n(_0_foo);
;// CONCATENATED MODULE: ./g/index.js




var __webpack_exports__foo = (foo_default());
var __webpack_exports__foo = (_0_foo_default());
export { __webpack_exports__foo as foo };
4 changes: 2 additions & 2 deletions ...k-test-tools/tests/configCases/library/modern-module-force-concaten/__snapshot__/h.js.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ __webpack_require__.p = "";
/************************************************************************/

;// CONCATENATED MODULE: ./h/file.png
const file_namespaceObject = __webpack_require__.p + "fc90103f80b6abc6.png";
export { file_namespaceObject as default };
const _0_file_namespaceObject = __webpack_require__.p + "fc90103f80b6abc6.png";
export { _0_file_namespaceObject as default };
4 changes: 2 additions & 2 deletions packages/rspack-test-tools/tests/configCases/rstest/module-path-names/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const sourceDir = path.resolve(__dirname, "../../../../configCases/rstest/module
it("Insert module path names with concatenateModules", () => {
const content = fs.readFileSync(path.resolve(__dirname, "modulePathName.js"), "utf-8");
// __dirname and __filename renamed after concatenation
expect(content).toContain(`const foo_filename = ${JSON.stringify(path.resolve(sourceDir, "./foo.js"))}`);
expect(content).toContain(`const foo_dirname = ${JSON.stringify(path.resolve(sourceDir, "."))}`);
expect(content).toContain(`const _0_foo_filename = ${JSON.stringify(path.resolve(sourceDir, "./foo.js"))}`);
expect(content).toContain(`const _0_foo_dirname = ${JSON.stringify(path.resolve(sourceDir, "."))}`);

expect(content).toContain(`const metaFile1 = ${JSON.stringify(path.resolve(sourceDir, "./foo.js"))}`)
expect(content).toContain(`const metaDir1 = ${JSON.stringify(path.resolve(sourceDir, "."))}`)
Expand Down
18 changes: 9 additions & 9 deletions ...spack-test-tools/tests/hookCases/normalModuleFactory#afterResolve/request/output.snap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,24 @@ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj
"use strict";

// EXTERNAL MODULE: ../../normalModuleFactory​#afterResolve/request/a.js
var a = __webpack_require__("../../normalModuleFactory​#afterResolve/request/a.js");
var a_default = /*#__PURE__*/__webpack_require__.n(a);
var _0_a = __webpack_require__("../../normalModuleFactory​#afterResolve/request/a.js");
var _0_a_default = /*#__PURE__*/__webpack_require__.n(_0_a);
// EXTERNAL MODULE: ../../normalModuleFactory​#afterResolve/request/c.js
var c = __webpack_require__("../../normalModuleFactory​#afterResolve/request/c.js");
var c_default = /*#__PURE__*/__webpack_require__.n(c);
var _1_c = __webpack_require__("../../normalModuleFactory​#afterResolve/request/c.js");
var _1_c_default = /*#__PURE__*/__webpack_require__.n(_1_c);
;// CONCATENATED MODULE: external "fs"
const external_fs_namespaceObject = require("fs");
var external_fs_default = /*#__PURE__*/__webpack_require__.n(external_fs_namespaceObject);
const _2_external_fs_namespaceObject = require("fs");
var _2_external_fs_default = /*#__PURE__*/__webpack_require__.n(_2_external_fs_namespaceObject);
;// CONCATENATED MODULE: ../../normalModuleFactory​#afterResolve/request/request.js




it("should modify request by after resolve hook", () => {
expect((a_default())).toBe("a");
expect((c_default())).toBe("b");
expect((_0_a_default())).toBe("a");
expect((_1_c_default())).toBe("b");
const ext = ".js";
expect(external_fs_default().readFileSync(__filename, "utf-8")).toContain("request/c" + ext);
expect(_2_external_fs_default().readFileSync(__filename, "utf-8")).toContain("request/c" + ext);
});

})();
Expand Down
18 changes: 9 additions & 9 deletions ...pack-test-tools/tests/hookCases/normalModuleFactory#afterResolve/resource/output.snap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,24 @@ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj
"use strict";

// EXTERNAL MODULE: ../../normalModuleFactory​#afterResolve/resource/a.js
var a = __webpack_require__("../../normalModuleFactory​#afterResolve/resource/a.js");
var a_default = /*#__PURE__*/__webpack_require__.n(a);
var _0_a = __webpack_require__("../../normalModuleFactory​#afterResolve/resource/a.js");
var _0_a_default = /*#__PURE__*/__webpack_require__.n(_0_a);
// EXTERNAL MODULE: ../../normalModuleFactory​#afterResolve/resource/b.js
var b = __webpack_require__("../../normalModuleFactory​#afterResolve/resource/b.js");
var b_default = /*#__PURE__*/__webpack_require__.n(b);
var _1_b = __webpack_require__("../../normalModuleFactory​#afterResolve/resource/b.js");
var _1_b_default = /*#__PURE__*/__webpack_require__.n(_1_b);
;// CONCATENATED MODULE: external "fs"
const external_fs_namespaceObject = require("fs");
var external_fs_default = /*#__PURE__*/__webpack_require__.n(external_fs_namespaceObject);
const _2_external_fs_namespaceObject = require("fs");
var _2_external_fs_default = /*#__PURE__*/__webpack_require__.n(_2_external_fs_namespaceObject);
;// CONCATENATED MODULE: ../../normalModuleFactory​#afterResolve/resource/resource.js




it("should modify resource by after resolve hook", () => {
expect((a_default())).toBe("a");
expect((b_default())).toBe("c");
expect((_0_a_default())).toBe("a");
expect((_1_b_default())).toBe("c");
const ext = ".js";
expect(external_fs_default().readFileSync(__filename, "utf-8")).toContain("resource/b" + ext);
expect(_2_external_fs_default().readFileSync(__filename, "utf-8")).toContain("resource/b" + ext);
});

})();
Expand Down
18 changes: 9 additions & 9 deletions ...es/rspack-test-tools/tests/hookCases/normalModuleFactory#resolve/resource/output.snap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,24 @@ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj
"use strict";

// EXTERNAL MODULE: ../../normalModuleFactory​#resolve/resource/a.js
var a = __webpack_require__("../../normalModuleFactory​#resolve/resource/a.js");
var a_default = /*#__PURE__*/__webpack_require__.n(a);
var _0_a = __webpack_require__("../../normalModuleFactory​#resolve/resource/a.js");
var _0_a_default = /*#__PURE__*/__webpack_require__.n(_0_a);
// EXTERNAL MODULE: ../../normalModuleFactory​#resolve/resource/b.js
var b = __webpack_require__("../../normalModuleFactory​#resolve/resource/b.js");
var b_default = /*#__PURE__*/__webpack_require__.n(b);
var _1_b = __webpack_require__("../../normalModuleFactory​#resolve/resource/b.js");
var _1_b_default = /*#__PURE__*/__webpack_require__.n(_1_b);
;// CONCATENATED MODULE: external "fs"
const external_fs_namespaceObject = require("fs");
var external_fs_default = /*#__PURE__*/__webpack_require__.n(external_fs_namespaceObject);
const _2_external_fs_namespaceObject = require("fs");
var _2_external_fs_default = /*#__PURE__*/__webpack_require__.n(_2_external_fs_namespaceObject);
;// CONCATENATED MODULE: ../../normalModuleFactory​#resolve/resource/resource.js




it("should modify resource by resolve hook", () => {
expect((a_default())).toBe("a");
expect((b_default())).toBe("c");
expect((_0_a_default())).toBe("a");
expect((_1_b_default())).toBe("c");
const ext = ".js";
expect(external_fs_default().readFileSync(__filename, "utf-8")).toContain("resource/b" + ext);
expect(_2_external_fs_default().readFileSync(__filename, "utf-8")).toContain("resource/b" + ext);
});

})();
Expand Down
Loading