@modern-js/app-tools 1.21.3 → 2.0.0-beta.0

package/CHANGELOG.md

@@ -1,21 +1,143 @@
 # @modern-js/app-tools
 
-## 1.21.3
-
-### Patch Changes
-
-- @modern-js/upgrade@1.21.3
-- @modern-js/new-action@1.21.3
-- @modern-js/core@1.21.3
-- @modern-js/plugin-i18n@1.21.3
-- @modern-js/plugin-jarvis@1.21.3
-- @modern-js/webpack@1.21.3
-- @modern-js/prod-server@1.21.3
-- @modern-js/server@1.21.3
-- @modern-js/node-bundle-require@1.21.3
-- @modern-js/plugin@1.21.3
-- @modern-js/types@1.21.3
-- @modern-js/utils@1.21.3
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Minor Changes
+
+- edd1cfb1a: feat: modernjs Access builder compiler
+  feat: modernjs 接入 builder 构建
+- 543be95: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- c9f912c: feat(app-tools): improve build logs of dev and build command
+
+  feat(app-tools): 优化 dev 和 build 过程中的日志展示
+
+- 103973c: fix: builder tools.webpackChain config args not match the Modernjs tools.webpackChain
+  fix: builder tools.webpackChain 配置传参无法匹配 Modernjs tools.webpackChain
+- 0b2d1ef: fix: repeat register `babel-plugin-lodash`
+  fix: 重复注册 `babel-plugin-lodash`
+- 82cef85: fix: specify builder compiler framework
+  fix: 指明 builder 构建时框架
+- 85edee8: feat(app-tools): support tools.htmlPlugin config
+
+  feat(app-tools): 支持 tools.htmlPlugin 配置项
+
+- dc8eeb9: fix: clear distDirectory in prepare hook & inject data loader plugin to server
+  fix: 在 prepare hook 中清理 dist 目录，并且向 server 中注入 data loader plugin
+- cc971eabf: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- 5b9049f: feat: inject async js chunk when streaming ssr
+  feat: streaming ssr 时, 注入 async 类型的 js chunk
+- 6bda14ed7: feat: refactor router with react-router@6.4
+
+  feat: 使用 react-router@6.4 重构路由模块
+
+- d36c6ee: fix(app-tools): failed to run inspect command
+
+  fix(app-tools): 修复运行 inspect 命令失败的问题
+
+- b8bbe036c: feat: change type logic
+  feat: 修改类型相关的逻辑
+- af4422d: feat(builder): complete utils of tools.webpack
+
+  feat(builder): 补全 tools.webpack 提供的 utils 方法
+
+- c258e34: fix: add builder hooks `beforeBuild` params
+  fix: 新增 builder hooks `beforeBuild` 的参数
+- 8b8e1bb57: feat: support nested routes
+  feat: 支持嵌套路由
+- c677bef: fix(app-tools): compat legacy resolve behavior
+
+  fix(app-tools): 兼容旧版本 node_modules 解析逻辑
+
+- 3f7cde5: fix: builder plugin setup can't get config
+  fix: builder 插件在 setup 阶段无法拿到 config
+- 99213e4: fix: process does't exit when exec command
+  fix: 修复执行命令时进程未退出的问题
+- b16fd96: fix: `modern-js/app-tools` pass error config to builder.
+  fix: `modern-js/app-tools` 传递错误的 config 给 builder.
+- 7eefedd: fix: add html-webpack-plugin `__internal__` options, for bottom template
+  fix: 为了 bottom template, 增加 `html-webpack-plugin` `__internal__` 配置项，
+- 14b712d: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [c9f912c]
+- Updated dependencies [95be7cc49]
+- Updated dependencies [e439457a5]
+- Updated dependencies [4d1545f]
+- Updated dependencies [2bc090c08]
+- Updated dependencies [f96a725]
+- Updated dependencies [828f42f9c]
+- Updated dependencies [c745686]
+- Updated dependencies [c9e800d39]
+- Updated dependencies [0ff846f]
+- Updated dependencies [57077b2]
+- Updated dependencies [287f29899]
+- Updated dependencies [15bf09d9c]
+- Updated dependencies [423188db7]
+- Updated dependencies [fd2d652]
+- Updated dependencies [0c2d8dae3]
+- Updated dependencies [85edee8]
+- Updated dependencies [a2509bf]
+- Updated dependencies [399887579]
+- Updated dependencies [399887579]
+- Updated dependencies [ba86b8b]
+- Updated dependencies [61f21d1e7]
+- Updated dependencies [2ae58176f]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [5d67c26]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [18360a38d]
+- Updated dependencies [6bda14ed7]
+- Updated dependencies [0b314e694]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [af4422d]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [102d32e4b]
+- Updated dependencies [c258e34]
+- Updated dependencies [7248342e4]
+- Updated dependencies [568eab1e4]
+- Updated dependencies [8b8e1bb57]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [ae71096d4]
+- Updated dependencies [73cd29dd9]
+- Updated dependencies [a23010138]
+- Updated dependencies [75d1b2657]
+- Updated dependencies [8a6d45f]
+- Updated dependencies [90e2879]
+- Updated dependencies [f727e5c6c]
+- Updated dependencies [5e3cecd52]
+- Updated dependencies [abf3421]
+- Updated dependencies [da2d1fc3c]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/builder-webpack-provider@2.0.0-beta.0
+  - @modern-js/builder-shared@2.0.0-beta.0
+  - @modern-js/core@2.0.0-beta.0
+  - @modern-js/prod-server@2.0.0-beta.0
+  - @modern-js/builder-plugin-esbuild@2.0.0-beta.0
+  - @modern-js/server@2.0.0-beta.0
+  - @modern-js/node-bundle-require@2.0.0-beta.0
+  - @modern-js/builder-plugin-node-polyfill@2.0.0-beta.0
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/types@2.0.0-beta.0
+  - @modern-js/plugin@2.0.0-beta.0
+  - @modern-js/builder@2.0.0-beta.0
+  - @modern-js/plugin-data-loader@2.0.0-beta.0
+  - @modern-js/plugin-i18n@2.0.0-beta.0
+  - @modern-js/plugin-jarvis@2.0.0-beta.0
+  - @modern-js/new-action@2.0.0-beta.0
+  - @modern-js/upgrade@2.0.0-beta.0
 
 ## 1.21.2
 

package/dist/js/modern/analyze/constants.js

@@ -2,6 +2,7 @@ export const JS_EXTENSIONS = ['.js', '.ts', '.jsx', '.tsx'];
 export const INDEX_FILE_NAME = 'index';
 export const APP_FILE_NAME = 'App';
 export const PAGES_DIR_NAME = 'pages';
+export const NESTED_ROUTES_DIR = 'routes';
 export const FILE_SYSTEM_ROUTES_FILE_NAME = 'routes.js';
 export const ENTRY_POINT_FILE_NAME = 'index.js';
 export const ENTRY_BOOTSTRAP_FILE_NAME = 'bootstrap.js';

package/dist/js/modern/analyze/generateCode.js

@@ -1,9 +1,13 @@
 import path from 'path';
-import { fs } from '@modern-js/utils';
+import { fs, logger } from '@modern-js/utils';
+import { useResolvedConfigContext } from '@modern-js/core';
+import esbuild from 'esbuild';
+import { getCommand } from "../utils/commands";
 import * as templates from "./templates";
-import { getClientRoutes } from "./getClientRoutes";
+import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
 import { getDefaultImports } from "./utils";
+import { walk } from "./nestedRoutes";
 
 const createImportSpecifier = specifiers => {
   let defaults = '';
@@ -65,21 +69,68 @@ export const createImportStatements = statements => {
     initialize
   }) => `import ${createImportSpecifier(specifiers)} from '${value}';\n${initialize || ''}`).join('\n');
 };
+
+const buildLoader = async (entry, outfile) => {
+  const loader = {
+    '.js': 'jsx',
+    '.ts': 'tsx'
+  };
+  const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
+  const command = getCommand();
+  await esbuild.build({
+    format: 'cjs',
+    platform: 'node',
+    target: 'esnext',
+    loader,
+    watch: command === 'dev' && {},
+    bundle: true,
+    logLevel: 'error',
+    entryPoints: [entry],
+    outfile,
+    plugins: [{
+      name: 'make-all-packages-external',
+
+      setup(build) {
+        // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
+        build.onResolve({
+          filter: EXTERNAL_REGEXP
+        }, args => {
+          let external = true; // FIXME: windows external entrypoint
+
+          if (args.kind === 'entry-point') {
+            external = false;
+          }
+
+          return {
+            path: args.path,
+            external
+          };
+        });
+      }
+
+    }]
+  });
+};
+
 export const generateCode = async (appContext, config, entrypoints, api) => {
+  var _config$runtime, _config$runtime$route;
+
   const {
     internalDirectory,
+    distDirectory,
     srcDirectory,
     internalDirAlias,
     internalSrcAlias
   } = appContext;
   const hookRunners = api.useHookRunners();
+  const islegacy = Boolean(config === null || config === void 0 ? void 0 : (_config$runtime = config.runtime) === null || _config$runtime === void 0 ? void 0 : (_config$runtime$route = _config$runtime.router) === null || _config$runtime$route === void 0 ? void 0 : _config$runtime$route.legacy);
   const {
-    output: {
-      mountId
-    }
-  } = config;
+    mountId
+  } = config.output;
+  const getRoutes = islegacy ? getClientRoutesLegacy : getClientRoutes;
+  await Promise.all(entrypoints.map(generateEntryCode));
 
-  for (const entrypoint of entrypoints) {
+  async function generateEntryCode(entrypoint) {
     const {
       entryName,
       isAutoMount,
@@ -90,27 +141,78 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
     if (isAutoMount) {
       // generate routes file for file system routes entrypoint.
       if (fileSystemRoutes) {
-        const initialRoutes = getClientRoutes({
-          entrypoint,
-          srcDirectory,
-          srcAlias: internalSrcAlias,
-          internalDirectory,
-          internalDirAlias
-        });
+        let initialRoutes = [];
+        let nestedRoute = null;
+
+        if (entrypoint.entry) {
+          initialRoutes = getRoutes({
+            entrypoint,
+            srcDirectory,
+            srcAlias: internalSrcAlias,
+            internalDirectory,
+            internalDirAlias
+          });
+        }
+
+        if (entrypoint.nestedRoutesEntry) {
+          if (!islegacy) {
+            nestedRoute = await walk(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
+              name: internalSrcAlias,
+              basename: srcDirectory
+            });
+
+            if (nestedRoute) {
+              initialRoutes.unshift(nestedRoute);
+            }
+          } else {
+            logger.error('Nested routes is not supported in legacy mode.'); // eslint-disable-next-line no-process-exit
+
+            process.exit(1);
+          }
+        }
+
         const {
           routes
         } = await hookRunners.modifyFileSystemRoutes({
           entrypoint,
           routes: initialRoutes
         });
+        const config = useResolvedConfigContext();
+        const ssr = config === null || config === void 0 ? void 0 : config.server.ssr;
+        let mode;
+
+        if (ssr) {
+          mode = typeof ssr === 'object' ? ssr.mode || 'string' : 'string';
+        } else {
+          mode = false;
+        }
+
         const {
           code
         } = await hookRunners.beforeGenerateRoutes({
           entrypoint,
           code: templates.fileSystemRoutes({
-            routes
+            routes,
+            ssrMode: mode,
+            nestedRoutesEntry: entrypoint.nestedRoutesEntry
           })
-        });
+        }); // extract nested router loaders
+
+        if (entrypoint.nestedRoutesEntry) {
+          const routesServerFile = path.join(internalDirectory, entryName, 'routes.server.js');
+          const outputRoutesServerFile = path.join(distDirectory, 'loader-routes', entryName, 'index.js');
+          const code = templates.routesForServer({
+            routes: routes,
+            alias: {
+              name: internalSrcAlias,
+              basename: srcDirectory
+            }
+          });
+          await fs.ensureFile(routesServerFile);
+          await fs.writeFile(routesServerFile, code);
+          await buildLoader(routesServerFile, outputRoutesServerFile);
+        }
+
         fs.outputFileSync(path.resolve(internalDirectory, `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`), code, 'utf8');
       } // call modifyEntryImports hook
 

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

@@ -66,8 +66,9 @@ export const getBundleEntry = (appContext, config) => {
     const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir);
     const found = defaults.find(({
       entryName,
-      entry
-    }) => entryName === packageName || path.dirname(entry) === entriesDirAbs);
+      entry,
+      nestedRoutesEntry: _nestedRoutesEntry = ''
+    }) => entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(_nestedRoutesEntry) === entriesDirAbs);
     found && (found.entryName = MAIN_ENTRY_NAME);
   }
 

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

@@ -0,0 +1,198 @@
+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';
+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";
+
+const compName = (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() || '';
+  return `${prefix}${makeLegalIdentifier(dirName)}`;
+};
+
+const parents = [];
+/* eslint-disable no-param-reassign */
+
+const recursiveReadDir = ({
+  dir,
+  routes,
+  basePath: _basePath = '/',
+  srcDirectory,
+  srcAlias
+}) => {
+  let hasDynamicRoute = false;
+  let resetParent = false;
+  let parent = parents[parents.length - 1];
+  const layout = findLayout(dir);
+
+  if (layout) {
+    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)}`,
+        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 fs.readdirSync(dir)) {
+    const filePath = path.join(dir, relative);
+
+    if (!shouldSkip(filePath)) {
+      const filename = path.basename(filePath, path.extname(filePath));
+      const alias = replaceWithAlias(srcDirectory, filePath, srcAlias);
+      const componentName = compName(srcDirectory, filePath);
+      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}`);
+        } else {
+          hasDynamicRoute = true;
+        }
+      }
+
+      const route = {
+        path: `${_basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
+        _component: alias,
+        component: componentName,
+        parent,
+        type: 'page'
+      };
+
+      if (fs.statSync(filePath).isDirectory()) {
+        recursiveReadDir({
+          dir: filePath,
+          routes,
+          basePath: `${route.path}/`,
+          srcDirectory,
+          srcAlias
+        });
+        continue;
+      }
+
+      if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
+        continue;
+      }
+
+      if (filename === 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();
+  }
+};
+/* 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 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
+
+    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 = path.resolve(internalComponentsDir, `${lastComponent}.jsx`);
+    fs.outputFileSync(file, `${imports.join('\n')}\n${codes.join('\n')}\nexport 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
+  }));
+  return normalized;
+};
+
+export 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.`);
+  }
+
+  if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
+    throw new Error(`generate file system routes error, ${entry} should be directory.`);
+  }
+
+  let routes = [];
+  recursiveReadDir({
+    dir: entry,
+    routes,
+    basePath: '/',
+    srcDirectory,
+    srcAlias
+  });
+  const internalComponentsDir = path.resolve(internalDirectory, `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
+  fs.emptyDirSync(internalComponentsDir);
+  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) {
+      return a.path.length - b.path.length;
+    }
+
+    return delta;
+  });
+  debug(`fileSystem routes: %o`, routes);
+  return routes;
+};

package/dist/js/modern/analyze/{getClientRoutes.js → getClientRoutes/getRoutesLegacy.js}

@@ -5,29 +5,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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, createDebugger, findExists, normalizeToPosixPath } from '@modern-js/utils';
-import { makeLegalIdentifier } from "./makeLegalIdentifier";
-import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT, JS_EXTENSIONS } 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 shouldSkip = file => {
-  // should not skip directory.
-  if (fs.statSync(file).isDirectory()) {
-    return false;
-  }
-
-  const 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;
-};
-
-const replaceWithAlias = (base, filePath, alias) => normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
+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";
 
 const compName = (srcDirectory, filePath) => {
   const legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
@@ -43,7 +25,7 @@ const layoutNameAbbr = filePath => {
 const parents = [];
 /* eslint-disable no-param-reassign */
 
-const recursiveReadDir = ({
+const recursiveReadDirLegacy = ({
   dir,
   routes,
   basePath: _basePath = '/',
@@ -103,7 +85,7 @@ const recursiveReadDir = ({
       };
 
       if (fs.statSync(filePath).isDirectory()) {
-        recursiveReadDir({
+        recursiveReadDirLegacy({
           dir: filePath,
           routes,
           basePath: `${route.path}/`,
@@ -170,8 +152,6 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
   return normalized;
 };
 
-const getRouteWeight = route => route === '*' ? 999 : route.split(':').length - 1;
-
 export const getClientRoutes = ({
   entrypoint,
   srcDirectory,
@@ -193,7 +173,7 @@ export const getClientRoutes = ({
   }
 
   let routes = [];
-  recursiveReadDir({
+  recursiveReadDirLegacy({
     dir: entry,
     routes,
     basePath: '/',

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

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

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

@@ -0,0 +1,21 @@
+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.
+  if (fs.statSync(file).isDirectory()) {
+    return false;
+  }
+
+  const 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;
+};