@umijs/utils 4.0.52 → 4.0.54

package/dist/index.js

@@ -32,6 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   BaseGenerator: () => import_BaseGenerator.default,
   Generator: () => import_Generator.default,
+  MagicString: () => import_magic_string.default,
   Mustache: () => import_mustache.default,
   address: () => import_address.default,
   aliasUtils: () => aliasUtils,
@@ -59,10 +60,12 @@ __export(src_exports, {
   printHelp: () => printHelp,
   prompts: () => import_prompts.default,
   register: () => register,
+  remapping: () => import_remapping.default,
   resolve: () => import_resolve.default,
   rimraf: () => import_rimraf.default,
   semver: () => import_semver.default,
   stripAnsi: () => import_strip_ansi.default,
+  tsconfigPaths: () => tsconfigPaths,
   updatePackageJSON: () => import_updatePackageJSON.default,
   yParser: () => import_yargs_parser.default
 });
@@ -79,10 +82,12 @@ var import_deepmerge = __toESM(require("../compiled/deepmerge"));
 var execa = __toESM(require("../compiled/execa"));
 var import_fs_extra = __toESM(require("../compiled/fs-extra"));
 var import_glob = __toESM(require("../compiled/glob"));
+var import_remapping = __toESM(require("../compiled/@ampproject/remapping"));
 var fastestLevenshtein = __toESM(require("../compiled/fastest-levenshtein"));
 var filesize = __toESM(require("../compiled/filesize"));
 var gzipSize = __toESM(require("../compiled/gzip-size"));
 var import_lodash = __toESM(require("../compiled/lodash"));
+var import_magic_string = __toESM(require("../compiled/magic-string"));
 var import_mustache = __toESM(require("../compiled/mustache"));
 var pkgUp = __toESM(require("../compiled/pkg-up"));
 var import_portfinder = __toESM(require("../compiled/portfinder"));
@@ -91,6 +96,7 @@ var import_resolve = __toESM(require("../compiled/resolve"));
 var import_rimraf = __toESM(require("../compiled/rimraf"));
 var import_semver = __toESM(require("../compiled/semver"));
 var import_strip_ansi = __toESM(require("../compiled/strip-ansi"));
+var tsconfigPaths = __toESM(require("../compiled/tsconfig-paths"));
 var import_yargs_parser = __toESM(require("../compiled/yargs-parser"));
 var import_BaseGenerator = __toESM(require("./BaseGenerator/BaseGenerator"));
 var import_generateFile = __toESM(require("./BaseGenerator/generateFile"));
@@ -109,6 +115,7 @@ __reExport(src_exports, require("./isMonorepo"), module.exports);
 __reExport(src_exports, require("./isStyleFile"), module.exports);
 __reExport(src_exports, require("./npmClient"), module.exports);
 __reExport(src_exports, require("./randomColor/randomColor"), module.exports);
+__reExport(src_exports, require("./readDirFiles"), module.exports);
 var register = __toESM(require("./register"));
 __reExport(src_exports, require("./setNoDeprecation"), module.exports);
 __reExport(src_exports, require("./tryPaths"), module.exports);
@@ -117,6 +124,7 @@ __reExport(src_exports, require("./winPath"), module.exports);
 0 && (module.exports = {
   BaseGenerator,
   Generator,
+  MagicString,
   Mustache,
   address,
   aliasUtils,
@@ -144,10 +152,12 @@ __reExport(src_exports, require("./winPath"), module.exports);
   printHelp,
   prompts,
   register,
+  remapping,
   resolve,
   rimraf,
   semver,
   stripAnsi,
+  tsconfigPaths,
   updatePackageJSON,
   yParser
 });

package/dist/installDeps.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/installDeps.ts
@@ -40,15 +43,18 @@ function installDeps({
   const devTag = useYarn || usePnpm ? "--D" : "--save-dev";
   const installDependencies = (deps, npmStr, insStr, devStr) => {
     console.log(`${npmStr} install dependencies packages:${deps.join(" ")}`);
-    execa.execaCommandSync([npmStr, insStr, devStr].concat(deps).filter((n) => n).join(" "), {
-      encoding: "utf8",
-      cwd,
-      env: {
-        ...process.env
-      },
-      stderr: "pipe",
-      stdout: "pipe"
-    });
+    execa.execaCommandSync(
+      [npmStr, insStr, devStr].concat(deps).filter((n) => n).join(" "),
+      {
+        encoding: "utf8",
+        cwd,
+        env: {
+          ...process.env
+        },
+        stderr: "pipe",
+        stdout: "pipe"
+      }
+    );
     console.log(`install dependencies packages success`);
   };
   if (dependencies) {

package/dist/logger.js

@@ -17,6 +17,10 @@ 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
 ));
@@ -58,16 +62,17 @@ var prefixes = {
   debug: import_chalk.default.gray("debug") + " -",
   profile: import_chalk.default.blue("profile") + " -"
 };
+var pinoModule = (0, import_importLazy.importLazy)(require.resolve("pino"));
 var logger;
 if (enableFSLogger) {
-  const { default: pino } = (0, import_importLazy.importLazy)(
-    require.resolve("pino")
-  );
+  const pino = pinoModule.default;
   import_fs_extra.default.mkdirpSync(loggerDir);
   const customLevels = {
     ready: 31,
     event: 32,
     wait: 55,
+    // 虽然这里设置了 debug 为 30，但日志中还是 20，符合预期
+    // 这里不加会不生成到 umi.log，transport 的 level 配置没有生效，原因不明
     debug: 30
   };
   logger = pino(

package/dist/npmClient.js

@@ -17,10 +17,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
 ));

package/dist/printHelp.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/printHelp.ts
@@ -33,7 +36,9 @@ function exit() {
     logger.fatal("A complete log of this run can be found in:");
     logger.fatal(loggerPath);
   }
-  logger.fatal("Consider reporting a GitHub issue on https://github.com/umijs/umi/issues");
+  logger.fatal(
+    "Consider reporting a GitHub issue on https://github.com/umijs/umi/issues"
+  );
 }
 function runtime(e) {
   logger.error(e);

package/dist/randomColor/randomColor.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/randomColor/randomColor.ts

package/dist/readDirFiles.d.ts

@@ -0,0 +1,9 @@
+interface FileItem {
+    filePath: string;
+    name: string;
+}
+export declare const readDirFiles: (opts: {
+    dir: string;
+    exclude?: RegExp[];
+}) => FileItem[];
+export {};

package/dist/readDirFiles.js

@@ -0,0 +1,62 @@
+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);
+
+// src/readDirFiles.ts
+var readDirFiles_exports = {};
+__export(readDirFiles_exports, {
+  readDirFiles: () => readDirFiles
+});
+module.exports = __toCommonJS(readDirFiles_exports);
+var import_path = require("path");
+var import_fs_extra = require("../compiled/fs-extra");
+var readDirFiles = (opts) => {
+  const { dir, exclude = [] } = opts;
+  const list = [];
+  const recursiveReadFiles = (p) => {
+    if (!(0, import_fs_extra.existsSync)(p)) {
+      return;
+    }
+    const isFile = (0, import_fs_extra.statSync)(p).isFile();
+    if (isFile) {
+      const name = (0, import_path.basename)(p);
+      list.push({
+        filePath: p,
+        name
+      });
+      return;
+    }
+    const files = (0, import_fs_extra.readdirSync)(p).filter((name) => {
+      return name !== ".DS_Store";
+    }).map((file) => {
+      const absolutePath = (0, import_path.join)(p, file);
+      return absolutePath;
+    }).filter((file) => {
+      const isExclude = exclude.some((reg) => reg.test(file));
+      return !isExclude;
+    });
+    files.forEach((file) => {
+      recursiveReadFiles(file);
+    });
+  };
+  recursiveReadFiles(dir);
+  return list;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  readDirFiles
+});

package/dist/register.js

@@ -27,6 +27,7 @@ __export(register_exports, {
 module.exports = __toCommonJS(register_exports);
 var import_path = require("path");
 var import_pirates = require("../compiled/pirates");
+var import_index = require("./index");
 var COMPILE_EXTS = [".ts", ".tsx", ".js", ".jsx"];
 var HOOK_EXTS = [...COMPILE_EXTS, ".mjs"];
 var registered = false;
@@ -46,16 +47,20 @@ function transform(opts) {
       logLevel: "error"
     }).code;
   } catch (e) {
-    throw new Error(`Parse file failed: [${filename}]`, { cause: e });
+    import_index.logger.error(e);
+    throw new Error(`Parse file failed: [${filename}]`);
   }
 }
 function register(opts) {
   files = [];
   if (!registered) {
-    revert = (0, import_pirates.addHook)((code, filename) => transform({ code, filename, implementor: opts.implementor }), {
-      ext: opts.exts || HOOK_EXTS,
-      ignoreNodeModules: true
-    });
+    revert = (0, import_pirates.addHook)(
+      (code, filename) => transform({ code, filename, implementor: opts.implementor }),
+      {
+        ext: opts.exts || HOOK_EXTS,
+        ignoreNodeModules: true
+      }
+    );
     registered = true;
   }
 }

package/dist/updatePackageJSON.js

@@ -16,7 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+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);
 
 // src/updatePackageJSON.ts
@@ -28,7 +35,6 @@ module.exports = __toCommonJS(updatePackageJSON_exports);
 var import_fs = require("fs");
 var import_path = require("path");
 var import_deepmerge = __toESM(require("../compiled/deepmerge"));
-var import_prettier = __toESM(require("../compiled/prettier"));
 function updatePackageJSON({
   opts,
   cwd = process.cwd()
@@ -36,9 +42,12 @@ function updatePackageJSON({
   const packageJsonPath = (0, import_path.resolve)(cwd, "package.json");
   const pkg = require(packageJsonPath);
   const projectPkg = (0, import_deepmerge.default)(pkg, opts);
-  (0, import_fs.writeFileSync)(packageJsonPath, import_prettier.default.format(JSON.stringify(projectPkg), {
-    parser: "json"
-  }));
+  (0, import_fs.writeFileSync)(
+    packageJsonPath,
+    `${JSON.stringify(projectPkg, null, 2)}
+`,
+    "utf-8"
+  );
 }
 var updatePackageJSON_default = updatePackageJSON;
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/utils",
-  "version": "4.0.52",
+  "version": "4.0.54",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
@@ -25,6 +25,7 @@
     "pino": "7.11.0"
   },
   "devDependencies": {
+    "@ampproject/remapping": "2.2.0",
     "@clack/prompts": "0.2.2",
     "@hapi/joi": "17.1.1",
     "@types/color": "3.0.3",
@@ -54,16 +55,18 @@
     "gzip-size": "7.0.0",
     "import-lazy": "4.0.0",
     "lodash": "4.17.21",
+    "magic-string": "0.27.0",
     "mustache": "4.2.0",
     "pirates": "4.0.5",
     "pkg-up": "4.0.0",
     "portfinder": "1.0.32",
-    "prettier": "2.8.2",
+    "prettier": "2.8.4",
     "prompts": "2.4.2",
     "resolve": "1.22.0",
     "rimraf": "3.0.2",
     "semver": "7.3.8",
     "strip-ansi": "7.0.1",
+    "tsconfig-paths": "4.1.2",
     "yargs-parser": "21.1.1"
   },
   "publishConfig": {
@@ -99,7 +102,10 @@
       "yargs-parser",
       "pirates",
       "@hapi/joi",
-      "@clack/prompts"
+      "@clack/prompts",
+      "magic-string",
+      "@ampproject/remapping",
+      "tsconfig-paths"
     ],
     "externals": {
       "address": "$$LOCAL",
@@ -121,7 +127,8 @@
       "strip-ansi": "$$LOCAL",
       "yargs-parser": "$$LOCAL",
       "pirates": "$$LOCAL",
-      "@hapi/joi": "$$LOCAL"
+      "@hapi/joi": "$$LOCAL",
+      "tsconfig-paths": "$$LOCAL"
     }
   }
 }