fix: avoid chunk conflication when muliple libs present

fi3ework · fi3ework · commit 2535c8ea89e1 · 2025-09-12T17:42:27.000+08:00
diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -1093,6 +1093,26 @@ export const resolveEntryPath = (
 ): RsbuildEntry =>
   traverseEntryQuery(entries, (item) => path.resolve(root, item));
 
+const composeOutputConfig = (
+  multiCompilerIndex: number | null,
+  format: Format,
+  jsExtension: string,
+): EnvironmentConfig => {
+  if (typeof multiCompilerIndex === 'number' && format !== 'mf') {
+    return {
+      tools: {
+        rspack: {
+          output: {
+            chunkFilename: `${multiCompilerIndex}~[name]${jsExtension}`,
+          },
+        },
+      },
+    };
+  }
+
+  return {};
+};
+
 const composeEntryConfig = async (
   rawEntry: RsbuildConfigEntry,
   bundle: LibConfig['bundle'],
@@ -1604,6 +1624,7 @@ const composeExternalHelpersConfig = (
 
 async function composeLibRsbuildConfig(
   config: LibConfig,
+  multiCompilerIndex: number | null, // null means there's non multi-compiler
   root?: string,
   sharedPlugins?: RsbuildPlugins,
 ) {
@@ -1660,6 +1681,11 @@ async function composeLibRsbuildConfig(
     cssModulesAuto,
     config.outBase,
   );
+  const outputConfig = composeOutputConfig(
+    multiCompilerIndex,
+    format,
+    jsExtension,
+  );
   const { config: bundlelessExternalConfig } = composeBundlelessExternalConfig(
     jsExtension,
     redirect,
@@ -1709,6 +1735,7 @@ async function composeLibRsbuildConfig(
 
   return mergeRsbuildConfig(
     formatConfig,
+    outputConfig,
     shimsConfig,
     syntaxConfig,
     externalHelpersConfig,
@@ -1761,7 +1788,7 @@ export async function composeCreateRsbuildConfig(
     );
   }
 
-  const libConfigPromises = libConfigsArray.map(async (libConfig) => {
+  const libConfigPromises = libConfigsArray.map(async (libConfig, index) => {
     const userConfig = mergeRsbuildConfig<LibConfig>(
       sharedRsbuildConfig,
       libConfig,
@@ -1771,6 +1798,7 @@ export async function composeCreateRsbuildConfig(
     // configuration and Lib configuration in the settings.
     const libRsbuildConfig = await composeLibRsbuildConfig(
       userConfig,
+      libConfigsArray.length > 1 ? index : null,
       root,
       sharedPlugins,
     );
diff --git a/packages/core/tests/__snapshots__/config.test.ts.snap b/packages/core/tests/__snapshots__/config.test.ts.snap
@@ -393,7 +393,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
   output: {
     path: '<WORKSPACE>/dist',
     filename: '[name].js',
-    chunkFilename: '[name].js',
+    chunkFilename: '0~[name].js',
     publicPath: 'auto',
     pathinfo: false,
     hashFunction: 'xxhash64',
@@ -1091,7 +1091,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
   output: {
     path: '<WORKSPACE>/dist',
     filename: '[name].cjs',
-    chunkFilename: '[name].cjs',
+    chunkFilename: '1~[name].cjs',
     publicPath: 'auto',
     pathinfo: false,
     hashFunction: 'xxhash64',
@@ -1775,7 +1775,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
   output: {
     path: '<WORKSPACE>/dist',
     filename: '[name].js',
-    chunkFilename: '[name].js',
+    chunkFilename: '2~[name].js',
     publicPath: '/',
     pathinfo: false,
     hashFunction: 'xxhash64',
@@ -2375,7 +2375,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
   output: {
     path: '<WORKSPACE>/dist',
     filename: '[name].js',
-    chunkFilename: '[name].js',
+    chunkFilename: '3~[name].js',
     publicPath: '/',
     pathinfo: false,
     hashFunction: 'xxhash64',
@@ -3674,6 +3674,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
               },
             },
             "output": {
+              "chunkFilename": "0~[name].js",
               "chunkFormat": "module",
               "chunkLoading": "import",
               "library": {
@@ -3945,6 +3946,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
               },
             },
             "output": {
+              "chunkFilename": "1~[name].cjs",
               "chunkFormat": "commonjs",
               "chunkLoading": "require",
               "iife": false,
@@ -4182,6 +4184,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
             },
             "output": {
               "asyncChunks": false,
+              "chunkFilename": "2~[name].js",
               "library": {
                 "type": "umd",
               },
@@ -4413,6 +4416,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
             },
             "output": {
               "asyncChunks": false,
+              "chunkFilename": "3~[name].js",
               "iife": true,
               "library": {
                 "type": "modern-module",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/output/chunkFileName-multi/package.json b/tests/integration/output/chunkFileName-multi/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "minify-output-chunk-file-name-multi-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}
diff --git a/tests/integration/output/chunkFileName-multi/rslib.config.ts b/tests/integration/output/chunkFileName-multi/rslib.config.ts
@@ -0,0 +1,21 @@
+import { defineConfig } from '@rslib/core';
+import { generateBundleEsmConfig } from 'test-helper';
+
+export default defineConfig({
+  lib: [
+    generateBundleEsmConfig({
+      source: {
+        entry: {
+          lib1: './src/lib1.js',
+        },
+      },
+    }),
+    generateBundleEsmConfig({
+      source: {
+        entry: {
+          lib2: './src/lib2.js',
+        },
+      },
+    }),
+  ],
+});
diff --git a/tests/integration/output/chunkFileName-multi/src/lib1.js b/tests/integration/output/chunkFileName-multi/src/lib1.js
@@ -0,0 +1,4 @@
+export default async function main() {
+  const { foo } = await import('./shared.js');
+  return foo;
+}
diff --git a/tests/integration/output/chunkFileName-multi/src/lib2.js b/tests/integration/output/chunkFileName-multi/src/lib2.js
@@ -0,0 +1,4 @@
+export default async function main() {
+  const { bar } = await import('./shared.js');
+  return bar;
+}
diff --git a/tests/integration/output/chunkFileName-multi/src/shared.js b/tests/integration/output/chunkFileName-multi/src/shared.js
@@ -0,0 +1,2 @@
+export const foo = 'foo';
+export const bar = 'bar';
diff --git a/tests/integration/output/chunkFileName-single/package.json b/tests/integration/output/chunkFileName-single/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "minify-output-chunk-file-name-single-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}
diff --git a/tests/integration/output/chunkFileName-single/rslib.config.ts b/tests/integration/output/chunkFileName-single/rslib.config.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from '@rslib/core';
+import { generateBundleEsmConfig } from 'test-helper';
+
+export default defineConfig({
+  lib: [
+    generateBundleEsmConfig({
+      source: {
+        entry: {
+          lib1: './src/lib1.js',
+        },
+      },
+    }),
+  ],
+});
diff --git a/tests/integration/output/chunkFileName-single/src/lib1.js b/tests/integration/output/chunkFileName-single/src/lib1.js
@@ -0,0 +1,4 @@
+export default async function main() {
+  const { foo } = await import('./shared.js');
+  return foo;
+}
diff --git a/tests/integration/output/chunkFileName-single/src/shared.js b/tests/integration/output/chunkFileName-single/src/shared.js
@@ -0,0 +1,2 @@
+export const foo = 'foo';
+export const bar = 'bar';
diff --git a/tests/integration/output/index.test.ts b/tests/integration/output/index.test.ts
@@ -0,0 +1,35 @@
+import { basename, join } from 'node:path';
+import { describe, expect, test } from '@rstest/core';
+import { buildAndGetResults } from 'test-helper';
+
+describe('output config', () => {
+  describe('chunkFileName', () => {
+    test('should prefix index for multi-compiler builds', async () => {
+      const fixturePath = join(__dirname, 'chunkFileName-multi');
+      const { files, rspackConfig } = await buildAndGetResults({ fixturePath });
+
+      expect(rspackConfig.length).toBeGreaterThanOrEqual(2);
+      expect(rspackConfig[0]!.output?.chunkFilename).toBe('0~[name].js');
+      expect(rspackConfig[1]!.output?.chunkFilename).toBe('1~[name].js');
+
+      const esm0BaseNames = (files.esm0 ?? []).map((p) => basename(p));
+      const esm1BaseNames = (files.esm1 ?? []).map((p) => basename(p));
+
+      expect(esm0BaseNames.some((n) => /^0~.+\.js$/.test(n))).toBeTruthy();
+      expect(esm1BaseNames.some((n) => /^1~.+\.js$/.test(n))).toBeTruthy();
+    });
+
+    test('should not prefix index for single-compiler builds', async () => {
+      const fixturePath = join(__dirname, 'chunkFileName-single');
+      const { files } = await buildAndGetResults({ fixturePath });
+
+      const esmBaseNames = (files.esm ?? []).map((p) => basename(p));
+      expect(esmBaseNames.some((n) => /^\d+~.+\.js$/.test(n))).toBeFalsy();
+      expect(
+        esmBaseNames.some(
+          (n) => /^\d+\.js$/.test(n) || /shared.*\.js$/.test(n),
+        ),
+      ).toBeTruthy();
+    });
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export const foo = 'foo';`
	`2`	`+export const bar = 'bar';`