@modern-js/app-tools 2.39.2 → 2.40.0

package/dist/cjs/analyze/getBundleEntry.js

@@ -35,6 +35,7 @@ var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_getFileSystemEntry = require("./getFileSystemEntry");
 var import_constants = require("./constants");
+var import_utils2 = require("./utils");
 const ensureExtensions = (file) => {
   if (!import_path.default.extname(file)) {
     return (0, import_utils.findExists)(import_constants.JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
@@ -47,7 +48,7 @@ const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint)
     checked.entryName = entrypoint.entryName;
     return true;
   }
-  if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
+  if ((0, import_utils2.isSubDirOrEqual)(entrypoint.entry, checked.entry) || (0, import_utils2.isSubDirOrEqual)(checked.entry, entrypoint.entry)) {
     throw new Error(`Entry configuration conflicts
  Your configuration: ${checked.entry}.
  Default entrypoint: ${entrypoint.entry}

package/dist/cjs/analyze/index.js

@@ -246,14 +246,6 @@ var analyze_default = ({ bundler }) => ({
           imports
         };
       },
-      validateSchema() {
-        return {
-          target: "output.splitRouteChunks",
-          schema: {
-            type: "boolean"
-          }
-        };
-      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const { appDirectory } = appContext;

package/dist/cjs/analyze/nestedRoutes.js

@@ -78,8 +78,7 @@ const optimizeRoute = (routeTree) => {
     ];
   }
   const { children } = routeTree;
-  const hasPage = children.some((child) => child.index);
-  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData && !hasPage) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData) {
     const newRoutes = children.map((child) => {
       const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
       const newRoute = {

package/dist/cjs/analyze/utils.js

@@ -35,6 +35,7 @@ __export(utils_exports, {
   hasAction: () => hasAction,
   hasLoader: () => hasLoader,
   isPageComponentFile: () => isPageComponentFile,
+  isSubDirOrEqual: () => isSubDirOrEqual,
   parseModule: () => parseModule,
   replaceWithAlias: () => replaceWithAlias,
   walkDirectory: () => walkDirectory
@@ -211,6 +212,14 @@ const checkIsBuildCommands = () => {
   const command = (0, import_utils.getCommand)();
   return buildCommands.includes(command);
 };
+const isSubDirOrEqual = (parent, child) => {
+  if (parent === child) {
+    return true;
+  }
+  const relative = import_path.default.relative(parent, child);
+  const isSubdir = relative && !relative.startsWith("..") && !import_path.default.isAbsolute(relative);
+  return Boolean(isSubdir);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkIsBuildCommands,
@@ -220,6 +229,7 @@ const checkIsBuildCommands = () => {
   hasAction,
   hasLoader,
   isPageComponentFile,
+  isSubDirOrEqual,
   parseModule,
   replaceWithAlias,
   walkDirectory

package/dist/cjs/initialize/index.js

@@ -22,7 +22,6 @@ __export(initialize_exports, {
 });
 module.exports = __toCommonJS(initialize_exports);
 var import_utils = require("@modern-js/utils");
-var import_schema = require("../schema");
 var import_config = require("../config");
 var initialize_default = ({ bundler }) => ({
   name: "@modern-js/plugin-initialize",
@@ -44,14 +43,8 @@ var initialize_default = ({ bundler }) => ({
       });
       return (0, import_config.checkIsLegacyConfig)(userConfig) ? (0, import_config.createLegacyDefaultConfig)(appContext) : (0, import_config.createDefaultConfig)(appContext, bundler);
     };
-    const validateSchema = () => {
-      const userConfig = api.useConfigContext();
-      const schemas = (0, import_config.checkIsLegacyConfig)(userConfig) ? import_schema.legacySchema : import_schema.schema;
-      return schemas.generate();
-    };
     return {
       config,
-      validateSchema,
       async resolvedConfig({ resolved }) {
         var _resolved_output_distPath;
         let appContext = api.useAppContext();

package/dist/esm/analyze/getBundleEntry.js

@@ -2,6 +2,7 @@ import path from "path";
 import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME, isRouterV5 } from "@modern-js/utils";
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
+import { isSubDirOrEqual } from "./utils";
 var ensureExtensions = function(file) {
   if (!path.extname(file)) {
     return findExists(JS_EXTENSIONS.map(function(ext) {
@@ -19,7 +20,7 @@ var ifAlreadyExists = function(entrypoints, checked) {
       checked.entryName = entrypoint.entryName;
       return true;
     }
-    if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
+    if (isSubDirOrEqual(entrypoint.entry, checked.entry) || isSubDirOrEqual(checked.entry, entrypoint.entry)) {
       throw new Error("Entry configuration conflicts\n Your configuration: ".concat(checked.entry, ".\n Default entrypoint: ").concat(entrypoint.entry, "\n Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules."));
     }
     return false;

package/dist/esm/analyze/index.js

@@ -457,14 +457,6 @@ function analyze_default(param) {
             })();
           }
         ),
-        validateSchema: function validateSchema() {
-          return {
-            target: "output.splitRouteChunks",
-            schema: {
-              type: "boolean"
-            }
-          };
-        },
         fileChange: function fileChange(e) {
           return _async_to_generator(function() {
             var appContext, appDirectory, filename, eventType, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, generateCode, entrypoints;

package/dist/esm/analyze/nestedRoutes.js

@@ -45,10 +45,7 @@ var optimizeRoute = function(routeTree) {
     ];
   }
   var children = routeTree.children;
-  var hasPage = children.some(function(child) {
-    return child.index;
-  });
-  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData && !hasPage) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData) {
     var newRoutes = children.map(function(child) {
       var routePath = "".concat(routeTree.path ? routeTree.path : "").concat(child.path ? "/".concat(child.path) : "");
       var newRoute = _object_spread_props(_object_spread({}, child), {

package/dist/esm/analyze/utils.js

@@ -286,6 +286,14 @@ var checkIsBuildCommands = function() {
   var command = getCommand();
   return buildCommands.includes(command);
 };
+var isSubDirOrEqual = function(parent, child) {
+  if (parent === child) {
+    return true;
+  }
+  var relative = path.relative(parent, child);
+  var isSubdir = relative && !relative.startsWith("..") && !path.isAbsolute(relative);
+  return Boolean(isSubdir);
+};
 export {
   checkIsBuildCommands,
   getDefaultImports,
@@ -294,6 +302,7 @@ export {
   hasAction,
   hasLoader,
   isPageComponentFile,
+  isSubDirOrEqual,
   parseModule,
   replaceWithAlias,
   walkDirectory

package/dist/esm/initialize/index.js

@@ -3,7 +3,6 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ensureAbsolutePath, getPort, isDev, isDevCommand } from "@modern-js/utils";
-import { legacySchema, schema } from "../schema";
 import { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig, transformNormalizedConfig } from "../config";
 function initialize_default(param) {
   var bundler = param.bundler;
@@ -26,14 +25,8 @@ function initialize_default(param) {
         }));
         return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext, bundler);
       };
-      var validateSchema = function() {
-        var userConfig = api.useConfigContext();
-        var schemas = checkIsLegacyConfig(userConfig) ? legacySchema : schema;
-        return schemas.generate();
-      };
       return {
         config,
-        validateSchema,
         resolvedConfig: function resolvedConfig(param2) {
           var resolved = param2.resolved;
           return _async_to_generator(function() {

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

@@ -2,6 +2,7 @@ import path from "path";
 import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME, isRouterV5 } from "@modern-js/utils";
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
+import { isSubDirOrEqual } from "./utils";
 const ensureExtensions = (file) => {
   if (!path.extname(file)) {
     return findExists(JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
@@ -14,7 +15,7 @@ const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint)
     checked.entryName = entrypoint.entryName;
     return true;
   }
-  if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
+  if (isSubDirOrEqual(entrypoint.entry, checked.entry) || isSubDirOrEqual(checked.entry, entrypoint.entry)) {
     throw new Error(`Entry configuration conflicts
  Your configuration: ${checked.entry}.
  Default entrypoint: ${entrypoint.entry}

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

@@ -213,14 +213,6 @@ var analyze_default = ({ bundler }) => ({
           imports
         };
       },
-      validateSchema() {
-        return {
-          target: "output.splitRouteChunks",
-          schema: {
-            type: "boolean"
-          }
-        };
-      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const { appDirectory } = appContext;

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

@@ -43,8 +43,7 @@ const optimizeRoute = (routeTree) => {
     ];
   }
   const { children } = routeTree;
-  const hasPage = children.some((child) => child.index);
-  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData && !hasPage) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData) {
     const newRoutes = children.map((child) => {
       const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
       const newRoute = {

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

@@ -169,6 +169,14 @@ const checkIsBuildCommands = () => {
   const command = getCommand();
   return buildCommands.includes(command);
 };
+const isSubDirOrEqual = (parent, child) => {
+  if (parent === child) {
+    return true;
+  }
+  const relative = path.relative(parent, child);
+  const isSubdir = relative && !relative.startsWith("..") && !path.isAbsolute(relative);
+  return Boolean(isSubdir);
+};
 export {
   checkIsBuildCommands,
   getDefaultImports,
@@ -177,6 +185,7 @@ export {
   hasAction,
   hasLoader,
   isPageComponentFile,
+  isSubDirOrEqual,
   parseModule,
   replaceWithAlias,
   walkDirectory

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

@@ -1,5 +1,4 @@
 import { ensureAbsolutePath, getPort, isDev, isDevCommand } from "@modern-js/utils";
-import { legacySchema, schema } from "../schema";
 import { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig, transformNormalizedConfig } from "../config";
 var initialize_default = ({ bundler }) => ({
   name: "@modern-js/plugin-initialize",
@@ -21,14 +20,8 @@ var initialize_default = ({ bundler }) => ({
       });
       return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext, bundler);
     };
-    const validateSchema = () => {
-      const userConfig = api.useConfigContext();
-      const schemas = checkIsLegacyConfig(userConfig) ? legacySchema : schema;
-      return schemas.generate();
-    };
     return {
       config,
-      validateSchema,
       async resolvedConfig({ resolved }) {
         var _resolved_output_distPath;
         let appContext = api.useAppContext();

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

@@ -27,4 +27,5 @@ export declare const hasLoader: (filename: string, source?: string) => Promise<b
 export declare const hasAction: (filename: string, source?: string) => Promise<boolean>;
 export declare const getServerLoadersFile: (internalDirectory: string, entryName: string) => string;
 export declare const getServerCombinedModueFile: (internalDirectory: string, entryName: string) => string;
-export declare const checkIsBuildCommands: () => boolean;
+export declare const checkIsBuildCommands: () => boolean;
+export declare const isSubDirOrEqual: (parent: string, child: string) => boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.39.2",
+  "version": "2.40.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -72,24 +72,24 @@
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.1",
-    "@modern-js/builder": "2.39.2",
-    "@modern-js/builder-plugin-esbuild": "2.39.2",
-    "@modern-js/builder-plugin-node-polyfill": "2.39.2",
-    "@modern-js/builder-shared": "2.39.2",
-    "@modern-js/builder-webpack-provider": "2.39.2",
-    "@modern-js/core": "2.39.2",
-    "@modern-js/new-action": "2.39.2",
-    "@modern-js/node-bundle-require": "2.39.2",
-    "@modern-js/plugin-data-loader": "2.39.2",
-    "@modern-js/plugin": "2.39.2",
-    "@modern-js/plugin-i18n": "2.39.2",
-    "@modern-js/plugin-lint": "2.39.2",
-    "@modern-js/prod-server": "2.39.2",
-    "@modern-js/server": "2.39.2",
-    "@modern-js/types": "2.39.2",
-    "@modern-js/upgrade": "2.39.2",
-    "@modern-js/utils": "2.39.2",
-    "@modern-js/server-core": "2.39.2"
+    "@modern-js/builder": "2.40.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.40.0",
+    "@modern-js/builder-plugin-esbuild": "2.40.0",
+    "@modern-js/builder-shared": "2.40.0",
+    "@modern-js/core": "2.40.0",
+    "@modern-js/builder-webpack-provider": "2.40.0",
+    "@modern-js/new-action": "2.40.0",
+    "@modern-js/node-bundle-require": "2.40.0",
+    "@modern-js/plugin": "2.40.0",
+    "@modern-js/plugin-i18n": "2.40.0",
+    "@modern-js/plugin-data-loader": "2.40.0",
+    "@modern-js/prod-server": "2.40.0",
+    "@modern-js/plugin-lint": "2.40.0",
+    "@modern-js/server": "2.40.0",
+    "@modern-js/types": "2.40.0",
+    "@modern-js/utils": "2.40.0",
+    "@modern-js/upgrade": "2.40.0",
+    "@modern-js/server-core": "2.40.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -98,13 +98,13 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/builder-plugin-swc": "2.39.2",
-    "@modern-js/builder-rspack-provider": "2.39.2",
-    "@scripts/build": "2.39.2",
-    "@scripts/jest-config": "2.39.2"
+    "@modern-js/builder-plugin-swc": "2.40.0",
+    "@modern-js/builder-rspack-provider": "2.40.0",
+    "@scripts/build": "2.40.0",
+    "@scripts/jest-config": "2.40.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.39.2"
+    "@modern-js/builder-rspack-provider": "^2.40.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {

package/dist/cjs/schema/Schema.js

@@ -1,66 +0,0 @@
-"use strict";
-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 Schema_exports = {};
-__export(Schema_exports, {
-  Schema: () => Schema
-});
-module.exports = __toCommonJS(Schema_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
-var import_lodash = require("@modern-js/utils/lodash");
-class Schema extends Map {
-  setSchema(key, object) {
-    Object.entries(object).forEach(([k, v]) => {
-      const target = `${key}.${k}`;
-      this.set(target, v);
-    });
-    return this;
-  }
-  set(key, value) {
-    if (this.has(key)) {
-      (0, import_lodash.merge)(this.schema[key], value);
-    } else {
-      this.schema[key] = value;
-    }
-    return this;
-  }
-  has(key) {
-    return key in this.schema;
-  }
-  get(key) {
-    return this.schema[key];
-  }
-  delete(key) {
-    return delete this.schema[key];
-  }
-  generate() {
-    return Object.entries(this.schema).map(([target, schema]) => ({
-      target,
-      schema
-    }));
-  }
-  constructor(baseSchema = {}) {
-    super();
-    (0, import_define_property._)(this, "schema", void 0);
-    this.schema = baseSchema;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Schema
-});

package/dist/cjs/schema/index.js

@@ -1,205 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var schema_exports = {};
-__export(schema_exports, {
-  legacySchema: () => import_legacy.default,
-  schema: () => schema
-});
-module.exports = __toCommonJS(schema_exports);
-var import_utils = require("@modern-js/utils");
-var import_Schema = require("./Schema");
-var import_legacy = __toESM(require("./legacy"));
-const source = {
-  entries: {
-    type: "object",
-    patternProperties: {
-      [import_utils.ENTRY_NAME_PATTERN]: {
-        if: {
-          type: "object"
-        },
-        then: {
-          required: [
-            "entry"
-          ],
-          properties: {
-            entry: {
-              type: [
-                "string",
-                "array"
-              ]
-            },
-            disableMount: {
-              type: "boolean"
-            },
-            customBootstrap: {
-              type: "string"
-            }
-          },
-          additionalProperties: false
-        },
-        else: {
-          type: [
-            "string",
-            "array"
-          ]
-        }
-      }
-    }
-  },
-  mainEntryName: {
-    type: "string"
-  },
-  enableAsyncEntry: {
-    type: "boolean"
-  },
-  disableDefaultEntries: {
-    type: "boolean"
-  },
-  entriesDir: {
-    type: "string"
-  },
-  disableEntryDirs: {
-    type: "array"
-  },
-  configDir: {
-    type: "string"
-  },
-  designSystem: {
-    type: "object"
-  }
-};
-const bff = {
-  prefix: {
-    type: "string"
-  },
-  httpMethodDecider: {
-    type: "string",
-    enum: [
-      "functionName",
-      "inputParams"
-    ]
-  },
-  proxy: {
-    type: "object",
-    additionalProperties: {
-      type: "string"
-    }
-  }
-};
-const output = {
-  ssg: {
-    typeof: [
-      "boolean",
-      "object",
-      "function"
-    ]
-  },
-  disableNodePolyfill: {
-    type: "boolean"
-  },
-  enableInlineRouteManifests: {
-    type: "boolean"
-  }
-};
-const dev = {};
-const server = {
-  routes: {
-    type: "object"
-  },
-  publicRoutes: {
-    type: "object"
-  },
-  ssr: {
-    type: [
-      "boolean",
-      "object"
-    ]
-  },
-  ssrByEntries: {
-    type: "object"
-  },
-  baseUrl: {
-    anyOf: [
-      {
-        type: "string"
-      },
-      {
-        type: "array",
-        items: {
-          type: "string"
-        }
-      }
-    ]
-  },
-  port: {
-    type: "number"
-  },
-  logger: {
-    type: [
-      "boolean",
-      "object"
-    ]
-  },
-  metrics: {
-    type: [
-      "boolean",
-      "object"
-    ]
-  },
-  enableMicroFrontendDebug: {
-    type: "boolean"
-  },
-  watchOptions: {
-    type: "object"
-  },
-  compiler: {
-    type: "string"
-  },
-  enableFrameworkExt: {
-    type: "boolean"
-  }
-};
-const tools = {
-  esbuild: {
-    typeof: [
-      "object"
-    ]
-  }
-};
-const deploy = {};
-const builderPlugins = {
-  type: "array"
-};
-const schema = new import_Schema.Schema();
-schema.setSchema("bff", bff).setSchema("dev", dev).setSchema("server", server).setSchema("source", source).setSchema("output", output).setSchema("tools", tools).setSchema("deploy", deploy).set("builderPlugin", builderPlugins);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  legacySchema,
-  schema
-});