@modern-js/uni-builder 2.69.6 → 2.70.0

package/dist/rspack/index.js

@@ -36,6 +36,7 @@ var import_core = require("@rsbuild/core");
 var import_compatLegacyPlugin = require("../shared/compatLegacyPlugin");
 var import_parseCommonConfig = require("../shared/parseCommonConfig");
 var import_rsbuild_rsc_plugin = require("../shared/rsc/plugins/rsbuild-rsc-plugin");
+var import_rscExternalFallback = require("../shared/rsc/rscExternalFallback");
 var import_utils = require("../shared/utils");
 async function parseConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_experiments, _uniBuilderConfig_tools, _uniBuilderConfig_tools1, _uniBuilderConfig_server;
@@ -139,6 +140,8 @@ async function parseConfig(uniBuilderConfig, options) {
       rscServerRuntimePath,
       internalDirectory
     }));
+  } else {
+    (0, import_rscExternalFallback.addRscExternalFallback)(rsbuildConfig, rsbuildPlugins);
   }
   return {
     rsbuildConfig,

package/dist/shared/rsc/plugins/rsbuild-rsc-plugin.js

@@ -45,6 +45,7 @@ const CSS_RULE_NAMES = [
   "scss",
   "sass"
 ];
+const createVirtualModule = (content) => `data:text/javascript,${encodeURIComponent(content)}`;
 const checkReactVersionAtLeast19 = async (appDir) => {
   const packageJsonPath = import_node_path.default.resolve(appDir, "package.json");
   const packageJson = await import_fs_extra.default.readJSON(packageJsonPath);
@@ -154,6 +155,12 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
           chain.dependencies([
             "server"
           ]);
+          const entries = chain.entryPoints.entries();
+          for (const entryName of Object.keys(entries)) {
+            const entryPoint = chain.entry(entryName);
+            const code = `window.__MODERN_JS_ENTRY_NAME="${entryName}";`;
+            entryPoint.add(createVirtualModule(code));
+          }
           addRscClientLoader();
           addRscClientPlugin();
         }

package/dist/shared/rsc/plugins/rsc-client-plugin.js

@@ -24,7 +24,7 @@ module.exports = __toCommonJS(rsc_client_plugin_exports);
 var import_common = require("../common");
 class RscClientPlugin {
   apply(compiler) {
-    const { AsyncDependenciesBlock, RuntimeGlobals, WebpackError, dependencies: { ModuleDependency, NullDependency }, sources: { RawSource } } = compiler.webpack;
+    const { AsyncDependenciesBlock, WebpackError, dependencies: { ModuleDependency, NullDependency }, sources: { RawSource } } = compiler.webpack;
     const ssrManifest = {
       moduleMap: {},
       moduleLoading: null,
@@ -86,22 +86,6 @@ class RscClientPlugin {
     compiler.hooks.compilation.tap(RscClientPlugin.name, (compilation, { normalModuleFactory }) => {
       compilation.dependencyFactories.set(ClientReferenceDependency, normalModuleFactory);
       compilation.dependencyTemplates.set(ClientReferenceDependency, new NullDependency.Template());
-      class EntryNameRuntimeModule extends compiler.webpack.RuntimeModule {
-        generate() {
-          return `window.__MODERN_JS_ENTRY_NAME="${this.entryName}";`;
-        }
-        constructor(entryName) {
-          super("entry-name", 10);
-          this.entryName = entryName;
-        }
-      }
-      compilation.hooks.runtimeRequirementInTree.for(RuntimeGlobals.ensureChunk).tap(RscClientPlugin.name, (chunk, set) => {
-        Array.from(compilation.entrypoints.entries()).forEach(([entryName, entrypoint]) => {
-          if (entrypoint.chunks.includes(chunk)) {
-            compilation.addRuntimeModule(chunk, new EntryNameRuntimeModule(entryName));
-          }
-        });
-      });
     });
     compiler.hooks.thisCompilation.tap(RscClientPlugin.name, (compilation, { normalModuleFactory }) => {
       this.styles = import_common.sharedData.get("styles");
@@ -120,8 +104,8 @@ class RscClientPlugin {
       normalModuleFactory.hooks.parser.for(`javascript/dynamic`).tap(`HarmonyModulesPlugin`, onNormalModuleFactoryParser);
       normalModuleFactory.hooks.parser.for(`javascript/esm`).tap(`HarmonyModulesPlugin`, onNormalModuleFactoryParser);
       compilation.hooks.additionalTreeRuntimeRequirements.tap(RscClientPlugin.name, (_chunk, runtimeRequirements) => {
-        runtimeRequirements.add(RuntimeGlobals.ensureChunk);
-        runtimeRequirements.add(RuntimeGlobals.compatGetDefaultExport);
+        runtimeRequirements.add(compiler.webpack.RuntimeGlobals.ensureChunk);
+        runtimeRequirements.add(compiler.webpack.RuntimeGlobals.compatGetDefaultExport);
       });
       compilation.hooks.processAssets.tap(RscClientPlugin.name, () => {
         const clientManifest = {};

package/dist/shared/rsc/plugins/rspack-rsc-client-plugin.js

@@ -38,7 +38,7 @@ const hasExtension = (filePath) => {
 };
 class RspackRscClientPlugin {
   apply(compiler) {
-    const { EntryPlugin, RuntimeGlobals, RuntimeModule, WebpackError, sources: { RawSource } } = compiler.webpack;
+    const { EntryPlugin, RuntimeGlobals, WebpackError, sources: { RawSource } } = compiler.webpack;
     const ssrManifest = {
       moduleMap: {},
       moduleLoading: null,
@@ -122,24 +122,6 @@ class RspackRscClientPlugin {
         }
       }
     });
-    compiler.hooks.compilation.tap(RspackRscClientPlugin.name, (compilation, { normalModuleFactory }) => {
-      class EntryNameRuntimeModule extends RuntimeModule {
-        generate() {
-          return `window.__MODERN_JS_ENTRY_NAME="${this.entryName}";`;
-        }
-        constructor(entryName) {
-          super("entry-name", 10);
-          this.entryName = entryName;
-        }
-      }
-      compilation.hooks.runtimeRequirementInTree.for(RuntimeGlobals.ensureChunk).tap(RspackRscClientPlugin.name, (chunk, set) => {
-        Array.from(compilation.entrypoints.entries()).forEach(([entryName, entrypoint]) => {
-          if (entrypoint.chunks.includes(chunk)) {
-            compilation.addRuntimeModule(chunk, new EntryNameRuntimeModule(entryName));
-          }
-        });
-      });
-    });
     compiler.hooks.thisCompilation.tap(RspackRscClientPlugin.name, (compilation, { normalModuleFactory }) => {
       this.styles = import_common.sharedData.get("styles");
       this.clientReferencesMap = import_common.sharedData.get("clientReferencesMap");

package/dist/shared/rsc/rscExternalFallback.d.ts

@@ -0,0 +1,7 @@
+import type { RsbuildConfig, RsbuildPlugin } from '@rsbuild/core';
+/**
+ * Add RSC external fallback when RSC is disabled.
+ * When RSC is disabled, provide an empty fallback for react-server-dom-webpack
+ * to avoid build errors while still allowing projects that may have conditional imports.
+ */
+export declare function addRscExternalFallback(rsbuildConfig: RsbuildConfig, rsbuildPlugins: RsbuildPlugin[]): void;

package/dist/shared/rsc/rscExternalFallback.js

@@ -0,0 +1,50 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rscExternalFallback_exports = {};
+__export(rscExternalFallback_exports, {
+  addRscExternalFallback: () => addRscExternalFallback
+});
+module.exports = __toCommonJS(rscExternalFallback_exports);
+function addRscExternalFallback(rsbuildConfig, rsbuildPlugins) {
+  var _rsbuildConfig_output;
+  var _rsbuildConfig, _rsbuildConfig1, _rsbuildConfig_source;
+  const existingExternals = (_rsbuildConfig_output = rsbuildConfig.output) === null || _rsbuildConfig_output === void 0 ? void 0 : _rsbuildConfig_output.externals;
+  var _output;
+  (_output = (_rsbuildConfig = rsbuildConfig).output) !== null && _output !== void 0 ? _output : _rsbuildConfig.output = {};
+  const externalsArray = Array.isArray(existingExternals) ? existingExternals : existingExternals ? [
+    existingExternals
+  ] : [];
+  rsbuildConfig.output.externals = [
+    ...externalsArray,
+    {
+      "react-server-dom-webpack": "__REACT_SERVER_DOM_WEBPACK_EMPTY__"
+    }
+  ];
+  var _source;
+  (_source = (_rsbuildConfig1 = rsbuildConfig).source) !== null && _source !== void 0 ? _source : _rsbuildConfig1.source = {};
+  var _define;
+  (_define = (_rsbuildConfig_source = rsbuildConfig.source).define) !== null && _define !== void 0 ? _define : _rsbuildConfig_source.define = {};
+  if (!("__REACT_SERVER_DOM_WEBPACK_EMPTY__" in rsbuildConfig.source.define)) {
+    rsbuildConfig.source.define.__REACT_SERVER_DOM_WEBPACK_EMPTY__ = "{}";
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  addRscExternalFallback
+});

package/dist/webpack/index.js

@@ -37,6 +37,7 @@ var import_compatLegacyPlugin = require("../shared/compatLegacyPlugin");
 var import_parseCommonConfig = require("../shared/parseCommonConfig");
 var import_postcss = require("../shared/plugins/postcss");
 var import_rsbuild_rsc_plugin = require("../shared/rsc/plugins/rsbuild-rsc-plugin");
+var import_rscExternalFallback = require("../shared/rsc/rscExternalFallback");
 var import_utils = require("../shared/utils");
 var import_babel = require("./plugins/babel");
 var import_include = require("./plugins/include");
@@ -109,6 +110,8 @@ async function parseConfig(uniBuilderConfig, options) {
       rscServerRuntimePath,
       internalDirectory
     }));
+  } else {
+    (0, import_rscExternalFallback.addRscExternalFallback)(rsbuildConfig, rsbuildPlugins);
   }
   if ((_uniBuilderConfig_tools1 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools1 === void 0 ? void 0 : _uniBuilderConfig_tools1.tsLoader) {
     const { pluginTsLoader } = await Promise.resolve().then(() => __toESM(require("./plugins/tsLoader")));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.69.6",
+  "version": "2.70.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -40,7 +40,7 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.26.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.16",
-    "@rsbuild/core": "1.6.15",
+    "@rsbuild/core": "1.7.2",
     "@rsbuild/plugin-assets-retry": "1.5.0",
     "@rsbuild/plugin-babel": "1.0.6",
     "@rsbuild/plugin-check-syntax": "1.6.0",
@@ -51,16 +51,16 @@
     "@rsbuild/plugin-rem": "1.0.4",
     "@rsbuild/plugin-sass": "1.4.0",
     "@rsbuild/plugin-source-build": "1.0.3",
-    "@rsbuild/plugin-styled-components": "1.5.0",
+    "@rsbuild/plugin-styled-components": "1.6.0",
     "@rsbuild/plugin-svgr": "1.2.3",
     "@rsbuild/plugin-toml": "1.1.1",
     "@rsbuild/plugin-type-check": "1.3.2",
     "@rsbuild/plugin-typed-css-modules": "1.2.0",
     "@rsbuild/plugin-yaml": "1.0.3",
     "@rsbuild/webpack": "1.6.1",
-    "@swc/core": "1.14.0",
+    "@swc/core": "1.15.8",
     "@swc/helpers": "^0.5.17",
-    "autoprefixer": "10.4.21",
+    "autoprefixer": "10.4.23",
     "babel-loader": "9.2.1",
     "babel-plugin-import": "1.13.8",
     "babel-plugin-styled-components": "1.13.3",
@@ -70,7 +70,7 @@
     "es-module-lexer": "^1.1.0",
     "glob": "^9.3.5",
     "html-minifier-terser": "^7.2.0",
-    "html-webpack-plugin": "5.6.4",
+    "html-webpack-plugin": "5.6.5",
     "jiti": "1.21.7",
     "lodash": "^4.17.21",
     "magic-string": "0.30.17",
@@ -90,9 +90,9 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.103.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/babel-preset": "2.69.6",
-    "@modern-js/flight-server-transform-plugin": "2.69.6",
-    "@modern-js/utils": "2.69.6"
+    "@modern-js/babel-preset": "2.70.0",
+    "@modern-js/flight-server-transform-plugin": "2.70.0",
+    "@modern-js/utils": "2.70.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.1.2",
@@ -103,9 +103,9 @@
     "react-dom": "^18.2.0",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@modern-js/types": "2.69.6",
-    "@scripts/vitest-config": "2.66.0",
-    "@scripts/build": "2.66.0"
+    "@modern-js/types": "2.70.0",
+    "@scripts/build": "2.66.0",
+    "@scripts/vitest-config": "2.66.0"
   },
   "publishConfig": {
     "access": "public",