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

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 } from "@modern-js/utils";
+import { createDebugger, findExists, fs, isApiOnly, isUseSSRBundle } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
@@ -229,8 +229,7 @@ import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getCommand } from "../utils/commands";
 import { initialNormalizedConfig } from "../config";
-import { isNestedRouteComponent, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
-import { loaderBuilder, serverLoaderBuilder } from "./Builder";
+import { getServerLoadersFile, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 var debug = createDebugger("plugin-analyze");
 var analyze_default = function() {
@@ -525,6 +524,25 @@ var analyze_default = function() {
                 watchFiles: function watchFiles() {
                     return pagesDir;
                 },
+                config: function config() {
+                    return {
+                        tools: {
+                            webpackChain: function(chain, param) {
+                                var name = param.name, CHAIN_ID = param.CHAIN_ID;
+                                var appContext = api.useAppContext();
+                                var resolvedConfig = api.useResolvedConfigContext();
+                                var entrypoints = appContext.entrypoints, internalDirectory = appContext.internalDirectory;
+                                entrypoints.forEach(function(entrypoint) {
+                                    var entryName = entrypoint.entryName;
+                                    if (entrypoint.nestedRoutesEntry && isUseSSRBundle(resolvedConfig)) {
+                                        var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
+                                        chain.entry("".concat(entryName, "-server-loaders")).add(serverLoadersFile);
+                                    }
+                                });
+                            }
+                        }
+                    };
+                },
                 resolvedConfig: function resolvedConfig(param) {
                     var resolved = param.resolved;
                     var appContext = api.useAppContext();
@@ -536,12 +554,12 @@ var analyze_default = function() {
                 modifyEntryImports: function modifyEntryImports(param) {
                     var entrypoint = param.entrypoint, imports = param.imports;
                     return _asyncToGenerator(function() {
-                        var appContext, srcDirectory, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, ref, moduleExports, hasAppConfig, generateLayoutPath, hasAppInit;
+                        var appContext, srcDirectory, internalSrcAlias, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, ref, moduleExports, hasAppConfig, generateLayoutPath, hasAppInit;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
                                     appContext = api.useAppContext();
-                                    srcDirectory = appContext.srcDirectory;
+                                    srcDirectory = appContext.srcDirectory, internalSrcAlias = appContext.internalSrcAlias;
                                     fileSystemRoutes = entrypoint.fileSystemRoutes, nestedRoutesEntry = entrypoint.nestedRoutesEntry;
                                     if (!(fileSystemRoutes && nestedRoutesEntry)) return [
                                         3,
@@ -582,7 +600,7 @@ var analyze_default = function() {
                                     hasAppConfig = moduleExports.some(function(e) {
                                         return e.n === APP_CONFIG_NAME;
                                     });
-                                    generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, "@_modern_js_src");
+                                    generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias);
                                     if (hasAppConfig) {
                                         imports.push({
                                             value: generateLayoutPath,
@@ -620,17 +638,6 @@ var analyze_default = function() {
                         });
                     })();
                 },
-                beforeRestart: function beforeRestart() {
-                    return _asyncToGenerator(function() {
-                        return __generator(this, function(_state) {
-                            serverLoaderBuilder.stop();
-                            loaderBuilder.stop();
-                            return [
-                                2
-                            ];
-                        });
-                    })();
-                },
                 fileChange: function fileChange(e) {
                     return _asyncToGenerator(function() {
                         var appContext, appDirectory, filename, eventType, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, generateCode, entrypoints;
@@ -647,7 +654,7 @@ var analyze_default = function() {
                                     };
                                     absoluteFilePath = path.resolve(appDirectory, filename);
                                     isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
-                                    if (!(isRouteComponent && (eventType === "add" || eventType === "unlink") || isNestedRouteComponent(nestedRouteEntries, absoluteFilePath) && eventType === "change")) return [
+                                    if (!(isRouteComponent && (eventType === "add" || eventType === "unlink"))) return [
                                         3,
                                         2
                                     ];

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

@@ -177,35 +177,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import * as path from "path";
 import { fs, getRouteId } from "@modern-js/utils";
 import { JS_EXTENSIONS, NESTED_ROUTE } from "./constants";
-import { hasLoader, replaceWithAlias } from "./utils";
+import { replaceWithAlias } from "./utils";
 var conventionNames = Object.values(NESTED_ROUTE);
-var getLoaderPath = function() {
-    var _ref = _asyncToGenerator(function(filename) {
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        hasLoader(filename)
-                    ];
-                case 1:
-                    if (_state.sent()) {
-                        return [
-                            2,
-                            filename
-                        ];
-                    }
-                    return [
-                        2,
-                        void 0
-                    ];
-            }
-        });
-    });
-    return function getLoaderPath(filename) {
-        return _ref.apply(this, arguments);
-    };
-}();
 var replaceDynamicPath = function(routePath) {
     return routePath.replace(/\[(.*?)\]/g, ":$1");
 };
@@ -224,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, loaderPath, ref1, loaderPath1, err, finalRoute;
+        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;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -280,16 +253,16 @@ var walk = function() {
                 case 4:
                     _state.trys.push([
                         4,
-                        15,
-                        16,
-                        17
+                        11,
+                        12,
+                        13
                     ]);
                     _iterator = items[Symbol.iterator]();
                     _state.label = 5;
                 case 5:
                     if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
                         3,
-                        14
+                        10
                     ];
                     item = _step.value;
                     itemPath = path.join(dirname, item);
@@ -320,7 +293,7 @@ var walk = function() {
                     if (extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
                         return [
                             3,
-                            13
+                            9
                         ];
                     }
                     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_LOADER_FILE) {
@@ -328,73 +301,49 @@ var walk = function() {
                             route.loader = itemPath;
                         }
                     }
-                    if (!(itemWithoutExt === NESTED_ROUTE.LAYOUT_FILE)) return [
-                        3,
-                        10
-                    ];
-                    route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
-                    return [
-                        4,
-                        getLoaderPath(itemPath)
-                    ];
-                case 9:
-                    loaderPath = _state.sent();
-                    if (loaderPath) {
-                        route.loader = loaderPath;
+                    if (itemWithoutExt === NESTED_ROUTE.LAYOUT_FILE) {
+                        route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
                     }
-                    _state.label = 10;
-                case 10:
                     if (itemWithoutExt === NESTED_ROUTE.PAGE_LOADER_FILE) {
                         pageLoaderFile = itemPath;
                     }
-                    if (!(itemWithoutExt === NESTED_ROUTE.PAGE_FILE)) return [
-                        3,
-                        12
-                    ];
-                    pageRoute = createIndexRoute({
-                        _component: replaceWithAlias(alias.basename, itemPath, alias.name)
-                    }, rootDir, itemPath, entryName);
-                    return [
-                        4,
-                        getLoaderPath(itemPath)
-                    ];
-                case 11:
-                    loaderPath1 = _state.sent();
-                    if (loaderPath1) {
-                        pageRoute.loader = loaderPath1;
-                    } else if (pageLoaderFile) {
-                        pageRoute.loader = pageLoaderFile;
+                    if (itemWithoutExt === NESTED_ROUTE.PAGE_FILE) {
+                        ;
+                        pageRoute = createIndexRoute({
+                            _component: replaceWithAlias(alias.basename, itemPath, alias.name)
+                        }, rootDir, itemPath, entryName);
+                        if (pageLoaderFile) {
+                            pageRoute.loader = pageLoaderFile;
+                        }
+                        (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(pageRoute);
                     }
-                    (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(pageRoute);
-                    _state.label = 12;
-                case 12:
                     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
                         route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
                     }
                     if (itemWithoutExt === NESTED_ROUTE.ERROR_FILE) {
                         route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
                     }
-                    _state.label = 13;
-                case 13:
+                    _state.label = 9;
+                case 9:
                     _iteratorNormalCompletion = true;
                     return [
                         3,
                         5
                     ];
-                case 14:
+                case 10:
                     return [
                         3,
-                        17
+                        13
                     ];
-                case 15:
+                case 11:
                     err = _state.sent();
                     _didIteratorError = true;
                     _iteratorError = err;
                     return [
                         3,
-                        17
+                        13
                     ];
-                case 16:
+                case 12:
                     try {
                         if (!_iteratorNormalCompletion && _iterator.return != null) {
                             _iterator.return();
@@ -407,7 +356,7 @@ var walk = function() {
                     return [
                         7
                     ];
-                case 17:
+                case 13:
                     finalRoute = createRoute(route, rootDir, path.join(dirname, "".concat(NESTED_ROUTE.LAYOUT_FILE, ".ts")), entryName);
                     if (isPathlessLayout) {
                         delete finalRoute.path;

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

@@ -1,3 +1,11 @@
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -40,6 +48,33 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
+function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function _objectSpread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -79,6 +114,17 @@ function _objectSpreadProps(target, source) {
     }
     return target;
 }
+function _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
 var __generator = this && this.__generator || function(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -243,15 +289,15 @@ var routesForServer = function(param) {
     routesCode += "\n];";
     var importLoadersCode = "";
     if (loaders.length > 0) {
-        importLoadersCode = "\n    import { ".concat(loaders.map(function(loader, index2) {
-            return "loader_".concat(index2);
-        }), ' } from "').concat(slash(loaderIndexFile), '"');
+        importLoadersCode = loaders.map(function(loader, index2) {
+            return "import loader_".concat(index2, ' from "').concat(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, loadersIndexFile, loadersMapFile, importLazyCode, rootLayoutCode, dataLoaderPath, componentLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, loaderEntryCode, loaderEntryFile;
+        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;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -260,17 +306,19 @@ var fileSystemRoutes = function() {
                     errors = [];
                     loaders = [];
                     loadersMap = {};
-                    loadersIndexFile = path.join(internalDirAlias, entryName, TEMP_LOADERS_DIR, "index.js");
                     loadersMapFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "map.json");
                     importLazyCode = '\n    import { lazy } from "react";\n    import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"\n  ';
                     rootLayoutCode = "";
-                    dataLoaderPath = "";
                     componentLoaderPath = "";
-                    if (ssrMode) {
-                        dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
+                    getDataLoaderPath = function(loaderId) {
+                        if (!ssrMode) return "";
+                        var dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
                         if (nestedRoutesEntry) {
-                            dataLoaderPath = "".concat(dataLoaderPath, "?routesDir=").concat(nestedRoutesEntry, "&mapFile=").concat(loadersMapFile, "!");
+                            dataLoaderPath = "".concat(slash(dataLoaderPath), "?mapFile=").concat(slash(loadersMapFile), "&loaderId=").concat(loaderId, "!");
                         }
+                        return dataLoaderPath;
+                    };
+                    if (ssrMode) {
                         componentLoaderPath = "".concat(path.join(__dirname, "../builder/loaders/routerLoader"), "!");
                     }
                     traverseRouteTree = function(route) {
@@ -283,6 +331,7 @@ var fileSystemRoutes = function() {
                         var error;
                         var loader;
                         var component = "";
+                        var lazyImport = null;
                         if (route.type === "nested") {
                             if (route.loading) {
                                 loadings.push(route.loading);
@@ -296,22 +345,30 @@ var fileSystemRoutes = function() {
                                 loaders.push(route.loader);
                                 var loaderId = loaders.length - 1;
                                 loader = "loader_".concat(loaderId);
-                                loadersMap[loader] = route.id;
+                                loadersMap[loader] = {
+                                    routeId: route.id,
+                                    filePath: route.loader,
+                                    inline: false
+                                };
                             }
                             if (route._component) {
                                 if (route.isRoot) {
                                     rootLayoutCode = "import RootLayout from '".concat(route._component, "'");
                                     component = "RootLayout";
                                 } else if (ssrMode === "string") {
-                                    component = 'loadable(() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "'))");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "')");
+                                    component = "loadable(".concat(lazyImport, ")");
                                 } else {
-                                    component = 'lazy(() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "'))");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "')");
+                                    component = "lazy(".concat(lazyImport, ")");
                                 }
                             }
                         } else if (route._component) {
-                            component = "loadable(() => import('".concat(route._component, "'))");
+                            lazyImport = "() => import('".concat(route._component, "')");
+                            component = "loadable(".concat(lazyImport, ")");
                         }
                         var finalRoute = _objectSpreadProps(_objectSpread({}, route), {
+                            lazyImport: lazyImport,
                             loading: loading,
                             loader: loader,
                             error: error,
@@ -329,7 +386,7 @@ var fileSystemRoutes = function() {
                             route = _step.value;
                             if ("type" in route) {
                                 newRoute = traverseRouteTree(route);
-                                routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(lazy.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"'), ",");
+                                routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"'), ",");
                             } else {
                                 component = "loadable(() => import('".concat(route._component, "'))");
                                 finalRoute = _objectSpreadProps(_objectSpread({}, route), {
@@ -360,78 +417,42 @@ var fileSystemRoutes = function() {
                         return "import error_".concat(index2, " from '").concat(error, "';\n");
                     }).join("");
                     importLoadersCode = "";
-                    if (!(loaders.length > 0)) return [
-                        3,
-                        5
-                    ];
-                    importLoadersCode = "\n    import { ".concat(loaders.map(function(loader, index2) {
-                        return "loader_".concat(index2);
-                    }), ' } from "').concat(slash(dataLoaderPath)).concat(slash(loadersIndexFile), '"\n  ');
-                    loaderEntryCode = loaders.map(function(loader, index2) {
-                        return "export * from './loader_".concat(index2, ".js';");
-                    }).join("\n");
-                    loaderEntryFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "entry.js");
+                    _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                    try {
+                        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');
+                            } else {
+                                importLoadersCode += "import ".concat(key, ' from "').concat(getDataLoaderPath(key)).concat(loaderInfo.filePath, '";\n');
+                            }
+                        }
+                    } catch (err) {
+                        _didIteratorError1 = true;
+                        _iteratorError1 = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                                _iterator1.return();
+                            }
+                        } finally{
+                            if (_didIteratorError1) {
+                                throw _iteratorError1;
+                            }
+                        }
+                    }
                     return [
                         4,
-                        fs.ensureFile(loaderEntryFile)
+                        fs.ensureFile(loadersMapFile)
                     ];
                 case 1:
-                    _state.sent();
-                    return [
-                        4,
-                        fs.writeFile(loaderEntryFile, loaderEntryCode)
-                    ];
-                case 2:
                     _state.sent();
                     return [
                         4,
                         fs.writeJSON(loadersMapFile, loadersMap)
                     ];
-                case 3:
-                    _state.sent();
-                    return [
-                        4,
-                        Promise.all(loaders.map(function() {
-                            var _ref = _asyncToGenerator(function(loader, index2) {
-                                var name, filename, code;
-                                return __generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            name = "loader_".concat(index2);
-                                            filename = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "".concat(name, ".js"));
-                                            code = "";
-                                            if (loader.includes(".loader.")) {
-                                                code = "\n          export { default as ".concat(name, " } from '").concat(slash(loader), "'\n        ");
-                                            } else {
-                                                code = "\n          export { loader as ".concat(name, " } from '").concat(slash(loader), "'\n        ");
-                                            }
-                                            return [
-                                                4,
-                                                fs.ensureFile(filename)
-                                            ];
-                                        case 1:
-                                            _state.sent();
-                                            return [
-                                                4,
-                                                fs.writeFile(filename, code)
-                                            ];
-                                        case 2:
-                                            _state.sent();
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            });
-                            return function(loader, index2) {
-                                return _ref.apply(this, arguments);
-                            };
-                        }()))
-                    ];
-                case 4:
+                case 2:
                     _state.sent();
-                    _state.label = 5;
-                case 5:
                     return [
                         2,
                         "\n    ".concat(importLazyCode, "\n    ").concat(rootLayoutCode, "\n    ").concat(importLoadingCode, "\n    ").concat(importErrorComponentsCode, "\n    ").concat(importLoadersCode, "\n    ").concat(routeComponentsCode, "\n  ")

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

@@ -287,7 +287,7 @@ 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?$"));
+    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;
@@ -377,4 +377,7 @@ var hasLoader = function() {
         return _ref.apply(this, arguments);
     };
 }();
-export { getDefaultImports, hasLoader, isNestedRouteComponent, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };
+var getServerLoadersFile = function(internalDirectory, entryName) {
+    return path.join(internalDirectory, entryName, "route-server-loaders.js");
+};
+export { getDefaultImports, getServerLoadersFile, hasLoader, isNestedRouteComponent, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };

package/dist/js/treeshaking/config/initial/inits.js

@@ -197,7 +197,7 @@ function initToolsConfig(config) {
             ]
         }
     };
-    var _tools = config.tools, tsChecker = _tools.tsChecker, tsLoader = _tools.tsLoader, htmlPlugin = _tools.htmlPlugin;
+    var _tools = config.tools, tsChecker = _tools.tsChecker, tsLoader = _tools.tsLoader;
     config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
     tsLoader && (config.tools.tsLoader = function(tsLoaderConfig, utils) {
         applyOptionsChain(_objectSpreadProps(_objectSpread({}, tsLoaderConfig), {
@@ -205,16 +205,5 @@ function initToolsConfig(config) {
             allowTsInNodeModules: true
         }), tsLoader || {}, utils);
     });
-    config.tools.htmlPlugin = [
-        function(config2) {
-            return _objectSpreadProps(_objectSpread({}, config2), {
-                minify: typeof config2.minify === "object" ? _objectSpreadProps(_objectSpread({}, config2.minify), {
-                    removeComments: false
-                }) : config2.minify
-            });
-        }
-    ].concat(_toConsumableArray(Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [
-        htmlPlugin
-    ] : []));
 }
 export { initHtmlConfig, initSourceConfig, initToolsConfig };

package/dist/js/treeshaking/index.js

@@ -175,11 +175,11 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import LintPlugin from "@modern-js/plugin-lint";
+import lintPlugin from "@modern-js/plugin-lint";
 import { cleanRequireCache, emptyDir, Import } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
-import AnalyzePlugin from "./analyze";
-import InitializePlugin from "./initialize";
+import analyzePlugin from "./analyze";
+import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
@@ -345,7 +345,6 @@ var buildCommand = function() {
                                         ];
                                     case 2:
                                         _state.sent();
-                                        process.exit(0);
                                         return [
                                             2
                                         ];
@@ -454,9 +453,9 @@ var src_default = function() {
         ],
         registerHook: hooks,
         usePlugins: [
-            InitializePlugin(),
-            AnalyzePlugin(),
-            LintPlugin()
+            initializePlugin(),
+            analyzePlugin(),
+            lintPlugin()
         ],
         setup: function(api) {
             var locale = getLocaleLanguage();
@@ -546,7 +545,7 @@ var src_default = function() {
                                             return _ref.apply(this, arguments);
                                         };
                                     }());
-                                    program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).action(function() {
+                                    program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).action(function() {
                                         var _ref = _asyncToGenerator(function(options) {
                                             var MWANewAction;
                                             return __generator(this, function(_state) {
@@ -561,7 +560,7 @@ var src_default = function() {
                                                         return [
                                                             4,
                                                             MWANewAction(_objectSpreadProps(_objectSpread({}, options), {
-                                                                locale: locale
+                                                                locale: options.lang || locale
                                                             }))
                                                         ];
                                                     case 2:

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

@@ -23,7 +23,8 @@ var 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",