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

package/dist/js/node/analyze/getHtmlTemplate.js

@@ -21,15 +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, {
-  getHtmlTemplate: () => getHtmlTemplate
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_constants = require("./constants");
-var templates = __toESM(require("./templates"));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -50,6 +41,15 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var getHtmlTemplate_exports = {};
+__export(getHtmlTemplate_exports, {
+  getHtmlTemplate: () => getHtmlTemplate
+});
+module.exports = __toCommonJS(getHtmlTemplate_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_constants = require("./constants");
+var templates = __toESM(require("./templates"));
 var PartialPosition = /* @__PURE__ */ ((PartialPosition2) => {
   PartialPosition2["TOP"] = "top";
   PartialPosition2["HEAD"] = "head";
@@ -94,7 +94,7 @@ const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function*
     const customIndexTemplate = findPartials(
       htmlDir,
       name,
-      "index"
+      "index" /* INDEX */
     );
     if (customIndexTemplate) {
       htmlTemplates[entryName] = customIndexTemplate.file;
@@ -103,9 +103,9 @@ const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function*
       const { partials } = yield hookRunners.htmlPartials({
         entrypoint,
         partials: [
-          "top",
-          "head",
-          "body"
+          "top" /* TOP */,
+          "head" /* HEAD */,
+          "body" /* BODY */
         ].reduce(
           (previous, position) => {
             const found = findPartials(htmlDir, name, position);
@@ -129,7 +129,7 @@ const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function*
       const bottomTemplate = findPartials(
         htmlDir,
         name,
-        "bottom"
+        "bottom" /* BOTTOM */
       );
       if (bottomTemplate) {
         htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
@@ -138,3 +138,7 @@ const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function*
   }
   return htmlTemplates;
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getHtmlTemplate
+});

package/dist/js/node/analyze/getServerRoutes.js

@@ -1,45 +1,17 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  getServerRoutes: () => getServerRoutes
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_path = __toESM(require("path"));
-var import_fs = __toESM(require("fs"));
-var import_utils = require("@modern-js/utils");
-var import_utils2 = require("./utils");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
+    if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
   if (__getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(b)) {
@@ -52,7 +24,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
   if (source != null && __getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(source)) {
@@ -61,6 +33,32 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var getServerRoutes_exports = {};
+__export(getServerRoutes_exports, {
+  getServerRoutes: () => getServerRoutes
+});
+module.exports = __toCommonJS(getServerRoutes_exports);
+var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
+var import_utils = require("@modern-js/utils");
+var import_utils2 = require("./utils");
 const applyBaseUrl = (baseUrl, routes) => {
   if (baseUrl) {
     if (Array.isArray(baseUrl)) {
@@ -190,3 +188,7 @@ const getServerRoutes = (entrypoints, {
   ...collectStaticRoutes(appContext, config)
 ];
 const toPosix = (pathStr) => pathStr.split(import_path.default.sep).join(import_path.default.posix.sep);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getServerRoutes
+});

package/dist/js/node/analyze/index.js

@@ -1,56 +1,17 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  default: () => analyze_default
-});
-module.exports = __toCommonJS(stdin_exports);
-var path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_lodash = require("@modern-js/utils/lodash");
-var import_builder = require("../builder");
-var import_printInstructions = require("../utils/printInstructions");
-var import_routes = require("../utils/routes");
-var import_config = require("../utils/config");
-var import_commands = require("../utils/commands");
-var import_config2 = require("../config");
-var import_utils2 = require("./utils");
-var import_Builder = require("./Builder");
-var __create2 = Object.create;
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames2 = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf2 = Object.getPrototypeOf;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
+    if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
   if (__getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(b)) {
@@ -60,18 +21,23 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __copyProps2 = (to, from, except, desc) => {
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames2(from))
-      if (!__hasOwnProp2.call(to, key) && key !== except)
-        __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+    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 __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-  isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -92,11 +58,28 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var analyze_exports = {};
+__export(analyze_exports, {
+  default: () => analyze_default
+});
+module.exports = __toCommonJS(analyze_exports);
+var path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_lodash = require("@modern-js/utils/lodash");
+var import_builder = require("../builder");
+var import_printInstructions = require("../utils/printInstructions");
+var import_routes = require("../utils/routes");
+var import_config = require("../utils/config");
+var import_commands = require("../utils/commands");
+var import_config2 = require("../config");
+var import_utils2 = require("./utils");
+var import_Builder = require("./Builder");
 const debug = (0, import_utils.createDebugger)("plugin-analyze");
 var analyze_default = () => ({
   name: "@modern-js/plugin-analyze",
   setup: (api) => {
     let pagesDir = [];
+    let nestedRouteEntries = [];
     let originEntrypoints = [];
     return {
       prepare() {
@@ -132,10 +115,10 @@ var analyze_default = () => ({
             { generateCode },
             { getHtmlTemplate }
           ] = yield Promise.all([
-            Promise.resolve().then(() => __toESM2(require("./getBundleEntry"))),
-            Promise.resolve().then(() => __toESM2(require("./getServerRoutes"))),
-            Promise.resolve().then(() => __toESM2(require("./generateCode"))),
-            Promise.resolve().then(() => __toESM2(require("./getHtmlTemplate")))
+            Promise.resolve().then(() => __toESM(require("./getBundleEntry"))),
+            Promise.resolve().then(() => __toESM(require("./getServerRoutes"))),
+            Promise.resolve().then(() => __toESM(require("./generateCode"))),
+            Promise.resolve().then(() => __toESM(require("./getHtmlTemplate")))
           ]);
           const entrypoints = getBundleEntry(appContext, resolvedConfig);
           const defaultChecked = entrypoints.map((point) => point.entryName);
@@ -153,7 +136,7 @@ var analyze_default = () => ({
             serverRoutes: routes
           });
           api.setAppContext(appContext);
-          const nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
+          nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
           pagesDir = entrypoints.map((point) => point.entry).filter(Boolean).concat(nestedRouteEntries);
           originEntrypoints = (0, import_lodash.cloneDeep)(entrypoints);
           yield generateCode(appContext, resolvedConfig, entrypoints, api);
@@ -173,7 +156,7 @@ var analyze_default = () => ({
           });
           api.setAppContext(appContext);
           const command = (0, import_commands.getCommand)();
-          const buildCommands = ["dev", "build", "inspect", "deploy"];
+          const buildCommands = ["dev", "start", "build", "inspect", "deploy"];
           if (buildCommands.includes(command)) {
             let _b;
             const normalizedConfig = api.useResolvedConfigContext();
@@ -229,6 +212,7 @@ var analyze_default = () => ({
                 }
               }
             });
+            builder.addPlugins(resolvedConfig.builderPlugins);
             appContext = __spreadProps(__spreadValues({}, appContext), {
               builder
             });
@@ -259,10 +243,10 @@ var analyze_default = () => ({
           const { filename, eventType } = e;
           const isPageFile = (name) => pagesDir.some((pageDir) => name.includes(pageDir));
           const absoluteFilePath = path.resolve(appDirectory, filename);
-          const isRouteComponent = isPageFile(absoluteFilePath) && (0, import_utils2.isRouteComponentFile)(absoluteFilePath);
-          if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
+          const isRouteComponent = isPageFile(absoluteFilePath) && (0, import_utils2.isPageComponentFile)(absoluteFilePath);
+          if (isRouteComponent && (eventType === "add" || eventType === "unlink") || (0, import_utils2.isNestedRouteComponent)(nestedRouteEntries, absoluteFilePath) && eventType === "change") {
             const resolvedConfig = api.useResolvedConfigContext();
-            const { generateCode } = yield Promise.resolve().then(() => __toESM2(require("./generateCode")));
+            const { generateCode } = yield Promise.resolve().then(() => __toESM(require("./generateCode")));
             const entrypoints = (0, import_lodash.cloneDeep)(originEntrypoints);
             generateCode(appContext, resolvedConfig, entrypoints, api);
           }
@@ -271,3 +255,5 @@ var analyze_default = () => ({
     };
   }
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/analyze/isDefaultExportFunction.js

@@ -21,11 +21,11 @@ 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, {
+var isDefaultExportFunction_exports = {};
+__export(isDefaultExportFunction_exports, {
   isDefaultExportFunction: () => isDefaultExportFunction
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(isDefaultExportFunction_exports);
 var import_fs = __toESM(require("fs"));
 var import_parser = require("@babel/parser");
 var import_traverse = __toESM(require("@babel/traverse"));
@@ -65,3 +65,7 @@ const isDefaultExportFunction = (file) => {
   });
   return isExportFunction;
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isDefaultExportFunction
+});

package/dist/js/node/analyze/makeLegalIdentifier.js

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var makeLegalIdentifier_exports = {};
+__export(makeLegalIdentifier_exports, {
   makeLegalIdentifier: () => makeLegalIdentifier
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(makeLegalIdentifier_exports);
 const reservedWords = "break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public";
 const builtins = "arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl";
 const forbidList = new Set(`${reservedWords} ${builtins}`.split(" "));
@@ -30,3 +30,7 @@ function makeLegalIdentifier(str) {
   }
   return identifier || "_";
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  makeLegalIdentifier
+});

package/dist/js/node/analyze/nestedRoutes.js

@@ -1,9 +1,26 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,34 +38,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, {
-  walk: () => walk
-});
-module.exports = __toCommonJS(stdin_exports);
-var path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_constants = require("./constants");
-var import_utils2 = require("./utils");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -69,18 +58,16 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const LAYOUT_FILE = "layout";
-const PAGE_FILE = "page";
-const LOADING_FILE = "loading";
-const ERROR_FILE = "error";
-const LOADER_FILE = "loader";
-const conventionNames = [
-  LAYOUT_FILE,
-  PAGE_FILE,
-  LOADING_FILE,
-  ERROR_FILE,
-  LOADER_FILE
-];
+var nestedRoutes_exports = {};
+__export(nestedRoutes_exports, {
+  walk: () => walk
+});
+module.exports = __toCommonJS(nestedRoutes_exports);
+var path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_constants = require("./constants");
+var import_utils2 = require("./utils");
+const conventionNames = Object.values(import_constants.NESTED_ROUTE);
 const getLoaderPath = (filename) => __async(void 0, null, function* () {
   if (yield (0, import_utils2.hasLoader)(filename)) {
     return filename;
@@ -133,6 +120,8 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
     children: [],
     isRoot
   };
+  let pageLoaderFile = "";
+  let pageRoute = null;
   const items = yield import_utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
@@ -148,12 +137,23 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
     if (extname && (!import_constants.JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
       continue;
     }
-    if (itemWithoutExt === LAYOUT_FILE) {
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_LOADER_FILE) {
+      if (!route.loader) {
+        route.loader = itemPath;
+      }
+    }
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_FILE) {
       route._component = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
-      route.loader = yield getLoaderPath(itemPath);
+      const loaderPath = yield getLoaderPath(itemPath);
+      if (loaderPath) {
+        route.loader = loaderPath;
+      }
     }
-    if (itemWithoutExt === PAGE_FILE) {
-      const childRoute = createIndexRoute(
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_LOADER_FILE) {
+      pageLoaderFile = itemPath;
+    }
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_FILE) {
+      pageRoute = createIndexRoute(
         {
           _component: (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name)
         },
@@ -161,20 +161,25 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
         itemPath,
         entryName
       );
-      childRoute.loader = yield getLoaderPath(itemPath);
-      (_b = route.children) == null ? void 0 : _b.push(childRoute);
+      const loaderPath = yield getLoaderPath(itemPath);
+      if (loaderPath) {
+        pageRoute.loader = loaderPath;
+      } else if (pageLoaderFile) {
+        pageRoute.loader = pageLoaderFile;
+      }
+      (_b = route.children) == null ? void 0 : _b.push(pageRoute);
     }
-    if (itemWithoutExt === LOADING_FILE) {
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.LOADING_FILE) {
       route.loading = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
-    if (itemWithoutExt === ERROR_FILE) {
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.ERROR_FILE) {
       route.error = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
   }
   const finalRoute = createRoute(
     route,
     rootDir,
-    path.join(dirname, `${LAYOUT_FILE}.ts`),
+    path.join(dirname, `${import_constants.NESTED_ROUTE.LAYOUT_FILE}.ts`),
     entryName
   );
   if (isPathlessLayout) {
@@ -182,3 +187,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   }
   return finalRoute;
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  walk
+});

package/dist/js/node/analyze/templates.js

@@ -1,9 +1,26 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,37 +38,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, {
-  fileSystemRoutes: () => fileSystemRoutes,
-  html: () => html,
-  index: () => index,
-  renderFunction: () => renderFunction,
-  routesForServer: () => routesForServer
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_constants = require("./constants");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -72,6 +58,18 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var templates_exports = {};
+__export(templates_exports, {
+  fileSystemRoutes: () => fileSystemRoutes,
+  html: () => html,
+  index: () => index,
+  renderFunction: () => renderFunction,
+  routesForServer: () => routesForServer
+});
+module.exports = __toCommonJS(templates_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_constants = require("./constants");
 const index = ({
   mountId,
   imports,
@@ -347,9 +345,16 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
           import_constants.TEMP_LOADERS_DIR,
           `${name}.js`
         );
-        const code = `
+        let code = "";
+        if (loader.includes(".loader.")) {
+          code = `
+          export { default as ${name} } from '${(0, import_utils.slash)(loader)}'
+        `;
+        } else {
+          code = `
           export { loader as ${name} } from '${(0, import_utils.slash)(loader)}'
         `;
+        }
         yield import_utils.fs.ensureFile(filename);
         yield import_utils.fs.writeFile(filename, code);
       }))
@@ -364,3 +369,11 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     ${routeComponentsCode}
   `;
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fileSystemRoutes,
+  html,
+  index,
+  renderFunction,
+  routesForServer
+});