@modern-js/uni-builder 2.65.1 → 2.65.2

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

@@ -31,6 +31,9 @@ __export(rsbuild_rsc_plugin_exports, {
   rsbuildRscPlugin: () => rsbuildRscPlugin
 });
 module.exports = __toCommonJS(rsbuild_rsc_plugin_exports);
+var import_node_path = __toESM(require("node:path"));
+var import_fs_extra = __toESM(require("@modern-js/utils/fs-extra"));
+var import_core = require("@rsbuild/core");
 var import_common = require("../common");
 var import_rsc_client_plugin = require("./rsc-client-plugin");
 var import_rsc_server_plugin = require("./rsc-server-plugin");
@@ -42,11 +45,37 @@ const CSS_RULE_NAMES = [
   "scss",
   "sass"
 ];
+const checkReactVersionAtLeast19 = async (appDir) => {
+  const packageJsonPath = import_node_path.default.resolve(appDir, "package.json");
+  const packageJson = await import_fs_extra.default.readJSON(packageJsonPath);
+  if (!packageJson.dependencies) {
+    return false;
+  }
+  const { dependencies } = packageJson;
+  const reactVersion = dependencies.react;
+  const reactDomVersion = dependencies["react-dom"];
+  if (!reactVersion || !reactDomVersion) {
+    return false;
+  }
+  const cleanVersion = (version) => version.replace(/[\^~]/g, "");
+  const reactVersionParts = cleanVersion(reactVersion).split(".");
+  const reactDomVersionParts = cleanVersion(reactDomVersion).split(".");
+  const reactMajor = parseInt(reactVersionParts[0], 10);
+  const reactDomMajor = parseInt(reactDomVersionParts[0], 10);
+  if (Number.isNaN(reactMajor) || Number.isNaN(reactDomMajor)) {
+    return false;
+  }
+  return reactMajor >= 19 && reactDomMajor >= 19;
+};
 const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscServerRuntimePath }) => ({
   name: "uni-builder:rsc-rsbuild-plugin",
   setup(api) {
     api.modifyBundlerChain({
       handler: async (chain, { isServer, CHAIN_ID }) => {
+        if (!await checkReactVersionAtLeast19(appDir)) {
+          import_core.logger.error("Enable react server component, please make sure the react and react-dom versions are greater than or equal to 19.0.0");
+          process.exit(1);
+        }
         const entryPath2Name = /* @__PURE__ */ new Map();
         for (const [name, entry] of Object.entries(chain.entryPoints.entries())) {
           entry.values().forEach((value) => {
@@ -80,6 +109,9 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
             /AppProxy/
           ]).layer(import_common.webpackRscLayerName).end();
           chain.module.rule(import_common.webpackRscLayerName).issuerLayer(import_common.webpackRscLayerName).resolve.conditionNames.add(import_common.webpackRscLayerName).add("...");
+          chain.module.rule("rsc-common").resource([
+            /universal[/\\]async_storage/
+          ]).layer("rsc-common");
         };
         const flightCssHandler = () => {
           CSS_RULE_NAMES.forEach((ruleName) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.65.1",
+  "version": "2.65.2",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "@rsbuild/plugin-typed-css-modules": "1.0.2",
     "@rsbuild/plugin-yaml": "1.0.2",
     "@rsbuild/webpack": "1.2.2",
-    "@swc/core": "1.10.16",
+    "@swc/core": "1.10.18",
     "@swc/helpers": "0.5.13",
     "autoprefixer": "10.4.20",
     "babel-loader": "9.2.1",
@@ -56,7 +56,7 @@
     "babel-plugin-styled-components": "1.13.3",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "browserslist": "4.24.4",
-    "cssnano": "6.0.1",
+    "cssnano": "6.1.2",
     "es-module-lexer": "^1.1.0",
     "glob": "^9.3.5",
     "html-minifier-terser": "^7.2.0",
@@ -79,9 +79,9 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.98.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/babel-preset": "2.65.1",
-    "@modern-js/flight-server-transform-plugin": "2.65.1",
-    "@modern-js/utils": "2.65.1"
+    "@modern-js/babel-preset": "2.65.2",
+    "@modern-js/flight-server-transform-plugin": "2.65.2",
+    "@modern-js/utils": "2.65.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.0.9",
@@ -92,9 +92,9 @@
     "react-dom": "^18.2.0",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@modern-js/types": "2.65.1",
-    "@scripts/build": "2.65.1",
-    "@scripts/vitest-config": "2.65.1"
+    "@modern-js/types": "2.65.2",
+    "@scripts/build": "2.65.2",
+    "@scripts/vitest-config": "2.65.2"
   },
   "publishConfig": {
     "access": "public",