@modern-js/uni-builder 2.68.0 → 2.68.2

package/dist/rspack/index.js

@@ -128,12 +128,13 @@ async function parseConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_server_rsc;
   const enableRsc = (_uniBuilderConfig_server_rsc = (_uniBuilderConfig_server = uniBuilderConfig.server) === null || _uniBuilderConfig_server === void 0 ? void 0 : _uniBuilderConfig_server.rsc) !== null && _uniBuilderConfig_server_rsc !== void 0 ? _uniBuilderConfig_server_rsc : false;
   if (enableRsc) {
-    const { rscClientRuntimePath, rscServerRuntimePath } = options;
+    const { rscClientRuntimePath, rscServerRuntimePath, internalDirectory } = options;
     rsbuildPlugins.push((0, import_rsbuild_rsc_plugin.rsbuildRscPlugin)({
       appDir: options.cwd,
       isRspack: true,
       rscClientRuntimePath,
-      rscServerRuntimePath
+      rscServerRuntimePath,
+      internalDirectory
     }));
   }
   return {
@@ -142,7 +143,7 @@ async function parseConfig(uniBuilderConfig, 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/shared/rsc/plugins/rsbuild-rsc-plugin.d.ts

@@ -1,7 +1,8 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
-export declare const rsbuildRscPlugin: ({ appDir, isRspack, rscClientRuntimePath, rscServerRuntimePath, }: {
+export declare const rsbuildRscPlugin: ({ appDir, isRspack, rscClientRuntimePath, rscServerRuntimePath, internalDirectory, }: {
     appDir: string;
     isRspack?: boolean;
     rscClientRuntimePath?: string;
     rscServerRuntimePath?: string;
+    internalDirectory?: string;
 }) => RsbuildPlugin;

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

@@ -67,7 +67,7 @@ const checkReactVersionAtLeast19 = async (appDir) => {
   }
   return reactMajor >= 19 && reactDomMajor >= 19;
 };
-const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscServerRuntimePath }) => ({
+const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscServerRuntimePath, internalDirectory }) => ({
   name: "uni-builder:rsc-rsbuild-plugin",
   setup(api) {
     api.modifyBundlerChain({
@@ -93,9 +93,11 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
             chain.module.rule(CHAIN_ID.RULE.JS).oneOf("rsc-server").issuerLayer(import_common.webpackRscLayerName).exclude.add(/universal[/\\]async_storage/).end().use("rsc-server-loader").loader(require.resolve("../rsc-server-loader")).options({
               entryPath2Name,
               appDir,
-              runtimePath: rscServerRuntimePath
+              runtimePath: rscServerRuntimePath,
+              internalDirectory
             }).end().use(JSRule).loader(jsLoaderPath).options(jsLoaderOptions).end().end().oneOf("rsc-ssr").exclude.add(/universal[/\\]async_storage/).end().use("rsc-ssr-loader").loader(require.resolve("../rsc-ssr-loader")).options({
-              entryPath2Name
+              entryPath2Name,
+              internalDirectory
             }).end().use(JSRule).loader(jsLoaderPath).options(jsLoaderOptions).end().end();
           }
         };
@@ -104,9 +106,11 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
             ...chain.experiments,
             layers: true
           });
+          const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, "[/\\\\]")}[/\\\\][^/\\\\]*[/\\\\]routes`);
           chain.module.rule("server-module").resource([
             /render[/\\].*[/\\]server[/\\]rsc/,
-            /AppProxy/
+            /AppProxy/,
+            routesFileReg
           ]).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([
@@ -139,11 +143,6 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
           const ClientPlugin = isRspack ? import_rspack_rsc_client_plugin.RspackRscClientPlugin : import_rsc_client_plugin.RscClientPlugin;
           chain.plugin("rsc-client-plugin").use(ClientPlugin);
         };
-        const configureRuntimeChunk = () => {
-          chain.optimization.runtimeChunk({
-            name: (entrypoint) => `runtime-${entrypoint.name}`
-          });
-        };
         if (isServer) {
           chain.name("server");
           layerHandler();
@@ -157,7 +156,6 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
           ]);
           addRscClientLoader();
           addRscClientPlugin();
-          configureRuntimeChunk();
         }
       },
       order: "post"

package/dist/shared/rsc/plugins/rsc-server-plugin.d.ts

@@ -14,7 +14,15 @@ export declare class RscServerPlugin {
     private serverManifestFilename;
     private entryPath2Name;
     private styles;
+    private moduleToEntries;
     constructor(options: RscServerPluginOptions);
+    private isValidModule;
+    private hasValidEntries;
+    private traverseModulesFromEntry;
     private findModuleEntries;
+    private getEntryNameFromIssuer;
+    private createEntryFromIssuer;
+    private buildModuleToEntriesMapping;
+    private getEntryPathByName;
     apply(compiler: Webpack.Compiler): void;
 }

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

@@ -25,15 +25,50 @@ var import_webpack = require("webpack");
 var import_common = require("../common");
 const resourcePath2Entries = /* @__PURE__ */ new Map();
 class RscServerPlugin {
-  findModuleEntries(module2, compilation, resourcePath2Entries2, visited = /* @__PURE__ */ new Set()) {
+  isValidModule(module2) {
+    return Boolean(module2 === null || module2 === void 0 ? void 0 : module2.resource);
+  }
+  hasValidEntries(entries) {
+    return Boolean(entries && entries.length > 0);
+  }
+  traverseModulesFromEntry(module2, entryName, moduleGraph, visited) {
     if (!(module2 === null || module2 === void 0 ? void 0 : module2.resource) || visited.has(module2.resource)) {
+      return;
+    }
+    visited.add(module2.resource);
+    if (!this.moduleToEntries.has(module2.resource)) {
+      this.moduleToEntries.set(module2.resource, /* @__PURE__ */ new Set());
+    }
+    this.moduleToEntries.get(module2.resource).add(entryName);
+    for (const connection of moduleGraph.getOutgoingConnections(module2)) {
+      if (connection.module && "resource" in connection.module) {
+        this.traverseModulesFromEntry(connection.module, entryName, moduleGraph, visited);
+      }
+    }
+  }
+  findModuleEntries(module2, compilation, resourcePath2Entries2, visited = /* @__PURE__ */ new Set()) {
+    if (!this.isValidModule(module2) || visited.has(module2.resource)) {
       return [];
     }
     visited.add(module2.resource);
     const currentEntries = resourcePath2Entries2.get(module2.resource);
-    if (currentEntries && (currentEntries === null || currentEntries === void 0 ? void 0 : currentEntries.length) > 0) {
+    if (this.hasValidEntries(currentEntries)) {
       return currentEntries;
     }
+    const entryNames = this.moduleToEntries.get(module2.resource);
+    if (entryNames && entryNames.size > 0) {
+      const entries = [];
+      for (const entryName2 of entryNames) {
+        const entryPath = this.getEntryPathByName(entryName2, compilation);
+        if (entryPath) {
+          entries.push({
+            entryName: entryName2,
+            entryPath
+          });
+        }
+      }
+      return entries;
+    }
     const issuer = (0, import_common.findRootIssuer)(compilation.moduleGraph, module2);
     if (!issuer) {
       return [];
@@ -42,19 +77,42 @@ class RscServerPlugin {
     if (issuerEntries.length > 0) {
       return issuerEntries;
     }
-    if (issuer.resource) {
-      const entryName = this.entryPath2Name.get(issuer.resource);
-      if (entryName) {
-        return [
-          {
-            entryName,
-            entryPath: issuer.resource
-          }
-        ];
-      }
+    const entryName = this.getEntryNameFromIssuer(issuer);
+    if (entryName) {
+      return [
+        this.createEntryFromIssuer(issuer, entryName)
+      ];
     }
     return [];
   }
+  getEntryNameFromIssuer(issuer) {
+    return issuer.resource ? this.entryPath2Name.get(issuer.resource) : void 0;
+  }
+  createEntryFromIssuer(issuer, entryName) {
+    return {
+      entryName,
+      entryPath: issuer.resource
+    };
+  }
+  buildModuleToEntriesMapping(compilation) {
+    this.moduleToEntries.clear();
+    for (const [entryName, entryDependency] of compilation.entries.entries()) {
+      const entryModule = compilation.moduleGraph.getModule(entryDependency.dependencies[0]);
+      if (!entryModule)
+        continue;
+      this.traverseModulesFromEntry(entryModule, entryName, compilation.moduleGraph, /* @__PURE__ */ new Set());
+    }
+  }
+  getEntryPathByName(entryName, compilation) {
+    const entryDependency = compilation.entries.get(entryName);
+    if (entryDependency && entryDependency.dependencies.length > 0) {
+      const firstDep = entryDependency.dependencies[0];
+      if ("request" in firstDep && typeof firstDep.request === "string") {
+        return firstDep.request;
+      }
+    }
+    return void 0;
+  }
   apply(compiler) {
     const { EntryPlugin, WebpackError, dependencies: { NullDependency }, sources: { RawSource }, RuntimeGlobals } = compiler.webpack;
     class ServerReferenceDependency extends NullDependency {
@@ -107,6 +165,7 @@ class RscServerPlugin {
     };
     let needsAdditionalPass = false;
     compiler.hooks.finishMake.tapPromise(RscServerPlugin.name, async (compilation) => {
+      this.buildModuleToEntriesMapping(compilation);
       const processModules = (modules) => {
         let hasChangeReference2 = false;
         for (const module2 of modules) {
@@ -261,6 +320,7 @@ class RscServerPlugin {
     this.serverReferencesMap = /* @__PURE__ */ new Map();
     this.serverManifest = {};
     this.entryPath2Name = /* @__PURE__ */ new Map();
+    this.moduleToEntries = /* @__PURE__ */ new Map();
     this.styles = /* @__PURE__ */ new Set();
     this.serverManifestFilename = (options === null || options === void 0 ? void 0 : options.serverManifestFilename) || `react-server-manifest.json`;
     this.entryPath2Name = (options === null || options === void 0 ? void 0 : options.entryPath2Name) || /* @__PURE__ */ new Map();

package/dist/shared/rsc/plugins/rspack-rsc-server-plugin.d.ts

@@ -18,11 +18,15 @@ export declare class RscServerPlugin {
     private serverManifestFilename;
     private entryPath2Name;
     private styles;
+    private moduleToEntries;
     constructor(options: RscServerPluginOptions);
     private isValidModule;
     private hasValidEntries;
     private getEntryNameFromIssuer;
     private createEntryFromIssuer;
+    private buildModuleToEntriesMapping;
+    private traverseModulesFromEntry;
     private findModuleEntries;
+    private getEntryPathByName;
     apply(compiler: Webpack.Compiler): void;
 }

package/dist/shared/rsc/plugins/rspack-rsc-server-plugin.js

@@ -39,6 +39,30 @@ class RscServerPlugin {
       entryPath: issuer.resource
     };
   }
+  buildModuleToEntriesMapping(compilation) {
+    this.moduleToEntries.clear();
+    for (const [entryName, entryDependency] of compilation.entries.entries()) {
+      const entryModule = compilation.moduleGraph.getModule(entryDependency.dependencies[0]);
+      if (!entryModule)
+        continue;
+      this.traverseModulesFromEntry(entryModule, entryName, compilation.moduleGraph, /* @__PURE__ */ new Set());
+    }
+  }
+  traverseModulesFromEntry(module2, entryName, moduleGraph, visited) {
+    if (!(module2 === null || module2 === void 0 ? void 0 : module2.resource) || visited.has(module2.resource)) {
+      return;
+    }
+    visited.add(module2.resource);
+    if (!this.moduleToEntries.has(module2.resource)) {
+      this.moduleToEntries.set(module2.resource, /* @__PURE__ */ new Set());
+    }
+    this.moduleToEntries.get(module2.resource).add(entryName);
+    for (const connection of moduleGraph.getOutgoingConnections(module2)) {
+      if (connection.module && "resource" in connection.module) {
+        this.traverseModulesFromEntry(connection.module, entryName, moduleGraph, visited);
+      }
+    }
+  }
   findModuleEntries(module2, compilation, resourcePath2Entries2, visited = /* @__PURE__ */ new Set()) {
     if (!this.isValidModule(module2) || visited.has(module2.resource)) {
       return [];
@@ -48,12 +72,26 @@ class RscServerPlugin {
     if (this.hasValidEntries(currentEntries)) {
       return currentEntries;
     }
+    const entryNames = this.moduleToEntries.get(module2.resource);
+    if (entryNames && entryNames.size > 0) {
+      const entries = [];
+      for (const entryName2 of entryNames) {
+        const entryPath = this.getEntryPathByName(entryName2, compilation);
+        if (entryPath) {
+          entries.push({
+            entryName: entryName2,
+            entryPath
+          });
+        }
+      }
+      return entries;
+    }
     const issuer = (0, import_common.findRootIssuer)(compilation.moduleGraph, module2);
     if (!issuer) {
       return [];
     }
     const issuerEntries = this.findModuleEntries(issuer, compilation, resourcePath2Entries2, visited);
-    if (this.hasValidEntries(issuerEntries)) {
+    if (issuerEntries.length > 0) {
       return issuerEntries;
     }
     const entryName = this.getEntryNameFromIssuer(issuer);
@@ -64,6 +102,16 @@ class RscServerPlugin {
     }
     return [];
   }
+  getEntryPathByName(entryName, compilation) {
+    const entryDependency = compilation.entries.get(entryName);
+    if (entryDependency && entryDependency.dependencies.length > 0) {
+      const firstDep = entryDependency.dependencies[0];
+      if ("request" in firstDep && typeof firstDep.request === "string") {
+        return firstDep.request;
+      }
+    }
+    return void 0;
+  }
   apply(compiler) {
     const { EntryPlugin, WebpackError, sources: { RawSource } } = compiler.webpack;
     const includeModule = async (compilation, resource, resourceEntryNames, layer) => {
@@ -103,6 +151,7 @@ class RscServerPlugin {
     };
     let needsAdditionalPass = false;
     compiler.hooks.finishMake.tapPromise(RscServerPlugin.name, async (compilation) => {
+      this.buildModuleToEntriesMapping(compilation);
       const processModules = (modules) => {
         let hasChangeReference2 = false;
         for (const module2 of modules) {
@@ -231,6 +280,7 @@ class RscServerPlugin {
     this.serverReferencesMap = /* @__PURE__ */ new Map();
     this.serverManifest = {};
     this.entryPath2Name = /* @__PURE__ */ new Map();
+    this.moduleToEntries = /* @__PURE__ */ new Map();
     this.styles = /* @__PURE__ */ new Set();
     this.serverManifestFilename = (options === null || options === void 0 ? void 0 : options.serverManifestFilename) || `react-server-manifest.json`;
     this.entryPath2Name = (options === null || options === void 0 ? void 0 : options.entryPath2Name) || /* @__PURE__ */ new Map();

package/dist/shared/rsc/rsc-server-loader.js

@@ -67,7 +67,8 @@ async function rscServerLoader(source) {
           ]
         ]
       }
-    }
+    },
+    isModule: true
   });
   const { code, map } = result;
   const metadata = extractMetadata(code);

package/dist/types.d.ts

@@ -41,6 +41,7 @@ export type CreateBuilderCommonOptions = {
     cwd: string;
     rscClientRuntimePath?: string;
     rscServerRuntimePath?: string;
+    internalDirectory?: string;
 };
 export type BundlerType = 'rspack' | 'webpack';
 export type CreateUniBuilderOptions = {

package/dist/webpack/index.js

@@ -101,12 +101,13 @@ async function parseConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_server_rsc;
   const enableRsc = (_uniBuilderConfig_server_rsc = (_uniBuilderConfig_server = uniBuilderConfig.server) === null || _uniBuilderConfig_server === void 0 ? void 0 : _uniBuilderConfig_server.rsc) !== null && _uniBuilderConfig_server_rsc !== void 0 ? _uniBuilderConfig_server_rsc : false;
   if (enableRsc) {
-    const { rscClientRuntimePath, rscServerRuntimePath } = options;
+    const { rscClientRuntimePath, rscServerRuntimePath, internalDirectory } = options;
     rsbuildPlugins.push((0, import_rsbuild_rsc_plugin.rsbuildRscPlugin)({
       appDir: options.cwd,
       isRspack: false,
       rscClientRuntimePath,
-      rscServerRuntimePath
+      rscServerRuntimePath,
+      internalDirectory
     }));
   }
   if ((_uniBuilderConfig_tools1 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools1 === void 0 ? void 0 : _uniBuilderConfig_tools1.tsLoader) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.68.0",
+  "version": "2.68.2",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -30,19 +30,19 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.26.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.16",
-    "@rsbuild/core": "1.4.3",
-    "@rsbuild/plugin-assets-retry": "1.3.0",
+    "@rsbuild/core": "1.4.4",
+    "@rsbuild/plugin-assets-retry": "1.4.0",
     "@rsbuild/plugin-babel": "1.0.5",
     "@rsbuild/plugin-check-syntax": "1.3.0",
     "@rsbuild/plugin-css-minimizer": "1.0.2",
-    "@rsbuild/plugin-less": "1.2.4",
+    "@rsbuild/plugin-less": "1.2.5",
     "@rsbuild/plugin-pug": "1.3.1",
-    "@rsbuild/plugin-react": "1.3.2",
+    "@rsbuild/plugin-react": "1.3.4",
     "@rsbuild/plugin-rem": "1.0.2",
-    "@rsbuild/plugin-sass": "1.3.2",
+    "@rsbuild/plugin-sass": "1.3.3",
     "@rsbuild/plugin-source-build": "1.0.2",
     "@rsbuild/plugin-styled-components": "1.4.0",
-    "@rsbuild/plugin-svgr": "1.2.0",
+    "@rsbuild/plugin-svgr": "1.2.1",
     "@rsbuild/plugin-toml": "1.1.0",
     "@rsbuild/plugin-type-check": "1.2.3",
     "@rsbuild/plugin-typed-css-modules": "1.0.2",
@@ -64,8 +64,8 @@
     "jiti": "1.21.7",
     "lodash": "^4.17.21",
     "magic-string": "0.30.17",
-    "picocolors": "^1.0.1",
-    "postcss": "^8.4.35",
+    "picocolors": "^1.1.1",
+    "postcss": "^8.5.6",
     "postcss-custom-properties": "13.3.12",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-font-variant": "5.0.0",
@@ -80,9 +80,9 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.99.8",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/babel-preset": "2.68.0",
-    "@modern-js/flight-server-transform-plugin": "2.68.0",
-    "@modern-js/utils": "2.68.0"
+    "@modern-js/babel-preset": "2.68.2",
+    "@modern-js/flight-server-transform-plugin": "2.68.2",
+    "@modern-js/utils": "2.68.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.1.1",
@@ -93,7 +93,7 @@
     "react-dom": "^18.2.0",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@modern-js/types": "2.68.0",
+    "@modern-js/types": "2.68.2",
     "@scripts/build": "2.66.0",
     "@scripts/vitest-config": "2.66.0"
   },