fix(deps)!: update @pnpm/logger (#5496)

.changeset/selfish-cycles-return.md

@@ -0,0 +1,95 @@
+---
+"@pnpm/audit": major
+"@pnpm/build-modules": major
+"@pnpm/cafs": major
+"@pnpm/cli-meta": major
+"@pnpm/cli-utils": major
+"@pnpm/client": major
+"@pnpm/config": major
+"@pnpm/core": major
+"@pnpm/core-loggers": major
+"@pnpm/create-cafs-store": major
+"@pnpm/default-reporter": major
+"@pnpm/default-resolver": major
+"dependencies-hierarchy": major
+"@pnpm/directory-fetcher": major
+"@pnpm/error": major
+"@pnpm/exportable-manifest": major
+"@pnpm/fetch": major
+"@pnpm/filter-lockfile": major
+"@pnpm/filter-workspace-packages": major
+"find-packages": major
+"@pnpm/find-workspace-dir": major
+"@pnpm/find-workspace-packages": major
+"@pnpm/fs.indexed-pkg-importer": major
+"@pnpm/get-context": major
+"@pnpm/git-fetcher": major
+"@pnpm/git-resolver": major
+"@pnpm/headless": major
+"@pnpm/hoist": major
+"@pnpm/hooks.read-package-hook": major
+"@pnpm/lifecycle": major
+"@pnpm/link-bins": major
+"@pnpm/list": major
+"@pnpm/local-resolver": major
+"@pnpm/lockfile-file": major
+"@pnpm/lockfile-to-pnp": major
+"@pnpm/lockfile-walker": major
+"@pnpm/manifest-utils": major
+"@pnpm/matcher": major
+"@pnpm/merge-lockfile-changes": major
+"@pnpm/modules-cleaner": major
+"@pnpm/node.fetcher": major
+"@pnpm/normalize-registries": major
+"@pnpm/npm-resolver": major
+"@pnpm/outdated": major
+"@pnpm/package-bins": major
+"@pnpm/package-is-installable": major
+"@pnpm/package-requester": major
+"@pnpm/package-store": major
+"@pnpm/parse-cli-args": major
+"@pnpm/parse-overrides": major
+"@pnpm/parse-wanted-dependency": major
+"@pnpm/pick-registry-for-package": major
+"pkgs-graph": major
+"@pnpm/plugin-commands-audit": major
+"@pnpm/plugin-commands-deploy": major
+"@pnpm/plugin-commands-env": major
+"@pnpm/plugin-commands-init": major
+"@pnpm/plugin-commands-installation": major
+"@pnpm/plugin-commands-listing": major
+"@pnpm/plugin-commands-outdated": major
+"@pnpm/plugin-commands-patching": major
+"@pnpm/plugin-commands-publishing": major
+"@pnpm/plugin-commands-rebuild": major
+"@pnpm/plugin-commands-script-runners": major
+"@pnpm/plugin-commands-server": major
+"@pnpm/plugin-commands-setup": major
+"@pnpm/plugin-commands-store": major
+"pnpm": major
+"@pnpm/pnpmfile": major
+"@pnpm/prepare-package": major
+"@pnpm/read-modules-dir": major
+"@pnpm/read-package-json": major
+"@pnpm/read-project-manifest": major
+"@pnpm/read-projects-context": major
+"@pnpm/real-hoist": major
+"@pnpm/remove-bins": major
+"@pnpm/render-peer-issues": major
+"@pnpm/resolve-dependencies": major
+"@pnpm/resolve-workspace-range": major
+"@pnpm/run-npm": major
+"@pnpm/server": major
+"@pnpm/sort-packages": major
+"@pnpm/store-connection-manager": major
+"@pnpm/store-path": major
+"@pnpm/symlink-dependency": major
+"@pnpm/tarball-fetcher": major
+"@pnpm/tarball-resolver": major
+"@pnpm/which-version-is-pinned": major
+"@pnpm/write-project-manifest": major
+"@pnpm/make-dedicated-lockfile": minor
+"@pnpm/mount-modules": minor
+---
+
+Require `@pnpm/logger` v5.

packages/build-modules/package.json

@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/build-modules#readme",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/calc-dep-state": "workspace:*",

packages/build-modules/src/index.ts

@@ -4,7 +4,7 @@ import { skippedOptionalDependencyLogger } from '@pnpm/core-loggers'
 import { PnpmError } from '@pnpm/error'
 import { runPostinstallHooks } from '@pnpm/lifecycle'
 import { linkBins, linkBinsOfPackages } from '@pnpm/link-bins'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { readPackageJsonFromDir, safeReadPackageJsonFromDir } from '@pnpm/read-package-json'
 import { StoreController } from '@pnpm/store-controller-types'
 import { DependencyManifest } from '@pnpm/types'

packages/cli-utils/package.json

@@ -44,7 +44,7 @@
     "load-json-file": "^6.2.0"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {

packages/cli-utils/src/packageIsInstallable.ts

@@ -1,5 +1,5 @@
 import { packageManager } from '@pnpm/cli-meta'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { checkPackage, UnsupportedEngineError, WantedEngine } from '@pnpm/package-is-installable'
 
 export function packageIsInstallable (

packages/core-loggers/package.json

@@ -12,7 +12,7 @@
     "!*.map"
   ],
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "devDependencies": {
     "@pnpm/core-loggers": "workspace:*"

packages/core-loggers/src/contextLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const contextLogger = baseLogger('context')
+export const contextLogger = logger('context')
 
 export interface ContextMessage {
   currentLockfileExists: boolean

packages/core-loggers/src/deprecationLogger.ts

@@ -1,9 +1,10 @@
-import baseLogger, {
+import {
   LogBase,
   Logger,
+  logger,
 } from '@pnpm/logger'
 
-export const deprecationLogger = baseLogger('deprecation') as Logger<DeprecationMessage>
+export const deprecationLogger = logger('deprecation') as Logger<DeprecationMessage>
 
 export interface DeprecationMessage {
   pkgName: string

packages/core-loggers/src/executionTimeLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const executionTimeLogger = baseLogger('execution-time')
+export const executionTimeLogger = logger('execution-time')
 
 export interface ExecutionTimeMessage {
   startedAt: number

packages/core-loggers/src/fetchingProgressLogger.ts

@@ -1,9 +1,10 @@
-import baseLogger, {
+import {
   LogBase,
   Logger,
+  logger,
 } from '@pnpm/logger'
 
-export const fetchingProgressLogger = baseLogger('fetching-progress') as Logger<FetchingProgressMessage>
+export const fetchingProgressLogger = logger('fetching-progress') as Logger<FetchingProgressMessage>
 
 export type FetchingProgressMessage = {
   attempt: number

packages/core-loggers/src/hookLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const hookLogger = baseLogger('hook')
+export const hookLogger = logger('hook')
 
 export interface HookMessage {
   from: string

packages/core-loggers/src/installCheckLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const installCheckLogger = baseLogger<InstallCheckMessage>('install-check')
+export const installCheckLogger = logger<InstallCheckMessage>('install-check')
 
 export interface InstallCheckMessage {
   code: string

packages/core-loggers/src/lifecycleLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const lifecycleLogger = baseLogger<LifecycleMessage>('lifecycle')
+export const lifecycleLogger = logger<LifecycleMessage>('lifecycle')
 
 // TODO: make depPath optional
 export type LifecycleMessage = {

packages/core-loggers/src/linkLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const linkLogger = baseLogger<LinkMessage>('link')
+export const linkLogger = logger<LinkMessage>('link')
 
 export interface LinkMessage {
   target: string

packages/core-loggers/src/packageImportMethodLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const packageImportMethodLogger = baseLogger('package-import-method')
+export const packageImportMethodLogger = logger('package-import-method')
 
 export interface PackageImportMethodMessage {
   method: 'clone' | 'hardlink' | 'copy'

packages/core-loggers/src/packageManifestLogger.ts

@@ -1,9 +1,10 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 import { ProjectManifest } from '@pnpm/types'
 
-export const packageManifestLogger = baseLogger<PackageManifestMessage>('package-manifest')
+export const packageManifestLogger = logger<PackageManifestMessage>('package-manifest')
 
 export type PackageManifestMessage = {
   prefix: string

packages/core-loggers/src/peerDependencyIssues.ts

@@ -1,10 +1,11 @@
-import baseLogger, {
+import {
   LogBase,
   Logger,
+  logger,
 } from '@pnpm/logger'
 import { PeerDependencyIssuesByProjects } from '@pnpm/types'
 
-export const peerDependencyIssuesLogger = baseLogger('peer-dependency-issues') as Logger<PeerDependencyIssuesMessage>
+export const peerDependencyIssuesLogger = logger('peer-dependency-issues') as Logger<PeerDependencyIssuesMessage>
 
 export interface PeerDependencyIssuesMessage {
   issuesByProjects: PeerDependencyIssuesByProjects

packages/core-loggers/src/progressLogger.ts

@@ -1,9 +1,10 @@
-import baseLogger, {
+import {
   LogBase,
   Logger,
+  logger,
 } from '@pnpm/logger'
 
-export const progressLogger = baseLogger('progress') as Logger<ProgressMessage>
+export const progressLogger = logger('progress') as Logger<ProgressMessage>
 
 export type ProgressMessage = {
   packageId: string

packages/core-loggers/src/removalLogger.ts

@@ -1,3 +1,3 @@
-import baseLogger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 
-export const removalLogger = baseLogger<string>('removal')
+export const removalLogger = logger<string>('removal')

packages/core-loggers/src/requestRetryLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const requestRetryLogger = baseLogger<RequestRetryMessage>('request-retry')
+export const requestRetryLogger = logger<RequestRetryMessage>('request-retry')
 
 export interface RequestRetryMessage {
   attempt: number

packages/core-loggers/src/rootLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const rootLogger = baseLogger<RootMessage>('root')
+export const rootLogger = logger<RootMessage>('root')
 
 export type DependencyType = 'prod' | 'dev' | 'optional'
 

packages/core-loggers/src/scopeLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const scopeLogger = baseLogger<ScopeMessage>('scope')
+export const scopeLogger = logger<ScopeMessage>('scope')
 
 export interface ScopeMessage {
   selected: number

packages/core-loggers/src/skippedOptionalDependencyLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const skippedOptionalDependencyLogger = baseLogger<SkippedOptionalDependencyMessage>('skipped-optional-dependency')
+export const skippedOptionalDependencyLogger = logger<SkippedOptionalDependencyMessage>('skipped-optional-dependency')
 
 export type SkippedOptionalDependencyLog = { name: 'pnpm:skipped-optional-dependency' } & LogBase & SkippedOptionalDependencyMessage
 

packages/core-loggers/src/stageLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const stageLogger = baseLogger<StageMessage>('stage')
+export const stageLogger = logger<StageMessage>('stage')
 
 export interface StageMessage {
   prefix: string

packages/core-loggers/src/statsLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const statsLogger = baseLogger<StatsMessage>('stats')
+export const statsLogger = logger<StatsMessage>('stats')
 
 export type StatsMessage = {
   prefix: string

packages/core-loggers/src/summaryLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const summaryLogger = baseLogger<SummaryMessage>('summary')
+export const summaryLogger = logger<SummaryMessage>('summary')
 
 export interface SummaryMessage {
   prefix: string

packages/core-loggers/src/updateCheckLogger.ts

@@ -1,8 +1,9 @@
-import baseLogger, {
+import {
   LogBase,
+  logger,
 } from '@pnpm/logger'
 
-export const updateCheckLogger = baseLogger('update-check')
+export const updateCheckLogger = logger('update-check')
 
 export interface UpdateCheckMessage {
   currentVersion: string

packages/core/package.json

@@ -12,7 +12,7 @@
     "!*.map"
   ],
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/build-modules": "workspace:*",

packages/core/src/err.ts

@@ -1,4 +1,4 @@
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 
 export default function err (error: Error) {
   // bole passes only the name, message and stack of an error

packages/core/src/install/index.ts

@@ -32,7 +32,7 @@ import {
 } from '@pnpm/lockfile-file'
 import { writePnpFile } from '@pnpm/lockfile-to-pnp'
 import { extendProjectsWithTargetDirs } from '@pnpm/lockfile-utils'
-import logger, { globalInfo, streamParser } from '@pnpm/logger'
+import { logger, globalInfo, streamParser } from '@pnpm/logger'
 import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils'
 import { write as writeModulesYaml } from '@pnpm/modules-yaml'
 import { readModulesDir } from '@pnpm/read-modules-dir'

packages/core/src/install/link.ts

@@ -12,7 +12,7 @@ import {
 } from '@pnpm/filter-lockfile'
 import { hoist } from '@pnpm/hoist'
 import { Lockfile } from '@pnpm/lockfile-file'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { prune } from '@pnpm/modules-cleaner'
 import { IncludedDependencies } from '@pnpm/modules-yaml'
 import {

packages/core/src/link/index.ts

@@ -11,7 +11,7 @@ import {
   writeCurrentLockfile,
   writeLockfiles,
 } from '@pnpm/lockfile-file'
-import logger, { streamParser } from '@pnpm/logger'
+import { logger, streamParser } from '@pnpm/logger'
 import {
   getPref,
   getSpecFromPackageManifest,

packages/create-cafs-store/package.json

@@ -12,7 +12,7 @@
     "!*.map"
   ],
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/cafs": "workspace:*",

packages/default-reporter/package.json

@@ -30,7 +30,7 @@
     "url": "https://github.com/pnpm/pnpm/issues"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/config": "workspace:*",

packages/default-reporter/test/filterLogHook.ts

@@ -1,6 +1,6 @@
 import { Log } from '@pnpm/core-loggers'
 import { toOutput$ } from '@pnpm/default-reporter'
-import logger, { createStreamParser } from '@pnpm/logger'
+import { logger, createStreamParser } from '@pnpm/logger'
 
 test('logger with filterLog hook', (done) => {
   const output$ = toOutput$({

packages/default-reporter/test/index.ts

@@ -13,8 +13,9 @@ import {
 } from '@pnpm/core-loggers'
 import { toOutput$ } from '@pnpm/default-reporter'
 import { PnpmError } from '@pnpm/error'
-import logger, {
+import {
   createStreamParser,
+  logger,
 } from '@pnpm/logger'
 import { map, skip, take } from 'rxjs/operators'
 import chalk from 'chalk'

packages/default-reporter/test/reportingErrors.ts

@@ -1,8 +1,9 @@
 import path from 'path'
 import { toOutput$ } from '@pnpm/default-reporter'
 import { PnpmError } from '@pnpm/error'
-import logger, {
+import {
   createStreamParser,
+  logger,
 } from '@pnpm/logger'
 import { map, take } from 'rxjs/operators'
 import chalk from 'chalk'

packages/default-reporter/test/reportingPeerDependencyIssues.ts

@@ -1,7 +1,8 @@
 import { peerDependencyIssuesLogger } from '@pnpm/core-loggers'
 import { toOutput$ } from '@pnpm/default-reporter'
-import logger, {
+import {
   createStreamParser,
+  logger,
 } from '@pnpm/logger'
 import { take } from 'rxjs/operators'
 

packages/default-reporter/test/reportingProgress.ts

@@ -6,8 +6,9 @@ import {
   statsLogger,
 } from '@pnpm/core-loggers'
 import { toOutput$ } from '@pnpm/default-reporter'
-import logger, {
+import {
   createStreamParser,
+  logger,
 } from '@pnpm/logger'
 import { map, skip, take } from 'rxjs/operators'
 import chalk from 'chalk'

packages/fetch/package.json

@@ -29,7 +29,7 @@
     "url": "https://github.com/pnpm/pnpm/issues"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/fetch#readme",
   "dependencies": {

packages/filter-lockfile/package.json

@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/filter-lockfile#readme",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "devDependencies": {
     "@pnpm/filter-lockfile": "workspace:*",

packages/filter-lockfile/src/filterLockfileByImporters.ts

@@ -5,11 +5,11 @@ import {
   PackageSnapshots,
 } from '@pnpm/lockfile-types'
 import { lockfileWalker, LockfileWalkerStep } from '@pnpm/lockfile-walker'
-import pnpmLogger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { DependenciesField } from '@pnpm/types'
 import { filterImporter } from './filterImporter'
 
-const logger = pnpmLogger('lockfile')
+const lockfileLogger = logger('lockfile')
 
 export function filterLockfileByImporters (
   lockfile: Lockfile,
@@ -62,6 +62,6 @@ function pkgAllDeps (
     if (opts.failOnMissingDependencies) {
       throw new LockfileMissingDependencyError(depPath)
     }
-    logger.debug(`No entry for "${depPath}" in ${WANTED_LOCKFILE}`)
+    lockfileLogger.debug(`No entry for "${depPath}" in ${WANTED_LOCKFILE}`)
   }
 }

packages/filter-lockfile/src/filterLockfileByImportersAndEngine.ts

@@ -5,14 +5,14 @@ import {
   PackageSnapshots,
 } from '@pnpm/lockfile-types'
 import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
-import pnpmLogger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { packageIsInstallable } from '@pnpm/package-is-installable'
 import { DependenciesField } from '@pnpm/types'
 import * as dp from 'dependency-path'
 import unnest from 'ramda/src/unnest'
 import { filterImporter } from './filterImporter'
 
-const logger = pnpmLogger('lockfile')
+const lockfileLogger = logger('lockfile')
 
 export function filterLockfileByImportersAndEngine (
   lockfile: Lockfile,
@@ -124,7 +124,7 @@ function pkgAllDeps (
       if (opts.failOnMissingDependencies) {
         throw new LockfileMissingDependencyError(depPath)
       }
-      logger.debug(`No entry for "${depPath}" in ${WANTED_LOCKFILE}`)
+      lockfileLogger.debug(`No entry for "${depPath}" in ${WANTED_LOCKFILE}`)
       continue
     }
     let installable!: boolean

packages/fs.indexed-pkg-importer/package.json

@@ -12,7 +12,7 @@
     "!*.map"
   ],
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/core-loggers": "workspace:*",

packages/fs.indexed-pkg-importer/src/importIndexedDir.ts

@@ -1,13 +1,13 @@
 import { promises as fs } from 'fs'
 import path from 'path'
-import pnpmLogger, { globalWarn } from '@pnpm/logger'
+import { globalWarn, logger } from '@pnpm/logger'
 import rimraf from '@zkochan/rimraf'
 import sanitizeFilename from 'sanitize-filename'
 import makeEmptyDir from 'make-empty-dir'
 import pathTemp from 'path-temp'
 import renameOverwrite from 'rename-overwrite'
 
-const filenameConflictsLogger = pnpmLogger('_filename-conflicts')
+const filenameConflictsLogger = logger('_filename-conflicts')
 
 export type ImportFile = (src: string, dest: string) => Promise<void>
 

packages/fs.indexed-pkg-importer/test/createImportPackage.test.ts

@@ -13,10 +13,8 @@ jest.mock('path-temp', () => (dir: string) => path.join(dir, '_tmp'))
 jest.mock('rename-overwrite', () => jest.fn())
 const globalInfo = jest.fn()
 const globalWarn = jest.fn()
-const baseLogger = jest.fn(() => ({ debug: jest.fn() }))
-baseLogger['globalInfo'] = globalInfo
-baseLogger['globalWarn'] = globalWarn
-jest.mock('@pnpm/logger', () => baseLogger)
+const logger = jest.fn(() => ({ debug: jest.fn() }))
+jest.mock('@pnpm/logger', () => ({ logger, globalWarn, globalInfo }))
 
 // eslint-disable-next-line
 import { createIndexedPkgImporter } from '@pnpm/fs.indexed-pkg-importer'

packages/get-context/package.json

@@ -34,7 +34,7 @@
     "@types/ramda": "0.28.15"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/constants": "workspace:*",

packages/get-context/src/index.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import { contextLogger, packageManifestLogger } from '@pnpm/core-loggers'
 import { PnpmError } from '@pnpm/error'
 import { Lockfile } from '@pnpm/lockfile-file'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import {
   IncludedDependencies,
   Modules,

packages/get-context/src/readLockfiles.ts

@@ -10,7 +10,7 @@ import {
   readWantedLockfile,
   readWantedLockfileAndAutofixConflicts,
 } from '@pnpm/lockfile-file'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import isCI from 'is-ci'
 import clone from 'ramda/src/clone'
 import equals from 'ramda/src/equals'

packages/headless/package.json

@@ -12,7 +12,7 @@
     "!*.map"
   ],
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "devDependencies": {
     "@pnpm/assert-project": "workspace:*",

packages/headless/src/index.ts

@@ -38,8 +38,9 @@ import {
   nameVerFromPkgSnapshot,
   satisfiesPackageManifest,
 } from '@pnpm/lockfile-utils'
-import logger, {
+import {
   LogBase,
+  logger,
   streamParser,
 } from '@pnpm/logger'
 import { prune } from '@pnpm/modules-cleaner'

packages/headless/src/linkHoistedModules.ts

@@ -6,7 +6,7 @@ import {
   statsLogger,
 } from '@pnpm/core-loggers'
 import { linkBins } from '@pnpm/link-bins'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import {
   PackageFilesResponse,
   StoreController,

packages/headless/src/lockfileToDepGraph.ts

@@ -12,7 +12,7 @@ import {
   packageIdFromSnapshot,
   pkgSnapshotToResolution,
 } from '@pnpm/lockfile-utils'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { IncludedDependencies } from '@pnpm/modules-yaml'
 import { packageIsInstallable } from '@pnpm/package-is-installable'
 import { PatchFile, Registries } from '@pnpm/types'

packages/hoist/package.json

@@ -12,7 +12,7 @@
     "!*.map"
   ],
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "devDependencies": {
     "@pnpm/hoist": "workspace:*",

packages/hoist/src/index.ts

@@ -6,7 +6,7 @@ import {
   nameVerFromPkgSnapshot,
 } from '@pnpm/lockfile-utils'
 import { lockfileWalker, LockfileWalkerStep } from '@pnpm/lockfile-walker'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { createMatcher } from '@pnpm/matcher'
 import { symlinkDependency } from '@pnpm/symlink-dependency'
 import { HoistedDependencies } from '@pnpm/types'

packages/lifecycle/package.json

@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/lifecycle#readme",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/core-loggers": "workspace:*",

packages/link-bins/package.json

@@ -61,7 +61,7 @@
   },
   "funding": "https://opencollective.com/pnpm",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "exports": {
     ".": "./lib/index.js"

packages/link-bins/src/index.ts

@@ -1,7 +1,7 @@
 import { promises as fs, existsSync } from 'fs'
 import path from 'path'
 import { PnpmError } from '@pnpm/error'
-import logger, { globalWarn } from '@pnpm/logger'
+import { logger, globalWarn } from '@pnpm/logger'
 import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils'
 import { Command, getBinsFromPackageManifest } from '@pnpm/package-bins'
 import { readModulesDir } from '@pnpm/read-modules-dir'

packages/link-bins/test/index.ts

@@ -1,7 +1,7 @@
 /// <reference path="../../../typings/index.d.ts"/>
 import { promises as fs, writeFileSync } from 'fs'
 import path from 'path'
-import logger, { globalWarn } from '@pnpm/logger'
+import { logger, globalWarn } from '@pnpm/logger'
 import {
   linkBins,
   linkBinsOfPackages,
@@ -18,8 +18,7 @@ jest.mock('@pnpm/logger', () => {
   const globalWarn = jest.fn()
 
   return {
-    __esModule: true,
-    default: () => ({ debug }),
+    logger: () => ({ debug }),
     globalWarn,
   }
 })

packages/lockfile-file/package.json

@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/lockfile-file#readme",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "devDependencies": {
     "@pnpm/lockfile-file": "workspace:*",

packages/lockfile-file/src/logger.ts

@@ -1,3 +1,3 @@
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 
 export default logger('lockfile')

packages/lockfile-to-pnp/package.json

@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/lockfile-to-pnp#readme",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "devDependencies": {
     "@pnpm/lockfile-to-pnp": "workspace:*",

packages/make-dedicated-lockfile/package.json

@@ -37,7 +37,7 @@
     "@pnpm/exportable-manifest": "workspace:*",
     "@pnpm/find-workspace-dir": "workspace:*",
     "@pnpm/lockfile-file": "workspace:*",
-    "@pnpm/logger": "^4.0.0",
+    "@pnpm/logger": "^5.0.0",
     "@pnpm/prune-lockfile": "workspace:*",
     "@pnpm/read-project-manifest": "workspace:*",
     "@pnpm/types": "workspace:*",

packages/modules-cleaner/package.json

@@ -9,7 +9,7 @@
     "!*.map"
   ],
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "keywords": [
     "pnpm7"

packages/modules-cleaner/src/prune.ts

@@ -11,7 +11,7 @@ import {
   ProjectSnapshot,
 } from '@pnpm/lockfile-types'
 import { packageIdFromSnapshot } from '@pnpm/lockfile-utils'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { readModulesDir } from '@pnpm/read-modules-dir'
 import { StoreController } from '@pnpm/store-controller-types'
 import {

packages/mount-modules/package.json

@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/mount-modules#readme",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "devDependencies": {
     "@pnpm/mount-modules": "workspace:*",
@@ -46,7 +46,7 @@
     "@pnpm/config": "workspace:*",
     "@pnpm/lockfile-file": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
-    "@pnpm/logger": "^4.0.0",
+    "@pnpm/logger": "^5.0.0",
     "@pnpm/store-path": "workspace:*",
     "@pnpm/types": "workspace:*",
     "dependency-path": "workspace:*",

packages/npm-resolver/package.json

@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/npm-resolver#readme",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/core-loggers": "workspace:*",

packages/npm-resolver/src/pickPackage.ts

@@ -2,7 +2,7 @@ import crypto from 'crypto'
 import { promises as fs } from 'fs'
 import path from 'path'
 import { PnpmError } from '@pnpm/error'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import gfs from '@pnpm/graceful-fs'
 import { VersionSelectors } from '@pnpm/resolver-base'
 import { PackageManifest } from '@pnpm/types'

packages/outdated/package.json

@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/outdated#readme",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/client": "workspace:*",

packages/package-is-installable/package.json

@@ -16,7 +16,7 @@
     "node": ">=14.6"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "repository": "https://github.com/pnpm/pnpm/blob/main/packages/package-is-installable",
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/package-is-installable#readme",

packages/package-requester/package.json

@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/package-requester#readme",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/cafs": "workspace:*",

packages/package-requester/src/packageRequester.ts

@@ -19,7 +19,7 @@ import {
 } from '@pnpm/fetcher-base'
 import type { Cafs, DeferredManifestPromise, PackageFilesResponse } from '@pnpm/cafs-types'
 import gfs from '@pnpm/graceful-fs'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { packageIsInstallable } from '@pnpm/package-is-installable'
 import { readPackageJson } from '@pnpm/read-package-json'
 import {

packages/package-store/package.json

@@ -12,7 +12,7 @@
     "!*.map"
   ],
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "dependencies": {
     "@pnpm/cafs": "workspace:*",

packages/plugin-commands-deploy/package.json

@@ -55,6 +55,6 @@
     "render-help": "^1.0.2"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   }
 }

packages/plugin-commands-env/package.json

@@ -34,7 +34,7 @@
     "@pnpm/config": "workspace:*",
     "@pnpm/error": "workspace:*",
     "@pnpm/fetch": "workspace:*",
-    "@pnpm/logger": "^4.0.0",
+    "@pnpm/logger": "^5.0.0",
     "@pnpm/node.fetcher": "workspace:*",
     "@pnpm/node.resolver": "workspace:*",
     "@pnpm/remove-bins": "workspace:*",

packages/plugin-commands-installation/package.json

@@ -106,7 +106,7 @@
     "version-selector-type": "^3.0.0"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {

packages/plugin-commands-installation/src/import/index.ts

@@ -12,7 +12,7 @@ import { install, InstallOptions } from '@pnpm/core'
 import { Config } from '@pnpm/config'
 import { findWorkspacePackages } from '@pnpm/find-workspace-packages'
 import { Project } from '@pnpm/types'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { sequenceGraph } from '@pnpm/sort-packages'
 import rimraf from '@zkochan/rimraf'
 import loadJsonFile from 'load-json-file'

packages/plugin-commands-installation/src/installDeps.ts

@@ -16,7 +16,7 @@ import {
   MutateModulesOptions,
   WorkspacePackages,
 } from '@pnpm/core'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { sequenceGraph } from '@pnpm/sort-packages'
 import isSubdir from 'is-subdir'
 import getOptionsFromRootManifest from './getOptionsFromRootManifest'

packages/plugin-commands-installation/src/recursive.ts

@@ -7,7 +7,7 @@ import {
 import { Config } from '@pnpm/config'
 import { PnpmError } from '@pnpm/error'
 import { arrayOfWorkspacePackagesToMap } from '@pnpm/find-workspace-packages'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { filterDependenciesByType } from '@pnpm/manifest-utils'
 import { createMatcherWithIndex } from '@pnpm/matcher'
 import { rebuild } from '@pnpm/plugin-commands-rebuild'

packages/plugin-commands-installation/test/warnCyclicDependencies.ts

@@ -1,7 +1,7 @@
 import { install } from '@pnpm/plugin-commands-installation'
 import { readProjects } from '@pnpm/filter-workspace-packages'
 import { preparePackages } from '@pnpm/prepare'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { DEFAULT_OPTS } from './utils'
 
 beforeEach(() => {

packages/plugin-commands-listing/package.json

@@ -54,7 +54,7 @@
     "render-help": "^1.0.2"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {

packages/plugin-commands-listing/src/recursive.ts

@@ -1,5 +1,5 @@
 import { Config } from '@pnpm/config'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { IncludedDependencies, Project } from '@pnpm/types'
 import { render } from './list'
 

packages/plugin-commands-patching/package.json

@@ -55,7 +55,7 @@
     "tempy": "^1.0.1"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {

packages/plugin-commands-publishing/package.json

@@ -85,7 +85,7 @@
     "write-json-file": "^4.3.0"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {

packages/plugin-commands-publishing/src/recursivePublish.ts

@@ -1,7 +1,7 @@
 import path from 'path'
 import { createResolver } from '@pnpm/client'
 import { Config } from '@pnpm/config'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package'
 import { ResolveFunction } from '@pnpm/resolver-base'
 import { sortPackages } from '@pnpm/sort-packages'

packages/plugin-commands-rebuild/package.json

@@ -78,7 +78,7 @@
     "semver": "^7.3.8"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {

packages/plugin-commands-rebuild/src/implementation/index.ts

@@ -17,7 +17,7 @@ import {
   PackageSnapshots,
 } from '@pnpm/lockfile-utils'
 import { lockfileWalker, LockfileWalkerStep } from '@pnpm/lockfile-walker'
-import logger, { streamParser } from '@pnpm/logger'
+import { logger, streamParser } from '@pnpm/logger'
 import { write as writeModulesYaml } from '@pnpm/modules-yaml'
 import { createOrConnectStoreController } from '@pnpm/store-connection-manager'
 import { ProjectManifest } from '@pnpm/types'

packages/plugin-commands-rebuild/src/recursive.ts

@@ -7,7 +7,7 @@ import {
   Config,
 } from '@pnpm/config'
 import { arrayOfWorkspacePackagesToMap } from '@pnpm/find-workspace-packages'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { sortPackages } from '@pnpm/sort-packages'
 import { createOrConnectStoreController, CreateStoreControllerOptions } from '@pnpm/store-connection-manager'
 import { Project, ProjectManifest } from '@pnpm/types'

packages/plugin-commands-script-runners/package.json

@@ -67,7 +67,7 @@
     "render-help": "^1.0.2"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {

packages/plugin-commands-script-runners/src/exec.ts

@@ -2,7 +2,7 @@ import path from 'path'
 import { docsUrl, RecursiveSummary, throwOnCommandFail } from '@pnpm/cli-utils'
 import { Config, types } from '@pnpm/config'
 import { makeNodeRequireOption } from '@pnpm/lifecycle'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { tryReadProjectManifest } from '@pnpm/read-project-manifest'
 import { sortPackages } from '@pnpm/sort-packages'
 import { Project } from '@pnpm/types'

packages/plugin-commands-script-runners/src/runRecursive.ts

@@ -7,7 +7,7 @@ import {
   makeNodeRequireOption,
   RunLifecycleHookOptions,
 } from '@pnpm/lifecycle'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { sortPackages } from '@pnpm/sort-packages'
 import pLimit from 'p-limit'
 import realpathMissing from 'realpath-missing'

packages/plugin-commands-server/package.json

@@ -54,7 +54,7 @@
     "tree-kill": "^1.2.2"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {

packages/plugin-commands-server/src/start.ts

@@ -10,7 +10,7 @@ import { promisify } from 'util'
 import path from 'path'
 import { packageManager } from '@pnpm/cli-meta'
 import { PnpmError } from '@pnpm/error'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import { createServer } from '@pnpm/server'
 import {
   createNewStoreController,

packages/plugin-commands-setup/package.json

@@ -36,7 +36,7 @@
   },
   "funding": "https://opencollective.com/pnpm",
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "devDependencies": {
     "@pnpm/error": "workspace:*",

packages/plugin-commands-setup/src/setup.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 import { docsUrl } from '@pnpm/cli-utils'
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 import {
   addDirToEnvPath,
   ConfigReport,

packages/plugin-commands-store/package.json

@@ -70,7 +70,7 @@
     "render-help": "^1.0.2"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^4.0.0"
+    "@pnpm/logger": "^5.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "exports": {

packages/plugin-commands-store/src/store.ts

@@ -1,7 +1,7 @@
 import { docsUrl } from '@pnpm/cli-utils'
 import { Config, types as allTypes } from '@pnpm/config'
 import { PnpmError } from '@pnpm/error'
-import logger, { LogBase } from '@pnpm/logger'
+import { logger, LogBase } from '@pnpm/logger'
 import { createOrConnectStoreController, CreateStoreControllerOptions } from '@pnpm/store-connection-manager'
 import { getStorePath } from '@pnpm/store-path'
 import pick from 'ramda/src/pick'

packages/plugin-commands-store/src/storeAdd.ts

@@ -1,5 +1,5 @@
 import { PnpmError } from '@pnpm/error'
-import logger, { globalInfo, streamParser } from '@pnpm/logger'
+import { logger, globalInfo, streamParser } from '@pnpm/logger'
 import { parseWantedDependency } from '@pnpm/parse-wanted-dependency'
 import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package'
 import { StoreController } from '@pnpm/store-controller-types'

packages/pnpm/package.json

@@ -34,7 +34,7 @@
     "@pnpm/find-workspace-dir": "workspace:*",
     "@pnpm/find-workspace-packages": "workspace:*",
     "@pnpm/lockfile-types": "workspace:*",
-    "@pnpm/logger": "^4.0.0",
+    "@pnpm/logger": "^5.0.0",
     "@pnpm/modules-yaml": "workspace:*",
     "@pnpm/nopt": "^0.2.1",
     "@pnpm/parse-cli-args": "workspace:*",

packages/pnpm/src/err.ts

@@ -1,4 +1,4 @@
-import logger from '@pnpm/logger'
+import { logger } from '@pnpm/logger'
 
 export default function err (error: Error) {
   if (!global['reporterInitialized']) {