@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.6

package/dist/js/modern/analyze/getBundleEntry.js

@@ -1,68 +1,70 @@
-import path from 'path';
-import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME } from '@modern-js/utils';
+import path from "path";
+import {
+  ensureAbsolutePath,
+  fs,
+  findExists,
+  MAIN_ENTRY_NAME
+} from "@modern-js/utils";
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
-const ensureExtensions = file => {
+const ensureExtensions = (file) => {
   if (!path.extname(file)) {
-    return findExists(JS_EXTENSIONS.map(ext => `${file}${ext}`)) || file;
+    return findExists(JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
   }
   return file;
 };
-const ifAlreadyExists = (entrypoints, checked) => entrypoints.some(entrypoint => {
+const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
   if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
-    // reset entryName
     checked.entryName = entrypoint.entryName;
     return true;
   }
-  // filesystem routes entrypoint conflict with normal entrypoint.
   if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
-    throw new Error(`Entry configuration conflicts\n Your configuration: ${checked.entry}.\n Default entrypoint: ${entrypoint.entry}\n Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`);
+    throw new Error(
+      `Entry configuration conflicts
+ Your configuration: ${checked.entry}.
+ Default entrypoint: ${entrypoint.entry}
+ Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`
+    );
   }
   return false;
 });
-export const getBundleEntry = (appContext, config) => {
+const getBundleEntry = (appContext, config) => {
+  const { appDirectory, packageName } = appContext;
   const {
-    appDirectory,
-    packageName
-  } = appContext;
-  const {
-    source: {
-      disableDefaultEntries,
-      entries,
-      entriesDir
-    }
+    source: { disableDefaultEntries, entries, entriesDir }
   } = config;
   const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
-
-  // merge entrypoints from user config with directory convention.
   if (entries) {
-    Object.keys(entries).forEach(name => {
+    Object.keys(entries).forEach((name) => {
       const value = entries[name];
-      const entrypoint = typeof value === 'string' ? {
+      const entrypoint = typeof value === "string" ? {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value),
         isAutoMount: true,
-        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : undefined
+        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
       } : {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value.entry),
         isAutoMount: !value.disableMount,
-        fileSystemRoutes: value.enableFileSystemRoutes ? {} : undefined
+        fileSystemRoutes: value.enableFileSystemRoutes ? {} : void 0
       };
+      if (entrypoint.fileSystemRoutes) {
+        entrypoint.nestedRoutesEntry = entrypoint.entry;
+      }
       if (!ifAlreadyExists(defaults, entrypoint)) {
         defaults.push(entrypoint);
       }
     });
   }
   if (!disableDefaultEntries) {
-    // find main entry point which server route is '/'.
-    const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || '');
-    const found = defaults.find(({
-      entryName,
-      entry,
-      nestedRoutesEntry: _nestedRoutesEntry = ''
-    }) => entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(_nestedRoutesEntry) === entriesDirAbs);
+    const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
+    const found = defaults.find(
+      ({ entryName, entry, nestedRoutesEntry = "" }) => entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs
+    );
     found && (found.entryName = MAIN_ENTRY_NAME);
   }
   return defaults;
-};
+};
+export {
+  getBundleEntry
+};

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

@@ -1,28 +1,49 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import path from 'path';
-import { fs } from '@modern-js/utils';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+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));
+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 {
+  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";
 const compName = (srcDirectory, filePath) => {
-  const legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
+  const legalCompName = makeLegalIdentifier(
+    path.relative(srcDirectory, filePath)
+  );
   return `Comp_${legalCompName}`;
 };
-const layoutNameAbbr = filePath => {
-  const prefix = 'L_';
-  const dirName = path.dirname(filePath).split('/').pop() || '';
+const layoutNameAbbr = (filePath) => {
+  const prefix = "L_";
+  const dirName = path.dirname(filePath).split("/").pop() || "";
   return `${prefix}${makeLegalIdentifier(dirName)}`;
 };
 const parents = [];
-
-/* eslint-disable no-param-reassign */
 const recursiveReadDir = ({
   dir,
   routes,
-  basePath: _basePath = '/',
+  basePath = "/",
   srcDirectory,
   srcAlias
 }) => {
@@ -31,18 +52,18 @@ const recursiveReadDir = ({
   let parent = parents[parents.length - 1];
   const layout = findLayout(dir);
   if (layout) {
-    if (_basePath === '/') {
+    if (basePath === "/") {
       throw new Error(`should use _app instead of _layout in ${dir}`);
     } else {
       const alias = replaceWithAlias(srcDirectory, layout, srcAlias);
       const componentName = compName(srcDirectory, layout);
       const route = {
-        path: `${_basePath.substring(0, _basePath.length - 1)}`,
+        path: `${basePath.substring(0, basePath.length - 1)}`,
         children: [],
         _component: alias,
         component: componentName,
         parent,
-        type: 'page'
+        type: "page"
       };
       parent = route;
       resetParent = true;
@@ -60,17 +81,19 @@ const recursiveReadDir = ({
       const dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
       if (dynamicRouteMatched) {
         if (hasDynamicRoute) {
-          throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
+          throw new Error(
+            `Can't set two dynamic route in one directory: ${dir}`
+          );
         } else {
           hasDynamicRoute = true;
         }
       }
       const route = {
-        path: `${_basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
+        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
         _component: alias,
         component: componentName,
         parent,
-        type: 'page'
+        type: "page"
       };
       if (fs.statSync(filePath).isDirectory()) {
         recursiveReadDir({
@@ -86,10 +109,10 @@ const recursiveReadDir = ({
         continue;
       }
       if (filename === FILE_SYSTEM_ROUTES_INDEX) {
-        route.path = _basePath === '/' ? _basePath : `${_basePath.substring(0, _basePath.length - 1)}`;
+        route.path = basePath === "/" ? basePath : `${basePath.substring(0, basePath.length - 1)}`;
       }
-      if (filename === '404' && _basePath === '/') {
-        route.path = '*';
+      if (filename === "404" && basePath === "/") {
+        route.path = "*";
       }
       routes.push(route);
     }
@@ -98,69 +121,90 @@ const recursiveReadDir = ({
     parents.pop();
   }
 };
-/* eslint-enable  no-param-reassign */
-
 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 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}'`];
-
-    // eslint-disable-next-line no-param-reassign, no-cond-assign
+    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} />;`);
+      codes.push(
+        `const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`
+      );
       lastComponent = currentComponent;
     }
     const file = path.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    fs.outputFileSync(file, `${imports.join('\n')}\n${codes.join('\n')}\nexport default ${lastComponent}`);
+    fs.outputFileSync(
+      file,
+      `${imports.join("\n")}
+${codes.join(
+        "\n"
+      )}
+export default ${lastComponent}`
+    );
     return {
       component: lastComponent,
       _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
     };
   };
-  const normalized = flat(nested).map(route => route.parent ? _objectSpread(_objectSpread(_objectSpread({}, route), generate(route)), {}, {
-    parent: undefined
-  }) : _objectSpread(_objectSpread({}, route), {}, {
-    parent: undefined
-  }));
+  const normalized = flat(nested).map(
+    (route) => route.parent ? __spreadProps(__spreadValues(__spreadValues({}, route), generate(route)), { parent: void 0 }) : __spreadProps(__spreadValues({}, route), { parent: void 0 })
+  );
   return normalized;
 };
-export const getClientRoutes = ({
+const getClientRoutes = ({
   entrypoint,
   srcDirectory,
   srcAlias,
   internalDirectory,
   internalDirAlias
 }) => {
-  const {
-    entry,
-    entryName
-  } = entrypoint;
-  if (!fs.existsSync(entry)) {
-    throw new Error(`generate file system routes error, ${entry} directory not found.`);
+  const { entryName, pageRoutesEntry } = entrypoint;
+  if (!pageRoutesEntry) {
+    return [];
+  }
+  if (!fs.existsSync(pageRoutesEntry)) {
+    throw new Error(
+      `generate file system routes error, ${pageRoutesEntry} directory not found.`
+    );
   }
-  if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
-    throw new Error(`generate file system routes error, ${entry} should be directory.`);
+  if (!(fs.existsSync(pageRoutesEntry) && fs.statSync(pageRoutesEntry).isDirectory())) {
+    throw new Error(
+      `generate file system routes error, ${pageRoutesEntry} should be directory.`
+    );
   }
   let routes = [];
   recursiveReadDir({
-    dir: entry,
+    dir: pageRoutesEntry,
     routes,
-    basePath: '/',
+    basePath: "/",
     srcDirectory,
     srcAlias
   });
-  const internalComponentsDir = path.resolve(internalDirectory, `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
+  const internalComponentsDir = path.resolve(
+    internalDirectory,
+    `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`
+  );
   fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
+  routes = normalizeNestedRoutes(
+    routes,
+    internalComponentsDir,
+    internalDirectory,
+    internalDirAlias
+  );
   parents.length = 0;
-
-  // FIXME: support more situations
   routes.sort((a, b) => {
     const delta = getRouteWeight(a.path) - getRouteWeight(b.path);
     if (delta === 0) {
@@ -170,4 +214,7 @@ export const getClientRoutes = ({
   });
   debug(`fileSystem routes: %o`, routes);
   return routes;
-};
+};
+export {
+  getClientRoutes
+};

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

@@ -1,28 +1,49 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import path from 'path';
-import { fs } from '@modern-js/utils';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+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));
+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 {
+  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";
 const compName = (srcDirectory, filePath) => {
-  const legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
+  const legalCompName = makeLegalIdentifier(
+    path.relative(srcDirectory, filePath)
+  );
   return `Comp_${legalCompName}`;
 };
-const layoutNameAbbr = filePath => {
-  const prefix = 'L_';
-  const dirName = path.dirname(filePath).split('/').pop() || '';
+const layoutNameAbbr = (filePath) => {
+  const prefix = "L_";
+  const dirName = path.dirname(filePath).split("/").pop() || "";
   return `${prefix}${makeLegalIdentifier(dirName)}`;
 };
 const parents = [];
-
-/* eslint-disable no-param-reassign */
 const recursiveReadDirLegacy = ({
   dir,
   routes,
-  basePath: _basePath = '/',
+  basePath = "/",
   srcDirectory,
   srcAlias
 }) => {
@@ -31,13 +52,13 @@ const recursiveReadDirLegacy = ({
   let parent = parents[parents.length - 1];
   const layout = findLayout(dir);
   if (layout) {
-    if (_basePath === '/') {
+    if (basePath === "/") {
       throw new Error(`should use _app instead of _layout in ${dir}`);
     } else {
       const alias = replaceWithAlias(srcDirectory, layout, srcAlias);
       const componentName = compName(srcDirectory, layout);
       const route = {
-        path: `${_basePath.substring(0, _basePath.length - 1)}`,
+        path: `${basePath.substring(0, basePath.length - 1)}`,
         exact: false,
         routes: [],
         _component: alias,
@@ -60,13 +81,15 @@ const recursiveReadDirLegacy = ({
       const dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
       if (dynamicRouteMatched) {
         if (hasDynamicRoute) {
-          throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
+          throw new Error(
+            `Can't set two dynamic route in one directory: ${dir}`
+          );
         } else {
           hasDynamicRoute = true;
         }
       }
       const route = {
-        path: `${_basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
+        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
         _component: alias,
         component: componentName,
         exact: true,
@@ -86,10 +109,10 @@ const recursiveReadDirLegacy = ({
         continue;
       }
       if (filename === FILE_SYSTEM_ROUTES_INDEX) {
-        route.path = _basePath === '/' ? _basePath : `${_basePath.substring(0, _basePath.length - 1)}`;
+        route.path = basePath === "/" ? basePath : `${basePath.substring(0, basePath.length - 1)}`;
       }
-      if (filename === '404' && _basePath === '/') {
-        route.path = '*';
+      if (filename === "404" && basePath === "/") {
+        route.path = "*";
         route.exact = false;
       }
       routes.push(route);
@@ -99,69 +122,85 @@ const recursiveReadDirLegacy = ({
     parents.pop();
   }
 };
-/* eslint-enable  no-param-reassign */
-
 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 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}'`];
-
-    // eslint-disable-next-line no-param-reassign, no-cond-assign
+    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} />;`);
+      codes.push(
+        `const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`
+      );
       lastComponent = currentComponent;
     }
     const file = path.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    fs.outputFileSync(file, `${imports.join('\n')}\n${codes.join('\n')}\nexport default ${lastComponent}`);
+    fs.outputFileSync(
+      file,
+      `${imports.join("\n")}
+${codes.join(
+        "\n"
+      )}
+export default ${lastComponent}`
+    );
     return {
       component: lastComponent,
       _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
     };
   };
-  const normalized = flat(nested).map(route => route.parent ? _objectSpread(_objectSpread(_objectSpread({}, route), generate(route)), {}, {
-    parent: undefined
-  }) : _objectSpread(_objectSpread({}, route), {}, {
-    parent: undefined
-  }));
+  const normalized = flat(nested).map(
+    (route) => route.parent ? __spreadProps(__spreadValues(__spreadValues({}, route), generate(route)), { parent: void 0 }) : __spreadProps(__spreadValues({}, route), { parent: void 0 })
+  );
   return normalized;
 };
-export const getClientRoutes = ({
+const getClientRoutes = ({
   entrypoint,
   srcDirectory,
   srcAlias,
   internalDirectory,
   internalDirAlias
 }) => {
-  const {
-    entry,
-    entryName
-  } = entrypoint;
+  const { entry, entryName } = entrypoint;
   if (!fs.existsSync(entry)) {
-    throw new Error(`generate file system routes error, ${entry} directory not found.`);
+    throw new Error(
+      `generate file system routes error, ${entry} directory not found.`
+    );
   }
   if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
-    throw new Error(`generate file system routes error, ${entry} should be directory.`);
+    throw new Error(
+      `generate file system routes error, ${entry} should be directory.`
+    );
   }
   let routes = [];
   recursiveReadDirLegacy({
     dir: entry,
     routes,
-    basePath: '/',
+    basePath: "/",
     srcDirectory,
     srcAlias
   });
-  const internalComponentsDir = path.resolve(internalDirectory, `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
+  const internalComponentsDir = path.resolve(
+    internalDirectory,
+    `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`
+  );
   fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
+  routes = normalizeNestedRoutes(
+    routes,
+    internalComponentsDir,
+    internalDirectory,
+    internalDirAlias
+  );
   parents.length = 0;
-
-  // FIXME: support more situations
   routes.sort((a, b) => {
     const delta = getRouteWeight(a.path) - getRouteWeight(b.path);
     if (delta === 0) {
@@ -171,4 +210,7 @@ export const getClientRoutes = ({
   });
   debug(`fileSystem routes: %o`, routes);
   return routes;
-};
+};
+export {
+  getClientRoutes
+};

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

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

package/dist/js/modern/analyze/getClientRoutes/utils.js

@@ -1,12 +1,19 @@
-import path from 'path';
-import { createDebugger, findExists, fs } from '@modern-js/utils';
-import { JS_EXTENSIONS, FILE_SYSTEM_ROUTES_LAYOUT, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX } from "../constants";
-const debug = createDebugger('get-client-routes');
-export { debug };
-export const findLayout = dir => findExists(JS_EXTENSIONS.map(ext => path.resolve(dir, `${FILE_SYSTEM_ROUTES_LAYOUT}${ext}`)));
-export const getRouteWeight = route => route === '*' ? 999 : route.split(':').length - 1;
-export const shouldSkip = file => {
-  // should not skip directory.
+import path from "path";
+import { createDebugger, findExists, fs } from "@modern-js/utils";
+import {
+  JS_EXTENSIONS,
+  FILE_SYSTEM_ROUTES_LAYOUT,
+  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
+  FILE_SYSTEM_ROUTES_IGNORED_REGEX
+} from "../constants";
+const debug = createDebugger("get-client-routes");
+const findLayout = (dir) => findExists(
+  JS_EXTENSIONS.map(
+    (ext) => path.resolve(dir, `${FILE_SYSTEM_ROUTES_LAYOUT}${ext}`)
+  )
+);
+const getRouteWeight = (route) => route === "*" ? 999 : route.split(":").length - 1;
+const shouldSkip = (file) => {
   if (fs.statSync(file).isDirectory()) {
     return false;
   }
@@ -15,4 +22,10 @@ export const shouldSkip = file => {
     return true;
   }
   return false;
-};
+};
+export {
+  debug,
+  findLayout,
+  getRouteWeight,
+  shouldSkip
+};