@modern-js/module-tools 2.35.1 → 2.37.0

package/dist/config/merge.js

@@ -1,34 +1,46 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+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)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  mergeDefaultBaseConfig: function() {
-    return mergeDefaultBaseConfig;
-  },
-  isLegacyUserConfig: function() {
-    return isLegacyUserConfig;
+    __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 merge_exports = {};
+__export(merge_exports, {
+  isLegacyUserConfig: () => isLegacyUserConfig,
+  mergeDefaultBaseConfig: () => mergeDefaultBaseConfig
 });
-const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-const _utils = require("@modern-js/utils");
-const _builder = require("../utils/builder");
-const _input = require("../utils/input");
-const _build = require("../constants/build");
+module.exports = __toCommonJS(merge_exports);
+var import_utils = require("@modern-js/utils");
+var import_utils2 = require("../utils");
+var import_build = require("../constants/build");
 const mergeDefaultBaseConfig = async (pConfig, options) => {
-  var _pConfig_style, _pConfig_style1, _pConfig_style2, _pConfig_style3;
-  const defaultConfig = (0, _build.getDefaultBuildConfig)();
+  var _pConfig_resolve, _pConfig_resolve1, _pConfig_style, _pConfig_style1, _pConfig_style2, _pConfig_style3;
+  const defaultConfig = (0, import_build.getDefaultBuildConfig)();
   const { context, buildCmdOptions } = options;
-  const { applyOptionsChain, ensureAbsolutePath, slash } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils")));
-  const { getDefaultIndexEntry } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../utils/input")));
-  const { getStyleConfig } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../utils/style")));
+  const { applyOptionsChain, ensureAbsolutePath, slash } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+  const { getDefaultIndexEntry, getStyleConfig } = await Promise.resolve().then(() => __toESM(require("../utils")));
   const defaultAlias = {
     "@": context.srcDirectory
   };
@@ -59,7 +71,7 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
     sourceDir
   ];
   var _pConfig_input;
-  const input = await (0, _input.normalizeInput)((_pConfig_input = pConfig.input) !== null && _pConfig_input !== void 0 ? _pConfig_input : defaultIndexEntry, context.appDirectory, Boolean(asset === null || asset === void 0 ? void 0 : asset.svgr));
+  const input = await (0, import_utils2.normalizeInput)((_pConfig_input = pConfig.input) !== null && _pConfig_input !== void 0 ? _pConfig_input : defaultIndexEntry, context.appDirectory, Boolean(asset === null || asset === void 0 ? void 0 : asset.svgr));
   var _pConfig_define;
   const userDefine = (_pConfig_define = pConfig.define) !== null && _pConfig_define !== void 0 ? _pConfig_define : {};
   const define = {
@@ -75,17 +87,14 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
     ...defaultConfig.dts,
     ...pConfig.dts
   };
-  if (dts) {
-    if (cmdTsconfigPath) {
-      dts.tsconfigPath = cmdTsconfigPath;
-    }
-  }
+  var _ref;
+  const tsconfig = (_ref = cmdTsconfigPath !== null && cmdTsconfigPath !== void 0 ? cmdTsconfigPath : pConfig.tsconfig) !== null && _ref !== void 0 ? _ref : defaultConfig.tsconfig;
   var _pConfig_externals;
   let externals = (_pConfig_externals = pConfig.externals) !== null && _pConfig_externals !== void 0 ? _pConfig_externals : defaultConfig.externals;
   var _pConfig_autoExternal;
   const autoExternal = (_pConfig_autoExternal = pConfig.autoExternal) !== null && _pConfig_autoExternal !== void 0 ? _pConfig_autoExternal : defaultConfig.autoExternal;
   if (autoExternal) {
-    const deps = await (0, _builder.getAllDeps)(context.appDirectory, (0, _utils.isObject)(autoExternal) ? autoExternal : {
+    const deps = await (0, import_utils2.getAllDeps)(context.appDirectory, (0, import_utils.isObject)(autoExternal) ? autoExternal : {
       dependencies: true,
       peerDependencies: true
     });
@@ -94,10 +103,30 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
       ...externals || []
     ];
   }
+  var _pConfig_platform;
+  const platform = (_pConfig_platform = pConfig.platform) !== null && _pConfig_platform !== void 0 ? _pConfig_platform : defaultConfig.platform;
+  const defaultMainFields = platform === "node" ? [
+    "module",
+    "main"
+  ] : [
+    "module",
+    "browser",
+    "main"
+  ];
+  var _pConfig_resolve_mainFields, _pConfig_resolve_jsExtensions;
+  const resolve = {
+    mainFields: (_pConfig_resolve_mainFields = (_pConfig_resolve = pConfig.resolve) === null || _pConfig_resolve === void 0 ? void 0 : _pConfig_resolve.mainFields) !== null && _pConfig_resolve_mainFields !== void 0 ? _pConfig_resolve_mainFields : defaultMainFields,
+    jsExtensions: (_pConfig_resolve_jsExtensions = (_pConfig_resolve1 = pConfig.resolve) === null || _pConfig_resolve1 === void 0 ? void 0 : _pConfig_resolve1.jsExtensions) !== null && _pConfig_resolve_jsExtensions !== void 0 ? _pConfig_resolve_jsExtensions : defaultConfig.resolve.jsExtensions
+  };
   var _pConfig_esbuildOptions;
   const esbuildOptions = (_pConfig_esbuildOptions = pConfig.esbuildOptions) !== null && _pConfig_esbuildOptions !== void 0 ? _pConfig_esbuildOptions : defaultConfig.esbuildOptions;
-  var _pConfig_format, _pConfig_target, _pConfig_sourceMap, _pConfig_copy, _pConfig_outDir, _pConfig_jsx, _pConfig_platform, _pConfig_splitting, _pConfig_minify, _pConfig_umdModuleName, _pConfig_sideEffects, _pConfig_style_inject, _pConfig_style_modules, _pConfig_style_autoModules, _pConfig_style_tailwindcss, _pConfig_externalHelpers, _pConfig_transformImport, _pConfig_transformLodash, _pConfig_sourceType, _pConfig_disableSwcTransform;
+  var _pConfig_footer, _pConfig_banner, _pConfig_hooks, _pConfig_format, _pConfig_target, _pConfig_sourceMap, _pConfig_copy, _pConfig_outDir, _pConfig_jsx, _pConfig_splitting, _pConfig_minify, _pConfig_umdModuleName, _pConfig_sideEffects, _pConfig_style_inject, _pConfig_style_modules, _pConfig_style_autoModules, _pConfig_style_tailwindcss, _pConfig_externalHelpers, _pConfig_transformCache, _pConfig_transformImport, _pConfig_transformLodash, _pConfig_sourceType, _pConfig_disableSwcTransform;
   return {
+    footer: (_pConfig_footer = pConfig.footer) !== null && _pConfig_footer !== void 0 ? _pConfig_footer : defaultConfig.footer,
+    banner: (_pConfig_banner = pConfig.banner) !== null && _pConfig_banner !== void 0 ? _pConfig_banner : defaultConfig.banner,
+    resolve,
+    tsconfig,
+    hooks: (_pConfig_hooks = pConfig.hooks) !== null && _pConfig_hooks !== void 0 ? _pConfig_hooks : defaultConfig.hooks,
     asset,
     buildType,
     format: (_pConfig_format = pConfig.format) !== null && _pConfig_format !== void 0 ? _pConfig_format : defaultConfig.format,
@@ -108,7 +137,7 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
     dts,
     jsx: (_pConfig_jsx = pConfig.jsx) !== null && _pConfig_jsx !== void 0 ? _pConfig_jsx : defaultConfig.jsx,
     input,
-    platform: (_pConfig_platform = pConfig.platform) !== null && _pConfig_platform !== void 0 ? _pConfig_platform : defaultConfig.platform,
+    platform,
     splitting: (_pConfig_splitting = pConfig.splitting) !== null && _pConfig_splitting !== void 0 ? _pConfig_splitting : defaultConfig.splitting,
     minify: (_pConfig_minify = pConfig.minify) !== null && _pConfig_minify !== void 0 ? _pConfig_minify : defaultConfig.minify,
     autoExternal,
@@ -136,6 +165,7 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
     },
     esbuildOptions,
     externalHelpers: (_pConfig_externalHelpers = pConfig.externalHelpers) !== null && _pConfig_externalHelpers !== void 0 ? _pConfig_externalHelpers : defaultConfig.externalHelpers,
+    transformCache: (_pConfig_transformCache = pConfig.transformCache) !== null && _pConfig_transformCache !== void 0 ? _pConfig_transformCache : defaultConfig.transformCache,
     transformImport: (_pConfig_transformImport = pConfig.transformImport) !== null && _pConfig_transformImport !== void 0 ? _pConfig_transformImport : defaultConfig.transformImport,
     transformLodash: (_pConfig_transformLodash = pConfig.transformLodash) !== null && _pConfig_transformLodash !== void 0 ? _pConfig_transformLodash : defaultConfig.transformLodash,
     sourceType: (_pConfig_sourceType = pConfig.sourceType) !== null && _pConfig_sourceType !== void 0 ? _pConfig_sourceType : defaultConfig.sourceType,
@@ -143,5 +173,8 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
   };
 };
 const isLegacyUserConfig = (config) => Boolean(config.legacy);
-
-//# sourceMappingURL=merge.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isLegacyUserConfig,
+  mergeDefaultBaseConfig
+});

package/dist/config/normalize.js

@@ -1,49 +1,58 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+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)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  presetToConfig: function() {
-    return presetToConfig;
-  },
-  mergeConfig: function() {
-    return mergeConfig;
-  },
-  normalizeBuildConfig: function() {
-    return normalizeBuildConfig;
-  },
-  transformToAbsPath: function() {
-    return transformToAbsPath;
+    __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 normalize_exports = {};
+__export(normalize_exports, {
+  mergeConfig: () => mergeConfig,
+  normalizeBuildConfig: () => normalizeBuildConfig,
+  presetToConfig: () => presetToConfig,
+  transformToAbsPath: () => transformToAbsPath
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _lodash = /* @__PURE__ */ _interop_require_default._(require("@modern-js/utils/lodash"));
-const _utils = require("@modern-js/utils");
-const _preset = require("../constants/preset");
-const _merge = require("./merge");
-const _valid = require("./valid");
+module.exports = __toCommonJS(normalize_exports);
+var import_path = __toESM(require("path"));
+var import_lodash = __toESM(require("@modern-js/utils/lodash"));
+var import_utils = require("@modern-js/utils");
+var import_preset = require("../constants/preset");
+var import_merge = require("./merge");
+var import_valid = require("./valid");
 const presetToConfig = async (preset) => {
   if (typeof preset === "function") {
     const extendPreset = (presetName, extendConfig) => {
-      const originalBuildConfig = _preset.internalPreset[presetName];
+      const originalBuildConfig = import_preset.internalPreset[presetName];
       if (!originalBuildConfig) {
         throw new Error(`**${presetName}** is not internal buildPreset`);
       }
       return originalBuildConfig.map((config) => {
-        return _lodash.default.merge(config, extendConfig);
+        return import_lodash.default.merge(config, extendConfig);
       });
     };
     const partialBuildConfig = await preset({
-      preset: _preset.internalPreset,
+      preset: import_preset.internalPreset,
       extendPreset
     });
     if (!partialBuildConfig) {
@@ -51,32 +60,32 @@ const presetToConfig = async (preset) => {
     }
     return partialBuildConfig;
   }
-  const inPresetList = (p) => p in _preset.presetList;
-  return preset && inPresetList(preset) ? _preset.presetList[preset] : void 0;
+  const inPresetList = (p) => p in import_preset.presetList;
+  return preset && inPresetList(preset) ? import_preset.presetList[preset] : void 0;
 };
 const mergeConfig = (low, high = {}) => {
   if (!low) {
-    return (0, _utils.ensureArray)(high);
+    return (0, import_utils.ensureArray)(high);
   }
   return Array.isArray(high) ? [
     ...low,
     ...high
   ] : low.map((config) => {
-    return _lodash.default.merge(config, high);
+    return import_lodash.default.merge(config, high);
   });
 };
 const normalizeBuildConfig = async (api, context, buildCmdOptions) => {
   let config = api.useConfigContext();
-  if ((0, _merge.isLegacyUserConfig)(config)) {
-    const { createUserConfigFromLegacy } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./transformLegacyConfig")));
+  if ((0, import_merge.isLegacyUserConfig)(config)) {
+    const { createUserConfigFromLegacy } = await Promise.resolve().then(() => __toESM(require("./transformLegacyConfig")));
     config = await createUserConfigFromLegacy(config);
   }
   const { buildConfig, buildPreset } = config;
   const configFromPreset = await presetToConfig(buildPreset);
   const mergedConfig = mergeConfig(configFromPreset, buildConfig !== null && buildConfig !== void 0 ? buildConfig : {});
-  (0, _valid.validPartialBuildConfig)(mergedConfig);
+  (0, import_valid.validPartialBuildConfig)(mergedConfig, context.appDirectory);
   const normalizedConfig = await Promise.all(mergedConfig.map(async (config2) => {
-    let newConfig = await (0, _merge.mergeDefaultBaseConfig)(config2, {
+    let newConfig = await (0, import_merge.mergeDefaultBaseConfig)(config2, {
       context,
       buildCmdOptions
     });
@@ -91,13 +100,21 @@ const normalizeBuildConfig = async (api, context, buildCmdOptions) => {
 const transformToAbsPath = async (baseConfig, options) => {
   const newConfig = baseConfig;
   const { context } = options;
-  newConfig.outDir = _path.default.resolve(context.appDirectory, newConfig.outDir);
-  newConfig.sourceDir = (0, _utils.slash)(_path.default.resolve(context.appDirectory, baseConfig.sourceDir));
+  newConfig.outDir = import_path.default.resolve(context.appDirectory, newConfig.outDir);
+  newConfig.sourceDir = import_path.default.resolve(context.appDirectory, baseConfig.sourceDir);
+  newConfig.tsconfig = import_path.default.resolve(context.appDirectory, newConfig.tsconfig);
   if (newConfig.dts) {
-    newConfig.dts.distPath = _path.default.resolve(newConfig.outDir, newConfig.dts.distPath);
-    newConfig.dts.tsconfigPath = _path.default.resolve(context.appDirectory, newConfig.dts.tsconfigPath);
+    newConfig.dts.distPath = import_path.default.resolve(newConfig.outDir, newConfig.dts.distPath);
+    if (newConfig.dts.tsconfigPath) {
+      newConfig.dts.tsconfigPath = import_path.default.resolve(context.appDirectory, newConfig.dts.tsconfigPath);
+    }
   }
   return newConfig;
 };
-
-//# sourceMappingURL=normalize.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  mergeConfig,
+  normalizeBuildConfig,
+  presetToConfig,
+  transformToAbsPath
+});

package/dist/config/schema.d.ts

@@ -13,6 +13,15 @@ export declare const buildConfig: {
           alias: {
             typeof: string[];
           };
+          hooks: {
+            type: string;
+          };
+          resolve: {
+            type: string;
+          };
+          banner: {
+            type: string;
+          };
           asset: {
             type: string;
           };
@@ -185,6 +194,9 @@ export declare const buildConfig: {
           externalHelpers: {
             type: string;
           };
+          tsconfig: {
+            type: string;
+          };
           transformImport: {
             type: string;
           };
@@ -203,6 +215,15 @@ export declare const buildConfig: {
         alias: {
           typeof: string[];
         };
+        hooks: {
+          type: string;
+        };
+        resolve: {
+          type: string;
+        };
+        banner: {
+          type: string;
+        };
         asset: {
           type: string;
         };
@@ -375,6 +396,9 @@ export declare const buildConfig: {
         externalHelpers: {
           type: string;
         };
+        tsconfig: {
+          type: string;
+        };
         transformImport: {
           type: string;
         };
@@ -421,6 +445,15 @@ export declare const schema: ({
           alias: {
             typeof: string[];
           };
+          hooks: {
+            type: string;
+          };
+          resolve: {
+            type: string;
+          };
+          banner: {
+            type: string;
+          };
           asset: {
             type: string;
           };
@@ -593,6 +626,9 @@ export declare const schema: ({
           externalHelpers: {
             type: string;
           };
+          tsconfig: {
+            type: string;
+          };
           transformImport: {
             type: string;
           };
@@ -611,6 +647,15 @@ export declare const schema: ({
         alias: {
           typeof: string[];
         };
+        hooks: {
+          type: string;
+        };
+        resolve: {
+          type: string;
+        };
+        banner: {
+          type: string;
+        };
         asset: {
           type: string;
         };
@@ -783,6 +828,9 @@ export declare const schema: ({
         externalHelpers: {
           type: string;
         };
+        tsconfig: {
+          type: string;
+        };
         transformImport: {
           type: string;
         };

package/dist/config/schema.js

@@ -1,38 +1,33 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+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)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  targets: function() {
-    return targets;
-  },
-  presets: function() {
-    return presets;
-  },
-  buildConfig: function() {
-    return buildConfig;
-  },
-  buildPreset: function() {
-    return buildPreset;
-  },
-  legacy: function() {
-    return legacy;
-  },
-  schema: function() {
-    return schema;
-  },
-  legacySchema: function() {
-    return _legacySchema.legacySchema;
+    __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, {
+  buildConfig: () => buildConfig,
+  buildPreset: () => buildPreset,
+  legacy: () => legacy,
+  legacySchema: () => import_legacySchema.legacySchema,
+  presets: () => presets,
+  schema: () => schema,
+  targets: () => targets
 });
-const _legacySchema = require("./legacySchema");
+module.exports = __toCommonJS(schema_exports);
+var import_legacySchema = require("./legacySchema");
 const targets = [
   "es5",
   "es6",
@@ -73,6 +68,18 @@ const buildConfigProperties = {
       "function"
     ]
   },
+  hooks: {
+    // TODO: improve it
+    type: "array"
+  },
+  resolve: {
+    // TODO: add properties
+    type: "object"
+  },
+  banner: {
+    // TODO: add properties
+    type: "object"
+  },
   asset: {
     type: "object"
   },
@@ -190,7 +197,8 @@ const buildConfigProperties = {
   jsx: {
     enum: [
       "automatic",
-      "transform"
+      "transform",
+      "preserve"
     ]
   },
   minify: {
@@ -273,6 +281,9 @@ const buildConfigProperties = {
   externalHelpers: {
     type: "boolean"
   },
+  tsconfig: {
+    type: "string"
+  },
   transformImport: {
     type: "array"
   },
@@ -331,5 +342,13 @@ const schema = [
   buildPreset,
   legacy
 ];
-
-//# sourceMappingURL=schema.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildConfig,
+  buildPreset,
+  legacy,
+  legacySchema,
+  presets,
+  schema,
+  targets
+});