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

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

@@ -6,33 +6,29 @@ import { makeLegalIdentifier } from "../makeLegalIdentifier";
 import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../constants";
 import { replaceWithAlias } from "../utils";
 import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
-
 var compName = function compName(srcDirectory, filePath) {
   var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
   return "Comp_".concat(legalCompName);
 };
-
 var layoutNameAbbr = function layoutNameAbbr(filePath) {
   var prefix = 'L_';
   var dirName = path.dirname(filePath).split('/').pop() || '';
   return "".concat(prefix).concat(makeLegalIdentifier(dirName));
 };
-
 var parents = [];
-/* eslint-disable no-param-reassign */
 
+/* eslint-disable no-param-reassign */
 var recursiveReadDirLegacy = function recursiveReadDirLegacy(_ref) {
   var dir = _ref.dir,
-      routes = _ref.routes,
-      _ref$basePath = _ref.basePath,
-      basePath = _ref$basePath === void 0 ? '/' : _ref$basePath,
-      srcDirectory = _ref.srcDirectory,
-      srcAlias = _ref.srcAlias;
+    routes = _ref.routes,
+    _ref$basePath = _ref.basePath,
+    basePath = _ref$basePath === void 0 ? '/' : _ref$basePath,
+    srcDirectory = _ref.srcDirectory,
+    srcAlias = _ref.srcAlias;
   var hasDynamicRoute = false;
   var resetParent = false;
   var parent = parents[parents.length - 1];
   var layout = findLayout(dir);
-
   if (layout) {
     if (basePath === '/') {
       throw new Error("should use _app instead of _layout in ".concat(dir));
@@ -54,24 +50,17 @@ var recursiveReadDirLegacy = function recursiveReadDirLegacy(_ref) {
       routes = route.routes;
     }
   }
-
   var _iterator = _createForOfIteratorHelper(fs.readdirSync(dir)),
-      _step;
-
+    _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var relative = _step.value;
       var filePath = path.join(dir, relative);
-
       if (!shouldSkip(filePath)) {
         var filename = path.basename(filePath, path.extname(filePath));
-
         var _alias = replaceWithAlias(srcDirectory, filePath, srcAlias);
-
         var _componentName = compName(srcDirectory, filePath);
-
         var dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
-
         if (dynamicRouteMatched) {
           if (hasDynamicRoute) {
             throw new Error("Can't set two dynamic route in one directory: ".concat(dir));
@@ -79,7 +68,6 @@ var recursiveReadDirLegacy = function recursiveReadDirLegacy(_ref) {
             hasDynamicRoute = true;
           }
         }
-
         var _route = {
           path: "".concat(basePath).concat(dynamicRouteMatched ? ":".concat(dynamicRouteMatched[1]).concat(dynamicRouteMatched[2]) : filename),
           _component: _alias,
@@ -87,7 +75,6 @@ var recursiveReadDirLegacy = function recursiveReadDirLegacy(_ref) {
           exact: true,
           parent: parent
         };
-
         if (fs.statSync(filePath).isDirectory()) {
           recursiveReadDirLegacy({
             dir: filePath,
@@ -98,20 +85,16 @@ var recursiveReadDirLegacy = function recursiveReadDirLegacy(_ref) {
           });
           continue;
         }
-
         if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
           continue;
         }
-
         if (filename === FILE_SYSTEM_ROUTES_INDEX) {
           _route.path = basePath === '/' ? basePath : "".concat(basePath.substring(0, basePath.length - 1));
         }
-
         if (filename === '404' && basePath === '/') {
           _route.path = '*';
           _route.exact = false;
         }
-
         routes.push(_route);
       }
     }
@@ -120,26 +103,24 @@ var recursiveReadDirLegacy = function recursiveReadDirLegacy(_ref) {
   } finally {
     _iterator.f();
   }
-
   if (resetParent) {
     parents.pop();
   }
 };
 /* eslint-enable  no-param-reassign */
 
-
 var normalizeNestedRoutes = function normalizeNestedRoutes(nested, internalComponentsDir, internalDirectory, internalDirAlias) {
   var flat = function flat(routes) {
     return routes.reduce(function (memo, route) {
       return memo.concat(Array.isArray(route.routes) ? flat(route.routes) : [route]);
     }, []);
   };
-
   var generate = function generate(route) {
     var codes = [];
     var lastComponent = route.component;
-    var imports = ["import React from 'react';", "import ".concat(lastComponent, " from '").concat(route._component, "'")]; // eslint-disable-next-line no-param-reassign, no-cond-assign
+    var imports = ["import React from 'react';", "import ".concat(lastComponent, " from '").concat(route._component, "'")];
 
+    // eslint-disable-next-line no-param-reassign, no-cond-assign
     while (route = route.parent) {
       var layoutComponent = route.component;
       var layoutComponentAbbr = layoutNameAbbr(route._component);
@@ -148,7 +129,6 @@ var normalizeNestedRoutes = function normalizeNestedRoutes(nested, internalCompo
       codes.push("const ".concat(currentComponent, " = props => <").concat(layoutComponent, " Component={").concat(lastComponent, "} {...props} />;"));
       lastComponent = currentComponent;
     }
-
     var file = path.resolve(internalComponentsDir, "".concat(lastComponent, ".jsx"));
     fs.outputFileSync(file, "".concat(imports.join('\n'), "\n").concat(codes.join('\n'), "\nexport default ").concat(lastComponent));
     return {
@@ -156,7 +136,6 @@ var normalizeNestedRoutes = function normalizeNestedRoutes(nested, internalCompo
       _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
     };
   };
-
   var normalized = flat(nested).map(function (route) {
     return route.parent ? _objectSpread(_objectSpread(_objectSpread({}, route), generate(route)), {}, {
       parent: undefined
@@ -166,24 +145,20 @@ var normalizeNestedRoutes = function normalizeNestedRoutes(nested, internalCompo
   });
   return normalized;
 };
-
 export var getClientRoutes = function getClientRoutes(_ref2) {
   var entrypoint = _ref2.entrypoint,
-      srcDirectory = _ref2.srcDirectory,
-      srcAlias = _ref2.srcAlias,
-      internalDirectory = _ref2.internalDirectory,
-      internalDirAlias = _ref2.internalDirAlias;
+    srcDirectory = _ref2.srcDirectory,
+    srcAlias = _ref2.srcAlias,
+    internalDirectory = _ref2.internalDirectory,
+    internalDirAlias = _ref2.internalDirAlias;
   var entry = entrypoint.entry,
-      entryName = entrypoint.entryName;
-
+    entryName = entrypoint.entryName;
   if (!fs.existsSync(entry)) {
     throw new Error("generate file system routes error, ".concat(entry, " directory not found."));
   }
-
   if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
     throw new Error("generate file system routes error, ".concat(entry, " should be directory."));
   }
-
   var routes = [];
   recursiveReadDirLegacy({
     dir: entry,
@@ -195,15 +170,14 @@ export var getClientRoutes = function getClientRoutes(_ref2) {
   var internalComponentsDir = path.resolve(internalDirectory, "".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_COMPONENTS_DIR));
   fs.emptyDirSync(internalComponentsDir);
   routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
-  parents.length = 0; // FIXME: support more situations
+  parents.length = 0;
 
+  // FIXME: support more situations
   routes.sort(function (a, b) {
     var delta = getRouteWeight(a.path) - getRouteWeight(b.path);
-
     if (delta === 0) {
       return a.path.length - b.path.length;
     }
-
     return delta;
   });
   debug("fileSystem routes: %o", routes);

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

@@ -16,12 +16,9 @@ export var shouldSkip = function shouldSkip(file) {
   if (fs.statSync(file).isDirectory()) {
     return false;
   }
-
   var ext = path.extname(file);
-
   if (FILE_SYSTEM_ROUTES_IGNORED_REGEX.test(file) || !JS_EXTENSIONS.includes(ext) || FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT === path.basename(file, ext)) {
     return true;
   }
-
   return false;
 };

package/dist/js/treeshaking/analyze/getFileSystemEntry.js

@@ -3,59 +3,50 @@ 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";
-
 var hasIndex = function hasIndex(dir) {
   return findExists(JS_EXTENSIONS.map(function (ext) {
     return path.resolve(dir, "".concat(INDEX_FILE_NAME).concat(ext));
   }));
 };
-
 var hasApp = function hasApp(dir) {
   return findExists(JS_EXTENSIONS.map(function (ext) {
     return path.resolve(dir, "".concat(APP_FILE_NAME).concat(ext));
   }));
 };
-
 var hasPages = function hasPages(dir) {
   return fs.existsSync(path.join(dir, PAGES_DIR_NAME));
 };
-
 var hasNestedRoutes = function hasNestedRoutes(dir) {
   return fs.existsSync(path.join(dir, NESTED_ROUTES_DIR));
 };
-
 var isBundleEntry = function isBundleEntry(dir) {
   return hasApp(dir) || hasPages(dir) || hasIndex(dir) || hasNestedRoutes(dir);
 };
-
 var scanDir = function scanDir(dirs) {
   return dirs.map(function (dir) {
     var indexFile = hasIndex(dir);
     var customBootstrap = isDefaultExportFunction(indexFile) ? indexFile : false;
     var entryName = path.basename(dir);
-
     if (indexFile && !customBootstrap) {
       return {
         entryName: entryName,
         entry: indexFile,
+        absoluteEntryDir: path.resolve(dir),
         isAutoMount: false
       };
     }
-
     var isHasApp = hasApp(dir);
-
     if (isHasApp) {
       return {
         entryName: entryName,
         entry: path.join(dir, APP_FILE_NAME),
         isAutoMount: true,
+        absoluteEntryDir: path.resolve(dir),
         customBootstrap: customBootstrap
       };
     }
-
     var isHasNestedRoutes = hasNestedRoutes(dir);
     var isHasPages = hasPages(dir);
-
     if (isHasNestedRoutes || isHasPages) {
       var entrypoint = {
         entryName: entryName,
@@ -66,33 +57,29 @@ var scanDir = function scanDir(dirs) {
           }))
         },
         isAutoMount: true,
+        absoluteEntryDir: path.resolve(dir),
         customBootstrap: 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: entryName,
       entry: indexFile,
+      absoluteEntryDir: path.resolve(dir),
       isAutoMount: false
     };
   });
 };
-
 export var getFileSystemEntry = function getFileSystemEntry(appContext, config) {
   var appDirectory = appContext.appDirectory;
   var entriesDir = config.source.entriesDir;
   var src = ensureAbsolutePath(appDirectory, entriesDir);
-
   if (fs.existsSync(src)) {
     if (fs.statSync(src).isDirectory()) {
       return scanDir(isBundleEntry(src) ? [src] : fs.readdirSync(src).map(function (file) {

package/dist/js/treeshaking/analyze/getHtmlTemplate.js

@@ -6,7 +6,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";
@@ -14,7 +13,6 @@ var PartialPosition;
   PartialPosition["BOTTOM"] = "bottom";
   PartialPosition["INDEX"] = "index";
 })(PartialPosition || (PartialPosition = {}));
-
 var findPartials = function findPartials(dir, entryName, position) {
   if (fs.existsSync(dir)) {
     var base = findExists(HTML_PARTIALS_EXTENSIONS.map(function (ext) {
@@ -28,15 +26,13 @@ var findPartials = function findPartials(dir, entryName, position) {
       content: fs.readFileSync(file, 'utf8')
     } : null;
   }
-
   return null;
-}; // generate html template for
-
+};
 
+// generate html template for
 export var getHtmlTemplate = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(entrypoints, api, _ref) {
     var appContext, config, appDirectory, internalDirectory, configDir, htmlDir, htmlTemplates, _iterator, _step, _loop;
-
     return _regeneratorRuntime().wrap(function _callee$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -50,7 +46,6 @@ export var getHtmlTemplate = /*#__PURE__*/function () {
             _context2.prev = 6;
             _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
               var entrypoint, entryName, name, customIndexTemplate, hookRunners, _yield$hookRunners$ht, partials, templatePath, bottomTemplate;
-
               return _regeneratorRuntime().wrap(function _loop$(_context) {
                 while (1) {
                   switch (_context.prev = _context.next) {
@@ -59,16 +54,13 @@ export var getHtmlTemplate = /*#__PURE__*/function () {
                       entryName = entrypoint.entryName;
                       name = entrypoints.length === 1 && entryName === MAIN_ENTRY_NAME ? '' : entryName;
                       customIndexTemplate = findPartials(htmlDir, name, PartialPosition.INDEX);
-
                       if (!customIndexTemplate) {
                         _context.next = 8;
                         break;
                       }
-
                       htmlTemplates[entryName] = customIndexTemplate.file;
                       _context.next = 18;
                       break;
-
                     case 8:
                       hookRunners = api.useHookRunners();
                       _context.next = 11;
@@ -84,7 +76,6 @@ export var getHtmlTemplate = /*#__PURE__*/function () {
                           body: []
                         })
                       });
-
                     case 11:
                       _yield$hookRunners$ht = _context.sent;
                       partials = _yield$hookRunners$ht.partials;
@@ -92,11 +83,9 @@ export var getHtmlTemplate = /*#__PURE__*/function () {
                       fs.outputFileSync(templatePath, templates.html(partials), 'utf8');
                       htmlTemplates[entryName] = templatePath;
                       bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
-
                       if (bottomTemplate) {
                         htmlTemplates["__".concat(entryName, "-bottom__")] = bottomTemplate.content;
                       }
-
                     case 18:
                     case "end":
                       return _context.stop();
@@ -104,41 +93,29 @@ export var getHtmlTemplate = /*#__PURE__*/function () {
                 }
               }, _loop);
             });
-
             _iterator.s();
-
           case 9:
             if ((_step = _iterator.n()).done) {
               _context2.next = 13;
               break;
             }
-
             return _context2.delegateYield(_loop(), "t0", 11);
-
           case 11:
             _context2.next = 9;
             break;
-
           case 13:
             _context2.next = 18;
             break;
-
           case 15:
             _context2.prev = 15;
             _context2.t1 = _context2["catch"](6);
-
             _iterator.e(_context2.t1);
-
           case 18:
             _context2.prev = 18;
-
             _iterator.f();
-
             return _context2.finish(18);
-
           case 21:
             return _context2.abrupt("return", htmlTemplates);
-
           case 22:
           case "end":
             return _context2.stop();
@@ -146,7 +123,6 @@ export var getHtmlTemplate = /*#__PURE__*/function () {
       }
     }, _callee, null, [[6, 15, 18, 21]]);
   }));
-
   return function getHtmlTemplate(_x, _x2, _x3) {
     return _ref2.apply(this, arguments);
   };

package/dist/js/treeshaking/analyze/getServerRoutes.js

@@ -2,18 +2,18 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 var _excluded = ["path"],
-    _excluded2 = ["path"];
+  _excluded2 = ["path"];
 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.
  */
-
 var applyBaseUrl = function applyBaseUrl(baseUrl, routes) {
   if (baseUrl) {
     if (Array.isArray(baseUrl)) {
@@ -29,33 +29,30 @@ var applyBaseUrl = function applyBaseUrl(baseUrl, routes) {
       });
     }
   }
-
   return routes;
 };
+
 /**
  *
  * @param original - Original entrypoint route info.
  * @param routeOptions - Custom entrypoint route config from server.routes.
  * @returns
  */
-
-
 var applyRouteOptions = function applyRouteOptions(original, routeOptions) {
   var route = routeOptions.route,
-      disableSpa = routeOptions.disableSpa;
-  original.isSPA = !disableSpa; // set entryPath as dir
+    disableSpa = routeOptions.disableSpa;
+  original.isSPA = !disableSpa;
 
+  // set entryPath as dir
   !original.isSPA && (original.entryPath = path.dirname(original.entryPath));
   var routes;
-
   if (route) {
     if (Array.isArray(route)) {
       routes = route.map(function (url) {
         if (isPlainObject(url)) {
           var _ref = url,
-              urlPath = _ref.path,
-              other = _objectWithoutProperties(_ref, _excluded);
-
+            urlPath = _ref.path,
+            other = _objectWithoutProperties(_ref, _excluded);
           return _objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
             urlPath: urlPath
           });
@@ -67,9 +64,8 @@ var applyRouteOptions = function applyRouteOptions(original, routeOptions) {
       });
     } else if (isPlainObject(route)) {
       var _ref2 = route,
-          urlPath = _ref2.path,
-          other = _objectWithoutProperties(_ref2, _excluded2);
-
+        urlPath = _ref2.path,
+        other = _objectWithoutProperties(_ref2, _excluded2);
       routes = [_objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
         urlPath: urlPath
       })];
@@ -81,36 +77,32 @@ var applyRouteOptions = function applyRouteOptions(original, routeOptions) {
   } else {
     routes = [original];
   }
-
   return routes;
 };
+
 /**
  * Collect routes from entrypoints.
  * @param entrypoints - Bundle entrypoints.
  * @param config - Normalized user config.
  * @returns entrypoint Routes
  */
-
-
 var collectHtmlRoutes = function collectHtmlRoutes(entrypoints, appContext, config) {
   var _config$output = config.output,
-      htmlPath = _config$output.htmlPath,
-      disableHtmlFolder = _config$output.disableHtmlFolder,
-      enableModernMode = _config$output.enableModernMode,
-      _config$server = config.server,
-      baseUrl = _config$server.baseUrl,
-      routes = _config$server.routes,
-      ssr = _config$server.ssr,
-      ssrByEntries = _config$server.ssrByEntries;
+    htmlPath = _config$output.htmlPath,
+    disableHtmlFolder = _config$output.disableHtmlFolder,
+    enableModernMode = _config$output.enableModernMode,
+    _config$server = config.server,
+    baseUrl = _config$server.baseUrl,
+    routes = _config$server.routes,
+    ssr = _config$server.ssr,
+    ssrByEntries = _config$server.ssrByEntries;
   var packageName = appContext.packageName;
   var htmlRoutes = entrypoints.reduce(function (previous, _ref3) {
     var entryName = _ref3.entryName;
     var entryOptions = getEntryOptions(entryName, ssr, ssrByEntries, packageName);
     var isSSR = Boolean(entryOptions);
-
     var _ref4 = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {},
-        resHeaders = _ref4.resHeaders;
-
+      resHeaders = _ref4.resHeaders;
     var route = {
       urlPath: "/".concat(entryName === MAIN_ENTRY_NAME ? '' : entryName),
       entryName: entryName,
@@ -121,32 +113,29 @@ var collectHtmlRoutes = function collectHtmlRoutes(entrypoints, appContext, conf
       enableModernMode: Boolean(enableModernMode),
       bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : undefined
     };
-
     if (routes !== null && routes !== void 0 && routes.hasOwnProperty(entryName)) {
       var routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {
         route: routes[entryName]
       };
       route = applyRouteOptions(route, routeOptions);
     }
-
     return Array.isArray(route) ? [].concat(_toConsumableArray(previous), _toConsumableArray(route)) : [].concat(_toConsumableArray(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.
  */
-
-
 var collectStaticRoutes = function collectStaticRoutes(appContext, config) {
   var appDirectory = appContext.appDirectory;
   var configDir = config.source.configDir,
-      _config$server$public = config.server.publicRoutes,
-      publicRoutes = _config$server$public === void 0 ? {} : _config$server$public;
+    _config$server$public = config.server.publicRoutes,
+    publicRoutes = _config$server$public === void 0 ? {} : _config$server$public;
   var publicFolder = path.resolve(appDirectory, configDir, 'public');
   return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(function (filePath) {
     var urlPath = "".concat(urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length)));
@@ -158,13 +147,11 @@ var collectStaticRoutes = function collectStaticRoutes(appContext, config) {
     };
   }) : [];
 };
-
 export var getServerRoutes = function getServerRoutes(entrypoints, _ref5) {
   var appContext = _ref5.appContext,
-      config = _ref5.config;
+    config = _ref5.config;
   return [].concat(_toConsumableArray(collectHtmlRoutes(entrypoints, appContext, config)), _toConsumableArray(collectStaticRoutes(appContext, config)));
 };
-
 var toPosix = function toPosix(pathStr) {
   return pathStr.split(path.sep).join(path.posix.sep);
 };