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

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

@@ -1,30 +1,24 @@
 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 */
 
+/* eslint-disable no-param-reassign */
 const recursiveReadDir = ({
   dir,
   routes,
@@ -36,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}`);
@@ -58,16 +51,13 @@ const recursiveReadDir = ({
       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}`);
@@ -75,7 +65,6 @@ const recursiveReadDir = ({
           hasDynamicRoute = true;
         }
       }
-
       const route = {
         path: `${_basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
         _component: alias,
@@ -83,7 +72,6 @@ const recursiveReadDir = ({
         parent,
         type: 'page'
       };
-
       if (fs.statSync(filePath).isDirectory()) {
         recursiveReadDir({
           dir: filePath,
@@ -94,38 +82,32 @@ 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 = '*';
       }
-
       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
+    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);
@@ -134,7 +116,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 {
@@ -142,7 +123,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), {}, {
@@ -150,7 +130,6 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
   }));
   return normalized;
 };
-
 export const getClientRoutes = ({
   entrypoint,
   srcDirectory,
@@ -162,15 +141,12 @@ 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({
     dir: entry,
@@ -182,15 +158,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/getRoutesLegacy.js

@@ -1,30 +1,24 @@
 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 */
 
+/* eslint-disable no-param-reassign */
 const recursiveReadDirLegacy = ({
   dir,
   routes,
@@ -36,7 +30,6 @@ const recursiveReadDirLegacy = ({
   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}`);
@@ -58,16 +51,13 @@ const recursiveReadDirLegacy = ({
       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}`);
@@ -75,7 +65,6 @@ const recursiveReadDirLegacy = ({
           hasDynamicRoute = true;
         }
       }
-
       const route = {
         path: `${_basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
         _component: alias,
@@ -83,7 +72,6 @@ const recursiveReadDirLegacy = ({
         exact: true,
         parent
       };
-
       if (fs.statSync(filePath).isDirectory()) {
         recursiveReadDirLegacy({
           dir: filePath,
@@ -94,39 +82,33 @@ const recursiveReadDirLegacy = ({
         });
         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);
@@ -135,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 {
@@ -143,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), {}, {
@@ -151,7 +131,6 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
   }));
   return normalized;
 };
-
 export const getClientRoutes = ({
   entrypoint,
   srcDirectory,
@@ -163,15 +142,12 @@ 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 = [];
   recursiveReadDirLegacy({
     dir: entry,
@@ -183,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/utils.js

@@ -10,12 +10,9 @@ export const shouldSkip = file => {
   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

@@ -3,44 +3,35 @@ 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, 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 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
     };
   }
-
   const isHasApp = hasApp(dir);
-
   if (isHasApp) {
     return {
       entryName,
       entry: path.join(dir, APP_FILE_NAME),
       isAutoMount: true,
+      absoluteEntryDir: path.resolve(dir),
       customBootstrap
     };
   }
-
   const isHasNestedRoutes = hasNestedRoutes(dir);
   const isHasPages = hasPages(dir);
-
   if (isHasNestedRoutes || isHasPages) {
     const entrypoint = {
       entryName,
@@ -49,27 +40,24 @@ const scanDir = dirs => dirs.map(dir => {
         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
     };
-
     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
@@ -79,8 +67,7 @@ export const getFileSystemEntry = (appContext, config) => {
       entriesDir
     }
   } = config;
-  const src = ensureAbsolutePath(appDirectory, entriesDir);
-
+  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
@@ -39,16 +36,14 @@ export const getHtmlTemplate = async (entrypoints, api, {
       configDir
     }
   } = config;
-  const htmlDir = path.resolve(appDirectory, configDir, HTML_PARTIALS_FOLDER);
+  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;
 };

package/dist/js/modern/analyze/getServerRoutes.js

@@ -1,27 +1,21 @@
 const _excluded = ["path"],
-      _excluded2 = ["path"];
-
+  _excluded2 = ["path"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 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 'fs';
 import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash } from '@modern-js/utils';
 import { walkDirectory } from "./utils";
+
 /**
  * Add base url for each server route.
  * @param baseUrl - Base url from server.baseUrl
  * @param routes - Server routes.
  * @returns Server routes with baseUrl prefixed.
  */
-
 const applyBaseUrl = (baseUrl, routes) => {
   if (baseUrl) {
     if (Array.isArray(baseUrl)) {
@@ -35,37 +29,34 @@ const applyBaseUrl = (baseUrl, routes) => {
       });
     }
   }
-
   return routes;
 };
+
 /**
  *
  * @param original - Original entrypoint route info.
  * @param routeOptions - Custom entrypoint route config from server.routes.
  * @returns
  */
-
-
 const applyRouteOptions = (original, routeOptions) => {
   const {
     route,
     disableSpa
   } = routeOptions;
-  original.isSPA = !disableSpa; // set entryPath as dir
+  original.isSPA = !disableSpa;
 
+  // set entryPath as dir
   !original.isSPA && (original.entryPath = path.dirname(original.entryPath));
   let routes;
-
   if (route) {
     if (Array.isArray(route)) {
       routes = route.map(url => {
         if (isPlainObject(url)) {
           const _ref = url,
-                {
-            path: urlPath
-          } = _ref,
-                other = _objectWithoutProperties(_ref, _excluded);
-
+            {
+              path: urlPath
+            } = _ref,
+            other = _objectWithoutProperties(_ref, _excluded);
           return _objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
             urlPath
           });
@@ -77,11 +68,10 @@ const applyRouteOptions = (original, routeOptions) => {
       });
     } else if (isPlainObject(route)) {
       const _ref2 = route,
-            {
-        path: urlPath
-      } = _ref2,
-            other = _objectWithoutProperties(_ref2, _excluded2);
-
+        {
+          path: urlPath
+        } = _ref2,
+        other = _objectWithoutProperties(_ref2, _excluded2);
       routes = [_objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
         urlPath
       })];
@@ -93,23 +83,24 @@ const applyRouteOptions = (original, routeOptions) => {
   } else {
     routes = [original];
   }
-
   return routes;
 };
+
 /**
  * Collect routes from entrypoints.
  * @param entrypoints - Bundle entrypoints.
  * @param config - Normalized user config.
  * @returns entrypoint Routes
  */
-
-
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const {
+    html: {
+      disableHtmlFolder
+    },
     output: {
-      htmlPath,
-      disableHtmlFolder,
-      enableModernMode
+      distPath: {
+        html: htmlPath
+      } = {}
     },
     server: {
       baseUrl,
@@ -136,30 +127,28 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
       isSPA: true,
       isSSR,
       responseHeaders: resHeaders,
-      enableModernMode: Boolean(enableModernMode),
+      // FIXME: remove the config.enableModernMode
+      // enableModernMode: Boolean(enableModernMode),
       bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : undefined
     };
-
     if (routes !== null && routes !== void 0 && routes.hasOwnProperty(entryName)) {
       const routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {
         route: routes[entryName]
       };
       route = applyRouteOptions(route, routeOptions);
     }
-
     return Array.isArray(route) ? [...previous, ...route] : [...previous, route];
   }, []);
   htmlRoutes = applyBaseUrl(baseUrl, htmlRoutes);
   return htmlRoutes;
 };
+
 /**
  * Collect static public file routes from config/public folder.
  * @param appContext - App context info.
  * @param config - normalized user config.
  * @returns Static public file routes.
  */
-
-
 const collectStaticRoutes = (appContext, config) => {
   const {
     appDirectory
@@ -172,21 +161,19 @@ const collectStaticRoutes = (appContext, config) => {
       publicRoutes = {}
     }
   } = config;
-  const publicFolder = path.resolve(appDirectory, configDir, 'public');
+  const publicFolder = path.resolve(appDirectory, configDir || '', 'public');
   return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(filePath => {
     const urlPath = `${urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
     return {
       urlPath: publicRoutes[removeLeadingSlash(urlPath)] || urlPath,
       isSPA: true,
       isSSR: false,
-      entryPath: toPosix(path.relative(path.resolve(appDirectory, configDir), filePath))
+      entryPath: toPosix(path.relative(path.resolve(appDirectory, configDir || ''), filePath))
     };
   }) : [];
 };
-
 export const getServerRoutes = (entrypoints, {
   appContext,
   config
 }) => [...collectHtmlRoutes(entrypoints, appContext, config), ...collectStaticRoutes(appContext, config)];
-
 const toPosix = pathStr => pathStr.split(path.sep).join(path.posix.sep);