@umijs/utils 4.0.0-canary.20230201.2 → 4.0.0-canary.20230209.1

package/dist/BaseGenerator/BaseGenerator.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/BaseGenerator/BaseGenerator.ts

package/dist/BaseGenerator/generateFile.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/BaseGenerator/generateFile.ts

package/dist/Generator/Generator.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/Generator/Generator.ts
@@ -56,7 +59,9 @@ var Generator = class {
     const tpl = (0, import_fs.readFileSync)(opts.templatePath, "utf-8");
     const content = import_mustache.default.render(tpl, opts.context);
     import_fs_extra.default.mkdirpSync((0, import_path.dirname)(opts.target));
-    console.log(`${import_chalk.default.green("Write:")} ${(0, import_path.relative)(this.baseDir, opts.target)}`);
+    console.log(
+      `${import_chalk.default.green("Write:")} ${(0, import_path.relative)(this.baseDir, opts.target)}`
+    );
     (0, import_fs.writeFileSync)(opts.target, content, "utf-8");
   }
   copyDirectory(opts) {

package/dist/getDevBanner.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/getDevBanner.ts
@@ -29,26 +32,34 @@ var import_address = __toESM(require("../compiled/address"));
 var import_chalk = __toESM(require("../compiled/chalk"));
 var import_strip_ansi = __toESM(require("../compiled/strip-ansi"));
 var BORDERS = {
-  TL: import_chalk.default.gray.dim("\u2554"),
-  TR: import_chalk.default.gray.dim("\u2557"),
-  BL: import_chalk.default.gray.dim("\u255A"),
-  BR: import_chalk.default.gray.dim("\u255D"),
-  V: import_chalk.default.gray.dim("\u2551"),
-  H_PURE: "\u2550"
+  TL: import_chalk.default.gray.dim("╔"),
+  TR: import_chalk.default.gray.dim("╗"),
+  BL: import_chalk.default.gray.dim("╚"),
+  BR: import_chalk.default.gray.dim("╝"),
+  V: import_chalk.default.gray.dim("║"),
+  H_PURE: "═"
 };
 function getDevBanner(protocol, host = "0.0.0.0", port, offset = 8) {
   const header = " App listening at:";
-  const footer = import_chalk.default.bold(" Now you can open browser with the above addresses\u2191 ");
-  const local = `  ${import_chalk.default.gray(">")}   Local: ${import_chalk.default.green(`${protocol}//${host === "0.0.0.0" ? "localhost" : host}:${port}`)} `;
+  const footer = import_chalk.default.bold(
+    " Now you can open browser with the above addresses↑ "
+  );
+  const local = `  ${import_chalk.default.gray(">")}   Local: ${import_chalk.default.green(
+    `${protocol}//${host === "0.0.0.0" ? "localhost" : host}:${port}`
+  )} `;
   const ip = import_address.default.ip();
   const network = `  ${import_chalk.default.gray(">")} Network: ${ip ? import_chalk.default.green(`${protocol}//${ip}:${port}`) : import_chalk.default.gray("Not available")} `;
-  const maxLen = Math.max(...[header, footer, local, network].map((x) => (0, import_strip_ansi.default)(x).length));
+  const maxLen = Math.max(
+    ...[header, footer, local, network].map((x) => (0, import_strip_ansi.default)(x).length)
+  );
   const beforeLines = [
     `${BORDERS.TL}${import_chalk.default.gray.dim("".padStart(maxLen, BORDERS.H_PURE))}${BORDERS.TR}`,
     `${BORDERS.V}${header}${"".padStart(maxLen - header.length)}${BORDERS.V}`,
     `${BORDERS.V}${local}${"".padStart(maxLen - (0, import_strip_ansi.default)(local).length)}${BORDERS.V}`
   ];
-  const mainLine = `${BORDERS.V}${network}${"".padStart(maxLen - (0, import_strip_ansi.default)(network).length)}${BORDERS.V}`;
+  const mainLine = `${BORDERS.V}${network}${"".padStart(
+    maxLen - (0, import_strip_ansi.default)(network).length
+  )}${BORDERS.V}`;
   const afterLines = [
     `${BORDERS.V}${"".padStart(maxLen)}${BORDERS.V}`,
     `${BORDERS.V}${footer}${"".padStart(maxLen - (0, import_strip_ansi.default)(footer).length)}${BORDERS.V}`,

package/dist/getGitInfo.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/getGitInfo.ts

package/dist/importLazy.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/importLazy.ts
@@ -27,7 +30,9 @@ __export(importLazy_exports, {
 module.exports = __toCommonJS(importLazy_exports);
 var import_import_lazy = __toESM(require("../compiled/import-lazy"));
 function importLazy(moduleName, requireFn) {
-  const importLazyLocal = (0, import_import_lazy.default)(requireFn || require);
+  const importLazyLocal = (0, import_import_lazy.default)(
+    requireFn || require
+  );
   return importLazyLocal(moduleName);
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -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/logger.ts
@@ -38,10 +41,11 @@ module.exports = __toCommonJS(logger_exports);
 var import_path = require("path");
 var import_chalk = __toESM(require("../compiled/chalk"));
 var import_fs_extra = __toESM(require("../compiled/fs-extra"));
+var import_pkg_up = require("../compiled/pkg-up");
 var import_importLazy = require("./importLazy");
 var enableFSLogger = process.env.FS_LOGGER !== "none" && !process.versions.webcontainer;
 var profilers = {};
-var loggerDir = (0, import_path.join)(process.cwd(), "node_modules/.cache/logger");
+var loggerDir = findLoggerDir();
 var loggerPath = (0, import_path.join)(loggerDir, "umi.log");
 var prefixes = {
   wait: import_chalk.default.cyan("wait") + "  -",
@@ -56,7 +60,9 @@ var prefixes = {
 };
 var logger;
 if (enableFSLogger) {
-  const { default: pino } = (0, import_importLazy.importLazy)(require.resolve("pino"));
+  const { default: pino } = (0, import_importLazy.importLazy)(
+    require.resolve("pino")
+  );
   import_fs_extra.default.mkdirpSync(loggerDir);
   const customLevels = {
     ready: 31,
@@ -64,19 +70,22 @@ if (enableFSLogger) {
     wait: 55,
     debug: 30
   };
-  logger = pino({
-    customLevels
-  }, pino.transport({
-    targets: [
-      {
-        target: require.resolve("pino/file"),
-        options: {
-          destination: loggerPath
-        },
-        level: "trace"
-      }
-    ]
-  }));
+  logger = pino(
+    {
+      customLevels
+    },
+    pino.transport({
+      targets: [
+        {
+          target: require.resolve("pino/file"),
+          options: {
+            destination: loggerPath
+          },
+          level: "trace"
+        }
+      ]
+    })
+  );
 } else {
   logger = {};
   Object.keys(prefixes).forEach((key) => {
@@ -131,12 +140,25 @@ function profile(id, ...message) {
   }
   const endTime = Date.now();
   const { startTime } = profilers[id];
-  console.log(prefixes.profile, import_chalk.default.green(id), `Completed in ${import_chalk.default.cyan(`${endTime - startTime}ms`)}`, ...message);
+  console.log(
+    prefixes.profile,
+    import_chalk.default.green(id),
+    `Completed in ${import_chalk.default.cyan(`${endTime - startTime}ms`)}`,
+    ...message
+  );
   delete profilers[id];
 }
 function getLatestLogFilePath() {
   return enableFSLogger ? loggerPath : null;
 }
+function findLoggerDir() {
+  let baseDir = process.cwd();
+  const pkg = (0, import_pkg_up.pkgUpSync)({ cwd: baseDir });
+  if (pkg) {
+    baseDir = (0, import_path.dirname)(pkg);
+  }
+  return (0, import_path.join)(baseDir, "node_modules/.cache/logger");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   debug,

package/dist/npmClient.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/npmClient.ts

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/register.js

@@ -52,10 +52,13 @@ function transform(opts) {
 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,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/updatePackageJSON.ts
@@ -36,9 +39,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,
+    import_prettier.default.format(JSON.stringify(projectPkg), {
+      parser: "json"
+    })
+  );
 }
 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.0-canary.20230201.2",
+  "version": "4.0.0-canary.20230209.1",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {