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

package/dist/js/node/analyze/getBundleEntry.js

@@ -1,76 +1,90 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  getBundleEntry: () => getBundleEntry
 });
-exports.getBundleEntry = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-var _getFileSystemEntry = require("./getFileSystemEntry");
-var _constants = require("./constants");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const ensureExtensions = file => {
-  if (!_path.default.extname(file)) {
-    return (0, _utils.findExists)(_constants.JS_EXTENSIONS.map(ext => `${file}${ext}`)) || file;
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_getFileSystemEntry = require("./getFileSystemEntry");
+var import_constants = require("./constants");
+const ensureExtensions = (file) => {
+  if (!import_path.default.extname(file)) {
+    return (0, import_utils.findExists)(import_constants.JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
   }
   return file;
 };
-const ifAlreadyExists = (entrypoints, checked) => entrypoints.some(entrypoint => {
+const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
   if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
-    // reset entryName
     checked.entryName = entrypoint.entryName;
     return true;
   }
-  // filesystem routes entrypoint conflict with normal entrypoint.
   if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
-    throw new Error(`Entry configuration conflicts\n Your configuration: ${checked.entry}.\n Default entrypoint: ${entrypoint.entry}\n Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`);
+    throw new Error(
+      `Entry configuration conflicts
+ Your configuration: ${checked.entry}.
+ Default entrypoint: ${entrypoint.entry}
+ Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`
+    );
   }
   return false;
 });
 const getBundleEntry = (appContext, config) => {
+  const { appDirectory, packageName } = appContext;
   const {
-    appDirectory,
-    packageName
-  } = appContext;
-  const {
-    source: {
-      disableDefaultEntries,
-      entries,
-      entriesDir
-    }
+    source: { disableDefaultEntries, entries, entriesDir }
   } = config;
-  const defaults = disableDefaultEntries ? [] : (0, _getFileSystemEntry.getFileSystemEntry)(appContext, config);
-
-  // merge entrypoints from user config with directory convention.
+  const defaults = disableDefaultEntries ? [] : (0, import_getFileSystemEntry.getFileSystemEntry)(appContext, config);
   if (entries) {
-    Object.keys(entries).forEach(name => {
+    Object.keys(entries).forEach((name) => {
       const value = entries[name];
-      const entrypoint = typeof value === 'string' ? {
+      const entrypoint = typeof value === "string" ? {
         entryName: name,
-        entry: (0, _utils.ensureAbsolutePath)(appDirectory, value),
+        entry: (0, import_utils.ensureAbsolutePath)(appDirectory, value),
         isAutoMount: true,
-        fileSystemRoutes: _utils.fs.statSync((0, _utils.ensureAbsolutePath)(appDirectory, value)).isDirectory() ? {} : undefined
+        fileSystemRoutes: import_utils.fs.statSync((0, import_utils.ensureAbsolutePath)(appDirectory, value)).isDirectory() ? {} : void 0
       } : {
         entryName: name,
-        entry: (0, _utils.ensureAbsolutePath)(appDirectory, value.entry),
+        entry: (0, import_utils.ensureAbsolutePath)(appDirectory, value.entry),
         isAutoMount: !value.disableMount,
-        fileSystemRoutes: value.enableFileSystemRoutes ? {} : undefined
+        fileSystemRoutes: value.enableFileSystemRoutes ? {} : void 0
       };
+      if (entrypoint.fileSystemRoutes) {
+        entrypoint.nestedRoutesEntry = entrypoint.entry;
+      }
       if (!ifAlreadyExists(defaults, entrypoint)) {
         defaults.push(entrypoint);
       }
     });
   }
   if (!disableDefaultEntries) {
-    // find main entry point which server route is '/'.
-    const entriesDirAbs = (0, _utils.ensureAbsolutePath)(appDirectory, entriesDir || '');
-    const found = defaults.find(({
-      entryName,
-      entry,
-      nestedRoutesEntry: _nestedRoutesEntry = ''
-    }) => entryName === packageName || _path.default.dirname(entry) === entriesDirAbs || _path.default.dirname(_nestedRoutesEntry) === entriesDirAbs);
-    found && (found.entryName = _utils.MAIN_ENTRY_NAME);
+    const entriesDirAbs = (0, import_utils.ensureAbsolutePath)(appDirectory, entriesDir || "");
+    const found = defaults.find(
+      ({ entryName, entry, nestedRoutesEntry = "" }) => entryName === packageName || import_path.default.dirname(entry) === entriesDirAbs || import_path.default.dirname(nestedRoutesEntry) === entriesDirAbs
+    );
+    found && (found.entryName = import_utils.MAIN_ENTRY_NAME);
   }
   return defaults;
 };
-exports.getBundleEntry = getBundleEntry;

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

@@ -1,55 +1,92 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  getClientRoutes: () => getClientRoutes
 });
-exports.getClientRoutes = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-var _makeLegalIdentifier = require("../makeLegalIdentifier");
-var _constants = require("../constants");
-var _utils2 = require("../utils");
-var _utils3 = require("./utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_makeLegalIdentifier = require("../makeLegalIdentifier");
+var import_constants = require("../constants");
+var import_utils2 = require("../utils");
+var import_utils3 = require("./utils");
+var __defProp2 = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp2.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 const compName = (srcDirectory, filePath) => {
-  const legalCompName = (0, _makeLegalIdentifier.makeLegalIdentifier)(_path.default.relative(srcDirectory, filePath));
+  const legalCompName = (0, import_makeLegalIdentifier.makeLegalIdentifier)(
+    import_path.default.relative(srcDirectory, filePath)
+  );
   return `Comp_${legalCompName}`;
 };
-const layoutNameAbbr = filePath => {
-  const prefix = 'L_';
-  const dirName = _path.default.dirname(filePath).split('/').pop() || '';
-  return `${prefix}${(0, _makeLegalIdentifier.makeLegalIdentifier)(dirName)}`;
+const layoutNameAbbr = (filePath) => {
+  const prefix = "L_";
+  const dirName = import_path.default.dirname(filePath).split("/").pop() || "";
+  return `${prefix}${(0, import_makeLegalIdentifier.makeLegalIdentifier)(dirName)}`;
 };
 const parents = [];
-
-/* eslint-disable no-param-reassign */
 const recursiveReadDir = ({
   dir,
   routes,
-  basePath: _basePath = '/',
+  basePath = "/",
   srcDirectory,
   srcAlias
 }) => {
   let hasDynamicRoute = false;
   let resetParent = false;
   let parent = parents[parents.length - 1];
-  const layout = (0, _utils3.findLayout)(dir);
+  const layout = (0, import_utils3.findLayout)(dir);
   if (layout) {
-    if (_basePath === '/') {
+    if (basePath === "/") {
       throw new Error(`should use _app instead of _layout in ${dir}`);
     } else {
-      const alias = (0, _utils2.replaceWithAlias)(srcDirectory, layout, srcAlias);
+      const alias = (0, import_utils2.replaceWithAlias)(srcDirectory, layout, srcAlias);
       const componentName = compName(srcDirectory, layout);
       const route = {
-        path: `${_basePath.substring(0, _basePath.length - 1)}`,
+        path: `${basePath.substring(0, basePath.length - 1)}`,
         children: [],
         _component: alias,
         component: componentName,
         parent,
-        type: 'page'
+        type: "page"
       };
       parent = route;
       resetParent = true;
@@ -58,28 +95,30 @@ const recursiveReadDir = ({
       routes = route.children;
     }
   }
-  for (const relative of _utils.fs.readdirSync(dir)) {
-    const filePath = _path.default.join(dir, relative);
-    if (!(0, _utils3.shouldSkip)(filePath)) {
-      const filename = _path.default.basename(filePath, _path.default.extname(filePath));
-      const alias = (0, _utils2.replaceWithAlias)(srcDirectory, filePath, srcAlias);
+  for (const relative of import_utils.fs.readdirSync(dir)) {
+    const filePath = import_path.default.join(dir, relative);
+    if (!(0, import_utils3.shouldSkip)(filePath)) {
+      const filename = import_path.default.basename(filePath, import_path.default.extname(filePath));
+      const alias = (0, import_utils2.replaceWithAlias)(srcDirectory, filePath, srcAlias);
       const componentName = compName(srcDirectory, filePath);
-      const dynamicRouteMatched = _constants.FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
+      const dynamicRouteMatched = import_constants.FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
       if (dynamicRouteMatched) {
         if (hasDynamicRoute) {
-          throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
+          throw new Error(
+            `Can't set two dynamic route in one directory: ${dir}`
+          );
         } else {
           hasDynamicRoute = true;
         }
       }
       const route = {
-        path: `${_basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
+        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
         _component: alias,
         component: componentName,
         parent,
-        type: 'page'
+        type: "page"
       };
-      if (_utils.fs.statSync(filePath).isDirectory()) {
+      if (import_utils.fs.statSync(filePath).isDirectory()) {
         recursiveReadDir({
           dir: filePath,
           routes,
@@ -89,14 +128,14 @@ const recursiveReadDir = ({
         });
         continue;
       }
-      if (filename === _constants.FILE_SYSTEM_ROUTES_LAYOUT) {
+      if (filename === import_constants.FILE_SYSTEM_ROUTES_LAYOUT) {
         continue;
       }
-      if (filename === _constants.FILE_SYSTEM_ROUTES_INDEX) {
-        route.path = _basePath === '/' ? _basePath : `${_basePath.substring(0, _basePath.length - 1)}`;
+      if (filename === import_constants.FILE_SYSTEM_ROUTES_INDEX) {
+        route.path = basePath === "/" ? basePath : `${basePath.substring(0, basePath.length - 1)}`;
       }
-      if (filename === '404' && _basePath === '/') {
-        route.path = '*';
+      if (filename === "404" && basePath === "/") {
+        route.path = "*";
       }
       routes.push(route);
     }
@@ -105,36 +144,47 @@ const recursiveReadDir = ({
     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 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}'`
+    ];
     while (route = route.parent) {
       const layoutComponent = route.component;
       const layoutComponentAbbr = layoutNameAbbr(route._component);
       imports.push(`import ${layoutComponent} from '${route._component}';`);
       const currentComponent = `${layoutComponentAbbr}_${lastComponent}`;
-      codes.push(`const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`);
+      codes.push(
+        `const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`
+      );
       lastComponent = currentComponent;
     }
-    const file = _path.default.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    _utils.fs.outputFileSync(file, `${imports.join('\n')}\n${codes.join('\n')}\nexport default ${lastComponent}`);
+    const file = import_path.default.resolve(internalComponentsDir, `${lastComponent}.jsx`);
+    import_utils.fs.outputFileSync(
+      file,
+      `${imports.join("\n")}
+${codes.join(
+        "\n"
+      )}
+export default ${lastComponent}`
+    );
     return {
       component: lastComponent,
-      _component: (0, _utils2.replaceWithAlias)(internalDirectory, file, internalDirAlias)
+      _component: (0, import_utils2.replaceWithAlias)(internalDirectory, file, internalDirAlias)
     };
   };
-  const normalized = flat(nested).map(route => route.parent ? _objectSpread(_objectSpread(_objectSpread({}, route), generate(route)), {}, {
-    parent: undefined
-  }) : _objectSpread(_objectSpread({}, route), {}, {
-    parent: undefined
-  }));
+  const normalized = flat(nested).map(
+    (route) => route.parent ? __spreadProps(__spreadValues(__spreadValues({}, route), generate(route)), { parent: void 0 }) : __spreadProps(__spreadValues({}, route), { parent: void 0 })
+  );
   return normalized;
 };
 const getClientRoutes = ({
@@ -144,38 +194,44 @@ const getClientRoutes = ({
   internalDirectory,
   internalDirAlias
 }) => {
-  const {
-    entry,
-    entryName
-  } = entrypoint;
-  if (!_utils.fs.existsSync(entry)) {
-    throw new Error(`generate file system routes error, ${entry} directory not found.`);
+  const { entry, entryName } = entrypoint;
+  if (!import_utils.fs.existsSync(entry)) {
+    throw new Error(
+      `generate file system routes error, ${entry} directory not found.`
+    );
   }
-  if (!(_utils.fs.existsSync(entry) && _utils.fs.statSync(entry).isDirectory())) {
-    throw new Error(`generate file system routes error, ${entry} should be directory.`);
+  if (!(import_utils.fs.existsSync(entry) && import_utils.fs.statSync(entry).isDirectory())) {
+    throw new Error(
+      `generate file system routes error, ${entry} should be directory.`
+    );
   }
   let routes = [];
   recursiveReadDir({
     dir: entry,
     routes,
-    basePath: '/',
+    basePath: "/",
     srcDirectory,
     srcAlias
   });
-  const internalComponentsDir = _path.default.resolve(internalDirectory, `${entryName}/${_constants.FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
-  _utils.fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
+  const internalComponentsDir = import_path.default.resolve(
+    internalDirectory,
+    `${entryName}/${import_constants.FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`
+  );
+  import_utils.fs.emptyDirSync(internalComponentsDir);
+  routes = normalizeNestedRoutes(
+    routes,
+    internalComponentsDir,
+    internalDirectory,
+    internalDirAlias
+  );
   parents.length = 0;
-
-  // FIXME: support more situations
   routes.sort((a, b) => {
-    const delta = (0, _utils3.getRouteWeight)(a.path) - (0, _utils3.getRouteWeight)(b.path);
+    const delta = (0, import_utils3.getRouteWeight)(a.path) - (0, import_utils3.getRouteWeight)(b.path);
     if (delta === 0) {
       return a.path.length - b.path.length;
     }
     return delta;
   });
-  (0, _utils3.debug)(`fileSystem routes: %o`, routes);
+  (0, import_utils3.debug)(`fileSystem routes: %o`, routes);
   return routes;
 };
-exports.getClientRoutes = getClientRoutes;