@modern-js/app-tools 2.8.1-alpha.0 → 2.8.1-alpha.1

package/dist/js/treeshaking/analyze/getServerRoutes.js

@@ -104,7 +104,7 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 import path from "path";
 import fs from "fs";
-import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash } from "@modern-js/utils";
+import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
 import { walkDirectory } from "./utils";
 var applyBaseUrl = function(baseUrl, routes) {
     if (baseUrl) {
@@ -130,8 +130,8 @@ var applyRouteOptions = function(original, routeOptions) {
     var routes;
     if (route) {
         if (Array.isArray(route)) {
-            var _tmp;
-            _tmp = route.map(function(url) {
+            var _route_map;
+            _route_map = route.map(function(url) {
                 if (isPlainObject(url)) {
                     var urlPath = url.path, other = _objectWithoutProperties(url, [
                         "path"
@@ -144,7 +144,7 @@ var applyRouteOptions = function(original, routeOptions) {
                         urlPath: url
                     });
                 }
-            }), routes = _tmp, _tmp;
+            }), routes = _route_map, _route_map;
         } else if (isPlainObject(route)) {
             var urlPath = route.path, other = _objectWithoutProperties(route, [
                 "path"
@@ -169,12 +169,13 @@ var applyRouteOptions = function(original, routeOptions) {
     return routes;
 };
 var collectHtmlRoutes = function(entrypoints, appContext, config) {
-    var disableHtmlFolder = config.html.disableHtmlFolder, _output = config.output, tmp = _output.distPath, ref = tmp === void 0 ? {} : tmp, htmlPath = ref.html, _server = config.server, baseUrl = _server.baseUrl, routes = _server.routes, ssr = _server.ssr, ssrByEntries = _server.ssrByEntries;
+    var disableHtmlFolder = config.html.disableHtmlFolder, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, worker = _config_server.worker;
     var packageName = appContext.packageName;
     var htmlRoutes = entrypoints.reduce(function(previous, param) {
         var entryName = param.entryName;
         var entryOptions = getEntryOptions(entryName, ssr, ssrByEntries, packageName);
         var isSSR = Boolean(entryOptions);
+        var isWorker = Boolean(worker);
         var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
         var route = {
             urlPath: "/".concat(entryName === MAIN_ENTRY_NAME ? "" : entryName),
@@ -183,6 +184,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
             isSPA: true,
             isSSR: isSSR,
             responseHeaders: resHeaders,
+            worker: isWorker ? "".concat(SERVER_WORKER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0,
             bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0
         };
         if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
@@ -200,7 +202,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
 };
 var collectStaticRoutes = function(appContext, config) {
     var appDirectory = appContext.appDirectory;
-    var configDir = config.source.configDir, _server = config.server, _publicRoutes = _server.publicRoutes, publicRoutes = _publicRoutes === void 0 ? {} : _publicRoutes;
+    var configDir = config.source.configDir, _config_server = config.server, _config_server_publicRoutes = _config_server.publicRoutes, publicRoutes = _config_server_publicRoutes === void 0 ? {} : _config_server_publicRoutes;
     var publicFolder = path.resolve(appDirectory, configDir || "", "public");
     return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(function(filePath) {
         var urlPath = "".concat(urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length)));

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

@@ -223,16 +223,17 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import * as path from "path";
 import { createDebugger, findExists, fs, getEntryOptions, isApiOnly, minimist, getCommand, isDevCommand } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
+import { createBuilderGenerator } 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() {
+var analyze_default = function(param) {
+    var bundler = param.bundler;
     return {
         name: "@modern-js/plugin-analyze",
         setup: function(api) {
@@ -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, initialRoutes, routes, htmlTemplates, checkedEntries, entry, command, buildCommands, normalizedConfig, builder;
+                        var _resolvedConfig_source, appContext, resolvedConfig, hookRunners, apiOnly, _ref, routes2, _ref1, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, initialRoutes, routes, htmlTemplates, checkedEntries, entry, command, buildCommands, normalizedConfig, createBuilderForModern, builder;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -254,7 +255,7 @@ var analyze_default = function() {
                                     } catch (e) {}
                                     return [
                                         4,
-                                        isApiOnly(appContext.appDirectory, (ref = resolvedConfig.source) === null || ref === void 0 ? void 0 : ref.entriesDir)
+                                        isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir)
                                     ];
                                 case 1:
                                     apiOnly = _state.sent();
@@ -275,7 +276,7 @@ var analyze_default = function() {
                                         })
                                     ];
                                 case 3:
-                                    ref1 = _state.sent(), routes2 = ref1.routes;
+                                    _ref = _state.sent(), routes2 = _ref.routes;
                                     debug("server routes: %o", routes2);
                                     appContext = _objectSpreadProps(_objectSpread({}, appContext), {
                                         apiOnly: apiOnly,
@@ -296,10 +297,10 @@ var analyze_default = function() {
                                         ])
                                     ];
                                 case 5:
-                                    ref2 = _slicedToArray.apply(void 0, [
+                                    _ref1 = _slicedToArray.apply(void 0, [
                                         _state.sent(),
                                         4
-                                    ]), getBundleEntry = ref2[0].getBundleEntry, getServerRoutes = ref2[1].getServerRoutes, generateCode = ref2[2].generateCode, getHtmlTemplate = ref2[3].getHtmlTemplate;
+                                    ]), getBundleEntry = _ref1[0].getBundleEntry, getServerRoutes = _ref1[1].getServerRoutes, generateCode = _ref1[2].generateCode, getHtmlTemplate = _ref1[3].getHtmlTemplate;
                                     entrypoints = getBundleEntry(appContext, resolvedConfig);
                                     debug("entrypoints: %o", entrypoints);
                                     initialRoutes = getServerRoutes(entrypoints, {
@@ -384,149 +385,153 @@ var analyze_default = function() {
                                     ];
                                     if (!buildCommands.includes(command)) return [
                                         3,
-                                        13
+                                        14
                                     ];
                                     normalizedConfig = api.useResolvedConfigContext();
+                                    return [
+                                        4,
+                                        createBuilderGenerator(bundler)
+                                    ];
+                                case 12:
+                                    createBuilderForModern = _state.sent();
                                     return [
                                         4,
                                         createBuilderForModern({
                                             normalizedConfig: normalizedConfig,
                                             appContext: appContext,
-                                            compatPluginConfig: {
-                                                onBeforeBuild: function onBeforeBuild(param) {
-                                                    var bundlerConfigs = param.bundlerConfigs;
-                                                    return _asyncToGenerator(function() {
-                                                        var hookRunners2;
-                                                        return __generator(this, function(_state) {
-                                                            switch(_state.label){
-                                                                case 0:
-                                                                    hookRunners2 = api.useHookRunners();
-                                                                    return [
-                                                                        4,
-                                                                        generateRoutes(appContext)
-                                                                    ];
-                                                                case 1:
-                                                                    _state.sent();
-                                                                    return [
-                                                                        4,
-                                                                        hookRunners2.beforeBuild({
-                                                                            bundlerConfigs: bundlerConfigs
-                                                                        })
-                                                                    ];
-                                                                case 2:
-                                                                    _state.sent();
-                                                                    return [
-                                                                        2
-                                                                    ];
-                                                            }
-                                                        });
-                                                    })();
-                                                },
-                                                onAfterBuild: function onAfterBuild(param) {
-                                                    var stats = param.stats;
-                                                    return _asyncToGenerator(function() {
-                                                        var hookRunners2;
-                                                        return __generator(this, function(_state) {
-                                                            switch(_state.label){
-                                                                case 0:
-                                                                    hookRunners2 = api.useHookRunners();
-                                                                    return [
-                                                                        4,
-                                                                        hookRunners2.afterBuild({
-                                                                            stats: stats
-                                                                        })
-                                                                    ];
-                                                                case 1:
-                                                                    _state.sent();
-                                                                    return [
-                                                                        4,
-                                                                        emitResolvedConfig(appContext.appDirectory, normalizedConfig)
-                                                                    ];
-                                                                case 2:
-                                                                    _state.sent();
-                                                                    return [
-                                                                        2
-                                                                    ];
-                                                            }
-                                                        });
-                                                    })();
-                                                },
-                                                onDevCompileDone: function onDevCompileDone(param) {
-                                                    var isFirstCompile = param.isFirstCompile;
-                                                    return _asyncToGenerator(function() {
-                                                        var hookRunners2;
-                                                        return __generator(this, function(_state) {
-                                                            hookRunners2 = api.useHookRunners();
-                                                            if (process.stdout.isTTY || isFirstCompile) {
-                                                                hookRunners2.afterDev();
-                                                                if (isFirstCompile) {
-                                                                    printInstructions(hookRunners2, appContext, normalizedConfig);
-                                                                }
+                                            onBeforeBuild: function onBeforeBuild(param) {
+                                                var bundlerConfigs = param.bundlerConfigs;
+                                                return _asyncToGenerator(function() {
+                                                    var hookRunners2;
+                                                    return __generator(this, function(_state) {
+                                                        switch(_state.label){
+                                                            case 0:
+                                                                hookRunners2 = api.useHookRunners();
+                                                                return [
+                                                                    4,
+                                                                    generateRoutes(appContext)
+                                                                ];
+                                                            case 1:
+                                                                _state.sent();
+                                                                return [
+                                                                    4,
+                                                                    hookRunners2.beforeBuild({
+                                                                        bundlerConfigs: bundlerConfigs
+                                                                    })
+                                                                ];
+                                                            case 2:
+                                                                _state.sent();
+                                                                return [
+                                                                    2
+                                                                ];
+                                                        }
+                                                    });
+                                                })();
+                                            },
+                                            onAfterBuild: function onAfterBuild(param) {
+                                                var stats = param.stats;
+                                                return _asyncToGenerator(function() {
+                                                    var hookRunners2;
+                                                    return __generator(this, function(_state) {
+                                                        switch(_state.label){
+                                                            case 0:
+                                                                hookRunners2 = api.useHookRunners();
+                                                                return [
+                                                                    4,
+                                                                    hookRunners2.afterBuild({
+                                                                        stats: stats
+                                                                    })
+                                                                ];
+                                                            case 1:
+                                                                _state.sent();
+                                                                return [
+                                                                    4,
+                                                                    emitResolvedConfig(appContext.appDirectory, normalizedConfig)
+                                                                ];
+                                                            case 2:
+                                                                _state.sent();
+                                                                return [
+                                                                    2
+                                                                ];
+                                                        }
+                                                    });
+                                                })();
+                                            },
+                                            onDevCompileDone: function onDevCompileDone(param) {
+                                                var isFirstCompile = param.isFirstCompile;
+                                                return _asyncToGenerator(function() {
+                                                    var hookRunners2;
+                                                    return __generator(this, function(_state) {
+                                                        hookRunners2 = api.useHookRunners();
+                                                        if (process.stdout.isTTY || isFirstCompile) {
+                                                            hookRunners2.afterDev();
+                                                            if (isFirstCompile) {
+                                                                printInstructions(hookRunners2, appContext, normalizedConfig);
                                                             }
-                                                            return [
-                                                                2
-                                                            ];
-                                                        });
-                                                    })();
-                                                },
-                                                onBeforeCreateCompiler: function onBeforeCreateCompiler(param) {
-                                                    var bundlerConfigs = param.bundlerConfigs;
-                                                    return _asyncToGenerator(function() {
-                                                        var hookRunners2;
-                                                        return __generator(this, function(_state) {
-                                                            switch(_state.label){
-                                                                case 0:
-                                                                    hookRunners2 = api.useHookRunners();
-                                                                    return [
-                                                                        4,
-                                                                        hookRunners2.beforeCreateCompiler({
-                                                                            bundlerConfigs: bundlerConfigs
-                                                                        })
-                                                                    ];
-                                                                case 1:
-                                                                    _state.sent();
-                                                                    return [
-                                                                        2
-                                                                    ];
-                                                            }
-                                                        });
-                                                    })();
-                                                },
-                                                onAfterCreateCompiler: function onAfterCreateCompiler(param) {
-                                                    var compiler = param.compiler;
-                                                    return _asyncToGenerator(function() {
-                                                        var hookRunners2;
-                                                        return __generator(this, function(_state) {
-                                                            switch(_state.label){
-                                                                case 0:
-                                                                    hookRunners2 = api.useHookRunners();
-                                                                    return [
-                                                                        4,
-                                                                        hookRunners2.afterCreateCompiler({
-                                                                            compiler: compiler
-                                                                        })
-                                                                    ];
-                                                                case 1:
-                                                                    _state.sent();
-                                                                    return [
-                                                                        2
-                                                                    ];
-                                                            }
-                                                        });
-                                                    })();
-                                                }
+                                                        }
+                                                        return [
+                                                            2
+                                                        ];
+                                                    });
+                                                })();
+                                            },
+                                            onBeforeCreateCompiler: function onBeforeCreateCompiler(param) {
+                                                var bundlerConfigs = param.bundlerConfigs;
+                                                return _asyncToGenerator(function() {
+                                                    var hookRunners2;
+                                                    return __generator(this, function(_state) {
+                                                        switch(_state.label){
+                                                            case 0:
+                                                                hookRunners2 = api.useHookRunners();
+                                                                return [
+                                                                    4,
+                                                                    hookRunners2.beforeCreateCompiler({
+                                                                        bundlerConfigs: bundlerConfigs
+                                                                    })
+                                                                ];
+                                                            case 1:
+                                                                _state.sent();
+                                                                return [
+                                                                    2
+                                                                ];
+                                                        }
+                                                    });
+                                                })();
+                                            },
+                                            onAfterCreateCompiler: function onAfterCreateCompiler(param) {
+                                                var compiler = param.compiler;
+                                                return _asyncToGenerator(function() {
+                                                    var hookRunners2;
+                                                    return __generator(this, function(_state) {
+                                                        switch(_state.label){
+                                                            case 0:
+                                                                hookRunners2 = api.useHookRunners();
+                                                                return [
+                                                                    4,
+                                                                    hookRunners2.afterCreateCompiler({
+                                                                        compiler: compiler
+                                                                    })
+                                                                ];
+                                                            case 1:
+                                                                _state.sent();
+                                                                return [
+                                                                    2
+                                                                ];
+                                                        }
+                                                    });
+                                                })();
                                             }
                                         })
                                     ];
-                                case 12:
+                                case 13:
                                     builder = _state.sent();
                                     builder.addPlugins(resolvedConfig.builderPlugins);
                                     appContext = _objectSpreadProps(_objectSpread({}, appContext), {
                                         builder: builder
                                     });
                                     api.setAppContext(appContext);
-                                    _state.label = 13;
-                                case 13:
+                                    _state.label = 14;
+                                case 14:
                                     return [
                                         2
                                     ];
@@ -560,7 +565,7 @@ var analyze_default = function() {
                 resolvedConfig: function resolvedConfig(param) {
                     var resolved = param.resolved;
                     var appContext = api.useAppContext();
-                    var config = initialNormalizedConfig(resolved, appContext);
+                    var config = initialNormalizedConfig(resolved, appContext, bundler);
                     return {
                         resolved: config
                     };
@@ -568,7 +573,7 @@ var analyze_default = function() {
                 modifyEntryImports: function modifyEntryImports(param) {
                     var entrypoint = param.entrypoint, imports = param.imports;
                     return _asyncToGenerator(function() {
-                        var appContext, srcDirectory, internalSrcAlias, 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:
@@ -607,10 +612,10 @@ var analyze_default = function() {
                                         })
                                     ];
                                 case 2:
-                                    ref = _slicedToArray.apply(void 0, [
+                                    _ref = _slicedToArray.apply(void 0, [
                                         _state.sent(),
                                         2
-                                    ]), moduleExports = ref[1];
+                                    ]), moduleExports = _ref[1];
                                     hasAppConfig = moduleExports.some(function(e) {
                                         return e.n === APP_CONFIG_NAME;
                                     });

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 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;
+        var _route_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, _route_children1, _route_children2, _route_children3, err, finalRoute, childRoute1, path2;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -242,6 +242,8 @@ var walk = function() {
                     };
                     pageLoaderFile = "";
                     pageRoute = null;
+                    splatLoaderFile = "";
+                    splatRoute = null;
                     return [
                         4,
                         fs.readdir(dirname)
@@ -286,7 +288,7 @@ var walk = function() {
                     childRoute = _state.sent();
                     if (childRoute) {
                         ;
-                        (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(childRoute);
+                        (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(childRoute);
                     }
                     _state.label = 8;
                 case 8:
@@ -315,7 +317,21 @@ var walk = function() {
                         if (pageLoaderFile) {
                             pageRoute.loader = pageLoaderFile;
                         }
-                        (ref2 = route.children) === null || ref2 === void 0 ? void 0 : ref2.push(pageRoute);
+                        (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(pageRoute);
+                    }
+                    if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
+                        splatLoaderFile = itemPath;
+                    }
+                    if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
+                        ;
+                        splatRoute = createRoute({
+                            _component: replaceWithAlias(alias.basename, itemPath, alias.name),
+                            path: "*"
+                        }, rootDir, itemPath, entryName);
+                        if (splatLoaderFile) {
+                            splatRoute.loader = splatLoaderFile;
+                        }
+                        (_route_children3 = route.children) === null || _route_children3 === void 0 ? void 0 : _route_children3.push(splatRoute);
                     }
                     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
                         route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
@@ -361,7 +377,7 @@ var walk = function() {
                     if (isPathlessLayout) {
                         delete finalRoute.path;
                     }
-                    route.children = (ref = route.children) === null || ref === void 0 ? void 0 : ref.filter(function(childRoute) {
+                    route.children = (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.filter(function(childRoute) {
                         return childRoute;
                     });
                     if (route.children && route.children.length === 0 && !route.index) {
@@ -370,6 +386,15 @@ var walk = function() {
                             null
                         ];
                     }
+                    if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
+                        childRoute1 = finalRoute.children[0];
+                        if (childRoute1.path === "*") {
+                            path2 = "".concat(finalRoute.path || "", "/").concat(childRoute1.path || "");
+                            finalRoute = _objectSpreadProps(_objectSpread({}, childRoute1), {
+                                path: path2
+                            });
+                        }
+                    }
                     return [
                         2,
                         finalRoute

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

@@ -229,10 +229,11 @@ var index = function(param) {
 };
 var renderFunction = function(param) {
     var plugins = param.plugins, customBootstrap = param.customBootstrap, fileSystemRoutes2 = param.fileSystemRoutes;
+    var bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
     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");
+    }).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, () => ".concat(bootstrap, ");") : "".concat(bootstrap, ";"), "\n  }\n\n  return AppWrapper\n");
 };
 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");
@@ -243,8 +244,8 @@ var routesForServer = function(param) {
     var traverseRouteTree = function(route) {
         var children;
         if ("children" in route && route.children) {
-            var ref;
-            children = route === null || route === void 0 ? void 0 : (ref = route.children) === null || ref === void 0 ? void 0 : ref.map(traverseRouteTree);
+            var _route_children;
+            children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
         }
         var loader;
         if (route.type === "nested") {
@@ -296,7 +297,7 @@ var routesForServer = function(param) {
 };
 var fileSystemRoutes = function() {
     var _ref = _asyncToGenerator(function(param) {
-        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;
+        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -308,7 +309,6 @@ var fileSystemRoutes = function() {
                     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 = "";
-                    componentLoaderPath = "";
                     getDataLoaderPath = function(loaderId) {
                         if (!ssrMode) {
                             return "";
@@ -319,14 +319,11 @@ var fileSystemRoutes = function() {
                         }
                         return dataLoaderPath;
                     };
-                    if (ssrMode) {
-                        componentLoaderPath = "".concat(path.join(__dirname, "../builder/loaders/routerLoader"), "!");
-                    }
                     traverseRouteTree = function(route) {
                         var children;
                         if ("children" in route && route.children) {
-                            var ref;
-                            children = route === null || route === void 0 ? void 0 : (ref = route.children) === null || ref === void 0 ? void 0 : ref.map(traverseRouteTree);
+                            var _route_children;
+                            children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
                         }
                         var loading;
                         var error;
@@ -357,10 +354,10 @@ var fileSystemRoutes = function() {
                                     rootLayoutCode = "import RootLayout from '".concat(route._component, "'");
                                     component = "RootLayout";
                                 } else if (ssrMode === "string") {
-                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "')");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
                                     component = "loadable(".concat(lazyImport, ")");
                                 } else {
-                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "')");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
                                     component = "lazy(".concat(lazyImport, ")");
                                 }
                             }
@@ -421,7 +418,7 @@ var fileSystemRoutes = function() {
                     _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];
+                            _step_value = _slicedToArray(_step1.value, 2), key = _step_value[0], loaderInfo = _step_value[1];
                             if (loaderInfo.inline) {
                                 importLoadersCode += "import { loader as ".concat(key, ' } from "').concat(getDataLoaderPath(key)).concat(slash(loaderInfo.filePath), '";\n');
                             } else {

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

@@ -333,7 +333,7 @@ var parseModule = function() {
 }();
 var hasLoader = function() {
     var _ref = _asyncToGenerator(function(filename) {
-        var source, ref, moduleExports;
+        var source, _ref, moduleExports;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -351,10 +351,10 @@ var hasLoader = function() {
                         })
                     ];
                 case 2:
-                    ref = _slicedToArray.apply(void 0, [
+                    _ref = _slicedToArray.apply(void 0, [
                         _state.sent(),
                         2
-                    ]), moduleExports = ref[1];
+                    ]), moduleExports = _ref[1];
                     return [
                         2,
                         moduleExports.some(function(e) {