@modern-js/app-tools 2.10.0 → 2.11.0

package/CHANGELOG.md

@@ -1,5 +1,71 @@
 # @modern-js/app-tools
 
+## 2.11.0
+
+### Patch Changes
+
+- 415bee6: fix: load chunk while can not load all css asset, when streaming ssr.
+  fix: 使用 streaming ssr 时，不能加载当前 chunk 的所有 css 资源
+- c0ba89b: feat: 控制台输出 rspack 版本
+  feat: Print the version of rspack in the console.
+- 0bd018b: feat: support use node api run dev & build & deploy command
+  feat: 支持通过 node api 运行 dev & build & deploy 命令
+- 5d624fd: feat: assets and data prefetching is supported
+  feat: 支持资源和数据预加载
+- 7017909: fix: distpath.root not take effect when serve
+
+  fix: 修复 distpath.root 在 run serve 时不生效的问题
+
+- 381a3b9: feat(utils): move universal utils to the universal folder
+
+  feat(utils): 将运行时使用的 utils 移动到 universal 目录
+
+- a47543a: fix: should hide publicPath in injected manifest
+  fix: 应该隐藏 publicPath 在注入的 manifest 中
+- Updated dependencies [adcedad]
+- Updated dependencies [cfb058f]
+- Updated dependencies [a9c6083]
+- Updated dependencies [55b07fd]
+- Updated dependencies [c0ba89b]
+- Updated dependencies [0bd018b]
+- Updated dependencies [8b90c79]
+- Updated dependencies [a8c08c3]
+- Updated dependencies [3aa318d]
+- Updated dependencies [5d624fd]
+- Updated dependencies [e2466a1]
+- Updated dependencies [58faba2]
+- Updated dependencies [53b0a63]
+- Updated dependencies [02bb383]
+- Updated dependencies [3171c9d]
+- Updated dependencies [381a3b9]
+- Updated dependencies [7a60f10]
+- Updated dependencies [73cfc9b]
+- Updated dependencies [cd1040f]
+- Updated dependencies [e262a99]
+- Updated dependencies [7178795]
+- Updated dependencies [1140a69]
+- Updated dependencies [b71cef1]
+- Updated dependencies [274b2e5]
+- Updated dependencies [b9e1c54]
+  - @modern-js/builder-shared@2.11.0
+  - @modern-js/builder-webpack-provider@2.11.0
+  - @modern-js/builder@2.11.0
+  - @modern-js/utils@2.11.0
+  - @modern-js/builder-rspack-provider@2.11.0
+  - @modern-js/core@2.11.0
+  - @modern-js/builder-plugin-node-polyfill@2.11.0
+  - @modern-js/plugin-data-loader@2.11.0
+  - @modern-js/plugin-lint@2.11.0
+  - @modern-js/prod-server@2.11.0
+  - @modern-js/server@2.11.0
+  - @modern-js/builder-plugin-esbuild@2.11.0
+  - @modern-js/plugin-i18n@2.11.0
+  - @modern-js/new-action@2.11.0
+  - @modern-js/node-bundle-require@2.11.0
+  - @modern-js/upgrade@2.11.0
+  - @modern-js/plugin@2.11.0
+  - @modern-js/types@2.11.0
+
 ## 2.10.0
 
 ### Patch Changes

package/dist/cjs/analyze/index.js

@@ -118,7 +118,7 @@ var analyze_default = ({
         debug(`add Define Types`);
         let checkedEntries = entrypoints.map((point) => point.entryName);
         if ((0, import_utils.isDevCommand)()) {
-          const { entry } = (0, import_utils.minimist)(process.argv.slice(2));
+          const { entry } = (0, import_utils.minimist)((0, import_utils.getArgv)());
           checkedEntries = await (0, import_getSelectedEntries.getSelectedEntries)(
             typeof entry === "string" ? entry.split(",") : entry,
             entrypoints

package/dist/cjs/builder/index.js

@@ -35,7 +35,9 @@ async function createBuilderGenerator(bundler) {
   if (bundler === "rspack") {
     try {
       const { createRspackBuilderForModern } = await Promise.resolve().then(() => __toESM(require("./builder-rspack")));
-      import_utils.logger.info("Using Rspack ✨");
+      const { getRspackVersion } = await Promise.resolve().then(() => __toESM(require("@modern-js/builder-rspack-provider")));
+      const version = await getRspackVersion();
+      import_utils.logger.info(`Using Rspack v${version} 🦀`);
       return createRspackBuilderForModern;
     } catch (_) {
       throw new Error(

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -43,8 +43,8 @@ const builderPluginAdapterSSR = (options) => ({
       async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
         const builderConfig = api.getNormalizedConfig();
         const { normalizedConfig: normalizedConfig2 } = options;
+        applyRouterPlugin(chain, options);
         if ((0, import_utils.isSSR)(normalizedConfig2)) {
-          applyRouterPlugin(chain, options);
           await applySSRLoaderEntry(chain, options, isServer);
         }
         if (["node", "service-worker"].includes(target)) {

package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -32,6 +32,8 @@ __export(RouterPlugin_exports, {
 module.exports = __toCommonJS(RouterPlugin_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_constants = require("@modern-js/utils/constants");
+var import_constants2 = require("@modern-js/utils/universal/constants");
 const PLUGIN_NAME = "ModernjsRoutePlugin";
 class RouterPlugin {
   apply(compiler) {
@@ -66,11 +68,12 @@ class RouterPlugin {
             publicPath: true,
             assets: true,
             chunkGroups: true,
-            chunks: true
+            chunks: true,
+            ids: true
           });
-          const { publicPath, chunks = [] } = stats;
+          const { publicPath, chunks = [], assetsByChunkName } = stats;
           const routeAssets = {};
-          const { namedChunkGroups, assetsByChunkName } = stats;
+          const { namedChunkGroups } = stats;
           if (!namedChunkGroups || !assetsByChunkName) {
             import_utils.logger.warn(
               "Route manifest does not exist, performance will be affected"
@@ -78,21 +81,31 @@ class RouterPlugin {
             return;
           }
           for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
-            if (assetsByChunkName[name]) {
-              routeAssets[name] = {
-                chunkIds: chunkGroup.chunks,
-                assets: assetsByChunkName[name].map(
-                  (item) => publicPath ? normalizePath(publicPath) + item : item
-                )
-              };
-            }
+            const referenceCssAssets = chunkGroup.assets.filter((asset) => /\.css$/.test(asset.name)).map((asset) => {
+              const item = asset.name;
+              return publicPath ? normalizePath(publicPath) + item : item;
+            });
+            routeAssets[name] = {
+              chunkIds: chunkGroup.chunks,
+              assets: assetsByChunkName[name].map(
+                (item) => publicPath ? normalizePath(publicPath) + item : item
+              ),
+              referenceCssAssets
+            };
           }
           const manifest = {
             routeAssets
           };
           const injectedContent = `
             ;(function(){
-              window.${import_utils.ROUTE_MANIFEST} = ${JSON.stringify(manifest)};
+              window.${import_constants2.ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v) => {
+            if (k === "assets" && Array.isArray(v)) {
+              return v.map((item) => {
+                return item.replace(publicPath, "");
+              });
+            }
+            return v;
+          })};
             })();
           `;
           const entrypointsArray = Array.from(
@@ -122,7 +135,7 @@ class RouterPlugin {
               void 0
             );
           }
-          const filename = import_path.default.join(outputPath, import_utils.ROUTE_MINIFEST_FILE);
+          const filename = import_path.default.join(outputPath, import_constants.ROUTE_MANIFEST_FILE);
           await import_utils.fs.ensureFile(filename);
           await import_utils.fs.writeFile(filename, JSON.stringify(manifest, null, 2));
         }

package/dist/cjs/commands/serve.js

@@ -36,7 +36,7 @@ var import_printInstructions = require("../utils/printInstructions");
 var import_createServer = require("../utils/createServer");
 var import_getServerInternalPlugins = require("../utils/getServerInternalPlugins");
 const start = async (api) => {
-  var _a;
+  var _a, _b;
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
@@ -49,7 +49,14 @@ const start = async (api) => {
   const serverInternalPlugins = await (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
   const app = await (0, import_prod_server.default)({
     pwd: appDirectory,
-    config: userConfig,
+    config: {
+      ...userConfig,
+      dev: userConfig.dev,
+      output: {
+        path: (_b = userConfig.output.distPath) == null ? void 0 : _b.root,
+        ...userConfig.output || {}
+      }
+    },
     appContext: {
       sharedDirectory: (0, import_utils.getTargetDir)(
         appContext.sharedDirectory,

package/dist/cjs/utils/restart.js

@@ -35,7 +35,7 @@ async function restart(hooksRunner, filename) {
     hasGetError = true;
   } finally {
     if (!hasGetError) {
-      import_utils.program.parse(process.argv);
+      import_utils.program.parse((0, import_utils.getArgv)());
     }
   }
 }

package/dist/esm/analyze/index.js

@@ -221,7 +221,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import * as path from "path";
-import { createDebugger, findExists, fs, isApiOnly, minimist, getCommand, isDevCommand } from "@modern-js/utils";
+import { createDebugger, findExists, fs, isApiOnly, minimist, getCommand, isDevCommand, getArgv } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
@@ -358,7 +358,7 @@ var analyze_default = function(param) {
                                         3,
                                         11
                                     ];
-                                    entry = minimist(process.argv.slice(2)).entry;
+                                    entry = minimist(getArgv()).entry;
                                     return [
                                         4,
                                         getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints)

package/dist/esm/builder/index.js

@@ -128,21 +128,21 @@ function createBuilderGenerator(bundler) {
 }
 function _createBuilderGenerator() {
     _createBuilderGenerator = _asyncToGenerator(function(bundler) {
-        var createRspackBuilderForModern, _, createWebpackBuilderForModern;
+        var createRspackBuilderForModern, getRspackVersion, version, _, createWebpackBuilderForModern;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     if (!(bundler === "rspack")) return [
                         3,
-                        4
+                        6
                     ];
                     _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
-                        3,
+                        5,
                         ,
-                        4
+                        6
                     ]);
                     return [
                         4,
@@ -150,20 +150,32 @@ function _createBuilderGenerator() {
                     ];
                 case 2:
                     createRspackBuilderForModern = _state.sent().createRspackBuilderForModern;
-                    logger.info("Using Rspack ✨");
+                    return [
+                        4,
+                        import("@modern-js/builder-rspack-provider")
+                    ];
+                case 3:
+                    getRspackVersion = _state.sent().getRspackVersion;
+                    return [
+                        4,
+                        getRspackVersion()
+                    ];
+                case 4:
+                    version = _state.sent();
+                    logger.info("Using Rspack v".concat(version, " \uD83E\uDD80"));
                     return [
                         2,
                         createRspackBuilderForModern
                     ];
-                case 3:
+                case 5:
                     _ = _state.sent();
                     throw new Error("Failed to use Rspack, please check if you have `@modern-js/builder-rspack-provider` installed");
-                case 4:
+                case 6:
                     return [
                         4,
                         import("./builder-webpack")
                     ];
-                case 5:
+                case 7:
                     createWebpackBuilderForModern = _state.sent().createWebpackBuilderForModern;
                     return [
                         2,

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js

@@ -151,11 +151,11 @@ var builderPluginAdapterSSR = function(options) {
                                 target = param.target, CHAIN_ID = param.CHAIN_ID, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin, isServer = param.isServer;
                                 builderConfig = api.getNormalizedConfig();
                                 normalizedConfig2 = options.normalizedConfig;
+                                applyRouterPlugin(chain, options);
                                 if (!isSSR(normalizedConfig2)) return [
                                     3,
                                     2
                                 ];
-                                applyRouterPlugin(chain, options);
                                 return [
                                     4,
                                     applySSRLoaderEntry(chain, options, isServer)

package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -200,7 +200,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import { fs, ROUTE_MANIFEST, logger, ROUTE_MINIFEST_FILE } from "@modern-js/utils";
+import { fs, logger } from "@modern-js/utils";
+import { ROUTE_MANIFEST_FILE } from "@modern-js/utils/constants";
+import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
 var PLUGIN_NAME = "ModernjsRoutePlugin";
 var RouterPlugin = /*#__PURE__*/ function() {
     "use strict";
@@ -235,7 +237,7 @@ var RouterPlugin = /*#__PURE__*/ function() {
                         name: PLUGIN_NAME,
                         stage: PROCESS_ASSETS_STAGE_REPORT
                     }, /*#__PURE__*/ _asyncToGenerator(function() {
-                        var stats, publicPath, _stats_chunks, chunks, routeAssets, namedChunkGroups, assetsByChunkName, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, file, asset, newContent, filename;
+                        var stats, publicPath, _stats_chunks, chunks, assetsByChunkName, routeAssets, namedChunkGroups, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, referenceCssAssets, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, file, asset, newContent, filename;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -244,11 +246,12 @@ var RouterPlugin = /*#__PURE__*/ function() {
                                         publicPath: true,
                                         assets: true,
                                         chunkGroups: true,
-                                        chunks: true
+                                        chunks: true,
+                                        ids: true
                                     });
-                                    publicPath = stats.publicPath, _stats_chunks = stats.chunks, chunks = _stats_chunks === void 0 ? [] : _stats_chunks;
+                                    publicPath = stats.publicPath, _stats_chunks = stats.chunks, chunks = _stats_chunks === void 0 ? [] : _stats_chunks, assetsByChunkName = stats.assetsByChunkName;
                                     routeAssets = {};
-                                    namedChunkGroups = stats.namedChunkGroups, assetsByChunkName = stats.assetsByChunkName;
+                                    namedChunkGroups = stats.namedChunkGroups;
                                     if (!namedChunkGroups || !assetsByChunkName) {
                                         logger.warn("Route manifest does not exist, performance will be affected");
                                         return [
@@ -259,14 +262,19 @@ var RouterPlugin = /*#__PURE__*/ function() {
                                     try {
                                         for(_iterator = Object.entries(namedChunkGroups)[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                                             _step_value = _slicedToArray(_step.value, 2), name = _step_value[0], chunkGroup = _step_value[1];
-                                            if (assetsByChunkName[name]) {
-                                                routeAssets[name] = {
-                                                    chunkIds: chunkGroup.chunks,
-                                                    assets: assetsByChunkName[name].map(function(item) {
-                                                        return publicPath ? normalizePath(publicPath) + item : item;
-                                                    })
-                                                };
-                                            }
+                                            referenceCssAssets = chunkGroup.assets.filter(function(asset) {
+                                                return /\.css$/.test(asset.name);
+                                            }).map(function(asset) {
+                                                var item = asset.name;
+                                                return publicPath ? normalizePath(publicPath) + item : item;
+                                            });
+                                            routeAssets[name] = {
+                                                chunkIds: chunkGroup.chunks,
+                                                assets: assetsByChunkName[name].map(function(item) {
+                                                    return publicPath ? normalizePath(publicPath) + item : item;
+                                                }),
+                                                referenceCssAssets: referenceCssAssets
+                                            };
                                         }
                                     } catch (err) {
                                         _didIteratorError = true;
@@ -285,7 +293,14 @@ var RouterPlugin = /*#__PURE__*/ function() {
                                     manifest = {
                                         routeAssets: routeAssets
                                     };
-                                    injectedContent = "\n            ;(function(){\n              window.".concat(ROUTE_MANIFEST, " = ").concat(JSON.stringify(manifest), ";\n            })();\n          ");
+                                    injectedContent = "\n            ;(function(){\n              window.".concat(ROUTE_MANIFEST, " = ").concat(JSON.stringify(manifest, function(k, v) {
+                                        if (k === "assets" && Array.isArray(v)) {
+                                            return v.map(function(item) {
+                                                return item.replace(publicPath, "");
+                                            });
+                                        }
+                                        return v;
+                                    }), ";\n            })();\n          ");
                                     entrypointsArray = Array.from(compilation.entrypoints.entries());
                                     entryChunkIds = entrypointsArray.map(function(entrypoint) {
                                         return entrypoint[0];
@@ -328,7 +343,7 @@ var RouterPlugin = /*#__PURE__*/ function() {
                                             }
                                         }
                                     }
-                                    filename = path.join(outputPath, ROUTE_MINIFEST_FILE);
+                                    filename = path.join(outputPath, ROUTE_MANIFEST_FILE);
                                     return [
                                         4,
                                         fs.ensureFile(filename)

package/dist/esm/commands/serve.js

@@ -27,6 +27,58 @@ function _asyncToGenerator(fn) {
         });
     };
 }
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 var __generator = this && this.__generator || function(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -129,7 +181,7 @@ import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var start = function() {
     var _ref = _asyncToGenerator(function(api) {
-        var _userConfig_source, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, apiOnly, serverInternalPlugins, app;
+        var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, apiOnly, serverInternalPlugins, app;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -154,7 +206,12 @@ var start = function() {
                         4,
                         server({
                             pwd: appDirectory,
-                            config: userConfig,
+                            config: _objectSpreadProps(_objectSpread({}, userConfig), {
+                                dev: userConfig.dev,
+                                output: _objectSpread({
+                                    path: (_userConfig_output_distPath = userConfig.output.distPath) === null || _userConfig_output_distPath === void 0 ? void 0 : _userConfig_output_distPath.root
+                                }, userConfig.output || {})
+                            }),
                             appContext: {
                                 sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
                                 apiDirectory: getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),

package/dist/esm/utils/restart.js

@@ -123,7 +123,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { cli } from "@modern-js/core";
-import { chalk, clearConsole, logger, program } from "@modern-js/utils";
+import { chalk, clearConsole, getArgv, logger, program } from "@modern-js/utils";
 function restart(hooksRunner, filename) {
     return _restart.apply(this, arguments);
 }
@@ -170,7 +170,7 @@ function _restart() {
                     ];
                 case 5:
                     if (!hasGetError) {
-                        program.parse(process.argv);
+                        program.parse(getArgv());
                     }
                     return [
                         7

package/dist/esm-node/analyze/index.js

@@ -6,7 +6,8 @@ import {
   isApiOnly,
   minimist,
   getCommand,
-  isDevCommand
+  isDevCommand,
+  getArgv
 } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { printInstructions } from "../utils/printInstructions";
@@ -98,7 +99,7 @@ var analyze_default = ({
         debug(`add Define Types`);
         let checkedEntries = entrypoints.map((point) => point.entryName);
         if (isDevCommand()) {
-          const { entry } = minimist(process.argv.slice(2));
+          const { entry } = minimist(getArgv());
           checkedEntries = await getSelectedEntries(
             typeof entry === "string" ? entry.split(",") : entry,
             entrypoints

package/dist/esm-node/builder/index.js

@@ -3,7 +3,9 @@ async function createBuilderGenerator(bundler) {
   if (bundler === "rspack") {
     try {
       const { createRspackBuilderForModern } = await import("./builder-rspack");
-      logger.info("Using Rspack ✨");
+      const { getRspackVersion } = await import("@modern-js/builder-rspack-provider");
+      const version = await getRspackVersion();
+      logger.info(`Using Rspack v${version} 🦀`);
       return createRspackBuilderForModern;
     } catch (_) {
       throw new Error(

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -23,8 +23,8 @@ const builderPluginAdapterSSR = (options) => ({
       async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
         const builderConfig = api.getNormalizedConfig();
         const { normalizedConfig: normalizedConfig2 } = options;
+        applyRouterPlugin(chain, options);
         if (isSSR(normalizedConfig2)) {
-          applyRouterPlugin(chain, options);
           await applySSRLoaderEntry(chain, options, isServer);
         }
         if (["node", "service-worker"].includes(target)) {

package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -1,10 +1,7 @@
 import path from "path";
-import {
-  fs,
-  ROUTE_MANIFEST,
-  logger,
-  ROUTE_MINIFEST_FILE
-} from "@modern-js/utils";
+import { fs, logger } from "@modern-js/utils";
+import { ROUTE_MANIFEST_FILE } from "@modern-js/utils/constants";
+import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
 const PLUGIN_NAME = "ModernjsRoutePlugin";
 class RouterPlugin {
   apply(compiler) {
@@ -39,11 +36,12 @@ class RouterPlugin {
             publicPath: true,
             assets: true,
             chunkGroups: true,
-            chunks: true
+            chunks: true,
+            ids: true
           });
-          const { publicPath, chunks = [] } = stats;
+          const { publicPath, chunks = [], assetsByChunkName } = stats;
           const routeAssets = {};
-          const { namedChunkGroups, assetsByChunkName } = stats;
+          const { namedChunkGroups } = stats;
           if (!namedChunkGroups || !assetsByChunkName) {
             logger.warn(
               "Route manifest does not exist, performance will be affected"
@@ -51,21 +49,31 @@ class RouterPlugin {
             return;
           }
           for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
-            if (assetsByChunkName[name]) {
-              routeAssets[name] = {
-                chunkIds: chunkGroup.chunks,
-                assets: assetsByChunkName[name].map(
-                  (item) => publicPath ? normalizePath(publicPath) + item : item
-                )
-              };
-            }
+            const referenceCssAssets = chunkGroup.assets.filter((asset) => /\.css$/.test(asset.name)).map((asset) => {
+              const item = asset.name;
+              return publicPath ? normalizePath(publicPath) + item : item;
+            });
+            routeAssets[name] = {
+              chunkIds: chunkGroup.chunks,
+              assets: assetsByChunkName[name].map(
+                (item) => publicPath ? normalizePath(publicPath) + item : item
+              ),
+              referenceCssAssets
+            };
           }
           const manifest = {
             routeAssets
           };
           const injectedContent = `
             ;(function(){
-              window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest)};
+              window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v) => {
+            if (k === "assets" && Array.isArray(v)) {
+              return v.map((item) => {
+                return item.replace(publicPath, "");
+              });
+            }
+            return v;
+          })};
             })();
           `;
           const entrypointsArray = Array.from(
@@ -95,7 +103,7 @@ class RouterPlugin {
               void 0
             );
           }
-          const filename = path.join(outputPath, ROUTE_MINIFEST_FILE);
+          const filename = path.join(outputPath, ROUTE_MANIFEST_FILE);
           await fs.ensureFile(filename);
           await fs.writeFile(filename, JSON.stringify(manifest, null, 2));
         }

package/dist/esm-node/commands/serve.js

@@ -4,7 +4,7 @@ import { printInstructions } from "../utils/printInstructions";
 import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 const start = async (api) => {
-  var _a;
+  var _a, _b;
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
@@ -17,7 +17,14 @@ const start = async (api) => {
   const serverInternalPlugins = await getServerInternalPlugins(api);
   const app = await server({
     pwd: appDirectory,
-    config: userConfig,
+    config: {
+      ...userConfig,
+      dev: userConfig.dev,
+      output: {
+        path: (_b = userConfig.output.distPath) == null ? void 0 : _b.root,
+        ...userConfig.output || {}
+      }
+    },
     appContext: {
       sharedDirectory: getTargetDir(
         appContext.sharedDirectory,

package/dist/esm-node/utils/restart.js

@@ -1,5 +1,11 @@
 import { cli } from "@modern-js/core";
-import { chalk, clearConsole, logger, program } from "@modern-js/utils";
+import {
+  chalk,
+  clearConsole,
+  getArgv,
+  logger,
+  program
+} from "@modern-js/utils";
 async function restart(hooksRunner, filename) {
   clearConsole();
   logger.info(`Restart because ${chalk.yellow(filename)} is changed...
@@ -13,7 +19,7 @@ async function restart(hooksRunner, filename) {
     hasGetError = true;
   } finally {
     if (!hasGetError) {
-      program.parse(process.argv);
+      program.parse(getArgv());
     }
   }
 }

package/dist/types/types/config/source.d.ts

@@ -24,5 +24,5 @@ export interface SharedSourceConfig extends BuilderSharedSourceConfig {
 
   designSystem?: Record<string, any>;
 }
-export interface SourceUserConfig extends BuilderSourceConfig, SharedSourceConfig {}
-export interface RsSourceUserConfig extends RsBuilderSourceConfig, SharedSourceConfig {}
+export type SourceUserConfig = BuilderSourceConfig & SharedSourceConfig;
+export type RsSourceUserConfig = RsBuilderSourceConfig & SharedSourceConfig;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.10.0",
+  "version": "2.11.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -68,23 +68,23 @@
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "2.10.0",
-    "@modern-js/builder-plugin-esbuild": "2.10.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.10.0",
-    "@modern-js/builder-shared": "2.10.0",
-    "@modern-js/builder-webpack-provider": "2.10.0",
-    "@modern-js/core": "2.10.0",
-    "@modern-js/new-action": "2.10.0",
-    "@modern-js/node-bundle-require": "2.10.0",
-    "@modern-js/plugin": "2.10.0",
-    "@modern-js/plugin-data-loader": "2.10.0",
-    "@modern-js/plugin-i18n": "2.10.0",
-    "@modern-js/plugin-lint": "2.10.0",
-    "@modern-js/prod-server": "2.10.0",
-    "@modern-js/server": "2.10.0",
-    "@modern-js/types": "2.10.0",
-    "@modern-js/upgrade": "2.10.0",
-    "@modern-js/utils": "2.10.0"
+    "@modern-js/builder": "2.11.0",
+    "@modern-js/builder-plugin-esbuild": "2.11.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.11.0",
+    "@modern-js/builder-shared": "2.11.0",
+    "@modern-js/builder-webpack-provider": "2.11.0",
+    "@modern-js/core": "2.11.0",
+    "@modern-js/new-action": "2.11.0",
+    "@modern-js/node-bundle-require": "2.11.0",
+    "@modern-js/plugin": "2.11.0",
+    "@modern-js/plugin-data-loader": "2.11.0",
+    "@modern-js/plugin-i18n": "2.11.0",
+    "@modern-js/plugin-lint": "2.11.0",
+    "@modern-js/prod-server": "2.11.0",
+    "@modern-js/server": "2.11.0",
+    "@modern-js/types": "2.11.0",
+    "@modern-js/upgrade": "2.11.0",
+    "@modern-js/utils": "2.11.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -93,14 +93,14 @@
     "jest": "^29",
     "typescript": "^4",
     "webpack": "^5.76.2",
-    "@modern-js/builder-plugin-swc": "2.10.0",
-    "@modern-js/builder-rspack-provider": "2.10.0",
-    "@modern-js/server-core": "2.10.0",
-    "@scripts/build": "2.10.0",
-    "@scripts/jest-config": "2.10.0"
+    "@modern-js/builder-plugin-swc": "2.11.0",
+    "@modern-js/builder-rspack-provider": "2.11.0",
+    "@modern-js/server-core": "2.11.0",
+    "@scripts/build": "2.11.0",
+    "@scripts/jest-config": "2.11.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.10.0"
+    "@modern-js/builder-rspack-provider": "^2.11.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {