@modern-js/app-tools 2.35.1 → 2.36.0

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

@@ -1,31 +1,32 @@
-export const JS_EXTENSIONS = [
+const JS_EXTENSIONS = [
   ".js",
   ".ts",
   ".jsx",
   ".tsx"
 ];
-export const INDEX_FILE_NAME = "index";
-export const APP_FILE_NAME = "App";
-export const PAGES_DIR_NAME = "pages";
-export const NESTED_ROUTES_DIR = "routes";
-export const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
-export const LOADER_EXPORT_NAME = "loader";
-export const TEMP_LOADERS_DIR = "__loaders__";
-export const ENTRY_POINT_FILE_NAME = "index.jsx";
-export const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
-export const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
-export const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
-export const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
-export const FILE_SYSTEM_ROUTES_INDEX = "index";
-export const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
-export const HTML_PARTIALS_FOLDER = "html";
-export const HTML_PARTIALS_EXTENSIONS = [
+const INDEX_FILE_NAME = "index";
+const APP_FILE_NAME = "App";
+const PAGES_DIR_NAME = "pages";
+const NESTED_ROUTES_DIR = "routes";
+const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+const LOADER_EXPORT_NAME = "loader";
+const ACTION_EXPORT_NAME = "action";
+const TEMP_LOADERS_DIR = "__loaders__";
+const ENTRY_POINT_FILE_NAME = "index.jsx";
+const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
+const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
+const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
+const FILE_SYSTEM_ROUTES_INDEX = "index";
+const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
+const HTML_PARTIALS_FOLDER = "html";
+const HTML_PARTIALS_EXTENSIONS = [
   ".htm",
   ".html",
   ".ejs"
 ];
-export const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
-export const NESTED_ROUTE = {
+const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+const NESTED_ROUTE = {
   LAYOUT_FILE: "layout",
   LAYOUT_CONFIG_FILE: "layout.config",
   LAYOUT_LOADER_FILE: "layout.loader",
@@ -45,6 +46,31 @@ export const NESTED_ROUTE = {
   ERROR_FILE: "error",
   LOADER_FILE: "loader"
 };
-export const APP_CONFIG_NAME = "config";
-export const APP_INIT_EXPORTED = "init";
-export const APP_INIT_IMPORTED = "appInit";
+const APP_CONFIG_NAME = "config";
+const APP_INIT_EXPORTED = "init";
+const APP_INIT_IMPORTED = "appInit";
+export {
+  ACTION_EXPORT_NAME,
+  APP_CONFIG_NAME,
+  APP_FILE_NAME,
+  APP_INIT_EXPORTED,
+  APP_INIT_IMPORTED,
+  ENTRY_BOOTSTRAP_FILE_NAME,
+  ENTRY_POINT_FILE_NAME,
+  FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
+  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
+  FILE_SYSTEM_ROUTES_FILE_NAME,
+  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
+  FILE_SYSTEM_ROUTES_IGNORED_REGEX,
+  FILE_SYSTEM_ROUTES_INDEX,
+  FILE_SYSTEM_ROUTES_LAYOUT,
+  HTML_PARTIALS_EXTENSIONS,
+  HTML_PARTIALS_FOLDER,
+  INDEX_FILE_NAME,
+  JS_EXTENSIONS,
+  LOADER_EXPORT_NAME,
+  NESTED_ROUTE,
+  NESTED_ROUTES_DIR,
+  PAGES_DIR_NAME,
+  TEMP_LOADERS_DIR
+};

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

@@ -25,7 +25,7 @@ const createImportSpecifier = (specifiers) => {
     return `{ ${named.join(", ")} }`;
   }
 };
-export const createImportStatements = (statements) => {
+const createImportStatements = (statements) => {
   const deDuplicated = [];
   const seen = /* @__PURE__ */ new Map();
   for (const { value, specifiers, initialize } of statements) {
@@ -49,7 +49,7 @@ ${initialize || ""}`);
   return deDuplicated.map(({ value, specifiers, initialize }) => `import ${createImportSpecifier(specifiers)} from '${value}';
 ${initialize || ""}`).join("\n");
 };
-export const generateCode = async (appContext, config, entrypoints, api) => {
+const generateCode = async (appContext, config, entrypoints, api) => {
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
   const isV5 = isRouterV5(config);
@@ -152,7 +152,7 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
     }
   }
 };
-export const generateIndexCode = async ({ appContext, api, entrypoints, config, importsStatemets, bundlerConfigs }) => {
+const generateIndexCode = async ({ appContext, api, entrypoints, config, importsStatemets, bundlerConfigs }) => {
   const hookRunners = api.useHookRunners();
   const { mountId } = config.html;
   const { internalDirectory, packageName } = appContext;
@@ -215,3 +215,8 @@ export const generateIndexCode = async ({ appContext, api, entrypoints, config,
     }
   }));
 };
+export {
+  createImportStatements,
+  generateCode,
+  generateIndexCode
+};

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

@@ -22,7 +22,7 @@ const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint)
   }
   return false;
 });
-export const getBundleEntry = (appContext, config) => {
+const getBundleEntry = (appContext, config) => {
   const { appDirectory, packageName } = appContext;
   const { disableDefaultEntries, entries, entriesDir, mainEntryName } = config.source;
   const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
@@ -63,3 +63,6 @@ export const getBundleEntry = (appContext, config) => {
   }
   return defaults;
 };
+export {
+  getBundleEntry
+};

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

@@ -125,7 +125,7 @@ export default ${lastComponent}`);
   });
   return normalized;
 };
-export const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDirectory, internalDirAlias }) => {
+const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDirectory, internalDirAlias }) => {
   const { entryName, pageRoutesEntry } = entrypoint;
   if (!pageRoutesEntry) {
     return [];
@@ -158,3 +158,6 @@ export const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDi
   debug(`fileSystem routes: %o`, routes);
   return routes;
 };
+export {
+  getClientRoutes
+};

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

@@ -126,7 +126,7 @@ export default ${lastComponent}`);
   });
   return normalized;
 };
-export const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDirectory, internalDirAlias }) => {
+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.`);
@@ -156,3 +156,6 @@ export const getClientRoutes = ({ entrypoint, srcDirectory, srcAlias, internalDi
   debug(`fileSystem routes: %o`, routes);
   return routes;
 };
+export {
+  getClientRoutes
+};

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

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

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

@@ -2,10 +2,9 @@ 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");
-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) => {
+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;
   }
@@ -15,3 +14,9 @@ export const shouldSkip = (file) => {
   }
   return false;
 };
+export {
+  debug,
+  findLayout,
+  getRouteWeight,
+  shouldSkip
+};

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

@@ -64,7 +64,7 @@ const scanDir = (dirs) => dirs.map((dir) => {
     isAutoMount: false
   };
 });
-export const getFileSystemEntry = (appContext, config) => {
+const getFileSystemEntry = (appContext, config) => {
   const { appDirectory } = appContext;
   const { source: { entriesDir, disableEntryDirs } } = config;
   let disabledDirs = [];
@@ -84,3 +84,6 @@ export const getFileSystemEntry = (appContext, config) => {
     throw Error(`src dir ${entriesDir} not found.`);
   }
 };
+export {
+  getFileSystemEntry
+};

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

@@ -21,7 +21,7 @@ const findPartials = (dir, entryName, position) => {
   }
   return null;
 };
-export const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
+const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
   const { appDirectory, internalDirectory } = appContext;
   const { source: { configDir } } = config;
   const htmlDir = path.resolve(appDirectory, configDir || "", HTML_PARTIALS_FOLDER);
@@ -69,3 +69,6 @@ export const getHtmlTemplate = async (entrypoints, api, { appContext, config })
   });
   return htmlTemplates;
 };
+export {
+  getHtmlTemplate
+};

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

@@ -121,8 +121,11 @@ const collectStaticRoutes = (appContext, config) => {
     };
   }) : [];
 };
-export const getServerRoutes = (entrypoints, { appContext, config }) => [
+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
+};

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

@@ -11,7 +11,7 @@ import { checkIsBuildCommands, isPageComponentFile, parseModule, replaceWithAlia
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 import { generateIndexCode } from "./generateCode";
 const debug = createDebugger("plugin-analyze");
-export default ({ bundler }) => ({
+var analyze_default = ({ bundler }) => ({
   name: "@modern-js/plugin-analyze",
   setup: (api) => {
     let pagesDir = [];
@@ -114,13 +114,11 @@ export default ({ bundler }) => ({
           });
           builder.onDevCompileDone(async ({ isFirstCompile }) => {
             const hookRunners2 = api.useHookRunners();
-            if (process.stdout.isTTY || isFirstCompile) {
-              hookRunners2.afterDev({
-                isFirstCompile
-              });
-              if (isFirstCompile) {
-                printInstructions(hookRunners2, appContext, normalizedConfig);
-              }
+            hookRunners2.afterDev({
+              isFirstCompile
+            });
+            if (isFirstCompile) {
+              printInstructions(hookRunners2, appContext, normalizedConfig);
             }
           });
           builder.onBeforeCreateCompiler(async ({ bundlerConfigs }) => {
@@ -240,3 +238,6 @@ export default ({ bundler }) => ({
     };
   }
 });
+export {
+  analyze_default as default
+};

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

@@ -3,7 +3,7 @@ import { parse } from "@babel/parser";
 import traverse from "@babel/traverse";
 import * as t from "@babel/types";
 const isFunction = (node) => t.isFunctionDeclaration(node) || t.isFunctionExpression(node) || t.isArrowFunctionExpression(node);
-export const isDefaultExportFunction = (file) => {
+const isDefaultExportFunction = (file) => {
   if (!file || !fs.existsSync(file)) {
     return false;
   }
@@ -42,3 +42,6 @@ export const isDefaultExportFunction = (file) => {
   });
   return isExportFunction;
 };
+export {
+  isDefaultExportFunction
+};

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

@@ -1,10 +1,13 @@
 const reservedWords = "break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public";
 const builtins = "arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl";
 const forbidList = new Set(`${reservedWords} ${builtins}`.split(" "));
-export function makeLegalIdentifier(str) {
+function makeLegalIdentifier(str) {
   const identifier = str.replace(/-(\w)/g, (_, letter) => letter.toUpperCase()).replace(/[^$_a-zA-Z0-9]/g, "_");
   if (/\d/.test(identifier[0]) || forbidList.has(identifier)) {
     return `_${identifier}`;
   }
   return identifier || "_";
 }
+export {
+  makeLegalIdentifier
+};

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

@@ -1,7 +1,7 @@
 import * as path from "path";
 import { fs, normalizeToPosixPath } from "@modern-js/utils";
 import { JS_EXTENSIONS, NESTED_ROUTE } from "./constants";
-import { replaceWithAlias } from "./utils";
+import { hasAction, replaceWithAlias } from "./utils";
 const conventionNames = Object.values(NESTED_ROUTE);
 const replaceDynamicPath = (routePath) => {
   return routePath.replace(/\[(.*?)\]/g, ":$1");
@@ -10,7 +10,7 @@ const getPathWithoutExt = (filename) => {
   const extname = path.extname(filename);
   return filename.slice(0, -extname.length);
 };
-export const getRouteId = (componentPath, routesDir, entryName, isMainEntry) => {
+const getRouteId = (componentPath, routesDir, entryName, isMainEntry) => {
   const relativePath = normalizeToPosixPath(path.relative(routesDir, componentPath));
   const pathWithoutExt = getPathWithoutExt(relativePath);
   let id = ``;
@@ -36,7 +36,7 @@ const createRoute = (routeInfo, rootDir, filename, entryName, isMainEntry) => {
     type: "nested"
   };
 };
-export const optimizeRoute = (routeTree) => {
+const optimizeRoute = (routeTree) => {
   if (!routeTree.children || routeTree.children.length === 0) {
     return [
       routeTree
@@ -69,7 +69,7 @@ export const optimizeRoute = (routeTree) => {
     ];
   }
 };
-export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion) => {
+const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion) => {
   var _finalRoute_children;
   if (!await fs.pathExists(dirname)) {
     return null;
@@ -96,12 +96,16 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
   };
   let pageLoaderFile = "";
   let pageRoute = null;
+  let pageConfigFile = "";
+  let pageClientData = "";
+  let pageData = "";
+  let pageAction = "";
   let splatLoaderFile = "";
-  let splatClientData = "";
-  let splatData = "";
   let splatRoute = null;
-  let pageConfigFile = "";
   let splatConfigFile = "";
+  let splatClientData = "";
+  let splatData = "";
+  let splatAction = "";
   const items = await fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
@@ -128,6 +132,9 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
     }
     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_DATA_FILE) {
       route.data = itemPath;
+      if (await hasAction(itemPath)) {
+        route.action = itemPath;
+      }
     }
     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_CONFIG_FILE) {
       if (!route.config) {
@@ -141,10 +148,13 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
       pageLoaderFile = itemPath;
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_CLIENT_LOADER) {
-      route.clientData = itemPath;
+      pageClientData = itemPath;
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_DATA_FILE) {
-      route.data = itemPath;
+      pageData = itemPath;
+      if (await hasAction(itemPath)) {
+        pageAction = itemPath;
+      }
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_CONFIG_FILE) {
       pageConfigFile = itemPath;
@@ -160,6 +170,15 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
       if (pageConfigFile) {
         pageRoute.config = pageConfigFile;
       }
+      if (pageData) {
+        pageRoute.data = pageData;
+      }
+      if (pageClientData) {
+        pageRoute.clientData = pageClientData;
+      }
+      if (pageAction) {
+        pageRoute.action = pageAction;
+      }
       (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(pageRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
@@ -175,6 +194,9 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
       splatData = itemPath;
+      if (await hasAction(itemPath)) {
+        splatAction = itemPath;
+      }
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
       var _route_children2;
@@ -194,6 +216,9 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
       if (splatConfigFile) {
         splatRoute.config = splatConfigFile;
       }
+      if (splatAction) {
+        splatRoute.action = splatAction;
+      }
       (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
@@ -221,9 +246,17 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
       };
     }
   }
+  if (isRoot && !finalRoute._component) {
+    throw new Error("The root layout component is required, make sure the routes/layout.tsx file exists.");
+  }
   if (isRoot && !oldVersion) {
     const optimizedRoutes = optimizeRoute(finalRoute);
     return optimizedRoutes;
   }
   return finalRoute;
 };
+export {
+  getRouteId,
+  optimizeRoute,
+  walk
+};