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

package/dist/js/treeshaking/analyze/getBundleEntry.js

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

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

@@ -1,184 +1,233 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import path from 'path';
-import { fs } from '@modern-js/utils';
+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;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+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";
-var compName = function compName(srcDirectory, filePath) {
-  var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
-  return "Comp_".concat(legalCompName);
+var compName = function(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 layoutNameAbbr = function(filePath) {
+    var prefix = "L_";
+    var dirName = path.dirname(filePath).split("/").pop() || "";
+    return "".concat(prefix).concat(makeLegalIdentifier(dirName));
 };
 var parents = [];
-
-/* eslint-disable no-param-reassign */
-var recursiveReadDir = function recursiveReadDir(_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;
-  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));
-    } else {
-      var alias = replaceWithAlias(srcDirectory, layout, srcAlias);
-      var componentName = compName(srcDirectory, layout);
-      var route = {
-        path: "".concat(basePath.substring(0, basePath.length - 1)),
-        children: [],
-        _component: alias,
-        component: componentName,
-        parent: parent,
-        type: 'page'
-      };
-      parent = route;
-      resetParent = true;
-      routes.push(route);
-      parents.push(route);
-      routes = route.children;
-    }
-  }
-  var _iterator = _createForOfIteratorHelper(fs.readdirSync(dir)),
-    _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));
-          } else {
-            hasDynamicRoute = true;
-          }
-        }
-        var _route = {
-          path: "".concat(basePath).concat(dynamicRouteMatched ? ":".concat(dynamicRouteMatched[1]).concat(dynamicRouteMatched[2]) : filename),
-          _component: _alias,
-          component: _componentName,
-          parent: parent,
-          type: 'page'
-        };
-        if (fs.statSync(filePath).isDirectory()) {
-          recursiveReadDir({
-            dir: filePath,
-            routes: routes,
-            basePath: "".concat(_route.path, "/"),
-            srcDirectory: srcDirectory,
-            srcAlias: srcAlias
-          });
-          continue;
-        }
-        if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
-          continue;
+var recursiveReadDir = function(param) {
+    var dir = param.dir, routes = param.routes, _basePath = param.basePath, basePath = _basePath === void 0 ? "/" : _basePath, srcDirectory = param.srcDirectory, srcAlias = param.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));
+        } else {
+            var alias = replaceWithAlias(srcDirectory, layout, srcAlias);
+            var componentName = compName(srcDirectory, layout);
+            var route = {
+                path: "".concat(basePath.substring(0, basePath.length - 1)),
+                children: [],
+                _component: alias,
+                component: componentName,
+                parent: parent,
+                type: "page"
+            };
+            parent = route;
+            resetParent = true;
+            routes.push(route);
+            parents.push(route);
+            routes = route.children;
         }
-        if (filename === FILE_SYSTEM_ROUTES_INDEX) {
-          _route.path = basePath === '/' ? basePath : "".concat(basePath.substring(0, basePath.length - 1));
+    }
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = fs.readdirSync(dir)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var relative = _step.value;
+            var filePath = path.join(dir, relative);
+            if (!shouldSkip(filePath)) {
+                var filename = path.basename(filePath, path.extname(filePath));
+                var alias1 = replaceWithAlias(srcDirectory, filePath, srcAlias);
+                var componentName1 = 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));
+                    } else {
+                        hasDynamicRoute = true;
+                    }
+                }
+                var route1 = {
+                    path: "".concat(basePath).concat(dynamicRouteMatched ? ":".concat(dynamicRouteMatched[1]).concat(dynamicRouteMatched[2]) : filename),
+                    _component: alias1,
+                    component: componentName1,
+                    parent: parent,
+                    type: "page"
+                };
+                if (fs.statSync(filePath).isDirectory()) {
+                    recursiveReadDir({
+                        dir: filePath,
+                        routes: routes,
+                        basePath: "".concat(route1.path, "/"),
+                        srcDirectory: srcDirectory,
+                        srcAlias: srcAlias
+                    });
+                    continue;
+                }
+                if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
+                    continue;
+                }
+                if (filename === FILE_SYSTEM_ROUTES_INDEX) {
+                    route1.path = basePath === "/" ? basePath : "".concat(basePath.substring(0, basePath.length - 1));
+                }
+                if (filename === "404" && basePath === "/") {
+                    route1.path = "*";
+                }
+                routes.push(route1);
+            }
         }
-        if (filename === '404' && basePath === '/') {
-          _route.path = '*';
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
         }
-        routes.push(_route);
-      }
     }
-  } catch (err) {
-    _iterator.e(err);
-  } 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.children) ? flat(route.children) : [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
-    while (route = route.parent) {
-      var layoutComponent = route.component;
-      var layoutComponentAbbr = layoutNameAbbr(route._component);
-      imports.push("import ".concat(layoutComponent, " from '").concat(route._component, "';"));
-      var currentComponent = "".concat(layoutComponentAbbr, "_").concat(lastComponent);
-      codes.push("const ".concat(currentComponent, " = props => <").concat(layoutComponent, " Component={").concat(lastComponent, "} {...props} />;"));
-      lastComponent = currentComponent;
+    if (resetParent) {
+        parents.pop();
     }
-    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 {
-      component: lastComponent,
-      _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
+};
+var normalizeNestedRoutes = function(nested, internalComponentsDir, internalDirectory, internalDirAlias) {
+    var flat = function(routes) {
+        return routes.reduce(function(memo, route) {
+            return memo.concat(Array.isArray(route.children) ? flat(route.children) : [
+                route
+            ]);
+        }, []);
+    };
+    var generate = function(route) {
+        var codes = [];
+        var lastComponent = route.component;
+        var imports = [
+            "import React from 'react';",
+            "import ".concat(lastComponent, " from '").concat(route._component, "'")
+        ];
+        while(route = route.parent){
+            var layoutComponent = route.component;
+            var layoutComponentAbbr = layoutNameAbbr(route._component);
+            imports.push("import ".concat(layoutComponent, " from '").concat(route._component, "';"));
+            var currentComponent = "".concat(layoutComponentAbbr, "_").concat(lastComponent);
+            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 {
+            component: lastComponent,
+            _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
+        };
     };
-  };
-  var normalized = flat(nested).map(function (route) {
-    return route.parent ? _objectSpread(_objectSpread(_objectSpread({}, route), generate(route)), {}, {
-      parent: undefined
-    }) : _objectSpread(_objectSpread({}, route), {}, {
-      parent: undefined
+    var normalized = flat(nested).map(function(route) {
+        return route.parent ? _objectSpreadProps(_objectSpread({}, route, generate(route)), {
+            parent: void 0
+        }) : _objectSpreadProps(_objectSpread({}, route), {
+            parent: void 0
+        });
     });
-  });
-  return normalized;
+    return normalized;
 };
-export var getClientRoutes = function getClientRoutes(_ref2) {
-  var entrypoint = _ref2.entrypoint,
-    srcDirectory = _ref2.srcDirectory,
-    srcAlias = _ref2.srcAlias,
-    internalDirectory = _ref2.internalDirectory,
-    internalDirAlias = _ref2.internalDirAlias;
-  var entry = entrypoint.entry,
-    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 = [];
-  recursiveReadDir({
-    dir: entry,
-    routes: routes,
-    basePath: '/',
-    srcDirectory: srcDirectory,
-    srcAlias: srcAlias
-  });
-  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
-  routes.sort(function (a, b) {
-    var delta = getRouteWeight(a.path) - getRouteWeight(b.path);
-    if (delta === 0) {
-      return a.path.length - b.path.length;
+var getClientRoutes = function(param) {
+    var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias, internalDirectory = param.internalDirectory, internalDirAlias = param.internalDirAlias;
+    var entryName = entrypoint.entryName, pageRoutesEntry = entrypoint.pageRoutesEntry;
+    if (!pageRoutesEntry) {
+        return [];
     }
-    return delta;
-  });
-  debug("fileSystem routes: %o", routes);
-  return routes;
-};
+    if (!fs.existsSync(pageRoutesEntry)) {
+        throw new Error("generate file system routes error, ".concat(pageRoutesEntry, " directory not found."));
+    }
+    if (!(fs.existsSync(pageRoutesEntry) && fs.statSync(pageRoutesEntry).isDirectory())) {
+        throw new Error("generate file system routes error, ".concat(pageRoutesEntry, " should be directory."));
+    }
+    var routes = [];
+    recursiveReadDir({
+        dir: pageRoutesEntry,
+        routes: routes,
+        basePath: "/",
+        srcDirectory: srcDirectory,
+        srcAlias: srcAlias
+    });
+    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;
+    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);
+    return routes;
+};
+export { getClientRoutes };