@modern-js/app-tools 2.0.2 → 2.1.0

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/modern/locale/en.js

@@ -19,7 +19,8 @@ const EN_LOCALE = {
       debug: "using debug mode to log something",
       config: "set default generator config(json string)",
       distTag: `use specified tag version for it's generator`,
-      registry: "set npm registry url to run npm command"
+      registry: "set npm registry url to run npm command",
+      lang: "set new command language(en or zh)"
     },
     inspect: {
       env: "specify env mode",

package/dist/js/modern/locale/zh.js

@@ -19,7 +19,8 @@ const ZH_LOCALE = {
       debug: "开启 Debug 模式，打印调试日志信息",
       config: "生成器运行默认配置(JSON 字符串)",
       distTag: "生成器使用特殊的 npm Tag 版本",
-      registry: "生成器运行过程中定制 npm Registry"
+      registry: "生成器运行过程中定制 npm Registry",
+      lang: "设置 new 命令执行语言(zh 或者 en)"
     },
     inspect: {
       env: "查看指定环境下的配置",

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

@@ -50,18 +50,11 @@ module.exports = __toCommonJS(generateCode_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_core = require("@modern-js/core");
-var import_commands = require("../utils/commands");
 var templates = __toESM(require("./templates"));
 var import_getClientRoutes = require("./getClientRoutes");
 var import_constants = require("./constants");
 var import_utils2 = require("./utils");
 var import_nestedRoutes = require("./nestedRoutes");
-var import_Builder = require("./Builder");
-const loader = {
-  ".js": "jsx",
-  ".ts": "tsx"
-};
-const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 const createImportSpecifier = (specifiers) => {
   let defaults = "";
   const named = [];
@@ -109,54 +102,10 @@ ${initialize || ""}`
 ${initialize || ""}`
   ).join("\n");
 };
-const buildLoader = (entry, outfile) => __async(void 0, null, function* () {
-  yield import_Builder.loaderBuilder.build({
-    format: "esm",
-    platform: "browser",
-    target: "esnext",
-    loader,
-    watch: (0, import_commands.isDevCommand)() && {},
-    bundle: true,
-    logLevel: "error",
-    entryPoints: [entry],
-    outfile,
-    plugins: [
-      {
-        name: "make-all-packages-external",
-        setup(build) {
-          build.onResolve({ filter: EXTERNAL_REGEXP }, (args) => {
-            let external = true;
-            if (args.kind === "entry-point") {
-              external = false;
-            }
-            return {
-              path: args.path,
-              external
-            };
-          });
-        }
-      }
-    ]
-  });
-});
-const buildServerLoader = (entry, outfile) => __async(void 0, null, function* () {
-  yield import_Builder.serverLoaderBuilder.build({
-    format: "cjs",
-    platform: "node",
-    target: "esnext",
-    loader,
-    watch: (0, import_commands.isDevCommand)() && {},
-    bundle: true,
-    logLevel: "error",
-    entryPoints: [entry],
-    outfile
-  });
-});
 const generateCode = (appContext, config, entrypoints, api) => __async(void 0, null, function* () {
   var _a, _b, _c;
   const {
     internalDirectory,
-    distDirectory,
     srcDirectory,
     internalDirAlias,
     internalSrcAlias,
@@ -237,47 +186,19 @@ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, n
               ssrMode: mode,
               nestedRoutesEntry: entrypoint.nestedRoutesEntry,
               entryName: entrypoint.entryName,
-              internalDirectory,
-              internalDirAlias
+              internalDirectory
             })
           });
-          if (entrypoint.nestedRoutesEntry) {
-            const routesServerFile = import_path.default.join(
+          if (entrypoint.nestedRoutesEntry && mode) {
+            const routesServerFile = (0, import_utils2.getServerLoadersFile)(
               internalDirectory,
-              entryName,
-              "route-server-loaders.js"
-            );
-            const outputRoutesServerFile = import_path.default.join(
-              distDirectory,
-              import_utils.LOADER_ROUTES_DIR,
-              entryName,
-              "index.js"
+              entryName
             );
             const code3 = templates.routesForServer({
-              routes,
-              internalDirectory,
-              entryName
+              routes
             });
             yield import_utils.fs.ensureFile(routesServerFile);
             yield import_utils.fs.writeFile(routesServerFile, code3);
-            const loaderEntryFile = import_path.default.join(
-              internalDirectory,
-              entryName,
-              import_constants.TEMP_LOADERS_DIR,
-              "entry.js"
-            );
-            const loaderIndexFile = import_path.default.join(
-              internalDirectory,
-              entryName,
-              import_constants.TEMP_LOADERS_DIR,
-              "index.js"
-            );
-            if (yield import_utils.fs.pathExists(loaderEntryFile)) {
-              yield buildLoader(loaderEntryFile, loaderIndexFile);
-            }
-            if (yield import_utils.fs.pathExists(routesServerFile)) {
-              yield buildServerLoader(routesServerFile, outputRoutesServerFile);
-            }
           }
           import_utils.fs.outputFileSync(
             import_path.default.resolve(

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

@@ -73,7 +73,6 @@ var import_config = require("../utils/config");
 var import_commands = require("../utils/commands");
 var import_config2 = require("../config");
 var import_utils2 = require("./utils");
-var import_Builder = require("./Builder");
 var import_constants = require("./constants");
 const debug = (0, import_utils.createDebugger)("plugin-analyze");
 var analyze_default = () => ({
@@ -224,6 +223,33 @@ var analyze_default = () => ({
       watchFiles() {
         return pagesDir;
       },
+      config() {
+        return {
+          tools: {
+            webpackChain: (chain, { name }) => {
+              const appContext = api.useAppContext();
+              const resolvedConfig = api.useResolvedConfigContext();
+              const { entrypoints, internalDirectory, packageName } = appContext;
+              entrypoints.forEach((entrypoint) => {
+                const { entryName } = entrypoint;
+                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
+                  );
+                  chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
+                }
+              });
+            }
+          }
+        };
+      },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
         const config = (0, import_config2.initialNormalizedConfig)(resolved, appContext);
@@ -283,12 +309,6 @@ var analyze_default = () => ({
           };
         });
       },
-      beforeRestart() {
-        return __async(this, null, function* () {
-          import_Builder.serverLoaderBuilder.stop();
-          import_Builder.loaderBuilder.stop();
-        });
-      },
       fileChange(e) {
         return __async(this, null, function* () {
           const appContext = api.useAppContext();
@@ -297,7 +317,7 @@ var analyze_default = () => ({
           const isPageFile = (name) => pagesDir.some((pageDir) => name.includes(pageDir));
           const absoluteFilePath = path.resolve(appDirectory, filename);
           const isRouteComponent = isPageFile(absoluteFilePath) && (0, import_utils2.isPageComponentFile)(absoluteFilePath);
-          if (isRouteComponent && (eventType === "add" || eventType === "unlink") || (0, import_utils2.isNestedRouteComponent)(nestedRouteEntries, absoluteFilePath) && eventType === "change") {
+          if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
             const resolvedConfig = api.useResolvedConfigContext();
             const { generateCode } = yield Promise.resolve().then(() => __toESM(require("./generateCode")));
             const entrypoints = (0, import_lodash.cloneDeep)(originEntrypoints);

package/dist/js/node/analyze/nestedRoutes.js

@@ -68,12 +68,6 @@ var import_utils = require("@modern-js/utils");
 var import_constants = require("./constants");
 var import_utils2 = require("./utils");
 const conventionNames = Object.values(import_constants.NESTED_ROUTE);
-const getLoaderPath = (filename) => __async(void 0, null, function* () {
-  if (yield (0, import_utils2.hasLoader)(filename)) {
-    return filename;
-  }
-  return void 0;
-});
 const replaceDynamicPath = (routePath) => {
   return routePath.replace(/\[(.*?)\]/g, ":$1");
 };
@@ -144,10 +138,6 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_FILE) {
       route._component = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
-      const loaderPath = yield getLoaderPath(itemPath);
-      if (loaderPath) {
-        route.loader = loaderPath;
-      }
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_LOADER_FILE) {
       pageLoaderFile = itemPath;
@@ -161,10 +151,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
         itemPath,
         entryName
       );
-      const loaderPath = yield getLoaderPath(itemPath);
-      if (loaderPath) {
-        pageRoute.loader = loaderPath;
-      } else if (pageLoaderFile) {
+      if (pageLoaderFile) {
         pageRoute.loader = pageLoaderFile;
       }
       (_b = route.children) == null ? void 0 : _b.push(pageRoute);

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;
@@ -205,10 +197,9 @@ const routesForServer = ({
 ];`;
   let importLoadersCode = "";
   if (loaders.length > 0) {
-    importLoadersCode = `
-    import { ${loaders.map(
-      (loader, index2) => `loader_${index2}`
-    )} } from "${(0, import_utils.slash)(loaderIndexFile)}"`;
+    importLoadersCode = loaders.map((loader, index2) => {
+      return `import loader_${index2} from "${(0, import_utils.slash)(loader)}"`;
+    }).join("\n");
   }
   return `
     ${importLoadersCode}
@@ -220,19 +211,12 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory,
-  internalDirAlias
+  internalDirectory
 }) {
   const loadings = [];
   const errors = [];
   const loaders = [];
   const loadersMap = {};
-  const loadersIndexFile = import_path.default.join(
-    internalDirAlias,
-    entryName,
-    import_constants.TEMP_LOADERS_DIR,
-    "index.js"
-  );
   const loadersMapFile = import_path.default.join(
     internalDirectory,
     entryName,
@@ -244,13 +228,20 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
   `;
   let rootLayoutCode = ``;
-  let dataLoaderPath = "";
   let componentLoaderPath = "";
-  if (ssrMode) {
-    dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
+  const getDataLoaderPath = (loaderId) => {
+    if (!ssrMode) {
+      return "";
+    }
+    let dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
     if (nestedRoutesEntry) {
-      dataLoaderPath = `${dataLoaderPath}?routesDir=${nestedRoutesEntry}&mapFile=${loadersMapFile}!`;
+      dataLoaderPath = `${(0, import_utils.slash)(dataLoaderPath)}?mapFile=${(0, import_utils.slash)(
+        loadersMapFile
+      )}&loaderId=${loaderId}!`;
     }
+    return dataLoaderPath;
+  };
+  if (ssrMode) {
     componentLoaderPath = `${import_path.default.join(
       __dirname,
       "../builder/loaders/routerLoader"
@@ -280,7 +271,11 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
         loaders.push(route.loader);
         const loaderId = loaders.length - 1;
         loader = `loader_${loaderId}`;
-        loadersMap[loader] = route.id;
+        loadersMap[loader] = {
+          routeId: route.id,
+          filePath: route.loader,
+          inline: false
+        };
       }
       if (route._component) {
         if (route.isRoot) {
@@ -336,48 +331,21 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
 `;
   }).join("");
   let importLoadersCode = "";
-  if (loaders.length > 0) {
-    importLoadersCode = `
-    import { ${loaders.map(
-      (loader, index2) => `loader_${index2}`
-    )} } from "${(0, import_utils.slash)(dataLoaderPath)}${(0, import_utils.slash)(loadersIndexFile)}"
-  `;
-    const loaderEntryCode = loaders.map((loader, index2) => {
-      return `export * from './loader_${index2}.js';`;
-    }).join("\n");
-    const loaderEntryFile = import_path.default.join(
-      internalDirectory,
-      entryName,
-      import_constants.TEMP_LOADERS_DIR,
-      "entry.js"
-    );
-    yield import_utils.fs.ensureFile(loaderEntryFile);
-    yield import_utils.fs.writeFile(loaderEntryFile, loaderEntryCode);
-    yield import_utils.fs.writeJSON(loadersMapFile, loadersMap);
-    yield Promise.all(
-      loaders.map((loader, index2) => __async(void 0, null, function* () {
-        const name = `loader_${index2}`;
-        const filename = import_path.default.join(
-          internalDirectory,
-          entryName,
-          import_constants.TEMP_LOADERS_DIR,
-          `${name}.js`
-        );
-        let code = "";
-        if (loader.includes(".loader.")) {
-          code = `
-          export { default as ${name} } from '${(0, import_utils.slash)(loader)}'
-        `;
-        } else {
-          code = `
-          export { loader as ${name} } from '${(0, import_utils.slash)(loader)}'
-        `;
-        }
-        yield import_utils.fs.ensureFile(filename);
-        yield import_utils.fs.writeFile(filename, code);
-      }))
-    );
+  for (const [key, loaderInfo] of Object.entries(loadersMap)) {
+    if (loaderInfo.inline) {
+      importLoadersCode += `import { loader as ${key} } from "${getDataLoaderPath(
+        key
+      )}${(0, import_utils.slash)(loaderInfo.filePath)}";
+`;
+    } else {
+      importLoadersCode += `import ${key} from "${getDataLoaderPath(
+        key
+      )}${(0, import_utils.slash)(loaderInfo.filePath)}";
+`;
+    }
   }
+  yield import_utils.fs.ensureFile(loadersMapFile);
+  yield import_utils.fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
     ${rootLayoutCode}

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

@@ -44,8 +44,8 @@ var __async = (__this, __arguments, generator) => {
 var utils_exports = {};
 __export(utils_exports, {
   getDefaultImports: () => getDefaultImports,
+  getServerLoadersFile: () => getServerLoadersFile,
   hasLoader: () => hasLoader,
-  isNestedRouteComponent: () => isNestedRouteComponent,
   isPageComponentFile: () => isPageComponentFile,
   parseModule: () => parseModule,
   replaceWithAlias: () => replaceWithAlias,
@@ -134,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,
@@ -168,11 +157,14 @@ 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");
+};
 // 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/config/initial/inits.js

@@ -154,7 +154,7 @@ function initToolsConfig(config) {
       ]
     }
   };
-  const { tsChecker, tsLoader, htmlPlugin } = config.tools;
+  const { tsChecker, tsLoader } = config.tools;
   config.tools.tsChecker = (0, import_utils.applyOptionsChain)(defaultTsChecker, tsChecker);
   tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
     (0, import_utils.applyOptionsChain)(
@@ -166,14 +166,6 @@ function initToolsConfig(config) {
       utils
     );
   });
-  config.tools.htmlPlugin = [
-    (config2) => __spreadProps(__spreadValues({}, config2), {
-      minify: typeof config2.minify === "object" ? __spreadProps(__spreadValues({}, config2.minify), {
-        removeComments: false
-      }) : config2.minify
-    }),
-    ...Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : []
-  ];
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/js/node/index.js

@@ -112,7 +112,6 @@ const buildCommand = (program, api) => __async(void 0, null, function* () {
   const buildProgram = program.command("build").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.build.describe)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--analyze", import_locale.i18n.t(import_locale.localeKeys.command.shared.analyze)).action((options) => __async(void 0, null, function* () {
     const { build } = yield Promise.resolve().then(() => __toESM(require("./commands/build")));
     yield build(api, options);
-    process.exit(0);
   }));
   for (const platformBuilder of platformBuilders) {
     const platforms = (0, import_lodash.castArray)(platformBuilder.platform);
@@ -167,12 +166,12 @@ var src_default = () => ({
             yield deploy(api, options);
             process.exit(0);
           }));
-          program.command("new").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.new.describe)).option("-d, --debug", import_locale.i18n.t(import_locale.localeKeys.command.new.debug), false).option(
+          program.command("new").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.new.describe)).option("--lang <lang>", import_locale.i18n.t(import_locale.localeKeys.command.new.lang)).option("-d, --debug", import_locale.i18n.t(import_locale.localeKeys.command.new.debug), false).option(
             "-c, --config <config>",
             import_locale.i18n.t(import_locale.localeKeys.command.new.config)
           ).option("--dist-tag <tag>", import_locale.i18n.t(import_locale.localeKeys.command.new.distTag)).option("--registry", import_locale.i18n.t(import_locale.localeKeys.command.new.registry)).action((options) => __async(this, null, function* () {
             const { MWANewAction } = yield Promise.resolve().then(() => __toESM(require("@modern-js/new-action")));
-            yield MWANewAction(__spreadProps(__spreadValues({}, options), { locale }));
+            yield MWANewAction(__spreadProps(__spreadValues({}, options), { locale: options.lang || locale }));
           }));
           program.command("inspect").description("inspect internal webpack config").option(
             `--env <env>`,

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/node/locale/en.js

@@ -41,7 +41,8 @@ const EN_LOCALE = {
       debug: "using debug mode to log something",
       config: "set default generator config(json string)",
       distTag: `use specified tag version for it's generator`,
-      registry: "set npm registry url to run npm command"
+      registry: "set npm registry url to run npm command",
+      lang: "set new command language(en or zh)"
     },
     inspect: {
       env: "specify env mode",

package/dist/js/node/locale/zh.js

@@ -41,7 +41,8 @@ const ZH_LOCALE = {
       debug: "开启 Debug 模式，打印调试日志信息",
       config: "生成器运行默认配置(JSON 字符串)",
       distTag: "生成器使用特殊的 npm Tag 版本",
-      registry: "生成器运行过程中定制 npm Registry"
+      registry: "生成器运行过程中定制 npm Registry",
+      lang: "设置 new 命令执行语言(zh 或者 en)"
     },
     inspect: {
       env: "查看指定环境下的配置",

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 };