@modern-js/app-tools 1.21.5 → 2.0.0-beta.1

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

@@ -2,30 +2,24 @@ 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 => {
   if (!path.extname(file)) {
     return findExists(JS_EXTENSIONS.map(ext => `${file}${ext}`)) || file;
   }
-
   return file;
 };
-
 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.
-
-
+  }
+  // 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.`);
   }
-
   return false;
 });
-
 export const getBundleEntry = (appContext, config) => {
   const {
     appDirectory,
@@ -38,8 +32,9 @@ export const getBundleEntry = (appContext, config) => {
       entriesDir
     }
   } = config;
-  const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config); // merge entrypoints from user config with directory convention.
+  const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
 
+  // merge entrypoints from user config with directory convention.
   if (entries) {
     Object.keys(entries).forEach(name => {
       const value = entries[name];
@@ -54,22 +49,20 @@ export const getBundleEntry = (appContext, config) => {
         isAutoMount: !value.disableMount,
         fileSystemRoutes: value.enableFileSystemRoutes ? {} : undefined
       };
-
       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
-    }) => 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);
   }
-
   return defaults;
 };

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

@@ -0,0 +1,173 @@
+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}

@@ -1,49 +1,25 @@
 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, 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));
   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 = ({
+/* eslint-disable no-param-reassign */
+const recursiveReadDirLegacy = ({
   dir,
   routes,
   basePath: _basePath = '/',
@@ -54,7 +30,6 @@ const recursiveReadDir = ({
   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}`);
@@ -76,16 +51,13 @@ const recursiveReadDir = ({
       routes = route.routes;
     }
   }
-
   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}`);
@@ -93,7 +65,6 @@ const recursiveReadDir = ({
           hasDynamicRoute = true;
         }
       }
-
       const route = {
         path: `${_basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
         _component: alias,
@@ -101,9 +72,8 @@ const recursiveReadDir = ({
         exact: true,
         parent
       };
-
       if (fs.statSync(filePath).isDirectory()) {
-        recursiveReadDir({
+        recursiveReadDirLegacy({
           dir: filePath,
           routes,
           basePath: `${route.path}/`,
@@ -112,39 +82,33 @@ const recursiveReadDir = ({
         });
         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 = '*';
         route.exact = false;
       }
-
       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.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}'`];
 
+    // eslint-disable-next-line no-param-reassign, no-cond-assign
     while (route = route.parent) {
       const layoutComponent = route.component;
       const layoutComponentAbbr = layoutNameAbbr(route._component);
@@ -153,7 +117,6 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
       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 {
@@ -161,7 +124,6 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
       _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
     };
   };
-
   const normalized = flat(nested).map(route => route.parent ? _objectSpread(_objectSpread(_objectSpread({}, route), generate(route)), {}, {
     parent: undefined
   }) : _objectSpread(_objectSpread({}, route), {}, {
@@ -169,9 +131,6 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
   }));
   return normalized;
 };
-
-const getRouteWeight = route => route === '*' ? 999 : route.split(':').length - 1;
-
 export const getClientRoutes = ({
   entrypoint,
   srcDirectory,
@@ -183,17 +142,14 @@ export const getClientRoutes = ({
     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({
+  recursiveReadDirLegacy({
     dir: entry,
     routes,
     basePath: '/',
@@ -203,15 +159,14 @@ export const getClientRoutes = ({
   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
+  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);

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,18 @@
+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;
+};

package/dist/js/modern/analyze/getFileSystemEntry.js

@@ -2,55 +2,62 @@ import fs from 'fs';
 import path from 'path';
 import { findExists, ensureAbsolutePath } from '@modern-js/utils';
 import { isDefaultExportFunction } from "./isDefaultExportFunction";
-import { JS_EXTENSIONS, INDEX_FILE_NAME, APP_FILE_NAME, PAGES_DIR_NAME, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT } from "./constants";
-
+import { JS_EXTENSIONS, INDEX_FILE_NAME, APP_FILE_NAME, PAGES_DIR_NAME, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, NESTED_ROUTES_DIR } from "./constants";
 const hasIndex = dir => findExists(JS_EXTENSIONS.map(ext => path.resolve(dir, `${INDEX_FILE_NAME}${ext}`)));
-
 const hasApp = dir => findExists(JS_EXTENSIONS.map(ext => path.resolve(dir, `${APP_FILE_NAME}${ext}`)));
-
 const hasPages = dir => fs.existsSync(path.join(dir, PAGES_DIR_NAME));
-
-const isBundleEntry = dir => hasApp(dir) || hasPages(dir) || hasIndex(dir);
-
+const hasNestedRoutes = dir => fs.existsSync(path.join(dir, NESTED_ROUTES_DIR));
+const isBundleEntry = dir => hasApp(dir) || hasPages(dir) || hasIndex(dir) || hasNestedRoutes(dir);
 const scanDir = dirs => dirs.map(dir => {
   const indexFile = hasIndex(dir);
   const customBootstrap = isDefaultExportFunction(indexFile) ? indexFile : false;
   const entryName = path.basename(dir);
-
   if (indexFile && !customBootstrap) {
     return {
       entryName,
       entry: indexFile,
+      absoluteEntryDir: path.resolve(dir),
       isAutoMount: false
     };
   }
-
-  if (hasApp(dir)) {
+  const isHasApp = hasApp(dir);
+  if (isHasApp) {
     return {
       entryName,
       entry: path.join(dir, APP_FILE_NAME),
       isAutoMount: true,
+      absoluteEntryDir: path.resolve(dir),
       customBootstrap
     };
-  } else if (hasPages(dir)) {
-    return {
+  }
+  const isHasNestedRoutes = hasNestedRoutes(dir);
+  const isHasPages = hasPages(dir);
+  if (isHasNestedRoutes || isHasPages) {
+    const entrypoint = {
       entryName,
-      entry: path.join(dir, PAGES_DIR_NAME),
+      entry: '',
       fileSystemRoutes: {
         globalApp: findExists(JS_EXTENSIONS.map(ext => path.resolve(dir, `./${PAGES_DIR_NAME}/${FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT}${ext}`)))
       },
       isAutoMount: true,
+      absoluteEntryDir: path.resolve(dir),
       customBootstrap
     };
-  } else {
-    return {
-      entryName,
-      entry: indexFile,
-      isAutoMount: false
-    };
+    if (isHasPages) {
+      entrypoint.entry = path.join(dir, PAGES_DIR_NAME);
+    }
+    if (isHasNestedRoutes) {
+      entrypoint.nestedRoutesEntry = path.join(dir, NESTED_ROUTES_DIR);
+    }
+    return entrypoint;
   }
+  return {
+    entryName,
+    entry: indexFile,
+    absoluteEntryDir: path.resolve(dir),
+    isAutoMount: false
+  };
 });
-
 export const getFileSystemEntry = (appContext, config) => {
   const {
     appDirectory
@@ -61,7 +68,6 @@ export const getFileSystemEntry = (appContext, config) => {
     }
   } = config;
   const src = ensureAbsolutePath(appDirectory, entriesDir);
-
   if (fs.existsSync(src)) {
     if (fs.statSync(src).isDirectory()) {
       return scanDir(isBundleEntry(src) ? [src] : fs.readdirSync(src).map(file => path.join(src, file)).filter(file => fs.statSync(file).isDirectory() && isBundleEntry(file)));

package/dist/js/modern/analyze/getHtmlTemplate.js

@@ -3,7 +3,6 @@ import { fs, findExists, MAIN_ENTRY_NAME } from '@modern-js/utils';
 import { HTML_PARTIALS_EXTENSIONS, HTML_PARTIALS_FOLDER } from "./constants";
 import * as templates from "./templates";
 var PartialPosition;
-
 (function (PartialPosition) {
   PartialPosition["TOP"] = "top";
   PartialPosition["HEAD"] = "head";
@@ -11,7 +10,6 @@ var PartialPosition;
   PartialPosition["BOTTOM"] = "bottom";
   PartialPosition["INDEX"] = "index";
 })(PartialPosition || (PartialPosition = {}));
-
 const findPartials = (dir, entryName, position) => {
   if (fs.existsSync(dir)) {
     const base = findExists(HTML_PARTIALS_EXTENSIONS.map(ext => path.resolve(dir, `${position}${ext}`)));
@@ -21,11 +19,10 @@ const findPartials = (dir, entryName, position) => {
       content: fs.readFileSync(file, 'utf8')
     } : null;
   }
-
   return null;
-}; // generate html template for
-
+};
 
+// generate html template for
 export const getHtmlTemplate = async (entrypoints, api, {
   appContext,
   config
@@ -41,14 +38,12 @@ export const getHtmlTemplate = async (entrypoints, api, {
   } = config;
   const htmlDir = path.resolve(appDirectory, configDir, HTML_PARTIALS_FOLDER);
   const htmlTemplates = {};
-
   for (const entrypoint of entrypoints) {
     const {
       entryName
     } = entrypoint;
     const name = entrypoints.length === 1 && entryName === MAIN_ENTRY_NAME ? '' : entryName;
     const customIndexTemplate = findPartials(htmlDir, name, PartialPosition.INDEX);
-
     if (customIndexTemplate) {
       htmlTemplates[entryName] = customIndexTemplate.file;
     } else {
@@ -71,12 +66,10 @@ export const getHtmlTemplate = async (entrypoints, api, {
       fs.outputFileSync(templatePath, templates.html(partials), 'utf8');
       htmlTemplates[entryName] = templatePath;
       const bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
-
       if (bottomTemplate) {
         htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
       }
     }
   }
-
   return htmlTemplates;
 };