@modern-js/app-tools 2.32.1-alpha.0 → 2.32.2-alpha.1

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

@@ -1,216 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.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));
-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 = [];
-const recursiveReadDirLegacy = ({
-  dir,
-  routes,
-  basePath = "/",
-  srcDirectory,
-  srcAlias
-}) => {
-  let hasDynamicRoute = false;
-  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}`);
-    } else {
-      const alias = replaceWithAlias(srcDirectory, layout, srcAlias);
-      const componentName = compName(srcDirectory, layout);
-      const route = {
-        path: `${basePath.substring(0, basePath.length - 1)}`,
-        exact: false,
-        routes: [],
-        _component: alias,
-        component: componentName,
-        parent
-      };
-      parent = route;
-      resetParent = true;
-      routes.push(route);
-      parents.push(route);
-      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}`
-          );
-        } else {
-          hasDynamicRoute = true;
-        }
-      }
-      const route = {
-        path: `${basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
-        _component: alias,
-        component: componentName,
-        exact: true,
-        parent
-      };
-      if (fs.statSync(filePath).isDirectory()) {
-        recursiveReadDirLegacy({
-          dir: filePath,
-          routes,
-          basePath: `${route.path}/`,
-          srcDirectory,
-          srcAlias
-        });
-        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();
-  }
-};
-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}'`
-    ];
-    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} />;`
-      );
-      lastComponent = currentComponent;
-    }
-    const file = path.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    fs.outputFileSync(
-      file,
-      `${imports.join("\n")}
-${codes.join(
-        "\n"
-      )}
-export default ${lastComponent}`
-    );
-    return {
-      component: lastComponent,
-      _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
-    };
-  };
-  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 = ({
-  entrypoint,
-  srcDirectory,
-  srcAlias,
-  internalDirectory,
-  internalDirAlias
-}) => {
-  const { 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,
-    routes,
-    basePath: "/",
-    srcDirectory,
-    srcAlias
-  });
-  const internalComponentsDir = path.resolve(
-    internalDirectory,
-    `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`
-  );
-  fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(
-    routes,
-    internalComponentsDir,
-    internalDirectory,
-    internalDirAlias
-  );
-  parents.length = 0;
-  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);
-  return routes;
-};
-export {
-  getClientRoutes
-};

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

@@ -1,6 +0,0 @@
-import { getClientRoutes } from "./getRoutes";
-import { getClientRoutes as getClientRoutes2 } from "./getRoutesLegacy";
-export {
-  getClientRoutes,
-  getClientRoutes2 as getClientRoutesLegacy
-};

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

@@ -1,31 +0,0 @@
-import path from "path";
-import { createDebugger, findExists, fs } from "@modern-js/utils";
-import {
-  JS_EXTENSIONS,
-  FILE_SYSTEM_ROUTES_LAYOUT,
-  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
-  FILE_SYSTEM_ROUTES_IGNORED_REGEX
-} from "../constants";
-const debug = createDebugger("get-client-routes");
-const findLayout = (dir) => findExists(
-  JS_EXTENSIONS.map(
-    (ext) => path.resolve(dir, `${FILE_SYSTEM_ROUTES_LAYOUT}${ext}`)
-  )
-);
-const getRouteWeight = (route) => route === "*" ? 999 : route.split(":").length - 1;
-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;
-};
-export {
-  debug,
-  findLayout,
-  getRouteWeight,
-  shouldSkip
-};

package/dist/js/modern/analyze/getFileSystemEntry.js

@@ -1,109 +0,0 @@
-import fs from "fs";
-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,
-      entry: "",
-      fileSystemRoutes: {
-        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);
-      entrypoint.pageRoutesEntry = entrypoint.entry;
-    }
-    if (isHasNestedRoutes) {
-      entrypoint.entry = path.join(dir, NESTED_ROUTES_DIR);
-      entrypoint.nestedRoutesEntry = entrypoint.entry;
-    }
-    return entrypoint;
-  }
-  return {
-    entryName,
-    entry: indexFile,
-    absoluteEntryDir: path.resolve(dir),
-    isAutoMount: false
-  };
-});
-const getFileSystemEntry = (appContext, config) => {
-  const { appDirectory } = appContext;
-  const {
-    source: { entriesDir, disableEntryDirs }
-  } = config;
-  let disabledDirs = [];
-  if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
-    disabledDirs = disableEntryDirs == null ? void 0 : disableEntryDirs.map(
-      (dir) => ensureAbsolutePath(appDirectory, dir)
-    );
-  }
-  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) && !disabledDirs.includes(file)
-        )
-      );
-    } else {
-      throw Error(`source.entriesDir accept a directory.`);
-    }
-  } else {
-    throw Error(`src dir ${entriesDir} not found.`);
-  }
-};
-export {
-  getFileSystemEntry
-};

package/dist/js/modern/analyze/getHtmlTemplate.js

@@ -1,115 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import path from "path";
-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 = /* @__PURE__ */ ((PartialPosition2) => {
-  PartialPosition2["TOP"] = "top";
-  PartialPosition2["HEAD"] = "head";
-  PartialPosition2["BODY"] = "body";
-  PartialPosition2["BOTTOM"] = "bottom";
-  PartialPosition2["INDEX"] = "index";
-  return PartialPosition2;
-})(PartialPosition || {});
-const findPartials = (dir, entryName, position) => {
-  if (fs.existsSync(dir)) {
-    const base = findExists(
-      HTML_PARTIALS_EXTENSIONS.map(
-        (ext) => path.resolve(dir, `${position}${ext}`)
-      )
-    );
-    const file = entryName ? findExists(
-      HTML_PARTIALS_EXTENSIONS.map(
-        (ext) => path.resolve(dir, entryName, `${position}${ext}`)
-      )
-    ) || base : base;
-    return file ? { file, content: fs.readFileSync(file, "utf8") } : null;
-  }
-  return null;
-};
-const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (entrypoints, api, {
-  appContext,
-  config
-}) {
-  const { appDirectory, internalDirectory } = appContext;
-  const {
-    source: { configDir }
-  } = config;
-  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,
-      "index" /* INDEX */
-    );
-    if (customIndexTemplate) {
-      htmlTemplates[entryName] = customIndexTemplate.file;
-    } else {
-      const hookRunners = api.useHookRunners();
-      const { partials } = yield hookRunners.htmlPartials({
-        entrypoint,
-        partials: [
-          "top" /* TOP */,
-          "head" /* HEAD */,
-          "body" /* BODY */
-        ].reduce(
-          (previous, position) => {
-            const found = findPartials(htmlDir, name, position);
-            previous[position] = found ? [found.content] : [];
-            return previous;
-          },
-          {
-            top: [],
-            head: [],
-            body: []
-          }
-        )
-      });
-      const templatePath = path.resolve(
-        internalDirectory,
-        entryName,
-        "index.html"
-      );
-      fs.outputFileSync(templatePath, templates.html(partials), "utf8");
-      htmlTemplates[entryName] = templatePath;
-      const bottomTemplate = findPartials(
-        htmlDir,
-        name,
-        "bottom" /* BOTTOM */
-      );
-      if (bottomTemplate) {
-        htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
-      }
-    }
-  }
-  return htmlTemplates;
-});
-export {
-  getHtmlTemplate
-};

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

@@ -1,175 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.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));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-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";
-const applyBaseUrl = (baseUrl, routes) => {
-  if (baseUrl) {
-    if (Array.isArray(baseUrl)) {
-      return baseUrl.reduce(
-        (previous, current) => [...previous, ...applyBaseUrl(current, routes)],
-        []
-      );
-    } else {
-      return routes.map((route) => {
-        const urlPath = urlJoin(baseUrl, route.urlPath);
-        return __spreadProps(__spreadValues({}, route), {
-          urlPath: urlPath === "/" ? urlPath : removeTailSlash(urlPath)
-        });
-      });
-    }
-  }
-  return routes;
-};
-const applyRouteOptions = (original, routeOptions) => {
-  const { route, disableSpa } = routeOptions;
-  original.isSPA = !disableSpa;
-  !original.isSPA && (original.entryPath = path.dirname(original.entryPath));
-  let routes;
-  if (route) {
-    if (Array.isArray(route)) {
-      routes = route.map((url) => {
-        if (isPlainObject(url)) {
-          const _a2 = url, { path: urlPath } = _a2, other = __objRest(_a2, ["path"]);
-          return __spreadProps(__spreadValues(__spreadValues({}, original), other), {
-            urlPath
-          });
-        } else {
-          return __spreadProps(__spreadValues({}, original), {
-            urlPath: url
-          });
-        }
-      });
-    } else if (isPlainObject(route)) {
-      const _a = route, { path: urlPath } = _a, other = __objRest(_a, ["path"]);
-      routes = [
-        __spreadProps(__spreadValues(__spreadValues({}, original), other), {
-          urlPath
-        })
-      ];
-    } else {
-      routes = [
-        __spreadProps(__spreadValues({}, original), {
-          urlPath: route
-        })
-      ];
-    }
-  } else {
-    routes = [original];
-  }
-  return routes;
-};
-const collectHtmlRoutes = (entrypoints, appContext, config) => {
-  const {
-    html: { disableHtmlFolder },
-    output: { distPath: { html: htmlPath } = {} },
-    server: { baseUrl, routes, ssr, ssrByEntries }
-  } = config;
-  const { packageName } = appContext;
-  let htmlRoutes = entrypoints.reduce(
-    (previous, { entryName }) => {
-      const entryOptions = getEntryOptions(
-        entryName,
-        ssr,
-        ssrByEntries,
-        packageName
-      );
-      const isSSR = Boolean(entryOptions);
-      const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
-      let route = {
-        urlPath: `/${entryName === MAIN_ENTRY_NAME ? "" : entryName}`,
-        entryName,
-        entryPath: removeLeadingSlash(
-          path.posix.normalize(
-            `${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`
-          )
-        ),
-        isSPA: true,
-        isSSR,
-        responseHeaders: resHeaders,
-        bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
-      };
-      if (routes == null ? 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;
-};
-const collectStaticRoutes = (appContext, config) => {
-  const { appDirectory } = appContext;
-  const {
-    source: { configDir },
-    server: { publicRoutes = {} }
-  } = config;
-  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
-        )
-      )
-    };
-  }) : [];
-};
-const getServerRoutes = (entrypoints, {
-  appContext,
-  config
-}) => [
-  ...collectHtmlRoutes(entrypoints, appContext, config),
-  ...collectStaticRoutes(appContext, config)
-];
-const toPosix = (pathStr) => pathStr.split(path.sep).join(path.posix.sep);
-export {
-  getServerRoutes
-};