web-infra-dev · zllkjc · Jun 26, 2025 · Jun 24, 2025 · Jun 24, 2025 · Jun 24, 2025
diff --git a/.changeset/young-coins-bet.md b/.changeset/young-coins-bet.md
@@ -0,0 +1,15 @@
+---
+'@modern-js/plugin-router-v5': patch
+'@modern-js/plugin-router-v7': patch
+'@modern-js/plugin-garfish': patch
+'@modern-js/runtime': patch
+'@modern-js/plugin-testing': patch
+'@modern-js/plugin-express': patch
+'@modern-js/plugin-state': patch
+'@modern-js/app-tools': patch
+'@modern-js/plugin-koa': patch
+'@modern-js/uni-builder': patch
+---
+
+feat: support resolve configuration in rsbuild.
+feat: 支持 rsbuild 的 resolve 配置。
diff --git a/packages/cli/plugin-bff/src/cli.ts b/packages/cli/plugin-bff/src/cli.ts
@@ -3,7 +3,13 @@ import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 import { ApiRouter } from '@modern-js/bff-core';
 import { compile } from '@modern-js/server-utils';
 import type { ServerRoute } from '@modern-js/types';
-import { fs, API_DIR, SHARED_DIR, normalizeOutputPath } from '@modern-js/utils';
+import {
+  fs,
+  API_DIR,
+  type AliasOption,
+  SHARED_DIR,
+  normalizeOutputPath,
+} from '@modern-js/utils';
 import clientGenerator from './utils/clientGenerator';
 import pluginGenerator from './utils/pluginGenerator';
 import runtimeGenerator from './utils/runtimeGenerator';
@@ -43,14 +49,15 @@ export const bffPlugin = (): CliPlugin<AppTools> => ({
 
       const { server } = modernConfig;
       const { alias } = modernConfig.source;
+      const { alias: resolveAlias } = modernConfig.resolve;
       const { babel } = modernConfig.tools;
 
       if (sourceDirs.length > 0) {
         await compile(
           appDirectory,
           {
             server,
-            alias,
+            alias: { ...alias, ...(resolveAlias as AliasOption) },
             babelConfig: babel,
           },
           {

diff --git a/packages/cli/uni-builder/src/shared/parseCommonConfig.ts b/packages/cli/uni-builder/src/shared/parseCommonConfig.ts
@@ -136,6 +136,7 @@ export async function parseCommonConfig(
       ...toolsConfig
     } = {},
     environments = {},
+    resolve = {},
   } = uniBuilderConfig;
 
   const rsbuildConfig: RsbuildConfig = {
@@ -146,6 +147,7 @@ export async function parseCommonConfig(
       sourceMap,
       ...outputConfig,
     },
+    resolve,
     source: {
       alias: alias as unknown as SourceConfig['alias'],
       ...sourceConfig,
@@ -157,6 +159,14 @@ export async function parseCommonConfig(
     environments,
   };
 
+  /**
+   * 在老版本中，默认 source.alias 为空对象。Rsbuild 新版本推荐使用 resolve.alias 代替 source.alias
+   * 因此如果 alias 为空对象，则删除 source.alias，避免在默认情况下出现警告
+   */
+  if (typeof alias === 'object' && Object.keys(alias).length === 0) {
+    delete rsbuildConfig.source?.alias;
+  }
+
   rsbuildConfig.tools!.htmlPlugin = htmlPlugin as ToolsConfig['htmlPlugin'];
 
   rsbuildConfig.tools!.lightningcssLoader ??= false;

diff --git a/packages/cli/uni-builder/src/types.ts b/packages/cli/uni-builder/src/types.ts
@@ -461,6 +461,7 @@ export type UniBuilderConfig = {
   performance?: RsbuildConfig['performance'];
   security?: Omit<SecurityConfig, 'sri'>;
   tools?: Omit<ToolsConfig, 'htmlPlugin'>;
+  resolve?: RsbuildConfig['resolve'];
   source?: Omit<SourceConfig, 'alias' | 'transformImport'>;
   // plugins is a new field, should avoid adding modern plugin by mistake
   plugins?: RsbuildPlugins;

diff --git a/packages/cli/uni-builder/tests/__snapshots__/parseConfig.test.ts.snap b/packages/cli/uni-builder/tests/__snapshots__/parseConfig.test.ts.snap
@@ -32,6 +32,7 @@ exports[`parseCommonConfig > dev.xxx 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "compress": false,
@@ -94,6 +95,7 @@ exports[`parseCommonConfig > dev.xxx 2`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -147,6 +149,7 @@ exports[`parseCommonConfig > html.faviconByEntries 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -202,6 +205,7 @@ exports[`parseCommonConfig > html.faviconByEntries 2`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -260,6 +264,7 @@ exports[`parseCommonConfig > html.faviconByEntries 3`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -315,6 +320,7 @@ exports[`parseCommonConfig > html.metaByEntries 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -377,6 +383,7 @@ exports[`parseCommonConfig > html.metaByEntries 2`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -432,6 +439,7 @@ exports[`parseCommonConfig > html.templateByEntries 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -490,6 +498,7 @@ exports[`parseCommonConfig > html.templateByEntries 2`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -545,6 +554,7 @@ exports[`parseCommonConfig > html.templateParametersByEntries 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -605,6 +615,7 @@ exports[`parseCommonConfig > html.templateParametersByEntries 2`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -662,6 +673,7 @@ exports[`parseCommonConfig > html.titleByEntries 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -719,6 +731,7 @@ exports[`parseCommonConfig > html.titleByEntries 2`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -776,6 +789,7 @@ exports[`parseCommonConfig > output.cssModuleLocalIdentName 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -833,6 +847,7 @@ exports[`parseCommonConfig > output.disableCssModuleExtension 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -886,6 +901,7 @@ exports[`parseCommonConfig > output.enableInlineScripts 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,
@@ -937,6 +953,7 @@ exports[`parseCommonConfig > output.enableInlineStyles 1`] = `
   },
   "performance": {},
   "plugins": [],
+  "resolve": {},
   "security": {},
   "server": {
     "htmlFallback": false,

diff --git a/packages/runtime/plugin-garfish/src/cli/index.ts b/packages/runtime/plugin-garfish/src/cli/index.ts
@@ -118,7 +118,7 @@ export const garfishPlugin = (): CliPluginFuture<AppTools<'shared'>> => ({
         output: {
           disableCssExtract,
         },
-        source: {
+        resolve: {
           alias: {
             [`@${metaName}/runtime/garfish`]: `@${metaName}/plugin-garfish/runtime`,
           },

diff --git a/packages/runtime/plugin-router-v5/src/cli/index.ts b/packages/runtime/plugin-router-v5/src/cli/index.ts
@@ -44,7 +44,7 @@ export const routerPlugin = (): CliPluginFuture<AppTools> => ({
       );
 
       return {
-        source: {
+        resolve: {
           alias: {
             [`@${metaName}/runtime/router-v5`]: routerExportsUtils.getPath(),
           },

diff --git a/packages/runtime/plugin-router-v5/tests/index.test.ts b/packages/runtime/plugin-router-v5/tests/index.test.ts
@@ -61,7 +61,7 @@ describe('cli-router-legacy', () => {
     const config = await api.getHooks().config.call();
     expect(
       config.find(
-        (item: any) => item.source.alias['@modern-js/runtime/plugins'],
+        (item: any) => item.resolve.alias['@modern-js/runtime/plugins'],
       ),
     ).toBeTruthy();
   });

diff --git a/packages/runtime/plugin-router-v7/src/cli/index.ts b/packages/runtime/plugin-router-v7/src/cli/index.ts
@@ -18,7 +18,7 @@ export const routerPlugin = (): CliPluginFuture<AppTools> => ({
         });
       }
       return {
-        source: {
+        resolve: {
           alias: {
             'react-router-dom$': require
               .resolve('../runtime')
@@ -30,6 +30,8 @@ export const routerPlugin = (): CliPluginFuture<AppTools> => ({
               .resolve('../runtime')
               .replace(/\/cjs\//, '/esm/'),
           },
+        },
+        source: {
           globalVars: {
             'process.env._MODERN_ROUTER_VERSION': 'v7',
           },

diff --git a/packages/runtime/plugin-runtime/src/cli/alias.ts b/packages/runtime/plugin-runtime/src/cli/alias.ts
@@ -35,7 +35,7 @@ export const builderPluginAlias = ({
         }
       });
       return mergeRsbuildConfig(userConfig, {
-        source: {
+        resolve: {
           alias: { ...entrypointsAlias, ...mainEntrypointsAlias },
         },
       });

diff --git a/packages/runtime/plugin-runtime/src/cli/index.ts b/packages/runtime/plugin-runtime/src/cli/index.ts
@@ -91,7 +91,7 @@ export const runtimePlugin = (params?: {
       return {
         runtime: {},
         runtimeByEntries: {},
-        source: {
+        resolve: {
           alias: {
             /**
              * twin.macro inserts styled-components into the code during the compilation process
@@ -112,6 +112,8 @@ export const runtimePlugin = (params?: {
             ),
             '@meta/runtime$': require.resolve('@modern-js/runtime'),
           },
+        },
+        source: {
           globalVars: {
             'process.env.IS_REACT18': process.env.IS_REACT18,
           },

diff --git a/packages/runtime/plugin-runtime/src/cli/ssr/index.ts b/packages/runtime/plugin-runtime/src/cli/ssr/index.ts
@@ -133,7 +133,7 @@ export const ssrPlugin = (): CliPluginFuture<AppTools<'shared'>> => ({
 
       return {
         builderPlugins: [ssrBuilderPlugin(api)],
-        source: {
+        resolve: {
           alias: {
             // ensure that all packages use the same storage in @modern-js/runtime-utils/node
             '@modern-js/runtime-utils/node$': require

diff --git a/packages/runtime/plugin-runtime/tests/router/index.test.ts b/packages/runtime/plugin-runtime/tests/router/index.test.ts
@@ -30,7 +30,7 @@ describe('cli-router', () => {
     const config = await runner.config();
     expect(
       config.find(
-        (item: any) => item.source.alias['@modern-js/runtime/plugins'],
+        (item: any) => item.resolve.alias['@modern-js/runtime/plugins'],
       ),
     ).toBeTruthy();
   });

diff --git a/packages/runtime/plugin-state/src/cli/index.ts b/packages/runtime/plugin-state/src/cli/index.ts
@@ -32,7 +32,7 @@ export const statePlugin = (): CliPluginFuture<AppTools<'shared'>> => ({
     api.config(() => {
       const { metaName } = api.getAppContext();
       return {
-        source: {
+        resolve: {
           alias: {
             [`@${metaName}/runtime/model`]: `@${metaName}/plugin-state/runtime`,
           },

diff --git a/packages/runtime/plugin-testing/src/base/config/index.ts b/packages/runtime/plugin-testing/src/base/config/index.ts
@@ -25,6 +25,9 @@ export type UserConfig = {
   source?: {
     alias?: AliasOption;
   };
+  resolve?: {
+    alias?: AliasOption;
+  };
   testing?: TestConfig;
   tools?: {
     jest: JestConfig | ((config: JestConfig) => JestConfig);

diff --git a/packages/runtime/plugin-testing/src/cli/index.ts b/packages/runtime/plugin-testing/src/cli/index.ts
@@ -92,7 +92,7 @@ export const testingPlugin = (): CliPlugin<{
           );
 
           return {
-            source: {
+            resolve: {
               alias: {
                 // The module-tools alias configuration is different and more specific than app-tools.
                 // So for the time being, the @ alias is configured here.

diff --git a/packages/server/plugin-express/src/cli/index.ts b/packages/server/plugin-express/src/cli/index.ts
@@ -34,7 +34,7 @@ export const expressPlugin = (): CliPlugin<AppTools> => ({
             : '@modern-js/plugin-express/runtime';
 
         return {
-          source: {
+          resolve: {
             alias: {
               '@modern-js/runtime/server': runtimePath,
               '@modern-js/runtime/express': runtimePath,

diff --git a/packages/server/plugin-koa/src/cli/index.ts b/packages/server/plugin-koa/src/cli/index.ts
@@ -39,7 +39,7 @@ export const koaPlugin = (): CliPlugin<AppTools> => ({
               '@modern-js/runtime/koa': runtimePath,
             },
           },
-          source: {
+          resolve: {
             alias: {
               '@modern-js/runtime/server$': alias,
               '@modern-js/runtime/koa': alias,

diff --git a/packages/solutions/app-tools/src/builder/generator/createBuilderProviderConfig.ts b/packages/solutions/app-tools/src/builder/generator/createBuilderProviderConfig.ts
@@ -31,6 +31,9 @@ export function createBuilderProviderConfig<B extends Bundler>(
   const config = {
     ...resolveConfig,
     plugins: [],
+    resolve: {
+      ...resolveConfig.resolve,
+    },
     dev: {
       ...resolveConfig.dev,
       port: appContext.port,