@modern-js/app-tools 2.0.0-beta.4 → 2.0.0-beta.7

package/dist/js/node/utils/language.js

@@ -15,13 +15,17 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var language_exports = {};
+__export(language_exports, {
   getLocaleLanguage: () => getLocaleLanguage
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(language_exports);
 var import_language_detector = require("@modern-js/plugin-i18n/language-detector");
 function getLocaleLanguage() {
   const detector = new import_language_detector.I18CLILanguageDetector();
   return detector.detect();
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getLocaleLanguage
+});

package/dist/js/node/utils/printInstructions.js

@@ -15,12 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  printInstructions: () => printInstructions
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_utils = require("@modern-js/utils");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -41,6 +35,12 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var printInstructions_exports = {};
+__export(printInstructions_exports, {
+  printInstructions: () => printInstructions
+});
+module.exports = __toCommonJS(printInstructions_exports);
+var import_utils = require("@modern-js/utils");
 const printInstructions = (hookRunners, appContext, config) => __async(void 0, null, function* () {
   const message = (0, import_utils.prettyInstructions)(appContext, config);
   const { instructions } = yield hookRunners.beforePrintInstructions({
@@ -48,3 +48,7 @@ const printInstructions = (hookRunners, appContext, config) => __async(void 0, n
   });
   import_utils.logger.info(instructions);
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  printInstructions
+});

package/dist/js/node/utils/restart.js

@@ -15,13 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  restart: () => restart
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_core = require("@modern-js/core");
-var import_utils = require("@modern-js/utils");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -42,6 +35,13 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var restart_exports = {};
+__export(restart_exports, {
+  restart: () => restart
+});
+module.exports = __toCommonJS(restart_exports);
+var import_core = require("@modern-js/core");
+var import_utils = require("@modern-js/utils");
 function restart(hooksRunner, filename) {
   return __async(this, null, function* () {
     (0, import_utils.clearConsole)();
@@ -61,3 +61,7 @@ function restart(hooksRunner, filename) {
     }
   });
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  restart
+});

package/dist/js/node/utils/routes.js

@@ -21,13 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  generateRoutes: () => generateRoutes
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -48,8 +41,19 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var routes_exports = {};
+__export(routes_exports, {
+  generateRoutes: () => generateRoutes
+});
+module.exports = __toCommonJS(routes_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
 const generateRoutes = (appContext) => __async(void 0, null, function* () {
   const { serverRoutes, distDirectory } = appContext;
   const output = JSON.stringify({ routes: serverRoutes }, null, 2);
   yield import_utils.fs.outputFile(import_path.default.join(distDirectory, import_utils.ROUTE_SPEC_FILE), output);
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateRoutes
+});

package/dist/js/node/utils/types.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/js/treeshaking/analyze/constants.js

@@ -25,4 +25,13 @@ var HTML_PARTIALS_EXTENSIONS = [
     ".ejs"
 ];
 var FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
-export { APP_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_FILE_NAME, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT, HTML_PARTIALS_EXTENSIONS, HTML_PARTIALS_FOLDER, INDEX_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME, NESTED_ROUTES_DIR, PAGES_DIR_NAME, TEMP_LOADERS_DIR };
+var NESTED_ROUTE = {
+    LAYOUT_FILE: "layout",
+    LAYOUT_LOADER_FILE: "layout.loader",
+    PAGE_FILE: "page",
+    PAGE_LOADER_FILE: "page.loader",
+    LOADING_FILE: "loading",
+    ERROR_FILE: "error",
+    LOADER_FILE: "loader"
+};
+export { APP_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_FILE_NAME, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT, HTML_PARTIALS_EXTENSIONS, HTML_PARTIALS_FOLDER, INDEX_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME, NESTED_ROUTE, NESTED_ROUTES_DIR, PAGES_DIR_NAME, TEMP_LOADERS_DIR };

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

@@ -150,7 +150,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import path from "path";
 import { fs, getEntryOptions, LOADER_ROUTES_DIR, logger } from "@modern-js/utils";
 import { useResolvedConfigContext } from "@modern-js/core";
-import { getCommand } from "../utils/commands";
+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";
@@ -247,11 +247,9 @@ var createImportStatements = function(statements) {
 };
 var buildLoader = function() {
     var _ref = _asyncToGenerator(function(entry, outfile) {
-        var command;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    command = getCommand();
                     return [
                         4,
                         loaderBuilder.build({
@@ -259,7 +257,7 @@ var buildLoader = function() {
                             platform: "browser",
                             target: "esnext",
                             loader: loader,
-                            watch: command === "dev" && {},
+                            watch: isDevCommand() && {},
                             bundle: true,
                             logLevel: "error",
                             entryPoints: [
@@ -301,11 +299,9 @@ var buildLoader = function() {
 }();
 var buildServerLoader = function() {
     var _ref = _asyncToGenerator(function(entry, outfile) {
-        var command;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    command = getCommand();
                     return [
                         4,
                         serverLoaderBuilder.build({
@@ -313,7 +309,7 @@ var buildServerLoader = function() {
                             platform: "node",
                             target: "esnext",
                             loader: loader,
-                            watch: command === "dev" && {},
+                            watch: isDevCommand() && {},
                             bundle: true,
                             logLevel: "error",
                             entryPoints: [
@@ -336,7 +332,7 @@ var buildServerLoader = function() {
 }();
 var generateCode = function() {
     var _ref = _asyncToGenerator(function(appContext, config, entrypoints, api) {
-        var ref, ref1, internalDirectory, distDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, islegacy, mountId, getRoutes;
+        var ref, ref1, ref2, internalDirectory, distDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
         function generateEntryCode(entrypoint) {
             return _generateEntryCode.apply(this, arguments);
         }
@@ -370,7 +366,7 @@ var generateCode = function() {
                                 3,
                                 3
                             ];
-                            if (!!islegacy) return [
+                            if (!!isV5) return [
                                 3,
                                 2
                             ];
@@ -597,9 +593,9 @@ var generateCode = function() {
                 case 0:
                     internalDirectory = appContext.internalDirectory, distDirectory = appContext.distDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
                     hookRunners = api.useHookRunners();
-                    islegacy = Boolean(config === null || config === void 0 ? void 0 : (ref = config.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.legacy);
+                    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;
-                    getRoutes = islegacy ? getClientRoutesLegacy : getClientRoutes;
+                    getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
                     return [
                         4,
                         Promise.all(entrypoints.map(generateEntryCode))

package/dist/js/treeshaking/analyze/getBundleEntry.js

@@ -38,7 +38,8 @@ var getBundleEntry = function(appContext, config) {
                 entryName: name,
                 entry: ensureAbsolutePath(appDirectory, value.entry),
                 isAutoMount: !value.disableMount,
-                fileSystemRoutes: value.enableFileSystemRoutes ? {} : void 0
+                customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
+                fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
             };
             if (entrypoint.fileSystemRoutes) {
                 entrypoint.nestedRoutesEntry = entrypoint.entry;

package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js

@@ -198,16 +198,19 @@ var normalizeNestedRoutes = function(nested, internalComponentsDir, internalDire
 };
 var getClientRoutes = function(param) {
     var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias, internalDirectory = param.internalDirectory, internalDirAlias = param.internalDirAlias;
-    var entry = entrypoint.entry, entryName = entrypoint.entryName;
-    if (!fs.existsSync(entry)) {
-        throw new Error("generate file system routes error, ".concat(entry, " directory not found."));
+    var entryName = entrypoint.entryName, pageRoutesEntry = entrypoint.pageRoutesEntry;
+    if (!pageRoutesEntry) {
+        return [];
     }
-    if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
-        throw new Error("generate file system routes error, ".concat(entry, " should be directory."));
+    if (!fs.existsSync(pageRoutesEntry)) {
+        throw new Error("generate file system routes error, ".concat(pageRoutesEntry, " directory not found."));
+    }
+    if (!(fs.existsSync(pageRoutesEntry) && fs.statSync(pageRoutesEntry).isDirectory())) {
+        throw new Error("generate file system routes error, ".concat(pageRoutesEntry, " should be directory."));
     }
     var routes = [];
     recursiveReadDir({
-        dir: entry,
+        dir: pageRoutesEntry,
         routes: routes,
         basePath: "/",
         srcDirectory: srcDirectory,

package/dist/js/treeshaking/analyze/getFileSystemEntry.js

@@ -62,9 +62,11 @@ var scanDir = function(dirs) {
             };
             if (isHasPages) {
                 entrypoint.entry = path.join(dir, PAGES_DIR_NAME);
+                entrypoint.pageRoutesEntry = entrypoint.entry;
             }
             if (isHasNestedRoutes) {
-                entrypoint.nestedRoutesEntry = path.join(dir, NESTED_ROUTES_DIR);
+                entrypoint.entry = path.join(dir, NESTED_ROUTES_DIR);
+                entrypoint.nestedRoutesEntry = entrypoint.entry;
             }
             return entrypoint;
         }
@@ -78,7 +80,13 @@ var scanDir = function(dirs) {
 };
 var getFileSystemEntry = function(appContext, config) {
     var appDirectory = appContext.appDirectory;
-    var entriesDir = config.source.entriesDir;
+    var _source = config.source, entriesDir = _source.entriesDir, disableEntryDirs = _source.disableEntryDirs;
+    var disabledDirs = [];
+    if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
+        disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? void 0 : disableEntryDirs.map(function(dir) {
+            return ensureAbsolutePath(appDirectory, dir);
+        });
+    }
     var src = ensureAbsolutePath(appDirectory, entriesDir || "");
     if (fs.existsSync(src)) {
         if (fs.statSync(src).isDirectory()) {
@@ -87,7 +95,7 @@ var getFileSystemEntry = function(appContext, config) {
             ] : fs.readdirSync(src).map(function(file) {
                 return path.join(src, file);
             }).filter(function(file) {
-                return fs.statSync(file).isDirectory() && isBundleEntry(file);
+                return fs.statSync(file).isDirectory() && isBundleEntry(file) && !disabledDirs.includes(file);
             }));
         } else {
             throw Error("source.entriesDir accept a directory.");

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

@@ -229,7 +229,7 @@ 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 } from "./utils";
 import { loaderBuilder, serverLoaderBuilder } from "./Builder";
 var debug = createDebugger("plugin-analyze");
 var analyze_default = function() {
@@ -237,11 +237,12 @@ var analyze_default = function() {
         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:
@@ -363,6 +364,7 @@ var analyze_default = function() {
                                     command = getCommand();
                                     buildCommands = [
                                         "dev",
+                                        "start",
                                         "build",
                                         "inspect",
                                         "deploy"
@@ -505,6 +507,7 @@ var analyze_default = function() {
                                     ];
                                 case 10:
                                     builder = _state.sent();
+                                    builder.addPlugins(resolvedConfig.builderPlugins);
                                     appContext = _objectSpreadProps(_objectSpread({}, appContext), {
                                         builder: builder
                                     });
@@ -555,8 +558,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

@@ -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, 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);
@@ -235,6 +235,7 @@ var getDefaultImports = function(param) {
                     local: "customBootstrap"
                 }
             ],
+            initialize: "const App = false;",
             value: normalizeToPosixPath(customBootstrap.replace(srcDirectory, internalSrcAlias))
         }
     ].filter(Boolean);
@@ -260,7 +261,7 @@ var getDefaultImports = function(param) {
             route.initialize = "const App = false;";
         }
         imports.push(route);
-    } else {
+    } else if (!customBootstrap) {
         imports.push({
             specifiers: [
                 {
@@ -272,7 +273,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 +287,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)));
 };
@@ -366,4 +376,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,7 +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, ref1;
+                var ref;
                 var builderNormalizedConfig = api.getNormalizedConfig();
                 if (target === "node") {
                     chain.name("server");
@@ -148,7 +148,8 @@ var PluginCompatModern = function(appContext, modernConfig, options) {
                 var existNestedRoutes = entrypoints.some(function(entrypoint) {
                     return entrypoint.nestedRoutesEntry;
                 });
-                var routerManifest = Boolean(modernConfig === null || modernConfig === void 0 ? void 0 : (ref = modernConfig.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.manifest);
+                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);
                 }
@@ -181,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,14 +201,15 @@ 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;
@@ -270,17 +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: _objectSpreadProps(_objectSpread({}, normalizedConfig.dev), {
             port: (ref = normalizedConfig.server) === null || ref === void 0 ? void 0 : ref.port
         }),
-        html: htmlConfig,
-        performance: _objectSpreadProps(_objectSpread({}, normalizedConfig.performance), {
-            removeMomentLocale: true
-        })
+        html: htmlConfig
     });
 }
 function createBuilderOptions(target, appContext) {