@umijs/utils 4.0.0-canary.20230201.1 → 4.0.0-canary.20230207.1

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/utils",
-  "version": "4.0.0-canary.20230201.1",
+  "version": "4.0.0-canary.20230207.1",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {