@modern-js/app-tools 2.53.1-alpha.4 → 2.54.1-alpha.0

package/dist/types/types/hooks.d.ts

@@ -1,5 +1,5 @@
 import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow } from '@modern-js/plugin';
-import type { Entrypoint, HtmlPartials, NestedRouteForCli, PageRoute, RouteLegacy, ServerRoute } from '@modern-js/types';
+import type { Entrypoint, HtmlPartials, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
 import type { RegisterBuildPlatformResult, DevToolData } from '@modern-js/core';
 import type { Stats, MultiStats } from '@rsbuild/shared';
 import type { Rspack, webpack } from '@modern-js/uni-builder';
@@ -47,6 +47,13 @@ export type AppToolsHooks<B extends Bundler = 'webpack'> = {
     modifyServerRoutes: AsyncWaterfall<{
         routes: ServerRoute[];
     }>;
+    modifyEntrypoints: AsyncWaterfall<{
+        entrypoints: Entrypoint[];
+    }>;
+    checkEntryPoint: AsyncWaterfall<{
+        path: string;
+        entry: false | string;
+    }>;
     htmlPartials: AsyncWaterfall<{
         entrypoint: Entrypoint;
         partials: HtmlPartials;
@@ -59,6 +66,9 @@ export type AppToolsHooks<B extends Bundler = 'webpack'> = {
     collectServerPlugins: AsyncWaterfall<{
         plugins: Array<Record<string, string>>;
     }>;
+    _internalServerPlugins: AsyncWaterfall<{
+        plugins: ServerPlugin[];
+    }>;
     beforeDev: AsyncWorkflow<void, unknown>;
     afterDev: AsyncWorkflow<{
         isFirstCompile: boolean;

package/dist/types/utils/loadPlugins.d.ts

@@ -0,0 +1,5 @@
+import { ServerPlugin as ServerPluginInstance } from '@modern-js/server-core';
+import { ServerPlugin } from '@modern-js/types';
+import { AppTools, PluginAPI } from '../types';
+export declare function getServerPlugins(api: PluginAPI<AppTools<'shared'>>): Promise<ServerPlugin[]>;
+export declare function loadServerPlugins(api: PluginAPI<AppTools<'shared'>>, appDirectory: string): Promise<ServerPluginInstance[]>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.53.1-alpha.4",
+  "version": "2.54.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -77,9 +77,9 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@rsbuild/plugin-node-polyfill": "0.7.3",
-    "@rsbuild/shared": "0.7.3",
-    "@rsbuild/core": "0.7.3",
+    "@rsbuild/plugin-node-polyfill": "0.7.9",
+    "@rsbuild/shared": "0.7.9",
+    "@rsbuild/core": "0.7.9",
     "@swc/helpers": "0.5.3",
     "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
@@ -88,23 +88,23 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/plugin-data-loader": "2.53.0",
-    "@modern-js/core": "2.53.0",
-    "@modern-js/node-bundle-require": "2.53.0",
-    "@modern-js/prod-server": "2.53.0",
-    "@modern-js/plugin-i18n": "2.53.0",
-    "@modern-js/plugin": "2.53.0",
-    "@modern-js/server-core": "2.53.0",
-    "@modern-js/types": "2.53.0",
-    "@modern-js/rsbuild-plugin-esbuild": "2.53.0",
-    "@modern-js/utils": "2.53.0",
-    "@modern-js/server": "2.53.0",
-    "@modern-js/server-utils": "2.53.0",
-    "@modern-js/uni-builder": "2.53.0",
-    "@modern-js/plugin-lint": "2.53.0"
+    "@modern-js/core": "2.54.0",
+    "@modern-js/plugin": "2.54.0",
+    "@modern-js/node-bundle-require": "2.54.0",
+    "@modern-js/plugin-i18n": "2.54.0",
+    "@modern-js/prod-server": "2.54.0",
+    "@modern-js/plugin-lint": "2.54.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.54.0",
+    "@modern-js/server": "2.54.0",
+    "@modern-js/server-core": "2.54.0",
+    "@modern-js/server-utils": "2.54.0",
+    "@modern-js/plugin-data-loader": "2.54.0",
+    "@modern-js/types": "2.54.0",
+    "@modern-js/uni-builder": "2.54.0",
+    "@modern-js/utils": "2.54.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.7.3",
+    "@rsbuild/plugin-swc": "0.7.9",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
@@ -112,9 +112,9 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
-    "webpack": "^5.91.0",
-    "@scripts/build": "2.53.0",
-    "@scripts/jest-config": "2.53.0"
+    "webpack": "^5.92.0",
+    "@scripts/build": "2.54.0",
+    "@scripts/jest-config": "2.54.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/cjs/analyze/constants.js

@@ -1,122 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var constants_exports = {};
-__export(constants_exports, {
-  ACTION_EXPORT_NAME: () => ACTION_EXPORT_NAME,
-  APP_CONFIG_NAME: () => APP_CONFIG_NAME,
-  APP_FILE_NAME: () => APP_FILE_NAME,
-  APP_INIT_EXPORTED: () => APP_INIT_EXPORTED,
-  APP_INIT_IMPORTED: () => APP_INIT_IMPORTED,
-  ENTRY_BOOTSTRAP_FILE_NAME: () => ENTRY_BOOTSTRAP_FILE_NAME,
-  ENTRY_POINT_FILE_NAME: () => ENTRY_POINT_FILE_NAME,
-  FILE_SYSTEM_ROUTES_COMPONENTS_DIR: () => FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
-  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: () => FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
-  FILE_SYSTEM_ROUTES_FILE_NAME: () => FILE_SYSTEM_ROUTES_FILE_NAME,
-  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT: () => FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
-  FILE_SYSTEM_ROUTES_IGNORED_REGEX: () => FILE_SYSTEM_ROUTES_IGNORED_REGEX,
-  FILE_SYSTEM_ROUTES_INDEX: () => FILE_SYSTEM_ROUTES_INDEX,
-  FILE_SYSTEM_ROUTES_LAYOUT: () => FILE_SYSTEM_ROUTES_LAYOUT,
-  HTML_PARTIALS_EXTENSIONS: () => HTML_PARTIALS_EXTENSIONS,
-  HTML_PARTIALS_FOLDER: () => HTML_PARTIALS_FOLDER,
-  INDEX_FILE_NAME: () => INDEX_FILE_NAME,
-  JS_EXTENSIONS: () => JS_EXTENSIONS,
-  LOADER_EXPORT_NAME: () => LOADER_EXPORT_NAME,
-  NESTED_ROUTE: () => NESTED_ROUTE,
-  NESTED_ROUTES_DIR: () => NESTED_ROUTES_DIR,
-  PAGES_DIR_NAME: () => PAGES_DIR_NAME,
-  TEMP_LOADERS_DIR: () => TEMP_LOADERS_DIR
-});
-module.exports = __toCommonJS(constants_exports);
-const JS_EXTENSIONS = [
-  ".js",
-  ".ts",
-  ".jsx",
-  ".tsx"
-];
-const INDEX_FILE_NAME = "index";
-const APP_FILE_NAME = "App";
-const PAGES_DIR_NAME = "pages";
-const NESTED_ROUTES_DIR = "routes";
-const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
-const LOADER_EXPORT_NAME = "loader";
-const ACTION_EXPORT_NAME = "action";
-const TEMP_LOADERS_DIR = "__loaders__";
-const ENTRY_POINT_FILE_NAME = "index.jsx";
-const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
-const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
-const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
-const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
-const FILE_SYSTEM_ROUTES_INDEX = "index";
-const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
-const HTML_PARTIALS_FOLDER = "html";
-const HTML_PARTIALS_EXTENSIONS = [
-  ".htm",
-  ".html",
-  ".ejs"
-];
-const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
-const NESTED_ROUTE = {
-  LAYOUT_FILE: "layout",
-  LAYOUT_CONFIG_FILE: "layout.config",
-  LAYOUT_LOADER_FILE: "layout.loader",
-  LAYOUT_DATA_FILE: "layout.data",
-  LAYOUT_CLIENT_LOADER: "layout.data.client",
-  PAGE_FILE: "page",
-  PAGE_CONFIG_FILE: "page.config",
-  PAGE_LOADER_FILE: "page.loader",
-  PAGE_DATA_FILE: "page.data",
-  PAGE_CLIENT_LOADER: "page.data.client",
-  SPLATE_FILE: "$",
-  SPLATE_CONFIG_FILE: "$.config",
-  SPLATE_LOADER_FILE: "$.loader",
-  SPLATE_DATA_FILE: "$.data",
-  SPLATE_CLIENT_DATA: "$.data.client",
-  LOADING_FILE: "loading",
-  ERROR_FILE: "error",
-  LOADER_FILE: "loader"
-};
-const APP_CONFIG_NAME = "config";
-const APP_INIT_EXPORTED = "init";
-const APP_INIT_IMPORTED = "appInit";
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ACTION_EXPORT_NAME,
-  APP_CONFIG_NAME,
-  APP_FILE_NAME,
-  APP_INIT_EXPORTED,
-  APP_INIT_IMPORTED,
-  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/cjs/analyze/getClientRoutes/getRoutes.js

@@ -1,197 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var getRoutes_exports = {};
-__export(getRoutes_exports, {
-  getClientRoutes: () => getClientRoutes
-});
-module.exports = __toCommonJS(getRoutes_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_makeLegalIdentifier = require("../makeLegalIdentifier");
-var import_constants = require("../constants");
-var import_utils2 = require("../utils");
-var import_utils3 = require("./utils");
-const compName = (srcDirectory, filePath) => {
-  const legalCompName = (0, import_makeLegalIdentifier.makeLegalIdentifier)(import_path.default.relative(srcDirectory, filePath));
-  return `Comp_${legalCompName}`;
-};
-const layoutNameAbbr = (filePath) => {
-  const prefix = "L_";
-  const dirName = import_path.default.dirname(filePath).split("/").pop() || "";
-  return `${prefix}${(0, import_makeLegalIdentifier.makeLegalIdentifier)(dirName)}`;
-};
-const parents = [];
-const recursiveReadDir = ({ dir, routes, basePath = "/", srcDirectory, srcAlias }) => {
-  let hasDynamicRoute = false;
-  let resetParent = false;
-  let parent = parents[parents.length - 1];
-  const layout = (0, import_utils3.findLayout)(dir);
-  if (layout) {
-    if (basePath === "/") {
-      throw new Error(`should use _app instead of _layout in ${dir}`);
-    } else {
-      const alias = (0, import_utils2.replaceWithAlias)(srcDirectory, layout, srcAlias);
-      const componentName = compName(srcDirectory, layout);
-      const route = {
-        path: `${basePath.substring(0, basePath.length - 1)}`,
-        children: [],
-        _component: alias,
-        component: componentName,
-        parent,
-        type: "page"
-      };
-      parent = route;
-      resetParent = true;
-      routes.push(route);
-      parents.push(route);
-      routes = route.children;
-    }
-  }
-  for (const relative of import_utils.fs.readdirSync(dir)) {
-    const filePath = import_path.default.join(dir, relative);
-    if (!(0, import_utils3.shouldSkip)(filePath)) {
-      const filename = import_path.default.basename(filePath, import_path.default.extname(filePath));
-      const alias = (0, import_utils2.replaceWithAlias)(srcDirectory, filePath, srcAlias);
-      const componentName = compName(srcDirectory, filePath);
-      const dynamicRouteMatched = import_constants.FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
-      if (dynamicRouteMatched) {
-        if (hasDynamicRoute) {
-          throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
-        } else {
-          hasDynamicRoute = true;
-        }
-      }
-      const route = {
-        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1].replace(/\$$/, "?")}${dynamicRouteMatched[2]}` : filename}`,
-        _component: alias,
-        component: componentName,
-        parent,
-        type: "page"
-      };
-      if (import_utils.fs.statSync(filePath).isDirectory()) {
-        recursiveReadDir({
-          dir: filePath,
-          routes,
-          basePath: `${route.path}/`,
-          srcDirectory,
-          srcAlias
-        });
-        continue;
-      }
-      if (filename === import_constants.FILE_SYSTEM_ROUTES_LAYOUT) {
-        continue;
-      }
-      if (filename === import_constants.FILE_SYSTEM_ROUTES_INDEX) {
-        route.path = basePath === "/" ? basePath : `${basePath.substring(0, basePath.length - 1)}`;
-      }
-      if (filename === "404" && basePath === "/") {
-        route.path = "*";
-      }
-      routes.push(route);
-    }
-  }
-  if (resetParent) {
-    parents.pop();
-  }
-};
-const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory, internalDirAlias) => {
-  const flat = (routes) => routes.reduce((memo, route) => memo.concat(Array.isArray(route.children) ? flat(route.children) : [
-    route
-  ]), []);
-  const generate = (route) => {
-    const codes = [];
-    let lastComponent = route.component;
-    const imports = [
-      `import React from 'react';`,
-      `import ${lastComponent} from '${route._component}'`
-    ];
-    while (route = route.parent) {
-      const layoutComponent = route.component;
-      const layoutComponentAbbr = layoutNameAbbr(route._component);
-      imports.push(`import ${layoutComponent} from '${route._component}';`);
-      const currentComponent = `${layoutComponentAbbr}_${lastComponent}`;
-      codes.push(`const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`);
-      lastComponent = currentComponent;
-    }
-    const file = import_path.default.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    import_utils.fs.outputFileSync(file, `${imports.join("\n")}
-${codes.join("\n")}
-export default ${lastComponent}`);
-    return {
-      component: lastComponent,
-      _component: (0, import_utils2.replaceWithAlias)(internalDirectory, file, internalDirAlias)
-    };
-  };
-  const normalized = flat(nested).map((route) => route.parent ? {
-    ...route,
-    ...generate(route),
-    parent: void 0
-  } : {
-    ...route,
-    parent: void 0
-  });
-  return normalized;
-};
-const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDirectory, internalDirAlias }) => {
-  const { entryName, pageRoutesEntry } = entrypoint;
-  if (!pageRoutesEntry) {
-    return [];
-  }
-  if (!import_utils.fs.existsSync(pageRoutesEntry)) {
-    throw new Error(`generate file system routes error, ${pageRoutesEntry} directory not found.`);
-  }
-  if (!(import_utils.fs.existsSync(pageRoutesEntry) && import_utils.fs.statSync(pageRoutesEntry).isDirectory())) {
-    throw new Error(`generate file system routes error, ${pageRoutesEntry} should be directory.`);
-  }
-  let routes = [];
-  recursiveReadDir({
-    dir: pageRoutesEntry,
-    routes,
-    basePath: "/",
-    srcDirectory,
-    srcAlias
-  });
-  const internalComponentsDir = import_path.default.resolve(internalDirectory, `${entryName}/${import_constants.FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
-  import_utils.fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
-  parents.length = 0;
-  routes.sort((a, b) => {
-    const delta = (0, import_utils3.getRouteWeight)(a.path) - (0, import_utils3.getRouteWeight)(b.path);
-    if (delta === 0) {
-      return a.path.length - b.path.length;
-    }
-    return delta;
-  });
-  (0, import_utils3.debug)(`fileSystem routes: %o`, routes);
-  return routes;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getClientRoutes
-});

package/dist/cjs/analyze/getClientRoutes/getRoutesLegacy.js

@@ -1,195 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var getRoutesLegacy_exports = {};
-__export(getRoutesLegacy_exports, {
-  getClientRoutes: () => getClientRoutes
-});
-module.exports = __toCommonJS(getRoutesLegacy_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_makeLegalIdentifier = require("../makeLegalIdentifier");
-var import_constants = require("../constants");
-var import_utils2 = require("../utils");
-var import_utils3 = require("./utils");
-const compName = (srcDirectory, filePath) => {
-  const legalCompName = (0, import_makeLegalIdentifier.makeLegalIdentifier)(import_path.default.relative(srcDirectory, filePath));
-  return `Comp_${legalCompName}`;
-};
-const layoutNameAbbr = (filePath) => {
-  const prefix = "L_";
-  const dirName = import_path.default.dirname(filePath).split("/").pop() || "";
-  return `${prefix}${(0, import_makeLegalIdentifier.makeLegalIdentifier)(dirName)}`;
-};
-const parents = [];
-const recursiveReadDirLegacy = ({ dir, routes, basePath = "/", srcDirectory, srcAlias }) => {
-  let hasDynamicRoute = false;
-  let resetParent = false;
-  let parent = parents[parents.length - 1];
-  const layout = (0, import_utils3.findLayout)(dir);
-  if (layout) {
-    if (basePath === "/") {
-      throw new Error(`should use _app instead of _layout in ${dir}`);
-    } else {
-      const alias = (0, import_utils2.replaceWithAlias)(srcDirectory, layout, srcAlias);
-      const componentName = compName(srcDirectory, layout);
-      const route = {
-        path: `${basePath.substring(0, basePath.length - 1)}`,
-        exact: false,
-        routes: [],
-        _component: alias,
-        component: componentName,
-        parent
-      };
-      parent = route;
-      resetParent = true;
-      routes.push(route);
-      parents.push(route);
-      routes = route.routes;
-    }
-  }
-  for (const relative of import_utils.fs.readdirSync(dir)) {
-    const filePath = import_path.default.join(dir, relative);
-    if (!(0, import_utils3.shouldSkip)(filePath)) {
-      const filename = import_path.default.basename(filePath, import_path.default.extname(filePath));
-      const alias = (0, import_utils2.replaceWithAlias)(srcDirectory, filePath, srcAlias);
-      const componentName = compName(srcDirectory, filePath);
-      const dynamicRouteMatched = import_constants.FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
-      if (dynamicRouteMatched) {
-        if (hasDynamicRoute) {
-          throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
-        } else {
-          hasDynamicRoute = true;
-        }
-      }
-      const route = {
-        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1].replace(/\$$/, "?")}${dynamicRouteMatched[2]}` : filename}`,
-        _component: alias,
-        component: componentName,
-        exact: true,
-        parent
-      };
-      if (import_utils.fs.statSync(filePath).isDirectory()) {
-        recursiveReadDirLegacy({
-          dir: filePath,
-          routes,
-          basePath: `${route.path}/`,
-          srcDirectory,
-          srcAlias
-        });
-        continue;
-      }
-      if (filename === import_constants.FILE_SYSTEM_ROUTES_LAYOUT) {
-        continue;
-      }
-      if (filename === import_constants.FILE_SYSTEM_ROUTES_INDEX) {
-        route.path = basePath === "/" ? basePath : `${basePath.substring(0, basePath.length - 1)}`;
-      }
-      if (filename === "404" && basePath === "/") {
-        route.path = "*";
-        route.exact = false;
-      }
-      routes.push(route);
-    }
-  }
-  if (resetParent) {
-    parents.pop();
-  }
-};
-const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory, internalDirAlias) => {
-  const flat = (routes) => routes.reduce((memo, route) => memo.concat(Array.isArray(route.routes) ? flat(route.routes) : [
-    route
-  ]), []);
-  const generate = (route) => {
-    const codes = [];
-    let lastComponent = route.component;
-    const imports = [
-      `import React from 'react';`,
-      `import ${lastComponent} from '${route._component}'`
-    ];
-    while (route = route.parent) {
-      const layoutComponent = route.component;
-      const layoutComponentAbbr = layoutNameAbbr(route._component);
-      imports.push(`import ${layoutComponent} from '${route._component}';`);
-      const currentComponent = `${layoutComponentAbbr}_${lastComponent}`;
-      codes.push(`const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`);
-      lastComponent = currentComponent;
-    }
-    const file = import_path.default.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    import_utils.fs.outputFileSync(file, `${imports.join("\n")}
-${codes.join("\n")}
-export default ${lastComponent}`);
-    return {
-      component: lastComponent,
-      _component: (0, import_utils2.replaceWithAlias)(internalDirectory, file, internalDirAlias)
-    };
-  };
-  const normalized = flat(nested).map((route) => route.parent ? {
-    ...route,
-    ...generate(route),
-    parent: void 0
-  } : {
-    ...route,
-    parent: void 0
-  });
-  return normalized;
-};
-const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDirectory, internalDirAlias }) => {
-  const { entry, entryName } = entrypoint;
-  if (!import_utils.fs.existsSync(entry)) {
-    throw new Error(`generate file system routes error, ${entry} directory not found.`);
-  }
-  if (!(import_utils.fs.existsSync(entry) && import_utils.fs.statSync(entry).isDirectory())) {
-    throw new Error(`generate file system routes error, ${entry} should be directory.`);
-  }
-  let routes = [];
-  recursiveReadDirLegacy({
-    dir: entry,
-    routes,
-    basePath: "/",
-    srcDirectory,
-    srcAlias
-  });
-  const internalComponentsDir = import_path.default.resolve(internalDirectory, `${entryName}/${import_constants.FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
-  import_utils.fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
-  parents.length = 0;
-  routes.sort((a, b) => {
-    const delta = (0, import_utils3.getRouteWeight)(a.path) - (0, import_utils3.getRouteWeight)(b.path);
-    if (delta === 0) {
-      return a.path.length - b.path.length;
-    }
-    return delta;
-  });
-  (0, import_utils3.debug)(`fileSystem routes: %o`, routes);
-  return routes;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getClientRoutes
-});

package/dist/cjs/analyze/getClientRoutes/index.js

@@ -1,31 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var getClientRoutes_exports = {};
-__export(getClientRoutes_exports, {
-  getClientRoutes: () => import_getRoutes.getClientRoutes,
-  getClientRoutesLegacy: () => import_getRoutesLegacy.getClientRoutes
-});
-module.exports = __toCommonJS(getClientRoutes_exports);
-var import_getRoutes = require("./getRoutes");
-var import_getRoutesLegacy = require("./getRoutesLegacy");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getClientRoutes,
-  getClientRoutesLegacy
-});