@modern-js/builder 3.0.1 → 3.0.3

package/dist/cjs/createBuilder.js

@@ -28,7 +28,7 @@ __webpack_require__.d(__webpack_exports__, {
     createRspackBuilder: ()=>createRspackBuilder
 });
 const core_namespaceObject = require("@rsbuild/core");
-const rsbuild_rsc_plugin_js_namespaceObject = require("./rsc/plugins/rsbuild-rsc-plugin.js");
+const rscConfig_js_namespaceObject = require("./plugins/rscConfig.js");
 const parseCommonConfig_js_namespaceObject = require("./shared/parseCommonConfig.js");
 const rscClientBrowserFallback_js_namespaceObject = require("./shared/rsc/rscClientBrowserFallback.js");
 async function parseConfig(builderConfig, options) {
@@ -54,13 +54,8 @@ async function parseConfig(builderConfig, options) {
     }
     const enableRsc = builderConfig.server?.rsc ?? false;
     if (enableRsc) {
-        const { rscClientRuntimePath, rscServerRuntimePath, internalDirectory } = options;
-        rsbuildPlugins.push((0, rsbuild_rsc_plugin_js_namespaceObject.rsbuildRscPlugin)({
-            appDir: options.cwd,
-            rscClientRuntimePath,
-            rscServerRuntimePath,
-            internalDirectory
-        }));
+        const rscPlugins = await (0, rscConfig_js_namespaceObject.getRscPlugins)(enableRsc, options.internalDirectory);
+        rsbuildPlugins.push(...rscPlugins);
     } else rsbuildPlugins.push((0, rscClientBrowserFallback_js_namespaceObject.rscClientBrowserFallbackPlugin)());
     return {
         rsbuildConfig,

package/dist/cjs/plugins/environmentDefaults.js

@@ -51,9 +51,9 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
                         }
                     };
                 }
-                if (config.environments?.node) {
+                if (config.environments?.server) {
                     compatConfig.environments ??= {};
-                    compatConfig.environments.node = {
+                    compatConfig.environments.server = {
                         output: {
                             emitAssets: false,
                             distPath: {
@@ -71,8 +71,8 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
             api.modifyRsbuildConfig({
                 handler: (config)=>{
                     const environmentNameOrder = [
-                        'web',
-                        'node',
+                        'client',
+                        'server',
                         'workerSSR'
                     ];
                     config.environments = Object.fromEntries(Object.entries(config.environments).sort((a1, a2)=>environmentNameOrder.includes(a1[0]) ? environmentNameOrder.indexOf(a1[0]) - environmentNameOrder.indexOf(a2[0]) : 1));

package/dist/cjs/plugins/rscConfig.js

@@ -0,0 +1,159 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    getRscPlugins: ()=>getRscPlugins,
+    pluginRscConfig: ()=>pluginRscConfig
+});
+const external_path_namespaceObject = require("path");
+var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+const ASYNC_STORAGE_PATTERN = /universal[/\\]async_storage/;
+const RSC_COMMON_LAYER = 'rsc-common';
+const ENTRY_NAME_VAR = '__MODERN_JS_ENTRY_NAME';
+const createVirtualModule = (content)=>`data:text/javascript,${encodeURIComponent(content)}`;
+const isAsyncStorageExclude = (exclude)=>{
+    if ('string' == typeof exclude) return ASYNC_STORAGE_PATTERN.test(exclude);
+    if (exclude instanceof RegExp) return exclude.test('universal/async_storage') || exclude.test('universal\\async_storage');
+    return false;
+};
+function pluginRscConfig() {
+    return {
+        name: 'builder:rsc-config',
+        setup (api) {
+            let layersCache = null;
+            const getLayers = async ()=>{
+                if (!layersCache) {
+                    const { Layers } = await import("rsbuild-plugin-rsc");
+                    layersCache = Layers;
+                }
+                return layersCache;
+            };
+            api.modifyBundlerChain({
+                handler: (chain, { isServer })=>{
+                    if (isServer) {
+                        const routeFilePattern = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.[tj]sx?$/;
+                        const appFilePattern = /[/\\]App\.[tj]sx?$/;
+                        const combinedPattern = new RegExp(`(${routeFilePattern.source}|${appFilePattern.source})`);
+                        let loaderPath;
+                        try {
+                            loaderPath = require.resolve('../shared/rsc/rsc-server-entry-loader');
+                        } catch  {
+                            loaderPath = external_path_default().resolve(__dirname, '../shared/rsc/rsc-server-entry-loader');
+                        }
+                        chain.module.rule('rsc-server-entry').test(/\.(tsx?|jsx?)$/).resource(combinedPattern).exclude.add(/node_modules/).end().use('rsc-server-entry-loader').loader(loaderPath).end();
+                    }
+                },
+                order: 'pre'
+            });
+            api.modifyRspackConfig(async (config, utils)=>{
+                const isServer = 'node' === config.target || 'node' === utils.target || utils.environment?.name === 'server';
+                if (!isServer) return;
+                const Layers = await getLayers();
+                if (config.entry) {
+                    const entries = config.entry;
+                    const newEntries = {};
+                    for (const [entryName, entryValue] of Object.entries(entries))if ('string' == typeof entryValue) newEntries[entryName] = {
+                        import: entryValue,
+                        layer: Layers.ssr
+                    };
+                    else if (Array.isArray(entryValue)) newEntries[entryName] = {
+                        import: entryValue,
+                        layer: Layers.ssr
+                    };
+                    else if ('object' == typeof entryValue && null !== entryValue) newEntries[entryName] = {
+                        ...entryValue,
+                        layer: Layers.ssr
+                    };
+                    else newEntries[entryName] = entryValue;
+                    config.entry = newEntries;
+                }
+                if (config.module?.rules) {
+                    const rules = config.module.rules;
+                    for (const rule of rules)if (rule.layer === Layers.rsc) {
+                        if (rule.exclude) {
+                            if (!Array.isArray(rule.exclude)) rule.exclude = [
+                                rule.exclude
+                            ];
+                        } else rule.exclude = [];
+                        const hasExclude = rule.exclude.some(isAsyncStorageExclude);
+                        if (!hasExclude) rule.exclude.push(ASYNC_STORAGE_PATTERN);
+                    }
+                    if (!Array.isArray(config.module.rules)) config.module.rules = [];
+                    config.module.rules.push({
+                        resource: ASYNC_STORAGE_PATTERN,
+                        layer: RSC_COMMON_LAYER
+                    });
+                }
+            });
+            api.modifyBundlerChain((chain, { isServer, isWebWorker })=>{
+                if (!isServer && !isWebWorker) {
+                    const entries = chain.entryPoints.entries();
+                    if (entries && 'object' == typeof entries) for (const entryName of Object.keys(entries)){
+                        const entryPoint = chain.entry(entryName);
+                        const code = `window.${ENTRY_NAME_VAR}="${entryName}";`;
+                        entryPoint.add(createVirtualModule(code));
+                    }
+                }
+            });
+        }
+    };
+}
+async function getRscPlugins(enableRsc, internalDirectory) {
+    if (enableRsc) {
+        const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
+        const { pluginRSC } = await import("rsbuild-plugin-rsc");
+        return [
+            pluginRSC({
+                layers: {
+                    rsc: [
+                        /render[/\\].*[/\\]server[/\\]rsc/,
+                        /AppProxy/,
+                        routesFileReg
+                    ]
+                }
+            }),
+            pluginRscConfig()
+        ];
+    }
+    return [];
+}
+exports.getRscPlugins = __webpack_exports__.getRscPlugins;
+exports.pluginRscConfig = __webpack_exports__.pluginRscConfig;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getRscPlugins",
+    "pluginRscConfig"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/plugins/runtimeChunk.js

@@ -41,7 +41,8 @@ const pluginRuntimeChunk = (disableInlineRuntimeChunk)=>({
             api.modifyRsbuildConfig((config)=>{
                 config.output ||= {};
                 if (disableInlineRuntimeChunk) return;
-                if (!config.output.inlineScripts) config.output.inlineScripts = utils_js_namespaceObject.RUNTIME_CHUNK_REGEX;
+                const originalConfig = api.getRsbuildConfig('original');
+                if (originalConfig.output?.inlineScripts === void 0) config.output.inlineScripts = utils_js_namespaceObject.RUNTIME_CHUNK_REGEX;
             });
         }
     });

package/dist/cjs/{rsc/rsc-css-loader.js → shared/rsc/rsc-server-entry-loader.js}

@@ -24,14 +24,13 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    default: ()=>rscCssLoader
+    default: ()=>rscServerEntryLoader
 });
-const external_common_js_namespaceObject = require("./common.js");
-function rscCssLoader(source) {
-    this._module && (0, external_common_js_namespaceObject.setRscBuildInfo)(this._module, {
-        isCssModule: true
-    });
-    return source;
+function rscServerEntryLoader(source) {
+    this.cacheable(true);
+    const hasServerEntryDirective = source.includes("'use server-entry'") || source.includes('"use server-entry"') || source.includes('`use server-entry`');
+    if (hasServerEntryDirective) return source;
+    return `'use server-entry';\n${source}`;
 }
 exports["default"] = __webpack_exports__["default"];
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/shared/rsc/rscClientBrowserFallback.js

@@ -50,7 +50,7 @@ function rscClientBrowserFallbackPlugin() {
             api.modifyRspackConfig((config)=>{
                 config.resolve ??= {};
                 config.resolve.fallback ??= {};
-                config.resolve.fallback['react-server-dom-webpack/client.browser'] = emptyModulePath;
+                config.resolve.fallback['react-server-dom-rspack/client.browser'] = emptyModulePath;
             });
         }
     };

package/dist/esm/createBuilder.mjs

@@ -1,5 +1,5 @@
 import { createRsbuild } from "@rsbuild/core";
-import { rsbuildRscPlugin } from "./rsc/plugins/rsbuild-rsc-plugin.mjs";
+import { getRscPlugins } from "./plugins/rscConfig.mjs";
 import { parseCommonConfig } from "./shared/parseCommonConfig.mjs";
 import { rscClientBrowserFallbackPlugin } from "./shared/rsc/rscClientBrowserFallback.mjs";
 async function parseConfig(builderConfig, options) {
@@ -25,13 +25,8 @@ async function parseConfig(builderConfig, options) {
     }
     const enableRsc = builderConfig.server?.rsc ?? false;
     if (enableRsc) {
-        const { rscClientRuntimePath, rscServerRuntimePath, internalDirectory } = options;
-        rsbuildPlugins.push(rsbuildRscPlugin({
-            appDir: options.cwd,
-            rscClientRuntimePath,
-            rscServerRuntimePath,
-            internalDirectory
-        }));
+        const rscPlugins = await getRscPlugins(enableRsc, options.internalDirectory);
+        rsbuildPlugins.push(...rscPlugins);
     } else rsbuildPlugins.push(rscClientBrowserFallbackPlugin());
     return {
         rsbuildConfig,

package/dist/esm/plugins/environmentDefaults.mjs

@@ -23,9 +23,9 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
                         }
                     };
                 }
-                if (config.environments?.node) {
+                if (config.environments?.server) {
                     compatConfig.environments ??= {};
-                    compatConfig.environments.node = {
+                    compatConfig.environments.server = {
                         output: {
                             emitAssets: false,
                             distPath: {
@@ -43,8 +43,8 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
             api.modifyRsbuildConfig({
                 handler: (config)=>{
                     const environmentNameOrder = [
-                        'web',
-                        'node',
+                        'client',
+                        'server',
                         'workerSSR'
                     ];
                     config.environments = Object.fromEntries(Object.entries(config.environments).sort((a1, a2)=>environmentNameOrder.includes(a1[0]) ? environmentNameOrder.indexOf(a1[0]) - environmentNameOrder.indexOf(a2[0]) : 1));

package/dist/esm/plugins/rscConfig.mjs

@@ -0,0 +1,112 @@
+import path from "path";
+const ASYNC_STORAGE_PATTERN = /universal[/\\]async_storage/;
+const RSC_COMMON_LAYER = 'rsc-common';
+const ENTRY_NAME_VAR = '__MODERN_JS_ENTRY_NAME';
+const createVirtualModule = (content)=>`data:text/javascript,${encodeURIComponent(content)}`;
+const isAsyncStorageExclude = (exclude)=>{
+    if ('string' == typeof exclude) return ASYNC_STORAGE_PATTERN.test(exclude);
+    if (exclude instanceof RegExp) return exclude.test('universal/async_storage') || exclude.test('universal\\async_storage');
+    return false;
+};
+function pluginRscConfig() {
+    return {
+        name: 'builder:rsc-config',
+        setup (api) {
+            let layersCache = null;
+            const getLayers = async ()=>{
+                if (!layersCache) {
+                    const { Layers } = await import("rsbuild-plugin-rsc");
+                    layersCache = Layers;
+                }
+                return layersCache;
+            };
+            api.modifyBundlerChain({
+                handler: (chain, { isServer })=>{
+                    if (isServer) {
+                        const routeFilePattern = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.[tj]sx?$/;
+                        const appFilePattern = /[/\\]App\.[tj]sx?$/;
+                        const combinedPattern = new RegExp(`(${routeFilePattern.source}|${appFilePattern.source})`);
+                        let loaderPath;
+                        try {
+                            loaderPath = require.resolve('../shared/rsc/rsc-server-entry-loader');
+                        } catch  {
+                            loaderPath = path.resolve(__dirname, '../shared/rsc/rsc-server-entry-loader');
+                        }
+                        chain.module.rule('rsc-server-entry').test(/\.(tsx?|jsx?)$/).resource(combinedPattern).exclude.add(/node_modules/).end().use('rsc-server-entry-loader').loader(loaderPath).end();
+                    }
+                },
+                order: 'pre'
+            });
+            api.modifyRspackConfig(async (config, utils)=>{
+                const isServer = 'node' === config.target || 'node' === utils.target || utils.environment?.name === 'server';
+                if (!isServer) return;
+                const Layers = await getLayers();
+                if (config.entry) {
+                    const entries = config.entry;
+                    const newEntries = {};
+                    for (const [entryName, entryValue] of Object.entries(entries))if ('string' == typeof entryValue) newEntries[entryName] = {
+                        import: entryValue,
+                        layer: Layers.ssr
+                    };
+                    else if (Array.isArray(entryValue)) newEntries[entryName] = {
+                        import: entryValue,
+                        layer: Layers.ssr
+                    };
+                    else if ('object' == typeof entryValue && null !== entryValue) newEntries[entryName] = {
+                        ...entryValue,
+                        layer: Layers.ssr
+                    };
+                    else newEntries[entryName] = entryValue;
+                    config.entry = newEntries;
+                }
+                if (config.module?.rules) {
+                    const rules = config.module.rules;
+                    for (const rule of rules)if (rule.layer === Layers.rsc) {
+                        if (rule.exclude) {
+                            if (!Array.isArray(rule.exclude)) rule.exclude = [
+                                rule.exclude
+                            ];
+                        } else rule.exclude = [];
+                        const hasExclude = rule.exclude.some(isAsyncStorageExclude);
+                        if (!hasExclude) rule.exclude.push(ASYNC_STORAGE_PATTERN);
+                    }
+                    if (!Array.isArray(config.module.rules)) config.module.rules = [];
+                    config.module.rules.push({
+                        resource: ASYNC_STORAGE_PATTERN,
+                        layer: RSC_COMMON_LAYER
+                    });
+                }
+            });
+            api.modifyBundlerChain((chain, { isServer, isWebWorker })=>{
+                if (!isServer && !isWebWorker) {
+                    const entries = chain.entryPoints.entries();
+                    if (entries && 'object' == typeof entries) for (const entryName of Object.keys(entries)){
+                        const entryPoint = chain.entry(entryName);
+                        const code = `window.${ENTRY_NAME_VAR}="${entryName}";`;
+                        entryPoint.add(createVirtualModule(code));
+                    }
+                }
+            });
+        }
+    };
+}
+async function getRscPlugins(enableRsc, internalDirectory) {
+    if (enableRsc) {
+        const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
+        const { pluginRSC } = await import("rsbuild-plugin-rsc");
+        return [
+            pluginRSC({
+                layers: {
+                    rsc: [
+                        /render[/\\].*[/\\]server[/\\]rsc/,
+                        /AppProxy/,
+                        routesFileReg
+                    ]
+                }
+            }),
+            pluginRscConfig()
+        ];
+    }
+    return [];
+}
+export { getRscPlugins, pluginRscConfig };

package/dist/esm/plugins/runtimeChunk.mjs

@@ -13,7 +13,8 @@ const pluginRuntimeChunk = (disableInlineRuntimeChunk)=>({
             api.modifyRsbuildConfig((config)=>{
                 config.output ||= {};
                 if (disableInlineRuntimeChunk) return;
-                if (!config.output.inlineScripts) config.output.inlineScripts = RUNTIME_CHUNK_REGEX;
+                const originalConfig = api.getRsbuildConfig('original');
+                if (originalConfig.output?.inlineScripts === void 0) config.output.inlineScripts = RUNTIME_CHUNK_REGEX;
             });
         }
     });

package/dist/esm/shared/rsc/rsc-server-entry-loader.mjs

@@ -0,0 +1,7 @@
+function rscServerEntryLoader(source) {
+    this.cacheable(true);
+    const hasServerEntryDirective = source.includes("'use server-entry'") || source.includes('"use server-entry"') || source.includes('`use server-entry`');
+    if (hasServerEntryDirective) return source;
+    return `'use server-entry';\n${source}`;
+}
+export { rscServerEntryLoader as default };

package/dist/esm/shared/rsc/rscClientBrowserFallback.mjs

@@ -12,7 +12,7 @@ function rscClientBrowserFallbackPlugin() {
             api.modifyRspackConfig((config)=>{
                 config.resolve ??= {};
                 config.resolve.fallback ??= {};
-                config.resolve.fallback['react-server-dom-webpack/client.browser'] = emptyModulePath;
+                config.resolve.fallback['react-server-dom-rspack/client.browser'] = emptyModulePath;
             });
         }
     };

package/dist/esm-node/createBuilder.mjs

@@ -1,6 +1,6 @@
 import "node:module";
 import { createRsbuild } from "@rsbuild/core";
-import { rsbuildRscPlugin } from "./rsc/plugins/rsbuild-rsc-plugin.mjs";
+import { getRscPlugins } from "./plugins/rscConfig.mjs";
 import { parseCommonConfig } from "./shared/parseCommonConfig.mjs";
 import { rscClientBrowserFallbackPlugin } from "./shared/rsc/rscClientBrowserFallback.mjs";
 async function parseConfig(builderConfig, options) {
@@ -26,13 +26,8 @@ async function parseConfig(builderConfig, options) {
     }
     const enableRsc = builderConfig.server?.rsc ?? false;
     if (enableRsc) {
-        const { rscClientRuntimePath, rscServerRuntimePath, internalDirectory } = options;
-        rsbuildPlugins.push(rsbuildRscPlugin({
-            appDir: options.cwd,
-            rscClientRuntimePath,
-            rscServerRuntimePath,
-            internalDirectory
-        }));
+        const rscPlugins = await getRscPlugins(enableRsc, options.internalDirectory);
+        rsbuildPlugins.push(...rscPlugins);
     } else rsbuildPlugins.push(rscClientBrowserFallbackPlugin());
     return {
         rsbuildConfig,

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

@@ -24,9 +24,9 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
                         }
                     };
                 }
-                if (config.environments?.node) {
+                if (config.environments?.server) {
                     compatConfig.environments ??= {};
-                    compatConfig.environments.node = {
+                    compatConfig.environments.server = {
                         output: {
                             emitAssets: false,
                             distPath: {
@@ -44,8 +44,8 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
             api.modifyRsbuildConfig({
                 handler: (config)=>{
                     const environmentNameOrder = [
-                        'web',
-                        'node',
+                        'client',
+                        'server',
                         'workerSSR'
                     ];
                     config.environments = Object.fromEntries(Object.entries(config.environments).sort((a1, a2)=>environmentNameOrder.includes(a1[0]) ? environmentNameOrder.indexOf(a1[0]) - environmentNameOrder.indexOf(a2[0]) : 1));

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

@@ -0,0 +1,117 @@
+import __rslib_shim_module__ from "node:module";
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
+import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
+import { dirname as __rspack_dirname } from "node:path";
+import path from "path";
+var rscConfig_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
+const ASYNC_STORAGE_PATTERN = /universal[/\\]async_storage/;
+const RSC_COMMON_LAYER = 'rsc-common';
+const ENTRY_NAME_VAR = '__MODERN_JS_ENTRY_NAME';
+const createVirtualModule = (content)=>`data:text/javascript,${encodeURIComponent(content)}`;
+const isAsyncStorageExclude = (exclude)=>{
+    if ('string' == typeof exclude) return ASYNC_STORAGE_PATTERN.test(exclude);
+    if (exclude instanceof RegExp) return exclude.test('universal/async_storage') || exclude.test('universal\\async_storage');
+    return false;
+};
+function pluginRscConfig() {
+    return {
+        name: 'builder:rsc-config',
+        setup (api) {
+            let layersCache = null;
+            const getLayers = async ()=>{
+                if (!layersCache) {
+                    const { Layers } = await import("rsbuild-plugin-rsc");
+                    layersCache = Layers;
+                }
+                return layersCache;
+            };
+            api.modifyBundlerChain({
+                handler: (chain, { isServer })=>{
+                    if (isServer) {
+                        const routeFilePattern = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.[tj]sx?$/;
+                        const appFilePattern = /[/\\]App\.[tj]sx?$/;
+                        const combinedPattern = new RegExp(`(${routeFilePattern.source}|${appFilePattern.source})`);
+                        let loaderPath;
+                        try {
+                            loaderPath = require.resolve('../shared/rsc/rsc-server-entry-loader');
+                        } catch  {
+                            loaderPath = path.resolve(rscConfig_dirname, '../shared/rsc/rsc-server-entry-loader');
+                        }
+                        chain.module.rule('rsc-server-entry').test(/\.(tsx?|jsx?)$/).resource(combinedPattern).exclude.add(/node_modules/).end().use('rsc-server-entry-loader').loader(loaderPath).end();
+                    }
+                },
+                order: 'pre'
+            });
+            api.modifyRspackConfig(async (config, utils)=>{
+                const isServer = 'node' === config.target || 'node' === utils.target || utils.environment?.name === 'server';
+                if (!isServer) return;
+                const Layers = await getLayers();
+                if (config.entry) {
+                    const entries = config.entry;
+                    const newEntries = {};
+                    for (const [entryName, entryValue] of Object.entries(entries))if ('string' == typeof entryValue) newEntries[entryName] = {
+                        import: entryValue,
+                        layer: Layers.ssr
+                    };
+                    else if (Array.isArray(entryValue)) newEntries[entryName] = {
+                        import: entryValue,
+                        layer: Layers.ssr
+                    };
+                    else if ('object' == typeof entryValue && null !== entryValue) newEntries[entryName] = {
+                        ...entryValue,
+                        layer: Layers.ssr
+                    };
+                    else newEntries[entryName] = entryValue;
+                    config.entry = newEntries;
+                }
+                if (config.module?.rules) {
+                    const rules = config.module.rules;
+                    for (const rule of rules)if (rule.layer === Layers.rsc) {
+                        if (rule.exclude) {
+                            if (!Array.isArray(rule.exclude)) rule.exclude = [
+                                rule.exclude
+                            ];
+                        } else rule.exclude = [];
+                        const hasExclude = rule.exclude.some(isAsyncStorageExclude);
+                        if (!hasExclude) rule.exclude.push(ASYNC_STORAGE_PATTERN);
+                    }
+                    if (!Array.isArray(config.module.rules)) config.module.rules = [];
+                    config.module.rules.push({
+                        resource: ASYNC_STORAGE_PATTERN,
+                        layer: RSC_COMMON_LAYER
+                    });
+                }
+            });
+            api.modifyBundlerChain((chain, { isServer, isWebWorker })=>{
+                if (!isServer && !isWebWorker) {
+                    const entries = chain.entryPoints.entries();
+                    if (entries && 'object' == typeof entries) for (const entryName of Object.keys(entries)){
+                        const entryPoint = chain.entry(entryName);
+                        const code = `window.${ENTRY_NAME_VAR}="${entryName}";`;
+                        entryPoint.add(createVirtualModule(code));
+                    }
+                }
+            });
+        }
+    };
+}
+async function getRscPlugins(enableRsc, internalDirectory) {
+    if (enableRsc) {
+        const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
+        const { pluginRSC } = await import("rsbuild-plugin-rsc");
+        return [
+            pluginRSC({
+                layers: {
+                    rsc: [
+                        /render[/\\].*[/\\]server[/\\]rsc/,
+                        /AppProxy/,
+                        routesFileReg
+                    ]
+                }
+            }),
+            pluginRscConfig()
+        ];
+    }
+    return [];
+}
+export { getRscPlugins, pluginRscConfig };

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

@@ -14,7 +14,8 @@ const pluginRuntimeChunk = (disableInlineRuntimeChunk)=>({
             api.modifyRsbuildConfig((config)=>{
                 config.output ||= {};
                 if (disableInlineRuntimeChunk) return;
-                if (!config.output.inlineScripts) config.output.inlineScripts = RUNTIME_CHUNK_REGEX;
+                const originalConfig = api.getRsbuildConfig('original');
+                if (originalConfig.output?.inlineScripts === void 0) config.output.inlineScripts = RUNTIME_CHUNK_REGEX;
             });
         }
     });

package/dist/esm-node/shared/rsc/rsc-server-entry-loader.mjs

@@ -0,0 +1,8 @@
+import "node:module";
+function rscServerEntryLoader(source) {
+    this.cacheable(true);
+    const hasServerEntryDirective = source.includes("'use server-entry'") || source.includes('"use server-entry"') || source.includes('`use server-entry`');
+    if (hasServerEntryDirective) return source;
+    return `'use server-entry';\n${source}`;
+}
+export { rscServerEntryLoader as default };

package/dist/esm-node/shared/rsc/rscClientBrowserFallback.mjs

@@ -17,7 +17,7 @@ function rscClientBrowserFallbackPlugin() {
             api.modifyRspackConfig((config)=>{
                 config.resolve ??= {};
                 config.resolve.fallback ??= {};
-                config.resolve.fallback['react-server-dom-webpack/client.browser'] = emptyModulePath;
+                config.resolve.fallback['react-server-dom-rspack/client.browser'] = emptyModulePath;
             });
         }
     };