@modern-js/core 2.39.2 → 2.40.0

package/dist/config/createResolvedConfig.d.ts

@@ -1,3 +1,2 @@
-import type { ErrorObject } from '@modern-js/utils/ajv';
-import type { UserConfig, NormalizedConfig, LoadedConfig, PluginValidateSchema } from '../types';
-export declare const createResolveConfig: (loaded: LoadedConfig<{}>, configs: UserConfig[], schemas: PluginValidateSchema[], onSchemaError?: ((error: ErrorObject) => void | Promise<void>) | undefined) => Promise<NormalizedConfig>;
+import type { UserConfig, NormalizedConfig, LoadedConfig } from '../types';
+export declare const createResolveConfig: (loaded: LoadedConfig<{}>, configs: UserConfig[]) => Promise<NormalizedConfig>;

package/dist/config/createResolvedConfig.js

@@ -1,9 +1,7 @@
 "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)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 createResolvedConfig_exports = {};
 __export(createResolvedConfig_exports, {
@@ -32,50 +22,11 @@ __export(createResolvedConfig_exports, {
 });
 module.exports = __toCommonJS(createResolvedConfig_exports);
 var import_utils = require("@modern-js/utils");
-var import_patchSchema = require("../schema/patchSchema");
-var import_repeatKeyWarning = require("../utils/repeatKeyWarning");
 var import_mergeConfig = require("../utils/mergeConfig");
 var import_createDefaultConfig = require("./createDefaultConfig");
 const debug = (0, import_utils.createDebugger)("resolve-config");
-const createResolveConfig = async (loaded, configs, schemas, onSchemaError) => {
-  var _validate_errors;
-  const { default: Ajv } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils/ajv")));
-  const { default: ajvKeywords } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils/ajv-keywords")));
-  const { default: betterAjvErrors } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils/better-ajv-errors")));
-  const { config: userConfig, jsConfig, pkgConfig } = loaded;
-  const ajv = new Ajv({
-    $data: true,
-    strict: false
-  });
-  ajvKeywords(ajv);
-  const validateSchema = (0, import_patchSchema.patchSchema)(schemas);
-  const validate = ajv.compile(validateSchema);
-  (0, import_repeatKeyWarning.repeatKeyWarning)(validateSchema, jsConfig, pkgConfig);
-  const valid = validate(userConfig);
-  const formatValidateError = (config) => {
-    var _validate_errors2;
-    return betterAjvErrors(validateSchema, config, (_validate_errors2 = validate.errors) === null || _validate_errors2 === void 0 ? void 0 : _validate_errors2.map((e) => ({
-      ...e,
-      dataPath: e.instancePath
-    })), {
-      indent: 2
-    });
-  };
-  if (!valid && ((_validate_errors = validate.errors) === null || _validate_errors === void 0 ? void 0 : _validate_errors.length)) {
-    if (onSchemaError) {
-      await onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
-    }
-    const errors = formatValidateError(userConfig);
-    import_utils.logger.log(errors);
-    throw new Error(`Validate configuration error`);
-  }
-  for (const config of configs) {
-    if (!validate(config)) {
-      const errors = formatValidateError(config);
-      import_utils.logger.error(errors);
-      throw new Error(`Validate configuration error.`);
-    }
-  }
+const createResolveConfig = async (loaded, configs) => {
+  const { config: userConfig } = loaded;
   const resolved = (0, import_mergeConfig.mergeConfig)([
     (0, import_createDefaultConfig.createDefaultConfig)(),
     ...configs,

package/dist/createCli.js

@@ -95,8 +95,7 @@ const createCli = () => {
     });
     await hooksRunner.beforeConfig();
     const extraConfigs = await hooksRunner.config();
-    const extraSchemas = await hooksRunner.validateSchema();
-    const normalizedConfig = await (0, import_config.createResolveConfig)(loaded, extraConfigs, extraSchemas, options === null || options === void 0 ? void 0 : options.onSchemaError);
+    const normalizedConfig = await (0, import_config.createResolveConfig)(loaded, extraConfigs);
     const { resolved } = await hooksRunner.resolvedConfig({
       resolved: normalizedConfig
     });

package/dist/manager.d.ts

@@ -5,7 +5,6 @@ export declare const manager: import("@modern-js/plugin").AsyncManager<{
   resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
     resolved: import("./types").NormalizedConfig<{}>;
   }>;
-  validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
   prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
   afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
   watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, string[] | {
@@ -29,7 +28,6 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
       resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, string[] | {
@@ -52,7 +50,6 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
       resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, string[] | {
@@ -75,7 +72,6 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
       resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, string[] | {
@@ -98,7 +94,6 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
       resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, string[] | {
@@ -121,7 +116,6 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     resolvedConfig: import("@modern-js/plugin").AsyncWaterfall<{
       resolved: import("./types").NormalizedConfig<{}>;
     }>;
-    validateSchema: import("@modern-js/plugin").ParallelWorkflow<void>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, string[] | {

package/dist/manager.js

@@ -29,7 +29,6 @@ const baseHooks = {
   beforeConfig: (0, import_plugin.createAsyncWorkflow)(),
   config: (0, import_plugin.createParallelWorkflow)(),
   resolvedConfig: (0, import_plugin.createAsyncWaterfall)(),
-  validateSchema: (0, import_plugin.createParallelWorkflow)(),
   prepare: (0, import_plugin.createAsyncWorkflow)(),
   afterPrepare: (0, import_plugin.createAsyncWorkflow)(),
   commands: (0, import_plugin.createAsyncWorkflow)(),

package/dist/types/coreOptions.d.ts

@@ -1,4 +1,3 @@
-import type { ErrorObject } from '@modern-js/utils/compiled/ajv';
 import type { InternalPlugins } from './plugin';
 import type { UserConfig } from './config';
 export interface CoreOptions {
@@ -16,7 +15,6 @@ export interface CoreOptions {
     server?: InternalPlugins;
     autoLoad?: InternalPlugins;
   };
-  onSchemaError?: (error: ErrorObject) => void;
   options?: {
     metaName?: string;
     srcDir?: string;

package/dist/types/hooks.d.ts

@@ -11,7 +11,6 @@ export type BaseHooks<Extends extends {
   resolvedConfig: AsyncWaterfall<{
     resolved: NormalizedConfig<Extends>;
   }>;
-  validateSchema: ParallelWorkflow<void>;
   prepare: AsyncWorkflow<void, void>;
   afterPrepare: AsyncWorkflow<void, void>;
   watchFiles: ParallelWorkflow<void, string[] | {

package/dist/types/index.d.ts

@@ -1,11 +1,6 @@
-import type { JSONSchemaType } from '@modern-js/utils/ajv/json-schema';
 export * from './plugin';
 export * from './config';
 export * from './pluginAPI';
 export * from './hooks';
 export * from './context';
-export * from './coreOptions';
-export interface PluginValidateSchema {
-  target: string;
-  schema: JSONSchemaType<any>;
-}
+export * from './coreOptions';

package/dist/utils/index.d.ts

@@ -2,5 +2,4 @@ export * from './commander';
 export * from './createFileWatcher';
 export * from './initAppDir';
 export * from './mergeConfig';
-export * from './repeatKeyWarning';
 export * from './checkIsDuplicationPlugin';

package/dist/utils/index.js

@@ -19,7 +19,6 @@ __reExport(utils_exports, require("./commander"), module.exports);
 __reExport(utils_exports, require("./createFileWatcher"), module.exports);
 __reExport(utils_exports, require("./initAppDir"), module.exports);
 __reExport(utils_exports, require("./mergeConfig"), module.exports);
-__reExport(utils_exports, require("./repeatKeyWarning"), module.exports);
 __reExport(utils_exports, require("./checkIsDuplicationPlugin"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -27,6 +26,5 @@ __reExport(utils_exports, require("./checkIsDuplicationPlugin"), module.exports)
   ...require("./createFileWatcher"),
   ...require("./initAppDir"),
   ...require("./mergeConfig"),
-  ...require("./repeatKeyWarning"),
   ...require("./checkIsDuplicationPlugin")
 });

package/package.json

@@ -14,7 +14,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.39.2",
+  "version": "2.40.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -71,9 +71,9 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/node-bundle-require": "2.39.2",
-    "@modern-js/plugin": "2.39.2",
-    "@modern-js/utils": "2.39.2"
+    "@modern-js/node-bundle-require": "2.40.0",
+    "@modern-js/plugin": "2.40.0",
+    "@modern-js/utils": "2.40.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -81,10 +81,10 @@
     "tsm": "2.3.0",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/builder-shared": "2.39.2",
-    "@modern-js/types": "2.39.2",
-    "@scripts/build": "2.39.2",
-    "@scripts/jest-config": "2.39.2"
+    "@modern-js/builder-shared": "2.40.0",
+    "@modern-js/types": "2.40.0",
+    "@scripts/build": "2.40.0",
+    "@scripts/jest-config": "2.40.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/schema/patchSchema.d.ts

@@ -1,5 +0,0 @@
-import { PluginValidateSchema } from '../types';
-export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | PluginValidateSchema[]>) => {
-  type: string;
-  properties: {};
-};

package/dist/schema/patchSchema.js

@@ -1,74 +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 patchSchema_exports = {};
-__export(patchSchema_exports, {
-  patchSchema: () => patchSchema
-});
-module.exports = __toCommonJS(patchSchema_exports);
-var import_utils = require("@modern-js/utils");
-var import_lodash = require("@modern-js/utils/lodash");
-const debug = (0, import_utils.createDebugger)("validate-schema");
-const patchSchema = (pluginSchemas) => {
-  const finalSchema = {
-    type: "object",
-    properties: {}
-  };
-  const findTargetNode = (props) => {
-    let node = finalSchema.properties;
-    for (const prop of props) {
-      if (!node[prop]) {
-        node[prop] = {
-          type: "object"
-        };
-      }
-      node = node[prop];
-      if (!node || !(0, import_utils.isObject)(node)) {
-        throw new Error(`add schema ${props.join(".")} error`);
-      }
-      node.properties = node.hasOwnProperty("properties") ? node.properties : {};
-      node = node.properties;
-    }
-    return node;
-  };
-  const finalPluginSchemas = [];
-  pluginSchemas.forEach((item) => {
-    if (Array.isArray(item)) {
-      finalPluginSchemas.push(...item);
-    } else {
-      finalPluginSchemas.push(item);
-    }
-  });
-  for (const { target, schema } of finalPluginSchemas) {
-    if (!target) {
-      throw new Error(`should return target property in plugin schema.`);
-    }
-    const props = target.split(".");
-    const mountProperty = props.pop();
-    const targetNode = findTargetNode(props);
-    if (!targetNode.hasOwnProperty(mountProperty)) {
-      targetNode[mountProperty] = (0, import_lodash.cloneDeep)(schema);
-    }
-  }
-  debug(`final validate schema: %o`, finalSchema);
-  return finalSchema;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  patchSchema
-});

package/dist/schema/traverseSchema.d.ts

@@ -1,2 +0,0 @@
-import { patchSchema } from './patchSchema';
-export declare const traverseSchema: (schema: ReturnType<typeof patchSchema>) => string[];

package/dist/schema/traverseSchema.js

@@ -1,45 +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 traverseSchema_exports = {};
-__export(traverseSchema_exports, {
-  traverseSchema: () => traverseSchema
-});
-module.exports = __toCommonJS(traverseSchema_exports);
-const traverseSchema = (schema) => {
-  const keys = [];
-  const traverse = ({ properties }, old = []) => {
-    for (const key of Object.keys(properties)) {
-      const current = [
-        ...old,
-        key
-      ];
-      if (properties[key].type === "object" && properties[key].properties) {
-        traverse(properties[key], current);
-      } else {
-        keys.push(current.join("."));
-      }
-    }
-  };
-  traverse(schema);
-  return keys;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  traverseSchema
-});

package/dist/utils/repeatKeyWarning.d.ts

@@ -1,3 +0,0 @@
-import { UserConfig } from '../types';
-export declare const deepGet: (obj: any, key: string) => any;
-export declare const repeatKeyWarning: <E extends Record<string, any>>(schema: any, jsConfig: UserConfig<E>, pkgConfig: UserConfig<E>) => void;

package/dist/utils/repeatKeyWarning.js

@@ -1,45 +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 repeatKeyWarning_exports = {};
-__export(repeatKeyWarning_exports, {
-  deepGet: () => deepGet,
-  repeatKeyWarning: () => repeatKeyWarning
-});
-module.exports = __toCommonJS(repeatKeyWarning_exports);
-var import_traverseSchema = require("../schema/traverseSchema");
-const deepGet = (obj, key) => {
-  for (const p of key.split(".")) {
-    obj = obj ? obj[p] : void 0;
-  }
-  return obj;
-};
-const repeatKeyWarning = (schema, jsConfig, pkgConfig) => {
-  const keys = (0, import_traverseSchema.traverseSchema)(schema);
-  for (const key of keys) {
-    if (deepGet(jsConfig, key) !== void 0 && deepGet(pkgConfig, key) !== void 0) {
-      throw new Error(`The same configuration ${key} exists in modern.config.js and package.json.
- Please remove it from package.json.`);
-    }
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  deepGet,
-  repeatKeyWarning
-});