@modern-js/app-tools 2.0.0-canary.0 → 2.0.1

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

@@ -221,26 +221,29 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import * as path from "path";
-import { createDebugger, fs, isApiOnly } from "@modern-js/utils";
+import { createDebugger, findExists, fs, isApiOnly } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { createBuilderForEdenX } from "../builder";
+import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getCommand } from "../utils/commands";
 import { initialNormalizedConfig } from "../config";
-import { isRouteComponentFile } from "./utils";
+import { isNestedRouteComponent, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
+import { loaderBuilder, serverLoaderBuilder } from "./Builder";
+import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 var debug = createDebugger("plugin-analyze");
 var analyze_default = function() {
     return {
         name: "@modern-js/plugin-analyze",
         setup: function(api) {
             var pagesDir = [];
+            var nestedRouteEntries = [];
             var originEntrypoints = [];
             return {
                 prepare: function prepare() {
                     return _asyncToGenerator(function() {
-                        var ref, appContext, resolvedConfig, hookRunners, apiOnly, ref1, routes2, ref2, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, defaultChecked, initialRoutes, routes, nestedRouteEntries, htmlTemplates, command, buildCommands, normalizedConfig, builder;
+                        var ref, appContext, resolvedConfig, hookRunners, apiOnly, ref1, routes2, ref2, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, defaultChecked, initialRoutes, routes, htmlTemplates, command, buildCommands, normalizedConfig, builder;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -362,6 +365,7 @@ var analyze_default = function() {
                                     command = getCommand();
                                     buildCommands = [
                                         "dev",
+                                        "start",
                                         "build",
                                         "inspect",
                                         "deploy"
@@ -373,7 +377,7 @@ var analyze_default = function() {
                                     normalizedConfig = api.useResolvedConfigContext();
                                     return [
                                         4,
-                                        createBuilderForEdenX({
+                                        createBuilderForModern({
                                             normalizedConfig: normalizedConfig,
                                             appContext: appContext,
                                             compatPluginConfig: {
@@ -504,6 +508,7 @@ var analyze_default = function() {
                                     ];
                                 case 10:
                                     builder = _state.sent();
+                                    builder.addPlugins(resolvedConfig.builderPlugins);
                                     appContext = _objectSpreadProps(_objectSpread({}, appContext), {
                                         builder: builder
                                     });
@@ -528,6 +533,104 @@ var analyze_default = function() {
                         resolved: config
                     };
                 },
+                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;
+                        return __generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    appContext = api.useAppContext();
+                                    srcDirectory = appContext.srcDirectory;
+                                    fileSystemRoutes = entrypoint.fileSystemRoutes, nestedRoutesEntry = entrypoint.nestedRoutesEntry;
+                                    if (!(fileSystemRoutes && nestedRoutesEntry)) return [
+                                        3,
+                                        3
+                                    ];
+                                    rootLayoutPath = path.join(nestedRoutesEntry, "layout");
+                                    rootLayoutFile = findExists([
+                                        ".js",
+                                        ".ts",
+                                        ".jsx",
+                                        ".tsx"
+                                    ].map(function(ext) {
+                                        return "".concat(rootLayoutPath).concat(ext);
+                                    }));
+                                    if (!rootLayoutFile) return [
+                                        3,
+                                        3
+                                    ];
+                                    return [
+                                        4,
+                                        fs.readFile(rootLayoutFile)
+                                    ];
+                                case 1:
+                                    rootLayoutBuffer = _state.sent();
+                                    rootLayout = rootLayoutBuffer.toString();
+                                    return [
+                                        4,
+                                        parseModule({
+                                            source: rootLayout.toString(),
+                                            filename: rootLayoutFile
+                                        })
+                                    ];
+                                case 2:
+                                    ref = _slicedToArray.apply(void 0, [
+                                        _state.sent(),
+                                        2
+                                    ]), moduleExports = ref[1];
+                                    hasAppConfig = moduleExports.some(function(e) {
+                                        return e.n === APP_CONFIG_NAME;
+                                    });
+                                    generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, "@_modern_js_src");
+                                    if (hasAppConfig) {
+                                        imports.push({
+                                            value: generateLayoutPath,
+                                            specifiers: [
+                                                {
+                                                    imported: APP_CONFIG_NAME
+                                                }
+                                            ]
+                                        });
+                                    }
+                                    hasAppInit = moduleExports.some(function(e) {
+                                        return e.n === APP_INIT_EXPORTED;
+                                    });
+                                    if (hasAppInit) {
+                                        imports.push({
+                                            value: generateLayoutPath,
+                                            specifiers: [
+                                                {
+                                                    imported: APP_INIT_EXPORTED,
+                                                    local: APP_INIT_IMPORTED
+                                                }
+                                            ]
+                                        });
+                                    }
+                                    _state.label = 3;
+                                case 3:
+                                    return [
+                                        2,
+                                        {
+                                            entrypoint: entrypoint,
+                                            imports: imports
+                                        }
+                                    ];
+                            }
+                        });
+                    })();
+                },
+                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;
@@ -543,8 +646,8 @@ var analyze_default = function() {
                                         });
                                     };
                                     absoluteFilePath = path.resolve(appDirectory, filename);
-                                    isRouteComponent = isPageFile(absoluteFilePath) && isRouteComponentFile(absoluteFilePath);
-                                    if (!(isRouteComponent && (eventType === "add" || eventType === "unlink"))) return [
+                                    isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
+                                    if (!(isRouteComponent && (eventType === "add" || eventType === "unlink") || isNestedRouteComponent(nestedRouteEntries, absoluteFilePath) && eventType === "change")) return [
                                         3,
                                         2
                                     ];

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

@@ -176,20 +176,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import * as path from "path";
 import { fs, getRouteId } from "@modern-js/utils";
-import { JS_EXTENSIONS } from "./constants";
+import { JS_EXTENSIONS, NESTED_ROUTE } from "./constants";
 import { hasLoader, replaceWithAlias } from "./utils";
-var LAYOUT_FILE = "layout";
-var PAGE_FILE = "page";
-var LOADING_FILE = "loading";
-var ERROR_FILE = "error";
-var LOADER_FILE = "loader";
-var conventionNames = [
-    LAYOUT_FILE,
-    PAGE_FILE,
-    LOADING_FILE,
-    ERROR_FILE,
-    LOADER_FILE
-];
+var conventionNames = Object.values(NESTED_ROUTE);
 var getLoaderPath = function() {
     var _ref = _asyncToGenerator(function(filename) {
         return __generator(this, function(_state) {
@@ -235,7 +224,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, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref, ref1, childRoute1, 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, loaderPath, ref1, loaderPath1, err, finalRoute;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -278,6 +267,8 @@ var walk = function() {
                         children: [],
                         isRoot: isRoot
                     };
+                    pageLoaderFile = "";
+                    pageRoute = null;
                     return [
                         4,
                         fs.readdir(dirname)
@@ -332,7 +323,12 @@ var walk = function() {
                             13
                         ];
                     }
-                    if (!(itemWithoutExt === LAYOUT_FILE)) return [
+                    if (itemWithoutExt === NESTED_ROUTE.LAYOUT_LOADER_FILE) {
+                        if (!route.loader) {
+                            route.loader = itemPath;
+                        }
+                    }
+                    if (!(itemWithoutExt === NESTED_ROUTE.LAYOUT_FILE)) return [
                         3,
                         10
                     ];
@@ -342,14 +338,20 @@ var walk = function() {
                         getLoaderPath(itemPath)
                     ];
                 case 9:
-                    route.loader = _state.sent();
+                    loaderPath = _state.sent();
+                    if (loaderPath) {
+                        route.loader = loaderPath;
+                    }
                     _state.label = 10;
                 case 10:
-                    if (!(itemWithoutExt === PAGE_FILE)) return [
+                    if (itemWithoutExt === NESTED_ROUTE.PAGE_LOADER_FILE) {
+                        pageLoaderFile = itemPath;
+                    }
+                    if (!(itemWithoutExt === NESTED_ROUTE.PAGE_FILE)) return [
                         3,
                         12
                     ];
-                    childRoute1 = createIndexRoute({
+                    pageRoute = createIndexRoute({
                         _component: replaceWithAlias(alias.basename, itemPath, alias.name)
                     }, rootDir, itemPath, entryName);
                     return [
@@ -357,14 +359,19 @@ var walk = function() {
                         getLoaderPath(itemPath)
                     ];
                 case 11:
-                    childRoute1.loader = _state.sent();
-                    (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(childRoute1);
+                    loaderPath1 = _state.sent();
+                    if (loaderPath1) {
+                        pageRoute.loader = loaderPath1;
+                    } else if (pageLoaderFile) {
+                        pageRoute.loader = pageLoaderFile;
+                    }
+                    (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(pageRoute);
                     _state.label = 12;
                 case 12:
-                    if (itemWithoutExt === LOADING_FILE) {
+                    if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
                         route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
                     }
-                    if (itemWithoutExt === ERROR_FILE) {
+                    if (itemWithoutExt === NESTED_ROUTE.ERROR_FILE) {
                         route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
                     }
                     _state.label = 13;
@@ -401,7 +408,7 @@ var walk = function() {
                         7
                     ];
                 case 17:
-                    finalRoute = createRoute(route, rootDir, path.join(dirname, "".concat(LAYOUT_FILE, ".ts")), entryName);
+                    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

@@ -176,17 +176,17 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import path from "path";
 import { fs, slash } from "@modern-js/utils";
-import { TEMP_LOADERS_DIR } from "./constants";
+import { APP_CONFIG_NAME, TEMP_LOADERS_DIR } from "./constants";
 var index = function(param) {
     var mountId = param.mountId, imports = param.imports, renderFunction2 = param.renderFunction, exportStatement = param.exportStatement;
     return "\nconst IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';\nconst IS_REACT18 = process.env.IS_REACT18 === 'true';\nconst MOUNT_ID = '".concat(mountId, "';\n\n").concat(imports, "\n\nlet AppWrapper = null;\n\nlet root = null;\n\nfunction render() {\n  ").concat(renderFunction2, "\n}\n\nAppWrapper = render();\n\n").concat(exportStatement, ";\n");
 };
 var renderFunction = function(param) {
     var plugins = param.plugins, customBootstrap = param.customBootstrap, fileSystemRoutes2 = param.fileSystemRoutes;
-    return "\n  AppWrapper = createApp({\n    plugins: [\n     ".concat(plugins.map(function(param) {
+    return "\n  const finalAppConfig = {\n    ...App.config,\n    ...typeof ".concat(APP_CONFIG_NAME, " === 'object' ? ").concat(APP_CONFIG_NAME, " : {},\n  }\n\n  AppWrapper = createApp({\n    plugins: [\n     ").concat(plugins.map(function(param) {
         var name = param.name, options = param.options, args = param.args;
-        return "".concat(name, "({...").concat(options, ", ...App?.config?.").concat(args || name, "}),");
-    }).join("\n"), "\n    ]\n  })(").concat(fileSystemRoutes2 ? "" : "App", ")\n\n  if (IS_BROWSER) {\n    ").concat(customBootstrap ? "customBootstrap(AppWrapper);" : "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);", "\n  }\n\n  return AppWrapper\n");
+        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");
 };
 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");
@@ -251,16 +251,16 @@ var routesForServer = function(param) {
 };
 var fileSystemRoutes = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, 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, loadersIndexFile, loadersMapFile, importLazyCode, rootLayoutCode, dataLoaderPath, componentLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, loaderEntryCode, loaderEntryFile;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory;
+                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory, internalDirAlias = param.internalDirAlias;
                     loadings = [];
                     errors = [];
                     loaders = [];
                     loadersMap = {};
-                    loadersIndexFile = path.join("@_modern_js_internal", entryName, TEMP_LOADERS_DIR, "index.js");
+                    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 = "";
@@ -399,7 +399,12 @@ var fileSystemRoutes = function() {
                                         case 0:
                                             name = "loader_".concat(index2);
                                             filename = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "".concat(name, ".js"));
-                                            code = "\n          export { loader as ".concat(name, " } from '").concat(slash(loader), "'\n        ");
+                                            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)

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

@@ -185,7 +185,7 @@ import path from "path";
 import { isReact18, normalizeToPosixPath, fs as fse } from "@modern-js/utils";
 import { transform } from "esbuild";
 import { parse } from "es-module-lexer";
-import { FILE_SYSTEM_ROUTES_FILE_NAME, LOADER_EXPORT_NAME } from "./constants";
+import { FILE_SYSTEM_ROUTES_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME, NESTED_ROUTE } from "./constants";
 var walkDirectory = function(dir) {
     return fs.readdirSync(dir).reduce(function(previous, filename) {
         var filePath = path.join(dir, filename);
@@ -272,7 +272,7 @@ var getDefaultImports = function(param) {
     }
     return imports;
 };
-var isRouteComponentFile = function(filePath) {
+var isPageComponentFile = function(filePath) {
     if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
         return false;
     }
@@ -286,6 +286,15 @@ var isRouteComponentFile = function(filePath) {
     }
     return false;
 };
+var isNestedRouteComponent = function(nestedRouteEntries, absoluteFilePath) {
+    var reg = new RegExp("(".concat(NESTED_ROUTE.LAYOUT_FILE, "|").concat(NESTED_ROUTE.PAGE_FILE, "})\\.tsx?$"));
+    return nestedRouteEntries.some(function(nestedRoutesEntry) {
+        if (absoluteFilePath.includes(nestedRoutesEntry) && reg.test(absoluteFilePath)) {
+            return true;
+        }
+        return false;
+    });
+};
 var replaceWithAlias = function(base, filePath, alias) {
     return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
 };
@@ -297,7 +306,9 @@ var parseModule = function() {
                 case 0:
                     source = param.source, filename = param.filename;
                     content = source;
-                    if (!(filename.endsWith(".tsx") || filename.endsWith(".jsx"))) return [
+                    if (!JS_EXTENSIONS.some(function(ext) {
+                        return filename.endsWith(ext);
+                    })) return [
                         3,
                         2
                     ];
@@ -366,4 +377,4 @@ var hasLoader = function() {
         return _ref.apply(this, arguments);
     };
 }();
-export { getDefaultImports, hasLoader, isRouteComponentFile, parseModule, replaceWithAlias, walkDirectory };
+export { getDefaultImports, hasLoader, isNestedRouteComponent, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };

package/dist/js/treeshaking/builder/builderPlugins/compatModern.js

@@ -104,6 +104,7 @@ var PluginCompatModern = function(appContext, modernConfig, options) {
                     var ref;
                     return ((ref = config.tools) === null || ref === void 0 ? void 0 : ref.htmlPlugin) !== false && target2 !== "node" && target2 !== "web-worker";
                 };
+                var ref;
                 var builderNormalizedConfig = api.getNormalizedConfig();
                 if (target === "node") {
                     chain.name("server");
@@ -147,7 +148,8 @@ var PluginCompatModern = function(appContext, modernConfig, options) {
                 var existNestedRoutes = entrypoints.some(function(entrypoint) {
                     return entrypoint.nestedRoutesEntry;
                 });
-                var routerManifest = Boolean(modernConfig.runtime.router.minifest);
+                var routerConfig = modernConfig === null || modernConfig === void 0 ? void 0 : (ref = modernConfig.runtime) === null || ref === void 0 ? void 0 : ref.router;
+                var routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
                 if (existNestedRoutes || routerManifest) {
                     chain.plugin("route-plugin").use(RouterPlugin);
                 }
@@ -180,6 +182,9 @@ function applyNodeCompat(chain, modernConfig, isProd) {
         if (isProd2 && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof (outputConfig === null || outputConfig === void 0 ? void 0 : (ref = outputConfig.ssg) === null || ref === void 0 ? void 0 : ref[0]) === "function")) {
             return;
         }
+        if (typeof entries === "undefined") {
+            throw new Error("No entry found, one of src/routes/layout.tsx, src/App.tsx, src/index.tsx is required");
+        }
         var entryNames = Object.keys(entries);
         if (isProd2 && entryNames.length === 1 && (outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg)) {
             return;

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

@@ -201,23 +201,24 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import { createBuilder } from "@modern-js/builder";
 import { builderWebpackProvider } from "@modern-js/builder-webpack-provider";
-import { applyOptionsChain, isUseSSRBundle } from "@modern-js/utils";
+import { applyOptionsChain, isProd, isSSR, isUseSSRBundle } from "@modern-js/utils";
 import { PluginCompatModern } from "./builderPlugins/compatModern";
 import { createCopyPattern } from "./share";
 function getBuilderTargets(normalizedConfig) {
     var targets = [
         "web"
     ];
-    if (isUseSSRBundle(normalizedConfig)) {
+    var useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
+    if (useNodeTarget) {
         targets.push("node");
     }
     return targets;
 }
-function createBuilderForEdenX(_) {
-    return _createBuilderForEdenX.apply(this, arguments);
+function createBuilderForModern(_) {
+    return _createBuilderForModern.apply(this, arguments);
 }
-function _createBuilderForEdenX() {
-    _createBuilderForEdenX = _asyncToGenerator(function(param) {
+function _createBuilderForModern() {
+    _createBuilderForModern = _asyncToGenerator(function(param) {
         var normalizedConfig, appContext, compatPluginConfig, builderConfig, webpackProvider, target, builderOptions, builder;
         return __generator(this, function(_state) {
             switch(_state.label){
@@ -248,7 +249,7 @@ function _createBuilderForEdenX() {
             }
         });
     });
-    return _createBuilderForEdenX.apply(this, arguments);
+    return _createBuilderForModern.apply(this, arguments);
 }
 function createBuilderProviderConfig(normalizedConfig, appContext) {
     var createOutputConfig = function createOutputConfig(config, appContext2) {
@@ -270,19 +271,11 @@ function createBuilderProviderConfig(normalizedConfig, appContext) {
         htmlConfig.templateByEntries = _objectSpread({}, htmlConfig.templateByEntries, appContext.htmlTemplates);
     }
     return _objectSpreadProps(_objectSpread({}, normalizedConfig), {
-        source: _objectSpreadProps(_objectSpread({}, normalizedConfig.source), {
-            resolveExtensionPrefix: ".web"
-        }),
         output: output,
-        dev: {
-            port: (ref = normalizedConfig.server) === null || ref === void 0 ? void 0 : ref.port,
-            https: normalizedConfig.dev.https,
-            assetPrefix: normalizedConfig.dev.assetPrefix
-        },
-        html: htmlConfig,
-        performance: _objectSpreadProps(_objectSpread({}, normalizedConfig.performance), {
-            removeMomentLocale: true
-        })
+        dev: _objectSpreadProps(_objectSpread({}, normalizedConfig.dev), {
+            port: (ref = normalizedConfig.server) === null || ref === void 0 ? void 0 : ref.port
+        }),
+        html: htmlConfig
     });
 }
 function createBuilderOptions(target, appContext) {
@@ -379,4 +372,4 @@ function _applyBuilderPlugins() {
     });
     return _applyBuilderPlugins.apply(this, arguments);
 }
-export { createBuilderForEdenX, createBuilderOptions, createBuilderProviderConfig };
+export { createBuilderForModern, createBuilderOptions, createBuilderProviderConfig };

package/dist/js/treeshaking/builder/share.js

@@ -1,5 +1,4 @@
 import path from "path";
-import { template as lodashTemplate } from "@modern-js/utils/lodash";
 import { removeTailSlash } from "@modern-js/utils";
 function createCopyPattern(appContext, config, patternsType, chain) {
     var configDir = path.resolve(appContext.appDirectory, config.source.configDir || "./config");
@@ -25,9 +24,7 @@ function createCopyPattern(appContext, config, patternsType, chain) {
                 if (!/\.html?$/.test(absoluteFrom)) {
                     return content;
                 }
-                return lodashTemplate(content.toString("utf8"))({
-                    assetPrefix: removeTailSlash(chain.output.get("publicPath"))
-                });
+                return content.toString("utf8").replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash(chain.output.get("publicPath")));
             }
         };
     } else {

package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js

@@ -288,7 +288,9 @@ var RouterPlugin = /*#__PURE__*/ function() {
                                         return entryChunkIds.includes(chunk.name);
                                     });
                                     entryChunkFiles = entryChunks.map(function(chunk) {
-                                        return _toConsumableArray(chunk.files)[0];
+                                        return _toConsumableArray(chunk.files).find(function(fname) {
+                                            return fname.includes(".js");
+                                        });
                                     });
                                     _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
                                     try {

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

@@ -181,9 +181,10 @@ import { setServer, createServer, injectDataLoaderPlugin } from "../utils/create
 import { generateRoutes } from "../utils/routes";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
 import { buildServerConfig } from "../utils/config";
+import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var dev = function() {
     var _ref = _asyncToGenerator(function(api, options) {
-        var ref, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, serverInternalPlugins, checkedEntries, compiler, serverOptions, app, server;
+        var ref, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, checkedEntries, serverInternalPlugins, serverOptions, app, server;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -197,7 +198,7 @@ var dev = function() {
                         cliOptions: options
                     });
                     ResolvedConfigContext.set(normalizedConfig);
-                    appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, entrypoints = appContext.entrypoints, serverConfigFile = appContext.serverConfigFile, serverInternalPlugins = appContext.serverInternalPlugins;
+                    appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, entrypoints = appContext.entrypoints, serverConfigFile = appContext.serverConfigFile;
                     return [
                         4,
                         getSpecifiedEntries(options.entry || false, entrypoints)
@@ -232,30 +233,23 @@ var dev = function() {
                     if (!appContext.builder && !apiOnly) {
                         throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
                     }
-                    if (!!apiOnly) return [
-                        3,
-                        5
-                    ];
                     return [
                         4,
-                        appContext.builder.createCompiler()
+                        generateRoutes(appContext)
                     ];
                 case 4:
-                    compiler = _state.sent();
-                    _state.label = 5;
-                case 5:
+                    _state.sent();
                     return [
                         4,
-                        generateRoutes(appContext)
+                        getServerInternalPlugins(api)
                     ];
-                case 6:
-                    _state.sent();
+                case 5:
+                    serverInternalPlugins = _state.sent();
                     serverOptions = {
                         dev: _objectSpread({
                             port: port,
                             https: normalizedConfig.dev.https
                         }, (ref = normalizedConfig.tools) === null || ref === void 0 ? void 0 : ref.devServer),
-                        compiler: compiler || null,
                         pwd: appDirectory,
                         config: normalizedConfig,
                         serverConfigFile: serverConfigFile,
@@ -263,13 +257,15 @@ var dev = function() {
                     };
                     if (!apiOnly) return [
                         3,
-                        8
+                        7
                     ];
                     return [
                         4,
-                        createServer(serverOptions)
+                        createServer(_objectSpreadProps(_objectSpread({}, serverOptions), {
+                            compiler: null
+                        }))
                     ];
-                case 7:
+                case 6:
                     app = _state.sent();
                     app.listen(port, function() {
                         var _ref = _asyncToGenerator(function(err) {
@@ -289,27 +285,26 @@ var dev = function() {
                     }());
                     return [
                         3,
-                        10
+                        9
                     ];
-                case 8:
+                case 7:
                     return [
                         4,
                         appContext.builder.startDevServer({
-                            compiler: compiler,
                             printURLs: false,
                             serverOptions: serverOptions
                         })
                     ];
-                case 9:
+                case 8:
                     server = _state.sent().server;
                     setServer(server);
-                    _state.label = 10;
-                case 10:
+                    _state.label = 9;
+                case 9:
                     return [
                         4,
                         createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners)
                     ];
-                case 11:
+                case 10:
                     _state.sent();
                     return [
                         2

package/dist/js/treeshaking/commands/index.js

@@ -1,3 +1,3 @@
 export * from "./dev";
 export * from "./build";
-export * from "./start";
+export * from "./serve";