@modern-js/builder 3.0.0-alpha.0 → 3.0.0-alpha.1

package/dist/createBuilder.js

@@ -129,7 +129,7 @@ async function parseConfig(builderConfig, options) {
   };
 }
 async function createRspackBuilder(options) {
-  const { cwd = process.cwd(), config, rscClientRuntimePath, rscServerRuntimePath, ...rest } = options;
+  const { cwd = process.cwd(), config, ...rest } = options;
   const { rsbuildConfig, rsbuildPlugins } = await parseConfig(config, {
     ...rest,
     cwd

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

@@ -43,6 +43,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);
@@ -69,7 +70,7 @@ const rsbuildRscPlugin = ({ appDir, rscClientRuntimePath, rscServerRuntimePath,
   name: "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);
@@ -147,11 +148,17 @@ const rsbuildRscPlugin = ({ appDir, rscClientRuntimePath, rscServerRuntimePath,
           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/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.rspack;
+    const { EntryPlugin, RuntimeGlobals, WebpackError, sources: { RawSource } } = compiler.rspack;
     const ssrManifest = {
       moduleMap: {},
       moduleLoading: null,
@@ -118,24 +118,6 @@ class RspackRscClientPlugin {
         }
       }
     });
-    compiler.hooks.compilation.tap(RspackRscClientPlugin.name, (compilation) => {
-      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) => {
-        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) => {
       this.styles = import_common.sharedData.get("styles");
       this.clientReferencesMap = import_common.sharedData.get("clientReferencesMap");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/builder",
-  "version": "3.0.0-alpha.0",
+  "version": "3.0.0-alpha.1",
   "description": "A builder for Modern.js",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "dist"
   ],
   "dependencies": {
-    "@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",
@@ -35,7 +35,7 @@
     "@rsbuild/plugin-svgr": "1.2.3",
     "@rsbuild/plugin-type-check": "1.3.2",
     "@rsbuild/plugin-typed-css-modules": "1.2.0",
-    "@swc/core": "1.14.0",
+    "@swc/core": "1.15.8",
     "@swc/helpers": "^0.5.17",
     "autoprefixer": "10.4.23",
     "browserslist": "4.28.1",
@@ -51,10 +51,10 @@
     "postcss-media-minmax": "5.0.0",
     "postcss-nesting": "12.1.5",
     "postcss-page-break": "3.0.4",
-    "rspack-manifest-plugin": "5.1.0",
+    "rspack-manifest-plugin": "5.2.0",
     "ts-deepmerge": "7.0.3",
-    "@modern-js/flight-server-transform-plugin": "3.0.0-alpha.0",
-    "@modern-js/utils": "3.0.0-alpha.0"
+    "@modern-js/flight-server-transform-plugin": "3.0.0-alpha.1",
+    "@modern-js/utils": "3.0.0-alpha.1"
   },
   "devDependencies": {
     "@types/html-minifier-terser": "^7.0.2",
@@ -62,9 +62,9 @@
     "react": "^19.2.3",
     "terser": "^5.44.1",
     "typescript": "^5.3.0",
-    "@modern-js/types": "3.0.0-alpha.0",
-    "@scripts/rstest-config": "2.66.0",
-    "@scripts/build": "2.66.0"
+    "@modern-js/types": "3.0.0-alpha.1",
+    "@scripts/build": "2.66.0",
+    "@scripts/rstest-config": "2.66.0"
   },
   "publishConfig": {
     "access": "public",