@modern-js/app-tools 2.2.0 → 2.2.1-alpha.0

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

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

package/dist/js/modern/analyze/index.js

@@ -44,14 +44,15 @@ import {
   fs,
   getEntryOptions,
   isApiOnly,
-  minimist
+  minimist,
+  getCommand,
+  isDevCommand
 } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
-import { getCommand, isDevCommand } from "../utils/commands";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
 import {

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;
   }
@@ -130,6 +130,18 @@ 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_FILE) {
+      const splatRoute = createRoute(
+        {
+          _component: replaceWithAlias(alias.basename, itemPath, alias.name),
+          path: "*"
+        },
+        rootDir,
+        itemPath,
+        entryName
+      );
+      (_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 +158,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/modern/index.js

@@ -39,14 +39,18 @@ var __async = (__this, __arguments, generator) => {
 };
 import path from "path";
 import lintPlugin from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, Import } from "@modern-js/utils";
+import {
+  cleanRequireCache,
+  emptyDir,
+  Import,
+  getCommand
+} from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import analyzePlugin from "./analyze";
 import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
-import { getCommand } from "./utils/commands";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
 export * from "./defineConfig";

package/dist/js/modern/initialize/index.js

@@ -37,9 +37,13 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { ensureAbsolutePath, getPort, isDev } from "@modern-js/utils";
+import {
+  ensureAbsolutePath,
+  getPort,
+  isDev,
+  isDevCommand
+} from "@modern-js/utils";
 import { legacySchema, schema } from "../schema";
-import { isDevCommand } from "../utils/commands";
 import { transformNormalizedConfig } from "../config/initial/transformNormalizedConfig";
 import {
   checkIsLegacyConfig,

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

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

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

@@ -70,7 +70,6 @@ var import_builder = require("../builder");
 var import_printInstructions = require("../utils/printInstructions");
 var import_routes = require("../utils/routes");
 var import_config = require("../utils/config");
-var import_commands = require("../utils/commands");
 var import_getSelectedEntries = require("../utils/getSelectedEntries");
 var import_config2 = require("../config");
 var import_utils2 = require("./utils");
@@ -148,7 +147,7 @@ var analyze_default = () => ({
           yield hookRunners.addDefineTypes();
           debug(`add Define Types`);
           let checkedEntries = entrypoints.map((point) => point.entryName);
-          if ((0, import_commands.isDevCommand)()) {
+          if ((0, import_utils.isDevCommand)()) {
             const { entry } = (0, import_utils.minimist)(process.argv.slice(2));
             checkedEntries = yield (0, import_getSelectedEntries.getSelectedEntries)(
               typeof entry === "string" ? entry.split(",") : entry,
@@ -163,7 +162,7 @@ var analyze_default = () => ({
             htmlTemplates
           });
           api.setAppContext(appContext);
-          const command = (0, import_commands.getCommand)();
+          const command = (0, import_utils.getCommand)();
           const buildCommands = ["dev", "start", "build", "inspect", "deploy"];
           if (buildCommands.includes(command)) {
             let _b;

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;
   }
@@ -156,6 +156,18 @@ 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_FILE) {
+      const splatRoute = createRoute(
+        {
+          _component: (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name),
+          path: "*"
+        },
+        rootDir,
+        itemPath,
+        entryName
+      );
+      (_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 +184,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/index.js

@@ -75,7 +75,6 @@ var import_initialize = __toESM(require("./initialize"));
 var import_hooks = require("./hooks");
 var import_locale = require("./locale");
 var import_language = require("./utils/language");
-var import_commands = require("./utils/commands");
 var import_restart = require("./utils/restart");
 var import_generateWatchFiles = require("./utils/generateWatchFiles");
 __reExport(src_exports, require("./defineConfig"), module.exports);
@@ -194,7 +193,7 @@ var src_default = () => ({
       },
       prepare() {
         return __async(this, null, function* () {
-          const command = (0, import_commands.getCommand)();
+          const command = (0, import_utils.getCommand)();
           if (command === "dev" || command === "start" || command === "build") {
             const appContext = api.useAppContext();
             yield (0, import_utils.emptyDir)(appContext.distDirectory);

package/dist/js/node/initialize/index.js

@@ -59,7 +59,6 @@ __export(initialize_exports, {
 module.exports = __toCommonJS(initialize_exports);
 var import_utils = require("@modern-js/utils");
 var import_schema = require("../schema");
-var import_commands = require("../utils/commands");
 var import_transformNormalizedConfig = require("../config/initial/transformNormalizedConfig");
 var import_config = require("../config");
 var initialize_default = () => ({
@@ -125,7 +124,7 @@ var initialize_default = () => ({
 function getServerPort(config) {
   return __async(this, null, function* () {
     const prodPort = config.server.port || 8080;
-    if ((0, import_utils.isDev)() && (0, import_commands.isDevCommand)()) {
+    if ((0, import_utils.isDev)() && (0, import_utils.isDevCommand)()) {
       return (0, import_utils.getPort)(config.dev.port || prodPort);
     }
     return prodPort;

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

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

package/dist/js/treeshaking/analyze/index.js

@@ -221,13 +221,12 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import * as path from "path";
-import { createDebugger, findExists, fs, getEntryOptions, isApiOnly, minimist } from "@modern-js/utils";
+import { createDebugger, findExists, fs, getEntryOptions, isApiOnly, minimist, getCommand, isDevCommand } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
-import { getCommand, isDevCommand } from "../utils/commands";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
 import { getServerLoadersFile, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";

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, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref1, ref2, ref3, splatRoute, err, finalRoute;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -317,6 +317,14 @@ var walk = function() {
                         }
                         (ref2 = route.children) === null || ref2 === void 0 ? void 0 : ref2.push(pageRoute);
                     }
+                    if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
+                        ;
+                        splatRoute = createRoute({
+                            _component: replaceWithAlias(alias.basename, itemPath, alias.name),
+                            path: "*"
+                        }, rootDir, itemPath, entryName);
+                        (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/js/treeshaking/index.js

@@ -176,14 +176,13 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import path from "path";
 import lintPlugin from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, Import } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, Import, getCommand } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import analyzePlugin from "./analyze";
 import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
-import { getCommand } from "./utils/commands";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
 export * from "./defineConfig";

package/dist/js/treeshaking/initialize/index.js

@@ -174,9 +174,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { ensureAbsolutePath, getPort, isDev } from "@modern-js/utils";
+import { ensureAbsolutePath, getPort, isDev, isDevCommand } from "@modern-js/utils";
 import { legacySchema, schema } from "../schema";
-import { isDevCommand } from "../utils/commands";
 import { transformNormalizedConfig } from "../config/initial/transformNormalizedConfig";
 import { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig } from "../config";
 var initialize_default = function() {

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

@@ -24,6 +24,7 @@ export declare const NESTED_ROUTE: {
   LOADING_FILE: string;
   ERROR_FILE: string;
   LOADER_FILE: string;
+  SPLATE_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.2.0",
+  "version": "2.2.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.2.0",
     "@modern-js/builder-plugin-esbuild": "2.2.0",
     "@modern-js/builder-plugin-node-polyfill": "2.2.0",
@@ -81,19 +79,21 @@
     "@modern-js/server": "2.2.0",
     "@modern-js/types": "2.2.0",
     "@modern-js/upgrade": "2.2.0",
-    "@modern-js/utils": "2.2.0"
+    "@modern-js/utils": "2.2.0",
+    "es-module-lexer": "^1.1.0",
+    "esbuild": "0.15.7"
   },
   "devDependencies": {
+    "@modern-js/builder-plugin-swc": "2.2.0",
+    "@modern-js/server-core": "2.2.0",
+    "@scripts/build": "2.2.0",
+    "@scripts/jest-config": "2.2.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.2.0",
-    "@modern-js/server-core": "2.2.0",
-    "@scripts/jest-config": "2.2.0",
-    "@scripts/build": "2.2.0"
+    "webpack": "^5.75.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/js/modern/utils/commands.js

@@ -1,13 +0,0 @@
-const getCommand = () => {
-  const args = process.argv.slice(2);
-  const command = args[0];
-  return command;
-};
-const isDevCommand = () => {
-  const command = getCommand();
-  return command === "dev" || command === "start";
-};
-export {
-  getCommand,
-  isDevCommand
-};

package/dist/js/node/utils/commands.js

@@ -1,37 +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 commands_exports = {};
-__export(commands_exports, {
-  getCommand: () => getCommand,
-  isDevCommand: () => isDevCommand
-});
-module.exports = __toCommonJS(commands_exports);
-const getCommand = () => {
-  const args = process.argv.slice(2);
-  const command = args[0];
-  return command;
-};
-const isDevCommand = () => {
-  const command = getCommand();
-  return command === "dev" || command === "start";
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getCommand,
-  isDevCommand
-});

package/dist/js/treeshaking/utils/commands.js

@@ -1,10 +0,0 @@
-var getCommand = function() {
-    var args = process.argv.slice(2);
-    var command = args[0];
-    return command;
-};
-var isDevCommand = function() {
-    var command = getCommand();
-    return command === "dev" || command === "start";
-};
-export { getCommand, isDevCommand };

package/dist/types/utils/commands.d.ts

@@ -1,2 +0,0 @@
-export declare const getCommand: () => string;
-export declare const isDevCommand: () => boolean;