@modern-js/uni-builder 2.69.5 → 2.69.7

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);
@@ -71,7 +72,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,11 +150,17 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
           flightCssHandler();
           jsHandler();
           addServerRscPlugin();
-        } else {
+        } else if (!isWebWorker) {
           chain.name("client");
           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,
@@ -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);
@@ -84,29 +86,13 @@ 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");
       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);
@@ -118,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.69.5",
+  "version": "2.69.7",
   "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.1",
     "@rsbuild/plugin-assets-retry": "1.5.0",
     "@rsbuild/plugin-babel": "1.0.6",
     "@rsbuild/plugin-check-syntax": "1.6.0",
@@ -51,14 +51,14 @@
     "@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",
     "babel-loader": "9.2.1",
@@ -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.7",
+    "@modern-js/flight-server-transform-plugin": "2.69.7",
+    "@modern-js/utils": "2.69.7"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.1.2",
@@ -103,7 +103,7 @@
     "react-dom": "^18.2.0",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@modern-js/types": "2.69.5",
+    "@modern-js/types": "2.69.7",
     "@scripts/build": "2.66.0",
     "@scripts/vitest-config": "2.66.0"
   },