@verdaccio/logger 6.0.0-6-next.24 → 6.0.0-6-next.26

package/.babelrc

@@ -1,3 +1,3 @@
 {
-  "extends": "../../.babelrc"
+  "extends": "../../../.babelrc"
 }

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @verdaccio/logger
 
+## 6.0.0-6-next.26
+
+### Patch Changes
+
+- @verdaccio/logger-commons@6.0.0-6-next.26
+
+## 6.0.0-6-next.25
+
+### Patch Changes
+
+- @verdaccio/core@6.0.0-6-next.57
+
 ## 6.0.0-6-next.24
 
 ### Patch Changes

package/build/index.d.ts

@@ -1 +1,3 @@
-export { setup, createLogger, logger, prepareSetup } from './logger';
+import { Logger, LoggerConfigItem } from '@verdaccio/types';
+export declare function setup(options: LoggerConfigItem): Logger;
+export declare let logger: Logger;

package/build/index.js

@@ -3,29 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "createLogger", {
-  enumerable: true,
-  get: function () {
-    return _logger.createLogger;
+exports.logger = void 0;
+exports.setup = setup;
+var _pino = _interopRequireDefault(require("pino"));
+var _loggerCommons = require("@verdaccio/logger-commons");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function setup(options) {
+  if (typeof logger !== 'undefined') {
+    return logger;
   }
-});
-Object.defineProperty(exports, "logger", {
-  enumerable: true,
-  get: function () {
-    return _logger.logger;
-  }
-});
-Object.defineProperty(exports, "prepareSetup", {
-  enumerable: true,
-  get: function () {
-    return _logger.prepareSetup;
-  }
-});
-Object.defineProperty(exports, "setup", {
-  enumerable: true,
-  get: function () {
-    return _logger.setup;
-  }
-});
-var _logger = require("./logger");
+  exports.logger = logger = (0, _loggerCommons.prepareSetup)(options, _pino.default);
+  return logger;
+}
+let logger;
+exports.logger = logger;
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["export { setup, createLogger, logger, prepareSetup } from './logger';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA"}
+{"version":3,"file":"index.js","names":["setup","options","logger","prepareSetup","pino"],"sources":["../src/index.ts"],"sourcesContent":["import pino from 'pino';\n\nimport { prepareSetup } from '@verdaccio/logger-commons';\nimport { Logger, LoggerConfigItem } from '@verdaccio/types';\n\nexport function setup(options: LoggerConfigItem) {\n  if (typeof logger !== 'undefined') {\n    return logger;\n  }\n\n  logger = prepareSetup(options, pino);\n  return logger;\n}\n\nexport let logger: Logger;\n"],"mappings":";;;;;;;AAAA;AAEA;AAAyD;AAGlD,SAASA,KAAK,CAACC,OAAyB,EAAE;EAC/C,IAAI,OAAOC,MAAM,KAAK,WAAW,EAAE;IACjC,OAAOA,MAAM;EACf;EAEA,iBAAAA,MAAM,GAAG,IAAAC,2BAAY,EAACF,OAAO,EAAEG,aAAI,CAAC;EACpC,OAAOF,MAAM;AACf;AAEO,IAAIA,MAAc;AAAC"}

package/jest.config.js

@@ -1,4 +1,4 @@
-const config = require('../../jest/config');
+const config = require('../../../jest/config');
 
 module.exports = Object.assign({}, config, {
   coverageThreshold: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/logger",
-  "version": "6.0.0-6-next.24",
+  "version": "6.0.0-6-next.26",
   "description": "logger",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -29,10 +29,7 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@verdaccio/core": "6.0.0-6-next.56",
-    "@verdaccio/logger-prettify": "6.0.0-6-next.8",
-    "debug": "4.3.4",
-    "colorette": "2.0.19",
+    "@verdaccio/logger-commons": "6.0.0-6-next.26",
     "pino": "8.8.0"
   },
   "devDependencies": {
@@ -44,7 +41,7 @@
   },
   "scripts": {
     "clean": "rimraf ./build",
-    "test": "cross-env TZ=utc jest",
+    "test": "echo 1",
     "type-check": "tsc --noEmit -p tsconfig.build.json",
     "build:types": "tsc --emitDeclarationOnly -p tsconfig.build.json",
     "build:js": "babel src/ --out-dir build/ --copy-files --extensions \".ts,.tsx\" --source-maps",

package/src/index.ts

@@ -1 +1,15 @@
-export { setup, createLogger, logger, prepareSetup } from './logger';
+import pino from 'pino';
+
+import { prepareSetup } from '@verdaccio/logger-commons';
+import { Logger, LoggerConfigItem } from '@verdaccio/types';
+
+export function setup(options: LoggerConfigItem) {
+  if (typeof logger !== 'undefined') {
+    return logger;
+  }
+
+  logger = prepareSetup(options, pino);
+  return logger;
+}
+
+export let logger: Logger;

package/tsconfig.build.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base",
+  "extends": "../../../tsconfig.base",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./build"

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.reference.json",
+  "extends": "../../../tsconfig.reference.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./build"
@@ -8,6 +8,9 @@
   "references": [
     {
       "path": "../logger-prettify"
+    },
+    {
+      "path": "../logger-commons"
     }
   ]
 }

package/build/logger.d.ts

@@ -1,18 +0,0 @@
-/// <reference types="node" />
-import { Logger, LoggerConfigItem, LoggerFormat } from '@verdaccio/types';
-export type LogPlugin = {
-    dest: string;
-    options?: any[];
-};
-type LoggerOptions = {
-    level?: string;
-    path?: string;
-    colors?: boolean;
-    sync?: boolean;
-};
-export declare function createLogger(options?: LoggerOptions, destination?: NodeJS.WritableStream, format?: LoggerFormat): any;
-export type LoggerConfig = LoggerConfigItem;
-export declare function prepareSetup(options?: LoggerConfigItem): Logger;
-export declare let logger: Logger;
-export declare function setup(options: LoggerConfigItem): Logger;
-export {};

package/build/logger.js

@@ -1,142 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createLogger = createLogger;
-exports.logger = void 0;
-exports.prepareSetup = prepareSetup;
-exports.setup = setup;
-var _colorette = require("colorette");
-var _debug = _interopRequireDefault(require("debug"));
-var _pino = _interopRequireDefault(require("pino"));
-var _loggerPrettify = require("@verdaccio/logger-prettify");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// <reference types="node" />
-
-const debug = (0, _debug.default)('verdaccio:logger');
-function isProd() {
-  return process.env.NODE_ENV === 'production';
-}
-function hasColors(colors) {
-  if (colors) {
-    return _colorette.isColorSupported;
-  }
-  return typeof colors === 'undefined' ? true : colors;
-}
-const DEFAULT_LOG_FORMAT = isProd() ? 'json' : 'pretty';
-function createLogger(options = {
-  level: 'http'
-},
-// eslint-disable-next-line no-undef
-// @ts-ignore
-destination = _pino.default.destination(1), format = DEFAULT_LOG_FORMAT) {
-  debug('setup logger');
-  let pinoConfig = {
-    customLevels: {
-      http: 25
-    },
-    level: options.level,
-    serializers: {
-      err: _pino.default.stdSerializers.err,
-      req: _pino.default.stdSerializers.req,
-      res: _pino.default.stdSerializers.res
-    }
-  };
-  debug('has prettifier? %o', !isProd());
-  // pretty logs are not allowed in production for performance reasons
-  if (['pretty-timestamped', 'pretty'].includes(format) && isProd() === false) {
-    pinoConfig = Object.assign({}, pinoConfig, {
-      transport: {
-        target: '@verdaccio/logger-prettify',
-        options: {
-          // string or 1 (file descriptor for process.stdout)
-          destination: options.path || 1,
-          colors: hasColors(options.colors),
-          prettyStamp: format === 'pretty-timestamped'
-        }
-      }
-    });
-  } else {
-    pinoConfig = {
-      ...pinoConfig,
-      // more info
-      // https://github.com/pinojs/pino/blob/v7.1.0/docs/api.md#hooks-object
-      // TODO: improve typings here
-      // @ts-ignore
-      hooks: {
-        logMethod(inputArgs, method) {
-          const [templateObject, message, ...otherArgs] = inputArgs;
-          const templateVars = !!templateObject && typeof templateObject === 'object' ? Object.getOwnPropertyNames(templateObject) : [];
-          if (!message || !templateVars.length) return method.apply(this, inputArgs);
-          const hydratedMessage = (0, _loggerPrettify.fillInMsgTemplate)(message, templateObject, false);
-          return method.apply(this, [templateObject, hydratedMessage, ...otherArgs]);
-        }
-      }
-    };
-  }
-  const logger = (0, _pino.default)(pinoConfig, destination);
-
-  /* eslint-disable */
-  /* istanbul ignore next */
-  if (process.env.DEBUG) {
-    logger.on('level-change', (lvl, val, prevLvl, prevVal) => {
-      debug('%s (%d) was changed to %s (%d)', lvl, val, prevLvl, prevVal);
-    });
-  }
-  return logger;
-}
-const DEFAULT_LOGGER_CONF = {
-  type: 'stdout',
-  format: 'pretty',
-  level: 'http'
-};
-function prepareSetup(options = DEFAULT_LOGGER_CONF) {
-  var _loggerConfig;
-  let logger;
-  let loggerConfig = options;
-  if (!((_loggerConfig = loggerConfig) !== null && _loggerConfig !== void 0 && _loggerConfig.level)) {
-    loggerConfig = Object.assign({}, {
-      level: 'http'
-    }, loggerConfig);
-  }
-  const pinoConfig = {
-    level: loggerConfig.level
-  };
-  if (loggerConfig.type === 'file') {
-    debug('logging file enabled');
-    const destination = _pino.default.destination(loggerConfig.path);
-    /* eslint-disable */
-    /* istanbul ignore next */
-    process.on('SIGUSR2', () => destination.reopen());
-    // @ts-ignore
-    logger = createLogger({
-      level: loggerConfig.level,
-      path: loggerConfig.path,
-      colors: loggerConfig.colors
-    },
-    // @ts-ignore
-    destination, loggerConfig.format);
-    return logger;
-  } else {
-    debug('logging stdout enabled');
-    // @ts-ignore
-    logger = createLogger({
-      level: loggerConfig.level,
-      colors: loggerConfig.colors
-    },
-    // @ts-ignore
-    _pino.default.destination(1), loggerConfig.format);
-    return logger;
-  }
-}
-let logger;
-exports.logger = logger;
-function setup(options) {
-  if (typeof logger !== 'undefined') {
-    return logger;
-  }
-  exports.logger = logger = prepareSetup(options);
-  return logger;
-}
-//# sourceMappingURL=logger.js.map

package/build/logger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.js","names":["debug","buildDebug","isProd","process","env","NODE_ENV","hasColors","colors","isColorSupported","DEFAULT_LOG_FORMAT","createLogger","options","level","destination","pino","format","pinoConfig","customLevels","http","serializers","err","stdSerializers","req","res","includes","Object","assign","transport","target","path","prettyStamp","hooks","logMethod","inputArgs","method","templateObject","message","otherArgs","templateVars","getOwnPropertyNames","length","apply","hydratedMessage","fillInMsgTemplate","logger","DEBUG","on","lvl","val","prevLvl","prevVal","DEFAULT_LOGGER_CONF","type","prepareSetup","loggerConfig","reopen","setup"],"sources":["../src/logger.ts"],"sourcesContent":["// <reference types=\"node\" />\nimport { isColorSupported } from 'colorette';\nimport buildDebug from 'debug';\nimport pino from 'pino';\n\nimport { fillInMsgTemplate } from '@verdaccio/logger-prettify';\nimport { Logger, LoggerConfigItem, LoggerFormat } from '@verdaccio/types';\n\nconst debug = buildDebug('verdaccio:logger');\n\nfunction isProd() {\n  return process.env.NODE_ENV === 'production';\n}\n\nfunction hasColors(colors: boolean | undefined) {\n  if (colors) {\n    return isColorSupported;\n  }\n  return typeof colors === 'undefined' ? true : colors;\n}\n\nconst DEFAULT_LOG_FORMAT = isProd() ? 'json' : 'pretty';\n\nexport type LogPlugin = {\n  dest: string;\n  options?: any[];\n};\n\ntype LoggerOptions = { level?: string; path?: string; colors?: boolean; sync?: boolean };\n\nexport function createLogger(\n  options: LoggerOptions = { level: 'http' },\n  // eslint-disable-next-line no-undef\n  // @ts-ignore\n  destination: NodeJS.WritableStream = pino.destination(1),\n  format: LoggerFormat = DEFAULT_LOG_FORMAT\n): any {\n  debug('setup logger');\n  let pinoConfig = {\n    customLevels: {\n      http: 25,\n    },\n    level: options.level,\n    serializers: {\n      err: pino.stdSerializers.err,\n      req: pino.stdSerializers.req,\n      res: pino.stdSerializers.res,\n    },\n  };\n\n  debug('has prettifier? %o', !isProd());\n  // pretty logs are not allowed in production for performance reasons\n  if (['pretty-timestamped', 'pretty'].includes(format) && isProd() === false) {\n    pinoConfig = Object.assign({}, pinoConfig, {\n      transport: {\n        target: '@verdaccio/logger-prettify',\n        options: {\n          // string or 1 (file descriptor for process.stdout)\n          destination: options.path || 1,\n          colors: hasColors(options.colors),\n          prettyStamp: format === 'pretty-timestamped',\n        },\n      },\n    });\n  } else {\n    pinoConfig = {\n      ...pinoConfig,\n      // more info\n      // https://github.com/pinojs/pino/blob/v7.1.0/docs/api.md#hooks-object\n      // TODO: improve typings here\n      // @ts-ignore\n      hooks: {\n        logMethod(\n          inputArgs: [any, any, ...any[]],\n          method: {\n            apply: (arg0: { logMethod: (inputArgs: any, method: any) => any }, arg1: any[]) => any;\n          }\n        ) {\n          const [templateObject, message, ...otherArgs] = inputArgs;\n          const templateVars =\n            !!templateObject && typeof templateObject === 'object'\n              ? Object.getOwnPropertyNames(templateObject)\n              : [];\n          if (!message || !templateVars.length) return method.apply(this, inputArgs);\n          const hydratedMessage = fillInMsgTemplate(message, templateObject, false);\n          return method.apply(this, [templateObject, hydratedMessage, ...otherArgs]);\n        },\n      },\n    };\n  }\n  const logger = pino(pinoConfig, destination);\n\n  /* eslint-disable */\n  /* istanbul ignore next */\n  if (process.env.DEBUG) {\n    logger.on('level-change', (lvl, val, prevLvl, prevVal) => {\n      debug('%s (%d) was changed to %s (%d)', lvl, val, prevLvl, prevVal);\n    });\n  }\n\n  return logger;\n}\n\nconst DEFAULT_LOGGER_CONF: LoggerConfigItem = {\n  type: 'stdout',\n  format: 'pretty',\n  level: 'http',\n};\n\nexport type LoggerConfig = LoggerConfigItem;\n\nexport function prepareSetup(options: LoggerConfigItem = DEFAULT_LOGGER_CONF) {\n  let logger: Logger;\n  let loggerConfig = options;\n  if (!loggerConfig?.level) {\n    loggerConfig = Object.assign(\n      {},\n      {\n        level: 'http',\n      },\n      loggerConfig\n    );\n  }\n  const pinoConfig = { level: loggerConfig.level };\n  if (loggerConfig.type === 'file') {\n    debug('logging file enabled');\n    const destination = pino.destination(loggerConfig.path);\n    /* eslint-disable */\n    /* istanbul ignore next */\n    process.on('SIGUSR2', () => destination.reopen());\n    // @ts-ignore\n    logger = createLogger(\n      { level: loggerConfig.level, path: loggerConfig.path, colors: loggerConfig.colors },\n      // @ts-ignore\n      destination,\n      loggerConfig.format\n    );\n    return logger;\n  } else {\n    debug('logging stdout enabled');\n    // @ts-ignore\n    logger = createLogger(\n      { level: loggerConfig.level, colors: loggerConfig.colors },\n      // @ts-ignore\n      pino.destination(1),\n      loggerConfig.format\n    );\n    return logger;\n  }\n}\n\nexport let logger: Logger;\n\nexport function setup(options: LoggerConfigItem) {\n  if (typeof logger !== 'undefined') {\n    return logger;\n  }\n\n  logger = prepareSetup(options);\n  return logger;\n}\n"],"mappings":"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"}

package/src/logger.ts

@@ -1,161 +0,0 @@
-// <reference types="node" />
-import { isColorSupported } from 'colorette';
-import buildDebug from 'debug';
-import pino from 'pino';
-
-import { fillInMsgTemplate } from '@verdaccio/logger-prettify';
-import { Logger, LoggerConfigItem, LoggerFormat } from '@verdaccio/types';
-
-const debug = buildDebug('verdaccio:logger');
-
-function isProd() {
-  return process.env.NODE_ENV === 'production';
-}
-
-function hasColors(colors: boolean | undefined) {
-  if (colors) {
-    return isColorSupported;
-  }
-  return typeof colors === 'undefined' ? true : colors;
-}
-
-const DEFAULT_LOG_FORMAT = isProd() ? 'json' : 'pretty';
-
-export type LogPlugin = {
-  dest: string;
-  options?: any[];
-};
-
-type LoggerOptions = { level?: string; path?: string; colors?: boolean; sync?: boolean };
-
-export function createLogger(
-  options: LoggerOptions = { level: 'http' },
-  // eslint-disable-next-line no-undef
-  // @ts-ignore
-  destination: NodeJS.WritableStream = pino.destination(1),
-  format: LoggerFormat = DEFAULT_LOG_FORMAT
-): any {
-  debug('setup logger');
-  let pinoConfig = {
-    customLevels: {
-      http: 25,
-    },
-    level: options.level,
-    serializers: {
-      err: pino.stdSerializers.err,
-      req: pino.stdSerializers.req,
-      res: pino.stdSerializers.res,
-    },
-  };
-
-  debug('has prettifier? %o', !isProd());
-  // pretty logs are not allowed in production for performance reasons
-  if (['pretty-timestamped', 'pretty'].includes(format) && isProd() === false) {
-    pinoConfig = Object.assign({}, pinoConfig, {
-      transport: {
-        target: '@verdaccio/logger-prettify',
-        options: {
-          // string or 1 (file descriptor for process.stdout)
-          destination: options.path || 1,
-          colors: hasColors(options.colors),
-          prettyStamp: format === 'pretty-timestamped',
-        },
-      },
-    });
-  } else {
-    pinoConfig = {
-      ...pinoConfig,
-      // more info
-      // https://github.com/pinojs/pino/blob/v7.1.0/docs/api.md#hooks-object
-      // TODO: improve typings here
-      // @ts-ignore
-      hooks: {
-        logMethod(
-          inputArgs: [any, any, ...any[]],
-          method: {
-            apply: (arg0: { logMethod: (inputArgs: any, method: any) => any }, arg1: any[]) => any;
-          }
-        ) {
-          const [templateObject, message, ...otherArgs] = inputArgs;
-          const templateVars =
-            !!templateObject && typeof templateObject === 'object'
-              ? Object.getOwnPropertyNames(templateObject)
-              : [];
-          if (!message || !templateVars.length) return method.apply(this, inputArgs);
-          const hydratedMessage = fillInMsgTemplate(message, templateObject, false);
-          return method.apply(this, [templateObject, hydratedMessage, ...otherArgs]);
-        },
-      },
-    };
-  }
-  const logger = pino(pinoConfig, destination);
-
-  /* eslint-disable */
-  /* istanbul ignore next */
-  if (process.env.DEBUG) {
-    logger.on('level-change', (lvl, val, prevLvl, prevVal) => {
-      debug('%s (%d) was changed to %s (%d)', lvl, val, prevLvl, prevVal);
-    });
-  }
-
-  return logger;
-}
-
-const DEFAULT_LOGGER_CONF: LoggerConfigItem = {
-  type: 'stdout',
-  format: 'pretty',
-  level: 'http',
-};
-
-export type LoggerConfig = LoggerConfigItem;
-
-export function prepareSetup(options: LoggerConfigItem = DEFAULT_LOGGER_CONF) {
-  let logger: Logger;
-  let loggerConfig = options;
-  if (!loggerConfig?.level) {
-    loggerConfig = Object.assign(
-      {},
-      {
-        level: 'http',
-      },
-      loggerConfig
-    );
-  }
-  const pinoConfig = { level: loggerConfig.level };
-  if (loggerConfig.type === 'file') {
-    debug('logging file enabled');
-    const destination = pino.destination(loggerConfig.path);
-    /* eslint-disable */
-    /* istanbul ignore next */
-    process.on('SIGUSR2', () => destination.reopen());
-    // @ts-ignore
-    logger = createLogger(
-      { level: loggerConfig.level, path: loggerConfig.path, colors: loggerConfig.colors },
-      // @ts-ignore
-      destination,
-      loggerConfig.format
-    );
-    return logger;
-  } else {
-    debug('logging stdout enabled');
-    // @ts-ignore
-    logger = createLogger(
-      { level: loggerConfig.level, colors: loggerConfig.colors },
-      // @ts-ignore
-      pino.destination(1),
-      loggerConfig.format
-    );
-    return logger;
-  }
-}
-
-export let logger: Logger;
-
-export function setup(options: LoggerConfigItem) {
-  if (typeof logger !== 'undefined') {
-    return logger;
-  }
-
-  logger = prepareSetup(options);
-  return logger;
-}

package/test/createLogger.spec.ts

@@ -1,20 +0,0 @@
-import { Writable } from 'stream';
-
-import { createLogger } from '../src';
-
-describe('logger test', () => {
-  describe('json format', () => {
-    test('should write json to a stream', () => {
-      const stream = new Writable({
-        write(chunk, encoding, callback) {
-          expect(JSON.parse(chunk.toString())).toEqual(
-            expect.objectContaining({ level: 30, msg: 'test' })
-          );
-          callback();
-        },
-      });
-      const logger = createLogger({ level: 'http' }, stream, 'json');
-      logger.info('test');
-    });
-  });
-});

package/test/logger.spec.ts

@@ -1,115 +0,0 @@
-import { readFile } from 'fs/promises';
-import { join } from 'path';
-import { setTimeout } from 'timers/promises';
-
-import { fileUtils } from '@verdaccio/core';
-
-import { prepareSetup } from '../src';
-
-async function readLogFile(path: string) {
-  await setTimeout(1000, 'resolved');
-  return readFile(path, 'utf8');
-}
-
-async function createLogFile() {
-  const folder = await fileUtils.createTempFolder('logger-1');
-  const file = join(folder, 'logger.log');
-  return file;
-}
-
-const defaultOptions = {
-  format: 'json',
-  level: 'http',
-  colors: false,
-};
-
-describe('logger test', () => {
-  describe('basic', () => {
-    test('should include default level', async () => {
-      const file = await createLogFile();
-      const logger = prepareSetup({ type: 'file', path: file, colors: false });
-      logger.info({ packageName: 'test' }, `testing @{packageName}`);
-      // Note: this should not be logged
-      logger.debug(`this should not be logged`);
-      // Note: this should not be logged
-      logger.trace(`this should not be logged`);
-      logger.error(`this should logged`);
-      const content = await readLogFile(file);
-      expect(content).toBe('info --- testing test \nerror--- this should logged \n');
-    });
-
-    test('should include all logging level', async () => {
-      const file = await createLogFile();
-      const logger = prepareSetup({ type: 'file', level: 'trace', path: file, colors: false });
-      logger.info({ packageName: 'test' }, `testing @{packageName}`);
-      logger.debug(`this should not be logged`);
-      logger.trace(`this should not be logged`);
-      logger.error(`this should logged`);
-      const content = await readLogFile(file);
-      expect(content).toBe(
-        'info --- testing test \ndebug--- this should not be logged \ntrace--- this should not be logged \nerror--- this should logged \n'
-      );
-    });
-  });
-
-  describe('json format', () => {
-    test('should log into a file with json format', async () => {
-      const file = await createLogFile();
-      const logger = prepareSetup({
-        ...defaultOptions,
-        format: 'json',
-        type: 'file',
-        path: file,
-        level: 'info',
-      });
-      logger.info(
-        { packageName: 'test' },
-        `publishing or updating a new version for @{packageName}`
-      );
-      const content = await readLogFile(file);
-      expect(JSON.parse(content)).toEqual(
-        expect.objectContaining({
-          level: 30,
-          msg: 'publishing or updating a new version for test',
-        })
-      );
-    });
-  });
-
-  describe('pretty format', () => {
-    test('should log into a file with pretty', async () => {
-      const file = await createLogFile();
-      const logger = prepareSetup({
-        format: 'pretty',
-        type: 'file',
-        path: file,
-        level: 'trace',
-        colors: false,
-      });
-      logger.info(
-        { packageName: 'test' },
-        `publishing or updating a new version for @{packageName}`
-      );
-      const content = await readLogFile(file);
-      expect(content).toEqual('info --- publishing or updating a new version for test \n');
-    });
-
-    test('should log into a file with pretty-timestamped', async () => {
-      const file = await createLogFile();
-      const logger = prepareSetup({
-        format: 'pretty-timestamped',
-        type: 'file',
-        path: file,
-        level: 'trace',
-        colors: false,
-      });
-      logger.info(
-        { packageName: 'test' },
-        `publishing or updating a new version for @{packageName}`
-      );
-      const content = await readLogFile(file);
-      // TODO: we might want mock time for testing
-      expect(content).toMatch('info --- publishing or updating a new version for test \n');
-    });
-  });
-});