@modern-js/app-tools 2.15.0 → 2.17.0

package/dist/esm/analyze/getBundleEntry.js

@@ -3,62 +3,61 @@ import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME, isRouterV5 } from
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
 var ensureExtensions = function(file) {
-    if (!path.extname(file)) {
-        return findExists(JS_EXTENSIONS.map(function(ext) {
-            return "".concat(file).concat(ext);
-        })) || file;
-    }
-    return 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 getBundleEntry = function(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);
-    if (entries) {
-        Object.keys(entries).forEach(function(name) {
-            var value = entries[name];
-            var entrypoint = typeof value === "string" ? {
-                entryName: name,
-                entry: ensureAbsolutePath(appDirectory, value),
-                absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value)),
-                isAutoMount: true,
-                fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
-            } : {
-                entryName: name,
-                entry: ensureAbsolutePath(appDirectory, value.entry),
-                absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value.entry)),
-                isAutoMount: !value.disableMount,
-                customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
-                fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
-            };
-            if (entrypoint.fileSystemRoutes && isRouterV5(config)) {
-                entrypoint.nestedRoutesEntry = entrypoint.entry;
-            }
-            if (!ifAlreadyExists(defaults, entrypoint)) {
-                defaults.push(entrypoint);
-            }
-        });
+  return entrypoints.some(function(entrypoint) {
+    if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
+      checked.entryName = entrypoint.entryName;
+      return true;
     }
-    if (!disableDefaultEntries) {
-        var entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
-        var found = defaults.find(function(param) {
-            var entryName = param.entryName, entry = param.entry, _param_nestedRoutesEntry = param.nestedRoutesEntry, nestedRoutesEntry = _param_nestedRoutesEntry === void 0 ? "" : _param_nestedRoutesEntry;
-            return entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs;
-        });
-        found && (found.entryName = MAIN_ENTRY_NAME);
+    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 defaults;
+    return false;
+  });
+};
+export var getBundleEntry = function(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);
+  if (entries) {
+    Object.keys(entries).forEach(function(name) {
+      var value = entries[name];
+      var entrypoint = typeof value === "string" ? {
+        entryName: name,
+        entry: ensureAbsolutePath(appDirectory, value),
+        absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value)),
+        isAutoMount: true,
+        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
+      } : {
+        entryName: name,
+        entry: ensureAbsolutePath(appDirectory, value.entry),
+        absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value.entry)),
+        isAutoMount: !value.disableMount,
+        customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
+        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
+      };
+      if (entrypoint.fileSystemRoutes && isRouterV5(config)) {
+        entrypoint.nestedRoutesEntry = entrypoint.entry;
+      }
+      if (!ifAlreadyExists(defaults, entrypoint)) {
+        defaults.push(entrypoint);
+      }
+    });
+  }
+  if (!disableDefaultEntries) {
+    var entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
+    var found = defaults.find(function(param) {
+      var entryName = param.entryName, entry = param.entry, _param_nestedRoutesEntry = param.nestedRoutesEntry, nestedRoutesEntry = _param_nestedRoutesEntry === void 0 ? "" : _param_nestedRoutesEntry;
+      return entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs;
+    });
+    found && (found.entryName = MAIN_ENTRY_NAME);
+  }
+  return defaults;
 };
-export { getBundleEntry };

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

@@ -1,54 +1,54 @@
-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 _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      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]);
-        });
+function _object_spread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {};
+    var ownKeys2 = Object.keys(source);
+    if (typeof Object.getOwnPropertySymbols === "function") {
+      ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+      }));
     }
-    return target;
+    ownKeys2.forEach(function(key) {
+      _define_property(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);
+  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;
+      });
     }
-    return keys;
+    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;
+function _object_spread_props(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";
@@ -57,177 +57,176 @@ import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, F
 import { replaceWithAlias } from "../utils";
 import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
 var compName = function(srcDirectory, filePath) {
-    var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
-    return "Comp_".concat(legalCompName);
+  var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
+  return "Comp_".concat(legalCompName);
 };
 var layoutNameAbbr = function(filePath) {
-    var prefix = "L_";
-    var dirName = path.dirname(filePath).split("/").pop() || "";
-    return "".concat(prefix).concat(makeLegalIdentifier(dirName));
+  var prefix = "L_";
+  var dirName = path.dirname(filePath).split("/").pop() || "";
+  return "".concat(prefix).concat(makeLegalIdentifier(dirName));
 };
 var parents = [];
 var recursiveReadDir = function(param) {
-    var dir = param.dir, routes = param.routes, _param_basePath = param.basePath, basePath = _param_basePath === void 0 ? "/" : _param_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;
-        }
+  var dir = param.dir, routes = param.routes, _param_basePath = param.basePath, basePath = _param_basePath === void 0 ? "/" : _param_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,
+        type: "page"
+      };
+      parent = route;
+      resetParent = true;
+      routes.push(route);
+      parents.push(route);
+      routes = route.children;
     }
-    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].replace(/\$$/, "?")).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);
-            }
+  }
+  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  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].replace(/\$$/, "?")).concat(dynamicRouteMatched[2]) : filename),
+          _component: alias1,
+          component: componentName1,
+          parent,
+          type: "page"
+        };
+        if (fs.statSync(filePath).isDirectory()) {
+          recursiveReadDir({
+            dir: filePath,
+            routes,
+            basePath: "".concat(route1.path, "/"),
+            srcDirectory,
+            srcAlias
+          });
+          continue;
+        }
+        if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
+          continue;
         }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
+        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 (resetParent) {
-        parents.pop();
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
     }
+  }
+  if (resetParent) {
+    parents.pop();
+  }
 };
 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 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 ? _objectSpreadProps(_objectSpread({}, route, generate(route)), {
-            parent: void 0
-        }) : _objectSpreadProps(_objectSpread({}, route), {
-            parent: void 0
-        });
+  };
+  var normalized = flat(nested).map(function(route) {
+    return route.parent ? _object_spread_props(_object_spread({}, route, generate(route)), {
+      parent: void 0
+    }) : _object_spread_props(_object_spread({}, route), {
+      parent: void 0
     });
-    return normalized;
+  });
+  return normalized;
 };
-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 [];
-    }
-    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."));
+export 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 [];
+  }
+  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,
+    basePath: "/",
+    srcDirectory,
+    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;
     }
-    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;
+    return delta;
+  });
+  debug("fileSystem routes: %o", routes);
+  return routes;
 };
-export { getClientRoutes };