@modern-js/app-tools 2.0.3-alpha.0 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,65 @@
 # @modern-js/app-tools
 
+## 2.1.0
+
+### Patch Changes
+
+- 2ad9642: feat: new command support --lang params
+
+  feat: new 命令支持 --lang 参数
+
+- bf38bda: feat(app-tools): allow to use dev.port config
+
+  feat(app-tools): 支持使用 dev.port 配置
+
+- 29fbc66: fix(app-tools): SVG default export type
+
+  fix(app-tools): 修复 SVG 默认导出的类型错误
+
+- 3a7da8c: fix(app-tools): server.port not work in development
+
+  fix(app-tools): 修复开发环境下 server.port 不生效的问题
+
+- 3d0fb38: fix: remove the prebundle for data loader
+  fix: 移除 data loader 的预打包
+- 6562578: chore: optimize the capitalization of plugin names
+
+  chore: 规范引用插件时的命名格式，统一使用 camelCase 代替 PascalCase
+
+- 0d2af52: docs: add docs for config and init
+  docs: 添加 config 和 init 在嵌套路由下的文档
+- 84ee9e9: fix: can't exit process after build
+  fix: 在 build 后不退出程序
+- 5b54418: fix(builder): no longer remove comments of HTML
+
+  fix(builder): 不再默认移除 HTML 中的注释
+
+- Updated dependencies [837620c]
+- Updated dependencies [3d0fb38]
+- Updated dependencies [3ad26c2]
+- Updated dependencies [5b54418]
+- Updated dependencies [bafa52e]
+- Updated dependencies [ccbac43]
+- Updated dependencies [8a9482c]
+- Updated dependencies [679296d]
+  - @modern-js/utils@2.1.0
+  - @modern-js/plugin-data-loader@2.1.0
+  - @modern-js/server@2.1.0
+  - @modern-js/builder-shared@2.1.0
+  - @modern-js/builder-webpack-provider@2.1.0
+  - @modern-js/core@2.1.0
+  - @modern-js/builder@2.1.0
+  - @modern-js/builder-plugin-esbuild@2.1.0
+  - @modern-js/builder-plugin-node-polyfill@2.1.0
+  - @modern-js/plugin-i18n@2.1.0
+  - @modern-js/plugin-lint@2.1.0
+  - @modern-js/new-action@2.1.0
+  - @modern-js/prod-server@2.1.0
+  - @modern-js/node-bundle-require@2.1.0
+  - @modern-js/upgrade@2.1.0
+  - @modern-js/plugin@2.1.0
+  - @modern-js/types@2.1.0
+
 ## 2.0.2
 
 ### Patch Changes

package/dist/js/modern/analyze/constants.js

@@ -25,7 +25,7 @@ const NESTED_ROUTE = {
   ERROR_FILE: "error",
   LOADER_FILE: "loader"
 };
-const APP_CONFIG_NAME = "appConfig";
+const APP_CONFIG_NAME = "config";
 const APP_INIT_EXPORTED = "init";
 const APP_INIT_IMPORTED = "appInit";
 export {

package/dist/js/modern/analyze/generateCode.js

@@ -19,11 +19,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import path from "path";
-import {
-  fs,
-  getEntryOptions,
-  logger
-} from "@modern-js/utils";
+import { fs, getEntryOptions, logger } from "@modern-js/utils";
 import {
   useResolvedConfigContext
 } from "@modern-js/core";
@@ -87,7 +83,6 @@ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, n
   var _a, _b, _c;
   const {
     internalDirectory,
-    distDirectory,
     srcDirectory,
     internalDirAlias,
     internalSrcAlias,
@@ -168,19 +163,16 @@ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, n
               ssrMode: mode,
               nestedRoutesEntry: entrypoint.nestedRoutesEntry,
               entryName: entrypoint.entryName,
-              internalDirectory,
-              internalDirAlias
+              internalDirectory
             })
           });
-          if (entrypoint.nestedRoutesEntry) {
+          if (entrypoint.nestedRoutesEntry && mode) {
             const routesServerFile = getServerLoadersFile(
               internalDirectory,
               entryName
             );
             const code3 = templates.routesForServer({
-              routes,
-              internalDirectory,
-              entryName
+              routes
             });
             yield fs.ensureFile(routesServerFile);
             yield fs.writeFile(routesServerFile, code3);

package/dist/js/modern/analyze/index.js

@@ -38,7 +38,13 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import * as path from "path";
-import { createDebugger, findExists, fs, isApiOnly, isUseSSRBundle } from "@modern-js/utils";
+import {
+  createDebugger,
+  findExists,
+  fs,
+  getEntryOptions,
+  isApiOnly
+} from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
@@ -209,13 +215,19 @@ var analyze_default = () => ({
       config() {
         return {
           tools: {
-            webpackChain: (chain, { name, CHAIN_ID }) => {
+            webpackChain: (chain, { name }) => {
               const appContext = api.useAppContext();
               const resolvedConfig = api.useResolvedConfigContext();
-              const { entrypoints, internalDirectory } = appContext;
+              const { entrypoints, internalDirectory, packageName } = appContext;
               entrypoints.forEach((entrypoint) => {
                 const { entryName } = entrypoint;
-                if (entrypoint.nestedRoutesEntry && isUseSSRBundle(resolvedConfig)) {
+                const ssr = getEntryOptions(
+                  entryName,
+                  resolvedConfig.server.ssr,
+                  resolvedConfig.server.ssrByEntries,
+                  packageName
+                );
+                if (entrypoint.nestedRoutesEntry && ssr && name === "server") {
                   const serverLoadersFile = getServerLoadersFile(
                     internalDirectory,
                     entryName

package/dist/js/modern/analyze/templates.js

@@ -72,7 +72,7 @@ const renderFunction = ({
   return `
   const finalAppConfig = {
     ...App.config,
-    ...typeof ${APP_CONFIG_NAME} === 'object' ? ${APP_CONFIG_NAME} : {},
+    ...typeof ${APP_CONFIG_NAME} === 'function' ? ${APP_CONFIG_NAME}() : {},
   }
 
   AppWrapper = createApp({
@@ -127,17 +127,9 @@ const html = (partials) => `
 </html>
 `;
 const routesForServer = ({
-  routes,
-  internalDirectory,
-  entryName
+  routes
 }) => {
   const loaders = [];
-  const loaderIndexFile = path.join(
-    internalDirectory,
-    entryName,
-    TEMP_LOADERS_DIR,
-    "index.js"
-  );
   const traverseRouteTree = (route) => {
     var _a;
     let children;
@@ -176,7 +168,7 @@ const routesForServer = ({
   let importLoadersCode = "";
   if (loaders.length > 0) {
     importLoadersCode = loaders.map((loader, index2) => {
-      return `import loader_${index2} from "${loader}"`;
+      return `import loader_${index2} from "${slash(loader)}"`;
     }).join("\n");
   }
   return `
@@ -189,8 +181,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory,
-  internalDirAlias
+  internalDirectory
 }) {
   const loadings = [];
   const errors = [];
@@ -209,11 +200,14 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   let rootLayoutCode = ``;
   let componentLoaderPath = "";
   const getDataLoaderPath = (loaderId) => {
-    if (!ssrMode)
+    if (!ssrMode) {
       return "";
+    }
     let dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
     if (nestedRoutesEntry) {
-      dataLoaderPath = `${slash(dataLoaderPath)}?mapFile=${slash(loadersMapFile)}&loaderId=${loaderId}!`;
+      dataLoaderPath = `${slash(dataLoaderPath)}?mapFile=${slash(
+        loadersMapFile
+      )}&loaderId=${loaderId}!`;
     }
     return dataLoaderPath;
   };
@@ -309,10 +303,14 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   let importLoadersCode = "";
   for (const [key, loaderInfo] of Object.entries(loadersMap)) {
     if (loaderInfo.inline) {
-      importLoadersCode += `import { loader as ${key} } from "${getDataLoaderPath(key)}${loaderInfo.filePath}";
+      importLoadersCode += `import { loader as ${key} } from "${getDataLoaderPath(
+        key
+      )}${slash(loaderInfo.filePath)}";
 `;
     } else {
-      importLoadersCode += `import ${key} from "${getDataLoaderPath(key)}${loaderInfo.filePath}";
+      importLoadersCode += `import ${key} from "${getDataLoaderPath(
+        key
+      )}${slash(loaderInfo.filePath)}";
 `;
     }
   }

package/dist/js/modern/analyze/utils.js

@@ -26,8 +26,7 @@ import { parse } from "es-module-lexer";
 import {
   FILE_SYSTEM_ROUTES_FILE_NAME,
   JS_EXTENSIONS,
-  LOADER_EXPORT_NAME,
-  NESTED_ROUTE
+  LOADER_EXPORT_NAME
 } from "./constants";
 const walkDirectory = (dir) => fs.readdirSync(dir).reduce((previous, filename) => {
   const filePath = path.join(dir, filename);
@@ -105,17 +104,6 @@ const isPageComponentFile = (filePath) => {
   }
   return false;
 };
-const isNestedRouteComponent = (nestedRouteEntries, absoluteFilePath) => {
-  const reg = new RegExp(
-    `(${NESTED_ROUTE.LAYOUT_FILE}|${NESTED_ROUTE.PAGE_FILE})\\.tsx?$`
-  );
-  return nestedRouteEntries.some((nestedRoutesEntry) => {
-    if (absoluteFilePath.includes(nestedRoutesEntry) && reg.test(absoluteFilePath)) {
-      return true;
-    }
-    return false;
-  });
-};
 const replaceWithAlias = (base, filePath, alias) => normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
 const parseModule = (_0) => __async(void 0, [_0], function* ({
   source,
@@ -140,17 +128,12 @@ const hasLoader = (filename) => __async(void 0, null, function* () {
   return moduleExports.some((e) => e.n === LOADER_EXPORT_NAME);
 });
 const getServerLoadersFile = (internalDirectory, entryName) => {
-  return path.join(
-    internalDirectory,
-    entryName,
-    "route-server-loaders.js"
-  );
+  return path.join(internalDirectory, entryName, "route-server-loaders.js");
 };
 export {
   getDefaultImports,
   getServerLoadersFile,
   hasLoader,
-  isNestedRouteComponent,
   isPageComponentFile,
   parseModule,
   replaceWithAlias,

package/dist/js/modern/builder/index.js

@@ -87,7 +87,6 @@ function createBuilderForModern(_0) {
   });
 }
 function createBuilderProviderConfig(normalizedConfig, appContext) {
-  var _a;
   const output = createOutputConfig(normalizedConfig, appContext);
   const htmlConfig = __spreadValues({}, normalizedConfig.html);
   if (!htmlConfig.template) {
@@ -96,7 +95,7 @@ function createBuilderProviderConfig(normalizedConfig, appContext) {
   return __spreadProps(__spreadValues({}, normalizedConfig), {
     output,
     dev: __spreadProps(__spreadValues({}, normalizedConfig.dev), {
-      port: (_a = normalizedConfig.server) == null ? void 0 : _a.port
+      port: appContext.port
     }),
     html: htmlConfig
   });

package/dist/js/modern/config/default.js

@@ -20,7 +20,9 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
 function createDefaultConfig(appContext) {
   const defaultBuilderConfig = createDefaultBuilderConfig();
-  const dev = __spreadValues({}, defaultBuilderConfig.dev);
+  const dev = __spreadProps(__spreadValues({}, defaultBuilderConfig.dev), {
+    port: void 0
+  });
   const tools = __spreadValues({}, defaultBuilderConfig.tools);
   const output = __spreadProps(__spreadValues({}, defaultBuilderConfig.output), {
     disableNodePolyfill: true

package/dist/js/modern/initialize/index.js

@@ -64,10 +64,10 @@ var initialize_default = () => ({
       validateSchema,
       resolvedConfig(_0) {
         return __async(this, arguments, function* ({ resolved }) {
-          var _a2, _b;
+          var _a2;
           let appContext = api.useAppContext();
           const userConfig = api.useConfigContext();
-          const port = yield getDevServerPort(appContext, resolved);
+          const port = yield getServerPort(resolved);
           appContext = __spreadProps(__spreadValues({}, appContext), {
             port,
             distDirectory: ensureAbsolutePath(
@@ -82,7 +82,7 @@ var initialize_default = () => ({
               _raw: userConfig,
               source: normalizedConfig.source || {},
               server: __spreadProps(__spreadValues({}, normalizedConfig.server || {}), {
-                port: port || ((_b = normalizedConfig.server) == null ? void 0 : _b.port)
+                port
               }),
               bff: normalizedConfig.bff || {},
               dev: normalizedConfig.dev || {},
@@ -106,13 +106,13 @@ var initialize_default = () => ({
     };
   }
 });
-function getDevServerPort(appContext, resolved) {
+function getServerPort(config) {
   return __async(this, null, function* () {
-    var _a;
+    const prodPort = config.server.port || 8080;
     if (isDev() && isDevCommand()) {
-      return ((_a = appContext.port) != null ? _a : 0) > 0 ? appContext.port : yield getPort(resolved.server.port || 8080);
+      return getPort(config.dev.port || prodPort);
     }
-    return resolved.server.port;
+    return prodPort;
   });
 }
 export {

package/dist/js/node/analyze/constants.js

@@ -68,7 +68,7 @@ const NESTED_ROUTE = {
   ERROR_FILE: "error",
   LOADER_FILE: "loader"
 };
-const APP_CONFIG_NAME = "appConfig";
+const APP_CONFIG_NAME = "config";
 const APP_INIT_EXPORTED = "init";
 const APP_INIT_IMPORTED = "appInit";
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -106,7 +106,6 @@ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, n
   var _a, _b, _c;
   const {
     internalDirectory,
-    distDirectory,
     srcDirectory,
     internalDirAlias,
     internalSrcAlias,
@@ -187,19 +186,16 @@ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, n
               ssrMode: mode,
               nestedRoutesEntry: entrypoint.nestedRoutesEntry,
               entryName: entrypoint.entryName,
-              internalDirectory,
-              internalDirAlias
+              internalDirectory
             })
           });
-          if (entrypoint.nestedRoutesEntry) {
+          if (entrypoint.nestedRoutesEntry && mode) {
             const routesServerFile = (0, import_utils2.getServerLoadersFile)(
               internalDirectory,
               entryName
             );
             const code3 = templates.routesForServer({
-              routes,
-              internalDirectory,
-              entryName
+              routes
             });
             yield import_utils.fs.ensureFile(routesServerFile);
             yield import_utils.fs.writeFile(routesServerFile, code3);

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

@@ -226,13 +226,19 @@ var analyze_default = () => ({
       config() {
         return {
           tools: {
-            webpackChain: (chain, { name, CHAIN_ID }) => {
+            webpackChain: (chain, { name }) => {
               const appContext = api.useAppContext();
               const resolvedConfig = api.useResolvedConfigContext();
-              const { entrypoints, internalDirectory } = appContext;
+              const { entrypoints, internalDirectory, packageName } = appContext;
               entrypoints.forEach((entrypoint) => {
                 const { entryName } = entrypoint;
-                if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(resolvedConfig)) {
+                const ssr = (0, import_utils.getEntryOptions)(
+                  entryName,
+                  resolvedConfig.server.ssr,
+                  resolvedConfig.server.ssrByEntries,
+                  packageName
+                );
+                if (entrypoint.nestedRoutesEntry && ssr && name === "server") {
                   const serverLoadersFile = (0, import_utils2.getServerLoadersFile)(
                     internalDirectory,
                     entryName

package/dist/js/node/analyze/templates.js

@@ -102,7 +102,7 @@ const renderFunction = ({
   return `
   const finalAppConfig = {
     ...App.config,
-    ...typeof ${import_constants.APP_CONFIG_NAME} === 'object' ? ${import_constants.APP_CONFIG_NAME} : {},
+    ...typeof ${import_constants.APP_CONFIG_NAME} === 'function' ? ${import_constants.APP_CONFIG_NAME}() : {},
   }
 
   AppWrapper = createApp({
@@ -157,17 +157,9 @@ const html = (partials) => `
 </html>
 `;
 const routesForServer = ({
-  routes,
-  internalDirectory,
-  entryName
+  routes
 }) => {
   const loaders = [];
-  const loaderIndexFile = import_path.default.join(
-    internalDirectory,
-    entryName,
-    import_constants.TEMP_LOADERS_DIR,
-    "index.js"
-  );
   const traverseRouteTree = (route) => {
     var _a;
     let children;
@@ -206,7 +198,7 @@ const routesForServer = ({
   let importLoadersCode = "";
   if (loaders.length > 0) {
     importLoadersCode = loaders.map((loader, index2) => {
-      return `import loader_${index2} from "${loader}"`;
+      return `import loader_${index2} from "${(0, import_utils.slash)(loader)}"`;
     }).join("\n");
   }
   return `
@@ -219,8 +211,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory,
-  internalDirAlias
+  internalDirectory
 }) {
   const loadings = [];
   const errors = [];
@@ -239,11 +230,14 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   let rootLayoutCode = ``;
   let componentLoaderPath = "";
   const getDataLoaderPath = (loaderId) => {
-    if (!ssrMode)
+    if (!ssrMode) {
       return "";
+    }
     let dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
     if (nestedRoutesEntry) {
-      dataLoaderPath = `${(0, import_utils.slash)(dataLoaderPath)}?mapFile=${(0, import_utils.slash)(loadersMapFile)}&loaderId=${loaderId}!`;
+      dataLoaderPath = `${(0, import_utils.slash)(dataLoaderPath)}?mapFile=${(0, import_utils.slash)(
+        loadersMapFile
+      )}&loaderId=${loaderId}!`;
     }
     return dataLoaderPath;
   };
@@ -339,10 +333,14 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   let importLoadersCode = "";
   for (const [key, loaderInfo] of Object.entries(loadersMap)) {
     if (loaderInfo.inline) {
-      importLoadersCode += `import { loader as ${key} } from "${getDataLoaderPath(key)}${loaderInfo.filePath}";
+      importLoadersCode += `import { loader as ${key} } from "${getDataLoaderPath(
+        key
+      )}${(0, import_utils.slash)(loaderInfo.filePath)}";
 `;
     } else {
-      importLoadersCode += `import ${key} from "${getDataLoaderPath(key)}${loaderInfo.filePath}";
+      importLoadersCode += `import ${key} from "${getDataLoaderPath(
+        key
+      )}${(0, import_utils.slash)(loaderInfo.filePath)}";
 `;
     }
   }

package/dist/js/node/analyze/utils.js

@@ -46,7 +46,6 @@ __export(utils_exports, {
   getDefaultImports: () => getDefaultImports,
   getServerLoadersFile: () => getServerLoadersFile,
   hasLoader: () => hasLoader,
-  isNestedRouteComponent: () => isNestedRouteComponent,
   isPageComponentFile: () => isPageComponentFile,
   parseModule: () => parseModule,
   replaceWithAlias: () => replaceWithAlias,
@@ -135,17 +134,6 @@ const isPageComponentFile = (filePath) => {
   }
   return false;
 };
-const isNestedRouteComponent = (nestedRouteEntries, absoluteFilePath) => {
-  const reg = new RegExp(
-    `(${import_constants.NESTED_ROUTE.LAYOUT_FILE}|${import_constants.NESTED_ROUTE.PAGE_FILE})\\.tsx?$`
-  );
-  return nestedRouteEntries.some((nestedRoutesEntry) => {
-    if (absoluteFilePath.includes(nestedRoutesEntry) && reg.test(absoluteFilePath)) {
-      return true;
-    }
-    return false;
-  });
-};
 const replaceWithAlias = (base, filePath, alias) => (0, import_utils.normalizeToPosixPath)(import_path.default.join(alias, import_path.default.relative(base, filePath)));
 const parseModule = (_0) => __async(void 0, [_0], function* ({
   source,
@@ -170,18 +158,13 @@ const hasLoader = (filename) => __async(void 0, null, function* () {
   return moduleExports.some((e) => e.n === import_constants.LOADER_EXPORT_NAME);
 });
 const getServerLoadersFile = (internalDirectory, entryName) => {
-  return import_path.default.join(
-    internalDirectory,
-    entryName,
-    "route-server-loaders.js"
-  );
+  return import_path.default.join(internalDirectory, entryName, "route-server-loaders.js");
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDefaultImports,
   getServerLoadersFile,
   hasLoader,
-  isNestedRouteComponent,
   isPageComponentFile,
   parseModule,
   replaceWithAlias,

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

@@ -104,7 +104,6 @@ function createBuilderForModern(_0) {
   });
 }
 function createBuilderProviderConfig(normalizedConfig, appContext) {
-  var _a;
   const output = createOutputConfig(normalizedConfig, appContext);
   const htmlConfig = __spreadValues({}, normalizedConfig.html);
   if (!htmlConfig.template) {
@@ -113,7 +112,7 @@ function createBuilderProviderConfig(normalizedConfig, appContext) {
   return __spreadProps(__spreadValues({}, normalizedConfig), {
     output,
     dev: __spreadProps(__spreadValues({}, normalizedConfig.dev), {
-      port: (_a = normalizedConfig.server) == null ? void 0 : _a.port
+      port: appContext.port
     }),
     html: htmlConfig
   });

package/dist/js/node/config/default.js

@@ -41,7 +41,9 @@ module.exports = __toCommonJS(default_exports);
 var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
 function createDefaultConfig(appContext) {
   const defaultBuilderConfig = (0, import_builder_webpack_provider.createDefaultConfig)();
-  const dev = __spreadValues({}, defaultBuilderConfig.dev);
+  const dev = __spreadProps(__spreadValues({}, defaultBuilderConfig.dev), {
+    port: void 0
+  });
   const tools = __spreadValues({}, defaultBuilderConfig.tools);
   const output = __spreadProps(__spreadValues({}, defaultBuilderConfig.output), {
     disableNodePolyfill: true

package/dist/js/node/initialize/index.js

@@ -80,10 +80,10 @@ var initialize_default = () => ({
       validateSchema,
       resolvedConfig(_0) {
         return __async(this, arguments, function* ({ resolved }) {
-          var _a2, _b;
+          var _a2;
           let appContext = api.useAppContext();
           const userConfig = api.useConfigContext();
-          const port = yield getDevServerPort(appContext, resolved);
+          const port = yield getServerPort(resolved);
           appContext = __spreadProps(__spreadValues({}, appContext), {
             port,
             distDirectory: (0, import_utils.ensureAbsolutePath)(
@@ -98,7 +98,7 @@ var initialize_default = () => ({
               _raw: userConfig,
               source: normalizedConfig.source || {},
               server: __spreadProps(__spreadValues({}, normalizedConfig.server || {}), {
-                port: port || ((_b = normalizedConfig.server) == null ? void 0 : _b.port)
+                port
               }),
               bff: normalizedConfig.bff || {},
               dev: normalizedConfig.dev || {},
@@ -122,13 +122,13 @@ var initialize_default = () => ({
     };
   }
 });
-function getDevServerPort(appContext, resolved) {
+function getServerPort(config) {
   return __async(this, null, function* () {
-    var _a;
+    const prodPort = config.server.port || 8080;
     if ((0, import_utils.isDev)() && (0, import_commands.isDevCommand)()) {
-      return ((_a = appContext.port) != null ? _a : 0) > 0 ? appContext.port : yield (0, import_utils.getPort)(resolved.server.port || 8080);
+      return (0, import_utils.getPort)(config.dev.port || prodPort);
     }
-    return resolved.server.port;
+    return prodPort;
   });
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/js/treeshaking/analyze/constants.js

@@ -34,7 +34,7 @@ var NESTED_ROUTE = {
     ERROR_FILE: "error",
     LOADER_FILE: "loader"
 };
-var APP_CONFIG_NAME = "appConfig";
+var APP_CONFIG_NAME = "config";
 var APP_INIT_EXPORTED = "init";
 var APP_INIT_IMPORTED = "appInit";
 export { APP_CONFIG_NAME, APP_FILE_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_FILE_NAME, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT, HTML_PARTIALS_EXTENSIONS, HTML_PARTIALS_FOLDER, INDEX_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME, NESTED_ROUTE, NESTED_ROUTES_DIR, PAGES_DIR_NAME, TEMP_LOADERS_DIR };

package/dist/js/treeshaking/analyze/generateCode.js

@@ -240,7 +240,7 @@ var createImportStatements = function(statements) {
 };
 var generateCode = function() {
     var _ref = _asyncToGenerator(function(appContext, config, entrypoints, api) {
-        var ref, ref1, ref2, internalDirectory, distDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
+        var ref, ref1, ref2, internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
         function generateEntryCode(entrypoint) {
             return _generateEntryCode.apply(this, arguments);
         }
@@ -335,8 +335,7 @@ var generateCode = function() {
                                     ssrMode: mode,
                                     nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                                     entryName: entrypoint.entryName,
-                                    internalDirectory: internalDirectory,
-                                    internalDirAlias: internalDirAlias
+                                    internalDirectory: internalDirectory
                                 })
                             ];
                         case 5:
@@ -348,15 +347,13 @@ var generateCode = function() {
                             ];
                         case 6:
                             ref = _state.sent(), code2 = ref.code;
-                            if (!entrypoint.nestedRoutesEntry) return [
+                            if (!(entrypoint.nestedRoutesEntry && mode)) return [
                                 3,
                                 9
                             ];
                             routesServerFile = getServerLoadersFile(internalDirectory, entryName);
                             code3 = templates.routesForServer({
-                                routes: routes,
-                                internalDirectory: internalDirectory,
-                                entryName: entryName
+                                routes: routes
                             });
                             return [
                                 4,
@@ -464,7 +461,7 @@ var generateCode = function() {
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    internalDirectory = appContext.internalDirectory, distDirectory = appContext.distDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
+                    internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
                     hookRunners = api.useHookRunners();
                     isV5 = typeof ((ref = config.runtime) === null || ref === void 0 ? void 0 : ref.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (ref1 = config.runtime) === null || ref1 === void 0 ? void 0 : (ref2 = ref1.router) === null || ref2 === void 0 ? void 0 : ref2.mode) === "react-router-5";
                     mountId = config.html.mountId;

package/dist/js/treeshaking/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, isUseSSRBundle } from "@modern-js/utils";
+import { createDebugger, findExists, fs, getEntryOptions, isApiOnly } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
@@ -528,13 +528,14 @@ var analyze_default = function() {
                     return {
                         tools: {
                             webpackChain: function(chain, param) {
-                                var name = param.name, CHAIN_ID = param.CHAIN_ID;
+                                var name = param.name;
                                 var appContext = api.useAppContext();
                                 var resolvedConfig = api.useResolvedConfigContext();
-                                var entrypoints = appContext.entrypoints, internalDirectory = appContext.internalDirectory;
+                                var entrypoints = appContext.entrypoints, internalDirectory = appContext.internalDirectory, packageName = appContext.packageName;
                                 entrypoints.forEach(function(entrypoint) {
                                     var entryName = entrypoint.entryName;
-                                    if (entrypoint.nestedRoutesEntry && isUseSSRBundle(resolvedConfig)) {
+                                    var ssr = getEntryOptions(entryName, resolvedConfig.server.ssr, resolvedConfig.server.ssrByEntries, packageName);
+                                    if (entrypoint.nestedRoutesEntry && ssr && name === "server") {
                                         var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
                                         chain.entry("".concat(entryName, "-server-loaders")).add(serverLoadersFile);
                                     }

package/dist/js/treeshaking/analyze/templates.js

@@ -229,7 +229,7 @@ var index = function(param) {
 };
 var renderFunction = function(param) {
     var plugins = param.plugins, customBootstrap = param.customBootstrap, fileSystemRoutes2 = param.fileSystemRoutes;
-    return "\n  const finalAppConfig = {\n    ...App.config,\n    ...typeof ".concat(APP_CONFIG_NAME, " === 'object' ? ").concat(APP_CONFIG_NAME, " : {},\n  }\n\n  AppWrapper = createApp({\n    plugins: [\n     ").concat(plugins.map(function(param) {
+    return "\n  const finalAppConfig = {\n    ...App.config,\n    ...typeof ".concat(APP_CONFIG_NAME, " === 'function' ? ").concat(APP_CONFIG_NAME, "() : {},\n  }\n\n  AppWrapper = createApp({\n    plugins: [\n     ").concat(plugins.map(function(param) {
         var name = param.name, options = param.options, args = param.args;
         return "".concat(name, "({...").concat(options, ", ...finalAppConfig?.").concat(args || name, "}),");
     }).join("\n"), "\n    ]\n  })(").concat(fileSystemRoutes2 ? "" : "App", ")\n\n\n  if(!AppWrapper.init && typeof appInit !== 'undefined') {\n    AppWrapper.init = appInit;\n  }\n\n\n  if (IS_BROWSER) {\n    ").concat(customBootstrap ? "customBootstrap(AppWrapper);" : "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);", "\n  }\n\n  return AppWrapper\n");
@@ -238,9 +238,8 @@ var html = function(partials) {
     return "\n<!DOCTYPE html>\n<html>\n<head>\n  <%= meta %>\n  <title><%= title %></title>\n\n  ".concat(partials.top.join("\n"), "\n\n  <script>\n    window.__assetPrefix__ = '<%= assetPrefix %>';\n  </script>\n  ").concat(partials.head.join("\n"), "\n\n  <!--<?- chunksMap.css ?>-->\n</head>\n\n<body>\n  <noscript>\n    We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.\n  </noscript>\n  <div id=\"<%= mountId %>\"><!--<?- html ?>--></div>\n  ").concat(partials.body.join("\n"), "\n  <!--<?- chunksMap.js ?>-->\n  <!--<?- SSRDataScript ?>-->\n  <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
 };
 var routesForServer = function(param) {
-    var routes = param.routes, internalDirectory = param.internalDirectory, entryName = param.entryName;
+    var routes = param.routes;
     var loaders = [];
-    var loaderIndexFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "index.js");
     var traverseRouteTree = function(route) {
         var children;
         if ("children" in route && route.children) {
@@ -290,18 +289,18 @@ var routesForServer = function(param) {
     var importLoadersCode = "";
     if (loaders.length > 0) {
         importLoadersCode = loaders.map(function(loader, index2) {
-            return "import loader_".concat(index2, ' from "').concat(loader, '"');
+            return "import loader_".concat(index2, ' from "').concat(slash(loader), '"');
         }).join("\n");
     }
     return "\n    ".concat(importLoadersCode, "\n    ").concat(routesCode, "\n  ");
 };
 var fileSystemRoutes = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, internalDirAlias, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, componentLoaderPath, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value, key, loaderInfo;
+        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, componentLoaderPath, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value, key, loaderInfo;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory, internalDirAlias = param.internalDirAlias;
+                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory;
                     loadings = [];
                     errors = [];
                     loaders = [];
@@ -311,7 +310,9 @@ var fileSystemRoutes = function() {
                     rootLayoutCode = "";
                     componentLoaderPath = "";
                     getDataLoaderPath = function(loaderId) {
-                        if (!ssrMode) return "";
+                        if (!ssrMode) {
+                            return "";
+                        }
                         var dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
                         if (nestedRoutesEntry) {
                             dataLoaderPath = "".concat(slash(dataLoaderPath), "?mapFile=").concat(slash(loadersMapFile), "&loaderId=").concat(loaderId, "!");
@@ -422,9 +423,9 @@ var fileSystemRoutes = function() {
                         for(_iterator1 = Object.entries(loadersMap)[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
                             _value = _slicedToArray(_step1.value, 2), key = _value[0], loaderInfo = _value[1];
                             if (loaderInfo.inline) {
-                                importLoadersCode += "import { loader as ".concat(key, ' } from "').concat(getDataLoaderPath(key)).concat(loaderInfo.filePath, '";\n');
+                                importLoadersCode += "import { loader as ".concat(key, ' } from "').concat(getDataLoaderPath(key)).concat(slash(loaderInfo.filePath), '";\n');
                             } else {
-                                importLoadersCode += "import ".concat(key, ' from "').concat(getDataLoaderPath(key)).concat(loaderInfo.filePath, '";\n');
+                                importLoadersCode += "import ".concat(key, ' from "').concat(getDataLoaderPath(key)).concat(slash(loaderInfo.filePath), '";\n');
                             }
                         }
                     } catch (err) {

package/dist/js/treeshaking/analyze/utils.js

@@ -185,7 +185,7 @@ import path from "path";
 import { isReact18, normalizeToPosixPath, fs as fse } from "@modern-js/utils";
 import { transform } from "esbuild";
 import { parse } from "es-module-lexer";
-import { FILE_SYSTEM_ROUTES_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME, NESTED_ROUTE } from "./constants";
+import { FILE_SYSTEM_ROUTES_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME } from "./constants";
 var walkDirectory = function(dir) {
     return fs.readdirSync(dir).reduce(function(previous, filename) {
         var filePath = path.join(dir, filename);
@@ -286,15 +286,6 @@ var isPageComponentFile = function(filePath) {
     }
     return false;
 };
-var isNestedRouteComponent = function(nestedRouteEntries, absoluteFilePath) {
-    var reg = new RegExp("(".concat(NESTED_ROUTE.LAYOUT_FILE, "|").concat(NESTED_ROUTE.PAGE_FILE, ")\\.tsx?$"));
-    return nestedRouteEntries.some(function(nestedRoutesEntry) {
-        if (absoluteFilePath.includes(nestedRoutesEntry) && reg.test(absoluteFilePath)) {
-            return true;
-        }
-        return false;
-    });
-};
 var replaceWithAlias = function(base, filePath, alias) {
     return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
 };
@@ -380,4 +371,4 @@ var hasLoader = function() {
 var getServerLoadersFile = function(internalDirectory, entryName) {
     return path.join(internalDirectory, entryName, "route-server-loaders.js");
 };
-export { getDefaultImports, getServerLoadersFile, hasLoader, isNestedRouteComponent, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };
+export { getDefaultImports, getServerLoadersFile, hasLoader, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };

package/dist/js/treeshaking/builder/index.js

@@ -264,7 +264,6 @@ function createBuilderProviderConfig(normalizedConfig, appContext) {
             cleanDistPath: false
         });
     };
-    var ref;
     var output = createOutputConfig(normalizedConfig, appContext);
     var htmlConfig = _objectSpread({}, normalizedConfig.html);
     if (!htmlConfig.template) {
@@ -273,7 +272,7 @@ function createBuilderProviderConfig(normalizedConfig, appContext) {
     return _objectSpreadProps(_objectSpread({}, normalizedConfig), {
         output: output,
         dev: _objectSpreadProps(_objectSpread({}, normalizedConfig.dev), {
-            port: (ref = normalizedConfig.server) === null || ref === void 0 ? void 0 : ref.port
+            port: appContext.port
         }),
         html: htmlConfig
     });

package/dist/js/treeshaking/config/default.js

@@ -53,7 +53,9 @@ function _objectSpreadProps(target, source) {
 import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
 function createDefaultConfig(appContext) {
     var defaultBuilderConfig = createDefaultBuilderConfig();
-    var dev = _objectSpread({}, defaultBuilderConfig.dev);
+    var dev = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.dev), {
+        port: void 0
+    });
     var tools = _objectSpread({}, defaultBuilderConfig.tools);
     var output = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.output), {
         disableNodePolyfill: true

package/dist/js/treeshaking/initialize/index.js

@@ -199,7 +199,7 @@ var initialize_default = function() {
                 resolvedConfig: function resolvedConfig(param) {
                     var resolved = param.resolved;
                     return _asyncToGenerator(function() {
-                        var ref, ref1, appContext, userConfig, port, normalizedConfig;
+                        var ref, appContext, userConfig, port, normalizedConfig;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -207,7 +207,7 @@ var initialize_default = function() {
                                     userConfig = api.useConfigContext();
                                     return [
                                         4,
-                                        getDevServerPort(appContext, resolved)
+                                        getServerPort(resolved)
                                     ];
                                 case 1:
                                     port = _state.sent();
@@ -224,7 +224,7 @@ var initialize_default = function() {
                                                 _raw: userConfig,
                                                 source: normalizedConfig.source || {},
                                                 server: _objectSpreadProps(_objectSpread({}, normalizedConfig.server || {}), {
-                                                    port: port || ((ref1 = normalizedConfig.server) === null || ref1 === void 0 ? void 0 : ref1.port)
+                                                    port: port
                                                 }),
                                                 bff: normalizedConfig.bff || {},
                                                 dev: normalizedConfig.dev || {},
@@ -252,49 +252,26 @@ var initialize_default = function() {
         }
     };
 };
-function getDevServerPort(appContext, resolved) {
-    return _getDevServerPort.apply(this, arguments);
+function getServerPort(config) {
+    return _getServerPort.apply(this, arguments);
 }
-function _getDevServerPort() {
-    _getDevServerPort = _asyncToGenerator(function(appContext, resolved) {
-        var _port, _tmp;
+function _getServerPort() {
+    _getServerPort = _asyncToGenerator(function(config) {
+        var prodPort;
         return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    if (!(isDev() && isDevCommand())) return [
-                        3,
-                        4
-                    ];
-                    if (!(((_port = appContext.port) !== null && _port !== void 0 ? _port : 0) > 0)) return [
-                        3,
-                        1
-                    ];
-                    _tmp = appContext.port;
-                    return [
-                        3,
-                        3
-                    ];
-                case 1:
-                    return [
-                        4,
-                        getPort(resolved.server.port || 8080)
-                    ];
-                case 2:
-                    _tmp = _state.sent();
-                    _state.label = 3;
-                case 3:
-                    return [
-                        2,
-                        _tmp
-                    ];
-                case 4:
-                    return [
-                        2,
-                        resolved.server.port
-                    ];
+            prodPort = config.server.port || 8080;
+            if (isDev() && isDevCommand()) {
+                return [
+                    2,
+                    getPort(config.dev.port || prodPort)
+                ];
             }
+            return [
+                2,
+                prodPort
+            ];
         });
     });
-    return _getDevServerPort.apply(this, arguments);
+    return _getServerPort.apply(this, arguments);
 }
 export { initialize_default as default };

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

@@ -25,6 +25,6 @@ export declare const NESTED_ROUTE: {
   ERROR_FILE: string;
   LOADER_FILE: string;
 };
-export declare const APP_CONFIG_NAME = "appConfig";
+export declare const APP_CONFIG_NAME = "config";
 export declare const APP_INIT_EXPORTED = "init";
 export declare const APP_INIT_IMPORTED = "appInit";

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

@@ -26,26 +26,20 @@ export declare const html: (partials: {
   body: string[];
 }) => string;
 export declare const routesForServer: ({
-  routes,
-  internalDirectory,
-  entryName
+  routes
 }: {
   routes: (NestedRoute | PageRoute)[];
-  internalDirectory: string;
-  entryName: string;
 }) => string;
 export declare const fileSystemRoutes: ({
   routes,
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory,
-  internalDirAlias
+  internalDirectory
 }: {
   routes: RouteLegacy[] | (NestedRoute | PageRoute)[];
   ssrMode: 'string' | 'stream' | false;
   nestedRoutesEntry?: string | undefined;
   entryName: string;
   internalDirectory: string;
-  internalDirAlias: string;
 }) => Promise<string>;

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

@@ -15,7 +15,6 @@ export declare const getDefaultImports: ({
   internalDirectory: string;
 }) => ImportStatement[];
 export declare const isPageComponentFile: (filePath: string) => boolean;
-export declare const isNestedRouteComponent: (nestedRouteEntries: string[], absoluteFilePath: string) => boolean;
 export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
 export declare const parseModule: ({
   source,

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

@@ -1,7 +1,7 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 type BuilderDevConfig = Required<BuilderConfig>['dev'];
 export type DevProxyOptions = string | Record<string, string>;
-export interface DevUserConfig extends Omit<BuilderDevConfig, 'port'> {
+export interface DevUserConfig extends BuilderDevConfig {
   /**
    * The configuration of `dev.proxy` is provided by `proxy` plugin.
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.

package/lib/types.d.ts

@@ -98,8 +98,12 @@ declare module '*.svg?inline' {
     React.SVGProps<SVGSVGElement>
   >;
 
-  const src: string;
-  export default src;
+  /**
+   * The default export type depends on the svgDefaultExport config,
+   * it can be a string or a ReactComponent
+   * */
+  const content: any;
+  export default content;
 }
 
 declare module '*.bmp?url' {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.3-alpha.0",
+  "version": "2.1.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -63,37 +63,37 @@
     "@babel/runtime": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
-    "@modern-js/builder": "2.0.2",
-    "@modern-js/builder-plugin-esbuild": "2.0.2",
-    "@modern-js/builder-plugin-node-polyfill": "2.0.2",
-    "@modern-js/builder-shared": "2.0.2",
-    "@modern-js/builder-webpack-provider": "2.0.2",
-    "@modern-js/core": "2.0.2",
-    "@modern-js/new-action": "2.0.2",
-    "@modern-js/node-bundle-require": "2.0.2",
-    "@modern-js/plugin": "2.0.2",
-    "@modern-js/plugin-data-loader": "2.0.3-alpha.0",
-    "@modern-js/plugin-i18n": "2.0.2",
-    "@modern-js/plugin-lint": "2.0.2",
-    "@modern-js/prod-server": "2.0.2",
-    "@modern-js/server": "2.0.2",
-    "@modern-js/types": "2.0.2",
-    "@modern-js/upgrade": "2.0.2",
-    "@modern-js/utils": "2.0.2",
     "es-module-lexer": "^1.1.0",
-    "esbuild": "0.15.7"
+    "esbuild": "0.15.7",
+    "@modern-js/builder": "2.1.0",
+    "@modern-js/builder-plugin-esbuild": "2.1.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.1.0",
+    "@modern-js/builder-shared": "2.1.0",
+    "@modern-js/builder-webpack-provider": "2.1.0",
+    "@modern-js/core": "2.1.0",
+    "@modern-js/new-action": "2.1.0",
+    "@modern-js/node-bundle-require": "2.1.0",
+    "@modern-js/plugin": "2.1.0",
+    "@modern-js/plugin-data-loader": "2.1.0",
+    "@modern-js/plugin-i18n": "2.1.0",
+    "@modern-js/plugin-lint": "2.1.0",
+    "@modern-js/prod-server": "2.1.0",
+    "@modern-js/server": "2.1.0",
+    "@modern-js/types": "2.1.0",
+    "@modern-js/upgrade": "2.1.0",
+    "@modern-js/utils": "2.1.0"
   },
   "devDependencies": {
-    "@modern-js/builder-plugin-swc": "2.0.2",
-    "@modern-js/server-core": "2.0.2",
-    "@scripts/build": "2.0.2",
-    "@scripts/jest-config": "2.0.2",
     "@types/babel__traverse": "^7.14.2",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "webpack": "^5.75.0"
+    "webpack": "^5.75.0",
+    "@modern-js/builder-plugin-swc": "2.1.0",
+    "@modern-js/server-core": "2.1.0",
+    "@scripts/build": "2.1.0",
+    "@scripts/jest-config": "2.1.0"
   },
   "sideEffects": false,
   "publishConfig": {