@modern-js/app-tools 2.1.0 → 2.3.0

package/dist/js/node/utils/{createFileWatcher.js → generateWatchFiles.js}

@@ -41,20 +41,18 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-var createFileWatcher_exports = {};
-__export(createFileWatcher_exports, {
+var generateWatchFiles_exports = {};
+__export(generateWatchFiles_exports, {
   addServerConfigToDeps: () => addServerConfigToDeps,
-  createFileWatcher: () => createFileWatcher
+  generateWatchFiles: () => generateWatchFiles
 });
-module.exports = __toCommonJS(createFileWatcher_exports);
-var import_crypto = __toESM(require("crypto"));
-var import_fs = __toESM(require("fs"));
+module.exports = __toCommonJS(generateWatchFiles_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 const getPackageConfig = (appDirectory, packageJsonConfig) => {
   const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
   const json = JSON.parse(
-    import_fs.default.readFileSync(import_path.default.resolve(appDirectory, "./package.json"), "utf8")
+    import_utils.fs.readFileSync(import_path.default.resolve(appDirectory, "./package.json"), "utf8")
   );
   return json[packageJsonConfig != null ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
 };
@@ -64,14 +62,10 @@ const addServerConfigToDeps = (dependencies, appDirectory, serverConfigFile) =>
     dependencies.push(serverConfig);
   }
 });
-const debug = (0, import_utils.createDebugger)("watch-files");
-const md5 = (data) => import_crypto.default.createHash("md5").update(data).digest("hex");
-const hashMap = /* @__PURE__ */ new Map();
-const createFileWatcher = (appContext, configDir, hooksRunner) => __async(void 0, null, function* () {
-  if ((0, import_utils.isDev)() || (0, import_utils.isTest)()) {
+function generateWatchFiles(appContext, configDir) {
+  return __async(this, null, function* () {
     const { appDirectory, configFile } = appContext;
-    const extraFiles = yield hooksRunner.watchFiles();
-    const configPath = import_path.default.join(appDirectory, configDir);
+    const configPath = import_path.default.join(appDirectory, configDir || "");
     const dependencies = getPackageConfig(
       appContext.appDirectory,
       appContext.packageName
@@ -81,59 +75,11 @@ const createFileWatcher = (appContext, configDir, hooksRunner) => __async(void 0
       appContext.appDirectory,
       appContext.serverConfigFile
     );
-    const watched = [
-      `${configPath}/html`,
-      ...extraFiles,
-      ...dependencies,
-      configFile
-    ].filter(Boolean);
-    debug(`watched: %o`, watched);
-    const watcher = import_utils.chokidar.watch(watched, {
-      cwd: appDirectory,
-      ignoreInitial: true,
-      ignorePermissionErrors: true,
-      ignored: [
-        /node_modules/,
-        "**/__test__/**",
-        "**/*.test.(js|jsx|ts|tsx)",
-        "**/*.spec.(js|jsx|ts|tsx)",
-        "**/*.stories.(js|jsx|ts|tsx)"
-      ]
-    });
-    watcher.on("change", (changed) => {
-      const lastHash = hashMap.get(changed);
-      const currentHash = md5(
-        import_fs.default.readFileSync(import_path.default.join(appDirectory, changed), "utf8")
-      );
-      if (currentHash !== lastHash) {
-        debug(`file change: %s`, changed);
-        hashMap.set(changed, currentHash);
-        hooksRunner.fileChange({ filename: changed, eventType: "change" });
-      }
-    });
-    watcher.on("add", (name) => {
-      debug(`add file: %s`, name);
-      const currentHash = md5(
-        import_fs.default.readFileSync(import_path.default.join(appDirectory, name), "utf8")
-      );
-      hashMap.set(name, currentHash);
-      hooksRunner.fileChange({ filename: name, eventType: "add" });
-    });
-    watcher.on("unlink", (name) => {
-      debug(`remove file: %s`, name);
-      if (hashMap.has(name)) {
-        hashMap.delete(name);
-      }
-      hooksRunner.fileChange({ filename: name, eventType: "unlink" });
-    });
-    watcher.on("error", (err) => {
-      throw err;
-    });
-    return watcher;
-  }
-});
+    return [`${configPath}/html`, configFile || "./config", ...dependencies];
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addServerConfigToDeps,
-  createFileWatcher
+  generateWatchFiles
 });

package/dist/js/node/utils/{getSpecifiedEntries.js → getSelectedEntries.js}

@@ -35,13 +35,14 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-var getSpecifiedEntries_exports = {};
-__export(getSpecifiedEntries_exports, {
-  getSpecifiedEntries: () => getSpecifiedEntries
+var getSelectedEntries_exports = {};
+__export(getSelectedEntries_exports, {
+  getSelectedEntries: () => getSelectedEntries
 });
-module.exports = __toCommonJS(getSpecifiedEntries_exports);
+module.exports = __toCommonJS(getSelectedEntries_exports);
 var import_utils = require("@modern-js/utils");
-const getSpecifiedEntries = (entry, entrypoints) => __async(void 0, null, function* () {
+var import_locale = require("../locale");
+const getSelectedEntries = (entry, entrypoints) => __async(void 0, null, function* () {
   const entryNames = entrypoints.map((e) => e.entryName);
   if (!entry) {
     return entryNames;
@@ -52,10 +53,10 @@ const getSpecifiedEntries = (entry, entrypoints) => __async(void 0, null, functi
         type: "checkbox",
         name: "selected",
         choices: entryNames,
-        message: "请选择需要构建的入口",
+        message: import_locale.i18n.t(import_locale.localeKeys.command.dev.selectEntry),
         validate(answer) {
           if (answer.length < 1) {
-            return "You must choose at least one topping.";
+            return import_locale.i18n.t(import_locale.localeKeys.command.dev.requireEntry);
           }
           return true;
         }
@@ -66,9 +67,9 @@ const getSpecifiedEntries = (entry, entrypoints) => __async(void 0, null, functi
   entry.forEach((name) => {
     if (!entryNames.includes(name)) {
       throw new Error(
-        `can not found entry ${name}, compiler entry should in ${entryNames.join(
-          ", "
-        )}`
+        `Can not found entry ${import_utils.chalk.yellow(
+          name
+        )}, the entry should be one of ${import_utils.chalk.yellow(entryNames.join(", "))}`
       );
     }
   });
@@ -76,5 +77,5 @@ const getSpecifiedEntries = (entry, entrypoints) => __async(void 0, null, functi
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getSpecifiedEntries
+  getSelectedEntries
 });

package/dist/js/treeshaking/analyze/index.js

@@ -221,13 +221,13 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import * as path from "path";
-import { createDebugger, findExists, fs, getEntryOptions, isApiOnly } from "@modern-js/utils";
+import { createDebugger, findExists, fs, getEntryOptions, isApiOnly, minimist, getCommand, isDevCommand } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
-import { getCommand } from "../utils/commands";
+import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
 import { getServerLoadersFile, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
@@ -242,7 +242,7 @@ var analyze_default = function() {
             return {
                 prepare: function prepare() {
                     return _asyncToGenerator(function() {
-                        var ref, appContext, resolvedConfig, hookRunners, apiOnly, ref1, routes2, ref2, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, defaultChecked, initialRoutes, routes, htmlTemplates, command, buildCommands, normalizedConfig, builder;
+                        var ref, appContext, resolvedConfig, hookRunners, apiOnly, ref1, routes2, ref2, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, initialRoutes, routes, htmlTemplates, checkedEntries, entry, command, buildCommands, normalizedConfig, builder;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -301,9 +301,6 @@ var analyze_default = function() {
                                         4
                                     ]), getBundleEntry = ref2[0].getBundleEntry, getServerRoutes = ref2[1].getServerRoutes, generateCode = ref2[2].generateCode, getHtmlTemplate = ref2[3].getHtmlTemplate;
                                     entrypoints = getBundleEntry(appContext, resolvedConfig);
-                                    defaultChecked = entrypoints.map(function(point) {
-                                        return point.entryName;
-                                    });
                                     debug("entrypoints: %o", entrypoints);
                                     initialRoutes = getServerRoutes(entrypoints, {
                                         appContext: appContext,
@@ -353,9 +350,25 @@ var analyze_default = function() {
                                 case 9:
                                     _state.sent();
                                     debug("add Define Types");
+                                    checkedEntries = entrypoints.map(function(point) {
+                                        return point.entryName;
+                                    });
+                                    if (!isDevCommand()) return [
+                                        3,
+                                        11
+                                    ];
+                                    entry = minimist(process.argv.slice(2)).entry;
+                                    return [
+                                        4,
+                                        getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints)
+                                    ];
+                                case 10:
+                                    checkedEntries = _state.sent();
+                                    _state.label = 11;
+                                case 11:
                                     appContext = _objectSpreadProps(_objectSpread({}, appContext), {
                                         entrypoints: entrypoints,
-                                        checkedEntries: defaultChecked,
+                                        checkedEntries: checkedEntries,
                                         apiOnly: apiOnly,
                                         serverRoutes: routes,
                                         htmlTemplates: htmlTemplates
@@ -371,7 +384,7 @@ var analyze_default = function() {
                                     ];
                                     if (!buildCommands.includes(command)) return [
                                         3,
-                                        11
+                                        13
                                     ];
                                     normalizedConfig = api.useResolvedConfigContext();
                                     return [
@@ -505,15 +518,15 @@ var analyze_default = function() {
                                             }
                                         })
                                     ];
-                                case 10:
+                                case 12:
                                     builder = _state.sent();
                                     builder.addPlugins(resolvedConfig.builderPlugins);
                                     appContext = _objectSpreadProps(_objectSpread({}, appContext), {
                                         builder: builder
                                     });
                                     api.setAppContext(appContext);
-                                    _state.label = 11;
-                                case 11:
+                                    _state.label = 13;
+                                case 13:
                                     return [
                                         2
                                     ];

package/dist/js/treeshaking/analyze/nestedRoutes.js

@@ -197,7 +197,7 @@ var createRoute = function(routeInfo, rootDir, filename, entryName) {
 };
 var walk = function() {
     var _ref = _asyncToGenerator(function(dirname, rootDir, alias, entryName) {
-        var isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref, ref1, err, finalRoute;
+        var ref, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref1, ref2, err, finalRoute;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -286,7 +286,7 @@ var walk = function() {
                     childRoute = _state.sent();
                     if (childRoute) {
                         ;
-                        (ref = route.children) === null || ref === void 0 ? void 0 : ref.push(childRoute);
+                        (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(childRoute);
                     }
                     _state.label = 8;
                 case 8:
@@ -315,7 +315,7 @@ var walk = function() {
                         if (pageLoaderFile) {
                             pageRoute.loader = pageLoaderFile;
                         }
-                        (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(pageRoute);
+                        (ref2 = route.children) === null || ref2 === void 0 ? void 0 : ref2.push(pageRoute);
                     }
                     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
                         route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
@@ -361,6 +361,15 @@ var walk = function() {
                     if (isPathlessLayout) {
                         delete finalRoute.path;
                     }
+                    route.children = (ref = route.children) === null || ref === void 0 ? void 0 : ref.filter(function(childRoute) {
+                        return childRoute;
+                    });
+                    if (route.children && route.children.length === 0 && !route.index) {
+                        return [
+                            2,
+                            null
+                        ];
+                    }
                     return [
                         2,
                         finalRoute

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

@@ -322,7 +322,7 @@ function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPlugin
 }
 function _applyBuilderPlugins() {
     _applyBuilderPlugins = _asyncToGenerator(function(builder, normalizedConfig, appContext, compatPluginConfig) {
-        var PluginNodePolyfill, _tools, esbuildOptions, PluginEsbuild;
+        var builderPluginNodePolyfill, _tools, esbuildOptions, builderPluginEsbuild;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -335,9 +335,9 @@ function _applyBuilderPlugins() {
                         import("@modern-js/builder-plugin-node-polyfill")
                     ];
                 case 1:
-                    PluginNodePolyfill = _state.sent().PluginNodePolyfill;
+                    builderPluginNodePolyfill = _state.sent().builderPluginNodePolyfill;
                     builder.addPlugins([
-                        PluginNodePolyfill()
+                        builderPluginNodePolyfill()
                     ]);
                     _state.label = 2;
                 case 2:
@@ -351,9 +351,9 @@ function _applyBuilderPlugins() {
                         import("@modern-js/builder-plugin-esbuild")
                     ];
                 case 3:
-                    PluginEsbuild = _state.sent().PluginEsbuild;
+                    builderPluginEsbuild = _state.sent().builderPluginEsbuild;
                     builder.addPlugins([
-                        PluginEsbuild({
+                        builderPluginEsbuild({
                             loader: false,
                             minimize: applyOptionsChain({}, esbuildOptions)
                         })

package/dist/js/treeshaking/commands/dev.js

@@ -175,16 +175,14 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { ResolvedConfigContext } from "@modern-js/core";
-import { createFileWatcher } from "../utils/createFileWatcher";
 import { printInstructions } from "../utils/printInstructions";
 import { setServer, createServer, injectDataLoaderPlugin } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
-import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
 import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var dev = function() {
     var _ref = _asyncToGenerator(function(api, options) {
-        var ref, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, checkedEntries, serverInternalPlugins, serverOptions, app, server;
+        var ref, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, serverInternalPlugins, serverOptions, app, server;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -198,17 +196,7 @@ var dev = function() {
                         cliOptions: options
                     });
                     ResolvedConfigContext.set(normalizedConfig);
-                    appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, entrypoints = appContext.entrypoints, serverConfigFile = appContext.serverConfigFile;
-                    return [
-                        4,
-                        getSpecifiedEntries(options.entry || false, entrypoints)
-                    ];
-                case 1:
-                    checkedEntries = _state.sent();
-                    api.setAppContext(_objectSpreadProps(_objectSpread({}, appContext), {
-                        checkedEntries: checkedEntries
-                    }));
-                    appContext.checkedEntries = checkedEntries;
+                    appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, serverConfigFile = appContext.serverConfigFile;
                     return [
                         4,
                         buildServerConfig({
@@ -222,13 +210,13 @@ var dev = function() {
                             }
                         })
                     ];
-                case 2:
+                case 1:
                     _state.sent();
                     return [
                         4,
                         hookRunners.beforeDev()
                     ];
-                case 3:
+                case 2:
                     _state.sent();
                     if (!appContext.builder && !apiOnly) {
                         throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
@@ -237,13 +225,13 @@ var dev = function() {
                         4,
                         generateRoutes(appContext)
                     ];
-                case 4:
+                case 3:
                     _state.sent();
                     return [
                         4,
                         getServerInternalPlugins(api)
                     ];
-                case 5:
+                case 4:
                     serverInternalPlugins = _state.sent();
                     serverOptions = {
                         dev: _objectSpread({
@@ -257,7 +245,7 @@ var dev = function() {
                     };
                     if (!apiOnly) return [
                         3,
-                        7
+                        6
                     ];
                     return [
                         4,
@@ -265,7 +253,7 @@ var dev = function() {
                             compiler: null
                         }))
                     ];
-                case 6:
+                case 5:
                     app = _state.sent();
                     app.listen(port, function() {
                         var _ref = _asyncToGenerator(function(err) {
@@ -285,9 +273,9 @@ var dev = function() {
                     }());
                     return [
                         3,
-                        9
+                        8
                     ];
-                case 7:
+                case 6:
                     return [
                         4,
                         appContext.builder.startDevServer({
@@ -295,17 +283,11 @@ var dev = function() {
                             serverOptions: serverOptions
                         })
                     ];
-                case 8:
+                case 7:
                     server = _state.sent().server;
                     setServer(server);
-                    _state.label = 9;
-                case 9:
-                    return [
-                        4,
-                        createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners)
-                    ];
-                case 10:
-                    _state.sent();
+                    _state.label = 8;
+                case 8:
                     return [
                         2
                     ];

package/dist/js/treeshaking/hooks.js

@@ -20,8 +20,6 @@ var hooks = {
     afterBuild: createAsyncWorkflow(),
     beforeDeploy: createAsyncWorkflow(),
     afterDeploy: createAsyncWorkflow(),
-    watchFiles: createParallelWorkflow(),
-    fileChange: createAsyncWorkflow(),
     beforeRestart: createAsyncWorkflow(),
     registerDev: createParallelWorkflow(),
     beforeDevTask: createParallelWorkflow(),

package/dist/js/treeshaking/index.js

@@ -176,15 +176,15 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import path from "path";
 import lintPlugin from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, Import } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, Import, getCommand } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import analyzePlugin from "./analyze";
 import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
-import { getCommand } from "./utils/commands";
 import { restart } from "./utils/restart";
+import { generateWatchFiles } from "./utils/generateWatchFiles";
 export * from "./defineConfig";
 export * from "./types";
 var upgradeModel = Import.lazy("@modern-js/upgrade", require);
@@ -633,6 +633,19 @@ var src_default = function() {
                         });
                     })();
                 },
+                watchFiles: function watchFiles() {
+                    return _asyncToGenerator(function() {
+                        var appContext, config;
+                        return __generator(this, function(_state) {
+                            appContext = api.useAppContext();
+                            config = api.useResolvedConfigContext();
+                            return [
+                                2,
+                                generateWatchFiles(appContext, config.source.configDir)
+                            ];
+                        });
+                    })();
+                },
                 fileChange: function fileChange(e) {
                     return _asyncToGenerator(function() {
                         var filename, eventType, appContext, appDirectory, srcDirectory, absolutePath, closeServer;

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

@@ -174,9 +174,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { ensureAbsolutePath, getPort, isDev } from "@modern-js/utils";
+import { ensureAbsolutePath, getPort, isDev, isDevCommand } from "@modern-js/utils";
 import { legacySchema, schema } from "../schema";
-import { isDevCommand } from "../utils/commands";
 import { transformNormalizedConfig } from "../config/initial/transformNormalizedConfig";
 import { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig } from "../config";
 var initialize_default = function() {

package/dist/js/treeshaking/locale/en.js

@@ -7,7 +7,9 @@ var EN_LOCALE = {
         dev: {
             describe: "start dev server",
             entry: "compiler by entry",
-            apiOnly: "start api server only"
+            apiOnly: "start api server only",
+            selectEntry: "Please select the entry that needs to be built",
+            requireEntry: "You must choose at least one entry"
         },
         build: {
             describe: "build application"

package/dist/js/treeshaking/locale/zh.js

@@ -7,7 +7,9 @@ var ZH_LOCALE = {
         dev: {
             describe: "本地开发命令",
             entry: "指定入口，编译特定的页面",
-            apiOnly: "仅启动 API 接口服务"
+            apiOnly: "仅启动 API 接口服务",
+            selectEntry: "请选择需要构建的入口",
+            requireEntry: "请至少选择一个入口"
         },
         build: {
             describe: "构建应用命令"