fix: @pnpm/worker should be a peer dependency

This commit is contained in:
Zoltan Kochan
2025-08-01 10:34:34 +02:00
parent acf1eabe1a
commit 2b0d35fa8d
8 changed files with 34 additions and 12 deletions

View File

@@ -0,0 +1,10 @@
---
"@pnpm/plugin-commands-rebuild": patch
"@pnpm/fetching.binary-fetcher": patch
"@pnpm/resolving.deno-resolver": patch
"@pnpm/resolving.bun-resolver": patch
"@pnpm/build-modules": patch
"@pnpm-private/updater": patch
---
`@pnpm/worker` should always be a peer dependency.

View File

@@ -92,11 +92,17 @@ export default async (workspaceDir: string) => { // eslint-disable-line
if (manifest.peerDependencies?.['@pnpm/logger'] != null) {
manifest.peerDependencies['@pnpm/logger'] = 'catalog:'
}
if (manifest.peerDependencies?.['@pnpm/worker'] != null) {
manifest.peerDependencies['@pnpm/worker'] = 'workspace:^'
}
if (manifest.name !== '@pnpm/make-dedicated-lockfile' && manifest.name !== '@pnpm/mount-modules') {
for (const depType of ['dependencies', 'optionalDependencies'] as const) {
if (manifest[depType]?.['@pnpm/logger']) {
delete manifest[depType]!['@pnpm/logger']
}
if (manifest[depType]?.['@pnpm/worker']) {
delete manifest[depType]!['@pnpm/worker']
}
}
}
if (dir.includes('artifacts') || manifest.name === '@pnpm/exe') {

View File

@@ -45,13 +45,13 @@
"@pnpm/read-package-json": "workspace:*",
"@pnpm/store-controller-types": "workspace:*",
"@pnpm/types": "workspace:*",
"@pnpm/worker": "workspace:*",
"p-defer": "catalog:",
"ramda": "catalog:",
"run-groups": "catalog:"
},
"peerDependencies": {
"@pnpm/logger": "catalog:"
"@pnpm/logger": "catalog:",
"@pnpm/worker": "workspace:^"
},
"devDependencies": {
"@pnpm/build-modules": "workspace:*",

View File

@@ -58,7 +58,6 @@
"@pnpm/store-controller-types": "workspace:*",
"@pnpm/store.cafs": "workspace:*",
"@pnpm/types": "workspace:*",
"@pnpm/worker": "workspace:*",
"@pnpm/workspace.find-packages": "workspace:*",
"load-json-file": "catalog:",
"mem": "catalog:",
@@ -69,7 +68,8 @@
"semver": "catalog:"
},
"peerDependencies": {
"@pnpm/logger": "catalog:"
"@pnpm/logger": "catalog:",
"@pnpm/worker": "workspace:^"
},
"devDependencies": {
"@pnpm/assert-project": "workspace:*",

View File

@@ -33,12 +33,14 @@
"@pnpm/error": "workspace:*",
"@pnpm/fetcher-base": "workspace:*",
"@pnpm/fetching-types": "workspace:*",
"@pnpm/worker": "workspace:*",
"adm-zip": "catalog:",
"rename-overwrite": "catalog:",
"ssri": "catalog:",
"tempy": "catalog:"
},
"peerDependencies": {
"@pnpm/worker": "workspace:^"
},
"devDependencies": {
"@pnpm/fetching.binary-fetcher": "workspace:*",
"@types/adm-zip": "catalog:",

10
pnpm-lock.yaml generated
View File

@@ -2386,7 +2386,7 @@ importers:
specifier: workspace:*
version: link:../../packages/types
'@pnpm/worker':
specifier: workspace:*
specifier: workspace:^
version: link:../../worker
p-defer:
specifier: 'catalog:'
@@ -2566,7 +2566,7 @@ importers:
specifier: workspace:*
version: link:../../packages/types
'@pnpm/worker':
specifier: workspace:*
specifier: workspace:^
version: link:../../worker
'@pnpm/workspace.find-packages':
specifier: workspace:*
@@ -2868,7 +2868,7 @@ importers:
specifier: workspace:*
version: link:../../network/fetching-types
'@pnpm/worker':
specifier: workspace:*
specifier: workspace:^
version: link:../../worker
adm-zip:
specifier: 'catalog:'
@@ -6772,7 +6772,7 @@ importers:
specifier: 'catalog:'
version: 3.0.2
'@pnpm/worker':
specifier: workspace:*
specifier: workspace:^
version: link:../../worker
semver:
specifier: 'catalog:'
@@ -6864,7 +6864,7 @@ importers:
specifier: 'catalog:'
version: 3.0.2
'@pnpm/worker':
specifier: workspace:*
specifier: workspace:^
version: link:../../worker
semver:
specifier: 'catalog:'

View File

@@ -43,9 +43,11 @@
"@pnpm/resolver-base": "workspace:*",
"@pnpm/types": "workspace:*",
"@pnpm/util.lex-comparator": "catalog:",
"@pnpm/worker": "workspace:*",
"semver": "catalog:"
},
"peerDependencies": {
"@pnpm/worker": "workspace:^"
},
"devDependencies": {
"@pnpm/resolving.bun-resolver": "workspace:*",
"@pnpm/resolving.deno-resolver": "workspace:*",

View File

@@ -43,9 +43,11 @@
"@pnpm/resolver-base": "workspace:*",
"@pnpm/types": "workspace:*",
"@pnpm/util.lex-comparator": "catalog:",
"@pnpm/worker": "workspace:*",
"semver": "catalog:"
},
"peerDependencies": {
"@pnpm/worker": "workspace:^"
},
"devDependencies": {
"@pnpm/resolving.deno-resolver": "workspace:*",
"@types/semver": "catalog:"