fix: should respect output.filename.js config (#108)

Author: Timeless0911

e2e/cases/auto-extension/index.test.ts

@@ -33,3 +33,23 @@ describe('autoExtension: false', () => {
     expect(extname(entryFiles.cjs!)).toEqual('.js');
   });
 });
+
+describe('should respect output.filename.js to override builtin logic', () => {
+  test('type is commonjs', async () => {
+    const fixturePath = join(__dirname, 'type-commonjs', 'config-override');
+    const { entryFiles } = await buildAndGetResults(fixturePath);
+    expect(extname(entryFiles.esm!)).toEqual('.mjs');
+    expect(entryFiles.cjs).toMatchInlineSnapshot(
+      `"<ROOT>/e2e/cases/auto-extension/type-commonjs/config-override/dist/cjs/index.babf05f8.js"`,
+    );
+  });
+
+  test('type is module', async () => {
+    const fixturePath = join(__dirname, 'type-module', 'config-override');
+    const { entryFiles } = await buildAndGetResults(fixturePath);
+    expect(entryFiles.esm).toMatchInlineSnapshot(
+      `"<ROOT>/e2e/cases/auto-extension/type-module/config-override/dist/esm/index.4ca64135.js"`,
+    );
+    expect(extname(entryFiles.cjs!)).toEqual('.cjs');
+  });
+});

e2e/cases/auto-extension/type-commonjs/config-override/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "auto-extension-config-override-commonjs-test",
+  "version": "1.0.0",
+  "private": true
+}

e2e/cases/auto-extension/type-commonjs/config-override/rslib.config.ts

@@ -0,0 +1,27 @@
+import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  lib: [
+    generateBundleEsmConfig({
+      autoExtension: false,
+      output: {
+        filename: {
+          js: '[name].mjs',
+        },
+      },
+    }),
+    generateBundleCjsConfig({
+      output: {
+        filename: {
+          js: '[name].[contenthash:8].js',
+        },
+      },
+    }),
+  ],
+  source: {
+    entry: {
+      index: '../../__fixtures__/src/index.ts',
+    },
+  },
+});

e2e/cases/auto-extension/type-module/config-override/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "auto-extension-config-override-module-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}

e2e/cases/auto-extension/type-module/config-override/rslib.config.ts

@@ -0,0 +1,27 @@
+import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  lib: [
+    generateBundleEsmConfig({
+      output: {
+        filename: {
+          js: '[name].[contenthash:8].js',
+        },
+      },
+    }),
+    generateBundleCjsConfig({
+      autoExtension: false,
+      output: {
+        filename: {
+          js: '[name].cjs',
+        },
+      },
+    }),
+  ],
+  source: {
+    entry: {
+      index: '../../__fixtures__/src/index.ts',
+    },
+  },
+});

packages/core/src/config.ts

@@ -240,7 +240,7 @@ const composeFormatConfig = (format: Format): RsbuildConfig => {
 };
 
 const composeAutoExtensionConfig = (
-  format: Format,
+  config: LibConfig,
   autoExtension: boolean,
   pkgJson?: PkgJson,
 ): {
@@ -249,7 +249,7 @@ const composeAutoExtensionConfig = (
   dtsExtension: string;
 } => {
   const { jsExtension, dtsExtension } = getDefaultExtension({
-    format,
+    format: config.format!,
     pkgJson,
     autoExtension,
   });
@@ -259,6 +259,7 @@ const composeAutoExtensionConfig = (
       output: {
         filename: {
           js: `[name]${jsExtension}`,
+          ...config.output?.filename,
         },
       },
     },
@@ -494,7 +495,7 @@ async function composeLibRsbuildConfig(
     config: autoExtensionConfig,
     jsExtension,
     dtsExtension,
-  } = composeAutoExtensionConfig(format!, autoExtension, pkgJson);
+  } = composeAutoExtensionConfig(config, autoExtension, pkgJson);
   const bundleConfig = composeBundleConfig(jsExtension, config.bundle);
   const targetConfig = composeTargetConfig(config.output?.target);
   const syntaxConfig = composeSyntaxConfig(