@modern-js/runtime 2.53.0 → 2.54.1

package/dist/esm/core/compatible.js

@@ -2,20 +2,19 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
-import { RuntimeReactContext } from "../runtimeContext";
-import { runtime } from "./plugin";
+import { RuntimeReactContext } from "./context/runtime";
+import { registerPlugin } from "./plugin";
 import { createLoaderManager } from "./loader/loaderManager";
+import { getGlobalRunner } from "./plugin/runner";
 var IS_REACT18 = process.env.IS_REACT18 === "true";
 function isClientArgs(id) {
   return typeof id === "string" || typeof HTMLElement !== "undefined" && _instanceof(id, HTMLElement);
 }
-var runnerMap = /* @__PURE__ */ new WeakMap();
 var getInitialContext = function(runner) {
   return {
     loaderManager: createLoaderManager({}),
@@ -25,33 +24,22 @@ var getInitialContext = function(runner) {
   };
 };
 var createApp = function(param) {
-  var plugins = param.plugins, globalProps = param.props;
-  var _appRuntime;
-  var appRuntime = runtime.clone();
-  (_appRuntime = appRuntime).usePlugin.apply(_appRuntime, _to_consumable_array(plugins));
+  var plugins = param.plugins, runtime = param.runtime, globalProps = param.props;
+  var runner = registerPlugin(plugins, {
+    plugins: []
+  }, runtime);
   return function(App) {
-    var runner = appRuntime.init();
     var WrapperComponent = function(props) {
-      var element = /* @__PURE__ */ React.createElement(App || React.Fragment, App ? _object_spread({}, props) : null, App ? props.children : React.Children.map(props.children, function(child) {
+      return /* @__PURE__ */ React.createElement(App || React.Fragment, App ? _object_spread({}, props) : null, App ? props.children : React.Children.map(props.children, function(child) {
         return /* @__PURE__ */ React.isValidElement(child) ? /* @__PURE__ */ React.cloneElement(child, _object_spread({}, child.props, props)) : child;
       }));
-      var context = useContext(RuntimeReactContext);
-      return runner.provide({
-        element,
-        props: _object_spread({}, props),
-        context
-      }, {
-        onLast: function(param2) {
-          var element2 = param2.element;
-          return element2;
-        }
-      });
     };
     if (App) {
       hoistNonReactStatics(WrapperComponent, App);
     }
     var HOCApp = runner.hoc({
-      App: WrapperComponent
+      App: WrapperComponent,
+      config: globalProps || {}
     }, {
       onLast: function(param2) {
         var _$App = param2.App;
@@ -81,7 +69,6 @@ var createApp = function(param) {
         return hoistNonReactStatics(WrapComponent, _$App);
       }
     });
-    runnerMap.set(HOCApp, runner);
     return HOCApp;
   };
 };
@@ -92,13 +79,7 @@ var bootstrap = function() {
       switch (_state.label) {
         case 0:
           App = BootApp;
-          runner = runnerMap.get(App);
-          if (!runner) {
-            App = createApp({
-              plugins: []
-            })(App);
-            runner = runnerMap.get(App);
-          }
+          runner = getGlobalRunner();
           context = getInitialContext(runner);
           runInit = function(_context) {
             return runner.init({

package/dist/esm/core/{appConfig.js → config.js}

@@ -1,7 +1,6 @@
 var APP_CONFIG_SYMBOL = "config";
 var getConfig = function(Component) {
   return (
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
     Component[APP_CONFIG_SYMBOL]
   );
@@ -10,7 +9,11 @@ var defineConfig = function(Component, config) {
   Component[APP_CONFIG_SYMBOL] = config;
   return Component;
 };
+var defineRuntimeConfig = function(config) {
+  return config;
+};
 export {
   defineConfig,
+  defineRuntimeConfig,
   getConfig
 };

package/dist/esm/core/context/index.js

@@ -0,0 +1,4 @@
+import { RuntimeReactContext } from "./runtime";
+export {
+  RuntimeReactContext
+};

package/dist/esm/core/context/runtime.js

@@ -0,0 +1,18 @@
+import { createContext } from "react";
+import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
+import { createLoaderManager } from "../loader/loaderManager";
+var RuntimeReactContext = createContext({});
+var ServerRouterContext = createContext({});
+var getInitialContext = function(runner) {
+  return {
+    loaderManager: createLoaderManager({}),
+    runner,
+    isBrowser: true,
+    routeManifest: typeof window !== "undefined" && window[ROUTE_MANIFEST]
+  };
+};
+export {
+  RuntimeReactContext,
+  ServerRouterContext,
+  getInitialContext
+};

package/dist/esm/core/index.js

@@ -1,16 +1,14 @@
-import { createPlugin, createRuntime, runtime, registerInit } from "./plugin";
-import { defineConfig, getConfig } from "./appConfig";
+import { runtime } from "./plugin";
+import { defineConfig, getConfig, defineRuntimeConfig } from "./config";
 export * from "./compatible";
-import { RuntimeReactContext, ServerRouterContext } from "../runtimeContext";
+import { RuntimeReactContext, ServerRouterContext } from "./context/runtime";
 export * from "./loader";
 export * from "@modern-js/plugin";
 export {
   RuntimeReactContext,
   ServerRouterContext,
-  createPlugin,
-  createRuntime,
   defineConfig,
+  defineRuntimeConfig,
   getConfig,
-  registerInit,
   runtime
 };

package/dist/esm/core/loader/useLoader.js

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { useContext, useRef, useMemo, useState, useCallback, useEffect } from "react";
 import invariant from "invariant";
-import { RuntimeReactContext } from "../../runtimeContext";
+import { RuntimeReactContext } from "../context/runtime";
 import { LoaderStatus } from "./loaderManager";
 var useLoader = function(loaderFn) {
   var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {

package/dist/esm/core/plugin/base.js

@@ -0,0 +1,21 @@
+import { createManager, createPipeline, createAsyncPipeline } from "@modern-js/plugin";
+var client = createAsyncPipeline();
+var server = createAsyncPipeline();
+var hoc = createPipeline();
+var init = createAsyncPipeline();
+var pickContext = createPipeline();
+var runtimeHooks = {
+  hoc,
+  init,
+  client,
+  server,
+  pickContext
+};
+var createRuntime = function() {
+  return createManager(runtimeHooks);
+};
+var runtime = createRuntime();
+export {
+  createRuntime,
+  runtime
+};

package/dist/esm/core/plugin/index.js

@@ -0,0 +1,15 @@
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { runtime } from "./base";
+import { setGlobalRunner } from "./runner";
+export * from "./base";
+function registerPlugin(internalPlugins, runtimeConfig, customRuntime) {
+  var _instance;
+  var _ref = runtimeConfig || {}, _ref_plugins = _ref.plugins, plugins = _ref_plugins === void 0 ? [] : _ref_plugins;
+  (_instance = customRuntime || runtime).usePlugin.apply(_instance, _to_consumable_array(internalPlugins).concat(_to_consumable_array(plugins)));
+  var runner = (customRuntime || runtime).init();
+  setGlobalRunner(runner);
+  return runner;
+}
+export {
+  registerPlugin
+};

package/dist/esm/core/plugin/runner.js

@@ -0,0 +1,17 @@
+import { runtime } from "./base";
+var globalRunner;
+function setGlobalRunner(runner) {
+  globalRunner = runner;
+}
+function getGlobalRunner() {
+  if (globalRunner) {
+    return globalRunner;
+  }
+  var runner = runtime.init();
+  setGlobalRunner(runner);
+  return runner;
+}
+export {
+  getGlobalRunner,
+  setGlobalRunner
+};

package/dist/esm/index.js

@@ -1,13 +1,12 @@
 import { isBrowser } from "./common";
-import { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, defineConfig, registerInit, useRuntimeContext } from "./core";
+import { createApp, useLoader, bootstrap, RuntimeReactContext, defineConfig, defineRuntimeConfig, useRuntimeContext } from "./core";
 export {
   RuntimeReactContext,
   bootstrap,
   createApp,
-  createPlugin,
   defineConfig,
+  defineRuntimeConfig,
   isBrowser,
-  registerInit,
   useLoader,
   useRuntimeContext
 };

package/dist/esm/router/cli/code/getClientRoutes/getRoutes.js

@@ -0,0 +1,185 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import path from "path";
+import { fs } from "@modern-js/utils";
+import { makeLegalIdentifier } from "../makeLegalIdentifier";
+import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../../constants";
+import { replaceWithAlias } from "../utils";
+import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
+var compName = function(srcDirectory, filePath) {
+  var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
+  return "Comp_".concat(legalCompName);
+};
+var layoutNameAbbr = function(filePath) {
+  var prefix = "L_";
+  var dirName = path.dirname(filePath).split("/").pop() || "";
+  return "".concat(prefix).concat(makeLegalIdentifier(dirName));
+};
+var parents = [];
+var recursiveReadDir = function(param) {
+  var dir = param.dir, routes = param.routes, _param_basePath = param.basePath, basePath = _param_basePath === void 0 ? "/" : _param_basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
+  var hasDynamicRoute = false;
+  var resetParent = false;
+  var parent = parents[parents.length - 1];
+  var layout = findLayout(dir);
+  if (layout) {
+    if (basePath === "/") {
+      throw new Error("should use _app instead of _layout in ".concat(dir));
+    } else {
+      var alias = replaceWithAlias(srcDirectory, layout, srcAlias);
+      var componentName = compName(srcDirectory, layout);
+      var route = {
+        path: "".concat(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;
+    }
+  }
+  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    for (var _iterator = fs.readdirSync(dir)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var relative = _step.value;
+      var filePath = path.join(dir, relative);
+      if (!shouldSkip(filePath)) {
+        var filename = path.basename(filePath, path.extname(filePath));
+        var alias1 = replaceWithAlias(srcDirectory, filePath, srcAlias);
+        var componentName1 = compName(srcDirectory, filePath);
+        var dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
+        if (dynamicRouteMatched) {
+          if (hasDynamicRoute) {
+            throw new Error("Can't set two dynamic route in one directory: ".concat(dir));
+          } else {
+            hasDynamicRoute = true;
+          }
+        }
+        var route1 = {
+          path: "".concat(basePath).concat(dynamicRouteMatched ? ":".concat(dynamicRouteMatched[1].replace(/\$$/, "?")).concat(dynamicRouteMatched[2]) : filename),
+          _component: alias1,
+          component: componentName1,
+          parent,
+          type: "page"
+        };
+        if (fs.statSync(filePath).isDirectory()) {
+          recursiveReadDir({
+            dir: filePath,
+            routes,
+            basePath: "".concat(route1.path, "/"),
+            srcDirectory,
+            srcAlias
+          });
+          continue;
+        }
+        if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
+          continue;
+        }
+        if (filename === FILE_SYSTEM_ROUTES_INDEX) {
+          route1.path = basePath === "/" ? basePath : "".concat(basePath.substring(0, basePath.length - 1));
+        }
+        if (filename === "404" && basePath === "/") {
+          route1.path = "*";
+        }
+        routes.push(route1);
+      }
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+  if (resetParent) {
+    parents.pop();
+  }
+};
+var normalizeNestedRoutes = function(nested, internalComponentsDir, internalDirectory, internalDirAlias) {
+  var flat = function(routes) {
+    return routes.reduce(function(memo, route) {
+      return memo.concat(Array.isArray(route.children) ? flat(route.children) : [
+        route
+      ]);
+    }, []);
+  };
+  var generate = function(route) {
+    var codes = [];
+    var lastComponent = route.component;
+    var imports = [
+      "import React from 'react';",
+      "import ".concat(lastComponent, " from '").concat(route._component, "'")
+    ];
+    while (route = route.parent) {
+      var layoutComponent = route.component;
+      var layoutComponentAbbr = layoutNameAbbr(route._component);
+      imports.push("import ".concat(layoutComponent, " from '").concat(route._component, "';"));
+      var currentComponent = "".concat(layoutComponentAbbr, "_").concat(lastComponent);
+      codes.push("const ".concat(currentComponent, " = props => <").concat(layoutComponent, " Component={").concat(lastComponent, "} {...props} />;"));
+      lastComponent = currentComponent;
+    }
+    var file = path.resolve(internalComponentsDir, "".concat(lastComponent, ".jsx"));
+    fs.outputFileSync(file, "".concat(imports.join("\n"), "\n").concat(codes.join("\n"), "\nexport default ").concat(lastComponent));
+    return {
+      component: lastComponent,
+      _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
+    };
+  };
+  var normalized = flat(nested).map(function(route) {
+    return route.parent ? _object_spread_props(_object_spread({}, route, generate(route)), {
+      parent: void 0
+    }) : _object_spread_props(_object_spread({}, route), {
+      parent: void 0
+    });
+  });
+  return normalized;
+};
+var getClientRoutes = function(param) {
+  var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias, internalDirectory = param.internalDirectory, internalDirAlias = param.internalDirAlias;
+  var entryName = entrypoint.entryName, pageRoutesEntry = entrypoint.pageRoutesEntry;
+  if (!pageRoutesEntry) {
+    return [];
+  }
+  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: pageRoutesEntry,
+    routes,
+    basePath: "/",
+    srcDirectory,
+    srcAlias
+  });
+  var internalComponentsDir = path.resolve(internalDirectory, "".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_COMPONENTS_DIR));
+  fs.emptyDirSync(internalComponentsDir);
+  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
+  parents.length = 0;
+  routes.sort(function(a, b) {
+    var delta = getRouteWeight(a.path) - getRouteWeight(b.path);
+    if (delta === 0) {
+      return a.path.length - b.path.length;
+    }
+    return delta;
+  });
+  debug("fileSystem routes: %o", routes);
+  return routes;
+};
+export {
+  getClientRoutes
+};

package/dist/esm/router/cli/code/getClientRoutes/getRoutesLegacy.js

@@ -0,0 +1,183 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import path from "path";
+import { fs } from "@modern-js/utils";
+import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../../constants";
+import { replaceWithAlias } from "../utils";
+import { makeLegalIdentifier } from "../makeLegalIdentifier";
+import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
+var compName = function(srcDirectory, filePath) {
+  var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
+  return "Comp_".concat(legalCompName);
+};
+var layoutNameAbbr = function(filePath) {
+  var prefix = "L_";
+  var dirName = path.dirname(filePath).split("/").pop() || "";
+  return "".concat(prefix).concat(makeLegalIdentifier(dirName));
+};
+var parents = [];
+var recursiveReadDirLegacy = function(param) {
+  var dir = param.dir, routes = param.routes, _param_basePath = param.basePath, basePath = _param_basePath === void 0 ? "/" : _param_basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
+  var hasDynamicRoute = false;
+  var resetParent = false;
+  var parent = parents[parents.length - 1];
+  var layout = findLayout(dir);
+  if (layout) {
+    if (basePath === "/") {
+      throw new Error("should use _app instead of _layout in ".concat(dir));
+    } else {
+      var alias = replaceWithAlias(srcDirectory, layout, srcAlias);
+      var componentName = compName(srcDirectory, layout);
+      var route = {
+        path: "".concat(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;
+    }
+  }
+  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    for (var _iterator = fs.readdirSync(dir)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var relative = _step.value;
+      var filePath = path.join(dir, relative);
+      if (!shouldSkip(filePath)) {
+        var filename = path.basename(filePath, path.extname(filePath));
+        var alias1 = replaceWithAlias(srcDirectory, filePath, srcAlias);
+        var componentName1 = compName(srcDirectory, filePath);
+        var dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
+        if (dynamicRouteMatched) {
+          if (hasDynamicRoute) {
+            throw new Error("Can't set two dynamic route in one directory: ".concat(dir));
+          } else {
+            hasDynamicRoute = true;
+          }
+        }
+        var route1 = {
+          path: "".concat(basePath).concat(dynamicRouteMatched ? ":".concat(dynamicRouteMatched[1].replace(/\$$/, "?")).concat(dynamicRouteMatched[2]) : filename),
+          _component: alias1,
+          component: componentName1,
+          exact: true,
+          parent
+        };
+        if (fs.statSync(filePath).isDirectory()) {
+          recursiveReadDirLegacy({
+            dir: filePath,
+            routes,
+            basePath: "".concat(route1.path, "/"),
+            srcDirectory,
+            srcAlias
+          });
+          continue;
+        }
+        if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
+          continue;
+        }
+        if (filename === FILE_SYSTEM_ROUTES_INDEX) {
+          route1.path = basePath === "/" ? basePath : "".concat(basePath.substring(0, basePath.length - 1));
+        }
+        if (filename === "404" && basePath === "/") {
+          route1.path = "*";
+          route1.exact = false;
+        }
+        routes.push(route1);
+      }
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+  if (resetParent) {
+    parents.pop();
+  }
+};
+var normalizeNestedRoutes = function(nested, internalComponentsDir, internalDirectory, internalDirAlias) {
+  var flat = function(routes) {
+    return routes.reduce(function(memo, route) {
+      return memo.concat(Array.isArray(route.routes) ? flat(route.routes) : [
+        route
+      ]);
+    }, []);
+  };
+  var generate = function(route) {
+    var codes = [];
+    var lastComponent = route.component;
+    var imports = [
+      "import React from 'react';",
+      "import ".concat(lastComponent, " from '").concat(route._component, "'")
+    ];
+    while (route = route.parent) {
+      var layoutComponent = route.component;
+      var layoutComponentAbbr = layoutNameAbbr(route._component);
+      imports.push("import ".concat(layoutComponent, " from '").concat(route._component, "';"));
+      var currentComponent = "".concat(layoutComponentAbbr, "_").concat(lastComponent);
+      codes.push("const ".concat(currentComponent, " = props => <").concat(layoutComponent, " Component={").concat(lastComponent, "} {...props} />;"));
+      lastComponent = currentComponent;
+    }
+    var file = path.resolve(internalComponentsDir, "".concat(lastComponent, ".jsx"));
+    fs.outputFileSync(file, "".concat(imports.join("\n"), "\n").concat(codes.join("\n"), "\nexport default ").concat(lastComponent));
+    return {
+      component: lastComponent,
+      _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
+    };
+  };
+  var normalized = flat(nested).map(function(route) {
+    return route.parent ? _object_spread_props(_object_spread({}, route, generate(route)), {
+      parent: void 0
+    }) : _object_spread_props(_object_spread({}, route), {
+      parent: void 0
+    });
+  });
+  return normalized;
+};
+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."));
+  }
+  if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
+    throw new Error("generate file system routes error, ".concat(entry, " should be directory."));
+  }
+  var routes = [];
+  recursiveReadDirLegacy({
+    dir: entry,
+    routes,
+    basePath: "/",
+    srcDirectory,
+    srcAlias
+  });
+  var internalComponentsDir = path.resolve(internalDirectory, "".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_COMPONENTS_DIR));
+  fs.emptyDirSync(internalComponentsDir);
+  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
+  parents.length = 0;
+  routes.sort(function(a, b) {
+    var delta = getRouteWeight(a.path) - getRouteWeight(b.path);
+    if (delta === 0) {
+      return a.path.length - b.path.length;
+    }
+    return delta;
+  });
+  debug("fileSystem routes: %o", routes);
+  return routes;
+};
+export {
+  getClientRoutes
+};

package/dist/esm/router/cli/code/getClientRoutes/index.js

@@ -0,0 +1,6 @@
+import { getClientRoutes } from "./getRoutes";
+import { getClientRoutes as getClientRoutes2 } from "./getRoutesLegacy";
+export {
+  getClientRoutes,
+  getClientRoutes2 as getClientRoutesLegacy
+};

package/dist/esm/router/cli/code/getClientRoutes/utils.js

@@ -0,0 +1,28 @@
+import path from "path";
+import { JS_EXTENSIONS, createDebugger, findExists, fs } from "@modern-js/utils";
+import { FILE_SYSTEM_ROUTES_LAYOUT, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX } from "../../constants";
+var debug = createDebugger("get-client-routes");
+var findLayout = function(dir) {
+  return findExists(JS_EXTENSIONS.map(function(ext) {
+    return path.resolve(dir, "".concat(FILE_SYSTEM_ROUTES_LAYOUT).concat(ext));
+  }));
+};
+var getRouteWeight = function(route) {
+  return route === "*" ? 999 : route.split(":").length - 1;
+};
+var shouldSkip = function(file) {
+  if (fs.statSync(file).isDirectory()) {
+    return false;
+  }
+  var ext = path.extname(file);
+  if (FILE_SYSTEM_ROUTES_IGNORED_REGEX.test(file) || !JS_EXTENSIONS.includes(ext) || FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT === path.basename(file, ext)) {
+    return true;
+  }
+  return false;
+};
+export {
+  debug,
+  findLayout,
+  getRouteWeight,
+  shouldSkip
+};