@modern-js/app-tools 2.15.0 → 2.17.0

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

@@ -1,18 +1,11 @@
 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 { 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)
-  );
+  const legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
   return `Comp_${legalCompName}`;
 };
 const layoutNameAbbr = (filePath) => {
@@ -21,13 +14,7 @@ const layoutNameAbbr = (filePath) => {
   return `${prefix}${makeLegalIdentifier(dirName)}`;
 };
 const parents = [];
-const recursiveReadDir = ({
-  dir,
-  routes,
-  basePath = "/",
-  srcDirectory,
-  srcAlias
-}) => {
+const recursiveReadDir = ({ dir, routes, basePath = "/", srcDirectory, srcAlias }) => {
   let hasDynamicRoute = false;
   let resetParent = false;
   let parent = parents[parents.length - 1];
@@ -62,9 +49,7 @@ const recursiveReadDir = ({
       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}`
-          );
+          throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
         } else {
           hasDynamicRoute = true;
         }
@@ -103,12 +88,9 @@ const recursiveReadDir = ({
   }
 };
 const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory, internalDirAlias) => {
-  const flat = (routes) => routes.reduce(
-    (memo, route) => memo.concat(
-      Array.isArray(route.children) ? flat(route.children) : [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;
@@ -121,50 +103,38 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
       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.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    fs.outputFileSync(
-      file,
-      `${imports.join("\n")}
-${codes.join(
-        "\n"
-      )}
-export default ${lastComponent}`
-    );
+    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 ? { ...route, ...generate(route), parent: void 0 } : { ...route, parent: void 0 }
-  );
+  const normalized = flat(nested).map((route) => route.parent ? {
+    ...route,
+    ...generate(route),
+    parent: void 0
+  } : {
+    ...route,
+    parent: void 0
+  });
   return normalized;
 };
-const getClientRoutes = ({
-  entrypoint,
-  srcDirectory,
-  srcAlias,
-  internalDirectory,
-  internalDirAlias
-}) => {
+export const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDirectory, internalDirAlias }) => {
   const { entryName, pageRoutesEntry } = entrypoint;
   if (!pageRoutesEntry) {
     return [];
   }
   if (!fs.existsSync(pageRoutesEntry)) {
-    throw new Error(
-      `generate file system routes error, ${pageRoutesEntry} directory not found.`
-    );
+    throw new Error(`generate file system routes error, ${pageRoutesEntry} directory not found.`);
   }
   if (!(fs.existsSync(pageRoutesEntry) && fs.statSync(pageRoutesEntry).isDirectory())) {
-    throw new Error(
-      `generate file system routes error, ${pageRoutesEntry} should be directory.`
-    );
+    throw new Error(`generate file system routes error, ${pageRoutesEntry} should be directory.`);
   }
   let routes = [];
   recursiveReadDir({
@@ -174,17 +144,9 @@ const getClientRoutes = ({
     srcDirectory,
     srcAlias
   });
-  const internalComponentsDir = path.resolve(
-    internalDirectory,
-    `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`
-  );
+  const internalComponentsDir = path.resolve(internalDirectory, `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
   fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(
-    routes,
-    internalComponentsDir,
-    internalDirectory,
-    internalDirAlias
-  );
+  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
   parents.length = 0;
   routes.sort((a, b) => {
     const delta = getRouteWeight(a.path) - getRouteWeight(b.path);
@@ -196,6 +158,3 @@ const getClientRoutes = ({
   debug(`fileSystem routes: %o`, routes);
   return routes;
 };
-export {
-  getClientRoutes
-};

package/dist/esm-node/analyze/getClientRoutes/getRoutesLegacy.js

@@ -1,18 +1,11 @@
 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 { 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)
-  );
+  const legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
   return `Comp_${legalCompName}`;
 };
 const layoutNameAbbr = (filePath) => {
@@ -21,13 +14,7 @@ const layoutNameAbbr = (filePath) => {
   return `${prefix}${makeLegalIdentifier(dirName)}`;
 };
 const parents = [];
-const recursiveReadDirLegacy = ({
-  dir,
-  routes,
-  basePath = "/",
-  srcDirectory,
-  srcAlias
-}) => {
+const recursiveReadDirLegacy = ({ dir, routes, basePath = "/", srcDirectory, srcAlias }) => {
   let hasDynamicRoute = false;
   let resetParent = false;
   let parent = parents[parents.length - 1];
@@ -62,9 +49,7 @@ const recursiveReadDirLegacy = ({
       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}`
-          );
+          throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
         } else {
           hasDynamicRoute = true;
         }
@@ -104,10 +89,9 @@ const recursiveReadDirLegacy = ({
   }
 };
 const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory, internalDirAlias) => {
-  const flat = (routes) => routes.reduce(
-    (memo, route) => memo.concat(Array.isArray(route.routes) ? flat(route.routes) : [route]),
-    []
-  );
+  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;
@@ -120,47 +104,35 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
       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.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-    fs.outputFileSync(
-      file,
-      `${imports.join("\n")}
-${codes.join(
-        "\n"
-      )}
-export default ${lastComponent}`
-    );
+    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 ? { ...route, ...generate(route), parent: void 0 } : { ...route, parent: void 0 }
-  );
+  const normalized = flat(nested).map((route) => route.parent ? {
+    ...route,
+    ...generate(route),
+    parent: void 0
+  } : {
+    ...route,
+    parent: void 0
+  });
   return normalized;
 };
-const getClientRoutes = ({
-  entrypoint,
-  srcDirectory,
-  srcAlias,
-  internalDirectory,
-  internalDirAlias
-}) => {
+export 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.`
-    );
+    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.`
-    );
+    throw new Error(`generate file system routes error, ${entry} should be directory.`);
   }
   let routes = [];
   recursiveReadDirLegacy({
@@ -170,17 +142,9 @@ const getClientRoutes = ({
     srcDirectory,
     srcAlias
   });
-  const internalComponentsDir = path.resolve(
-    internalDirectory,
-    `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`
-  );
+  const internalComponentsDir = path.resolve(internalDirectory, `${entryName}/${FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
   fs.emptyDirSync(internalComponentsDir);
-  routes = normalizeNestedRoutes(
-    routes,
-    internalComponentsDir,
-    internalDirectory,
-    internalDirAlias
-  );
+  routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
   parents.length = 0;
   routes.sort((a, b) => {
     const delta = getRouteWeight(a.path) - getRouteWeight(b.path);
@@ -192,6 +156,3 @@ const getClientRoutes = ({
   debug(`fileSystem routes: %o`, routes);
   return routes;
 };
-export {
-  getClientRoutes
-};

package/dist/esm-node/analyze/getClientRoutes/index.js

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

package/dist/esm-node/analyze/getClientRoutes/utils.js

@@ -1,19 +1,11 @@
 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";
+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) => {
+export { debug };
+export const findLayout = (dir) => findExists(JS_EXTENSIONS.map((ext) => path.resolve(dir, `${FILE_SYSTEM_ROUTES_LAYOUT}${ext}`)));
+export const getRouteWeight = (route) => route === "*" ? 999 : route.split(":").length - 1;
+export const shouldSkip = (file) => {
   if (fs.statSync(file).isDirectory()) {
     return false;
   }
@@ -23,9 +15,3 @@ const shouldSkip = (file) => {
   }
   return false;
 };
-export {
-  debug,
-  findLayout,
-  getRouteWeight,
-  shouldSkip
-};

package/dist/esm-node/analyze/getFileSystemEntry.js

@@ -2,20 +2,9 @@ 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}`))
-);
+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);
@@ -48,14 +37,7 @@ const scanDir = (dirs) => dirs.map((dir) => {
       entryName,
       entry: "",
       fileSystemRoutes: {
-        globalApp: findExists(
-          JS_EXTENSIONS.map(
-            (ext) => path.resolve(
-              dir,
-              `./${PAGES_DIR_NAME}/${FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT}${ext}`
-            )
-          )
-        )
+        globalApp: findExists(JS_EXTENSIONS.map((ext) => path.resolve(dir, `./${PAGES_DIR_NAME}/${FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT}${ext}`)))
       },
       isAutoMount: true,
       absoluteEntryDir: path.resolve(dir),
@@ -78,25 +60,19 @@ const scanDir = (dirs) => dirs.map((dir) => {
     isAutoMount: false
   };
 });
-const getFileSystemEntry = (appContext, config) => {
+export const getFileSystemEntry = (appContext, config) => {
   const { appDirectory } = appContext;
-  const {
-    source: { entriesDir, disableEntryDirs }
-  } = config;
+  const { source: { entriesDir, disableEntryDirs } } = config;
   let disabledDirs = [];
   if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
-    disabledDirs = disableEntryDirs == null ? void 0 : disableEntryDirs.map(
-      (dir) => ensureAbsolutePath(appDirectory, dir)
-    );
+    disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? 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)
-        )
-      );
+      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.`);
     }
@@ -104,6 +80,3 @@ const getFileSystemEntry = (appContext, config) => {
     throw Error(`src dir ${entriesDir} not found.`);
   }
 };
-export {
-  getFileSystemEntry
-};

package/dist/esm-node/analyze/getHtmlTemplate.js

@@ -2,52 +2,34 @@ 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) => {
+var PartialPosition;
+(function(PartialPosition2) {
   PartialPosition2["TOP"] = "top";
   PartialPosition2["HEAD"] = "head";
   PartialPosition2["BODY"] = "body";
   PartialPosition2["BOTTOM"] = "bottom";
   PartialPosition2["INDEX"] = "index";
-  return PartialPosition2;
-})(PartialPosition || {});
+})(PartialPosition || (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;
+    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 = async (entrypoints, api, {
-  appContext,
-  config
-}) => {
+export const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
   const { appDirectory, internalDirectory } = appContext;
-  const {
-    source: { configDir }
-  } = config;
-  const htmlDir = path.resolve(
-    appDirectory,
-    configDir || "",
-    HTML_PARTIALS_FOLDER
-  );
+  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 */
-    );
+    const customIndexTemplate = findPartials(htmlDir, name, PartialPosition.INDEX);
     if (customIndexTemplate) {
       htmlTemplates[entryName] = customIndexTemplate.file;
     } else {
@@ -55,34 +37,25 @@ const getHtmlTemplate = async (entrypoints, api, {
       const { partials } = await 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: []
-          }
-        )
+          PartialPosition.TOP,
+          PartialPosition.HEAD,
+          PartialPosition.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"
-      );
+      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 */
-      );
+      const bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
       if (bottomTemplate) {
         htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
       }
@@ -90,6 +63,3 @@ const getHtmlTemplate = async (entrypoints, api, {
   }
   return htmlTemplates;
 };
-export {
-  getHtmlTemplate
-};