@modern-js/app-tools 2.0.2 → 2.1.0

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

@@ -148,20 +148,13 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import { fs, getEntryOptions, LOADER_ROUTES_DIR, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, logger } from "@modern-js/utils";
 import { useResolvedConfigContext } from "@modern-js/core";
-import { isDevCommand } from "../utils/commands";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
-import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, TEMP_LOADERS_DIR } from "./constants";
-import { getDefaultImports } from "./utils";
+import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
+import { getDefaultImports, getServerLoadersFile } from "./utils";
 import { walk } from "./nestedRoutes";
-import { loaderBuilder, serverLoaderBuilder } from "./Builder";
-var loader = {
-    ".js": "jsx",
-    ".ts": "tsx"
-};
-var EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 var createImportSpecifier = function(specifiers) {
     var defaults = "";
     var named = [];
@@ -245,111 +238,26 @@ var createImportStatements = function(statements) {
         return "import ".concat(createImportSpecifier(specifiers), " from '").concat(value, "';\n").concat(initialize || "");
     }).join("\n");
 };
-var buildLoader = function() {
-    var _ref = _asyncToGenerator(function(entry, outfile) {
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        loaderBuilder.build({
-                            format: "esm",
-                            platform: "browser",
-                            target: "esnext",
-                            loader: loader,
-                            watch: isDevCommand() && {},
-                            bundle: true,
-                            logLevel: "error",
-                            entryPoints: [
-                                entry
-                            ],
-                            outfile: outfile,
-                            plugins: [
-                                {
-                                    name: "make-all-packages-external",
-                                    setup: function setup(build) {
-                                        build.onResolve({
-                                            filter: EXTERNAL_REGEXP
-                                        }, function(args) {
-                                            var external = true;
-                                            if (args.kind === "entry-point") {
-                                                external = false;
-                                            }
-                                            return {
-                                                path: args.path,
-                                                external: external
-                                            };
-                                        });
-                                    }
-                                }
-                            ]
-                        })
-                    ];
-                case 1:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    });
-    return function buildLoader(entry, outfile) {
-        return _ref.apply(this, arguments);
-    };
-}();
-var buildServerLoader = function() {
-    var _ref = _asyncToGenerator(function(entry, outfile) {
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        serverLoaderBuilder.build({
-                            format: "cjs",
-                            platform: "node",
-                            target: "esnext",
-                            loader: loader,
-                            watch: isDevCommand() && {},
-                            bundle: true,
-                            logLevel: "error",
-                            entryPoints: [
-                                entry
-                            ],
-                            outfile: outfile
-                        })
-                    ];
-                case 1:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    });
-    return function buildServerLoader(entry, outfile) {
-        return _ref.apply(this, arguments);
-    };
-}();
 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);
         }
         function _generateEntryCode() {
             _generateEntryCode = _asyncToGenerator(function(entrypoint) {
-                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, mode, hasPageRoute, ref, code2, _, _tmp, routesServerFile, outputRoutesServerFile, code3, loaderEntryFile, loaderIndexFile, ref1, importStatements, plugins, ref2, renderFunction, exportStatement, code, entryFile, ref3, asyncEntryCode, bootstrapFile;
+                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, mode, hasPageRoute, ref, code2, _, _tmp, routesServerFile, code3, ref1, importStatements, plugins, ref2, renderFunction, exportStatement, code, entryFile, ref3, asyncEntryCode, bootstrapFile;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
                             entryName = entrypoint.entryName, isAutoMount = entrypoint.isAutoMount, customBootstrap = entrypoint.customBootstrap, fileSystemRoutes = entrypoint.fileSystemRoutes;
                             if (!isAutoMount) return [
                                 3,
-                                22
+                                17
                             ];
                             if (!fileSystemRoutes) return [
                                 3,
-                                15
+                                10
                             ];
                             initialRoutes = [];
                             nestedRoute = null;
@@ -427,8 +335,7 @@ var generateCode = function() {
                                     ssrMode: mode,
                                     nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                                     entryName: entrypoint.entryName,
-                                    internalDirectory: internalDirectory,
-                                    internalDirAlias: internalDirAlias
+                                    internalDirectory: internalDirectory
                                 })
                             ];
                         case 5:
@@ -440,16 +347,13 @@ var generateCode = function() {
                             ];
                         case 6:
                             ref = _state.sent(), code2 = ref.code;
-                            if (!entrypoint.nestedRoutesEntry) return [
+                            if (!(entrypoint.nestedRoutesEntry && mode)) return [
                                 3,
-                                14
+                                9
                             ];
-                            routesServerFile = path.join(internalDirectory, entryName, "route-server-loaders.js");
-                            outputRoutesServerFile = path.join(distDirectory, LOADER_ROUTES_DIR, entryName, "index.js");
+                            routesServerFile = getServerLoadersFile(internalDirectory, entryName);
                             code3 = templates.routesForServer({
-                                routes: routes,
-                                internalDirectory: internalDirectory,
-                                entryName: entryName
+                                routes: routes
                             });
                             return [
                                 4,
@@ -463,45 +367,11 @@ var generateCode = function() {
                             ];
                         case 8:
                             _state.sent();
-                            loaderEntryFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "entry.js");
-                            loaderIndexFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "index.js");
-                            return [
-                                4,
-                                fs.pathExists(loaderEntryFile)
-                            ];
+                            _state.label = 9;
                         case 9:
-                            if (!_state.sent()) return [
-                                3,
-                                11
-                            ];
-                            return [
-                                4,
-                                buildLoader(loaderEntryFile, loaderIndexFile)
-                            ];
-                        case 10:
-                            _state.sent();
-                            _state.label = 11;
-                        case 11:
-                            return [
-                                4,
-                                fs.pathExists(routesServerFile)
-                            ];
-                        case 12:
-                            if (!_state.sent()) return [
-                                3,
-                                14
-                            ];
-                            return [
-                                4,
-                                buildServerLoader(routesServerFile, outputRoutesServerFile)
-                            ];
-                        case 13:
-                            _state.sent();
-                            _state.label = 14;
-                        case 14:
                             fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code2, "utf8");
-                            _state.label = 15;
-                        case 15:
+                            _state.label = 10;
+                        case 10:
                             return [
                                 4,
                                 hookRunners.modifyEntryImports({
@@ -515,7 +385,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 16:
+                        case 11:
                             ref1 = _state.sent(), importStatements = ref1.imports;
                             return [
                                 4,
@@ -524,7 +394,7 @@ var generateCode = function() {
                                     plugins: []
                                 })
                             ];
-                        case 17:
+                        case 12:
                             plugins = _state.sent().plugins;
                             return [
                                 4,
@@ -537,7 +407,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 18:
+                        case 13:
                             ref2 = _state.sent(), renderFunction = ref2.code;
                             return [
                                 4,
@@ -546,7 +416,7 @@ var generateCode = function() {
                                     exportStatement: "export default AppWrapper;"
                                 })
                             ];
-                        case 19:
+                        case 14:
                             exportStatement = _state.sent().exportStatement;
                             code = templates.index({
                                 mountId: mountId,
@@ -558,7 +428,7 @@ var generateCode = function() {
                             entrypoint.entry = entryFile;
                             if (!config.source.enableAsyncEntry) return [
                                 3,
-                                21
+                                16
                             ];
                             return [
                                 4,
@@ -567,19 +437,19 @@ var generateCode = function() {
                                     code: "import('./".concat(ENTRY_BOOTSTRAP_FILE_NAME, "');")
                                 })
                             ];
-                        case 20:
+                        case 15:
                             ref3 = _state.sent(), asyncEntryCode = ref3.code;
                             fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
                             bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
                             fs.outputFileSync(bootstrapFile, code, "utf8");
                             return [
                                 3,
-                                22
+                                17
                             ];
-                        case 21:
+                        case 16:
                             fs.outputFileSync(entryFile, code, "utf8");
-                            _state.label = 22;
-                        case 22:
+                            _state.label = 17;
+                        case 17:
                             return [
                                 2
                             ];
@@ -591,7 +461,7 @@ var generateCode = function() {
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    internalDirectory = appContext.internalDirectory, distDirectory = appContext.distDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
+                    internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
                     hookRunners = api.useHookRunners();
                     isV5 = typeof ((ref = config.runtime) === null || ref === void 0 ? void 0 : ref.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (ref1 = config.runtime) === null || ref1 === void 0 ? void 0 : (ref2 = ref1.router) === null || ref2 === void 0 ? void 0 : ref2.mode) === "react-router-5";
                     mountId = config.html.mountId;

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

@@ -221,7 +221,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import * as path from "path";
-import { createDebugger, findExists, fs, isApiOnly } from "@modern-js/utils";
+import { createDebugger, findExists, fs, getEntryOptions, isApiOnly } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
@@ -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,26 @@ var analyze_default = function() {
                 watchFiles: function watchFiles() {
                     return pagesDir;
                 },
+                config: function config() {
+                    return {
+                        tools: {
+                            webpackChain: function(chain, param) {
+                                var name = param.name;
+                                var appContext = api.useAppContext();
+                                var resolvedConfig = api.useResolvedConfigContext();
+                                var entrypoints = appContext.entrypoints, internalDirectory = appContext.internalDirectory, packageName = appContext.packageName;
+                                entrypoints.forEach(function(entrypoint) {
+                                    var entryName = entrypoint.entryName;
+                                    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);
+                                    }
+                                });
+                            }
+                        }
+                    };
+                },
                 resolvedConfig: function resolvedConfig(param) {
                     var resolved = param.resolved;
                     var appContext = api.useAppContext();
@@ -620,17 +639,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 +655,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;