feat!: target default to node (#398)

web-infra-dev · Nov 11, 2024 · 7dd9a48 · 7dd9a48
1 parent b821370
commit 7dd9a48
Show file tree

Hide file tree

Showing 83 changed files with 366 additions and 129 deletions.
diff --git a/examples/express-plugin/rslib.config.ts b/examples/express-plugin/rslib.config.ts
@@ -27,7 +27,4 @@ export default defineConfig({
       },
     },
   ],
-  output: {
-    target: 'node',
-  },
 });
diff --git a/examples/module-federation/mf-react-component/rslib.config.ts b/examples/module-federation/mf-react-component/rslib.config.ts
@@ -55,5 +55,8 @@ export default defineConfig({
       ],
     },
   ],
+  output: {
+    target: 'web',
+  },
   plugins: [pluginReact()],
 });
diff --git a/examples/react-component-bundle-false/rslib.config.ts b/examples/react-component-bundle-false/rslib.config.ts
@@ -35,6 +35,9 @@ export default defineConfig({
       },
     },
   ],
+  output: {
+    target: 'web',
+  },
   plugins: [
     pluginReact({
       swcReactOptions: {

diff --git a/examples/react-component-bundle/rslib.config.ts b/examples/react-component-bundle/rslib.config.ts
@@ -33,6 +33,9 @@ export default defineConfig({
       },
     },
   ],
+  output: {
+    target: 'web',
+  },
   plugins: [
     pluginReact({
       swcReactOptions: {

diff --git a/examples/react-component-umd/rslib.config.ts b/examples/react-component-umd/rslib.config.ts
@@ -17,6 +17,9 @@ export default defineConfig({
       },
     },
   ],
+  output: {
+    target: 'web',
+  },
   plugins: [
     pluginReact({
       swcReactOptions: {

diff --git a/packages/core/rslib.config.ts b/packages/core/rslib.config.ts
@@ -21,6 +21,7 @@ export default defineConfig({
     },
   },
   output: {
+    // TODO: Remove this after bumping Rslib
     target: 'node',
     externals: {
       picocolors: '../compiled/picocolors/index.js',

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -453,6 +453,7 @@ export async function createConstantRsbuildConfig(): Promise<RsbuildConfig> {
       },
     },
     output: {
+      target: 'node',
       filenameHash: false,
       distPath: {
         js: './',
@@ -558,7 +559,6 @@ const composeFormatConfig = ({
             },
             output: {
               asyncChunks: false,
-
               library: umdName
                 ? {
                     type: 'umd',
@@ -713,8 +713,8 @@ const composeAutoExtensionConfig = (
 };
 
 const composeSyntaxConfig = (
+  target: RsbuildConfigOutputTarget,
   syntax?: Syntax,
-  target?: RsbuildConfigOutputTarget,
 ): RsbuildConfig => {
   // Defaults to ESNext, Rslib will assume all of the latest JavaScript and CSS features are supported.
   if (syntax) {
@@ -941,31 +941,40 @@ const composeDtsConfig = async (
 };
 
 const composeTargetConfig = (
-  target: RsbuildConfigOutputTarget = 'web',
-): RsbuildConfig => {
+  target: RsbuildConfigOutputTarget = 'node',
+): {
+  config: RsbuildConfig;
+  target: RsbuildConfigOutputTarget;
+} => {
   switch (target) {
     case 'web':
       return {
-        tools: {
-          rspack: {
-            target: ['web'],
+        config: {
+          tools: {
+            rspack: {
+              target: ['web'],
+            },
           },
         },
+        target: 'web',
       };
     case 'node':
       return {
-        tools: {
-          rspack: {
-            target: ['node'],
+        config: {
+          tools: {
+            rspack: {
+              target: ['node'],
+            },
+          },
+          output: {
+            // When output.target is 'node', Node.js's built-in will be treated as externals of type `node-commonjs`.
+            // Simply override the built-in modules to make them external.
+            // https://github.com/webpack/webpack/blob/dd44b206a9c50f4b4cb4d134e1a0bd0387b159a3/lib/node/NodeTargetPlugin.js#L81
+            externals: nodeBuiltInModules,
+            target: 'node',
           },
         },
-        output: {
-          // When output.target is 'node', Node.js's built-in will be treated as externals of type `node-commonjs`.
-          // Simply override the built-in modules to make them external.
-          // https://github.com/webpack/webpack/blob/dd44b206a9c50f4b4cb4d134e1a0bd0387b159a3/lib/node/NodeTargetPlugin.js#L81
-          externals: nodeBuiltInModules,
-          target: 'node',
-        },
+        target: 'node',
       };
     // TODO: Support `neutral` target, however Rsbuild don't list it as an option in the target field.
     // case 'neutral':
@@ -1067,11 +1076,10 @@ async function composeLibRsbuildConfig(config: LibConfig, configPath: string) {
     cssModulesAuto,
     bundle,
   );
-  const targetConfig = composeTargetConfig(config.output?.target);
-  const syntaxConfig = composeSyntaxConfig(
-    config?.syntax,
+  const { config: targetConfig, target } = composeTargetConfig(
     config.output?.target,
   );
+  const syntaxConfig = composeSyntaxConfig(target, config?.syntax);
   const autoExternalConfig = composeAutoExternalConfig({
     autoExternal,
     pkgJson,

diff --git a/packages/core/src/utils/syntax.ts b/packages/core/src/utils/syntax.ts
@@ -26,10 +26,6 @@ export const LATEST_TARGET_VERSIONS: Record<
 };
 
 const calcEsnextBrowserslistByTarget = (target: RsbuildConfigOutputTarget) => {
-  if (!target) {
-    return [...LATEST_TARGET_VERSIONS.node, ...LATEST_TARGET_VERSIONS.web];
-  }
-
   if (target === 'node') {
     return LATEST_TARGET_VERSIONS.node;
   }
@@ -195,7 +191,7 @@ export function transformSyntaxToRspackTarget(
 
 export function transformSyntaxToBrowserslist(
   syntax: Syntax,
-  target?: NonNullable<RsbuildConfig['output']>['target'],
+  target: NonNullable<RsbuildConfig['output']>['target'],
 ): NonNullable<NonNullable<RsbuildConfig['output']>['overrideBrowserslist']> {
   const handleSyntaxItem = (
     syntaxItem: EcmaScriptVersion | string,
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,4 @@ export default defineConfig({ @@
           },
         },
       ],
-      output: {
-        target: 'node',
-      },
     });