diff --git a/cli/default-reporter/src/reportError.ts b/cli/default-reporter/src/reportError.ts index 5791bac3a97..36919bc00ad 100644 --- a/cli/default-reporter/src/reportError.ts +++ b/cli/default-reporter/src/reportError.ts @@ -397,7 +397,7 @@ function reportPreparePackage ( msg: { stderr: string stdout: string - }, + } ) { return { title: err.message, diff --git a/exec/prepare-package/package.json b/exec/prepare-package/package.json index 3857b83aa20..d1c81e9b563 100644 --- a/exec/prepare-package/package.json +++ b/exec/prepare-package/package.json @@ -29,7 +29,6 @@ }, "homepage": "https://github.com/pnpm/pnpm/blob/main/exec/prepare-package#readme", "dependencies": { - "@pnpm/error": "workspace:*", "@pnpm/npm-lifecycle": "^2.0.0", "@pnpm/read-package-json": "workspace:*", "@zkochan/rimraf": "^2.1.2", diff --git a/exec/prepare-package/src/index.ts b/exec/prepare-package/src/index.ts index c460ca00773..027272458e5 100644 --- a/exec/prepare-package/src/index.ts +++ b/exec/prepare-package/src/index.ts @@ -1,5 +1,4 @@ import path from 'path' -import { PnpmError } from '@pnpm/error' import lifecycle from '@pnpm/npm-lifecycle' import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' import { PackageScripts } from '@pnpm/types' diff --git a/exec/prepare-package/tsconfig.json b/exec/prepare-package/tsconfig.json index 359055070d7..38adfe8b5ff 100644 --- a/exec/prepare-package/tsconfig.json +++ b/exec/prepare-package/tsconfig.json @@ -15,9 +15,6 @@ { "path": "../../__utils__/test-fixtures" }, - { - "path": "../../packages/error" - }, { "path": "../../packages/types" }, diff --git a/fetching/git-fetcher/src/index.ts b/fetching/git-fetcher/src/index.ts index 220d8c74c59..a86eaeb0b42 100644 --- a/fetching/git-fetcher/src/index.ts +++ b/fetching/git-fetcher/src/index.ts @@ -22,7 +22,7 @@ export function createGitFetcher (createOpts: { gitShallowHosts?: string[], rawC try { await preparePkg(tempLocation) } catch (err: any) { // eslint-disable-line - err.message = `Failed to prepare git-hosted package fetched from "${resolution.repo}": ${err.message}` + err.message = `Failed to prepare git-hosted package fetched from "${resolution.repo}": ${err.message}` // eslint-disable-line throw err } // removing /.git to make directory integrity calculation faster diff --git a/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts b/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts index b08cf076b54..27182afcd61 100644 --- a/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts +++ b/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts @@ -16,7 +16,7 @@ export function createGitHostedTarballFetcher (fetchRemoteTarball: FetchFunction try { return { filesIndex: await prepareGitHostedPkg(filesIndex as FilesIndex, cafs, rawConfig) } } catch (err: any) { // eslint-disable-line - err.message = `Failed to prepare git-hosted package fetched from "${resolution.tarball}": ${err.message}` + err.message = `Failed to prepare git-hosted package fetched from "${resolution.tarball}": ${err.message}` // eslint-disable-line throw err } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e7a3de262c8..66261ab3918 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1223,9 +1223,6 @@ importers: exec/prepare-package: dependencies: - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error '@pnpm/npm-lifecycle': specifier: ^2.0.0 version: 2.0.0_typanion@3.12.1