@modern-js/uni-builder 2.69.5 → 2.69.6

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

@@ -71,7 +71,7 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
   name: "uni-builder:rsc-rsbuild-plugin",
   setup(api) {
     api.modifyBundlerChain({
-      handler: async (chain, { isServer, CHAIN_ID }) => {
+      handler: async (chain, { isServer, CHAIN_ID, isWebWorker }) => {
         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);
@@ -149,7 +149,7 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
           flightCssHandler();
           jsHandler();
           addServerRscPlugin();
-        } else {
+        } else if (!isWebWorker) {
           chain.name("client");
           chain.dependencies([
             "server"

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

@@ -35,7 +35,7 @@ class RscClientPlugin {
         return `client-reference`;
       }
     }
-    const getEntryModule = (compilation) => {
+    const getEntryModule = (compilation, type) => {
       const entryModules = [];
       for (const [, entryValue] of compilation.entries.entries()) {
         const entryDependency = entryValue.dependencies.find((dependency) => dependency.constructor.name === `EntryDependency`);
@@ -49,7 +49,9 @@ class RscClientPlugin {
         }
       }
       if (entryModules.length === 0) {
-        compilation.errors.push(new WebpackError(`Could not find any entries in the compilation.`));
+        if (type === "finishMake") {
+          compilation.errors.push(new WebpackError(`Could not find any entries in the compilation.`));
+        }
         return [];
       }
       return entryModules;
@@ -74,7 +76,7 @@ class RscClientPlugin {
     };
     compiler.hooks.finishMake.tap(RscClientPlugin.name, (compilation) => {
       if (compiler.watchMode) {
-        const entryModules = getEntryModule(compilation);
+        const entryModules = getEntryModule(compilation, "finishMake");
         for (const entryModule of entryModules) {
           entryModule.blocks = entryModule.blocks.filter((block) => block.dependencies.some((dependency) => !(dependency instanceof ClientReferenceDependency) || this.clientReferencesMap.has(dependency.request)));
           addClientReferencesChunks(entryModule);
@@ -106,7 +108,7 @@ class RscClientPlugin {
       this.clientReferencesMap = import_common.sharedData.get("clientReferencesMap");
       const onNormalModuleFactoryParser = (parser) => {
         parser.hooks.program.tap(RscClientPlugin.name, () => {
-          const entryModules = getEntryModule(compilation);
+          const entryModules = getEntryModule(compilation, "jsParse");
           for (const entryModule of entryModules) {
             if (entryModule === parser.state.module) {
               addClientReferencesChunks(entryModule);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.69.5",
+  "version": "2.69.6",
   "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.69.5",
-    "@modern-js/flight-server-transform-plugin": "2.69.5",
-    "@modern-js/utils": "2.69.5"
+    "@modern-js/babel-preset": "2.69.6",
+    "@modern-js/flight-server-transform-plugin": "2.69.6",
+    "@modern-js/utils": "2.69.6"
   },
   "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.5",
-    "@scripts/build": "2.66.0",
-    "@scripts/vitest-config": "2.66.0"
+    "@modern-js/types": "2.69.6",
+    "@scripts/vitest-config": "2.66.0",
+    "@scripts/build": "2.66.0"
   },
   "publishConfig": {
     "access": "public",