@modern-js/app-tools 2.20.0 → 2.21.1

package/CHANGELOG.md

@@ -1,5 +1,102 @@
 # @modern-js/app-tools
 
+## 2.21.1
+
+### Patch Changes
+
+- Updated dependencies [78e3ac8]
+- Updated dependencies [19b3b64]
+- Updated dependencies [8e9f8c8]
+- Updated dependencies [2728724]
+  - @modern-js/prod-server@2.21.1
+  - @modern-js/builder-shared@2.21.1
+  - @modern-js/builder-plugin-esbuild@2.21.1
+  - @modern-js/server@2.21.1
+  - @modern-js/builder@2.21.1
+  - @modern-js/builder-rspack-provider@2.21.1
+  - @modern-js/builder-webpack-provider@2.21.1
+  - @modern-js/builder-plugin-node-polyfill@2.21.1
+  - @modern-js/core@2.21.1
+  - @modern-js/plugin-data-loader@2.21.1
+  - @modern-js/plugin-i18n@2.21.1
+  - @modern-js/plugin-lint@2.21.1
+  - @modern-js/new-action@2.21.1
+  - @modern-js/node-bundle-require@2.21.1
+  - @modern-js/plugin@2.21.1
+  - @modern-js/types@2.21.1
+  - @modern-js/upgrade@2.21.1
+  - @modern-js/utils@2.21.1
+
+## 2.21.0
+
+### Patch Changes
+
+- 5424051: fix: the proxy should not recreated when exists
+  fix: proxy server 不应该被重新创建当存在时
+- cfc5bda: feat: ssr mode support async entry
+  feat: ssr 模式支持异步入口
+- df43559: fix(core): toolsType is overridden when install multiple solutions
+
+  fix(core): 修复安装多个 solutions 时 toolsType 被覆盖的问题
+
+- 26dcf3a: chore: bump typescript to v5 in devDependencies
+
+  chore: 升级 devDependencies 中的 typescript 版本到 v5
+
+- d6aed02: feat(app-tools): add isFirstCompile param to afterDev hook
+
+  feat(app-tools): 为 afterDev 钩子增加 isFirstCompile 参数
+
+- 5c56949: fix: should only watch file-based routes changes
+  fix: 只有基于文件的路由（约定式路由）需要被监听变化
+- 4274510: fix(builder): failed to disable html via htmlPlugin: false
+
+  fix(builder): 修复通过 htmlPlugin: false 无法禁用 html 的问题
+
+- 43b4e83: feat: support security.nonce for add nonce attribute on script tag
+  feat: 支持 security.nonce 配置，为 script 标签添加 nonce 属性
+- ad78387: chore(deps): bump babel-related dependencies to latest version
+
+  chore(deps): 升级 babel 相关依赖到最新版本
+
+- Updated dependencies [cfc5bda]
+- Updated dependencies [7d2972e]
+- Updated dependencies [df43559]
+- Updated dependencies [7d2972e]
+- Updated dependencies [863f8df]
+- Updated dependencies [55d37e9]
+- Updated dependencies [e81eeaf]
+- Updated dependencies [26dcf3a]
+- Updated dependencies [8a7d4d2]
+- Updated dependencies [1ef03dc]
+- Updated dependencies [441a579]
+- Updated dependencies [056627f]
+- Updated dependencies [de8f73f]
+- Updated dependencies [8fa8566]
+- Updated dependencies [4274510]
+- Updated dependencies [c90ea5a]
+- Updated dependencies [0fc15ca]
+- Updated dependencies [43b4e83]
+- Updated dependencies [ad78387]
+  - @modern-js/prod-server@2.21.0
+  - @modern-js/builder-rspack-provider@2.21.0
+  - @modern-js/core@2.21.0
+  - @modern-js/builder-shared@2.21.0
+  - @modern-js/builder@2.21.0
+  - @modern-js/plugin-data-loader@2.21.0
+  - @modern-js/utils@2.21.0
+  - @modern-js/builder-webpack-provider@2.21.0
+  - @modern-js/builder-plugin-node-polyfill@2.21.0
+  - @modern-js/node-bundle-require@2.21.0
+  - @modern-js/builder-plugin-esbuild@2.21.0
+  - @modern-js/new-action@2.21.0
+  - @modern-js/plugin-i18n@2.21.0
+  - @modern-js/plugin-lint@2.21.0
+  - @modern-js/upgrade@2.21.0
+  - @modern-js/plugin@2.21.0
+  - @modern-js/server@2.21.0
+  - @modern-js/types@2.21.0
+
 ## 2.20.0
 
 ### Minor Changes

package/bin/modern.js

@@ -11,5 +11,4 @@ require('@modern-js/core/runBin').run({
     server: INTERNAL_SERVER_PLUGINS,
     autoLoad: INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
   },
-  toolsType: 'app-tools',
 });

package/dist/cjs/analyze/generateCode.js

@@ -177,9 +177,26 @@ const generateCode = async (appContext, config, entrypoints, api) => {
       const entryFile = _path.default.resolve(internalDirectory, `./${entryName}/${_constants.ENTRY_POINT_FILE_NAME}`);
       entrypoint.entry = entryFile;
       if (config.source.enableAsyncEntry) {
+        let rawAsyncEntryCode = `import('./${_constants.ENTRY_BOOTSTRAP_FILE_NAME}');`;
+        const ssr = (0, _utils.getEntryOptions)(entryName, config.server.ssr, config.server.ssrByEntries, packageName);
+        if (ssr) {
+          rawAsyncEntryCode = `
+          export const ${_utils.SERVER_RENDER_FUNCTION_NAME} = async (...args) => {
+            let entry = await ${rawAsyncEntryCode};
+            if (entry.default instanceof Promise){
+              entry = await entry.default;
+              return entry.default.${_utils.SERVER_RENDER_FUNCTION_NAME}.apply(null, args);
+            }
+            return entry.${_utils.SERVER_RENDER_FUNCTION_NAME}.apply(null, args);
+          };
+          if(typeof window!=='undefined'){
+            ${rawAsyncEntryCode}
+          }
+          `;
+        }
         const { code: asyncEntryCode } = await hookRunners.modifyAsyncEntry({
           entrypoint,
-          code: `import('./${_constants.ENTRY_BOOTSTRAP_FILE_NAME}');`
+          code: rawAsyncEntryCode
         });
         _utils.fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
         const bootstrapFile = _path.default.resolve(internalDirectory, `./${entryName}/${_constants.ENTRY_BOOTSTRAP_FILE_NAME}`);

package/dist/cjs/analyze/getBundleEntry.js

@@ -51,7 +51,7 @@ const getBundleEntry = (appContext, config) => {
         customBootstrap: value.customBootstrap && (0, _utils.ensureAbsolutePath)(appDirectory, value.customBootstrap),
         fileSystemRoutes: _utils.fs.statSync((0, _utils.ensureAbsolutePath)(appDirectory, value.entry)).isDirectory() ? {} : void 0
       };
-      if (entrypoint.fileSystemRoutes && (0, _utils.isRouterV5)(config)) {
+      if (entrypoint.fileSystemRoutes && !(0, _utils.isRouterV5)(config)) {
         entrypoint.nestedRoutesEntry = entrypoint.entry;
       }
       if (!ifAlreadyExists(defaults, entrypoint)) {

package/dist/cjs/analyze/index.js

@@ -74,7 +74,7 @@ const _default = ({ bundler }) => {
           };
           api.setAppContext(appContext);
           nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
-          pagesDir = entrypoints.map((point) => point.entry).filter(Boolean).concat(nestedRouteEntries);
+          pagesDir = entrypoints.map((point) => point.entry).filter((entry) => entry && !_path.extname(entry)).concat(nestedRouteEntries);
           originEntrypoints = (0, _lodash.cloneDeep)(entrypoints);
           await generateCode(appContext, resolvedConfig, entrypoints, api);
           const htmlTemplates = await getHtmlTemplate(entrypoints, api, {
@@ -129,7 +129,9 @@ const _default = ({ bundler }) => {
               async onDevCompileDone({ isFirstCompile }) {
                 const hookRunners2 = api.useHookRunners();
                 if (process.stdout.isTTY || isFirstCompile) {
-                  hookRunners2.afterDev();
+                  hookRunners2.afterDev({
+                    isFirstCompile
+                  });
                   if (isFirstCompile) {
                     (0, _printInstructions.printInstructions)(hookRunners2, appContext, normalizedConfig);
                   }

package/dist/cjs/builder/builder-rspack/adapterCopy.js

@@ -22,7 +22,7 @@ const builderPluginAdpaterCopy = (options) => {
           ...config.builtins || {},
           copy: {
             patterns: [
-              ...transformCopy((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns),
+              ...((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || [],
               ...createConfigBuiltinCopy(options)
             ]
           }
@@ -57,19 +57,6 @@ const builderPluginAdpaterCopy = (options) => {
     }
   };
 };
-function transformCopy(patterns) {
-  if (patterns) {
-    patterns.map((value) => {
-      if (typeof value === "string") {
-        return {
-          from: value
-        };
-      }
-      return value;
-    });
-  }
-  return [];
-}
 function createConfigBuiltinCopy(options) {
   const { normalizedConfig, appContext } = options;
   const { uploadDir, publicDir } = (0, _shared.createCopyInfo)(appContext, normalizedConfig);

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

@@ -2,32 +2,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  isHtmlEnabled: () => isHtmlEnabled,
-  builderPluginAdapterHtml: () => builderPluginAdapterHtml
+Object.defineProperty(exports, "builderPluginAdapterHtml", {
+  enumerable: true,
+  get: () => builderPluginAdapterHtml
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _buildershared = require("@modern-js/builder-shared");
 const _utils = require("@modern-js/utils");
 const _lodash = require("@modern-js/utils/lodash");
 const _bundlerPlugins = require("../bundlerPlugins");
-function isHtmlEnabled(config, target) {
-  var _config_tools;
-  return ((_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
-}
 const builderPluginAdapterHtml = (options) => ({
   name: "builder-plugin-adapter-modern-html",
   setup(api) {
     api.modifyBundlerChain(async (chain, { CHAIN_ID, target, HtmlPlugin: HtmlBundlerPlugin }) => {
       const builderConfig = api.getNormalizedConfig();
-      if (isHtmlEnabled(builderConfig, target)) {
+      if (!(0, _buildershared.isHtmlDisabled)(builderConfig, target)) {
         applyBottomHtmlPlugin({
           api,
           options,

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

@@ -12,7 +12,6 @@ const _buildershared = require("@modern-js/builder-shared");
 const _utils = require("@modern-js/utils");
 const _bundlerPlugins = require("../bundlerPlugins");
 const _utils1 = require("../../../analyze/utils");
-const _adapterHtml = require("./adapterHtml");
 const builderPluginAdapterSSR = (options) => ({
   name: "builder-plugin-adapter-modern-ssr",
   setup(api) {
@@ -45,7 +44,7 @@ const builderPluginAdapterSSR = (options) => ({
           appNormalizedConfig: normalizedConfig2
         });
       }
-      if ((0, _adapterHtml.isHtmlEnabled)(builderConfig, target)) {
+      if (!(0, _buildershared.isHtmlDisabled)(builderConfig, target)) {
         applyAsyncChunkHtmlPlugin({
           chain,
           modernConfig: options.normalizedConfig,

package/dist/cjs/index.js

@@ -103,6 +103,11 @@ const _default = (options = {
       (0, _pluginlint.default)()
     ],
     setup: (api) => {
+      const appContext = api.useAppContext();
+      api.setAppContext({
+        ...appContext,
+        toolsType: "app-tools"
+      });
       const locale = (0, _languagedetector.getLocaleLanguage)();
       _locale.i18n.changeLanguage({
         locale
@@ -111,11 +116,11 @@ const _default = (options = {
         async beforeConfig() {
           var _userConfig_output;
           const userConfig = api.useConfigContext();
-          const appContext = api.useAppContext();
+          const appContext2 = api.useAppContext();
           if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
             api.setAppContext({
-              ...appContext,
-              internalDirectory: _path.default.resolve(appContext.appDirectory, userConfig.output.tempDir)
+              ...appContext2,
+              internalDirectory: _path.default.resolve(appContext2.appDirectory, userConfig.output.tempDir)
             });
           }
         },
@@ -151,21 +156,21 @@ const _default = (options = {
           if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
             const resolvedConfig = api.useResolvedConfigContext();
             if (resolvedConfig.output.cleanDistPath) {
-              const appContext = api.useAppContext();
-              await (0, _utils.emptyDir)(appContext.distDirectory);
+              const appContext2 = api.useAppContext();
+              await (0, _utils.emptyDir)(appContext2.distDirectory);
             }
           }
         },
         async watchFiles() {
-          const appContext = api.useAppContext();
+          const appContext2 = api.useAppContext();
           const config = api.useResolvedConfigContext();
-          return (0, _generateWatchFiles.generateWatchFiles)(appContext, config.source.configDir);
+          return (0, _generateWatchFiles.generateWatchFiles)(appContext2, config.source.configDir);
         },
         // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
         async fileChange(e) {
           const { filename, eventType } = e;
-          const appContext = api.useAppContext();
-          const { appDirectory, srcDirectory } = appContext;
+          const appContext2 = api.useAppContext();
+          const { appDirectory, srcDirectory } = appContext2;
           const absolutePath = _path.default.resolve(appDirectory, filename);
           if (!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")) {
             const { closeServer } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./utils/createServer")));

package/dist/esm/analyze/generateCode.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
@@ -100,7 +100,7 @@ export var generateCode = function() {
     }
     function _generateEntryCode() {
       _generateEntryCode = _async_to_generator(function(entrypoint) {
-        var entryName, isAutoMount, customBootstrap, fileSystemRoutes, _config_output, initialRoutes, nestedRoute, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile, _ref2, importStatements, plugins, _ref1, renderFunction, exportStatement, code2, entryFile, _ref22, asyncEntryCode, bootstrapFile;
+        var entryName, isAutoMount, customBootstrap, fileSystemRoutes, _config_output, initialRoutes, nestedRoute, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile, _ref2, importStatements, plugins, _ref1, renderFunction, exportStatement, code2, entryFile, rawAsyncEntryCode, ssr1, _ref22, asyncEntryCode, bootstrapFile;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -293,11 +293,16 @@ export var generateCode = function() {
                   3,
                   17
                 ];
+              rawAsyncEntryCode = "import('./".concat(ENTRY_BOOTSTRAP_FILE_NAME, "');");
+              ssr1 = getEntryOptions(entryName, config.server.ssr, config.server.ssrByEntries, packageName);
+              if (ssr1) {
+                rawAsyncEntryCode = "\n          export const ".concat(SERVER_RENDER_FUNCTION_NAME, " = async (...args) => {\n            let entry = await ").concat(rawAsyncEntryCode, ";\n            if (entry.default instanceof Promise){\n              entry = await entry.default;\n              return entry.default.").concat(SERVER_RENDER_FUNCTION_NAME, ".apply(null, args);\n            }\n            return entry.").concat(SERVER_RENDER_FUNCTION_NAME, ".apply(null, args);\n          };\n          if(typeof window!=='undefined'){\n            ").concat(rawAsyncEntryCode, "\n          }\n          ");
+              }
               return [
                 4,
                 hookRunners.modifyAsyncEntry({
                   entrypoint: entrypoint,
-                  code: "import('./".concat(ENTRY_BOOTSTRAP_FILE_NAME, "');")
+                  code: rawAsyncEntryCode
                 })
               ];
             case 16:

package/dist/esm/analyze/getBundleEntry.js

@@ -43,7 +43,7 @@ export var getBundleEntry = function(appContext, config) {
         customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
       };
-      if (entrypoint.fileSystemRoutes && isRouterV5(config)) {
+      if (entrypoint.fileSystemRoutes && !isRouterV5(config)) {
         entrypoint.nestedRoutesEntry = entrypoint.entry;
       }
       if (!ifAlreadyExists(defaults, entrypoint)) {

package/dist/esm/analyze/index.js

@@ -111,7 +111,9 @@ export default function(param) {
                   }).filter(Boolean);
                   pagesDir = entrypoints.map(function(point) {
                     return point.entry;
-                  }).filter(Boolean).concat(nestedRouteEntries);
+                  }).filter(function(entry2) {
+                    return entry2 && !path.extname(entry2);
+                  }).concat(nestedRouteEntries);
                   originEntrypoints = cloneDeep(entrypoints);
                   return [
                     4,
@@ -251,7 +253,9 @@ export default function(param) {
                           return _ts_generator(this, function(_state2) {
                             hookRunners2 = api.useHookRunners();
                             if (process.stdout.isTTY || isFirstCompile) {
-                              hookRunners2.afterDev();
+                              hookRunners2.afterDev({
+                                isFirstCompile: isFirstCompile
+                              });
                               if (isFirstCompile) {
                                 printInstructions(hookRunners2, appContext, normalizedConfig);
                               }

package/dist/esm/builder/builder-rspack/adapterCopy.js

@@ -16,7 +16,7 @@ export var builderPluginAdpaterCopy = function(options) {
         var _config_builtins, _config_builtins_copy, _config_output;
         config.builtins = _object_spread_props(_object_spread({}, config.builtins || {}), {
           copy: {
-            patterns: _to_consumable_array(transformCopy((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns)).concat(_to_consumable_array(createConfigBuiltinCopy(options)))
+            patterns: _to_consumable_array(((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || []).concat(_to_consumable_array(createConfigBuiltinCopy(options)))
           }
         });
         publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
@@ -144,19 +144,6 @@ export var builderPluginAdpaterCopy = function(options) {
     }
   };
 };
-function transformCopy(patterns) {
-  if (patterns) {
-    patterns.map(function(value) {
-      if (typeof value === "string") {
-        return {
-          from: value
-        };
-      }
-      return value;
-    });
-  }
-  return [];
-}
 function createConfigBuiltinCopy(options) {
   var normalizedConfig = options.normalizedConfig, appContext = options.appContext;
   var _createCopyInfo = createCopyInfo(appContext, normalizedConfig), uploadDir = _createCopyInfo.uploadDir, publicDir = _createCopyInfo.publicDir;

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

@@ -3,14 +3,10 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createVirtualModule } from "@modern-js/builder-shared";
+import { isHtmlDisabled, createVirtualModule } from "@modern-js/builder-shared";
 import { getEntryOptions, removeTailSlash } from "@modern-js/utils";
 import { template as lodashTemplate } from "@modern-js/utils/lodash";
 import { BottomTemplatePlugin } from "../bundlerPlugins";
-export function isHtmlEnabled(config, target) {
-  var _config_tools;
-  return ((_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
-}
 export var builderPluginAdapterHtml = function(options) {
   return {
     name: "builder-plugin-adapter-modern-html",
@@ -23,7 +19,7 @@ export var builderPluginAdapterHtml = function(options) {
               case 0:
                 CHAIN_ID = param.CHAIN_ID, target = param.target, HtmlBundlerPlugin = param.HtmlPlugin;
                 builderConfig = api.getNormalizedConfig();
-                if (!isHtmlEnabled(builderConfig, target))
+                if (!!isHtmlDisabled(builderConfig, target))
                   return [
                     3,
                     2

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

@@ -1,11 +1,10 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
-import { mergeBuilderConfig } from "@modern-js/builder-shared";
+import { isHtmlDisabled, mergeBuilderConfig } from "@modern-js/builder-shared";
 import { isSSR, fs } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
 import { getServerCombinedModueFile } from "../../../analyze/utils";
-import { isHtmlEnabled } from "./adapterHtml";
 export var builderPluginAdapterSSR = function(options) {
   return {
     name: "builder-plugin-adapter-modern-ssr",
@@ -55,7 +54,7 @@ export var builderPluginAdapterSSR = function(options) {
                     appNormalizedConfig: normalizedConfig2
                   });
                 }
-                if (isHtmlEnabled(builderConfig, target)) {
+                if (!isHtmlDisabled(builderConfig, target)) {
                   applyAsyncChunkHtmlPlugin({
                     chain: chain,
                     modernConfig: options.normalizedConfig,

package/dist/esm/index.js

@@ -296,6 +296,10 @@ export default function() {
       lintPlugin()
     ],
     setup: function(api) {
+      var appContext = api.useAppContext();
+      api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
+        toolsType: "app-tools"
+      }));
       var locale = getLocaleLanguage();
       i18n.changeLanguage({
         locale: locale
@@ -303,13 +307,13 @@ export default function() {
       return {
         beforeConfig: function beforeConfig() {
           return _async_to_generator(function() {
-            var _userConfig_output, userConfig, appContext;
+            var _userConfig_output, userConfig, appContext2;
             return _ts_generator(this, function(_state) {
               userConfig = api.useConfigContext();
-              appContext = api.useAppContext();
+              appContext2 = api.useAppContext();
               if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
-                api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
-                  internalDirectory: path.resolve(appContext.appDirectory, userConfig.output.tempDir)
+                api.setAppContext(_object_spread_props(_object_spread({}, appContext2), {
+                  internalDirectory: path.resolve(appContext2.appDirectory, userConfig.output.tempDir)
                 }));
               }
               return [
@@ -463,7 +467,7 @@ export default function() {
         },
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var command, resolvedConfig, appContext;
+            var command, resolvedConfig, appContext2;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -479,10 +483,10 @@ export default function() {
                       3,
                       2
                     ];
-                  appContext = api.useAppContext();
+                  appContext2 = api.useAppContext();
                   return [
                     4,
-                    emptyDir(appContext.distDirectory)
+                    emptyDir(appContext2.distDirectory)
                   ];
                 case 1:
                   _state.sent();
@@ -497,13 +501,13 @@ export default function() {
         },
         watchFiles: function watchFiles() {
           return _async_to_generator(function() {
-            var appContext, config;
+            var appContext2, config;
             return _ts_generator(this, function(_state) {
-              appContext = api.useAppContext();
+              appContext2 = api.useAppContext();
               config = api.useResolvedConfigContext();
               return [
                 2,
-                generateWatchFiles(appContext, config.source.configDir)
+                generateWatchFiles(appContext2, config.source.configDir)
               ];
             });
           })();
@@ -512,13 +516,13 @@ export default function() {
           // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
           function fileChange(e) {
             return _async_to_generator(function() {
-              var filename, eventType, appContext, appDirectory, srcDirectory, absolutePath, closeServer;
+              var filename, eventType, appContext2, appDirectory, srcDirectory, absolutePath, closeServer;
               return _ts_generator(this, function(_state) {
                 switch (_state.label) {
                   case 0:
                     filename = e.filename, eventType = e.eventType;
-                    appContext = api.useAppContext();
-                    appDirectory = appContext.appDirectory, srcDirectory = appContext.srcDirectory;
+                    appContext2 = api.useAppContext();
+                    appDirectory = appContext2.appDirectory, srcDirectory = appContext2.srcDirectory;
                     absolutePath = path.resolve(appDirectory, filename);
                     if (!(!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")))
                       return [

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

@@ -1,5 +1,5 @@
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
@@ -160,9 +160,26 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
       const entryFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_FILE_NAME}`);
       entrypoint.entry = entryFile;
       if (config.source.enableAsyncEntry) {
+        let rawAsyncEntryCode = `import('./${ENTRY_BOOTSTRAP_FILE_NAME}');`;
+        const ssr = getEntryOptions(entryName, config.server.ssr, config.server.ssrByEntries, packageName);
+        if (ssr) {
+          rawAsyncEntryCode = `
+          export const ${SERVER_RENDER_FUNCTION_NAME} = async (...args) => {
+            let entry = await ${rawAsyncEntryCode};
+            if (entry.default instanceof Promise){
+              entry = await entry.default;
+              return entry.default.${SERVER_RENDER_FUNCTION_NAME}.apply(null, args);
+            }
+            return entry.${SERVER_RENDER_FUNCTION_NAME}.apply(null, args);
+          };
+          if(typeof window!=='undefined'){
+            ${rawAsyncEntryCode}
+          }
+          `;
+        }
         const { code: asyncEntryCode } = await hookRunners.modifyAsyncEntry({
           entrypoint,
-          code: `import('./${ENTRY_BOOTSTRAP_FILE_NAME}');`
+          code: rawAsyncEntryCode
         });
         fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
         const bootstrapFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_BOOTSTRAP_FILE_NAME}`);

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

@@ -42,7 +42,7 @@ export const getBundleEntry = (appContext, config) => {
         customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
       };
-      if (entrypoint.fileSystemRoutes && isRouterV5(config)) {
+      if (entrypoint.fileSystemRoutes && !isRouterV5(config)) {
         entrypoint.nestedRoutesEntry = entrypoint.entry;
       }
       if (!ifAlreadyExists(defaults, entrypoint)) {

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

@@ -65,7 +65,7 @@ export default ({ bundler }) => {
           };
           api.setAppContext(appContext);
           nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
-          pagesDir = entrypoints.map((point) => point.entry).filter(Boolean).concat(nestedRouteEntries);
+          pagesDir = entrypoints.map((point) => point.entry).filter((entry) => entry && !path.extname(entry)).concat(nestedRouteEntries);
           originEntrypoints = cloneDeep(entrypoints);
           await generateCode(appContext, resolvedConfig, entrypoints, api);
           const htmlTemplates = await getHtmlTemplate(entrypoints, api, {
@@ -120,7 +120,9 @@ export default ({ bundler }) => {
               async onDevCompileDone({ isFirstCompile }) {
                 const hookRunners2 = api.useHookRunners();
                 if (process.stdout.isTTY || isFirstCompile) {
-                  hookRunners2.afterDev();
+                  hookRunners2.afterDev({
+                    isFirstCompile
+                  });
                   if (isFirstCompile) {
                     printInstructions(hookRunners2, appContext, normalizedConfig);
                   }

package/dist/esm-node/builder/builder-rspack/adapterCopy.js

@@ -13,7 +13,7 @@ export const builderPluginAdpaterCopy = (options) => {
           ...config.builtins || {},
           copy: {
             patterns: [
-              ...transformCopy((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns),
+              ...((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || [],
               ...createConfigBuiltinCopy(options)
             ]
           }
@@ -48,19 +48,6 @@ export const builderPluginAdpaterCopy = (options) => {
     }
   };
 };
-function transformCopy(patterns) {
-  if (patterns) {
-    patterns.map((value) => {
-      if (typeof value === "string") {
-        return {
-          from: value
-        };
-      }
-      return value;
-    });
-  }
-  return [];
-}
 function createConfigBuiltinCopy(options) {
   const { normalizedConfig, appContext } = options;
   const { uploadDir, publicDir } = createCopyInfo(appContext, normalizedConfig);

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

@@ -1,17 +1,13 @@
-import { createVirtualModule } from "@modern-js/builder-shared";
+import { isHtmlDisabled, createVirtualModule } from "@modern-js/builder-shared";
 import { getEntryOptions, removeTailSlash } from "@modern-js/utils";
 import { template as lodashTemplate } from "@modern-js/utils/lodash";
 import { BottomTemplatePlugin } from "../bundlerPlugins";
-export function isHtmlEnabled(config, target) {
-  var _config_tools;
-  return ((_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
-}
 export const builderPluginAdapterHtml = (options) => ({
   name: "builder-plugin-adapter-modern-html",
   setup(api) {
     api.modifyBundlerChain(async (chain, { CHAIN_ID, target, HtmlPlugin: HtmlBundlerPlugin }) => {
       const builderConfig = api.getNormalizedConfig();
-      if (isHtmlEnabled(builderConfig, target)) {
+      if (!isHtmlDisabled(builderConfig, target)) {
         applyBottomHtmlPlugin({
           api,
           options,

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

@@ -1,9 +1,8 @@
 import * as path from "path";
-import { mergeBuilderConfig } from "@modern-js/builder-shared";
+import { isHtmlDisabled, mergeBuilderConfig } from "@modern-js/builder-shared";
 import { isSSR, fs } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
 import { getServerCombinedModueFile } from "../../../analyze/utils";
-import { isHtmlEnabled } from "./adapterHtml";
 export const builderPluginAdapterSSR = (options) => ({
   name: "builder-plugin-adapter-modern-ssr",
   setup(api) {
@@ -36,7 +35,7 @@ export const builderPluginAdapterSSR = (options) => ({
           appNormalizedConfig: normalizedConfig2
         });
       }
-      if (isHtmlEnabled(builderConfig, target)) {
+      if (!isHtmlDisabled(builderConfig, target)) {
         applyAsyncChunkHtmlPlugin({
           chain,
           modernConfig: options.normalizedConfig,

package/dist/esm-node/index.js

@@ -83,6 +83,11 @@ export default (options = {
       lintPlugin()
     ],
     setup: (api) => {
+      const appContext = api.useAppContext();
+      api.setAppContext({
+        ...appContext,
+        toolsType: "app-tools"
+      });
       const locale = getLocaleLanguage();
       i18n.changeLanguage({
         locale
@@ -91,11 +96,11 @@ export default (options = {
         async beforeConfig() {
           var _userConfig_output;
           const userConfig = api.useConfigContext();
-          const appContext = api.useAppContext();
+          const appContext2 = api.useAppContext();
           if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
             api.setAppContext({
-              ...appContext,
-              internalDirectory: path.resolve(appContext.appDirectory, userConfig.output.tempDir)
+              ...appContext2,
+              internalDirectory: path.resolve(appContext2.appDirectory, userConfig.output.tempDir)
             });
           }
         },
@@ -131,21 +136,21 @@ export default (options = {
           if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
             const resolvedConfig = api.useResolvedConfigContext();
             if (resolvedConfig.output.cleanDistPath) {
-              const appContext = api.useAppContext();
-              await emptyDir(appContext.distDirectory);
+              const appContext2 = api.useAppContext();
+              await emptyDir(appContext2.distDirectory);
             }
           }
         },
         async watchFiles() {
-          const appContext = api.useAppContext();
+          const appContext2 = api.useAppContext();
           const config = api.useResolvedConfigContext();
-          return generateWatchFiles(appContext, config.source.configDir);
+          return generateWatchFiles(appContext2, config.source.configDir);
         },
         // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
         async fileChange(e) {
           const { filename, eventType } = e;
-          const appContext = api.useAppContext();
-          const { appDirectory, srcDirectory } = appContext;
+          const appContext2 = api.useAppContext();
+          const { appDirectory, srcDirectory } = appContext2;
           const absolutePath = path.resolve(appDirectory, filename);
           if (!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")) {
             const { closeServer } = await import("./utils/createServer");

package/dist/types/analyze/index.d.ts

@@ -1,10 +1,8 @@
 import type { CliPlugin } from '@modern-js/core';
 import { AppTools } from '../types';
-
 declare const _default: ({
   bundler
 }: {
   bundler: 'webpack' | 'rspack';
 }) => CliPlugin<AppTools<'shared'>>;
-
 export default _default;

package/dist/types/builder/builder-rspack/index.d.ts

@@ -1,2 +1,2 @@
 import { BuilderOptions } from '../shared';
-export declare function createRspackBuilderForModern(options: BuilderOptions<'rspack'>): Promise<import("@modern-js/builder-shared").BuilderInstance<import("@modern-js/builder-shared").BuilderProvider<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>>>;
+export declare function createRspackBuilderForModern(options: BuilderOptions<'rspack'>): Promise<import("@modern-js/builder-shared").BuilderInstance<import("@modern-js/builder-shared").BuilderProvider>>;

package/dist/types/builder/builder-webpack/adapterModern.d.ts

@@ -4,5 +4,4 @@ import { BuilderOptions } from '../shared';
 /**
  * Provides default configuration consistent with modern.js v1
  */
-
 export declare const builderPluginAdapterModern: (options: BuilderOptions<'webpack'>) => BuilderPlugin<BuilderPluginAPI>;

package/dist/types/builder/generator/index.d.ts

@@ -10,8 +10,7 @@ export type GenerateProvider = (c: {
  * @param utils - ModifyBuilderConfig, ModifyBuilderInstance
  * @returns BuilderInstance
  */
-
 export declare function generateBuilder<B extends Bundler>(options: BuilderOptions<B>, generateProvider: GenerateProvider, utils?: {
   modifyBuilderConfig?: ModifyBuilderConfig<B>;
   modifyBuilderInstance?: ModifyBuilderInstance;
-}): Promise<BuilderInstance<BuilderProvider<Record<string, any>, Record<string, any>, Record<string, any>, Record<string, any>>>>;
+}): Promise<BuilderInstance<BuilderProvider>>;

package/dist/types/builder/shared/builderPlugins/adapterBasic.d.ts

@@ -3,5 +3,4 @@ import type { BuilderOptions, BuilderPluginAPI } from '../types';
 import type { Bundler } from '../../../types';
 export declare const builderPluginAdapterBasic: <B extends Bundler>(options: BuilderOptions<B>) => BuilderPlugin<BuilderPluginAPI>;
 /** register builder hooks callback */
-
 export declare function applyCallbacks<B extends Bundler>(api: BuilderPluginAPI, options: BuilderOptions<B>): void;

package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts

@@ -1,5 +1,4 @@
-import { BuilderPlugin, BuilderTarget } from '@modern-js/builder-shared';
+import { BuilderPlugin } from '@modern-js/builder-shared';
 import { Bundler } from '../../../types';
-import type { BuilderNormalizedConfig, BuilderOptions, BuilderPluginAPI } from '../types';
-export declare function isHtmlEnabled(config: BuilderNormalizedConfig, target: BuilderTarget): boolean;
+import type { BuilderOptions, BuilderPluginAPI } from '../types';
 export declare const builderPluginAdapterHtml: <B extends Bundler>(options: BuilderOptions<B>) => BuilderPlugin<BuilderPluginAPI>;

package/dist/types/defineConfig.d.ts

@@ -6,5 +6,4 @@ export declare const defineConfig: <B extends "webpack" | "rspack" = "webpack">(
  *
  * `defineLegacyConfig` will be deprecated in the future.
  */
-
 export declare const defineLegacyConfig: (config: AppLegacyUserConfig) => AppLegacyUserConfig;

package/dist/types/index.d.ts

@@ -11,7 +11,5 @@ export type AppToolsOptions = {
   /** Specify the use what kind of bundler to compiler, default: `webpack` */
   bundler?: 'experimental-rspack' | 'webpack';
 };
-
 declare const _default: (options?: AppToolsOptions) => CliPlugin<AppTools<'shared'>>;
-
 export default _default;

package/dist/types/initialize/index.d.ts

@@ -1,9 +1,7 @@
 import type { CliPlugin, AppTools } from '../types';
-
 declare const _default: ({
   bundler
 }: {
   bundler: 'rspack' | 'webpack';
 }) => CliPlugin<AppTools<'shared'>>;
-
 export default _default;

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

@@ -5,7 +5,7 @@ import type { RsSourceUserConfig, SharedSourceConfig, SourceUserConfig } from '.
 import type { DevUserConfig } from './dev';
 import type { RsToolsUserConfig, SharedToolsConfig, ToolsUserConfig } from './tools';
 import type { HtmlUserConfig, RsHtmlUserConfig, SharedHtmlConfig } from './html';
-import type { SecurityUserConfig } from './security';
+import type { RsSecurityConfig, SecurityUserConfig } from './security';
 import type { DeployUserConfig } from './deploy';
 import type { ExperimentsUserConfig } from './experiments';
 import type { PerformanceUserConfig, RsPerformanceConfig, SharedPerformanceConfig } from './performance';
@@ -25,7 +25,6 @@ export type SharedUserConfig = {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `bff` plugin
    */
-
   bff?: BffUserConfig;
   dev?: DevUserConfig;
   deploy?: DeployUserConfig;
@@ -51,6 +50,7 @@ export interface RsAppToolsUserConfig extends SharedUserConfig {
   html?: RsHtmlUserConfig;
   tools?: RsToolsUserConfig;
   performance?: RsPerformanceConfig;
+  security?: RsSecurityConfig;
 }
 interface SharedNormalizedConfig<RawConfig> {
   cliOptions?: Record<string, any>;

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

@@ -1,4 +1,6 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
+import type { BuilderConfig as RsBuilderConfig } from '@modern-js/builder-rspack-provider';
 import { UnwrapBuilderConfig } from '../utils';
 export type BuilderSecurityConfig = UnwrapBuilderConfig<BuilderConfig, 'security'>;
+export type RsSecurityConfig = UnwrapBuilderConfig<RsBuilderConfig, 'security'>;
 export type SecurityUserConfig = BuilderSecurityConfig;

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

@@ -21,7 +21,6 @@ export interface SharedSourceConfig extends BuilderSharedSourceConfig {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `tailwindcss` plugin
    */
-
   designSystem?: Record<string, any>;
 }
 export type SourceUserConfig = BuilderSourceConfig & SharedSourceConfig;

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

@@ -14,7 +14,6 @@ export type RsBuilderToolsConfig = UnwrapBuilderConfig<RsBuilderConfig, 'tools'>
  * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
  * @requires `tailwindcss` plugin
  */
-
 export type Tailwindcss = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
 export interface SharedToolsConfig extends BuilderSharedToolsConfig {
   tailwindcss?: Tailwindcss;
@@ -23,7 +22,6 @@ export interface SharedToolsConfig extends BuilderSharedToolsConfig {
    * The configuration of `swc` is provided by `swc` plugin.
    * @requires `swc` plugin
    */
-
   swc?: PluginSwcOptions;
 }
 export interface ToolsUserConfig extends BuilderToolsConfig, SharedToolsConfig {}

package/dist/types/types/hooks.d.ts

@@ -60,7 +60,9 @@ export type AppToolsHooks<B extends Bundler = 'webpack'> = {
     plugins: Array<Record<string, string>>;
   }>;
   beforeDev: AsyncWorkflow<void, unknown>;
-  afterDev: AsyncWorkflow<void, unknown>;
+  afterDev: AsyncWorkflow<{
+    isFirstCompile: boolean;
+  }, unknown>;
   beforeCreateCompiler: AsyncWorkflow<{
     bundlerConfigs?: B extends 'rspack' ? Rspack.Configuration[] : webpack.Configuration[];
   }, unknown>;

package/dist/types/types/legacyConfig/dev.d.ts

@@ -8,6 +8,5 @@ export type DevUserLegacyConfig = {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `proxy` plugin
    */
-
   proxy?: DevProxyOptions;
 };

package/dist/types/types/legacyConfig/output.d.ts

@@ -45,7 +45,6 @@ export type OutputLegacyUserConfig = {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `ssg` plugin
    */
-
   ssg?: SSGConfig;
 };
 export {};

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

@@ -20,6 +20,5 @@ export type SourceLegacyUserConfig = {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `tailwindcss` plugin
    */
-
   designSystem?: Record<string, any>;
 };

package/dist/types/types/legacyConfig/tools.d.ts

@@ -10,7 +10,6 @@ export type ToolsLegacyUserConfig = BuilderToolsConfig & {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `tailwindcss` plugin
    */
-
   tailwindcss?: Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
   jest?: JestConfig | ((jestConfig: JestConfig) => JestConfig);
 };

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

@@ -17,6 +17,5 @@ export declare const buildServerConfig: ({
  *
  * 处理循环引用的 replacer
  */
-
 export declare const safeReplacer: () => (key: string, value: unknown) => unknown;
 export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig<'shared'>) => Promise<void>;

package/dist/types/utils/getSelectedEntries.d.ts

@@ -2,5 +2,4 @@ import { Entrypoint } from '@modern-js/types';
 /**
  * Allow user to select entrypoints to build.
  */
-
 export declare const getSelectedEntries: (entry: string[] | boolean, entrypoints: Entrypoint[]) => Promise<string[]>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.20.0",
+  "version": "2.21.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -66,46 +66,46 @@
     "modern-app": "./bin/modern.js"
   },
   "dependencies": {
-    "@babel/parser": "^7.18.0",
-    "@babel/traverse": "^7.18.0",
-    "@babel/types": "^7.18.0",
+    "@babel/parser": "^7.21.8",
+    "@babel/traverse": "^7.21.5",
+    "@babel/types": "^7.21.5",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
     "rspack-plugin-virtual-module": "0.1.0",
     "@swc/helpers": "0.5.1",
-    "@modern-js/builder": "2.20.0",
-    "@modern-js/builder-plugin-esbuild": "2.20.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.20.0",
-    "@modern-js/builder-shared": "2.20.0",
-    "@modern-js/builder-webpack-provider": "2.20.0",
-    "@modern-js/core": "2.20.0",
-    "@modern-js/new-action": "2.20.0",
-    "@modern-js/node-bundle-require": "2.20.0",
-    "@modern-js/plugin": "2.20.0",
-    "@modern-js/plugin-data-loader": "2.20.0",
-    "@modern-js/plugin-i18n": "2.20.0",
-    "@modern-js/plugin-lint": "2.20.0",
-    "@modern-js/prod-server": "2.20.0",
-    "@modern-js/server": "2.20.0",
-    "@modern-js/types": "2.20.0",
-    "@modern-js/upgrade": "2.20.0",
-    "@modern-js/utils": "2.20.0"
+    "@modern-js/builder": "2.21.1",
+    "@modern-js/builder-plugin-esbuild": "2.21.1",
+    "@modern-js/builder-plugin-node-polyfill": "2.21.1",
+    "@modern-js/builder-shared": "2.21.1",
+    "@modern-js/builder-webpack-provider": "2.21.1",
+    "@modern-js/core": "2.21.1",
+    "@modern-js/new-action": "2.21.1",
+    "@modern-js/node-bundle-require": "2.21.1",
+    "@modern-js/plugin": "2.21.1",
+    "@modern-js/plugin-data-loader": "2.21.1",
+    "@modern-js/plugin-i18n": "2.21.1",
+    "@modern-js/plugin-lint": "2.21.1",
+    "@modern-js/prod-server": "2.21.1",
+    "@modern-js/server": "2.21.1",
+    "@modern-js/types": "2.21.1",
+    "@modern-js/upgrade": "2.21.1",
+    "@modern-js/utils": "2.21.1"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
-    "typescript": "^4",
+    "typescript": "^5",
     "webpack": "^5.82.1",
-    "@modern-js/builder-plugin-swc": "2.20.0",
-    "@modern-js/builder-rspack-provider": "2.20.0",
-    "@modern-js/server-core": "2.20.0",
-    "@scripts/build": "2.20.0",
-    "@scripts/jest-config": "2.20.0"
+    "@modern-js/builder-plugin-swc": "2.21.1",
+    "@modern-js/builder-rspack-provider": "2.21.1",
+    "@modern-js/server-core": "2.21.1",
+    "@scripts/jest-config": "2.21.1",
+    "@scripts/build": "2.21.1"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.20.0"
+    "@modern-js/builder-rspack-provider": "^2.21.1"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {