@bleedingdev/modern-js-builder 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

package/dist/cjs/createBuilder.js

@@ -34,7 +34,7 @@ __webpack_require__.d(__webpack_exports__, {
 const core_namespaceObject = require("@rsbuild/core");
 const rscConfig_js_namespaceObject = require("./plugins/rscConfig.js");
 const parseCommonConfig_js_namespaceObject = require("./shared/parseCommonConfig.js");
-const rscDisabledRuntime_js_namespaceObject = require("./shared/rsc/rscDisabledRuntime.js");
+const rscClientBrowserFallback_js_namespaceObject = require("./shared/rsc/rscClientBrowserFallback.js");
 async function parseConfig(builderConfig, options) {
     builderConfig.performance ??= {};
     builderConfig.performance.buildCache ??= true;
@@ -62,10 +62,7 @@ async function parseConfig(builderConfig, options) {
         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 rsbuildConfig.plugins = [
-        ...rsbuildConfig.plugins ?? [],
-        (0, rscDisabledRuntime_js_namespaceObject.rscDisabledRuntimePlugin)()
-    ];
+    } else rsbuildPlugins.push((0, rscClientBrowserFallback_js_namespaceObject.rscClientBrowserFallbackPlugin)());
     return {
         rsbuildConfig,
         rsbuildPlugins
@@ -83,7 +80,19 @@ async function createRspackBuilder(options) {
     ];
     const rsbuild = await (0, core_namespaceObject.createRsbuild)({
         cwd,
-        rsbuildConfig
+        rsbuildConfig: (0, core_namespaceObject.mergeRsbuildConfig)({
+            tools: {
+                rspack: {
+                    module: {
+                        parser: {
+                            javascript: {
+                                createRequire: true
+                            }
+                        }
+                    }
+                }
+            }
+        }, rsbuildConfig)
     });
     return {
         ...rsbuild

package/dist/cjs/index.js

@@ -35,10 +35,12 @@ __webpack_require__.d(__webpack_exports__, {
     createBuilder: ()=>external_createBuilder_js_namespaceObject.createRspackBuilder,
     isHtmlDisabled: ()=>utils_js_namespaceObject.isHtmlDisabled,
     logger: ()=>core_namespaceObject.logger,
-    parseRspackConfig: ()=>external_createBuilder_js_namespaceObject.parseConfig
+    parseRspackConfig: ()=>external_createBuilder_js_namespaceObject.parseConfig,
+    refreshTsgoCheckerConfig: ()=>tsgo_js_namespaceObject.refreshTsgoCheckerConfig
 });
 const external_createBuilder_js_namespaceObject = require("./createBuilder.js");
 const core_namespaceObject = require("@rsbuild/core");
+const tsgo_js_namespaceObject = require("./shared/tsgo.js");
 const utils_js_namespaceObject = require("./shared/utils.js");
 exports.RUNTIME_CHUNK_NAME = __webpack_exports__.RUNTIME_CHUNK_NAME;
 exports.RUNTIME_CHUNK_REGEX = __webpack_exports__.RUNTIME_CHUNK_REGEX;
@@ -48,6 +50,7 @@ exports.createBuilder = __webpack_exports__.createBuilder;
 exports.isHtmlDisabled = __webpack_exports__.isHtmlDisabled;
 exports.logger = __webpack_exports__.logger;
 exports.parseRspackConfig = __webpack_exports__.parseRspackConfig;
+exports.refreshTsgoCheckerConfig = __webpack_exports__.refreshTsgoCheckerConfig;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "RUNTIME_CHUNK_NAME",
     "RUNTIME_CHUNK_REGEX",
@@ -56,7 +59,8 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createBuilder",
     "isHtmlDisabled",
     "logger",
-    "parseRspackConfig"
+    "parseRspackConfig",
+    "refreshTsgoCheckerConfig"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/plugins/environmentDefaults.js

@@ -88,14 +88,13 @@ 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({
+                        ...'object' == typeof library && !Array.isArray(library) ? library : {},
+                        type: true === chain.output.get('module') ? 'module' : 'commonjs2'
+                    });
+                }
             });
         }
     });

package/dist/cjs/plugins/manifest.js

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

package/dist/cjs/plugins/rscConfig.js

@@ -46,9 +46,7 @@ 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?(?:\?.*)?$/;
@@ -73,7 +71,6 @@ function pluginRscConfig() {
             api.modifyBundlerChain({
                 handler: (chain, { isServer })=>{
                     if (isServer) {
-                        chain.resolve.alias.set(`${RENDER_RSC_RUNTIME}$`, RENDER_RSC_WORKER_RUNTIME);
                         let emptyModulePath;
                         try {
                             emptyModulePath = require.resolve('../shared/rsc/rscEmptyModule');

package/dist/cjs/shared/parseCommonConfig.js

@@ -43,6 +43,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_tsgo_js_namespaceObject = require("./tsgo.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
@@ -168,7 +169,7 @@ async function parseCommonConfig(builderConfig, options) {
     if (!disableTsChecker) {
         const { pluginTypeCheck } = await import("@rsbuild/plugin-type-check");
         rsbuildPlugins.push(pluginTypeCheck({
-            tsCheckerOptions: tsChecker
+            tsCheckerOptions: (0, external_tsgo_js_namespaceObject.withTsgoDefaults)(tsChecker, options?.cwd ?? process.cwd())
         }));
     }
     if (convertToRem) {
@@ -184,9 +185,23 @@ 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
-    }));
+    rsbuildPlugins.push((0, plugin_react_namespaceObject.pluginReact)());
+    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);
+        }
+    });
     if (!disableSvgr) {
         const { pluginSvgr } = await import("@rsbuild/plugin-svgr");
         rsbuildPlugins.push(pluginSvgr({

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

@@ -0,0 +1,68 @@
+"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, 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__, {
+    rscClientBrowserFallbackPlugin: ()=>rscClientBrowserFallbackPlugin
+});
+const external_path_namespaceObject = require("path");
+var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+function rscClientBrowserFallbackPlugin() {
+    return {
+        name: 'builder:rsc-client-browser-fallback',
+        setup (api) {
+            let emptyModulePath;
+            try {
+                emptyModulePath = require.resolve('./rscEmptyModule');
+            } catch  {
+                emptyModulePath = external_path_default().resolve(__dirname, 'rscEmptyModule');
+            }
+            api.modifyRspackConfig((config)=>{
+                config.resolve ??= {};
+                config.resolve.fallback ??= {};
+                config.resolve.fallback['react-server-dom-rspack/client.browser'] = emptyModulePath;
+            });
+        }
+    };
+}
+exports.rscClientBrowserFallbackPlugin = __webpack_exports__.rscClientBrowserFallbackPlugin;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "rscClientBrowserFallbackPlugin"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/shared/tsgo.js

@@ -0,0 +1,274 @@
+"use strict";
+const __rslib_import_meta_url__ = /*#__PURE__*/ function() {
+    return "u" < typeof document ? new (require('url'.replace('', ''))).URL('file:' + __filename).href : document.currentScript && document.currentScript.src || new URL('main.js', document.baseURI).href;
+}();
+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, 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__, {
+    refreshTsgoCheckerConfig: ()=>refreshTsgoCheckerConfig,
+    withTsgoDefaults: ()=>withTsgoDefaults
+});
+const external_node_crypto_namespaceObject = require("node:crypto");
+const external_node_fs_namespaceObject = require("node:fs");
+var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
+const external_node_module_namespaceObject = require("node:module");
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+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 {
+        return builderRequire.resolve(request, {
+            paths: [
+                rootPath
+            ]
+        });
+    } catch  {
+        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 toPosixPath = (input)=>input.replaceAll(external_node_path_default().sep, '/');
+const asTsConfigPath = (request)=>{
+    if (external_node_path_default().extname(request)) return [
+        request
+    ];
+    return [
+        request,
+        `${request}.json`
+    ];
+};
+const resolveExtends = (request, configDirectory)=>{
+    const configRequire = (0, external_node_module_namespaceObject.createRequire)(external_node_path_default().join(configDirectory, 'tsconfig.json'));
+    for (const candidate of asTsConfigPath(request)){
+        if (candidate.startsWith('.') || external_node_path_default().isAbsolute(candidate)) {
+            const resolved = external_node_path_default().resolve(configDirectory, candidate);
+            if (external_node_fs_default().existsSync(resolved)) return resolved;
+            continue;
+        }
+        try {
+            return configRequire.resolve(candidate);
+        } catch  {}
+    }
+};
+const PATH_COMPILER_OPTIONS = [
+    'rootDir',
+    'outDir',
+    'declarationDir'
+];
+const absolutiseConfigPaths = (compilerOptions, configDirectory)=>{
+    if (!compilerOptions) return {};
+    const resolved = {
+        ...compilerOptions
+    };
+    for (const option of PATH_COMPILER_OPTIONS){
+        const value = resolved[option];
+        if ('string' == typeof value && !external_node_path_default().isAbsolute(value)) resolved[option] = external_node_path_default().resolve(configDirectory, value);
+    }
+    return resolved;
+};
+const readTsConfig = (configFile, visited = new Set())=>{
+    if (visited.has(configFile) || !external_node_fs_default().existsSync(configFile)) return {};
+    visited.add(configFile);
+    const config = utils_namespaceObject.json5.parse(external_node_fs_default().readFileSync(configFile, 'utf8'));
+    const configDirectory = external_node_path_default().dirname(configFile);
+    const extendsList = Array.isArray(config.extends) ? config.extends : config.extends ? [
+        config.extends
+    ] : [];
+    const baseConfig = extendsList.reduce((merged, request)=>{
+        const resolved = resolveExtends(request, configDirectory);
+        if (!resolved) return merged;
+        const parentConfig = readTsConfig(resolved, visited);
+        return {
+            ...merged,
+            compilerOptions: {
+                ...merged.compilerOptions ?? {},
+                ...parentConfig.compilerOptions ?? {}
+            }
+        };
+    }, {});
+    return {
+        ...baseConfig,
+        compilerOptions: {
+            ...baseConfig.compilerOptions ?? {},
+            ...absolutiseConfigPaths(config.compilerOptions, configDirectory)
+        }
+    };
+};
+const readProjectReferences = (configFile)=>{
+    if (!external_node_fs_default().existsSync(configFile)) return [];
+    const config = utils_namespaceObject.json5.parse(external_node_fs_default().readFileSync(configFile, 'utf8'));
+    if (!Array.isArray(config.references)) return [];
+    const configDirectory = external_node_path_default().dirname(configFile);
+    return config.references.filter((reference)=>'string' == typeof reference?.path).map((reference)=>({
+            ...reference,
+            path: toPosixPath(external_node_path_default().resolve(configDirectory, reference.path))
+        }));
+};
+const toRelativeConfigPath = (fromDirectory, target)=>{
+    const relative = toPosixPath(external_node_path_default().relative(fromDirectory, target));
+    if (relative.startsWith('.')) return relative;
+    return `./${relative}`;
+};
+const writeFileIfChanged = (file, content)=>{
+    if (external_node_fs_default().existsSync(file) && external_node_fs_default().readFileSync(file, 'utf8') === content) return;
+    external_node_fs_default().writeFileSync(file, content);
+};
+const defaultTsgoCheckerConfigFile = (configFile)=>{
+    const hash = (0, external_node_crypto_namespaceObject.createHash)('sha1').update(configFile).digest('hex').slice(0, 10);
+    return external_node_path_default().join(external_node_path_default().dirname(configFile), TSGO_CHECKER_DIR, `tsconfig.${hash}.json`);
+};
+const createTsgoCheckerConfig = (configFile, checkerConfigFile = defaultTsgoCheckerConfigFile(configFile))=>{
+    const configDirectory = external_node_path_default().dirname(configFile);
+    const checkerConfigDirectory = external_node_path_default().dirname(checkerConfigFile);
+    const tsConfig = readTsConfig(configFile);
+    const compilerOptions = {
+        baseUrl: null
+    };
+    const declaredRootDir = tsConfig.compilerOptions?.rootDir;
+    if ('string' == typeof declaredRootDir) compilerOptions.rootDir = toPosixPath(declaredRootDir);
+    else if (tsConfig.compilerOptions?.composite === true) compilerOptions.rootDir = toPosixPath(configDirectory);
+    const moduleResolution = String(tsConfig.compilerOptions?.moduleResolution).toLowerCase();
+    if ([
+        'node',
+        'node10'
+    ].includes(moduleResolution)) compilerOptions.moduleResolution = null;
+    const references = readProjectReferences(configFile);
+    const checkerConfig = {
+        extends: toRelativeConfigPath(checkerConfigDirectory, configFile),
+        compilerOptions,
+        ...references.length > 0 ? {
+            references
+        } : {}
+    };
+    external_node_fs_default().mkdirSync(checkerConfigDirectory, {
+        recursive: true
+    });
+    writeFileIfChanged(checkerConfigFile, `${JSON.stringify(checkerConfig, null, 2)}\n`);
+    return checkerConfigFile;
+};
+const refreshTsgoCheckerConfig = (checkerConfigFile)=>{
+    const checkerConfigDirectory = external_node_path_default().dirname(checkerConfigFile);
+    if ('tsgo' !== external_node_path_default().basename(checkerConfigDirectory) || '.modern-js' !== external_node_path_default().basename(external_node_path_default().dirname(checkerConfigDirectory)) || !external_node_fs_default().existsSync(checkerConfigFile)) return;
+    let checkerConfig;
+    try {
+        checkerConfig = utils_namespaceObject.json5.parse(external_node_fs_default().readFileSync(checkerConfigFile, 'utf8'));
+    } catch  {
+        return;
+    }
+    if ('string' != typeof checkerConfig.extends) return;
+    const projectConfigFile = external_node_path_default().resolve(checkerConfigDirectory, checkerConfig.extends);
+    if (external_node_fs_default().existsSync(projectConfigFile)) try {
+        createTsgoCheckerConfig(projectConfigFile, checkerConfigFile);
+    } catch  {}
+    return projectConfigFile;
+};
+const normalizeTsgoConfig = (config, rootPath)=>{
+    const { typescript } = config;
+    if (typescript?.tsgo === false) return config;
+    const compilerOptions = {
+        ...typescript?.configOverwrite?.compilerOptions ?? {},
+        baseUrl: null
+    };
+    if ([
+        'node',
+        'node10'
+    ].includes(String(compilerOptions.moduleResolution).toLowerCase())) compilerOptions.moduleResolution = null;
+    config.typescript = {
+        ...typescript,
+        configOverwrite: {
+            ...typescript?.configOverwrite ?? {},
+            compilerOptions
+        }
+    };
+    if (typescript?.configFile) config.typescript.configFile = createTsgoCheckerConfig(external_node_path_default().resolve(rootPath, typescript.configFile));
+    return config;
+};
+const withTsgoDefaults = (userOptions, rootPath)=>{
+    const tsgoPath = resolveTsgoPackagePath(rootPath);
+    const userChain = userOptions ? Array.isArray(userOptions) ? userOptions : [
+        userOptions
+    ] : [];
+    return [
+        {
+            typescript: tsgoPath ? {
+                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);
+        }
+    ];
+};
+exports.refreshTsgoCheckerConfig = __webpack_exports__.refreshTsgoCheckerConfig;
+exports.withTsgoDefaults = __webpack_exports__.withTsgoDefaults;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "refreshTsgoCheckerConfig",
+    "withTsgoDefaults"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/esm/createBuilder.mjs

@@ -1,7 +1,7 @@
-import { createRsbuild } from "@rsbuild/core";
+import { createRsbuild, mergeRsbuildConfig } from "@rsbuild/core";
 import { getRscPlugins } from "./plugins/rscConfig.mjs";
 import { parseCommonConfig } from "./shared/parseCommonConfig.mjs";
-import { rscDisabledRuntimePlugin } from "./shared/rsc/rscDisabledRuntime.mjs";
+import { rscClientBrowserFallbackPlugin } from "./shared/rsc/rscClientBrowserFallback.mjs";
 async function parseConfig(builderConfig, options) {
     builderConfig.performance ??= {};
     builderConfig.performance.buildCache ??= true;
@@ -29,10 +29,7 @@ async function parseConfig(builderConfig, options) {
         const rscEnvironments = 'object' == typeof rscConfig ? rscConfig.environments : void 0;
         const rscPlugins = await getRscPlugins(enableRsc, options.internalDirectory, rscEnvironments);
         rsbuildPlugins.push(...rscPlugins);
-    } else rsbuildConfig.plugins = [
-        ...rsbuildConfig.plugins ?? [],
-        rscDisabledRuntimePlugin()
-    ];
+    } else rsbuildPlugins.push(rscClientBrowserFallbackPlugin());
     return {
         rsbuildConfig,
         rsbuildPlugins
@@ -50,7 +47,19 @@ async function createRspackBuilder(options) {
     ];
     const rsbuild = await createRsbuild({
         cwd,
-        rsbuildConfig
+        rsbuildConfig: mergeRsbuildConfig({
+            tools: {
+                rspack: {
+                    module: {
+                        parser: {
+                            javascript: {
+                                createRequire: true
+                            }
+                        }
+                    }
+                }
+            }
+        }, rsbuildConfig)
     });
     return {
         ...rsbuild

package/dist/esm/index.mjs

@@ -1,3 +1,4 @@
 export { createRspackBuilder as createBuilder, parseConfig as parseRspackConfig } from "./createBuilder.mjs";
 export { logger } from "@rsbuild/core";
+export { refreshTsgoCheckerConfig } from "./shared/tsgo.mjs";
 export { RUNTIME_CHUNK_NAME, RUNTIME_CHUNK_REGEX, SERVICE_WORKER_ENVIRONMENT_NAME, castArray, isHtmlDisabled } from "./shared/utils.mjs";

package/dist/esm/plugins/environmentDefaults.mjs

@@ -56,14 +56,13 @@ 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({
+                        ...'object' == typeof library && !Array.isArray(library) ? library : {},
+                        type: true === chain.output.get('module') ? 'module' : 'commonjs2'
+                    });
+                }
             });
         }
     });

package/dist/esm/plugins/manifest.mjs

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

package/dist/esm/plugins/rscConfig.mjs

@@ -2,9 +2,7 @@ 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?(?:\?.*)?$/;
@@ -29,7 +27,6 @@ function pluginRscConfig() {
             api.modifyBundlerChain({
                 handler: (chain, { isServer })=>{
                     if (isServer) {
-                        chain.resolve.alias.set(`${RENDER_RSC_RUNTIME}$`, RENDER_RSC_WORKER_RUNTIME);
                         let emptyModulePath;
                         try {
                             emptyModulePath = require.resolve('../shared/rsc/rscEmptyModule');

package/dist/esm/shared/parseCommonConfig.mjs

@@ -10,7 +10,8 @@ import { pluginGlobalVars } from "../plugins/globalVars.mjs";
 import { pluginHtmlMinifierTerser } from "../plugins/htmlMinify.mjs";
 import { pluginRuntimeChunk } from "../plugins/runtimeChunk.mjs";
 import { transformToRsbuildServerOptions } from "./devServer.mjs";
-import { NODE_MODULES_REGEX } from "./utils.mjs";
+import { withTsgoDefaults } from "./tsgo.mjs";
+import { NODE_MODULES_REGEX, SERVICE_WORKER_ENVIRONMENT_NAME } from "./utils.mjs";
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
 const DEFAULT_CSS_MINIFIER_OPTIONS = {
@@ -135,7 +136,7 @@ async function parseCommonConfig(builderConfig, options) {
     if (!disableTsChecker) {
         const { pluginTypeCheck } = await import("@rsbuild/plugin-type-check");
         rsbuildPlugins.push(pluginTypeCheck({
-            tsCheckerOptions: tsChecker
+            tsCheckerOptions: withTsgoDefaults(tsChecker, options?.cwd ?? process.cwd())
         }));
     }
     if (convertToRem) {
@@ -151,9 +152,23 @@ async function parseCommonConfig(builderConfig, options) {
         const { pluginSourceBuild } = await import("@rsbuild/plugin-source-build");
         rsbuildPlugins.push(pluginSourceBuild(true === sourceBuild ? {} : sourceBuild));
     }
-    rsbuildPlugins.push(pluginReact(options?.disableReactCompiler || void 0 === reactCompiler ? {} : {
-        reactCompiler
-    }));
+    rsbuildPlugins.push(pluginReact());
+    if (!options?.disableReactCompiler && void 0 !== reactCompiler) rsbuildPlugins.push({
+        name: 'builder:react-compiler',
+        setup (api) {
+            api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig })=>'web' === config.output.target && name !== SERVICE_WORKER_ENVIRONMENT_NAME ? mergeEnvironmentConfig({
+                    tools: {
+                        swc: {
+                            jsc: {
+                                transform: {
+                                    reactCompiler
+                                }
+                            }
+                        }
+                    }
+                }, config) : config);
+        }
+    });
     if (!disableSvgr) {
         const { pluginSvgr } = await import("@rsbuild/plugin-svgr");
         rsbuildPlugins.push(pluginSvgr({