@modern-js/utils 2.69.5 → 3.0.0-alpha.0

package/rslib.config.mts

@@ -0,0 +1,140 @@
+import { rslibConfig } from '@modern-js/rslib';
+import { type RslibConfig, type Rspack, defineConfig } from '@rslib/core';
+
+const dependencies = [
+  // zero dependency
+  'address',
+  'filesize',
+  'minimist',
+  'commander',
+  'import-lazy',
+  'dotenv',
+  'dotenv-expand',
+  'url-join',
+  'slash',
+  'nanoid',
+  'lodash',
+  {
+    name: 'upath',
+  },
+  // a few dependencies
+  'debug',
+  'semver',
+  'js-yaml',
+  'mime-types',
+  'strip-ansi',
+  'gzip-size',
+  'pkg-up',
+  {
+    name: 'json5',
+    externals: {
+      minimist: '../minimist',
+    },
+  },
+  // some dependencies
+  'glob',
+  'chalk',
+  'webpack-chain',
+  {
+    name: 'signale',
+    externals: {
+      chalk: '../chalk',
+    },
+    packageJsonField: ['options'],
+  },
+  'execa',
+  'fs-extra',
+  'browserslist',
+  'chokidar',
+  'fast-glob',
+  {
+    name: 'globby',
+    externals: {
+      'fast-glob': '../fast-glob',
+    },
+  },
+  {
+    name: 'ora',
+    externals: {
+      chalk: '../chalk',
+      'strip-ansi': '../strip-ansi',
+    },
+  },
+  {
+    name: 'inquirer',
+    externals: {
+      ora: '../ora',
+      chalk: '../chalk',
+      'strip-ansi': '../strip-ansi',
+    },
+  },
+  {
+    name: 'tsconfig-paths',
+    externals: {
+      json5: '../json5',
+      minimist: '../minimist',
+    },
+  },
+];
+
+const regexpMap: Record<string, RegExp> = {};
+
+for (const item of dependencies) {
+  const depName = typeof item === 'string' ? item : item.name;
+
+  // Skip dtsOnly dependencies
+  if (typeof item !== 'string' && 'dtsOnly' in item) {
+    continue;
+  }
+
+  regexpMap[depName] = new RegExp(`compiled[\\/]${depName}(?:[\\/]|$)`);
+}
+
+const externals: Rspack.Configuration['externals'] = [
+  // externalize pre-bundled dependencies
+  ({ request }, callback) => {
+    const entries = Object.entries(regexpMap);
+    if (request) {
+      for (const [name, test] of entries) {
+        if (request === name) {
+          throw new Error(
+            `"${name}" is not allowed to be imported, use "../compiled/${name}/index.js" instead.`,
+          );
+        }
+        if (test.test(request)) {
+          return callback(undefined, `node-commonjs ${request}/index.js`);
+        }
+      }
+    }
+    callback();
+  },
+];
+
+const lib: RslibConfig['lib'] = rslibConfig.lib.map((config, index) => {
+  if (config.format === 'esm') {
+    return {
+      ...config,
+      output: {
+        ...config.output,
+        externals,
+      },
+    };
+  }
+  return {
+    ...config,
+    output: {
+      ...config.output,
+      copy: [
+        {
+          from: './compiled',
+          to: '../compiled',
+        },
+      ],
+    },
+  };
+});
+
+export default defineConfig({
+  ...rslibConfig,
+  lib,
+});

package/dist/cjs/cli/action.js

@@ -1,55 +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 action_exports = {};
-__export(action_exports, {
-  newAction: () => newAction,
-  upgradeAction: () => upgradeAction
-});
-module.exports = __toCommonJS(action_exports);
-var import_compiled = require("../compiled");
-const newAction = async (config, solution) => {
-  var _process_env_MODERN_JS_VERSION;
-  await (0, import_compiled.execa)("npx", [
-    "--yes",
-    `@modern-js/new-action@${(_process_env_MODERN_JS_VERSION = process.env.MODERN_JS_VERSION) !== null && _process_env_MODERN_JS_VERSION !== void 0 ? _process_env_MODERN_JS_VERSION : "latest"}`,
-    `--config=${JSON.stringify(config)}`,
-    `--solution=${solution}`
-  ], {
-    stderr: "inherit",
-    stdout: "inherit",
-    stdin: "inherit"
-  });
-};
-const upgradeAction = async () => {
-  var _process_env_MODERN_JS_VERSION;
-  await (0, import_compiled.execa)("npx", [
-    "--yes",
-    `@modern-js/upgrade@${(_process_env_MODERN_JS_VERSION = process.env.MODERN_JS_VERSION) !== null && _process_env_MODERN_JS_VERSION !== void 0 ? _process_env_MODERN_JS_VERSION : "latest"}`,
-    ...process.argv.slice(2)
-  ], {
-    stdin: "inherit",
-    stdout: "inherit",
-    stderr: "inherit"
-  });
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  newAction,
-  upgradeAction
-});

package/dist/cjs/universal/formatWebpack.js

@@ -1,127 +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 formatWebpack_exports = {};
-__export(formatWebpack_exports, {
-  addErrorTips: () => addErrorTips,
-  formatWebpackMessages: () => formatWebpackMessages
-});
-module.exports = __toCommonJS(formatWebpack_exports);
-const friendlySyntaxErrorLabel = "SyntaxError:";
-function isLikelyASyntaxError(message) {
-  return message.includes(friendlySyntaxErrorLabel);
-}
-function formatMessage(stats) {
-  let lines = [];
-  let message;
-  if (typeof stats === "object") {
-    const fileName = stats.moduleName ? `File: ${stats.moduleName}
-` : "";
-    const mainMessage = typeof stats.formatted === "string" ? stats.formatted : stats.message;
-    const details = stats.details ? `
-Details: ${stats.details}
-` : "";
-    const stack = stats.stack ? `
-${stats.stack}` : "";
-    message = `${fileName}${mainMessage}${details}${stack}`;
-  } else {
-    message = stats;
-  }
-  lines = message.split("\n");
-  lines = lines.map((line) => {
-    const parsingError = /Line (\d+):(?:(\d+):)?\s*Parsing error: (.+)$/.exec(line);
-    if (!parsingError) {
-      return line;
-    }
-    const [, errorLine, errorColumn, errorMessage] = parsingError;
-    return `${friendlySyntaxErrorLabel} ${errorMessage} (${errorLine}:${errorColumn})`;
-  });
-  message = lines.join("\n");
-  message = message.replace(/SyntaxError\s+\((\d+):(\d+)\)\s*(.+?)\n/g, `${friendlySyntaxErrorLabel} $3 ($1:$2)
-`);
-  lines = message.split("\n");
-  if (lines.length > 2 && lines[1].trim() === "") {
-    lines.splice(1, 1);
-  }
-  lines[0] = lines[0].replace(/^(.*) \d+:\d+-\d+$/, "$1");
-  if (lines[1] && lines[1].indexOf("Module not found:") !== -1) {
-    lines[1] = lines[1].replace("Error: ", "");
-  }
-  lines = lines.filter((line, index, arr) => index === 0 || line.trim() !== "" || line.trim() !== arr[index - 1].trim());
-  message = lines.join("\n");
-  return message.trim();
-}
-const noop = (message) => message;
-const defaultColor = {
-  gray: noop,
-  cyan: noop,
-  green: noop,
-  yellow: noop,
-  underline: noop
-};
-function addErrorTips(errors, color = defaultColor) {
-  const errorHelpers = [
-    {
-      validator(message) {
-        return (message.includes("You may need an appropriate loader") || message.includes("You may need an additional loader")) && message.includes(".ts");
-      },
-      formatter(message) {
-        return `${message}
-
-${color.yellow(`If it is a TypeScript file, you can use "source.include" config to compile it. see ${color.underline("https://modernjs.dev/en/configure/app/source/include.html")}`)}
-
-${color.green(`${color.gray("// config file")}
-export default {
-  source: {
-    include: [
-      ${color.gray("// add some include rules")}
-    ]
-  }
-}`)}
-        `;
-      }
-    }
-  ];
-  return errors.map((error) => {
-    const helper = errorHelpers.find((item) => item.validator(error));
-    return helper ? helper.formatter(error) : error;
-  });
-}
-function formatWebpackMessages(json, color = defaultColor) {
-  var _json_errors, _json_warnings, _result_errors;
-  const formattedErrors = json === null || json === void 0 ? void 0 : (_json_errors = json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
-  const formattedWarnings = json === null || json === void 0 ? void 0 : (_json_warnings = json.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
-  const result = {
-    errors: formattedErrors || [],
-    warnings: formattedWarnings || [],
-    errorTips: []
-  };
-  if ((_result_errors = result.errors) === null || _result_errors === void 0 ? void 0 : _result_errors.some(isLikelyASyntaxError)) {
-    result.errors = result.errors.filter(isLikelyASyntaxError);
-  }
-  if (result.errors.length > 1) {
-    result.errors.length = 1;
-  }
-  result.errors = addErrorTips(result.errors, color);
-  return result;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  addErrorTips,
-  formatWebpackMessages
-});

package/dist/esm/cli/action.js

@@ -1,68 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { execa } from "../compiled";
-var newAction = function() {
-  var _ref = _async_to_generator(function(config, solution) {
-    var _process_env_MODERN_JS_VERSION;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          return [
-            4,
-            execa("npx", [
-              "--yes",
-              "@modern-js/new-action@".concat((_process_env_MODERN_JS_VERSION = process.env.MODERN_JS_VERSION) !== null && _process_env_MODERN_JS_VERSION !== void 0 ? _process_env_MODERN_JS_VERSION : "latest"),
-              "--config=".concat(JSON.stringify(config)),
-              "--solution=".concat(solution)
-            ], {
-              stderr: "inherit",
-              stdout: "inherit",
-              stdin: "inherit"
-            })
-          ];
-        case 1:
-          _state.sent();
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function newAction2(config, solution) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var upgradeAction = function() {
-  var _ref = _async_to_generator(function() {
-    var _process_env_MODERN_JS_VERSION;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          return [
-            4,
-            execa("npx", [
-              "--yes",
-              "@modern-js/upgrade@".concat((_process_env_MODERN_JS_VERSION = process.env.MODERN_JS_VERSION) !== null && _process_env_MODERN_JS_VERSION !== void 0 ? _process_env_MODERN_JS_VERSION : "latest")
-            ].concat(_to_consumable_array(process.argv.slice(2))), {
-              stdin: "inherit",
-              stdout: "inherit",
-              stderr: "inherit"
-            })
-          ];
-        case 1:
-          _state.sent();
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function upgradeAction2() {
-    return _ref.apply(this, arguments);
-  };
-}();
-export {
-  newAction,
-  upgradeAction
-};

package/dist/esm/cli/alias.js

@@ -1,43 +0,0 @@
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import fs from "fs";
-import path from "path";
-import { applyOptionsChain } from "./applyOptionsChain";
-import { readTsConfigByFile } from "./get";
-var mergeAlias = function(alias) {
-  return applyOptionsChain({}, alias);
-};
-var getAliasConfig = function(aliasOption, option) {
-  var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;
-  var isTsProject = fs.existsSync(option.tsconfigPath);
-  var alias = mergeAlias(aliasOption);
-  if (!isTsProject) {
-    return {
-      absoluteBaseUrl: option.appDirectory,
-      paths: alias,
-      isTsPath: false,
-      isTsProject
-    };
-  }
-  var tsconfig = readTsConfigByFile(option.tsconfigPath);
-  var baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
-  return {
-    absoluteBaseUrl: baseUrl ? path.join(option.appDirectory, baseUrl) : option.appDirectory,
-    paths: _object_spread({}, alias, tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions1 = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths),
-    isTsPath: true,
-    isTsProject
-  };
-};
-var getUserAlias = function() {
-  var alias = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-  return Object.keys(alias).reduce(function(o, k) {
-    if (Array.isArray(alias[k])) {
-      o[k] = alias[k];
-    }
-    return o;
-  }, {});
-};
-export {
-  getAliasConfig,
-  getUserAlias,
-  mergeAlias
-};

package/dist/esm/cli/applyOptionsChain.js

@@ -1,29 +0,0 @@
-import { isFunction, isPlainObject } from "./is";
-import { logger } from "./logger";
-function applyOptionsChain(defaults, options, utils) {
-  var mergeFn = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : Object.assign;
-  if (!options) {
-    return defaults;
-  }
-  if (isPlainObject(options)) {
-    return mergeFn(defaults, options);
-  } else if (isFunction(options)) {
-    var ret = options(defaults, utils);
-    if (ret) {
-      if (!isPlainObject(ret)) {
-        logger.warn("".concat(options.name, ": Function should mutate the config and return nothing, Or return a cloned or merged version of config object."));
-      }
-      return ret;
-    }
-  } else if (Array.isArray(options)) {
-    return options.reduce(function(memo, cur) {
-      return applyOptionsChain(memo, cur, utils, mergeFn);
-    }, defaults);
-  } else {
-    throw new Error("applyOptionsChain error:\ndefault options is: ".concat(JSON.stringify(defaults)));
-  }
-  return defaults;
-}
-export {
-  applyOptionsChain
-};

package/dist/esm/cli/babel.js

@@ -1,122 +0,0 @@
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { isAbsolute, sep } from "path";
-import { applyOptionsChain } from "./applyOptionsChain";
-import { ensureArray } from "./ensure";
-import { normalizeToPosixPath } from "./path";
-var formatPath = function(originPath) {
-  if (isAbsolute(originPath)) {
-    return originPath.split(sep).join("/");
-  }
-  return originPath;
-};
-var getPluginItemName = function(item) {
-  if (typeof item === "string") {
-    return formatPath(item);
-  }
-  if (Array.isArray(item) && typeof item[0] === "string") {
-    return formatPath(item[0]);
-  }
-  return null;
-};
-var addPlugins = function(plugins, config) {
-  if (config.plugins) {
-    var _config_plugins;
-    (_config_plugins = config.plugins).push.apply(_config_plugins, _to_consumable_array(plugins));
-  } else {
-    config.plugins = plugins;
-  }
-};
-var addPresets = function(presets, config) {
-  if (config.presets) {
-    var _config_presets;
-    (_config_presets = config.presets).push.apply(_config_presets, _to_consumable_array(presets));
-  } else {
-    config.presets = presets;
-  }
-};
-var removePlugins = function(plugins, config) {
-  if (!config.plugins) {
-    return;
-  }
-  var removeList = ensureArray(plugins);
-  config.plugins = config.plugins.filter(function(item) {
-    var name = getPluginItemName(item);
-    if (name) {
-      return !removeList.find(function(removeItem) {
-        return name.includes(removeItem);
-      });
-    }
-    return true;
-  });
-};
-var removePresets = function(presets, config) {
-  if (!config.presets) {
-    return;
-  }
-  var removeList = ensureArray(presets);
-  config.presets = config.presets.filter(function(item) {
-    var name = getPluginItemName(item);
-    if (name) {
-      return !removeList.find(function(removeItem) {
-        return name.includes(removeItem);
-      });
-    }
-    return true;
-  });
-};
-var modifyPresetOptions = function(presetName, options) {
-  var presets = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
-  presets.forEach(function(preset, index) {
-    if (Array.isArray(preset)) {
-      if (typeof preset[0] === "string" && normalizeToPosixPath(preset[0]).includes(presetName)) {
-        preset[1] = _object_spread({}, preset[1] || {}, options);
-      }
-    } else if (typeof preset === "string" && normalizeToPosixPath(preset).includes(presetName)) {
-      presets[index] = [
-        preset,
-        options
-      ];
-    }
-  });
-};
-var getBabelUtils = function(config) {
-  var noop = function() {
-  };
-  return {
-    addPlugins: function(plugins) {
-      return addPlugins(plugins, config);
-    },
-    addPresets: function(presets) {
-      return addPresets(presets, config);
-    },
-    removePlugins: function(plugins) {
-      return removePlugins(plugins, config);
-    },
-    removePresets: function(presets) {
-      return removePresets(presets, config);
-    },
-    // `addIncludes` and `addExcludes` are noop functions by default,
-    // It can be overridden by `extraBabelUtils`.
-    addIncludes: noop,
-    addExcludes: noop,
-    // Compat `presetEnvOptions` and `presetReactOptions` in Eden.
-    modifyPresetEnvOptions: function(options) {
-      return modifyPresetOptions("@babel/preset-env", options, config.presets || []);
-    },
-    modifyPresetReactOptions: function(options) {
-      return modifyPresetOptions("@babel/preset-react", options, config.presets || []);
-    }
-  };
-};
-var applyUserBabelConfig = function(defaultOptions, userBabelConfig, extraBabelUtils) {
-  if (userBabelConfig) {
-    var babelUtils = _object_spread({}, getBabelUtils(defaultOptions), extraBabelUtils);
-    return applyOptionsChain(defaultOptions, userBabelConfig || {}, babelUtils);
-  }
-  return defaultOptions;
-};
-export {
-  applyUserBabelConfig,
-  getBabelUtils
-};

package/dist/esm/cli/commands.js

@@ -1,39 +0,0 @@
-import { logger } from "./logger";
-var getFullArgv = function() {
-  var _process_env_MODERN_ARGV;
-  return ((_process_env_MODERN_ARGV = process.env.MODERN_ARGV) === null || _process_env_MODERN_ARGV === void 0 ? void 0 : _process_env_MODERN_ARGV.split(" ")) || process.argv;
-};
-var getArgv = function() {
-  return getFullArgv().slice(2);
-};
-var getCommand = function() {
-  var args = getArgv();
-  var command = args[0];
-  return command;
-};
-var isDevCommand = function() {
-  var command = getCommand();
-  return command === "dev" || command === "start";
-};
-var deprecatedCommands = function(program) {
-  var _program_commandsMap, _program_commandsMap1;
-  var lintCommand = (_program_commandsMap = program.commandsMap) === null || _program_commandsMap === void 0 ? void 0 : _program_commandsMap.get("lint");
-  if (!lintCommand) {
-    program.command("lint [...files]").allowUnknownOption().description("Deprecated").action(function() {
-      logger.warn('The "modern lint" command is deprecated, please use "eslint" or "biome" instead.');
-    });
-  }
-  var preCommitCommand = (_program_commandsMap1 = program.commandsMap) === null || _program_commandsMap1 === void 0 ? void 0 : _program_commandsMap1.get("pre-commit");
-  if (!preCommitCommand) {
-    program.command("pre-commit").description("Deprecated").action(function() {
-      logger.warn('The "modern pre-commit" command is deprecated, please use "lint-staged" instead.');
-    });
-  }
-};
-export {
-  deprecatedCommands,
-  getArgv,
-  getCommand,
-  getFullArgv,
-  isDevCommand
-};

package/dist/esm/cli/common.js

@@ -1,20 +0,0 @@
-import { debug } from "../../compiled/debug";
-var createDebugger = function(scope) {
-  return debug("modern-js:".concat(scope));
-};
-var clearConsole = function() {
-  if (process.stdout.isTTY && !process.env.DEBUG) {
-    process.stdout.write("\x1B[H\x1B[2J");
-  }
-};
-var wait = function() {
-  var time = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
-  return new Promise(function(resolve) {
-    setTimeout(resolve, time);
-  });
-};
-export {
-  clearConsole,
-  createDebugger,
-  wait
-};

package/dist/esm/cli/config.js

@@ -1,11 +0,0 @@
-var isOverriddenConfigKey = function(key) {
-  return [
-    "removeConsole",
-    "enableInlineScripts",
-    "enableInlineStyles",
-    "baseUrl"
-  ].includes(key);
-};
-export {
-  isOverriddenConfigKey
-};