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

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);
     }
@@ -137,7 +157,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
     }
   }
-  const finalRoute = createRoute(
+  let finalRoute = createRoute(
     route,
     rootDir,
     path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`),
@@ -146,10 +166,19 @@ 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;
   }
+  if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
+    const childRoute = finalRoute.children[0];
+    if (childRoute.path === "*") {
+      const path2 = (finalRoute.path || "") + (childRoute.path || "");
+      finalRoute = __spreadProps(__spreadValues({}, childRoute), {
+        path: path2
+      });
+    }
+  }
   return finalRoute;
 });
 export {

package/dist/js/modern/analyze/templates.js

@@ -198,7 +198,6 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
   `;
   let rootLayoutCode = ``;
-  let componentLoaderPath = "";
   const getDataLoaderPath = (loaderId) => {
     if (!ssrMode) {
       return "";
@@ -211,12 +210,6 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     }
     return dataLoaderPath;
   };
-  if (ssrMode) {
-    componentLoaderPath = `${path.join(
-      __dirname,
-      "../builder/loaders/routerLoader"
-    )}!`;
-  }
   const traverseRouteTree = (route) => {
     var _a;
     let children;
@@ -252,10 +245,10 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
           rootLayoutCode = `import RootLayout from '${route._component}'`;
           component = `RootLayout`;
         } else if (ssrMode === "string") {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
           component = `loadable(${lazyImport})`;
         } else {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
           component = `lazy(${lazyImport})`;
         }
       }

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);
     }
@@ -163,7 +183,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       route.error = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
   }
-  const finalRoute = createRoute(
+  let finalRoute = createRoute(
     route,
     rootDir,
     path.join(dirname, `${import_constants.NESTED_ROUTE.LAYOUT_FILE}.ts`),
@@ -172,10 +192,19 @@ 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;
   }
+  if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
+    const childRoute = finalRoute.children[0];
+    if (childRoute.path === "*") {
+      const path2 = (finalRoute.path || "") + (childRoute.path || "");
+      finalRoute = __spreadProps(__spreadValues({}, childRoute), {
+        path: path2
+      });
+    }
+  }
   return finalRoute;
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/js/node/analyze/templates.js

@@ -228,7 +228,6 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
   `;
   let rootLayoutCode = ``;
-  let componentLoaderPath = "";
   const getDataLoaderPath = (loaderId) => {
     if (!ssrMode) {
       return "";
@@ -241,12 +240,6 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     }
     return dataLoaderPath;
   };
-  if (ssrMode) {
-    componentLoaderPath = `${import_path.default.join(
-      __dirname,
-      "../builder/loaders/routerLoader"
-    )}!`;
-  }
   const traverseRouteTree = (route) => {
     var _a;
     let children;
@@ -282,10 +275,10 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
           rootLayoutCode = `import RootLayout from '${route._component}'`;
           component = `RootLayout`;
         } else if (ssrMode === "string") {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
           component = `loadable(${lazyImport})`;
         } else {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
           component = `lazy(${lazyImport})`;
         }
       }

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, childRoute1, path2;
         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);
                     }
@@ -370,6 +386,15 @@ var walk = function() {
                             null
                         ];
                     }
+                    if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
+                        childRoute1 = finalRoute.children[0];
+                        if (childRoute1.path === "*") {
+                            path2 = (finalRoute.path || "") + (childRoute1.path || "");
+                            finalRoute = _objectSpreadProps(_objectSpread({}, childRoute1), {
+                                path: path2
+                            });
+                        }
+                    }
                     return [
                         2,
                         finalRoute

package/dist/js/treeshaking/analyze/templates.js

@@ -296,7 +296,7 @@ var routesForServer = function(param) {
 };
 var fileSystemRoutes = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, componentLoaderPath, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value, key, loaderInfo;
+        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _value, key, loaderInfo;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -308,7 +308,6 @@ var fileSystemRoutes = function() {
                     loadersMapFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "map.json");
                     importLazyCode = '\n    import { lazy } from "react";\n    import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"\n  ';
                     rootLayoutCode = "";
-                    componentLoaderPath = "";
                     getDataLoaderPath = function(loaderId) {
                         if (!ssrMode) {
                             return "";
@@ -319,9 +318,6 @@ var fileSystemRoutes = function() {
                         }
                         return dataLoaderPath;
                     };
-                    if (ssrMode) {
-                        componentLoaderPath = "".concat(path.join(__dirname, "../builder/loaders/routerLoader"), "!");
-                    }
                     traverseRouteTree = function(route) {
                         var children;
                         if ("children" in route && route.children) {
@@ -357,10 +353,10 @@ var fileSystemRoutes = function() {
                                     rootLayoutCode = "import RootLayout from '".concat(route._component, "'");
                                     component = "RootLayout";
                                 } else if (ssrMode === "string") {
-                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "')");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
                                     component = "loadable(".concat(lazyImport, ")");
                                 } else {
-                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "')");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
                                     component = "lazy(".concat(lazyImport, ")");
                                 }
                             }

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/dist/types/defineConfig.d.ts

@@ -1,5 +1,6 @@
-import { AppUserConfig, AppLegacyUserConfig } from './types';
-export declare const defineConfig: (config: AppUserConfig) => AppUserConfig;
+import type { UserConfigExport } from '@modern-js/core';
+import type { AppUserConfig, AppLegacyUserConfig } from './types';
+export declare const defineConfig: (config: UserConfigExport<AppUserConfig>) => UserConfigExport<AppUserConfig>;
 /**
  * @deprecated
  * Using defineConfig first.

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.3.0",
+  "version": "2.3.1-alpha.0",
   "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": {

package/dist/js/modern/builder/loaders/routerLoader.js

@@ -1,17 +0,0 @@
-import { slash } from "@modern-js/utils";
-function loader(source) {
-  this.cacheable();
-  const { target } = this._compiler.options;
-  if (target === "node" || Array.isArray(target) && target.includes("node")) {
-    return source;
-  }
-  const { resourcePath } = this;
-  const code = `
-    export { default } from "${slash(resourcePath)}";
-  `;
-  return code;
-}
-var routerLoader_default = loader;
-export {
-  routerLoader_default as default
-};

package/dist/js/node/builder/loaders/routerLoader.js

@@ -1,38 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var routerLoader_exports = {};
-__export(routerLoader_exports, {
-  default: () => routerLoader_default
-});
-module.exports = __toCommonJS(routerLoader_exports);
-var import_utils = require("@modern-js/utils");
-function loader(source) {
-  this.cacheable();
-  const { target } = this._compiler.options;
-  if (target === "node" || Array.isArray(target) && target.includes("node")) {
-    return source;
-  }
-  const { resourcePath } = this;
-  const code = `
-    export { default } from "${(0, import_utils.slash)(resourcePath)}";
-  `;
-  return code;
-}
-var routerLoader_default = loader;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/js/treeshaking/builder/loaders/routerLoader.js

@@ -1,13 +0,0 @@
-import { slash } from "@modern-js/utils";
-function loader(source) {
-    this.cacheable();
-    var target = this._compiler.options.target;
-    if (target === "node" || Array.isArray(target) && target.includes("node")) {
-        return source;
-    }
-    var resourcePath = this.resourcePath;
-    var code = '\n    export { default } from "'.concat(slash(resourcePath), '";\n  ');
-    return code;
-}
-var routerLoader_default = loader;
-export { routerLoader_default as default };

package/dist/types/builder/loaders/routerLoader.d.ts

@@ -1,3 +0,0 @@
-import type { LoaderContext } from 'webpack';
-declare function loader(this: LoaderContext<void>, source: string): string;
-export default loader;