@modern-js/app-tools 2.3.0 → 2.3.1-alpha.1

package/dist/js/modern/analyze/constants.js

@@ -23,7 +23,9 @@ const NESTED_ROUTE = {
   PAGE_LOADER_FILE: "page.loader",
   LOADING_FILE: "loading",
   ERROR_FILE: "error",
-  LOADER_FILE: "loader"
+  LOADER_FILE: "loader",
+  SPLATE_FILE: "$",
+  SPLATE_LOADER_FILE: "$.loader"
 };
 const APP_CONFIG_NAME = "config";
 const APP_INIT_EXPORTED = "init";

package/dist/js/modern/analyze/nestedRoutes.js

@@ -64,7 +64,7 @@ const createRoute = (routeInfo, rootDir, filename, entryName) => {
   });
 };
 const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, function* () {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (!(yield fs.pathExists(dirname))) {
     return null;
   }
@@ -90,6 +90,8 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   };
   let pageLoaderFile = "";
   let pageRoute = null;
+  let splatLoaderFile = "";
+  let splatRoute = null;
   const items = yield fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
@@ -130,6 +132,24 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       }
       (_b = route.children) == null ? void 0 : _b.push(pageRoute);
     }
+    if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
+      splatLoaderFile = itemPath;
+    }
+    if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
+      splatRoute = createRoute(
+        {
+          _component: replaceWithAlias(alias.basename, itemPath, alias.name),
+          path: "*"
+        },
+        rootDir,
+        itemPath,
+        entryName
+      );
+      if (splatLoaderFile) {
+        splatRoute.loader = splatLoaderFile;
+      }
+      (_c = route.children) == null ? void 0 : _c.push(splatRoute);
+    }
     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
       route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
     }
@@ -146,7 +166,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
-  route.children = (_c = route.children) == null ? void 0 : _c.filter((childRoute) => childRoute);
+  route.children = (_d = route.children) == null ? void 0 : _d.filter((childRoute) => childRoute);
   if (route.children && route.children.length === 0 && !route.index) {
     return null;
   }

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

@@ -66,7 +66,9 @@ const NESTED_ROUTE = {
   PAGE_LOADER_FILE: "page.loader",
   LOADING_FILE: "loading",
   ERROR_FILE: "error",
-  LOADER_FILE: "loader"
+  LOADER_FILE: "loader",
+  SPLATE_FILE: "$",
+  SPLATE_LOADER_FILE: "$.loader"
 };
 const APP_CONFIG_NAME = "config";
 const APP_INIT_EXPORTED = "init";

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

@@ -90,7 +90,7 @@ const createRoute = (routeInfo, rootDir, filename, entryName) => {
   });
 };
 const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, function* () {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (!(yield import_utils.fs.pathExists(dirname))) {
     return null;
   }
@@ -116,6 +116,8 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   };
   let pageLoaderFile = "";
   let pageRoute = null;
+  let splatLoaderFile = "";
+  let splatRoute = null;
   const items = yield import_utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
@@ -156,6 +158,24 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       }
       (_b = route.children) == null ? void 0 : _b.push(pageRoute);
     }
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.SPLATE_LOADER_FILE) {
+      splatLoaderFile = itemPath;
+    }
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.SPLATE_FILE) {
+      splatRoute = createRoute(
+        {
+          _component: (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name),
+          path: "*"
+        },
+        rootDir,
+        itemPath,
+        entryName
+      );
+      if (splatLoaderFile) {
+        splatRoute.loader = splatLoaderFile;
+      }
+      (_c = route.children) == null ? void 0 : _c.push(splatRoute);
+    }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LOADING_FILE) {
       route.loading = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
@@ -172,7 +192,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
-  route.children = (_c = route.children) == null ? void 0 : _c.filter((childRoute) => childRoute);
+  route.children = (_d = route.children) == null ? void 0 : _d.filter((childRoute) => childRoute);
   if (route.children && route.children.length === 0 && !route.index) {
     return null;
   }

package/dist/js/treeshaking/analyze/constants.js

@@ -32,7 +32,9 @@ var NESTED_ROUTE = {
     PAGE_LOADER_FILE: "page.loader",
     LOADING_FILE: "loading",
     ERROR_FILE: "error",
-    LOADER_FILE: "loader"
+    LOADER_FILE: "loader",
+    SPLATE_FILE: "$",
+    SPLATE_LOADER_FILE: "$.loader"
 };
 var APP_CONFIG_NAME = "config";
 var APP_INIT_EXPORTED = "init";

package/dist/js/treeshaking/analyze/nestedRoutes.js

@@ -197,7 +197,7 @@ var createRoute = function(routeInfo, rootDir, filename, entryName) {
 };
 var walk = function() {
     var _ref = _asyncToGenerator(function(dirname, rootDir, alias, entryName) {
-        var ref, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref1, ref2, err, finalRoute;
+        var ref, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref1, ref2, ref3, err, finalRoute;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -242,6 +242,8 @@ var walk = function() {
                     };
                     pageLoaderFile = "";
                     pageRoute = null;
+                    splatLoaderFile = "";
+                    splatRoute = null;
                     return [
                         4,
                         fs.readdir(dirname)
@@ -317,6 +319,20 @@ var walk = function() {
                         }
                         (ref2 = route.children) === null || ref2 === void 0 ? void 0 : ref2.push(pageRoute);
                     }
+                    if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
+                        splatLoaderFile = itemPath;
+                    }
+                    if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
+                        ;
+                        splatRoute = createRoute({
+                            _component: replaceWithAlias(alias.basename, itemPath, alias.name),
+                            path: "*"
+                        }, rootDir, itemPath, entryName);
+                        if (splatLoaderFile) {
+                            splatRoute.loader = splatLoaderFile;
+                        }
+                        (ref3 = route.children) === null || ref3 === void 0 ? void 0 : ref3.push(splatRoute);
+                    }
                     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
                         route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
                     }

package/dist/types/analyze/constants.d.ts

@@ -24,6 +24,8 @@ export declare const NESTED_ROUTE: {
   LOADING_FILE: string;
   ERROR_FILE: string;
   LOADER_FILE: string;
+  SPLATE_FILE: string;
+  SPLATE_LOADER_FILE: string;
 };
 export declare const APP_CONFIG_NAME = "config";
 export declare const APP_INIT_EXPORTED = "init";

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.3.0",
+  "version": "2.3.1-alpha.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -63,8 +63,6 @@
     "@babel/runtime": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
-    "es-module-lexer": "^1.1.0",
-    "esbuild": "0.15.7",
     "@modern-js/builder": "2.3.0",
     "@modern-js/builder-plugin-esbuild": "2.3.0",
     "@modern-js/builder-plugin-node-polyfill": "2.3.0",
@@ -81,19 +79,21 @@
     "@modern-js/server": "2.3.0",
     "@modern-js/types": "2.3.0",
     "@modern-js/upgrade": "2.3.0",
-    "@modern-js/utils": "2.3.0"
+    "@modern-js/utils": "2.3.0",
+    "es-module-lexer": "^1.1.0",
+    "esbuild": "0.15.7"
   },
   "devDependencies": {
+    "@modern-js/builder-plugin-swc": "2.3.0",
+    "@modern-js/server-core": "2.3.0",
+    "@scripts/build": "2.3.0",
+    "@scripts/jest-config": "2.3.0",
     "@types/babel__traverse": "^7.14.2",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "webpack": "^5.75.0",
-    "@modern-js/builder-plugin-swc": "2.3.0",
-    "@modern-js/server-core": "2.3.0",
-    "@scripts/jest-config": "2.3.0",
-    "@scripts/build": "2.3.0"
+    "webpack": "^5.75.0"
   },
   "sideEffects": false,
   "publishConfig": {