@modern-js/uni-builder 2.70.0 → 2.70.1

package/dist/rspack/index.js

@@ -36,7 +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_rscClientBrowserFallback = require("../shared/rsc/rscClientBrowserFallback");
 var import_utils = require("../shared/utils");
 async function parseConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_experiments, _uniBuilderConfig_tools, _uniBuilderConfig_tools1, _uniBuilderConfig_server;
@@ -141,7 +141,7 @@ async function parseConfig(uniBuilderConfig, options) {
       internalDirectory
     }));
   } else {
-    (0, import_rscExternalFallback.addRscExternalFallback)(rsbuildConfig, rsbuildPlugins);
+    rsbuildPlugins.push((0, import_rscClientBrowserFallback.rscClientBrowserFallbackPlugin)());
   }
   return {
     rsbuildConfig,

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

@@ -0,0 +1,2 @@
+import type { RsbuildPlugin } from '@rsbuild/core';
+export declare function rscClientBrowserFallbackPlugin(): RsbuildPlugin;

package/dist/shared/rsc/rscClientBrowserFallback.js

@@ -0,0 +1,53 @@
+"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 rscClientBrowserFallback_exports = {};
+__export(rscClientBrowserFallback_exports, {
+  rscClientBrowserFallbackPlugin: () => rscClientBrowserFallbackPlugin
+});
+module.exports = __toCommonJS(rscClientBrowserFallback_exports);
+function rscClientBrowserFallbackPlugin() {
+  return {
+    name: "uni-builder:rsc-client-browser-fallback",
+    setup(api) {
+      if (api.context.bundlerType === "webpack") {
+        api.modifyWebpackConfig((config) => {
+          var _config, _config_resolve;
+          var _resolve;
+          (_resolve = (_config = config).resolve) !== null && _resolve !== void 0 ? _resolve : _config.resolve = {};
+          var _fallback;
+          (_fallback = (_config_resolve = config.resolve).fallback) !== null && _fallback !== void 0 ? _fallback : _config_resolve.fallback = {};
+          config.resolve.fallback["react-server-dom-webpack/client.browser"] = false;
+        });
+      } else {
+        api.modifyRspackConfig((config) => {
+          var _config, _config_resolve;
+          var _resolve;
+          (_resolve = (_config = config).resolve) !== null && _resolve !== void 0 ? _resolve : _config.resolve = {};
+          var _fallback;
+          (_fallback = (_config_resolve = config.resolve).fallback) !== null && _fallback !== void 0 ? _fallback : _config_resolve.fallback = {};
+          config.resolve.fallback["react-server-dom-webpack/client.browser"] = false;
+        });
+      }
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  rscClientBrowserFallbackPlugin
+});

package/dist/webpack/index.js

@@ -37,7 +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_rscClientBrowserFallback = require("../shared/rsc/rscClientBrowserFallback");
 var import_utils = require("../shared/utils");
 var import_babel = require("./plugins/babel");
 var import_include = require("./plugins/include");
@@ -111,7 +111,7 @@ async function parseConfig(uniBuilderConfig, options) {
       internalDirectory
     }));
   } else {
-    (0, import_rscExternalFallback.addRscExternalFallback)(rsbuildConfig, rsbuildPlugins);
+    rsbuildPlugins.push((0, import_rscClientBrowserFallback.rscClientBrowserFallbackPlugin)());
   }
   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.70.0",
+  "version": "2.70.1",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -90,9 +90,9 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.103.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/babel-preset": "2.70.0",
-    "@modern-js/flight-server-transform-plugin": "2.70.0",
-    "@modern-js/utils": "2.70.0"
+    "@modern-js/babel-preset": "2.70.1",
+    "@modern-js/flight-server-transform-plugin": "2.70.1",
+    "@modern-js/utils": "2.70.1"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.1.2",
@@ -103,8 +103,8 @@
     "react-dom": "^18.2.0",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@modern-js/types": "2.70.0",
     "@scripts/build": "2.66.0",
+    "@modern-js/types": "2.70.1",
     "@scripts/vitest-config": "2.66.0"
   },
   "publishConfig": {

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

@@ -1,7 +0,0 @@
-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

@@ -1,50 +0,0 @@
-"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
-});