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

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,13 +221,14 @@ 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, minimist } 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 { getCommand, isDevCommand } 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 +243,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 +302,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 +351,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 +385,7 @@ var analyze_default = function() {
                                     ];
                                     if (!buildCommands.includes(command)) return [
                                         3,
-                                        11
+                                        13
                                     ];
                                     normalizedConfig = api.useResolvedConfigContext();
                                     return [
@@ -505,15 +519,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
                                     ];
@@ -528,13 +542,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/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/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
     });
@@ -323,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:
@@ -336,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:
@@ -352,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/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/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

@@ -185,6 +185,7 @@ 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 +634,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

@@ -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/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: "构建应用命令"