fix: concatenation should merge module’s chunk init fragments (web-in…

…fra-dev#7504)
wChenonly · Aug 8, 2024 · 6f19caa · 6f19caa
1 parent 840de57
commit 6f19caa
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 1 deletion.
diff --git a/crates/rspack_core/src/concatenated_module.rs b/crates/rspack_core/src/concatenated_module.rs
@@ -1655,11 +1655,16 @@ impl ConcatenatedModule {
       let codegen_res = module.code_generation(compilation, runtime, Some(concatenation_scope))?;
       let CodeGenerationResult {
         mut inner,
-        chunk_init_fragments,
+        mut chunk_init_fragments,
         runtime_requirements,
         concatenation_scope,
         ..
       } = codegen_res;
+
+      if let Some(fragments) = codegen_res.data.get::<ChunkInitFragments>() {
+        chunk_init_fragments.extend(fragments.iter().cloned());
+      }
+
       let concatenation_scope = concatenation_scope.expect("should have concatenation_scope");
       let source = inner
         .remove(&SourceType::JavaScript)

diff --git a/...pack-test-tools/tests/configCases/output-module/node-shims-in-concatenated-module/file.js b/...pack-test-tools/tests/configCases/output-module/node-shims-in-concatenated-module/file.js
@@ -0,0 +1,6 @@
+const fileURLToPath = "";
+const file = __filename;
+const dir = __dirname;
+const dir2 = `${__dirname}/`;
+
+export { file, dir, dir2 };
diff --git a/...ack-test-tools/tests/configCases/output-module/node-shims-in-concatenated-module/index.js b/...ack-test-tools/tests/configCases/output-module/node-shims-in-concatenated-module/index.js
@@ -0,0 +1,10 @@
+import { dir, dir2, file } from './file.js'
+
+it("should generate correct __dirname", () => {
+	expect(dir).toMatch(/[\\/]node-shims-in-concatenated-module$/);
+	expect(dir2).toMatch(/[\\/]node-shims-in-concatenated-module\/$/);
+});
+
+it("should generate correct __filename", () => {
+	expect(file).toMatch(/[\\/]main.mjs$/);
+});
diff --git a/...-tools/tests/configCases/output-module/node-shims-in-concatenated-module/rspack.config.js b/...-tools/tests/configCases/output-module/node-shims-in-concatenated-module/rspack.config.js
@@ -0,0 +1,14 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	entry: {
+		main: "./index.js"
+	},
+	output: {
+		filename: "[name].mjs",
+		module: true
+	},
+	experiments: {
+		outputModule: true
+	},
+	target: "node14"
+};
diff --git a/...st-tools/tests/configCases/output-module/node-shims-in-concatenated-module/test.config.js b/...st-tools/tests/configCases/output-module/node-shims-in-concatenated-module/test.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	findBundle() {
+		return "./main.mjs";
+	}
+};