@rife/logger 0.0.6-beta.19 → 0.0.6-beta.20

package/dist/cjs/pino/index.cjs

@@ -61,7 +61,7 @@ var __webpack_exports__ = {};
     const external_pino_namespaceObject = require("pino");
     var external_pino_default = /*#__PURE__*/ __webpack_require__.n(external_pino_namespaceObject);
     const external_trace_cjs_namespaceObject = require("../trace.cjs");
-    function getPinoConfig() {
+    function createLogger() {
         const targets = [];
         const rotate = `./rotate${external_path_default().extname(__filename)}`;
         targets.push({
@@ -71,7 +71,7 @@ var __webpack_exports__ = {};
                 path: './logs/'
             }
         });
-        if ("u" > typeof __isNodeSingleFileBundle || "u" > typeof __isVite || global?.__remix_devServerHooks || 'development' !== process.env.NODE_ENV) globalThis.__bundlerPathsOverrides = {
+        if ("u" > typeof RSTACK_NODE_SINGLE_FILE_BUNDLE || 'development' !== process.env.NODE_ENV) globalThis.__bundlerPathsOverrides = {
             'pino-pretty': external_path_default().join(__dirname, './worker/pino-pretty.cjs'),
             'pino-worker': external_path_default().join(__dirname, './worker/pino-worker.cjs'),
             [rotate]: external_path_default().join(__dirname, './worker/pino-rotate.cjs'),
@@ -134,9 +134,6 @@ var __webpack_exports__ = {};
                 }
             }
         };
-        return config;
-    }
-    function createLogger() {
         const logger = external_pino_default()({
             base: {
                 pid: process.pid
@@ -144,7 +141,7 @@ var __webpack_exports__ = {};
             messageKey: 'message',
             errorKey: 'error',
             timestamp: external_pino_default().stdTimeFunctions.epochTime,
-            ...getPinoConfig()
+            ...config
         });
         return {
             logger

package/dist/esm/pino/index.mjs

@@ -8,7 +8,7 @@ var __rspack_import_meta_filename__ = __rspack_fileURLToPath(import.meta.url);
 var __rspack_import_meta_dirname__ = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 import { createRequire as __rspack_createRequire } from "node:module";
 const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
-function getPinoConfig() {
+function createLogger() {
     const targets = [];
     const rotate = `./rotate${path.extname(__rspack_import_meta_filename__)}`;
     targets.push({
@@ -18,7 +18,7 @@ function getPinoConfig() {
             path: './logs/'
         }
     });
-    if ("u" > typeof __isNodeSingleFileBundle || "u" > typeof __isVite || global?.__remix_devServerHooks || 'development' !== process.env.NODE_ENV) globalThis.__bundlerPathsOverrides = {
+    if ("u" > typeof RSTACK_NODE_SINGLE_FILE_BUNDLE || 'development' !== process.env.NODE_ENV) globalThis.__bundlerPathsOverrides = {
         'pino-pretty': path.join(__rspack_import_meta_dirname__, './worker/pino-pretty.cjs'),
         'pino-worker': path.join(__rspack_import_meta_dirname__, './worker/pino-worker.cjs'),
         [rotate]: path.join(__rspack_import_meta_dirname__, './worker/pino-rotate.cjs'),
@@ -81,9 +81,6 @@ function getPinoConfig() {
             }
         }
     };
-    return config;
-}
-function createLogger() {
     const logger = pino({
         base: {
             pid: process.pid
@@ -91,7 +88,7 @@ function createLogger() {
         messageKey: 'message',
         errorKey: 'error',
         timestamp: pino.stdTimeFunctions.epochTime,
-        ...getPinoConfig()
+        ...config
     });
     return {
         logger

package/dist/esm/test.mjs

@@ -2,7 +2,7 @@ import "node:module";
 import { createLogger } from "./pino/index.mjs";
 import { genTraceId, runInTrace } from "./trace.mjs";
 process.env.NODE_ENV = 'development';
-const { logger: logger } = createLogger();
+const { logger } = createLogger();
 logger.info({
     a: 999
 }, '1');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.6-beta.19",
+  "version": "0.0.6-beta.20",
   "description": "",
   "type": "module",
   "types": "./src/index.ts",
@@ -43,8 +43,8 @@
     "rotating-file-stream": "^3.2.9"
   },
   "devDependencies": {
-    "@rife/cli": "0.0.6-beta.26",
-    "@rife/plugin-rstack": "0.0.1-beta.26",
+    "@rife/cli": "0.0.6-beta.28",
+    "@rife/plugin-rstack": "0.0.1-beta.27",
     "thread-stream": "^4.0.0"
   },
   "scripts": {

package/src/pino/index.ts

@@ -5,11 +5,12 @@ export { pino };
 
 import { genTraceId, getTraceId, runInTrace } from '../trace';
 
-declare var __isNodeSingleFileBundle: any;
-declare var __isVite: any;
+declare let RSTACK_NODE_SINGLE_FILE_BUNDLE: any;
+
+export type Logger = pino.Logger;
 
 // https://github.com/pinojs/pino/blob/master/docs/api.md
-function getPinoConfig() {
+export function createLogger() {
     const targets: any = [];
 
     const rotate = `./rotate${path.extname(__filename)}`;
@@ -20,12 +21,7 @@ function getPinoConfig() {
         options: { path: './logs/' },
     });
 
-    if (
-        typeof __isNodeSingleFileBundle !== 'undefined' ||
-        typeof __isVite !== 'undefined' || // remix
-        (global as any)?.__remix_devServerHooks || // remix
-        process.env.NODE_ENV !== 'development'
-    ) {
+    if (typeof (RSTACK_NODE_SINGLE_FILE_BUNDLE as any) !== 'undefined' || process.env.NODE_ENV !== 'development') {
         // 打包单文件的时候自动拷贝worker
         (globalThis as any).__bundlerPathsOverrides = {
             'pino-pretty': path.join(__dirname, './worker/pino-pretty.cjs'),
@@ -103,12 +99,6 @@ function getPinoConfig() {
         },
     };
 
-    return config;
-}
-
-export type Logger = pino.Logger<never, boolean>;
-
-export function createLogger() {
     const logger: Logger = pino({
         // https://github.com/pinojs/pino/blob/main/docs/api.md#opt-serializers
         base: { pid: process.pid },
@@ -116,7 +106,7 @@ export function createLogger() {
         errorKey: 'error',
         timestamp: pino.stdTimeFunctions.epochTime,
         // timestamp: process.env.NODE_ENV === 'production' ? pino.stdTimeFunctions.epochTime : pino.stdTimeFunctions.isoTime,
-        ...getPinoConfig(),
+        ...config,
     });
 
     return { logger };

package/src/trace.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'async_hooks';
 
-const als = new AsyncLocalStorage<{ traceId: string } & any>();
+const als = new AsyncLocalStorage<{ traceId: string } & Record<string, any>>();
 
 export function runInTrace<T>(data: any, fn: (...args: any[]) => T): T {
     return als.run(data, fn);