@modern-js/app-tools 2.35.1 → 2.36.0

package/dist/esm/analyze/getFileSystemEntry.js

@@ -29,7 +29,7 @@ var scanDir = function(dirs) {
     var entryName = path.basename(dir);
     if (indexFile && !customBootstrap) {
       return {
-        entryName: entryName,
+        entryName,
         isMainEntry: false,
         entry: indexFile,
         absoluteEntryDir: path.resolve(dir),
@@ -39,19 +39,19 @@ var scanDir = function(dirs) {
     var isHasApp = hasApp(dir);
     if (isHasApp) {
       return {
-        entryName: entryName,
+        entryName,
         isMainEntry: false,
         entry: path.join(dir, APP_FILE_NAME),
         isAutoMount: true,
         absoluteEntryDir: path.resolve(dir),
-        customBootstrap: customBootstrap
+        customBootstrap
       };
     }
     var isHasNestedRoutes = hasNestedRoutes(dir);
     var isHasPages = hasPages(dir);
     if (isHasNestedRoutes || isHasPages) {
       var entrypoint = {
-        entryName: entryName,
+        entryName,
         isMainEntry: false,
         entry: "",
         fileSystemRoutes: {
@@ -61,7 +61,7 @@ var scanDir = function(dirs) {
         },
         isAutoMount: true,
         absoluteEntryDir: path.resolve(dir),
-        customBootstrap: customBootstrap
+        customBootstrap
       };
       if (isHasPages) {
         entrypoint.entry = path.join(dir, PAGES_DIR_NAME);
@@ -74,7 +74,7 @@ var scanDir = function(dirs) {
       return entrypoint;
     }
     return {
-      entryName: entryName,
+      entryName,
       isMainEntry: false,
       entry: indexFile,
       absoluteEntryDir: path.resolve(dir),
@@ -82,7 +82,7 @@ var scanDir = function(dirs) {
     };
   });
 };
-export var getFileSystemEntry = function(appContext, config) {
+var getFileSystemEntry = function(appContext, config) {
   var appDirectory = appContext.appDirectory;
   var _config_source = config.source, entriesDir = _config_source.entriesDir, disableEntryDirs = _config_source.disableEntryDirs;
   var disabledDirs = [];
@@ -108,3 +108,6 @@ export var getFileSystemEntry = function(appContext, config) {
     throw Error("src dir ".concat(entriesDir, " not found."));
   }
 };
+export {
+  getFileSystemEntry
+};

package/dist/esm/analyze/getHtmlTemplate.js

@@ -24,13 +24,13 @@ var findPartials = function(dir, entryName, position) {
       return path.resolve(dir, entryName, "".concat(position).concat(ext));
     })) || base : base;
     return file ? {
-      file: file,
+      file,
       content: fs.readFileSync(file, "utf8")
     } : null;
   }
   return null;
 };
-export var getHtmlTemplate = function() {
+var getHtmlTemplate = function() {
   var _ref = _async_to_generator(function(entrypoints, api, param) {
     var appContext, config, appDirectory, internalDirectory, configDir, htmlDir, htmlTemplates, partialsByEntrypoint, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, err;
     return _ts_generator(this, function(_state) {
@@ -75,7 +75,7 @@ export var getHtmlTemplate = function() {
                   return [
                     4,
                     hookRunners.htmlPartials({
-                      entrypoint: entrypoint,
+                      entrypoint,
                       partials: [
                         PartialPosition.TOP,
                         PartialPosition.HEAD,
@@ -160,7 +160,7 @@ export var getHtmlTemplate = function() {
           ];
         case 8:
           api.setAppContext(_object_spread_props(_object_spread({}, api.useAppContext()), {
-            partialsByEntrypoint: partialsByEntrypoint
+            partialsByEntrypoint
           }));
           return [
             2,
@@ -173,3 +173,6 @@ export var getHtmlTemplate = function() {
     return _ref.apply(this, arguments);
   };
 }();
+export {
+  getHtmlTemplate
+};

package/dist/esm/analyze/getServerRoutes.js

@@ -51,7 +51,7 @@ var applyRouteOptions = function(original, routeOptions) {
       ]);
       routes = [
         _object_spread_props(_object_spread({}, original, other), {
-          urlPath: urlPath
+          urlPath
         })
       ];
     } else {
@@ -83,11 +83,11 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
     var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
     var route = {
       urlPath: "/".concat(isMainEntry ? "" : entryName),
-      entryName: entryName,
+      entryName,
       entryPath: removeLeadingSlash(path.posix.normalize("".concat(htmlPath, "/").concat(entryName).concat(disableHtmlFolder ? ".html" : "/index.html"))),
       isSPA: true,
-      isStream: isStream,
-      isSSR: isSSR,
+      isStream,
+      isSSR,
       responseHeaders: resHeaders,
       worker: isWorker ? "".concat(SERVER_WORKER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0,
       bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0
@@ -119,10 +119,13 @@ var collectStaticRoutes = function(appContext, config) {
     };
   }) : [];
 };
-export var getServerRoutes = function(entrypoints, param) {
+var getServerRoutes = function(entrypoints, param) {
   var appContext = param.appContext, config = param.config;
   return _to_consumable_array(collectHtmlRoutes(entrypoints, appContext, config)).concat(_to_consumable_array(collectStaticRoutes(appContext, config)));
 };
 var toPosix = function(pathStr) {
   return pathStr.split(path.sep).join(path.posix.sep);
 };
+export {
+  getServerRoutes
+};

package/dist/esm/analyze/index.js

@@ -16,7 +16,7 @@ import { checkIsBuildCommands, isPageComponentFile, parseModule, replaceWithAlia
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 import { generateIndexCode } from "./generateCode";
 var debug = createDebugger("plugin-analyze");
-export default function(param) {
+function analyze_default(param) {
   var bundler = param.bundler;
   return {
     name: "@modern-js/plugin-analyze",
@@ -67,7 +67,7 @@ export default function(param) {
                   routes = _state.sent().routes;
                   debug("server routes: %o", routes);
                   appContext = _object_spread_props(_object_spread({}, api.useAppContext()), {
-                    apiOnly: apiOnly,
+                    apiOnly,
                     serverRoutes: routes
                   });
                   api.setAppContext(appContext);
@@ -92,7 +92,7 @@ export default function(param) {
                   entrypoints = getBundleEntry(appContext, resolvedConfig);
                   debug("entrypoints: %o", entrypoints);
                   initialRoutes = getServerRoutes(entrypoints, {
-                    appContext: appContext,
+                    appContext,
                     config: resolvedConfig
                   });
                   return [
@@ -105,7 +105,7 @@ export default function(param) {
                   routes1 = _state.sent().routes;
                   debug("server routes: %o", routes1);
                   appContext = _object_spread_props(_object_spread({}, api.useAppContext()), {
-                    entrypoints: entrypoints,
+                    entrypoints,
                     serverRoutes: routes1
                   });
                   api.setAppContext(appContext);
@@ -127,7 +127,7 @@ export default function(param) {
                   return [
                     4,
                     getHtmlTemplate(entrypoints, api, {
-                      appContext: appContext,
+                      appContext,
                       config: resolvedConfig
                     })
                   ];
@@ -159,11 +159,11 @@ export default function(param) {
                   _state.label = 11;
                 case 11:
                   appContext = _object_spread_props(_object_spread({}, api.useAppContext()), {
-                    entrypoints: entrypoints,
-                    checkedEntries: checkedEntries,
-                    apiOnly: apiOnly,
+                    entrypoints,
+                    checkedEntries,
+                    apiOnly,
                     serverRoutes: routes1,
-                    htmlTemplates: htmlTemplates
+                    htmlTemplates
                   });
                   api.setAppContext(appContext);
                   if (!checkIsBuildCommands())
@@ -181,8 +181,8 @@ export default function(param) {
                   return [
                     4,
                     createBuilderForModern({
-                      normalizedConfig: normalizedConfig,
-                      appContext: appContext
+                      normalizedConfig,
+                      appContext
                     })
                   ];
                 case 13:
@@ -204,7 +204,7 @@ export default function(param) {
                             return [
                               4,
                               hookRunners2.beforeBuild({
-                                bundlerConfigs: bundlerConfigs
+                                bundlerConfigs
                               })
                             ];
                           case 2:
@@ -230,7 +230,7 @@ export default function(param) {
                             return [
                               4,
                               hookRunners2.afterBuild({
-                                stats: stats
+                                stats
                               })
                             ];
                           case 1:
@@ -257,13 +257,11 @@ export default function(param) {
                       return _ts_generator(this, function(_state2) {
                         isFirstCompile = param2.isFirstCompile;
                         hookRunners2 = api.useHookRunners();
-                        if (process.stdout.isTTY || isFirstCompile) {
-                          hookRunners2.afterDev({
-                            isFirstCompile: isFirstCompile
-                          });
-                          if (isFirstCompile) {
-                            printInstructions(hookRunners2, appContext, normalizedConfig);
-                          }
+                        hookRunners2.afterDev({
+                          isFirstCompile
+                        });
+                        if (isFirstCompile) {
+                          printInstructions(hookRunners2, appContext, normalizedConfig);
                         }
                         return [
                           2
@@ -285,12 +283,12 @@ export default function(param) {
                             return [
                               4,
                               generateIndexCode({
-                                appContext: appContext,
+                                appContext,
                                 config: resolvedConfig,
-                                entrypoints: entrypoints,
-                                api: api,
-                                importsStatemets: importsStatemets,
-                                bundlerConfigs: bundlerConfigs
+                                entrypoints,
+                                api,
+                                importsStatemets,
+                                bundlerConfigs
                               })
                             ];
                           case 1:
@@ -298,7 +296,7 @@ export default function(param) {
                             return [
                               4,
                               hookRunners2.beforeCreateCompiler({
-                                bundlerConfigs: bundlerConfigs
+                                bundlerConfigs
                               })
                             ];
                           case 2:
@@ -324,7 +322,7 @@ export default function(param) {
                             return [
                               4,
                               hookRunners2.afterCreateCompiler({
-                                compiler: compiler
+                                compiler
                               })
                             ];
                           case 1:
@@ -341,7 +339,7 @@ export default function(param) {
                   }());
                   builder.addPlugins(resolvedConfig.builderPlugins);
                   appContext = _object_spread_props(_object_spread({}, api.useAppContext()), {
-                    builder: builder
+                    builder
                   });
                   api.setAppContext(appContext);
                   _state.label = 14;
@@ -450,8 +448,8 @@ export default function(param) {
                     return [
                       2,
                       {
-                        entrypoint: entrypoint,
-                        imports: imports
+                        entrypoint,
+                        imports
                       }
                     ];
                 }
@@ -511,3 +509,6 @@ export default function(param) {
   };
 }
 ;
+export {
+  analyze_default as default
+};

package/dist/esm/analyze/isDefaultExportFunction.js

@@ -5,7 +5,7 @@ import * as t from "@babel/types";
 var isFunction = function(node) {
   return t.isFunctionDeclaration(node) || t.isFunctionExpression(node) || t.isArrowFunctionExpression(node);
 };
-export var isDefaultExportFunction = function(file) {
+var isDefaultExportFunction = function(file) {
   if (!file || !fs.existsSync(file)) {
     return false;
   }
@@ -44,3 +44,6 @@ export var isDefaultExportFunction = function(file) {
   });
   return isExportFunction;
 };
+export {
+  isDefaultExportFunction
+};

package/dist/esm/analyze/makeLegalIdentifier.js

@@ -1,7 +1,7 @@
 var 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";
 var 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";
 var forbidList = new Set("".concat(reservedWords, " ").concat(builtins).split(" "));
-export function makeLegalIdentifier(str) {
+function makeLegalIdentifier(str) {
   var identifier = str.replace(/-(\w)/g, function(_, letter) {
     return letter.toUpperCase();
   }).replace(/[^$_a-zA-Z0-9]/g, "_");
@@ -10,3 +10,6 @@ export function makeLegalIdentifier(str) {
   }
   return identifier || "_";
 }
+export {
+  makeLegalIdentifier
+};

package/dist/esm/analyze/nestedRoutes.js

@@ -5,7 +5,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
 var conventionNames = Object.values(NESTED_ROUTE);
 var replaceDynamicPath = function(routePath) {
   return routePath.replace(/\[(.*?)\]/g, ":$1");
@@ -14,7 +14,7 @@ var getPathWithoutExt = function(filename) {
   var extname = path.extname(filename);
   return filename.slice(0, -extname.length);
 };
-export var getRouteId = function(componentPath, routesDir, entryName, isMainEntry) {
+var getRouteId = function(componentPath, routesDir, entryName, isMainEntry) {
   var relativePath = normalizeToPosixPath(path.relative(routesDir, componentPath));
   var pathWithoutExt = getPathWithoutExt(relativePath);
   var id = "";
@@ -34,11 +34,11 @@ var createIndexRoute = function(routeInfo, rootDir, filename, entryName, isMainE
 var createRoute = function(routeInfo, rootDir, filename, entryName, isMainEntry) {
   var id = getRouteId(filename, rootDir, entryName, isMainEntry);
   return _object_spread_props(_object_spread({}, routeInfo), {
-    id: id,
+    id,
     type: "nested"
   });
 };
-export var optimizeRoute = function(routeTree) {
+var optimizeRoute = function(routeTree) {
   if (!routeTree.children || routeTree.children.length === 0) {
     return [
       routeTree
@@ -71,9 +71,9 @@ export var optimizeRoute = function(routeTree) {
     ];
   }
 };
-export var walk = function() {
+var walk = function() {
   var _ref = _async_to_generator(function(dirname, rootDir, alias, entryName, isMainEntry, oldVersion) {
-    var _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatClientData, splatData, splatRoute, pageConfigFile, splatConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
+    var _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, pageConfigFile, pageClientData, pageData, pageAction, splatLoaderFile, splatRoute, splatConfigFile, splatClientData, splatData, splatAction, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -114,16 +114,20 @@ export var walk = function() {
           route = {
             path: routePath === null || routePath === void 0 ? void 0 : routePath.replace(/\$$/, "?"),
             children: [],
-            isRoot: isRoot
+            isRoot
           };
           pageLoaderFile = "";
           pageRoute = null;
+          pageConfigFile = "";
+          pageClientData = "";
+          pageData = "";
+          pageAction = "";
           splatLoaderFile = "";
-          splatClientData = "";
-          splatData = "";
           splatRoute = null;
-          pageConfigFile = "";
           splatConfigFile = "";
+          splatClientData = "";
+          splatData = "";
+          splatAction = "";
           return [
             4,
             fs.readdir(dirname)
@@ -135,9 +139,9 @@ export var walk = function() {
         case 4:
           _state.trys.push([
             4,
-            11,
-            12,
-            13
+            17,
+            18,
+            19
           ]);
           _iterator = items[Symbol.iterator]();
           _state.label = 5;
@@ -145,7 +149,7 @@ export var walk = function() {
           if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
             return [
               3,
-              10
+              16
             ];
           item = _step.value;
           itemPath = path.join(dirname, item);
@@ -177,7 +181,7 @@ export var walk = function() {
           if (extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
             return [
               3,
-              9
+              15
             ];
           }
           if (itemWithoutExt === NESTED_ROUTE.LAYOUT_LOADER_FILE) {
@@ -188,9 +192,22 @@ export var walk = function() {
           if (itemWithoutExt === NESTED_ROUTE.LAYOUT_CLIENT_LOADER) {
             route.clientData = itemPath;
           }
-          if (itemWithoutExt === NESTED_ROUTE.LAYOUT_DATA_FILE) {
-            route.data = itemPath;
+          if (!(itemWithoutExt === NESTED_ROUTE.LAYOUT_DATA_FILE))
+            return [
+              3,
+              10
+            ];
+          route.data = itemPath;
+          return [
+            4,
+            hasAction(itemPath)
+          ];
+        case 9:
+          if (_state.sent()) {
+            route.action = itemPath;
           }
+          _state.label = 10;
+        case 10:
           if (itemWithoutExt === NESTED_ROUTE.LAYOUT_CONFIG_FILE) {
             if (!route.config) {
               route.config = itemPath;
@@ -203,11 +220,24 @@ export var walk = function() {
             pageLoaderFile = itemPath;
           }
           if (itemWithoutExt === NESTED_ROUTE.PAGE_CLIENT_LOADER) {
-            route.clientData = itemPath;
+            pageClientData = itemPath;
           }
-          if (itemWithoutExt === NESTED_ROUTE.PAGE_DATA_FILE) {
-            route.data = itemPath;
+          if (!(itemWithoutExt === NESTED_ROUTE.PAGE_DATA_FILE))
+            return [
+              3,
+              12
+            ];
+          pageData = itemPath;
+          return [
+            4,
+            hasAction(itemPath)
+          ];
+        case 11:
+          if (_state.sent()) {
+            pageAction = itemPath;
           }
+          _state.label = 12;
+        case 12:
           if (itemWithoutExt === NESTED_ROUTE.PAGE_CONFIG_FILE) {
             pageConfigFile = itemPath;
           }
@@ -222,6 +252,15 @@ export var walk = function() {
             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) {
@@ -235,9 +274,22 @@ export var walk = function() {
               splatConfigFile = itemPath;
             }
           }
-          if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
-            splatData = itemPath;
+          if (!(itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE))
+            return [
+              3,
+              14
+            ];
+          splatData = itemPath;
+          return [
+            4,
+            hasAction(itemPath)
+          ];
+        case 13:
+          if (_state.sent()) {
+            splatAction = itemPath;
           }
+          _state.label = 14;
+        case 14:
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
             ;
             splatRoute = createRoute({
@@ -256,6 +308,9 @@ export var walk = function() {
             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) {
@@ -264,27 +319,27 @@ export var walk = function() {
           if (itemWithoutExt === NESTED_ROUTE.ERROR_FILE) {
             route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
           }
-          _state.label = 9;
-        case 9:
+          _state.label = 15;
+        case 15:
           _iteratorNormalCompletion = true;
           return [
             3,
             5
           ];
-        case 10:
+        case 16:
           return [
             3,
-            13
+            19
           ];
-        case 11:
+        case 17:
           err = _state.sent();
           _didIteratorError = true;
           _iteratorError = err;
           return [
             3,
-            13
+            19
           ];
-        case 12:
+        case 18:
           try {
             if (!_iteratorNormalCompletion && _iterator.return != null) {
               _iterator.return();
@@ -297,7 +352,7 @@ export var walk = function() {
           return [
             7
           ];
-        case 13:
+        case 19:
           finalRoute = createRoute(route, rootDir, path.join(dirname, "".concat(NESTED_ROUTE.LAYOUT_FILE, ".ts")), entryName, isMainEntry);
           if (isPathlessLayout) {
             delete finalRoute.path;
@@ -320,6 +375,9 @@ export var walk = function() {
               });
             }
           }
+          if (isRoot && !finalRoute._component) {
+            throw new Error("The root layout component is required, make sure the routes/layout.tsx file exists.");
+          }
           if (isRoot && !oldVersion) {
             optimizedRoutes = optimizeRoute(finalRoute);
             return [
@@ -338,3 +396,8 @@ export var walk = function() {
     return _ref.apply(this, arguments);
   };
 }();
+export {
+  getRouteId,
+  optimizeRoute,
+  walk
+};