@modern-js/core 2.26.0 → 2.28.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @modern-js/core
 
+## 2.28.0
+
+### Patch Changes
+
+- Updated dependencies [00b58a7]
+  - @modern-js/utils@2.28.0
+  - @modern-js/node-bundle-require@2.28.0
+  - @modern-js/plugin@2.28.0
+
+## 2.27.0
+
+### Patch Changes
+
+- 8322a51: chore: migrate packages from tsc to module-lib build
+
+  chore: 将使用 tsc 的包迁移到 module-lib 构建
+
+- Updated dependencies [91d14b8]
+- Updated dependencies [6d7104d]
+  - @modern-js/utils@2.27.0
+  - @modern-js/node-bundle-require@2.27.0
+  - @modern-js/plugin@2.27.0
+
 ## 2.26.0
 
 ### Patch Changes

package/dist/bin.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-export {};
+export {};

package/dist/bin.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const runBin_1 = require("./runBin");
-(0, runBin_1.run)();
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+const _runBin = require("./runBin");
+(0, _runBin.run)();

package/dist/config/createDefaultConfig.d.ts

@@ -1,2 +1,2 @@
 import { UserConfig } from '../types';
-export declare function createDefaultConfig(): UserConfig;
+export declare function createDefaultConfig(): UserConfig;

package/dist/config/createDefaultConfig.js

@@ -1,9 +1,15 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDefaultConfig = void 0;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "createDefaultConfig", {
+  enumerable: true,
+  get: function() {
+    return createDefaultConfig;
+  }
+});
 function createDefaultConfig() {
-    return {
-        autoLoadPlugins: false,
-    };
+  return {
+    autoLoadPlugins: false
+  };
 }
-exports.createDefaultConfig = createDefaultConfig;

package/dist/config/createLoadedConfig.d.ts

@@ -3,4 +3,4 @@ import { LoadedConfig, UserConfig } from '../types';
  * Assign the pkg config into the user config.
  */
 export declare const assignPkgConfig: (userConfig?: UserConfig, pkgConfig?: UserConfig) => UserConfig;
-export declare function createLoadedConfig(appDirectory: string, filePath?: string, packageJsonConfig?: string, loadedConfig?: UserConfig): Promise<LoadedConfig<{}>>;
+export declare function createLoadedConfig(appDirectory: string, filePath?: string, packageJsonConfig?: string, loadedConfig?: UserConfig): Promise<LoadedConfig<{}>>;

package/dist/config/createLoadedConfig.js

@@ -1,84 +1,92 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLoadedConfig = exports.assignPkgConfig = void 0;
-const path_1 = __importDefault(require("path"));
-const lodash_1 = require("@modern-js/utils/lodash");
-const utils_1 = require("@modern-js/utils");
-const utils_2 = require("../utils");
-const loadConfig_1 = require("./loadConfig");
-/**
- * Assign the pkg config into the user config.
- */
-const assignPkgConfig = (userConfig = {}, pkgConfig = {}) => (0, lodash_1.mergeWith)({}, userConfig, pkgConfig, (objValue, srcValue) => {
-    // mergeWith can not merge object with symbol, but plugins object contains symbol,
-    // so we need to handle it manually.
-    if (objValue === undefined && (0, utils_1.isPlainObject)(srcValue)) {
-        return { ...srcValue };
-    }
-    // return undefined to use the default behavior of mergeWith
-    return undefined;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  assignPkgConfig: function() {
+    return assignPkgConfig;
+  },
+  createLoadedConfig: function() {
+    return createLoadedConfig;
+  }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _lodash = require("@modern-js/utils/lodash");
+const _utils = require("@modern-js/utils");
+const _utils1 = require("../utils");
+const _loadConfig = require("./loadConfig");
+const assignPkgConfig = (userConfig = {}, pkgConfig = {}) => (0, _lodash.mergeWith)({}, userConfig, pkgConfig, (objValue, srcValue) => {
+  if (objValue === void 0 && (0, _utils.isPlainObject)(srcValue)) {
+    return {
+      ...srcValue
+    };
+  }
+  return void 0;
 });
-exports.assignPkgConfig = assignPkgConfig;
-/**
- * A modern config can export a function or an object
- * If it's a function, it will be called and return a config object
- */
 async function getConfigObject(config) {
-    if (typeof config === 'function') {
-        return (await config({ env: (0, utils_1.getNodeEnv)(), command: (0, utils_1.getCommand)() })) || {};
-    }
-    return config || {};
+  if (typeof config === "function") {
+    return await config({
+      env: (0, _utils.getNodeEnv)(),
+      command: (0, _utils.getCommand)()
+    }) || {};
+  }
+  return config || {};
 }
 async function loadLocalConfig(appDirectory, configFile) {
-    let localConfigFile = false;
-    if (typeof configFile === 'string') {
-        for (const ext of utils_1.CONFIG_FILE_EXTENSIONS) {
-            if (configFile.endsWith(ext)) {
-                const replacedPath = configFile.replace(ext, `.local${ext}`);
-                if (utils_1.fs.existsSync(replacedPath)) {
-                    localConfigFile = replacedPath;
-                }
-            }
+  let localConfigFile = false;
+  if (typeof configFile === "string") {
+    for (const ext of _utils.CONFIG_FILE_EXTENSIONS) {
+      if (configFile.endsWith(ext)) {
+        const replacedPath = configFile.replace(ext, `.local${ext}`);
+        if (_utils.fs.existsSync(replacedPath)) {
+          localConfigFile = replacedPath;
         }
+      }
     }
-    else {
-        localConfigFile = (0, utils_1.findExists)(utils_1.CONFIG_FILE_EXTENSIONS.map(extension => path_1.default.resolve(appDirectory, `${loadConfig_1.LOCAL_CONFIG_FILE_NAME}${extension}`)));
-    }
-    if (localConfigFile) {
-        const loaded = await (0, loadConfig_1.loadConfig)(appDirectory, localConfigFile);
-        return getConfigObject(loaded.config);
-    }
-    return null;
+  } else {
+    localConfigFile = (0, _utils.findExists)(_utils.CONFIG_FILE_EXTENSIONS.map((extension) => _path.default.resolve(appDirectory, `${_loadConfig.LOCAL_CONFIG_FILE_NAME}${extension}`)));
+  }
+  if (localConfigFile) {
+    const loaded = await (0, _loadConfig.loadConfig)(appDirectory, localConfigFile);
+    return getConfigObject(loaded.config);
+  }
+  return null;
 }
 async function createLoadedConfig(appDirectory, filePath, packageJsonConfig, loadedConfig) {
-    const configFile = (0, loadConfig_1.getConfigFilePath)(appDirectory, filePath);
-    const loaded = await (0, loadConfig_1.loadConfig)(appDirectory, configFile, packageJsonConfig, loadedConfig);
-    if (!loaded.config && !loaded.pkgConfig) {
-        utils_1.logger.warn(`Can not find any config file in the current project, please check if you have a correct config file.`);
-        utils_1.logger.warn(`Current project path: ${utils_1.chalk.yellow(appDirectory)}`);
+  const configFile = (0, _loadConfig.getConfigFilePath)(appDirectory, filePath);
+  const loaded = await (0, _loadConfig.loadConfig)(appDirectory, configFile, packageJsonConfig, loadedConfig);
+  if (!loaded.config && !loaded.pkgConfig) {
+    _utils.logger.warn(`Can not find any config file in the current project, please check if you have a correct config file.`);
+    _utils.logger.warn(`Current project path: ${_utils.chalk.yellow(appDirectory)}`);
+  }
+  const config = await getConfigObject(loaded.config);
+  let mergedConfig = config;
+  if (loaded.pkgConfig) {
+    var _loaded;
+    mergedConfig = assignPkgConfig(config, (_loaded = loaded) === null || _loaded === void 0 ? void 0 : _loaded.pkgConfig);
+  }
+  if ((0, _utils.isDevCommand)()) {
+    const localConfig = await loadLocalConfig(appDirectory, configFile);
+    if (localConfig) {
+      mergedConfig = (0, _utils1.mergeConfig)([
+        mergedConfig,
+        localConfig
+      ]);
     }
-    const config = await getConfigObject(loaded.config);
-    let mergedConfig = config;
-    if (loaded.pkgConfig) {
-        mergedConfig = (0, exports.assignPkgConfig)(config, loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig);
-    }
-    // Only load local config when running dev command
-    if ((0, utils_1.isDevCommand)()) {
-        const localConfig = await loadLocalConfig(appDirectory, configFile);
-        // The priority of local config is higher than the user config and pkg config
-        if (localConfig) {
-            mergedConfig = (0, utils_2.mergeConfig)([mergedConfig, localConfig]);
-        }
-    }
-    return {
-        config: mergedConfig,
-        filePath: loaded.path,
-        dependencies: loaded.dependencies || [],
-        pkgConfig: loaded.pkgConfig || {},
-        jsConfig: config || {},
-    };
+  }
+  return {
+    config: mergedConfig,
+    filePath: loaded.path,
+    dependencies: loaded.dependencies || [],
+    pkgConfig: loaded.pkgConfig || {},
+    jsConfig: config || {}
+  };
 }
-exports.createLoadedConfig = createLoadedConfig;

package/dist/config/createResolvedConfig.d.ts

@@ -1,3 +1,3 @@
 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>;
+export declare const createResolveConfig: (loaded: LoadedConfig<{}>, configs: UserConfig[], schemas: PluginValidateSchema[], onSchemaError?: ((error: ErrorObject) => void | Promise<void>) | undefined) => Promise<NormalizedConfig>;

package/dist/config/createResolvedConfig.js

@@ -1,77 +1,65 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createResolveConfig = void 0;
-const utils_1 = require("@modern-js/utils");
-const patchSchema_1 = require("../schema/patchSchema");
-const repeatKeyWarning_1 = require("../utils/repeatKeyWarning");
-const mergeConfig_1 = require("../utils/mergeConfig");
-const createDefaultConfig_1 = require("./createDefaultConfig");
-const debug = (0, utils_1.createDebugger)('resolve-config');
-const createResolveConfig = async (
-// eslint-disable-next-line @typescript-eslint/ban-types
-loaded, configs, schemas, onSchemaError) => {
-    var _a;
-    const { default: Ajv } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/ajv')));
-    const { default: ajvKeywords } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/ajv-keywords')));
-    const { default: betterAjvErrors } = await Promise.resolve().then(() => __importStar(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, patchSchema_1.patchSchema)(schemas);
-    const validate = ajv.compile(validateSchema);
-    (0, repeatKeyWarning_1.repeatKeyWarning)(validateSchema, jsConfig, pkgConfig);
-    // validate user config.
-    const valid = validate(userConfig);
-    const formatValidateError = (config) => {
-        var _a;
-        return betterAjvErrors(validateSchema, config, (_a = validate.errors) === null || _a === void 0 ? void 0 : _a.map(e => ({
-            ...e,
-            dataPath: e.instancePath,
-        })), {
-            indent: 2,
-        });
-    };
-    if (!valid && ((_a = validate.errors) === null || _a === void 0 ? void 0 : _a.length)) {
-        if (onSchemaError) {
-            await onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
-        }
-        const errors = formatValidateError(userConfig);
-        utils_1.logger.log(errors);
-        throw new Error(`Validate configuration error`);
+Object.defineProperty(exports, "createResolveConfig", {
+  enumerable: true,
+  get: function() {
+    return createResolveConfig;
+  }
+});
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _utils = require("@modern-js/utils");
+const _patchSchema = require("../schema/patchSchema");
+const _repeatKeyWarning = require("../utils/repeatKeyWarning");
+const _mergeConfig = require("../utils/mergeConfig");
+const _createDefaultConfig = require("./createDefaultConfig");
+const debug = (0, _utils.createDebugger)("resolve-config");
+const createResolveConfig = async (loaded, configs, schemas, onSchemaError) => {
+  var _validate_errors;
+  const { default: Ajv } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils/ajv")));
+  const { default: ajvKeywords } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils/ajv-keywords")));
+  const { default: betterAjvErrors } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(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, _patchSchema.patchSchema)(schemas);
+  const validate = ajv.compile(validateSchema);
+  (0, _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) {
+      var _validate;
+      await onSchemaError((_validate = validate) === null || _validate === void 0 ? void 0 : _validate.errors[0]);
     }
-    // validate config from plugins.
-    for (const config of configs) {
-        if (!validate(config)) {
-            const errors = formatValidateError(config);
-            utils_1.logger.error(errors);
-            throw new Error(`Validate configuration error.`);
-        }
+    const errors = formatValidateError(userConfig);
+    _utils.logger.log(errors);
+    throw new Error(`Validate configuration error`);
+  }
+  for (const config of configs) {
+    if (!validate(config)) {
+      const errors = formatValidateError(config);
+      _utils.logger.error(errors);
+      throw new Error(`Validate configuration error.`);
     }
-    const resolved = (0, mergeConfig_1.mergeConfig)([(0, createDefaultConfig_1.createDefaultConfig)(), ...configs, userConfig]);
-    debug('resolved %o', resolved);
-    return resolved;
+  }
+  const resolved = (0, _mergeConfig.mergeConfig)([
+    (0, _createDefaultConfig.createDefaultConfig)(),
+    ...configs,
+    userConfig
+  ]);
+  debug("resolved %o", resolved);
+  return resolved;
 };
-exports.createResolveConfig = createResolveConfig;

package/dist/config/index.d.ts

@@ -1,3 +1,3 @@
 export * from './createLoadedConfig';
 export * from './createResolvedConfig';
-export * from './createDefaultConfig';
+export * from './createDefaultConfig';

package/dist/config/index.js

@@ -1,19 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./createLoadedConfig"), exports);
-__exportStar(require("./createResolvedConfig"), exports);
-__exportStar(require("./createDefaultConfig"), exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+const _export_star = require("@swc/helpers/_/_export_star");
+_export_star._(require("./createLoadedConfig"), exports);
+_export_star._(require("./createResolvedConfig"), exports);
+_export_star._(require("./createDefaultConfig"), exports);

package/dist/config/loadConfig.d.ts

@@ -28,8 +28,8 @@ export declare const getConfigFilePath: (appDirectory: string, filePath?: string
  * @returns Object contain config file path, user config object and dependency files used by config file.
  */
 export declare const loadConfig: <T>(appDirectory: string, configFile: string | false, packageJsonConfig?: string, loadedConfig?: T | undefined) => Promise<{
-    path: string | false;
-    config?: T | undefined;
-    dependencies?: string[] | undefined;
-    pkgConfig?: T | undefined;
-}>;
+  path: string | false;
+  config?: T | undefined;
+  dependencies?: string[] | undefined;
+  pkgConfig?: T | undefined;
+}>;