@modern-js/builder 3.3.0 → 3.5.0

package/dist/cjs/createBuilder.js

@@ -56,9 +56,11 @@ async function parseConfig(builderConfig, options) {
             autoprefixer: builderConfig.tools?.autoprefixer
         }));
     }
-    const enableRsc = builderConfig.server?.rsc ?? false;
+    const rscConfig = builderConfig.server?.rsc ?? false;
+    const enableRsc = Boolean(rscConfig);
     if (enableRsc) {
-        const rscPlugins = await (0, rscConfig_js_namespaceObject.getRscPlugins)(enableRsc, options.internalDirectory);
+        const rscEnvironments = 'object' == typeof rscConfig ? rscConfig.environments : void 0;
+        const rscPlugins = await (0, rscConfig_js_namespaceObject.getRscPlugins)(enableRsc, options.internalDirectory, rscEnvironments);
         rsbuildPlugins.push(...rscPlugins);
     } else rsbuildPlugins.push((0, rscClientBrowserFallback_js_namespaceObject.rscClientBrowserFallbackPlugin)());
     return {

package/dist/cjs/plugins/rscConfig.js

@@ -133,12 +133,15 @@ function pluginRscConfig() {
         }
     };
 }
-async function getRscPlugins(enableRsc, internalDirectory) {
+async function getRscPlugins(enableRsc, internalDirectory, environments) {
     if (enableRsc) {
         const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
         const { pluginRSC } = await import("rsbuild-plugin-rsc");
         return [
             pluginRSC({
+                ...environments ? {
+                    environments
+                } : {},
                 layers: {
                     rsc: [
                         /render[/\\].*[/\\]server[/\\]rsc/,

package/dist/esm/createBuilder.mjs

@@ -23,9 +23,11 @@ async function parseConfig(builderConfig, options) {
             autoprefixer: builderConfig.tools?.autoprefixer
         }));
     }
-    const enableRsc = builderConfig.server?.rsc ?? false;
+    const rscConfig = builderConfig.server?.rsc ?? false;
+    const enableRsc = Boolean(rscConfig);
     if (enableRsc) {
-        const rscPlugins = await getRscPlugins(enableRsc, options.internalDirectory);
+        const rscEnvironments = 'object' == typeof rscConfig ? rscConfig.environments : void 0;
+        const rscPlugins = await getRscPlugins(enableRsc, options.internalDirectory, rscEnvironments);
         rsbuildPlugins.push(...rscPlugins);
     } else rsbuildPlugins.push(rscClientBrowserFallbackPlugin());
     return {

package/dist/esm/plugins/rscConfig.mjs

@@ -90,12 +90,15 @@ function pluginRscConfig() {
         }
     };
 }
-async function getRscPlugins(enableRsc, internalDirectory) {
+async function getRscPlugins(enableRsc, internalDirectory, environments) {
     if (enableRsc) {
         const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
         const { pluginRSC } = await import("rsbuild-plugin-rsc");
         return [
             pluginRSC({
+                ...environments ? {
+                    environments
+                } : {},
                 layers: {
                     rsc: [
                         /render[/\\].*[/\\]server[/\\]rsc/,

package/dist/esm-node/createBuilder.mjs

@@ -24,9 +24,11 @@ async function parseConfig(builderConfig, options) {
             autoprefixer: builderConfig.tools?.autoprefixer
         }));
     }
-    const enableRsc = builderConfig.server?.rsc ?? false;
+    const rscConfig = builderConfig.server?.rsc ?? false;
+    const enableRsc = Boolean(rscConfig);
     if (enableRsc) {
-        const rscPlugins = await getRscPlugins(enableRsc, options.internalDirectory);
+        const rscEnvironments = 'object' == typeof rscConfig ? rscConfig.environments : void 0;
+        const rscPlugins = await getRscPlugins(enableRsc, options.internalDirectory, rscEnvironments);
         rsbuildPlugins.push(...rscPlugins);
     } else rsbuildPlugins.push(rscClientBrowserFallbackPlugin());
     return {

package/dist/esm-node/plugins/rscConfig.mjs

@@ -95,12 +95,15 @@ function pluginRscConfig() {
         }
     };
 }
-async function getRscPlugins(enableRsc, internalDirectory) {
+async function getRscPlugins(enableRsc, internalDirectory, environments) {
     if (enableRsc) {
         const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
         const { pluginRSC } = await import("rsbuild-plugin-rsc");
         return [
             pluginRSC({
+                ...environments ? {
+                    environments
+                } : {},
                 layers: {
                     rsc: [
                         /render[/\\].*[/\\]server[/\\]rsc/,

package/dist/types/plugins/rscConfig.d.ts

@@ -13,6 +13,15 @@ export declare function pluginRscConfig(): RsbuildPlugin;
  * Get RSC plugins based on configuration
  * @param enableRsc - Whether RSC is enabled
  * @param internalDirectory - Internal directory path for route matching
+ * @param environments - Optional mapping of the RSC plugin's `server`/`client`
+ *   environments onto existing Rsbuild environment names. When omitted, the RSC
+ *   plugin uses its defaults (`'server'` / `'client'`). Frameworks that already
+ *   declare their own environments can point RSC at them instead of having the
+ *   plugin create new empty environments (which would otherwise fall back to the
+ *   default `./src` entry and fail to resolve).
  * @returns Array of RSC-related plugins
  */
-export declare function getRscPlugins(enableRsc: boolean, internalDirectory: string): Promise<RsbuildPlugin[]>;
+export declare function getRscPlugins(enableRsc: boolean, internalDirectory: string, environments?: {
+    server?: string;
+    client?: string;
+}): Promise<RsbuildPlugin[]>;

package/dist/types/types.d.ts

@@ -91,7 +91,7 @@ export type BuilderExtraConfig = {
          */
         devServer?: ToolsDevServerConfig;
         /**
-         * Modify the options of [fork-ts-checker-webpack-plugin](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin).
+         * Modify the options of [ts-checker-rspack-plugin](https://github.com/rstackjs/ts-checker-rspack-plugin).
          */
         tsChecker?: PluginTypeCheckerOptions['tsCheckerOptions'];
         /**
@@ -235,6 +235,30 @@ export type DistPath = DistPathConfig & {
     server?: string;
     worker?: string;
 };
+/**
+ * RSC (React Server Components) configuration.
+ *
+ * - `true` / `false`: enable or disable RSC with the default `'server'` and
+ *   `'client'` environment names.
+ * - object form: enable RSC and customize which Rsbuild environments the RSC
+ *   plugin attaches to. Frameworks whose environment names differ from the
+ *   defaults (e.g. multi-page builders that already declare their own
+ *   server/client environments) can map RSC onto those existing environments
+ *   instead of letting the plugin create new empty `'server'`/`'client'` ones.
+ */
+export type RscConfig = boolean | {
+    /**
+     * Map the RSC plugin's server/client environments onto existing Rsbuild
+     * environment names. Omitted keys fall back to the defaults
+     * (`'server'` / `'client'`).
+     */
+    environments?: {
+        /** Rsbuild environment name for the React Server Components (server) bundle. @default 'server' */
+        server?: string;
+        /** Rsbuild environment name for the client (browser) bundle. @default 'client' */
+        client?: string;
+    };
+};
 export type BuilderConfig = {
     dev?: Omit<DevConfig, 'setupMiddlewares'> & {
         server?: {
@@ -251,7 +275,7 @@ export type BuilderConfig = {
         distPath?: DistPath;
     };
     server?: {
-        rsc?: boolean;
+        rsc?: RscConfig;
         port?: number;
         cors?: ServerConfig['cors'];
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/builder",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "description": "A builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "dist"
   ],
   "dependencies": {
-    "@rsbuild/core": "2.0.10",
+    "@rsbuild/core": "2.1.0",
     "@rsbuild/plugin-assets-retry": "2.0.1",
     "@rsbuild/plugin-check-syntax": "2.0.0",
     "@rsbuild/plugin-css-minimizer": "2.0.1",
@@ -36,9 +36,9 @@
     "@rsbuild/plugin-sass": "1.5.3",
     "@rsbuild/plugin-source-build": "1.0.6",
     "@rsbuild/plugin-svgr": "2.0.3",
-    "@rsbuild/plugin-type-check": "1.4.0",
+    "@rsbuild/plugin-type-check": "1.5.0",
     "@rsbuild/plugin-typed-css-modules": "1.2.3",
-    "@swc/core": "1.15.40",
+    "@swc/core": "1.15.41",
     "@swc/helpers": "^0.5.17",
     "autoprefixer": "10.4.27",
     "browserslist": "4.28.2",
@@ -54,20 +54,20 @@
     "postcss-media-minmax": "5.0.0",
     "postcss-nesting": "12.1.5",
     "postcss-page-break": "3.0.4",
-    "rsbuild-plugin-rsc": "0.1.0",
+    "rsbuild-plugin-rsc": "0.1.1",
     "rspack-manifest-plugin": "5.2.2",
     "ts-deepmerge": "7.0.3",
-    "@modern-js/utils": "3.3.0"
+    "@modern-js/utils": "3.5.0"
   },
   "devDependencies": {
-    "@rslib/core": "0.22.0",
+    "@rslib/core": "0.23.0",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/lodash": "^4.17.24",
     "react": "^19.2.7",
-    "terser": "^5.46.2",
+    "terser": "^5.48.0",
     "typescript": "^5.3.0",
     "@modern-js/rslib": "2.68.10",
-    "@modern-js/types": "3.3.0",
+    "@modern-js/types": "3.5.0",
     "@scripts/rstest-config": "2.66.0"
   },
   "publishConfig": {