@bleedingdev/modern-js-builder 3.9.0-ultramodern.9 → 3.9.3-ultramodern.1

package/dist/cjs/plugins/environmentDefaults.js

@@ -88,14 +88,15 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
             });
             api.modifyBundlerChain(async (chain, { environment })=>{
                 const isServiceWorker = environment.name === utils_js_namespaceObject.SERVICE_WORKER_ENVIRONMENT_NAME;
-                if (isServiceWorker && true === chain.output.get('module')) chain.output.library({
-                    ...chain.output.get('library') || {},
-                    type: 'module'
-                });
-                else if (isServiceWorker) chain.output.library({
-                    ...chain.output.get('library') || {},
-                    type: 'commonjs2'
-                });
+                if (isServiceWorker) {
+                    const library = chain.output.get('library');
+                    chain.output.library({
+                        ...'string' == typeof library || Array.isArray(library) ? {
+                            name: library
+                        } : library,
+                        type: true === chain.output.get('module') ? 'module' : 'commonjs2'
+                    });
+                }
             });
         }
     });

package/dist/cjs/plugins/manifest.js

@@ -40,7 +40,9 @@ const pluginManifest = ()=>({
                 chain.plugin(CHAIN_ID.PLUGIN.MANIFEST).use(RspackManifestPlugin, [
                     {
                         fileName: 'web' === target ? 'asset-manifest.json' : `asset-manifest-${target}.json`,
-                        publicPath,
+                        ...'string' == typeof publicPath ? {
+                            publicPath
+                        } : {},
                         generate: manifest_js_namespaceObject.generateManifest
                     }
                 ]);

package/dist/cjs/plugins/rscConfig.js

@@ -46,19 +46,26 @@ var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_na
 const ASYNC_STORAGE_PATTERN = /universal[/\\]async_storage/;
 const SERVER_LOADER_ENTRY_PATTERN = /[/\\](?:server-loader-combined|route-server-loaders)\.js$/;
 const RENDER_RSC_SOURCE_PATTERN = /render[/\\].*[/\\]server[/\\]rsc/;
-const RENDER_RSC_RSLIB_ENTRY_PATTERN = /render[/\\]dist[/\\]esm[/\\]rsc(?:Worker)?\.mjs$/;
-const RENDER_RSC_RUNTIME = '@modern-js/render/rsc';
-const RENDER_RSC_WORKER_RUNTIME = '@modern-js/render/rsc-worker';
+const RENDER_RSC_RSLIB_ENTRY_PATTERN = /render[/\\]dist[/\\]esm[/\\]rsc(?:\.edge)?\.mjs$/;
 const RSC_COMMON_LAYER = 'rsc-common';
 const ENTRY_NAME_VAR = '__MODERN_JS_ENTRY_NAME';
 const ROUTE_DATA_FILE_PATTERN = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.(?:loader|data)\.[tj]sx?(?:\?.*)?$/;
 const createVirtualModule = (content)=>`data:text/javascript,${encodeURIComponent(content)}`;
+const resolveRscEnvironments = (environments)=>{
+    const resolved = {
+        server: environments?.server ?? 'server',
+        client: environments?.client ?? 'client'
+    };
+    for (const [role, name] of Object.entries(resolved))if ('string' != typeof name || !name.trim()) throw new TypeError(`RSC ${role} environment must have a nonempty name`);
+    return resolved;
+};
 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() {
+function pluginRscConfig(environments, rscLayerMatchers = []) {
+    const serverEnvironment = resolveRscEnvironments(environments).server;
     return {
         name: 'builder:rsc-config',
         setup (api) {
@@ -71,9 +78,8 @@ function pluginRscConfig() {
                 return layersCache;
             };
             api.modifyBundlerChain({
-                handler: (chain, { isServer })=>{
-                    if (isServer) {
-                        chain.resolve.alias.set(`${RENDER_RSC_RUNTIME}$`, RENDER_RSC_WORKER_RUNTIME);
+                handler: (chain, { isServer, environment })=>{
+                    if (isServer || environment.name === serverEnvironment) {
                         let emptyModulePath;
                         try {
                             emptyModulePath = require.resolve('../shared/rsc/rscEmptyModule');
@@ -96,9 +102,25 @@ function pluginRscConfig() {
                 order: 'pre'
             });
             api.modifyRspackConfig(async (config, utils)=>{
-                const isServer = 'node' === config.target || 'node' === utils.target || utils.environment?.name === 'server';
+                const isServer = 'node' === config.target || 'node' === utils.target || utils.environment?.name === serverEnvironment;
                 if (!isServer) return;
                 const Layers = await getLayers();
+                if (utils.environment?.name !== serverEnvironment && rscLayerMatchers.length > 0) {
+                    config.module ??= {};
+                    config.module.rules ??= [];
+                    config.module.rules.push({
+                        test: rscLayerMatchers,
+                        layer: Layers.rsc
+                    }, {
+                        issuerLayer: Layers.rsc,
+                        resolve: {
+                            conditionNames: [
+                                'react-server',
+                                '...'
+                            ]
+                        }
+                    });
+                }
                 if (config.entry) {
                     const entries = config.entry;
                     const newEntries = {};
@@ -135,8 +157,8 @@ function pluginRscConfig() {
                     });
                 }
             });
-            api.modifyBundlerChain((chain, { isServer, isWebWorker })=>{
-                if (!isServer && !isWebWorker) {
+            api.modifyBundlerChain((chain, { isServer, isWebWorker, environment })=>{
+                if (!isServer && !isWebWorker && environment.name !== serverEnvironment) {
                     const entries = chain.entryPoints.entries();
                     if (entries && 'object' == typeof entries) for (const entryName of Object.keys(entries)){
                         const entryPoint = chain.entry(entryName);
@@ -150,13 +172,12 @@ function pluginRscConfig() {
 }
 async function getRscPlugins(enableRsc, internalDirectory, environments) {
     if (enableRsc) {
+        const rscEnvironments = resolveRscEnvironments(environments);
         const rscLayerMatchers = createRscLayerMatchers(internalDirectory);
         const { pluginRSC } = await import("rsbuild-plugin-rsc");
         return [
             pluginRSC({
-                ...environments ? {
-                    environments
-                } : {},
+                environments: rscEnvironments,
                 layers: {
                     ssr: SERVER_LOADER_ENTRY_PATTERN,
                     rsc: [
@@ -167,7 +188,7 @@ async function getRscPlugins(enableRsc, internalDirectory, environments) {
                     ]
                 }
             }),
-            pluginRscConfig()
+            pluginRscConfig(rscEnvironments, rscLayerMatchers)
         ];
     }
     return [];

package/dist/cjs/shared/parseCommonConfig.js

@@ -34,7 +34,6 @@ __webpack_require__.d(__webpack_exports__, {
 const core_namespaceObject = require("@rsbuild/core");
 const plugin_css_minimizer_namespaceObject = require("@rsbuild/plugin-css-minimizer");
 const plugin_less_namespaceObject = require("@rsbuild/plugin-less");
-const plugin_react_namespaceObject = require("@rsbuild/plugin-react");
 const plugin_sass_namespaceObject = require("@rsbuild/plugin-sass");
 const devtools_js_namespaceObject = require("../plugins/devtools.js");
 const emitRouteFile_js_namespaceObject = require("../plugins/emitRouteFile.js");
@@ -43,6 +42,7 @@ const globalVars_js_namespaceObject = require("../plugins/globalVars.js");
 const htmlMinify_js_namespaceObject = require("../plugins/htmlMinify.js");
 const runtimeChunk_js_namespaceObject = require("../plugins/runtimeChunk.js");
 const external_devServer_js_namespaceObject = require("./devServer.js");
+const external_pluginOptions_js_namespaceObject = require("./pluginOptions.js");
 const external_tsgo_js_namespaceObject = require("./tsgo.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
@@ -70,7 +70,7 @@ function removeUndefinedKey(obj) {
 }
 async function parseCommonConfig(builderConfig, options) {
     const frameworkConfigPath = options?.frameworkConfigPath;
-    const { plugins: [...plugins] = [], splitChunks, performance: { ...performanceConfig } = {}, output: { module = false, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetManifest, sourceMap, convertToRem, polyfill, dataUriLimit = 10000, distPath = {}, ...outputConfig } = {}, html: { outputStructure, appIcon, ...htmlConfig } = {}, source: { alias, globalVars, transformImport, reactCompiler, ...sourceConfig } = {}, dev = {}, server = {}, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {}, resolve = {} } = builderConfig;
+    const { plugins: [...plugins] = [], splitChunks, performance: { ...performanceConfig } = {}, output: { module = false, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetManifest, sourceMap, convertToRem, polyfill, dataUriLimit = 10000, distPath = {}, ...outputConfig } = {}, html: { outputStructure, appIcon, ...htmlConfig } = {}, source: { alias, globalVars, transformImport, reactCompiler, ...sourceConfig } = {}, dev = {}, server = {}, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, svgr, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {}, resolve = {} } = builderConfig;
     let combinedAlias;
     if (alias || resolve.alias) combinedAlias = [].concat(alias ?? []).concat(resolve.alias ?? []);
     const rsbuildConfig = {
@@ -153,12 +153,8 @@ async function parseCommonConfig(builderConfig, options) {
             sourceMap
         }),
         (0, emitRouteFile_js_namespaceObject.pluginEmitRouteFile)(),
-        (0, plugin_sass_namespaceObject.pluginSass)({
-            sassLoaderOptions: sass
-        }),
-        (0, plugin_less_namespaceObject.pluginLess)({
-            lessLoaderOptions: less
-        }),
+        (0, plugin_sass_namespaceObject.pluginSass)((0, external_pluginOptions_js_namespaceObject.normalizeSassOptions)(sass)),
+        (0, plugin_less_namespaceObject.pluginLess)((0, external_pluginOptions_js_namespaceObject.normalizeLessOptions)(less)),
         (0, environmentDefaults_js_namespaceObject.pluginEnvironmentDefaults)(distPath),
         (0, htmlMinify_js_namespaceObject.pluginHtmlMinifierTerser)()
     ];
@@ -185,19 +181,44 @@ async function parseCommonConfig(builderConfig, options) {
         const { pluginSourceBuild } = await import("@rsbuild/plugin-source-build");
         rsbuildPlugins.push(pluginSourceBuild(true === sourceBuild ? {} : sourceBuild));
     }
-    rsbuildPlugins.push((0, plugin_react_namespaceObject.pluginReact)(options?.disableReactCompiler || void 0 === reactCompiler ? {} : {
-        reactCompiler
-    }));
-    if (!disableSvgr) {
-        const { pluginSvgr } = await import("@rsbuild/plugin-svgr");
-        rsbuildPlugins.push(pluginSvgr({
-            mixedImport: true,
-            parallel: true,
-            svgrOptions: {
-                exportType: 'component' === svgDefaultExport ? 'default' : 'named'
-            }
-        }));
-    }
+    rsbuildPlugins.push({
+        name: 'rsbuild:react',
+        async setup (api) {
+            const { pluginReact } = await import("@rsbuild/plugin-react");
+            return pluginReact().setup(api);
+        }
+    });
+    if (!options?.disableReactCompiler && void 0 !== reactCompiler) rsbuildPlugins.push({
+        name: 'builder:react-compiler',
+        setup (api) {
+            api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig })=>'web' === config.output.target && name !== external_utils_js_namespaceObject.SERVICE_WORKER_ENVIRONMENT_NAME ? mergeEnvironmentConfig({
+                    tools: {
+                        swc: {
+                            jsc: {
+                                transform: {
+                                    reactCompiler
+                                }
+                            }
+                        }
+                    }
+                }, config) : config);
+        }
+    });
+    const svgrOptions = (0, external_pluginOptions_js_namespaceObject.resolveSvgrOptions)({
+        svgr,
+        disableSvgr,
+        svgDefaultExport
+    });
+    if (false !== svgrOptions) rsbuildPlugins.push({
+        name: 'rsbuild:svgr',
+        pre: [
+            'rsbuild:react'
+        ],
+        async setup (api) {
+            const { pluginSvgr } = await import("@rsbuild/plugin-svgr");
+            await pluginSvgr(svgrOptions).setup(api);
+        }
+    });
     if (assetsRetry) {
         const { pluginAssetsRetry } = await import("@rsbuild/plugin-assets-retry");
         rsbuildPlugins.push(pluginAssetsRetry(assetsRetry));

package/dist/cjs/shared/pluginOptions.js

@@ -0,0 +1,122 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __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__, {
+    normalizeLessOptions: ()=>normalizeLessOptions,
+    normalizeSassOptions: ()=>normalizeSassOptions,
+    resetPluginOptionsWarnings: ()=>resetPluginOptionsWarnings,
+    resolveSvgrOptions: ()=>resolveSvgrOptions
+});
+const utils_namespaceObject = require("@modern-js/utils");
+const LESS_PLUGIN_KEYS = [
+    'lessLoaderOptions',
+    'include',
+    'exclude',
+    'parallel'
+];
+const SASS_PLUGIN_KEYS = [
+    'sassLoaderOptions',
+    'include',
+    'exclude',
+    'rewriteUrls'
+];
+const warned = new Set();
+const resetPluginOptionsWarnings = ()=>{
+    warned.clear();
+};
+const warnOnceInDev = (key, message)=>{
+    if (!(0, utils_namespaceObject.isDevCommand)() || warned.has(key)) return;
+    warned.add(key);
+    utils_namespaceObject.logger.warn(message);
+};
+const isPlainObject = (value)=>'object' == typeof value && null !== value && !Array.isArray(value);
+const isPluginLevelOptions = (value, pluginKeys)=>isPlainObject(value) && pluginKeys.some((key)=>key in value);
+const isEmptyObject = (value)=>isPlainObject(value) && 0 === Object.keys(value).length;
+const warnIgnoredKeys = (name, value, pluginKeys, loaderOptionsKey)=>{
+    const pluginLevel = Object.keys(value).filter((key)=>pluginKeys.includes(key));
+    const ignored = Object.keys(value).filter((key)=>!pluginKeys.includes(key));
+    if (0 === ignored.length) return;
+    warnOnceInDev(`${name}:mixed`, `\`${name}\` contains plugin-level options (${pluginLevel.join(', ')}) together with other keys (${ignored.join(', ')}). The whole object is passed to the plugin, so the other keys are ignored. Move loader options under \`${loaderOptionsKey}\`.`);
+};
+const normalizeLessOptions = (less)=>{
+    if (isPluginLevelOptions(less, LESS_PLUGIN_KEYS)) {
+        warnIgnoredKeys('tools.less', less, LESS_PLUGIN_KEYS, 'lessLoaderOptions');
+        return less;
+    }
+    if (void 0 !== less && !isEmptyObject(less)) warnOnceInDev('tools.less', "`tools.less` now accepts the full options of @rsbuild/plugin-less. Passing less-loader options directly is deprecated and will stop working in the next major version. Move them under `lessLoaderOptions`:\n  before: tools: { less: { lessOptions: { javascriptEnabled: true } } }\n  after:  tools: { less: { lessLoaderOptions: { lessOptions: { javascriptEnabled: true } } } }");
+    return {
+        lessLoaderOptions: less
+    };
+};
+const normalizeSassOptions = (sass)=>{
+    if (isPluginLevelOptions(sass, SASS_PLUGIN_KEYS)) {
+        warnIgnoredKeys('tools.sass', sass, SASS_PLUGIN_KEYS, 'sassLoaderOptions');
+        return sass;
+    }
+    if (void 0 !== sass && !isEmptyObject(sass)) warnOnceInDev('tools.sass', "`tools.sass` now accepts the full options of @rsbuild/plugin-sass. Passing sass-loader options directly is deprecated and will stop working in the next major version. Move them under `sassLoaderOptions`:\n  before: tools: { sass: { sassOptions: { quietDeps: true } } }\n  after:  tools: { sass: { sassLoaderOptions: { sassOptions: { quietDeps: true } } } }");
+    return {
+        sassLoaderOptions: sass
+    };
+};
+const mergeSvgrOptions = (target, source)=>{
+    const svgrOptions = source.svgrOptions ? {
+        ...target.svgrOptions,
+        ...source.svgrOptions
+    } : target.svgrOptions;
+    return Object.assign(target, source, {
+        svgrOptions
+    });
+};
+const resolveSvgrOptions = ({ svgr, disableSvgr, svgDefaultExport })=>{
+    if (void 0 !== disableSvgr) warnOnceInDev('output.disableSvgr', disableSvgr ? '`output.disableSvgr` is deprecated and will be removed in the next major version. Use `tools: { svgr: false }` instead.' : '`output.disableSvgr` is deprecated and will be removed in the next major version. SVGR is enabled by default, so `output.disableSvgr: false` can be removed (or use `tools: { svgr: {} }` to keep it explicit).');
+    if (void 0 !== svgDefaultExport) warnOnceInDev('output.svgDefaultExport', "`output.svgDefaultExport` is deprecated and will be removed in the next major version. Use `tools.svgr.svgrOptions.exportType` instead:\n  before: output: { svgDefaultExport: 'component' }\n  after:  tools: { svgr: { svgrOptions: { exportType: 'default' } } }\n  ('url' maps to exportType: 'named')");
+    if (false === svgr) return false;
+    if (void 0 === svgr && disableSvgr) return false;
+    const defaults = {
+        mixedImport: true,
+        parallel: true,
+        svgrOptions: {
+            exportType: 'component' === svgDefaultExport ? 'default' : 'named'
+        }
+    };
+    return (0, utils_namespaceObject.applyOptionsChain)(defaults, svgr, void 0, mergeSvgrOptions);
+};
+exports.normalizeLessOptions = __webpack_exports__.normalizeLessOptions;
+exports.normalizeSassOptions = __webpack_exports__.normalizeSassOptions;
+exports.resetPluginOptionsWarnings = __webpack_exports__.resetPluginOptionsWarnings;
+exports.resolveSvgrOptions = __webpack_exports__.resolveSvgrOptions;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "normalizeLessOptions",
+    "normalizeSassOptions",
+    "resetPluginOptionsWarnings",
+    "resolveSvgrOptions"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/shared/tsgo.js

@@ -52,7 +52,6 @@ var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_no
 const utils_namespaceObject = require("@modern-js/utils");
 const builderRequire = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__);
 const STABLE_TSGO_PACKAGE = "typescript/package.json";
-const NATIVE_PREVIEW_TSGO_PACKAGE = "@typescript/native-preview/package.json";
 const TSGO_CHECKER_DIR = external_node_path_default().join('.modern-js', 'tsgo');
 const tryResolve = (request, rootPath)=>{
     try {
@@ -65,25 +64,11 @@ const tryResolve = (request, rootPath)=>{
         return;
     }
 };
-const readPackageMajorVersion = (packageJsonPath)=>{
-    try {
-        const packageJson = JSON.parse(external_node_fs_default().readFileSync(packageJsonPath, 'utf8'));
-        const major = Number.parseInt(String(packageJson.version).split('.')[0], 10);
-        return Number.isFinite(major) ? major : void 0;
-    } catch  {
-        return;
-    }
-};
 const resolveTsgoPackagePath = (rootPath)=>{
-    const stableTypeScriptPath = tryResolve(STABLE_TSGO_PACKAGE, rootPath);
-    if (stableTypeScriptPath && (readPackageMajorVersion(stableTypeScriptPath) ?? 0) >= 7) return stableTypeScriptPath;
-    const previewFromProject = tryResolve(NATIVE_PREVIEW_TSGO_PACKAGE, rootPath);
-    if (previewFromProject) return previewFromProject;
-    try {
-        return builderRequire.resolve(NATIVE_PREVIEW_TSGO_PACKAGE);
-    } catch  {
-        return;
-    }
+    const packageJsonPath = tryResolve(STABLE_TSGO_PACKAGE, rootPath) ?? builderRequire.resolve(STABLE_TSGO_PACKAGE);
+    const packageJson = JSON.parse(external_node_fs_default().readFileSync(packageJsonPath, 'utf8'));
+    if ("typescript" !== packageJson.name || '7.0.2' !== packageJson.version) throw new Error(`The native type checker requires typescript@7.0.2; found ${String(packageJson.name)}@${String(packageJson.version)} at ${packageJsonPath}.`);
+    return packageJsonPath;
 };
 const toPosixPath = (input)=>input.replaceAll(external_node_path_default().sep, '/');
 const asTsConfigPath = (request)=>{
@@ -184,7 +169,7 @@ const createTsgoCheckerConfig = (configFile, checkerConfigFile = defaultTsgoChec
     };
     const declaredRootDir = tsConfig.compilerOptions?.rootDir;
     if ('string' == typeof declaredRootDir) compilerOptions.rootDir = toPosixPath(declaredRootDir);
-    else if (tsConfig.compilerOptions?.composite === true) compilerOptions.rootDir = toPosixPath(configDirectory);
+    else compilerOptions.rootDir = toPosixPath(configDirectory);
     const moduleResolution = String(tsConfig.compilerOptions?.moduleResolution).toLowerCase();
     if ([
         'node',
@@ -248,19 +233,13 @@ const withTsgoDefaults = (userOptions, rootPath)=>{
     ] : [];
     return [
         {
-            typescript: tsgoPath ? {
+            typescript: {
                 tsgo: true,
                 typescriptPath: tsgoPath
-            } : {
-                tsgo: true
             }
         },
         ...userChain,
-        (config)=>{
-            const { typescript } = config;
-            if (typescript?.tsgo === false && typescript.typescriptPath === tsgoPath) typescript.typescriptPath = tryResolve("typescript", rootPath);
-            return normalizeTsgoConfig(config, rootPath);
-        }
+        (config)=>normalizeTsgoConfig(config, rootPath)
     ];
 };
 exports.refreshTsgoCheckerConfig = __webpack_exports__.refreshTsgoCheckerConfig;

package/dist/esm/plugins/environmentDefaults.mjs

@@ -56,14 +56,15 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
             });
             api.modifyBundlerChain(async (chain, { environment })=>{
                 const isServiceWorker = environment.name === SERVICE_WORKER_ENVIRONMENT_NAME;
-                if (isServiceWorker && true === chain.output.get('module')) chain.output.library({
-                    ...chain.output.get('library') || {},
-                    type: 'module'
-                });
-                else if (isServiceWorker) chain.output.library({
-                    ...chain.output.get('library') || {},
-                    type: 'commonjs2'
-                });
+                if (isServiceWorker) {
+                    const library = chain.output.get('library');
+                    chain.output.library({
+                        ...'string' == typeof library || Array.isArray(library) ? {
+                            name: library
+                        } : library,
+                        type: true === chain.output.get('module') ? 'module' : 'commonjs2'
+                    });
+                }
             });
         }
     });

package/dist/esm/plugins/manifest.mjs

@@ -8,7 +8,9 @@ const pluginManifest = ()=>({
                 chain.plugin(CHAIN_ID.PLUGIN.MANIFEST).use(RspackManifestPlugin, [
                     {
                         fileName: 'web' === target ? 'asset-manifest.json' : `asset-manifest-${target}.json`,
-                        publicPath,
+                        ...'string' == typeof publicPath ? {
+                            publicPath
+                        } : {},
                         generate: generateManifest
                     }
                 ]);

package/dist/esm/plugins/rscConfig.mjs

@@ -2,19 +2,26 @@ import path from "path";
 const ASYNC_STORAGE_PATTERN = /universal[/\\]async_storage/;
 const SERVER_LOADER_ENTRY_PATTERN = /[/\\](?:server-loader-combined|route-server-loaders)\.js$/;
 const RENDER_RSC_SOURCE_PATTERN = /render[/\\].*[/\\]server[/\\]rsc/;
-const RENDER_RSC_RSLIB_ENTRY_PATTERN = /render[/\\]dist[/\\]esm[/\\]rsc(?:Worker)?\.mjs$/;
-const RENDER_RSC_RUNTIME = '@modern-js/render/rsc';
-const RENDER_RSC_WORKER_RUNTIME = '@modern-js/render/rsc-worker';
+const RENDER_RSC_RSLIB_ENTRY_PATTERN = /render[/\\]dist[/\\]esm[/\\]rsc(?:\.edge)?\.mjs$/;
 const RSC_COMMON_LAYER = 'rsc-common';
 const ENTRY_NAME_VAR = '__MODERN_JS_ENTRY_NAME';
 const ROUTE_DATA_FILE_PATTERN = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.(?:loader|data)\.[tj]sx?(?:\?.*)?$/;
 const createVirtualModule = (content)=>`data:text/javascript,${encodeURIComponent(content)}`;
+const resolveRscEnvironments = (environments)=>{
+    const resolved = {
+        server: environments?.server ?? 'server',
+        client: environments?.client ?? 'client'
+    };
+    for (const [role, name] of Object.entries(resolved))if ('string' != typeof name || !name.trim()) throw new TypeError(`RSC ${role} environment must have a nonempty name`);
+    return resolved;
+};
 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() {
+function pluginRscConfig(environments, rscLayerMatchers = []) {
+    const serverEnvironment = resolveRscEnvironments(environments).server;
     return {
         name: 'builder:rsc-config',
         setup (api) {
@@ -27,9 +34,8 @@ function pluginRscConfig() {
                 return layersCache;
             };
             api.modifyBundlerChain({
-                handler: (chain, { isServer })=>{
-                    if (isServer) {
-                        chain.resolve.alias.set(`${RENDER_RSC_RUNTIME}$`, RENDER_RSC_WORKER_RUNTIME);
+                handler: (chain, { isServer, environment })=>{
+                    if (isServer || environment.name === serverEnvironment) {
                         let emptyModulePath;
                         try {
                             emptyModulePath = require.resolve('../shared/rsc/rscEmptyModule');
@@ -52,9 +58,25 @@ function pluginRscConfig() {
                 order: 'pre'
             });
             api.modifyRspackConfig(async (config, utils)=>{
-                const isServer = 'node' === config.target || 'node' === utils.target || utils.environment?.name === 'server';
+                const isServer = 'node' === config.target || 'node' === utils.target || utils.environment?.name === serverEnvironment;
                 if (!isServer) return;
                 const Layers = await getLayers();
+                if (utils.environment?.name !== serverEnvironment && rscLayerMatchers.length > 0) {
+                    config.module ??= {};
+                    config.module.rules ??= [];
+                    config.module.rules.push({
+                        test: rscLayerMatchers,
+                        layer: Layers.rsc
+                    }, {
+                        issuerLayer: Layers.rsc,
+                        resolve: {
+                            conditionNames: [
+                                'react-server',
+                                '...'
+                            ]
+                        }
+                    });
+                }
                 if (config.entry) {
                     const entries = config.entry;
                     const newEntries = {};
@@ -91,8 +113,8 @@ function pluginRscConfig() {
                     });
                 }
             });
-            api.modifyBundlerChain((chain, { isServer, isWebWorker })=>{
-                if (!isServer && !isWebWorker) {
+            api.modifyBundlerChain((chain, { isServer, isWebWorker, environment })=>{
+                if (!isServer && !isWebWorker && environment.name !== serverEnvironment) {
                     const entries = chain.entryPoints.entries();
                     if (entries && 'object' == typeof entries) for (const entryName of Object.keys(entries)){
                         const entryPoint = chain.entry(entryName);
@@ -106,13 +128,12 @@ function pluginRscConfig() {
 }
 async function getRscPlugins(enableRsc, internalDirectory, environments) {
     if (enableRsc) {
+        const rscEnvironments = resolveRscEnvironments(environments);
         const rscLayerMatchers = createRscLayerMatchers(internalDirectory);
         const { pluginRSC } = await import("rsbuild-plugin-rsc");
         return [
             pluginRSC({
-                ...environments ? {
-                    environments
-                } : {},
+                environments: rscEnvironments,
                 layers: {
                     ssr: SERVER_LOADER_ENTRY_PATTERN,
                     rsc: [
@@ -123,7 +144,7 @@ async function getRscPlugins(enableRsc, internalDirectory, environments) {
                     ]
                 }
             }),
-            pluginRscConfig()
+            pluginRscConfig(rscEnvironments, rscLayerMatchers)
         ];
     }
     return [];