diff --git a/.changeset/add-filter-short-alias.md b/.changeset/add-filter-short-alias.md index 39bf427a16..eeb3535e33 100644 --- a/.changeset/add-filter-short-alias.md +++ b/.changeset/add-filter-short-alias.md @@ -1,5 +1,5 @@ --- -"@pnpm/common-cli-options-help": patch +"@pnpm/cli.common-cli-options-help": patch "pnpm": patch --- diff --git a/.changeset/add-name-formatter.md b/.changeset/add-name-formatter.md index 72931265f5..52f6119142 100644 --- a/.changeset/add-name-formatter.md +++ b/.changeset/add-name-formatter.md @@ -1,6 +1,6 @@ --- -"@pnpm/reviewing.dependencies-hierarchy": minor -"@pnpm/list": patch +"@pnpm/deps.inspection.tree-builder": minor +"@pnpm/deps.inspection.list": patch --- Added `nameFormatter` option to `buildDependentsTree` and `displayName` field to `DependentsTree`/`DependentNode`, allowing consumers to customize the displayed package name (e.g. showing component names instead of registry names). diff --git a/.changeset/add-sbom-command.md b/.changeset/add-sbom-command.md index c51d72528a..5f120335ae 100644 --- a/.changeset/add-sbom-command.md +++ b/.changeset/add-sbom-command.md @@ -1,5 +1,5 @@ --- -"@pnpm/sbom": minor +"@pnpm/deps.compliance.sbom": minor "@pnpm/deps.compliance.commands": minor "pnpm": minor --- diff --git a/.changeset/afraid-mammals-battle.md b/.changeset/afraid-mammals-battle.md index 3116cf0755..131dd3f382 100644 --- a/.changeset/afraid-mammals-battle.md +++ b/.changeset/afraid-mammals-battle.md @@ -1,5 +1,5 @@ --- -"@pnpm/headless": patch +"@pnpm/installing.deps-restorer": patch --- Failed to install dependency packages under absolute paths on different disk paths. diff --git a/.changeset/all-tables-speak.md b/.changeset/all-tables-speak.md index 54c4f5abe5..455cfbbb61 100644 --- a/.changeset/all-tables-speak.md +++ b/.changeset/all-tables-speak.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/angry-streets-bow.md b/.changeset/angry-streets-bow.md index 2369bf4561..dcf3abda35 100644 --- a/.changeset/angry-streets-bow.md +++ b/.changeset/angry-streets-bow.md @@ -1,10 +1,10 @@ --- -"@pnpm/resolve-dependencies": major -"@pnpm/dependency-path": major -"@pnpm/calc-dep-state": major -"@pnpm/headless": major +"@pnpm/installing.resolve-dependencies": major +"@pnpm/deps.path": major +"@pnpm/deps.graph-hasher": major +"@pnpm/installing.deps-restorer": major "@pnpm/deps.graph-builder": major -"@pnpm/core": major +"@pnpm/installing.deps-installer": major "pnpm": major --- diff --git a/.changeset/audit-env-lockfile.md b/.changeset/audit-env-lockfile.md index da195c2924..64706b9e30 100644 --- a/.changeset/audit-env-lockfile.md +++ b/.changeset/audit-env-lockfile.md @@ -1,5 +1,5 @@ --- -"@pnpm/audit": minor +"@pnpm/deps.compliance.audit": minor "@pnpm/deps.compliance.commands": minor "pnpm": minor --- diff --git a/.changeset/audit-quick-fallback.md b/.changeset/audit-quick-fallback.md index 8a85ec4719..4a2920df82 100644 --- a/.changeset/audit-quick-fallback.md +++ b/.changeset/audit-quick-fallback.md @@ -1,5 +1,5 @@ --- -"@pnpm/audit": patch +"@pnpm/deps.compliance.audit": patch "pnpm": patch --- diff --git a/.changeset/better-parents-tell.md b/.changeset/better-parents-tell.md index 6c9381fbe9..82a80cec5b 100644 --- a/.changeset/better-parents-tell.md +++ b/.changeset/better-parents-tell.md @@ -1,7 +1,7 @@ --- -"@pnpm/resolve-dependencies": minor -"@pnpm/core": minor -"@pnpm/config": minor +"@pnpm/installing.resolve-dependencies": minor +"@pnpm/installing.deps-installer": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/big-lies-pump.md b/.changeset/big-lies-pump.md index d298f28e87..bc13871434 100644 --- a/.changeset/big-lies-pump.md +++ b/.changeset/big-lies-pump.md @@ -1,12 +1,12 @@ --- -"@pnpm/plugin-commands-installation": minor -"@pnpm/resolve-dependencies": minor -"@pnpm/package-requester": minor -"@pnpm/store-controller-types": minor -"@pnpm/resolver-base": minor -"@pnpm/npm-resolver": minor -"@pnpm/core": minor -"@pnpm/config": minor +"@pnpm/installing.commands": minor +"@pnpm/installing.resolve-dependencies": minor +"@pnpm/installing.package-requester": minor +"@pnpm/store.controller-types": minor +"@pnpm/resolving.resolver-base": minor +"@pnpm/resolving.npm-resolver": minor +"@pnpm/installing.deps-installer": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/bold-words-give.md b/.changeset/bold-words-give.md index 5321de3636..17c4644667 100644 --- a/.changeset/bold-words-give.md +++ b/.changeset/bold-words-give.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-installation": patch +"@pnpm/installing.commands": patch "@pnpm/releasing.commands": patch pnpm: patch --- diff --git a/.changeset/brave-bears-worry.md b/.changeset/brave-bears-worry.md index 4edafac2f1..3e9d3c3418 100644 --- a/.changeset/brave-bears-worry.md +++ b/.changeset/brave-bears-worry.md @@ -1,5 +1,5 @@ --- -"@pnpm/headless": minor +"@pnpm/installing.deps-restorer": minor --- Export extendProjectsWithTargetDirs. diff --git a/.changeset/brave-ties-move.md b/.changeset/brave-ties-move.md index 3034b59fe5..473f58c787 100644 --- a/.changeset/brave-ties-move.md +++ b/.changeset/brave-ties-move.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-init": minor +"@pnpm/workspace.commands": minor "pnpm": minor --- diff --git a/.changeset/breezy-zebras-smile.md b/.changeset/breezy-zebras-smile.md index 4dbf996440..20ec9ac2b2 100644 --- a/.changeset/breezy-zebras-smile.md +++ b/.changeset/breezy-zebras-smile.md @@ -1,5 +1,5 @@ --- -"@pnpm/reviewing.dependencies-hierarchy": patch +"@pnpm/deps.inspection.tree-builder": patch "pnpm": patch --- diff --git a/.changeset/bright-digests-store.md b/.changeset/bright-digests-store.md index 159c8da039..50b144c031 100644 --- a/.changeset/bright-digests-store.md +++ b/.changeset/bright-digests-store.md @@ -1,11 +1,11 @@ --- -"@pnpm/cafs-types": major +"@pnpm/store.cafs-types": major "@pnpm/store.cafs": major "@pnpm/worker": major -"@pnpm/package-store": major +"@pnpm/store.controller": major "@pnpm/store.commands": major -"@pnpm/license-scanner": major -"@pnpm/mount-modules": major +"@pnpm/deps.compliance.license-scanner": major +"@pnpm/modules-mounter.daemon": major "pnpm": major --- diff --git a/.changeset/chubby-garlics-sort.md b/.changeset/chubby-garlics-sort.md index 4038ff168a..c0a7952df9 100644 --- a/.changeset/chubby-garlics-sort.md +++ b/.changeset/chubby-garlics-sort.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": patch +"@pnpm/config.reader": patch "pnpm": patch --- diff --git a/.changeset/chubby-rockets-see.md b/.changeset/chubby-rockets-see.md index c217146d0b..22e2cccaa8 100644 --- a/.changeset/chubby-rockets-see.md +++ b/.changeset/chubby-rockets-see.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-script-runners": patch +"@pnpm/exec.commands": patch "pnpm": patch --- diff --git a/.changeset/ci-frozen-incompatible-lockfile.md b/.changeset/ci-frozen-incompatible-lockfile.md index 8cdb2367ab..7e938070c1 100644 --- a/.changeset/ci-frozen-incompatible-lockfile.md +++ b/.changeset/ci-frozen-incompatible-lockfile.md @@ -1,5 +1,5 @@ --- -'@pnpm/get-context': patch +"@pnpm/installing.context": patch pnpm: patch --- diff --git a/.changeset/ci-respect-explicit-gvs.md b/.changeset/ci-respect-explicit-gvs.md index 0fd9b7c84f..fdba593575 100644 --- a/.changeset/ci-respect-explicit-gvs.md +++ b/.changeset/ci-respect-explicit-gvs.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": patch +"@pnpm/config.reader": patch "pnpm": patch --- diff --git a/.changeset/clear-minimum-release-age-error.md b/.changeset/clear-minimum-release-age-error.md index 0fae0ac2e1..151f657f56 100644 --- a/.changeset/clear-minimum-release-age-error.md +++ b/.changeset/clear-minimum-release-age-error.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch "pnpm": patch --- diff --git a/.changeset/cold-weeks-work.md b/.changeset/cold-weeks-work.md index 7e9228b473..e2a2259850 100644 --- a/.changeset/cold-weeks-work.md +++ b/.changeset/cold-weeks-work.md @@ -1,7 +1,7 @@ --- -"@pnpm/workspace.manifest-writer": minor +"@pnpm/workspace.workspace-manifest-writer": minor "@pnpm/types": minor -"@pnpm/config": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/config-deps-lockfile.md b/.changeset/config-deps-lockfile.md index 17d5e88af6..cc4b608f37 100644 --- a/.changeset/config-deps-lockfile.md +++ b/.changeset/config-deps-lockfile.md @@ -6,8 +6,8 @@ "@pnpm/lockfile.utils": minor "@pnpm/types": patch "@pnpm/engine.pm.commands": minor -"@pnpm/calc-dep-state": minor -"@pnpm/resolve-dependencies": patch +"@pnpm/deps.graph-hasher": minor +"@pnpm/installing.resolve-dependencies": patch "pnpm": minor --- diff --git a/.changeset/correct-tarball-url.md b/.changeset/correct-tarball-url.md index ea8230a65e..5201a0048f 100644 --- a/.changeset/correct-tarball-url.md +++ b/.changeset/correct-tarball-url.md @@ -2,7 +2,7 @@ "@pnpm/config.deps-installer": minor "@pnpm/workspace.state": minor "@pnpm/types": minor -"@pnpm/cli-utils": minor +"@pnpm/cli.utils": minor "pnpm": minor --- diff --git a/.changeset/crazy-swans-retire.md b/.changeset/crazy-swans-retire.md index 46423fdac6..edf5fb4c9e 100644 --- a/.changeset/crazy-swans-retire.md +++ b/.changeset/crazy-swans-retire.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-config": major +"@pnpm/config.commands": major "pnpm": major --- diff --git a/.changeset/crazy-toes-join.md b/.changeset/crazy-toes-join.md index dc828637a4..583a248a5c 100644 --- a/.changeset/crazy-toes-join.md +++ b/.changeset/crazy-toes-join.md @@ -1,5 +1,5 @@ --- -"@pnpm/package-store": patch +"@pnpm/store.controller": patch "pnpm": patch --- diff --git a/.changeset/cruel-colts-smoke.md b/.changeset/cruel-colts-smoke.md index 3ffc7c97ef..7533bb87b2 100644 --- a/.changeset/cruel-colts-smoke.md +++ b/.changeset/cruel-colts-smoke.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": major +"@pnpm/config.reader": major "pnpm": major --- diff --git a/.changeset/cuddly-rooms-check.md b/.changeset/cuddly-rooms-check.md index 886b561a63..43e793452f 100644 --- a/.changeset/cuddly-rooms-check.md +++ b/.changeset/cuddly-rooms-check.md @@ -1,6 +1,6 @@ --- -"@pnpm/tarball-fetcher": patch -"@pnpm/git-fetcher": patch +"@pnpm/fetching.tarball-fetcher": patch +"@pnpm/fetching.git-fetcher": patch --- `@pnpm/fs.packlist` should be linked from the workspace. diff --git a/.changeset/curly-dryers-cheese.md b/.changeset/curly-dryers-cheese.md index 6ce34b669f..f469f96941 100644 --- a/.changeset/curly-dryers-cheese.md +++ b/.changeset/curly-dryers-cheese.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-script-runners": minor +"@pnpm/exec.commands": minor --- Add timeout & retry options to `pnpm dlx` / `pnpx` diff --git a/.changeset/curly-dryers-jam.md b/.changeset/curly-dryers-jam.md index 6caff3073d..59bfd68c76 100644 --- a/.changeset/curly-dryers-jam.md +++ b/.changeset/curly-dryers-jam.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-script-runners": minor +"@pnpm/exec.commands": minor pnpm: minor --- diff --git a/.changeset/curvy-baboons-refuse.md b/.changeset/curvy-baboons-refuse.md index 4d1ad65e71..f8f07bf8c4 100644 --- a/.changeset/curvy-baboons-refuse.md +++ b/.changeset/curvy-baboons-refuse.md @@ -1,5 +1,5 @@ --- -"@pnpm/modules-yaml": major +"@pnpm/installing.modules-yaml": major --- Remove options from writeModulesManifest. diff --git a/.changeset/cyan-moons-drive.md b/.changeset/cyan-moons-drive.md index 8cc962f404..c47f241df5 100644 --- a/.changeset/cyan-moons-drive.md +++ b/.changeset/cyan-moons-drive.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": major +"@pnpm/config.reader": major "pnpm": major --- diff --git a/.changeset/deep-eggs-cry.md b/.changeset/deep-eggs-cry.md index 7c4df023d4..10e45dadd1 100644 --- a/.changeset/deep-eggs-cry.md +++ b/.changeset/deep-eggs-cry.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch --- An internal refactor was performed to remove a misleading usage of `pMemoize`. Previously the `maxAge` argument was passed, but this field is ignored by the `p-memoize` NPM package. diff --git a/.changeset/dev-engines-package-manager.md b/.changeset/dev-engines-package-manager.md index 60a56e8c8c..cfcd343b3d 100644 --- a/.changeset/dev-engines-package-manager.md +++ b/.changeset/dev-engines-package-manager.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/dirty-cases-scream.md b/.changeset/dirty-cases-scream.md index 77275415ac..e8876647c6 100644 --- a/.changeset/dirty-cases-scream.md +++ b/.changeset/dirty-cases-scream.md @@ -1,5 +1,5 @@ --- -"@pnpm/resolve-dependencies": patch +"@pnpm/installing.resolve-dependencies": patch "pnpm": patch --- diff --git a/.changeset/eager-camels-appear.md b/.changeset/eager-camels-appear.md index 3a7a02d9e8..e51efc1a81 100644 --- a/.changeset/eager-camels-appear.md +++ b/.changeset/eager-camels-appear.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-config": major +"@pnpm/config.commands": major "pnpm": major --- diff --git a/.changeset/early-taxis-carry.md b/.changeset/early-taxis-carry.md index 7baae3b747..d5f6311224 100644 --- a/.changeset/early-taxis-carry.md +++ b/.changeset/early-taxis-carry.md @@ -1,5 +1,5 @@ --- -"@pnpm/exportable-manifest": minor +"@pnpm/releasing.exportable-manifest": minor "pnpm": minor --- diff --git a/.changeset/easy-toys-design.md b/.changeset/easy-toys-design.md index b342de728c..737ec67908 100644 --- a/.changeset/easy-toys-design.md +++ b/.changeset/easy-toys-design.md @@ -1,9 +1,9 @@ --- "@pnpm/building.commands": major -"@pnpm/modules-yaml": major -"@pnpm/headless": major +"@pnpm/installing.modules-yaml": major +"@pnpm/installing.deps-restorer": major "@pnpm/building.during-install": major -"@pnpm/core": major +"@pnpm/installing.deps-installer": major --- `ignoreBuilds` is now a set of DepPath. diff --git a/.changeset/eighty-clowns-shave.md b/.changeset/eighty-clowns-shave.md index f93b3ce4c9..78945a34d4 100644 --- a/.changeset/eighty-clowns-shave.md +++ b/.changeset/eighty-clowns-shave.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-config": patch +"@pnpm/config.commands": patch --- Fix phantom keys in `pnpm config get ` [#10296](https://github.com/pnpm/pnpm/issues/10296). diff --git a/.changeset/engine-agnostic-gvs-hashes.md b/.changeset/engine-agnostic-gvs-hashes.md index cd33af705f..ddf3409229 100644 --- a/.changeset/engine-agnostic-gvs-hashes.md +++ b/.changeset/engine-agnostic-gvs-hashes.md @@ -1,7 +1,7 @@ --- -"@pnpm/calc-dep-state": minor +"@pnpm/deps.graph-hasher": minor "@pnpm/deps.graph-builder": minor -"@pnpm/resolve-dependencies": minor +"@pnpm/installing.resolve-dependencies": minor "pnpm": minor --- diff --git a/.changeset/engine-strict-devengines-runtime.md b/.changeset/engine-strict-devengines-runtime.md index e8bf0066b0..3e459633d2 100644 --- a/.changeset/engine-strict-devengines-runtime.md +++ b/.changeset/engine-strict-devengines-runtime.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": patch +"@pnpm/config.reader": patch "pnpm": patch --- diff --git a/.changeset/env-cross-platform-musl.md b/.changeset/env-cross-platform-musl.md index 9c6d9bb3fe..043f6cc3f7 100644 --- a/.changeset/env-cross-platform-musl.md +++ b/.changeset/env-cross-platform-musl.md @@ -1,6 +1,6 @@ --- -"@pnpm/node.fetcher": minor -"@pnpm/runtime.commands": minor +"@pnpm/engine.runtime.node.fetcher": minor +"@pnpm/engine.runtime.commands": minor "pnpm": minor --- diff --git a/.changeset/every-impalas-change.md b/.changeset/every-impalas-change.md index 246b717576..7760836fd0 100644 --- a/.changeset/every-impalas-change.md +++ b/.changeset/every-impalas-change.md @@ -1,5 +1,5 @@ --- -"@pnpm/filter-workspace-packages": minor +"@pnpm/workspace.projects-filter": minor --- Drop `directory` as required filetype for `findUp` to allow git-based filtering to work inside git worktrees, which store `.git` as a file rather than directory. diff --git a/.changeset/every-jars-own.md b/.changeset/every-jars-own.md index d0a2849e02..02ce35edf0 100644 --- a/.changeset/every-jars-own.md +++ b/.changeset/every-jars-own.md @@ -1,5 +1,5 @@ --- -"@pnpm/manifest-utils": minor +"@pnpm/pkg-manifest.utils": minor --- Added convertEnginesRuntimeToDependencies. diff --git a/.changeset/every-trains-shake.md b/.changeset/every-trains-shake.md index 2ebbb06604..056f8c02f8 100644 --- a/.changeset/every-trains-shake.md +++ b/.changeset/every-trains-shake.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-installation": patch +"@pnpm/installing.commands": patch "pnpm": patch --- diff --git a/.changeset/evil-boats-do.md b/.changeset/evil-boats-do.md index 6abb48fd3d..0311738086 100644 --- a/.changeset/evil-boats-do.md +++ b/.changeset/evil-boats-do.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": major +"@pnpm/config.reader": major "pnpm": major --- diff --git a/.changeset/fair-nights-grow.md b/.changeset/fair-nights-grow.md index cc7ed2774d..33e9b9785f 100644 --- a/.changeset/fair-nights-grow.md +++ b/.changeset/fair-nights-grow.md @@ -1,8 +1,8 @@ --- -"@pnpm/resolve-dependencies": patch -"@pnpm/npm-resolver": patch -"@pnpm/default-reporter": patch -"@pnpm/outdated": patch +"@pnpm/installing.resolve-dependencies": patch +"@pnpm/resolving.npm-resolver": patch +"@pnpm/cli.default-reporter": patch +"@pnpm/deps.inspection.outdated": patch --- Don't silently skip an optional dependency if it cannot be resolved from a version that satisfies the `minimumReleaseAge` setting [#10270](https://github.com/pnpm/pnpm/issues/10270). diff --git a/.changeset/famous-cloths-press.md b/.changeset/famous-cloths-press.md index 4ee116265c..6d7ce0cd5b 100644 --- a/.changeset/famous-cloths-press.md +++ b/.changeset/famous-cloths-press.md @@ -1,5 +1,5 @@ --- -"@pnpm/reviewing.dependencies-hierarchy": patch +"@pnpm/deps.inspection.tree-builder": patch "pnpm": patch --- diff --git a/.changeset/famous-plums-fix.md b/.changeset/famous-plums-fix.md index c8f071f0ce..5053b15be5 100644 --- a/.changeset/famous-plums-fix.md +++ b/.changeset/famous-plums-fix.md @@ -1,5 +1,5 @@ --- -"@pnpm/cafs-types": minor +"@pnpm/store.cafs-types": minor "@pnpm/store.cafs": minor --- diff --git a/.changeset/five-lies-travel.md b/.changeset/five-lies-travel.md index 59d01ef158..7820f9b06b 100644 --- a/.changeset/five-lies-travel.md +++ b/.changeset/five-lies-travel.md @@ -1,137 +1,137 @@ --- -"@pnpm/plugin-commands-installation": major +"@pnpm/installing.commands": major "@pnpm/store.commands": major "@pnpm/cli.commands": major "@pnpm/releasing.commands": major -"@pnpm/plugin-commands-script-runners": major -"@pnpm/write-project-manifest": major -"@pnpm/filter-workspace-packages": major -"@pnpm/read-project-manifest": major +"@pnpm/exec.commands": major +"@pnpm/workspace.project-manifest-writer": major +"@pnpm/workspace.projects-filter": major +"@pnpm/workspace.project-manifest-reader": major "@pnpm/deps.compliance.commands": major "@pnpm/deps.inspection.commands": major "@pnpm/engine.pm.commands": major -"@pnpm/workspace.filter-packages-from-dir": major -"@pnpm/plugin-commands-patching": major -"@pnpm/read-projects-context": major -"@pnpm/resolve-workspace-range": major -"@pnpm/pick-registry-for-package": major -"@pnpm/make-dedicated-lockfile": major -"@pnpm/parse-wanted-dependency": major -"@pnpm/resolve-dependencies": major -"@pnpm/exportable-manifest": major -"@pnpm/reviewing.dependencies-hierarchy": major -"@pnpm/read-package-json": major +"@pnpm/workspace.projects-filter": major +"@pnpm/patching.commands": major +"@pnpm/installing.read-projects-context": major +"@pnpm/workspace.range-resolver": major +"@pnpm/config.pick-registry-for-package": major +"@pnpm/lockfile.make-dedicated-lockfile": major +"@pnpm/resolving.parse-wanted-dependency": major +"@pnpm/installing.resolve-dependencies": major +"@pnpm/releasing.exportable-manifest": major +"@pnpm/deps.inspection.tree-builder": major +"@pnpm/pkg-manifest.read-package-json": major "@pnpm/resolving.jsr-specifier-parser": major -"@pnpm/store-connection-manager": major +"@pnpm/store.connection-manager": major "@pnpm/workspace.injected-deps-syncer": major -"@pnpm/package-is-installable": major -"@pnpm/plugin-commands-config": major -"@pnpm/plugin-commands-init": major -"@pnpm/pkg-manager.direct-dep-linker": major -"@pnpm/package-requester": major +"@pnpm/config.package-is-installable": major +"@pnpm/config.commands": major +"@pnpm/workspace.commands": major +"@pnpm/installing.linking.direct-dep-linker": major +"@pnpm/installing.package-requester": major "@pnpm/building.commands": major -"@pnpm/store-controller-types": major -"@pnpm/find-workspace-dir": major -"@pnpm/common-cli-options-help": major -"@pnpm/normalize-registries": major +"@pnpm/store.controller-types": major +"@pnpm/workspace.root-finder": major +"@pnpm/cli.common-cli-options-help": major +"@pnpm/config.normalize-registries": major "@pnpm/lockfile.preferred-versions": major -"@pnpm/render-peer-issues": major -"@pnpm/modules-cleaner": major -"@pnpm/manifest-utils": major +"@pnpm/installing.render-peer-issues": major +"@pnpm/installing.linking.modules-cleaner": major +"@pnpm/pkg-manifest.utils": major "@pnpm/get-release-text": major "@pnpm/prepare-temp-dir": major -"@pnpm/directory-fetcher": major +"@pnpm/fetching.directory-fetcher": major "@pnpm/fs.is-empty-dir-or-nothing": major -"@pnpm/default-resolver": major -"@pnpm/tarball-resolver": major +"@pnpm/resolving.default-resolver": major +"@pnpm/resolving.tarball-resolver": major "@pnpm/test-ipc-server": major "@pnpm/lockfile.detect-dep-types": major "@pnpm/lockfile.settings-checker": major -"@pnpm/license-scanner": major -"@pnpm/workspace.manifest-writer": major +"@pnpm/deps.compliance.license-scanner": major +"@pnpm/workspace.workspace-manifest-writer": major "@pnpm/assert-project": major "@pnpm/catalogs.protocol-parser": major -"@pnpm/tarball-fetcher": major -"@pnpm/lockfile-to-pnp": major -"@pnpm/dependency-path": major -"@pnpm/modules-yaml": major -"@pnpm/package-bins": major -"@pnpm/local-resolver": major +"@pnpm/fetching.tarball-fetcher": major +"@pnpm/lockfile.to-pnp": major +"@pnpm/deps.path": major +"@pnpm/installing.modules-yaml": major +"@pnpm/bins.resolver": major +"@pnpm/resolving.local-resolver": major "@pnpm/eslint-config": major "@pnpm/test-fixtures": major -"@pnpm/runtime.commands": major -"@pnpm/env.system-node-version": major +"@pnpm/engine.runtime.commands": major +"@pnpm/engine.runtime.system-node-version": major "@pnpm/building.pkg-requires-build": major "@pnpm/fetching.binary-fetcher": major "@pnpm/fs.indexed-pkg-importer": major "@pnpm/hooks.read-package-hook": major -"@pnpm/calc-dep-state": major -"@pnpm/get-context": major -"@pnpm/remove-bins": major +"@pnpm/deps.graph-hasher": major +"@pnpm/installing.context": major +"@pnpm/bins.remover": major "@pnpm/resolving.deno-resolver": major -"@pnpm/resolver-base": major -"@pnpm/create-cafs-store": major -"@pnpm/workspace.find-packages": major -"@pnpm/workspace.read-manifest": major -"@pnpm/sort-packages": major +"@pnpm/resolving.resolver-base": major +"@pnpm/store.create-cafs-store": major +"@pnpm/workspace.projects-reader": major +"@pnpm/workspace.workspace-manifest-reader": major +"@pnpm/workspace.sort-packages": major "@pnpm/assert-store": major -"@pnpm/parse-overrides": major -"@pnpm/dedupe.issues-renderer": major -"@pnpm/mount-modules": major -"@pnpm/fetching-types": major -"@pnpm/real-hoist": major +"@pnpm/config.parse-overrides": major +"@pnpm/installing.dedupe.issues-renderer": major +"@pnpm/modules-mounter.daemon": major +"@pnpm/fetching.types": major +"@pnpm/installing.linking.real-hoist": major "@pnpm/resolving.bun-resolver": major -"@pnpm/git-resolver": major -"@pnpm/npm-resolver": major +"@pnpm/resolving.git-resolver": major +"@pnpm/resolving.npm-resolver": major "@pnpm/jest-config": major "@pnpm/config.deps-installer": major -"@pnpm/fetcher-base": major -"@pnpm/pick-fetcher": major -"@pnpm/symlink-dependency": major +"@pnpm/fetching.fetcher-base": major +"@pnpm/fetching.pick-fetcher": major +"@pnpm/fs.symlink-dependency": major "@pnpm/lockfile.verification": major "@pnpm/core-loggers": major -"@pnpm/link-bins": major +"@pnpm/bins.linker": major "@pnpm/workspace.spec-parser": major -"@pnpm/default-reporter": major -"@pnpm/config.config-writer": major +"@pnpm/cli.default-reporter": major +"@pnpm/config.writer": major "@pnpm/crypto.object-hasher": major "@pnpm/deps.graph-sequencer": major "@pnpm/exec.pnpm-cli-runner": major -"@pnpm/prepare-package": major -"@pnpm/git-fetcher": major +"@pnpm/exec.prepare-package": major +"@pnpm/fetching.git-fetcher": major "@pnpm/object.property-path": major "@pnpm/patching.apply-patch": major -"@pnpm/headless": major +"@pnpm/installing.deps-restorer": major "@pnpm/text.comments-parser": major "@pnpm/workspace.pkgs-graph": major "@pnpm/crypto.shasums-file": major -"@pnpm/read-modules-dir": major +"@pnpm/fs.read-modules-dir": major "@pnpm/network.auth-header": major -"@pnpm/package-store": major +"@pnpm/store.controller": major "@pnpm/tsconfig": major -"@pnpm/parse-cli-args": major +"@pnpm/cli.parse-cli-args": major "@pnpm/deps.graph-builder": major "@pnpm/building.during-install": major "@pnpm/lockfile.filtering": major "@pnpm/object.key-sorting": major "@pnpm/constants": major -"@pnpm/git-utils": major -"@pnpm/client": major +"@pnpm/network.git-utils": major +"@pnpm/installing.client": major "@pnpm/exe": major -"@pnpm/outdated": major +"@pnpm/deps.inspection.outdated": major "@pnpm/testing.temp-store": major "@pnpm/prepare": major "@pnpm/scripts": major "@pnpm/catalogs.resolver": major -"@pnpm/node.resolver": major -"@pnpm/hoist": major -"@pnpm/semver.peer-range": major -"@pnpm/node.fetcher": major +"@pnpm/engine.runtime.node.resolver": major +"@pnpm/installing.linking.hoist": major +"@pnpm/deps.peer-range": major +"@pnpm/engine.runtime.node.fetcher": major "@pnpm/fs.find-packages": major "@pnpm/fs.hard-link-dir": major -"@pnpm/core": major -"@pnpm/cafs-types": major -"@pnpm/store-path": major +"@pnpm/installing.deps-installer": major +"@pnpm/store.cafs-types": major +"@pnpm/store.path": major "@pnpm/catalogs.config": major "@pnpm/lockfile.merger": major "@pnpm/lockfile.pruner": major @@ -141,27 +141,27 @@ "@pnpm/workspace.state": major "@pnpm/cache.commands": major "@pnpm/catalogs.types": major -"@pnpm/matcher": major -"@pnpm/lifecycle": major -"@pnpm/graceful-fs": major -"@pnpm/pnpmfile": major -"@pnpm/audit": major +"@pnpm/config.matcher": major +"@pnpm/exec.lifecycle": major +"@pnpm/fs.graceful-fs": major +"@pnpm/hooks.pnpmfile": major +"@pnpm/deps.compliance.audit": major "@pnpm/lockfile.types": major "@pnpm/lockfile.utils": major "@pnpm/error": major "@pnpm/types": major "@pnpm/patching.types": major -"@pnpm/list": major +"@pnpm/deps.inspection.list": major "@pnpm-private/updater": major -"@pnpm/cli-utils": major -"@pnpm/config": major -"@pnpm/fetch": major -"@pnpm/cli-meta": major -"@pnpm/dedupe.check": major -"@pnpm/dedupe.types": major -"@pnpm/run-npm": major +"@pnpm/cli.utils": major +"@pnpm/config.reader": major +"@pnpm/network.fetch": major +"@pnpm/cli.meta": major +"@pnpm/installing.dedupe.check": major +"@pnpm/installing.dedupe.types": major +"@pnpm/exec.run-npm": major "@pnpm-private/typings": major -"@pnpm/command": major +"@pnpm/cli.command": major "@pnpm/crypto.hash": major "@pnpm/deps.status": major "@pnpm/fs.packlist": major @@ -169,7 +169,7 @@ "@pnpm/lockfile.fs": major "@pnpm/store.cafs": major "@pnpm/cache.api": major -"@pnpm/env.path": major +"@pnpm/shell.path": major "pd": major "@pnpm/worker": major "pnpm": major diff --git a/.changeset/fix-annotated-git-tags.md b/.changeset/fix-annotated-git-tags.md index 900257017c..4158e6e2f6 100644 --- a/.changeset/fix-annotated-git-tags.md +++ b/.changeset/fix-annotated-git-tags.md @@ -1,5 +1,5 @@ --- -"@pnpm/git-resolver": patch +"@pnpm/resolving.git-resolver": patch "pnpm": patch --- diff --git a/.changeset/fix-catalog-strict-mode-write.md b/.changeset/fix-catalog-strict-mode-write.md index 4e1e0d434d..b45c8a9eee 100644 --- a/.changeset/fix-catalog-strict-mode-write.md +++ b/.changeset/fix-catalog-strict-mode-write.md @@ -1,5 +1,5 @@ --- -"@pnpm/resolve-dependencies": patch +"@pnpm/installing.resolve-dependencies": patch "pnpm": patch --- diff --git a/.changeset/fix-directories-bin-path-traversal.md b/.changeset/fix-directories-bin-path-traversal.md index e170d76f61..29e0bb82c2 100644 --- a/.changeset/fix-directories-bin-path-traversal.md +++ b/.changeset/fix-directories-bin-path-traversal.md @@ -1,5 +1,5 @@ --- -"@pnpm/package-bins": patch +"@pnpm/bins.resolver": patch "pnpm": patch --- diff --git a/.changeset/fix-dlx-concurrent-install-race.md b/.changeset/fix-dlx-concurrent-install-race.md index ab027ff71e..c8324e1cda 100644 --- a/.changeset/fix-dlx-concurrent-install-race.md +++ b/.changeset/fix-dlx-concurrent-install-race.md @@ -1,8 +1,8 @@ --- "@pnpm/fs.indexed-pkg-importer": patch -"@pnpm/plugin-commands-script-runners": patch -"@pnpm/core": patch -"@pnpm/link-bins": patch +"@pnpm/exec.commands": patch +"@pnpm/installing.deps-installer": patch +"@pnpm/bins.linker": patch "pnpm": patch --- diff --git a/.changeset/fix-git-url-detection.md b/.changeset/fix-git-url-detection.md index a62f61af4a..bdce388bda 100644 --- a/.changeset/fix-git-url-detection.md +++ b/.changeset/fix-git-url-detection.md @@ -1,7 +1,7 @@ --- -"@pnpm/git-resolver": minor -"@pnpm/tarball-resolver": minor -"@pnpm/default-resolver": minor +"@pnpm/resolving.git-resolver": minor +"@pnpm/resolving.tarball-resolver": minor +"@pnpm/resolving.default-resolver": minor "pnpm": patch --- diff --git a/.changeset/fix-global-install-output.md b/.changeset/fix-global-install-output.md index 7ab0bad235..36b4fef080 100644 --- a/.changeset/fix-global-install-output.md +++ b/.changeset/fix-global-install-output.md @@ -1,5 +1,5 @@ --- -"@pnpm/default-reporter": patch +"@pnpm/cli.default-reporter": patch "pnpm": patch --- diff --git a/.changeset/fix-global-link-output.md b/.changeset/fix-global-link-output.md index 8495ecad06..4a6eaeb58f 100644 --- a/.changeset/fix-global-link-output.md +++ b/.changeset/fix-global-link-output.md @@ -1,5 +1,5 @@ --- -"@pnpm/default-reporter": patch +"@pnpm/cli.default-reporter": patch "pnpm": patch --- diff --git a/.changeset/fix-hoist-peers-override.md b/.changeset/fix-hoist-peers-override.md index c4a5cbe5a3..6441773120 100644 --- a/.changeset/fix-hoist-peers-override.md +++ b/.changeset/fix-hoist-peers-override.md @@ -1,5 +1,5 @@ --- -"@pnpm/resolve-dependencies": patch +"@pnpm/installing.resolve-dependencies": patch --- Fix auto-installed peer dependencies ignoring overrides when a stale version exists in the lockfile. Previously, `hoistPeers` used `semver.maxSatisfying(versions, '*')` which picked the highest preferred version regardless of the peer dep range. Now it first tries `semver.maxSatisfying(versions, range)` to respect the actual range, falling back to exact-version ranges (e.g. from overrides) when no preferred version satisfies. Also handles `workspace:` protocol ranges safely. diff --git a/.changeset/fix-injected-deps-global-vstore.md b/.changeset/fix-injected-deps-global-vstore.md index a78cd8fb02..81b54af1d5 100644 --- a/.changeset/fix-injected-deps-global-vstore.md +++ b/.changeset/fix-injected-deps-global-vstore.md @@ -1,7 +1,7 @@ --- "@pnpm/deps.graph-builder": patch -"@pnpm/headless": patch -"@pnpm/core": patch +"@pnpm/installing.deps-restorer": patch +"@pnpm/installing.deps-installer": patch --- Fixed injected local packages to work correctly with the global virtual store [#10366](https://github.com/pnpm/pnpm/pull/10366). diff --git a/.changeset/fix-link-bin-dangling-symlink.md b/.changeset/fix-link-bin-dangling-symlink.md index 6ae8677e9c..ed1435fb31 100644 --- a/.changeset/fix-link-bin-dangling-symlink.md +++ b/.changeset/fix-link-bin-dangling-symlink.md @@ -1,5 +1,5 @@ --- -"@pnpm/link-bins": patch +"@pnpm/bins.linker": patch "pnpm": patch --- diff --git a/.changeset/fix-list-only-projects.md b/.changeset/fix-list-only-projects.md index a27b36ef42..80985f8191 100644 --- a/.changeset/fix-list-only-projects.md +++ b/.changeset/fix-list-only-projects.md @@ -1,5 +1,5 @@ --- -"@pnpm/reviewing.dependencies-hierarchy": patch +"@pnpm/deps.inspection.tree-builder": patch "@pnpm/deps.inspection.commands": patch "pnpm": patch --- diff --git a/.changeset/fix-list-oom.md b/.changeset/fix-list-oom.md index 0cefbdb16e..090291a993 100644 --- a/.changeset/fix-list-oom.md +++ b/.changeset/fix-list-oom.md @@ -1,6 +1,6 @@ --- -"@pnpm/reviewing.dependencies-hierarchy": patch -"@pnpm/list": patch +"@pnpm/deps.inspection.tree-builder": patch +"@pnpm/deps.inspection.list": patch "pnpm": patch --- diff --git a/.changeset/fix-lockfile-include-tarball-url.md b/.changeset/fix-lockfile-include-tarball-url.md index fcdce145ce..45a617e735 100644 --- a/.changeset/fix-lockfile-include-tarball-url.md +++ b/.changeset/fix-lockfile-include-tarball-url.md @@ -1,5 +1,5 @@ --- -"@pnpm/resolve-dependencies": patch +"@pnpm/installing.resolve-dependencies": patch "pnpm": patch --- diff --git a/.changeset/fix-non-interactive-modules-purge-hint.md b/.changeset/fix-non-interactive-modules-purge-hint.md index 30c2490b58..1d82671004 100644 --- a/.changeset/fix-non-interactive-modules-purge-hint.md +++ b/.changeset/fix-non-interactive-modules-purge-hint.md @@ -1,5 +1,5 @@ --- -"@pnpm/core": patch +"@pnpm/installing.deps-installer": patch "pnpm": patch --- diff --git a/.changeset/fix-npm-resolver-400-status.md b/.changeset/fix-npm-resolver-400-status.md index 68ef527701..916d87dae3 100644 --- a/.changeset/fix-npm-resolver-400-status.md +++ b/.changeset/fix-npm-resolver-400-status.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch "pnpm": patch --- diff --git a/.changeset/fix-outdated-minimum-release-age.md b/.changeset/fix-outdated-minimum-release-age.md index 5d5fb09ea4..a5ceba8c44 100644 --- a/.changeset/fix-outdated-minimum-release-age.md +++ b/.changeset/fix-outdated-minimum-release-age.md @@ -1,5 +1,5 @@ --- -"@pnpm/outdated": patch +"@pnpm/deps.inspection.outdated": patch "pnpm": patch --- diff --git a/.changeset/fix-patch-commit-home-env.md b/.changeset/fix-patch-commit-home-env.md index 51673c4c52..5378e0f85b 100644 --- a/.changeset/fix-patch-commit-home-env.md +++ b/.changeset/fix-patch-commit-home-env.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-patching": patch +"@pnpm/patching.commands": patch "pnpm": patch --- diff --git a/.changeset/fix-pnpm-fetch-file-protocol.md b/.changeset/fix-pnpm-fetch-file-protocol.md index eedad13960..b2c5e93a9f 100644 --- a/.changeset/fix-pnpm-fetch-file-protocol.md +++ b/.changeset/fix-pnpm-fetch-file-protocol.md @@ -1,8 +1,8 @@ --- "@pnpm/deps.graph-builder": patch -"@pnpm/headless": patch -"@pnpm/core": patch -"@pnpm/plugin-commands-installation": patch +"@pnpm/installing.deps-restorer": patch +"@pnpm/installing.deps-installer": patch +"@pnpm/installing.commands": patch "pnpm": patch --- diff --git a/.changeset/fix-prompt-no-tty.md b/.changeset/fix-prompt-no-tty.md index 55acb97681..df6de4d3b6 100644 --- a/.changeset/fix-prompt-no-tty.md +++ b/.changeset/fix-prompt-no-tty.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-script-runners": patch +"@pnpm/exec.commands": patch "pnpm": patch --- diff --git a/.changeset/fix-recursive-run-no-script.md b/.changeset/fix-recursive-run-no-script.md index db71460db8..e4cf554369 100644 --- a/.changeset/fix-recursive-run-no-script.md +++ b/.changeset/fix-recursive-run-no-script.md @@ -1,6 +1,6 @@ --- "pnpm": patch -"@pnpm/plugin-commands-script-runners": patch +"@pnpm/exec.commands": patch --- `pnpm run -r` and `pnpm run --filter` now fail with a non-zero exit code when no packages have the specified script. Previously, this only failed when all packages were selected. Use `--if-present` to suppress this error [#6844](https://github.com/pnpm/pnpm/issues/6844). diff --git a/.changeset/fix-why-parseable-dedup.md b/.changeset/fix-why-parseable-dedup.md index f406d534bb..1653a38b11 100644 --- a/.changeset/fix-why-parseable-dedup.md +++ b/.changeset/fix-why-parseable-dedup.md @@ -1,5 +1,5 @@ --- -"@pnpm/list": patch +"@pnpm/deps.inspection.list": patch "pnpm": patch --- diff --git a/.changeset/fix-windows-node-path-too-long.md b/.changeset/fix-windows-node-path-too-long.md index 8f89a878a4..ff50dc6cc0 100644 --- a/.changeset/fix-windows-node-path-too-long.md +++ b/.changeset/fix-windows-node-path-too-long.md @@ -1,5 +1,5 @@ --- -"@pnpm/link-bins": patch +"@pnpm/bins.linker": patch "pnpm": patch --- diff --git a/.changeset/fix-workspace-protocol-consistency.md b/.changeset/fix-workspace-protocol-consistency.md index 033fe3fdfb..0947223790 100644 --- a/.changeset/fix-workspace-protocol-consistency.md +++ b/.changeset/fix-workspace-protocol-consistency.md @@ -1,6 +1,6 @@ --- -"@pnpm/resolve-dependencies": patch -"@pnpm/core": patch +"@pnpm/installing.resolve-dependencies": patch +"@pnpm/installing.deps-installer": patch "pnpm": patch --- diff --git a/.changeset/flat-clowns-type.md b/.changeset/flat-clowns-type.md index a06e94c7d9..81f9b7ffe7 100644 --- a/.changeset/flat-clowns-type.md +++ b/.changeset/flat-clowns-type.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": major +"@pnpm/resolving.npm-resolver": major --- Changed the error code for no matching version that satisfies the maturity configuration. diff --git a/.changeset/fluffy-bugs-knock.md b/.changeset/fluffy-bugs-knock.md index 27a9cfbb20..b1db43da76 100644 --- a/.changeset/fluffy-bugs-knock.md +++ b/.changeset/fluffy-bugs-knock.md @@ -1,5 +1,5 @@ --- -"@pnpm/list": patch +"@pnpm/deps.inspection.list": patch "pnpm": patch --- diff --git a/.changeset/funny-melons-pay.md b/.changeset/funny-melons-pay.md index c9967ff9e8..469290c9d0 100644 --- a/.changeset/funny-melons-pay.md +++ b/.changeset/funny-melons-pay.md @@ -1,5 +1,5 @@ --- -"@pnpm/fetch": patch +"@pnpm/network.fetch": patch --- When the node-fetch request redirects an installation link and returns a relative path, URL parsing may fail [#10286](https://github.com/pnpm/pnpm/pull/10286). diff --git a/.changeset/fuzzy-cups-float.md b/.changeset/fuzzy-cups-float.md index 4012e01454..ae159a1213 100644 --- a/.changeset/fuzzy-cups-float.md +++ b/.changeset/fuzzy-cups-float.md @@ -1,6 +1,6 @@ --- -"@pnpm/workspace.manifest-writer": minor -"@pnpm/config.config-writer": minor +"@pnpm/workspace.workspace-manifest-writer": minor +"@pnpm/config.writer": minor --- New option added: updatedOverrides. diff --git a/.changeset/gentle-waves-rise.md b/.changeset/gentle-waves-rise.md index b9b5de7ae6..5a0d8d6b4c 100644 --- a/.changeset/gentle-waves-rise.md +++ b/.changeset/gentle-waves-rise.md @@ -1,5 +1,5 @@ --- -"@pnpm/package-requester": patch +"@pnpm/installing.package-requester": patch "pnpm": patch --- diff --git a/.changeset/giant-pots-think.md b/.changeset/giant-pots-think.md index f097a79dd5..00cd63d57e 100644 --- a/.changeset/giant-pots-think.md +++ b/.changeset/giant-pots-think.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/global-install-allow-builds.md b/.changeset/global-install-allow-builds.md index adb8470ae4..897cd54005 100644 --- a/.changeset/global-install-allow-builds.md +++ b/.changeset/global-install-allow-builds.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/global-install-virtual-store.md b/.changeset/global-install-virtual-store.md index 8f00f19d51..946c588a32 100644 --- a/.changeset/global-install-virtual-store.md +++ b/.changeset/global-install-virtual-store.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": major +"@pnpm/config.reader": major "pnpm": major --- diff --git a/.changeset/global-virtual-store-prune.md b/.changeset/global-virtual-store-prune.md index 4b220075b7..0916e7732a 100644 --- a/.changeset/global-virtual-store-prune.md +++ b/.changeset/global-virtual-store-prune.md @@ -1,6 +1,6 @@ --- -"@pnpm/package-store": minor -"@pnpm/get-context": minor +"@pnpm/store.controller": minor +"@pnpm/installing.context": minor "pnpm": minor --- diff --git a/.changeset/great-trams-drop.md b/.changeset/great-trams-drop.md index d9a61b3818..52ceefc6d3 100644 --- a/.changeset/great-trams-drop.md +++ b/.changeset/great-trams-drop.md @@ -1,9 +1,9 @@ --- -"@pnpm/plugin-commands-config": minor -"@pnpm/workspace.manifest-writer": minor -"@pnpm/workspace.read-manifest": minor +"@pnpm/config.commands": minor +"@pnpm/workspace.workspace-manifest-writer": minor +"@pnpm/workspace.workspace-manifest-reader": minor "@pnpm/constants": minor -"@pnpm/config": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/happy-paws-walk.md b/.changeset/happy-paws-walk.md index 809dbae153..0f8e95624e 100644 --- a/.changeset/happy-paws-walk.md +++ b/.changeset/happy-paws-walk.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-script-runners": patch +"@pnpm/exec.commands": patch "pnpm": patch --- diff --git a/.changeset/heavy-dragons-start.md b/.changeset/heavy-dragons-start.md index 6bd5b20975..1b4f043dcf 100644 --- a/.changeset/heavy-dragons-start.md +++ b/.changeset/heavy-dragons-start.md @@ -1,7 +1,7 @@ --- "pnpm": patch -"@pnpm/git-fetcher": patch -"@pnpm/git-resolver": patch +"@pnpm/fetching.git-fetcher": patch +"@pnpm/resolving.git-resolver": patch --- Always resolve git references to full commits and ensure `HEAD` points to the commit after checkout [#10310](https://github.com/pnpm/pnpm/pull/10310). diff --git a/.changeset/hip-jars-boil.md b/.changeset/hip-jars-boil.md index 5bdbdf7c34..39f206113f 100644 --- a/.changeset/hip-jars-boil.md +++ b/.changeset/hip-jars-boil.md @@ -1,5 +1,5 @@ --- -"@pnpm/calc-dep-state": major +"@pnpm/deps.graph-hasher": major "pnpm": minor --- diff --git a/.changeset/honest-radios-cut.md b/.changeset/honest-radios-cut.md index 07a8438cbc..b942d522f0 100644 --- a/.changeset/honest-radios-cut.md +++ b/.changeset/honest-radios-cut.md @@ -1,5 +1,5 @@ --- -"@pnpm/find-workspace-dir": patch +"@pnpm/workspace.root-finder": patch --- Throw an error message if a `.pnpm-workspace.yaml` or `.pnpm-workspace.yml` file is found instead of a `pnpm-workspace.yaml`. diff --git a/.changeset/install-from-release-channels.md b/.changeset/install-from-release-channels.md index 3660d70765..0e361bdcf9 100644 --- a/.changeset/install-from-release-channels.md +++ b/.changeset/install-from-release-channels.md @@ -1,6 +1,6 @@ --- -"@pnpm/node.resolver": patch -"@pnpm/runtime.commands": patch +"@pnpm/engine.runtime.node.resolver": patch +"@pnpm/engine.runtime.commands": patch --- -`parseNodeSpecifier` is moved from `@pnpm/plugin-commands-env` to `@pnpm/node.resolver` and enhanced to support all Node.js version specifier formats. Previously `parseEnvSpecifier` (in `@pnpm/node.resolver`) handled the resolver's parsing, while `parseNodeSpecifier` (in `@pnpm/plugin-commands-env`) was a stricter but now-unused validator. They are now unified into a single `parseNodeSpecifier` in `@pnpm/node.resolver` that supports: exact versions (`22.0.0`), prerelease versions (`22.0.0-rc.4`), semver ranges (`18`, `^18`), LTS codenames (`argon`, `iron`), well-known aliases (`lts`, `latest`), standalone release channels (`nightly`, `rc`, `test`, `v8-canary`, `release`), and channel/version combos (`rc/18`, `nightly/latest`). +`parseNodeSpecifier` is moved from `@pnpm/plugin-commands-env` to `@pnpm/engine.runtime.node.resolver` and enhanced to support all Node.js version specifier formats. Previously `parseEnvSpecifier` (in `@pnpm/engine.runtime.node.resolver`) handled the resolver's parsing, while `parseNodeSpecifier` (in `@pnpm/plugin-commands-env`) was a stricter but now-unused validator. They are now unified into a single `parseNodeSpecifier` in `@pnpm/engine.runtime.node.resolver` that supports: exact versions (`22.0.0`), prerelease versions (`22.0.0-rc.4`), semver ranges (`18`, `^18`), LTS codenames (`argon`, `iron`), well-known aliases (`lts`, `latest`), standalone release channels (`nightly`, `rc`, `test`, `v8-canary`, `release`), and channel/version combos (`rc/18`, `nightly/latest`). diff --git a/.changeset/isolated-global-packages.md b/.changeset/isolated-global-packages.md index f5085c8451..77740b53a8 100644 --- a/.changeset/isolated-global-packages.md +++ b/.changeset/isolated-global-packages.md @@ -1,9 +1,9 @@ --- "@pnpm/global.packages": minor "@pnpm/global.commands": minor -"@pnpm/plugin-commands-installation": major +"@pnpm/installing.commands": major "@pnpm/deps.inspection.commands": minor -"@pnpm/plugin-commands-script-runners": minor +"@pnpm/exec.commands": minor "pnpm": major --- diff --git a/.changeset/itchy-humans-love.md b/.changeset/itchy-humans-love.md index 589865922d..35c2fb7af6 100644 --- a/.changeset/itchy-humans-love.md +++ b/.changeset/itchy-humans-love.md @@ -1,6 +1,6 @@ --- -"@pnpm/config": major -"@pnpm/plugin-commands-config": major +"@pnpm/config.reader": major +"@pnpm/config.commands": major "pnpm": major --- diff --git a/.changeset/kind-boxes-shake.md b/.changeset/kind-boxes-shake.md index 0a0e7e0bc3..106e7de517 100644 --- a/.changeset/kind-boxes-shake.md +++ b/.changeset/kind-boxes-shake.md @@ -1,5 +1,5 @@ --- -"@pnpm/package-bins": patch +"@pnpm/bins.resolver": patch "pnpm": patch --- diff --git a/.changeset/large-flowers-roll.md b/.changeset/large-flowers-roll.md index abd9d68a3a..bf2c87e503 100644 --- a/.changeset/large-flowers-roll.md +++ b/.changeset/large-flowers-roll.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": patch +"@pnpm/config.reader": patch --- Fixed `lockfile: false` in `pnpm-workspace.yaml` being ignored, causing `pnpm-lock.yaml` to be created despite the setting. diff --git a/.changeset/large-suits-scream.md b/.changeset/large-suits-scream.md index 20c2837296..2a9a19bc40 100644 --- a/.changeset/large-suits-scream.md +++ b/.changeset/large-suits-scream.md @@ -1,5 +1,5 @@ --- -"@pnpm/read-project-manifest": patch +"@pnpm/workspace.project-manifest-reader": patch "pnpm": patch --- diff --git a/.changeset/legal-ways-accept.md b/.changeset/legal-ways-accept.md index acf6efd234..053747931f 100644 --- a/.changeset/legal-ways-accept.md +++ b/.changeset/legal-ways-accept.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch pnpm: patch --- diff --git a/.changeset/light-carrots-fetch.md b/.changeset/light-carrots-fetch.md index 3a84ed5586..28df5b6e2c 100644 --- a/.changeset/light-carrots-fetch.md +++ b/.changeset/light-carrots-fetch.md @@ -1,13 +1,13 @@ --- -"@pnpm/prepare-package": major -"@pnpm/git-fetcher": patch -"@pnpm/tarball-fetcher": patch -"@pnpm/core": patch -"@pnpm/headless": patch -"@pnpm/fetcher-base": minor -"@pnpm/package-requester": minor -"@pnpm/resolve-dependencies": minor -"@pnpm/store-controller-types": minor +"@pnpm/exec.prepare-package": major +"@pnpm/fetching.git-fetcher": patch +"@pnpm/fetching.tarball-fetcher": patch +"@pnpm/installing.deps-installer": patch +"@pnpm/installing.deps-restorer": patch +"@pnpm/fetching.fetcher-base": minor +"@pnpm/installing.package-requester": minor +"@pnpm/installing.resolve-dependencies": minor +"@pnpm/store.controller-types": minor "pnpm": patch --- diff --git a/.changeset/link-breaking-changes.md b/.changeset/link-breaking-changes.md index 845b471368..311d8a863c 100644 --- a/.changeset/link-breaking-changes.md +++ b/.changeset/link-breaking-changes.md @@ -1,6 +1,6 @@ --- "pnpm": major -"@pnpm/plugin-commands-installation": major +"@pnpm/installing.commands": major --- Breaking changes to `pnpm link`: diff --git a/.changeset/little-kings-invent.md b/.changeset/little-kings-invent.md index 98592c4285..a73bf0452a 100644 --- a/.changeset/little-kings-invent.md +++ b/.changeset/little-kings-invent.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-installation": patch +"@pnpm/installing.commands": patch "pnpm": patch --- diff --git a/.changeset/long-radios-cross.md b/.changeset/long-radios-cross.md index a05a5ef046..0409a5c2b9 100644 --- a/.changeset/long-radios-cross.md +++ b/.changeset/long-radios-cross.md @@ -1,6 +1,6 @@ --- -"@pnpm/tarball-fetcher": minor -"@pnpm/fetcher-base": minor +"@pnpm/fetching.tarball-fetcher": minor +"@pnpm/fetching.fetcher-base": minor "@pnpm/worker": minor "@pnpm/crypto.object-hasher": minor --- diff --git a/.changeset/lucky-bikes-nail.md b/.changeset/lucky-bikes-nail.md index 2f0c8573bb..964b9dbd2b 100644 --- a/.changeset/lucky-bikes-nail.md +++ b/.changeset/lucky-bikes-nail.md @@ -1,6 +1,6 @@ --- "@pnpm/deps.compliance.commands": minor -"@pnpm/config": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/many-showers-beg.md b/.changeset/many-showers-beg.md index 314edb153c..ac1979d497 100644 --- a/.changeset/many-showers-beg.md +++ b/.changeset/many-showers-beg.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch "pnpm": patch --- diff --git a/.changeset/nine-areas-glow.md b/.changeset/nine-areas-glow.md index 4fdea315f1..ef18b2ea13 100644 --- a/.changeset/nine-areas-glow.md +++ b/.changeset/nine-areas-glow.md @@ -1,7 +1,7 @@ --- -"@pnpm/resolve-workspace-range": minor -"@pnpm/exportable-manifest": minor -"@pnpm/npm-resolver": minor +"@pnpm/workspace.range-resolver": minor +"@pnpm/releasing.exportable-manifest": minor +"@pnpm/resolving.npm-resolver": minor pnpm: minor --- diff --git a/.changeset/nine-pillows-travel.md b/.changeset/nine-pillows-travel.md index 3f2d657a80..d91cb24781 100644 --- a/.changeset/nine-pillows-travel.md +++ b/.changeset/nine-pillows-travel.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch pnpm: patch --- diff --git a/.changeset/ninety-poets-shake.md b/.changeset/ninety-poets-shake.md index dbbd017745..cb27e95d62 100644 --- a/.changeset/ninety-poets-shake.md +++ b/.changeset/ninety-poets-shake.md @@ -1,5 +1,5 @@ --- -"@pnpm/package-requester": minor +"@pnpm/installing.package-requester": minor --- In some cases, a filtered install (i.e. `pnpm install --filter ...`) was slower than running `pnpm install` without any filter arguments. This performance regression is now fixed. Filtered installs should be as fast or faster than a full install. diff --git a/.changeset/node-runtime-musl-support.md b/.changeset/node-runtime-musl-support.md index 3e61682a9e..a66ecd31e2 100644 --- a/.changeset/node-runtime-musl-support.md +++ b/.changeset/node-runtime-musl-support.md @@ -1,5 +1,5 @@ --- -"@pnpm/node.resolver": patch +"@pnpm/engine.runtime.node.resolver": patch "pnpm": patch --- diff --git a/.changeset/open-animals-speak.md b/.changeset/open-animals-speak.md index 76d8491256..4d66a157dd 100644 --- a/.changeset/open-animals-speak.md +++ b/.changeset/open-animals-speak.md @@ -1,5 +1,5 @@ --- -"@pnpm/resolve-dependencies": patch +"@pnpm/installing.resolve-dependencies": patch "pnpm": patch --- diff --git a/.changeset/open-trams-take.md b/.changeset/open-trams-take.md index 27e0fb4d77..31159b449a 100644 --- a/.changeset/open-trams-take.md +++ b/.changeset/open-trams-take.md @@ -1,7 +1,7 @@ --- "@pnpm/deps.inspection.commands": minor -"@pnpm/reviewing.dependencies-hierarchy": minor -"@pnpm/list": minor +"@pnpm/deps.inspection.tree-builder": minor +"@pnpm/deps.inspection.list": minor --- Added `--lockfile-only` option to `pnpm list` [#10020](https://github.com/pnpm/pnpm/issues/10020). diff --git a/.changeset/open-zoos-sniff.md b/.changeset/open-zoos-sniff.md index 35cb33372a..15143ac030 100644 --- a/.changeset/open-zoos-sniff.md +++ b/.changeset/open-zoos-sniff.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch "pnpm": patch --- diff --git a/.changeset/optimize-why-many-importers.md b/.changeset/optimize-why-many-importers.md index 165d4f947e..2115d97e54 100644 --- a/.changeset/optimize-why-many-importers.md +++ b/.changeset/optimize-why-many-importers.md @@ -1,6 +1,6 @@ --- -"@pnpm/reviewing.dependencies-hierarchy": patch -"@pnpm/list": patch +"@pnpm/deps.inspection.tree-builder": patch +"@pnpm/deps.inspection.list": patch "pnpm": patch --- diff --git a/.changeset/optional-deps-full-metadata.md b/.changeset/optional-deps-full-metadata.md index e3d89193d6..3c73cb1918 100644 --- a/.changeset/optional-deps-full-metadata.md +++ b/.changeset/optional-deps-full-metadata.md @@ -1,7 +1,7 @@ --- -"@pnpm/npm-resolver": patch -"@pnpm/fetching-types": patch -"@pnpm/package-requester": patch +"@pnpm/resolving.npm-resolver": patch +"@pnpm/fetching.types": patch +"@pnpm/installing.package-requester": patch "pnpm": patch --- diff --git a/.changeset/polite-carpets-relax.md b/.changeset/polite-carpets-relax.md index 371a47c2c4..9a9e5bb549 100644 --- a/.changeset/polite-carpets-relax.md +++ b/.changeset/polite-carpets-relax.md @@ -1,125 +1,124 @@ --- -"@pnpm/plugin-commands-installation": major +"@pnpm/installing.commands": major "@pnpm/store.commands": major "@pnpm/cli.commands": major "@pnpm/releasing.commands": major -"@pnpm/plugin-commands-script-runners": major -"@pnpm/write-project-manifest": major -"@pnpm/filter-workspace-packages": major -"@pnpm/read-project-manifest": major +"@pnpm/exec.commands": major +"@pnpm/workspace.project-manifest-writer": major +"@pnpm/workspace.projects-filter": major +"@pnpm/workspace.project-manifest-reader": major "@pnpm/deps.compliance.commands": major "@pnpm/deps.inspection.commands": major "@pnpm/engine.pm.commands": major -"@pnpm/workspace.filter-packages-from-dir": major -"@pnpm/plugin-commands-patching": major -"@pnpm/read-projects-context": major -"@pnpm/resolve-workspace-range": major -"@pnpm/pick-registry-for-package": major -"@pnpm/make-dedicated-lockfile": major -"@pnpm/parse-wanted-dependency": major -"@pnpm/resolve-dependencies": major -"@pnpm/exportable-manifest": major -"@pnpm/reviewing.dependencies-hierarchy": major -"@pnpm/read-package-json": major +"@pnpm/patching.commands": major +"@pnpm/installing.read-projects-context": major +"@pnpm/workspace.range-resolver": major +"@pnpm/config.pick-registry-for-package": major +"@pnpm/lockfile.make-dedicated-lockfile": major +"@pnpm/resolving.parse-wanted-dependency": major +"@pnpm/installing.resolve-dependencies": major +"@pnpm/releasing.exportable-manifest": major +"@pnpm/deps.inspection.tree-builder": major +"@pnpm/pkg-manifest.read-package-json": major "@pnpm/resolving.jsr-specifier-parser": major -"@pnpm/store-connection-manager": major +"@pnpm/store.connection-manager": major "@pnpm/workspace.injected-deps-syncer": major -"@pnpm/package-is-installable": major -"@pnpm/plugin-commands-config": major -"@pnpm/plugin-commands-init": major -"@pnpm/pkg-manager.direct-dep-linker": major -"@pnpm/package-requester": major +"@pnpm/config.package-is-installable": major +"@pnpm/config.commands": major +"@pnpm/workspace.commands": major +"@pnpm/installing.linking.direct-dep-linker": major +"@pnpm/installing.package-requester": major "@pnpm/building.commands": major -"@pnpm/store-controller-types": major -"@pnpm/find-workspace-dir": major -"@pnpm/common-cli-options-help": major -"@pnpm/normalize-registries": major +"@pnpm/store.controller-types": major +"@pnpm/workspace.root-finder": major +"@pnpm/cli.common-cli-options-help": major +"@pnpm/config.normalize-registries": major "@pnpm/lockfile.preferred-versions": major -"@pnpm/render-peer-issues": major -"@pnpm/modules-cleaner": major -"@pnpm/manifest-utils": major -"@pnpm/directory-fetcher": major +"@pnpm/installing.render-peer-issues": major +"@pnpm/installing.linking.modules-cleaner": major +"@pnpm/pkg-manifest.utils": major +"@pnpm/fetching.directory-fetcher": major "@pnpm/fs.is-empty-dir-or-nothing": major -"@pnpm/default-resolver": major -"@pnpm/tarball-resolver": major +"@pnpm/resolving.default-resolver": major +"@pnpm/resolving.tarball-resolver": major "@pnpm/lockfile.detect-dep-types": major "@pnpm/lockfile.settings-checker": major -"@pnpm/license-scanner": major -"@pnpm/workspace.manifest-writer": major +"@pnpm/deps.compliance.license-scanner": major +"@pnpm/workspace.workspace-manifest-writer": major "@pnpm/catalogs.protocol-parser": major -"@pnpm/tarball-fetcher": major -"@pnpm/lockfile-to-pnp": major -"@pnpm/dependency-path": major -"@pnpm/modules-yaml": major -"@pnpm/package-bins": major -"@pnpm/local-resolver": major -"@pnpm/runtime.commands": major -"@pnpm/env.system-node-version": major +"@pnpm/fetching.tarball-fetcher": major +"@pnpm/lockfile.to-pnp": major +"@pnpm/deps.path": major +"@pnpm/installing.modules-yaml": major +"@pnpm/bins.resolver": major +"@pnpm/resolving.local-resolver": major +"@pnpm/engine.runtime.commands": major +"@pnpm/engine.runtime.system-node-version": major "@pnpm/building.pkg-requires-build": major "@pnpm/fetching.binary-fetcher": major "@pnpm/fs.indexed-pkg-importer": major "@pnpm/hooks.read-package-hook": major -"@pnpm/calc-dep-state": major -"@pnpm/get-context": major -"@pnpm/remove-bins": major +"@pnpm/deps.graph-hasher": major +"@pnpm/installing.context": major +"@pnpm/bins.remover": major "@pnpm/resolving.deno-resolver": major -"@pnpm/resolver-base": major -"@pnpm/create-cafs-store": major -"@pnpm/workspace.find-packages": major -"@pnpm/workspace.read-manifest": major -"@pnpm/sort-packages": major -"@pnpm/parse-overrides": major -"@pnpm/dedupe.issues-renderer": major -"@pnpm/mount-modules": major -"@pnpm/fetching-types": major -"@pnpm/real-hoist": major +"@pnpm/resolving.resolver-base": major +"@pnpm/store.create-cafs-store": major +"@pnpm/workspace.projects-reader": major +"@pnpm/workspace.workspace-manifest-reader": major +"@pnpm/workspace.sort-packages": major +"@pnpm/config.parse-overrides": major +"@pnpm/installing.dedupe.issues-renderer": major +"@pnpm/modules-mounter.daemon": major +"@pnpm/fetching.types": major +"@pnpm/installing.linking.real-hoist": major "@pnpm/resolving.bun-resolver": major -"@pnpm/git-resolver": major -"@pnpm/npm-resolver": major +"@pnpm/resolving.git-resolver": major +"@pnpm/resolving.npm-resolver": major "@pnpm/config.deps-installer": major -"@pnpm/fetcher-base": major -"@pnpm/pick-fetcher": major -"@pnpm/symlink-dependency": major +"@pnpm/fetching.fetcher-base": major +"@pnpm/fetching.pick-fetcher": major +"@pnpm/fs.symlink-dependency": major "@pnpm/lockfile.verification": major "@pnpm/core-loggers": major -"@pnpm/link-bins": major +"@pnpm/bins.linker": major "@pnpm/workspace.spec-parser": major -"@pnpm/default-reporter": major -"@pnpm/config.config-writer": major +"@pnpm/cli.default-reporter": major +"@pnpm/config.writer": major "@pnpm/crypto.object-hasher": major "@pnpm/deps.graph-sequencer": major "@pnpm/exec.pnpm-cli-runner": major -"@pnpm/prepare-package": major -"@pnpm/git-fetcher": major +"@pnpm/exec.prepare-package": major +"@pnpm/fetching.git-fetcher": major "@pnpm/object.property-path": major "@pnpm/patching.apply-patch": major -"@pnpm/headless": major +"@pnpm/installing.deps-restorer": major "@pnpm/text.comments-parser": major "@pnpm/workspace.pkgs-graph": major "@pnpm/crypto.shasums-file": major -"@pnpm/read-modules-dir": major +"@pnpm/fs.read-modules-dir": major "@pnpm/network.auth-header": major -"@pnpm/package-store": major -"@pnpm/parse-cli-args": major +"@pnpm/store.controller": major +"@pnpm/cli.parse-cli-args": major "@pnpm/deps.graph-builder": major "@pnpm/building.during-install": major "@pnpm/lockfile.filtering": major "@pnpm/object.key-sorting": major "@pnpm/constants": major -"@pnpm/git-utils": major -"@pnpm/client": major -"@pnpm/outdated": major +"@pnpm/network.git-utils": major +"@pnpm/installing.client": major +"@pnpm/deps.inspection.outdated": major "@pnpm/testing.temp-store": major "@pnpm/catalogs.resolver": major -"@pnpm/node.resolver": major -"@pnpm/hoist": major -"@pnpm/semver.peer-range": major -"@pnpm/node.fetcher": major +"@pnpm/engine.runtime.node.resolver": major +"@pnpm/installing.linking.hoist": major +"@pnpm/deps.peer-range": major +"@pnpm/engine.runtime.node.fetcher": major "@pnpm/fs.find-packages": major "@pnpm/fs.hard-link-dir": major -"@pnpm/core": major -"@pnpm/cafs-types": major -"@pnpm/store-path": major +"@pnpm/installing.deps-installer": major +"@pnpm/store.cafs-types": major +"@pnpm/store.path": major "@pnpm/catalogs.config": major "@pnpm/lockfile.merger": major "@pnpm/lockfile.pruner": major @@ -129,26 +128,26 @@ "@pnpm/workspace.state": major "@pnpm/cache.commands": major "@pnpm/catalogs.types": major -"@pnpm/matcher": major -"@pnpm/lifecycle": major -"@pnpm/graceful-fs": major -"@pnpm/pnpmfile": major -"@pnpm/audit": major +"@pnpm/config.matcher": major +"@pnpm/exec.lifecycle": major +"@pnpm/fs.graceful-fs": major +"@pnpm/hooks.pnpmfile": major +"@pnpm/deps.compliance.audit": major "@pnpm/lockfile.types": major "@pnpm/lockfile.utils": major "@pnpm/error": major "@pnpm/types": major "@pnpm/patching.types": major -"@pnpm/list": major +"@pnpm/deps.inspection.list": major "@pnpm-private/updater": major -"@pnpm/cli-utils": major -"@pnpm/config": major -"@pnpm/fetch": major -"@pnpm/cli-meta": major -"@pnpm/dedupe.check": major -"@pnpm/dedupe.types": major -"@pnpm/run-npm": major -"@pnpm/command": major +"@pnpm/cli.utils": major +"@pnpm/config.reader": major +"@pnpm/network.fetch": major +"@pnpm/cli.meta": major +"@pnpm/installing.dedupe.check": major +"@pnpm/installing.dedupe.types": major +"@pnpm/exec.run-npm": major +"@pnpm/cli.command": major "@pnpm/crypto.hash": major "@pnpm/deps.status": major "@pnpm/fs.packlist": major @@ -156,7 +155,7 @@ "@pnpm/lockfile.fs": major "@pnpm/store.cafs": major "@pnpm/cache.api": major -"@pnpm/env.path": major +"@pnpm/shell.path": major "@pnpm/worker": major "pnpm": major --- diff --git a/.changeset/pretty-readers-know.md b/.changeset/pretty-readers-know.md index 80cce970f1..59269e113e 100644 --- a/.changeset/pretty-readers-know.md +++ b/.changeset/pretty-readers-know.md @@ -1,6 +1,6 @@ --- -"@pnpm/run-npm": minor -"@pnpm/plugin-commands-config": patch +"@pnpm/exec.run-npm": minor +"@pnpm/config.commands": patch "pnpm": patch --- diff --git a/.changeset/prune-global-virtual-store.md b/.changeset/prune-global-virtual-store.md index 7ea14e24cd..c9d5a473d7 100644 --- a/.changeset/prune-global-virtual-store.md +++ b/.changeset/prune-global-virtual-store.md @@ -1,5 +1,5 @@ --- -"@pnpm/package-store": minor +"@pnpm/store.controller": minor "pnpm": minor --- diff --git a/.changeset/public-buckets-worry.md b/.changeset/public-buckets-worry.md index 7ca22eba64..cd84195ff9 100644 --- a/.changeset/public-buckets-worry.md +++ b/.changeset/public-buckets-worry.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": patch +"@pnpm/config.reader": patch --- Fix `_password` decoding. diff --git a/.changeset/public-feet-hide.md b/.changeset/public-feet-hide.md index ef8c7556c3..6be1ffb1dc 100644 --- a/.changeset/public-feet-hide.md +++ b/.changeset/public-feet-hide.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch --- Improve the error messages related to `trustPolicy` mismatch. diff --git a/.changeset/quick-foxes-leap.md b/.changeset/quick-foxes-leap.md index 9e489b91d7..3d3df4cf81 100644 --- a/.changeset/quick-foxes-leap.md +++ b/.changeset/quick-foxes-leap.md @@ -1,10 +1,10 @@ --- "@pnpm/store.cafs": major -"@pnpm/store-controller-types": major +"@pnpm/store.controller-types": major "@pnpm/worker": major -"@pnpm/package-requester": major -"@pnpm/npm-resolver": major -"@pnpm/reviewing.dependencies-hierarchy": major +"@pnpm/installing.package-requester": major +"@pnpm/resolving.npm-resolver": major +"@pnpm/deps.inspection.tree-builder": major "@pnpm/building.during-install": major "pnpm": major --- diff --git a/.changeset/quick-rice-hang.md b/.changeset/quick-rice-hang.md index 78f2f50ad1..bb7c385fe3 100644 --- a/.changeset/quick-rice-hang.md +++ b/.changeset/quick-rice-hang.md @@ -1,6 +1,6 @@ --- -"@pnpm/plugin-commands-config": minor -"@pnpm/config": minor +"@pnpm/config.commands": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/ready-cobras-jump.md b/.changeset/ready-cobras-jump.md index 25d7a1b35b..8d21d81521 100644 --- a/.changeset/ready-cobras-jump.md +++ b/.changeset/ready-cobras-jump.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-config": major +"@pnpm/config.commands": major "pnpm": major --- diff --git a/.changeset/real-papers-cut.md b/.changeset/real-papers-cut.md index 929c2da851..63f1fd938c 100644 --- a/.changeset/real-papers-cut.md +++ b/.changeset/real-papers-cut.md @@ -1,5 +1,5 @@ --- -"@pnpm/pnpmfile": minor +"@pnpm/hooks.pnpmfile": minor "pnpm": minor --- diff --git a/.changeset/red-months-bathe.md b/.changeset/red-months-bathe.md index 0cc81299e1..3eb8c05760 100644 --- a/.changeset/red-months-bathe.md +++ b/.changeset/red-months-bathe.md @@ -1,6 +1,6 @@ --- -"@pnpm/plugin-commands-script-runners": patch -"@pnpm/config": patch +"@pnpm/exec.commands": patch +"@pnpm/config.reader": patch "pnpm": patch --- diff --git a/.changeset/refactor-env-use-global-bin-linker.md b/.changeset/refactor-env-use-global-bin-linker.md index e7bebaae3f..12c465895f 100644 --- a/.changeset/refactor-env-use-global-bin-linker.md +++ b/.changeset/refactor-env-use-global-bin-linker.md @@ -1,9 +1,9 @@ --- "@pnpm/constants": patch -"@pnpm/resolver-base": patch +"@pnpm/resolving.resolver-base": patch "@pnpm/lockfile.types": patch -"@pnpm/node.resolver": patch -"@pnpm/runtime.commands": patch +"@pnpm/engine.runtime.node.resolver": patch +"@pnpm/engine.runtime.commands": patch --- Added `getNodeBinsForCurrentOS` to `@pnpm/constants` which returns a `Record` with paths for `node`, `npm`, and `npx` within the Node.js package. This record is now used as `BinaryResolution.bin` (type widened from `string` to `string | Record`) and as `manifest.bin` in the node resolver, so pnpm's bin-linker creates all three shims automatically when installing a Node.js runtime. diff --git a/.changeset/refactor-fullmetadata-options.md b/.changeset/refactor-fullmetadata-options.md index ec4444cfe7..c081065db4 100644 --- a/.changeset/refactor-fullmetadata-options.md +++ b/.changeset/refactor-fullmetadata-options.md @@ -1,5 +1,5 @@ --- -"@pnpm/fetch": major +"@pnpm/network.fetch": major --- Refactored `fullMetadata` option handling. The `fullMetadata` option is no longer accepted by `createFetchFromRegistry()` at construction time - it should only be passed at call time via the fetch options. diff --git a/.changeset/refactor-workspace-domains.md b/.changeset/refactor-workspace-domains.md new file mode 100644 index 0000000000..fb2fc9b0cd --- /dev/null +++ b/.changeset/refactor-workspace-domains.md @@ -0,0 +1,7 @@ +--- +"pnpm": minor +"@pnpm/workspace.projects-filter": minor +"@pnpm/workspace.projects-reader": minor +--- + +Refactor workspace domains: rename `project-finder` to `projects-reader`, merge `filter-packages-from-dir` into `filter-workspace-packages`, and rename it to `projects-filter`. diff --git a/.changeset/remove-deprecated-build-settings0.md b/.changeset/remove-deprecated-build-settings0.md index 99dadf90ee..cbb7c6a354 100644 --- a/.changeset/remove-deprecated-build-settings0.md +++ b/.changeset/remove-deprecated-build-settings0.md @@ -1,12 +1,12 @@ --- "@pnpm/types": major -"@pnpm/config": major -"@pnpm/core": major -"@pnpm/headless": major +"@pnpm/config.reader": major +"@pnpm/installing.deps-installer": major +"@pnpm/installing.deps-restorer": major "@pnpm/building.policy": major "@pnpm/building.commands": major -"@pnpm/plugin-commands-installation": major -"@pnpm/workspace.manifest-writer": major +"@pnpm/installing.commands": major +"@pnpm/workspace.workspace-manifest-writer": major --- Remove deprecated build dependency settings: `onlyBuiltDependencies`, `onlyBuiltDependenciesFile`, `neverBuiltDependencies`, and `ignoredBuiltDependencies`. diff --git a/.changeset/remove-deprecated-patch-options.md b/.changeset/remove-deprecated-patch-options.md index 163e6c0c38..ab38363567 100644 --- a/.changeset/remove-deprecated-patch-options.md +++ b/.changeset/remove-deprecated-patch-options.md @@ -1,16 +1,16 @@ --- -"@pnpm/plugin-commands-installation": major +"@pnpm/installing.commands": major "@pnpm/releasing.commands": major -"@pnpm/plugin-commands-patching": major -"@pnpm/package-bins": major +"@pnpm/patching.commands": major +"@pnpm/bins.resolver": major "@pnpm/patching.apply-patch": major "@pnpm/patching.config": major "@pnpm/patching.types": major -"@pnpm/headless": major +"@pnpm/installing.deps-restorer": major "@pnpm/building.during-install": major -"@pnpm/core": major +"@pnpm/installing.deps-installer": major "@pnpm/types": major -"@pnpm/config": major +"@pnpm/config.reader": major "pnpm": major --- diff --git a/.changeset/replace-archy-with-tree-renderer.md b/.changeset/replace-archy-with-tree-renderer.md index 2bcce806c6..877622998c 100644 --- a/.changeset/replace-archy-with-tree-renderer.md +++ b/.changeset/replace-archy-with-tree-renderer.md @@ -1,6 +1,6 @@ --- -"@pnpm/dedupe.issues-renderer": patch -"@pnpm/render-peer-issues": patch +"@pnpm/installing.dedupe.issues-renderer": patch +"@pnpm/installing.render-peer-issues": patch --- Replaced `archy` with `@pnpm/text.tree-renderer` for tree output. diff --git a/.changeset/reverse-why-tree.md b/.changeset/reverse-why-tree.md index 2460d31d8a..2b6476aa66 100644 --- a/.changeset/reverse-why-tree.md +++ b/.changeset/reverse-why-tree.md @@ -1,6 +1,6 @@ --- -"@pnpm/reviewing.dependencies-hierarchy": minor -"@pnpm/list": minor +"@pnpm/deps.inspection.tree-builder": minor +"@pnpm/deps.inspection.list": minor "@pnpm/deps.inspection.commands": minor "pnpm": minor --- diff --git a/.changeset/runtime-set-command.md b/.changeset/runtime-set-command.md index 3ed0cbcd22..0389e25cc7 100644 --- a/.changeset/runtime-set-command.md +++ b/.changeset/runtime-set-command.md @@ -1,5 +1,5 @@ --- -"@pnpm/runtime.commands": patch +"@pnpm/engine.runtime.commands": patch "pnpm": minor --- diff --git a/.changeset/salty-beds-sell.md b/.changeset/salty-beds-sell.md index d320f5afd5..649af5332f 100644 --- a/.changeset/salty-beds-sell.md +++ b/.changeset/salty-beds-sell.md @@ -1,7 +1,7 @@ --- "@pnpm/lockfile.settings-checker": patch "@pnpm/lockfile.verification": patch -"@pnpm/core": patch +"@pnpm/installing.deps-installer": patch "@pnpm/deps.status": patch --- diff --git a/.changeset/seven-turtles-attack.md b/.changeset/seven-turtles-attack.md index 7ffc09e8a1..7ddae8fc0c 100644 --- a/.changeset/seven-turtles-attack.md +++ b/.changeset/seven-turtles-attack.md @@ -1,8 +1,8 @@ --- -"@pnpm/plugin-commands-installation": patch -"@pnpm/reviewing.dependencies-hierarchy": patch +"@pnpm/installing.commands": patch +"@pnpm/deps.inspection.tree-builder": patch "@pnpm/lockfile.detect-dep-types": patch -"@pnpm/dedupe.check": patch +"@pnpm/installing.dedupe.check": patch pnpm: patch --- diff --git a/.changeset/shaggy-peaches-shop.md b/.changeset/shaggy-peaches-shop.md index b989a83e53..a01f6a3e16 100644 --- a/.changeset/shaggy-peaches-shop.md +++ b/.changeset/shaggy-peaches-shop.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": major +"@pnpm/config.reader": major "pnpm": major --- diff --git a/.changeset/shaky-emus-notice.md b/.changeset/shaky-emus-notice.md index 560399eac4..63451c1af6 100644 --- a/.changeset/shaky-emus-notice.md +++ b/.changeset/shaky-emus-notice.md @@ -1,6 +1,6 @@ --- -"@pnpm/cli-utils": patch -"@pnpm/config": patch +"@pnpm/cli.utils": patch +"@pnpm/config.reader": patch "pnpm": patch --- diff --git a/.changeset/shaky-lines-sit.md b/.changeset/shaky-lines-sit.md index 4d4aef2ebe..3d7f43986d 100644 --- a/.changeset/shaky-lines-sit.md +++ b/.changeset/shaky-lines-sit.md @@ -1,8 +1,8 @@ --- "@pnpm/deps.inspection.commands": patch -"@pnpm/reviewing.dependencies-hierarchy": patch +"@pnpm/deps.inspection.tree-builder": patch "@pnpm/types": patch -"@pnpm/list": patch +"@pnpm/deps.inspection.list": patch "pnpm": patch --- diff --git a/.changeset/sharp-birds-rest.md b/.changeset/sharp-birds-rest.md index ddd20e9f36..0bbbf92cc5 100644 --- a/.changeset/sharp-birds-rest.md +++ b/.changeset/sharp-birds-rest.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-config": major +"@pnpm/config.commands": major "pnpm": major --- diff --git a/.changeset/sharp-insects-joke.md b/.changeset/sharp-insects-joke.md index faec89db01..2d0fe1292b 100644 --- a/.changeset/sharp-insects-joke.md +++ b/.changeset/sharp-insects-joke.md @@ -1,5 +1,5 @@ --- -"@pnpm/workspace.read-manifest": minor +"@pnpm/workspace.workspace-manifest-reader": minor --- The `validateWorkspaceManifest` function is now exported and can be used to validate whether a workspace manifest object's schema is correct. diff --git a/.changeset/sharp-planes-boil.md b/.changeset/sharp-planes-boil.md index 55d2e08caa..c4a00c21e3 100644 --- a/.changeset/sharp-planes-boil.md +++ b/.changeset/sharp-planes-boil.md @@ -1,6 +1,6 @@ --- -"@pnpm/manifest-utils": patch -"@pnpm/resolve-dependencies": patch +"@pnpm/pkg-manifest.utils": patch +"@pnpm/installing.resolve-dependencies": patch pnpm: patch --- diff --git a/.changeset/silver-geckos-hunt.md b/.changeset/silver-geckos-hunt.md index de2bec479f..51014fc556 100644 --- a/.changeset/silver-geckos-hunt.md +++ b/.changeset/silver-geckos-hunt.md @@ -1,5 +1,5 @@ --- -"@pnpm/node.resolver": patch +"@pnpm/engine.runtime.node.resolver": patch "pnpm": patch --- diff --git a/.changeset/sixty-results-end.md b/.changeset/sixty-results-end.md index 89d0d5e66a..669ace70e0 100644 --- a/.changeset/sixty-results-end.md +++ b/.changeset/sixty-results-end.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-config": major +"@pnpm/config.commands": major "pnpm": major --- diff --git a/.changeset/slick-cases-double.md b/.changeset/slick-cases-double.md index 7a4cc64ce5..dd3ac400ec 100644 --- a/.changeset/slick-cases-double.md +++ b/.changeset/slick-cases-double.md @@ -1,6 +1,6 @@ --- -"@pnpm/headless": patch -"@pnpm/core": patch +"@pnpm/installing.deps-restorer": patch +"@pnpm/installing.deps-installer": patch --- Fix the comparison of current and previous hoistPattern and publicHoistPattern values. diff --git a/.changeset/small-numbers-joke.md b/.changeset/small-numbers-joke.md index 4f771ee99b..38fc882014 100644 --- a/.changeset/small-numbers-joke.md +++ b/.changeset/small-numbers-joke.md @@ -1,14 +1,14 @@ --- -"@pnpm/plugin-commands-installation": major +"@pnpm/installing.commands": major "@pnpm/releasing.commands": major -"@pnpm/plugin-commands-script-runners": major -"@pnpm/runtime.commands": major -"@pnpm/workspace.find-packages": major +"@pnpm/exec.commands": major +"@pnpm/engine.runtime.commands": major +"@pnpm/workspace.projects-reader": major "@pnpm/constants": major -"@pnpm/core": major -"@pnpm/lifecycle": major +"@pnpm/installing.deps-installer": major +"@pnpm/exec.lifecycle": major "@pnpm/types": major -"@pnpm/config": major +"@pnpm/config.reader": major "pnpm": major --- diff --git a/.changeset/small-results-hunt.md b/.changeset/small-results-hunt.md index 0f75272f93..32d321a6d0 100644 --- a/.changeset/small-results-hunt.md +++ b/.changeset/small-results-hunt.md @@ -1,5 +1,5 @@ --- -"@pnpm/package-requester": minor +"@pnpm/installing.package-requester": minor "@pnpm/worker": minor "pnpm": minor --- diff --git a/.changeset/smooth-llamas-pick.md b/.changeset/smooth-llamas-pick.md index 12f65ec1ef..67c3616201 100644 --- a/.changeset/smooth-llamas-pick.md +++ b/.changeset/smooth-llamas-pick.md @@ -1,16 +1,16 @@ --- -"@pnpm/plugin-commands-installation": minor -"@pnpm/plugin-commands-script-runners": minor -"@pnpm/resolve-dependencies": minor -"@pnpm/store-connection-manager": minor -"@pnpm/package-requester": minor -"@pnpm/store-controller-types": minor -"@pnpm/resolver-base": minor -"@pnpm/npm-resolver": minor -"@pnpm/core": minor +"@pnpm/installing.commands": minor +"@pnpm/exec.commands": minor +"@pnpm/installing.resolve-dependencies": minor +"@pnpm/store.connection-manager": minor +"@pnpm/installing.package-requester": minor +"@pnpm/store.controller-types": minor +"@pnpm/resolving.resolver-base": minor +"@pnpm/resolving.npm-resolver": minor +"@pnpm/installing.deps-installer": minor "@pnpm/types": minor -"@pnpm/registry.types": minor -"@pnpm/config": minor +"@pnpm/resolving.registry.types": minor +"@pnpm/config.reader": minor --- Added a new setting: `trustPolicy`. diff --git a/.changeset/soft-trains-prove.md b/.changeset/soft-trains-prove.md index 6eaecf8710..f4d49015c1 100644 --- a/.changeset/soft-trains-prove.md +++ b/.changeset/soft-trains-prove.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch --- Update parse-npm-tarball-url to fix deprecation warnings on Node.js 24. diff --git a/.changeset/solid-eagles-mate.md b/.changeset/solid-eagles-mate.md index a5ac5e6b46..d308dd4395 100644 --- a/.changeset/solid-eagles-mate.md +++ b/.changeset/solid-eagles-mate.md @@ -1,5 +1,5 @@ --- -"@pnpm/workspace.manifest-writer": patch +"@pnpm/workspace.workspace-manifest-writer": patch "pnpm": patch --- diff --git a/.changeset/solid-regions-ring.md b/.changeset/solid-regions-ring.md index 6cf4c8b2f0..7e2e3417fb 100644 --- a/.changeset/solid-regions-ring.md +++ b/.changeset/solid-regions-ring.md @@ -1,5 +1,5 @@ --- -"@pnpm/npm-resolver": patch +"@pnpm/resolving.npm-resolver": patch "pnpm": patch --- diff --git a/.changeset/solid-suns-wear.md b/.changeset/solid-suns-wear.md index ba2d77264c..0b52e09a74 100644 --- a/.changeset/solid-suns-wear.md +++ b/.changeset/solid-suns-wear.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-installation": patch +"@pnpm/installing.commands": patch "pnpm": patch --- diff --git a/.changeset/sour-hoops-allow.md b/.changeset/sour-hoops-allow.md index e59cee2ede..48590a8832 100644 --- a/.changeset/sour-hoops-allow.md +++ b/.changeset/sour-hoops-allow.md @@ -1,20 +1,20 @@ --- -"@pnpm/pick-fetcher": major -"@pnpm/resolve-dependencies": minor +"@pnpm/fetching.pick-fetcher": major +"@pnpm/installing.resolve-dependencies": minor "@pnpm/releasing.commands": minor -"@pnpm/store-connection-manager": minor -"@pnpm/default-resolver": minor -"@pnpm/license-scanner": minor -"@pnpm/calc-dep-state": minor -"@pnpm/resolver-base": minor -"@pnpm/package-store": minor -"@pnpm/client": minor -"@pnpm/core": minor -"@pnpm/pnpmfile": minor +"@pnpm/store.connection-manager": minor +"@pnpm/resolving.default-resolver": minor +"@pnpm/deps.compliance.license-scanner": minor +"@pnpm/deps.graph-hasher": minor +"@pnpm/resolving.resolver-base": minor +"@pnpm/store.controller": minor +"@pnpm/installing.client": minor +"@pnpm/installing.deps-installer": minor +"@pnpm/hooks.pnpmfile": minor "@pnpm/lockfile.types": minor "@pnpm/hooks.types": minor -"@pnpm/package-requester": patch -"@pnpm/tarball-fetcher": patch +"@pnpm/installing.package-requester": patch +"@pnpm/fetching.tarball-fetcher": patch "@pnpm/deps.graph-builder": patch "@pnpm/lockfile.utils": patch --- diff --git a/.changeset/sqlite-store-index.md b/.changeset/sqlite-store-index.md index a8ff4ddf09..56b3d9cf24 100644 --- a/.changeset/sqlite-store-index.md +++ b/.changeset/sqlite-store-index.md @@ -3,9 +3,9 @@ "@pnpm/store.cafs": minor "@pnpm/worker": minor "@pnpm/store.commands": minor -"@pnpm/package-store": minor +"@pnpm/store.controller": minor "@pnpm/store.pkg-finder": minor -"@pnpm/reviewing.dependencies-hierarchy": minor +"@pnpm/deps.inspection.tree-builder": minor "@pnpm/building.commands": minor "pnpm": minor --- diff --git a/.changeset/stale-bars-tan.md b/.changeset/stale-bars-tan.md index 5a8afca6ce..c60e496e15 100644 --- a/.changeset/stale-bars-tan.md +++ b/.changeset/stale-bars-tan.md @@ -1,6 +1,6 @@ --- -"@pnpm/dependency-path": patch -"@pnpm/calc-dep-state": patch +"@pnpm/deps.path": patch +"@pnpm/deps.graph-hasher": patch --- Fix dependency graph hash calculation for runtime dependencies (like Node.js, Deno). diff --git a/.changeset/stale-cats-judge.md b/.changeset/stale-cats-judge.md index 2ad2e5c8e1..a14e3ada17 100644 --- a/.changeset/stale-cats-judge.md +++ b/.changeset/stale-cats-judge.md @@ -1,5 +1,5 @@ --- -"@pnpm/naming-cases": major +"@pnpm/text.naming-cases": major --- Initial Release. diff --git a/.changeset/strong-readers-think.md b/.changeset/strong-readers-think.md index 1a9aa70b24..7c5234f1bc 100644 --- a/.changeset/strong-readers-think.md +++ b/.changeset/strong-readers-think.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": patch +"@pnpm/config.reader": patch "pnpm": patch --- diff --git a/.changeset/stupid-carpets-teach.md b/.changeset/stupid-carpets-teach.md index 2f61621f0c..1014a88bc3 100644 --- a/.changeset/stupid-carpets-teach.md +++ b/.changeset/stupid-carpets-teach.md @@ -1,9 +1,9 @@ --- -"@pnpm/plugin-commands-installation": minor -"@pnpm/resolve-dependencies": minor +"@pnpm/installing.commands": minor +"@pnpm/installing.resolve-dependencies": minor "@pnpm/deps.compliance.commands": minor -"@pnpm/npm-resolver": minor -"@pnpm/core": minor +"@pnpm/resolving.npm-resolver": minor +"@pnpm/installing.deps-installer": minor "@pnpm/types": minor "@pnpm-private/updater": minor "pnpm": minor diff --git a/.changeset/tangy-geckos-fry.md b/.changeset/tangy-geckos-fry.md index b73b945398..a823a8a765 100644 --- a/.changeset/tangy-geckos-fry.md +++ b/.changeset/tangy-geckos-fry.md @@ -1,6 +1,6 @@ --- -"@pnpm/plugin-commands-installation": major -"@pnpm/parse-cli-args": major +"@pnpm/installing.commands": major +"@pnpm/cli.parse-cli-args": major "pnpm": major --- diff --git a/.changeset/tangy-pans-pull.md b/.changeset/tangy-pans-pull.md index 2998a0a1c3..5aad99c009 100644 --- a/.changeset/tangy-pans-pull.md +++ b/.changeset/tangy-pans-pull.md @@ -1,10 +1,10 @@ --- "@pnpm/releasing.commands": major "pnpm": major -"@pnpm/make-dedicated-lockfile": minor -"@pnpm/exportable-manifest": minor +"@pnpm/lockfile.make-dedicated-lockfile": minor +"@pnpm/releasing.exportable-manifest": minor "@pnpm/types": minor -"@pnpm/config": minor +"@pnpm/config.reader": minor --- `pnpm publish` now works without the `npm` CLI. diff --git a/.changeset/tasty-eyes-retire.md b/.changeset/tasty-eyes-retire.md index 89c9dfc997..c09311b0e4 100644 --- a/.changeset/tasty-eyes-retire.md +++ b/.changeset/tasty-eyes-retire.md @@ -1,7 +1,7 @@ --- -"@pnpm/common-cli-options-help": minor -"@pnpm/core": minor -"@pnpm/config": minor +"@pnpm/cli.common-cli-options-help": minor +"@pnpm/installing.deps-installer": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/tender-times-hug.md b/.changeset/tender-times-hug.md index 3ccb90d185..ca9671e2df 100644 --- a/.changeset/tender-times-hug.md +++ b/.changeset/tender-times-hug.md @@ -1,5 +1,5 @@ --- -"@pnpm/modules-yaml": minor +"@pnpm/installing.modules-yaml": minor --- Save node_modules/.modules.yaml in JSON format. diff --git a/.changeset/thin-crabs-smoke.md b/.changeset/thin-crabs-smoke.md index 3131ab1064..8acee6d79d 100644 --- a/.changeset/thin-crabs-smoke.md +++ b/.changeset/thin-crabs-smoke.md @@ -1,5 +1,5 @@ --- -"@pnpm/resolve-dependencies": patch +"@pnpm/installing.resolve-dependencies": patch "pnpm": patch --- diff --git a/.changeset/three-gifts-try.md b/.changeset/three-gifts-try.md index a79d6adbda..2583334333 100644 --- a/.changeset/three-gifts-try.md +++ b/.changeset/three-gifts-try.md @@ -1,6 +1,6 @@ --- -"@pnpm/plugin-commands-config": major -"@pnpm/config": major +"@pnpm/config.commands": major +"@pnpm/config.reader": major "pnpm": major --- diff --git a/.changeset/tidy-teeth-accept.md b/.changeset/tidy-teeth-accept.md index 6156b1e508..679abad72e 100644 --- a/.changeset/tidy-teeth-accept.md +++ b/.changeset/tidy-teeth-accept.md @@ -1,5 +1,5 @@ --- -"@pnpm/package-store": patch +"@pnpm/store.controller": patch "pnpm": patch --- diff --git a/.changeset/tiny-ads-tickle.md b/.changeset/tiny-ads-tickle.md index a031284af3..7090292510 100644 --- a/.changeset/tiny-ads-tickle.md +++ b/.changeset/tiny-ads-tickle.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": patch +"@pnpm/config.reader": patch "pnpm": patch --- diff --git a/.changeset/tiny-rivers-crash.md b/.changeset/tiny-rivers-crash.md index d2b2ccb46f..b68ddae278 100644 --- a/.changeset/tiny-rivers-crash.md +++ b/.changeset/tiny-rivers-crash.md @@ -1,12 +1,12 @@ --- -"@pnpm/plugin-commands-installation": minor -"@pnpm/resolve-dependencies": minor -"@pnpm/package-requester": minor -"@pnpm/store-controller-types": minor -"@pnpm/resolver-base": minor -"@pnpm/npm-resolver": minor -"@pnpm/core": minor -"@pnpm/config": minor +"@pnpm/installing.commands": minor +"@pnpm/installing.resolve-dependencies": minor +"@pnpm/installing.package-requester": minor +"@pnpm/store.controller-types": minor +"@pnpm/resolving.resolver-base": minor +"@pnpm/resolving.npm-resolver": minor +"@pnpm/installing.deps-installer": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/tired-fans-invent.md b/.changeset/tired-fans-invent.md index ec3d654e8c..eec6dee71b 100644 --- a/.changeset/tired-fans-invent.md +++ b/.changeset/tired-fans-invent.md @@ -1,5 +1,5 @@ --- -"@pnpm/tarball-resolver": patch +"@pnpm/resolving.tarball-resolver": patch "pnpm": patch --- diff --git a/.changeset/tricky-ravens-obey.md b/.changeset/tricky-ravens-obey.md index 774f8492cf..ed7c80818e 100644 --- a/.changeset/tricky-ravens-obey.md +++ b/.changeset/tricky-ravens-obey.md @@ -1,7 +1,7 @@ --- -"@pnpm/package-requester": minor -"@pnpm/store-controller-types": minor -"@pnpm/fetcher-base": minor +"@pnpm/installing.package-requester": minor +"@pnpm/store.controller-types": minor +"@pnpm/fetching.fetcher-base": minor "@pnpm/worker": minor "pnpm": minor --- diff --git a/.changeset/twenty-parks-end.md b/.changeset/twenty-parks-end.md index 4e66dc93f1..3d537819d6 100644 --- a/.changeset/twenty-parks-end.md +++ b/.changeset/twenty-parks-end.md @@ -1,5 +1,5 @@ --- -"@pnpm/plugin-commands-script-runners": patch +"@pnpm/exec.commands": patch "pnpm": patch --- diff --git a/.changeset/two-candies-train.md b/.changeset/two-candies-train.md index c5257d6744..d7109d04ee 100644 --- a/.changeset/two-candies-train.md +++ b/.changeset/two-candies-train.md @@ -1,7 +1,7 @@ --- -"@pnpm/read-project-manifest": minor -"@pnpm/resolve-dependencies": minor -"@pnpm/link-bins": minor +"@pnpm/workspace.project-manifest-reader": minor +"@pnpm/installing.resolve-dependencies": minor +"@pnpm/bins.linker": minor "@pnpm/types": minor "pnpm": minor --- diff --git a/.changeset/two-colts-talk.md b/.changeset/two-colts-talk.md index 098ff2cc6b..9448577dbb 100644 --- a/.changeset/two-colts-talk.md +++ b/.changeset/two-colts-talk.md @@ -1,5 +1,5 @@ --- -"@pnpm/exportable-manifest": minor +"@pnpm/releasing.exportable-manifest": minor "pnpm": minor --- diff --git a/.changeset/update-default-settings.md b/.changeset/update-default-settings.md index 9b45bd90cc..e40f03197f 100644 --- a/.changeset/update-default-settings.md +++ b/.changeset/update-default-settings.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": minor +"@pnpm/config.reader": minor "pnpm": minor --- diff --git a/.changeset/violet-trains-rescue.md b/.changeset/violet-trains-rescue.md index 2dcd1207a3..cfa677beaa 100644 --- a/.changeset/violet-trains-rescue.md +++ b/.changeset/violet-trains-rescue.md @@ -1,5 +1,5 @@ --- -"@pnpm/manifest-utils": major +"@pnpm/pkg-manifest.utils": major --- Added `@pnpm/logger` to peer dependencies. diff --git a/.changeset/virtual-store-only.md b/.changeset/virtual-store-only.md index e089f8a016..f82c869147 100644 --- a/.changeset/virtual-store-only.md +++ b/.changeset/virtual-store-only.md @@ -1,8 +1,8 @@ --- -"@pnpm/config": patch -"@pnpm/core": minor -"@pnpm/headless": minor -"@pnpm/plugin-commands-installation": minor +"@pnpm/config.reader": patch +"@pnpm/installing.deps-installer": minor +"@pnpm/installing.deps-restorer": minor +"@pnpm/installing.commands": minor "pnpm": minor --- diff --git a/.changeset/warm-pnpmfiles-glow.md b/.changeset/warm-pnpmfiles-glow.md index d3afd153f6..7cbcaedef8 100644 --- a/.changeset/warm-pnpmfiles-glow.md +++ b/.changeset/warm-pnpmfiles-glow.md @@ -1,5 +1,5 @@ --- -"@pnpm/pnpmfile": minor +"@pnpm/hooks.pnpmfile": minor "pnpm": minor --- diff --git a/.changeset/warn-path-delimiter.md b/.changeset/warn-path-delimiter.md index 32c1f44b00..e8010ed261 100644 --- a/.changeset/warn-path-delimiter.md +++ b/.changeset/warn-path-delimiter.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": patch +"@pnpm/config.reader": patch "pnpm": patch --- diff --git a/.changeset/wet-rabbits-reply.md b/.changeset/wet-rabbits-reply.md index 29ccd0ca8a..11988f595b 100644 --- a/.changeset/wet-rabbits-reply.md +++ b/.changeset/wet-rabbits-reply.md @@ -1,5 +1,5 @@ --- -"@pnpm/workspace.manifest-writer": minor +"@pnpm/workspace.workspace-manifest-writer": minor pnpm: minor --- diff --git a/.changeset/witty-tigers-tell.md b/.changeset/witty-tigers-tell.md index b5cd0645f2..0de7ef16f6 100644 --- a/.changeset/witty-tigers-tell.md +++ b/.changeset/witty-tigers-tell.md @@ -1,5 +1,5 @@ --- -"@pnpm/config": patch +"@pnpm/config.reader": patch "pnpm": patch --- diff --git a/.changeset/yellow-beds-wear.md b/.changeset/yellow-beds-wear.md index 1753e0e4f1..7b568aee72 100644 --- a/.changeset/yellow-beds-wear.md +++ b/.changeset/yellow-beds-wear.md @@ -1,9 +1,9 @@ --- "@pnpm/building.commands": patch -"@pnpm/default-reporter": patch -"@pnpm/headless": patch +"@pnpm/cli.default-reporter": patch +"@pnpm/installing.deps-restorer": patch "@pnpm/building.during-install": patch -"@pnpm/core": patch +"@pnpm/installing.deps-installer": patch "pnpm": patch --- diff --git a/.meta-updater/package.json b/.meta-updater/package.json index f920f50464..1542776229 100644 --- a/.meta-updater/package.json +++ b/.meta-updater/package.json @@ -13,8 +13,8 @@ "@pnpm/meta-updater": "catalog:", "@pnpm/object.key-sorting": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/workspace.find-packages": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*", + "@pnpm/workspace.projects-reader": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "@types/normalize-path": "catalog:", "is-subdir": "catalog:", "load-json-file": "catalog:", diff --git a/.meta-updater/src/index.ts b/.meta-updater/src/index.ts index 8952f10393..d83c0b27cc 100644 --- a/.meta-updater/src/index.ts +++ b/.meta-updater/src/index.ts @@ -5,8 +5,8 @@ import { type LockfileObject, readWantedLockfile } from '@pnpm/lockfile.fs' import { createUpdateOptions, type FormatPluginFnOptions } from '@pnpm/meta-updater' import { sortDirectKeys, sortKeysByPriority } from '@pnpm/object.key-sorting' import type { ProjectId, ProjectManifest } from '@pnpm/types' -import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.find-packages' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.projects-reader' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { isSubdir } from 'is-subdir' import { loadJsonFileSync } from 'load-json-file' import normalizePath from 'normalize-path' @@ -93,7 +93,7 @@ export default async (workspaceDir: string) => { // eslint-disable-line manifest.peerDependencies['@pnpm/worker'] = 'workspace:^' } const isUtil = isSubdir(utilsDir, dir) - if (manifest.name !== '@pnpm/make-dedicated-lockfile' && manifest.name !== '@pnpm/mount-modules' && !isUtil && manifest.name !== '@pnpm-private/updater') { + if (manifest.name !== '@pnpm/lockfile.make-dedicated-lockfile' && manifest.name !== '@pnpm/modules-mounter.daemon' && !isUtil && manifest.name !== '@pnpm-private/updater') { for (const depType of ['dependencies', 'optionalDependencies'] as const) { if (manifest[depType]?.['@pnpm/logger']) { delete manifest[depType]!['@pnpm/logger'] @@ -161,12 +161,12 @@ async function updateTSConfig ( if (!fs.existsSync(path.join(linkedPkgDir, 'tsconfig.json'))) continue if (!isSubdir(context.workspaceDir, linkedPkgDir)) continue if ( - depName === '@pnpm/package-store' && ( - manifest.name === '@pnpm/git-fetcher' || - manifest.name === '@pnpm/tarball-fetcher' || - manifest.name === '@pnpm/package-requester' + depName === '@pnpm/store.controller' && ( + manifest.name === '@pnpm/fetching.git-fetcher' || + manifest.name === '@pnpm/fetching.tarball-fetcher' || + manifest.name === '@pnpm/installing.package-requester' ) || - depName === 'pnpm' && manifest.name === '@pnpm/make-dedicated-lockfile' + depName === 'pnpm' && manifest.name === '@pnpm/lockfile.make-dedicated-lockfile' ) { // This is to avoid a circular graph (which TypeScript references do not support. continue @@ -217,7 +217,7 @@ async function updateTSConfig ( // // The project reference allows editor features like Go to Definition // jump to files in src for imports using the current package's name - // (ex: @pnpm/config). + // (ex: @pnpm/config.reader). : [{ path: '..' }], }, { indent: 2 }) } @@ -256,27 +256,27 @@ async function updateManifest (workspaceDir: string, manifest: ProjectManifest, break case '@pnpm/building.commands': case '@pnpm/config.deps-installer': - case '@pnpm/headless': - case '@pnpm/outdated': - case '@pnpm/package-requester': + case '@pnpm/installing.deps-restorer': + case '@pnpm/deps.inspection.outdated': + case '@pnpm/installing.package-requester': case '@pnpm/cache.commands': case '@pnpm/plugin-commands-import': - case '@pnpm/plugin-commands-installation': + case '@pnpm/installing.commands': case '@pnpm/deps.inspection.commands': - case '@pnpm/plugin-commands-patching': + case '@pnpm/patching.commands': case '@pnpm/releasing.commands': - case '@pnpm/plugin-commands-script-runners': + case '@pnpm/exec.commands': case '@pnpm/store.commands': case '@pnpm/deps.compliance.commands': case CLI_PKG_NAME: - case '@pnpm/core': { + case '@pnpm/installing.deps-installer': { preset = '@pnpm/jest-config/with-registry' scripts = { ...(manifest.scripts as Record), } scripts.test = 'pnpm run compile && pnpm run _test' - if (manifest.name === '@pnpm/core') { - // @pnpm/core tests currently works only with port 7769 due to the usage of + if (manifest.name === '@pnpm/installing.deps-installer') { + // @pnpm/installing.deps-installer tests currently works only with port 7769 due to the usage of // the next package: pkg-with-tarball-dep-from-registry scripts._test = `cross-env PNPM_REGISTRY_MOCK_PORT=${registryMockPortForCore} NODE_OPTIONS="$NODE_OPTIONS --experimental-vm-modules" jest` } else { diff --git a/.meta-updater/tsconfig.json b/.meta-updater/tsconfig.json index 906013c32f..7571216b43 100644 --- a/.meta-updater/tsconfig.json +++ b/.meta-updater/tsconfig.json @@ -23,10 +23,10 @@ "path": "../packages/types" }, { - "path": "../workspace/find-packages" + "path": "../workspace/projects-reader" }, { - "path": "../workspace/read-manifest" + "path": "../workspace/workspace-manifest-reader" } ] } diff --git a/__utils__/assert-project/package.json b/__utils__/assert-project/package.json index f0d03cdc21..92a19d3270 100644 --- a/__utils__/assert-project/package.json +++ b/__utils__/assert-project/package.json @@ -47,8 +47,8 @@ "dependencies": { "@pnpm/assert-store": "workspace:*", "@pnpm/constants": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/lockfile.types": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/types": "workspace:*", "is-windows": "catalog:", diff --git a/__utils__/assert-project/src/index.ts b/__utils__/assert-project/src/index.ts index 0179a4d695..cc49b3c939 100644 --- a/__utils__/assert-project/src/index.ts +++ b/__utils__/assert-project/src/index.ts @@ -5,8 +5,8 @@ import util from 'node:util' import { assertStore } from '@pnpm/assert-store' import { WANTED_LOCKFILE } from '@pnpm/constants' +import type { Modules } from '@pnpm/installing.modules-yaml' import type { LockfileFile } from '@pnpm/lockfile.types' -import type { Modules } from '@pnpm/modules-yaml' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import yaml from 'js-yaml' import { readYamlFileSync } from 'read-yaml-file' diff --git a/__utils__/scripts/package.json b/__utils__/scripts/package.json index 7b058d1e0a..ab6a09387f 100644 --- a/__utils__/scripts/package.json +++ b/__utils__/scripts/package.json @@ -4,8 +4,8 @@ "private": true, "type": "module", "dependencies": { - "@pnpm/workspace.find-packages": "catalog:", - "@pnpm/workspace.read-manifest": "catalog:", + "@pnpm/workspace.projects-reader": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "execa": "catalog:", "fast-glob": "catalog:", "make-empty-dir": "catalog:", diff --git a/__utils__/scripts/src/typecheck-only.ts b/__utils__/scripts/src/typecheck-only.ts index 6c8c9df4e4..80a0d85c1f 100644 --- a/__utils__/scripts/src/typecheck-only.ts +++ b/__utils__/scripts/src/typecheck-only.ts @@ -2,8 +2,8 @@ import assert from 'node:assert/strict' import fs from 'node:fs' import path from 'node:path' -import { findWorkspacePackages } from '@pnpm/workspace.find-packages' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { sync as execa } from 'execa' import glob from 'fast-glob' import normalizePath from 'normalize-path' diff --git a/__utils__/scripts/tsconfig.json b/__utils__/scripts/tsconfig.json index c6f0399f60..1dbcd83d0b 100644 --- a/__utils__/scripts/tsconfig.json +++ b/__utils__/scripts/tsconfig.json @@ -8,5 +8,12 @@ "src/**/*.ts", "../../__typings__/**/*.d.ts" ], - "references": [] + "references": [ + { + "path": "../../workspace/projects-reader" + }, + { + "path": "../../workspace/workspace-manifest-reader" + } + ] } diff --git a/bins/link-bins/CHANGELOG.md b/bins/linker/CHANGELOG.md similarity index 100% rename from bins/link-bins/CHANGELOG.md rename to bins/linker/CHANGELOG.md diff --git a/bins/link-bins/README.md b/bins/linker/README.md similarity index 100% rename from bins/link-bins/README.md rename to bins/linker/README.md diff --git a/bins/link-bins/package.json b/bins/linker/package.json similarity index 81% rename from bins/link-bins/package.json rename to bins/linker/package.json index aa3e7a38ef..8ce4f15321 100644 --- a/bins/link-bins/package.json +++ b/bins/linker/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/link-bins", + "name": "@pnpm/bins.linker", "version": "1000.2.6", "description": "Link bins to node_modules/.bin", "keywords": [ @@ -9,8 +9,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/bins/link-bins", - "homepage": "https://github.com/pnpm/pnpm/tree/main/bins/link-bins#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/bins/linker", + "homepage": "https://github.com/pnpm/pnpm/tree/main/bins/linker#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -33,14 +33,14 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/bins.resolver": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/manifest-utils": "workspace:*", - "@pnpm/package-bins": "workspace:*", - "@pnpm/read-modules-dir": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", + "@pnpm/fs.read-modules-dir": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.utils": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "@zkochan/cmd-shim": "catalog:", "@zkochan/rimraf": "catalog:", "bin-links": "catalog:", @@ -56,7 +56,7 @@ }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/link-bins": "workspace:*", + "@pnpm/bins.linker": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/is-windows": "catalog:", diff --git a/bins/link-bins/src/getBinNodePaths.ts b/bins/linker/src/getBinNodePaths.ts similarity index 100% rename from bins/link-bins/src/getBinNodePaths.ts rename to bins/linker/src/getBinNodePaths.ts diff --git a/bins/link-bins/src/index.ts b/bins/linker/src/index.ts similarity index 97% rename from bins/link-bins/src/index.ts rename to bins/linker/src/index.ts index dc80c83229..9a48948875 100644 --- a/bins/link-bins/src/index.ts +++ b/bins/linker/src/index.ts @@ -2,15 +2,15 @@ import { existsSync, promises as fs } from 'node:fs' import { createRequire } from 'node:module' import path from 'node:path' +import { type Command, getBinsFromPackageManifest } from '@pnpm/bins.resolver' import { getBunBinLocationForCurrentOS, getDenoBinLocationForCurrentOS, getNodeBinLocationForCurrentOS } from '@pnpm/constants' import { PnpmError } from '@pnpm/error' +import { readModulesDir } from '@pnpm/fs.read-modules-dir' import { globalWarn, logger } from '@pnpm/logger' -import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils' -import { type Command, getBinsFromPackageManifest } from '@pnpm/package-bins' -import { readModulesDir } from '@pnpm/read-modules-dir' -import { readPackageJsonFromDir } from '@pnpm/read-package-json' -import { safeReadProjectManifestOnly } from '@pnpm/read-project-manifest' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { getAllDependenciesFromManifest } from '@pnpm/pkg-manifest.utils' import type { DependencyManifest, EngineDependency, ProjectManifest } from '@pnpm/types' +import { safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' import cmdShim from '@zkochan/cmd-shim' import { rimraf } from '@zkochan/rimraf' import fixBin from 'bin-links/lib/fix-bin.js' diff --git a/bins/link-bins/test/.gitignore b/bins/linker/test/.gitignore similarity index 100% rename from bins/link-bins/test/.gitignore rename to bins/linker/test/.gitignore diff --git a/bins/link-bins/test/fixtures/bin-dir/pkg/bin/subdir/index.js b/bins/linker/test/fixtures/bin-dir/pkg/bin/subdir/index.js similarity index 100% rename from bins/link-bins/test/fixtures/bin-dir/pkg/bin/subdir/index.js rename to bins/linker/test/fixtures/bin-dir/pkg/bin/subdir/index.js diff --git a/bins/link-bins/test/fixtures/bin-dir/pkg/package.json b/bins/linker/test/fixtures/bin-dir/pkg/package.json similarity index 100% rename from bins/link-bins/test/fixtures/bin-dir/pkg/package.json rename to bins/linker/test/fixtures/bin-dir/pkg/package.json diff --git a/bins/link-bins/test/fixtures/bin-is-directory/.gitignore b/bins/linker/test/fixtures/bin-is-directory/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/bin-is-directory/.gitignore rename to bins/linker/test/fixtures/bin-is-directory/.gitignore diff --git a/bins/link-bins/test/fixtures/bin-is-directory/node_modules/invalid-bin/dist/readme.txt b/bins/linker/test/fixtures/bin-is-directory/node_modules/invalid-bin/dist/readme.txt similarity index 100% rename from bins/link-bins/test/fixtures/bin-is-directory/node_modules/invalid-bin/dist/readme.txt rename to bins/linker/test/fixtures/bin-is-directory/node_modules/invalid-bin/dist/readme.txt diff --git a/bins/link-bins/test/fixtures/bin-is-directory/node_modules/invalid-bin/package.json b/bins/linker/test/fixtures/bin-is-directory/node_modules/invalid-bin/package.json similarity index 100% rename from bins/link-bins/test/fixtures/bin-is-directory/node_modules/invalid-bin/package.json rename to bins/linker/test/fixtures/bin-is-directory/node_modules/invalid-bin/package.json diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/.gitignore b/bins/linker/test/fixtures/bin-name-conflicts-no-own-name/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/.gitignore rename to bins/linker/test/fixtures/bin-name-conflicts-no-own-name/.gitignore diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/node_modules/bar/index.js b/bins/linker/test/fixtures/bin-name-conflicts-no-own-name/node_modules/bar/index.js similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/node_modules/bar/index.js rename to bins/linker/test/fixtures/bin-name-conflicts-no-own-name/node_modules/bar/index.js diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/node_modules/bar/package.json b/bins/linker/test/fixtures/bin-name-conflicts-no-own-name/node_modules/bar/package.json similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/node_modules/bar/package.json rename to bins/linker/test/fixtures/bin-name-conflicts-no-own-name/node_modules/bar/package.json diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/node_modules/foo/index.js b/bins/linker/test/fixtures/bin-name-conflicts-no-own-name/node_modules/foo/index.js similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/node_modules/foo/index.js rename to bins/linker/test/fixtures/bin-name-conflicts-no-own-name/node_modules/foo/index.js diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/node_modules/foo/package.json b/bins/linker/test/fixtures/bin-name-conflicts-no-own-name/node_modules/foo/package.json similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts-no-own-name/node_modules/foo/package.json rename to bins/linker/test/fixtures/bin-name-conflicts-no-own-name/node_modules/foo/package.json diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts/.gitignore b/bins/linker/test/fixtures/bin-name-conflicts/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts/.gitignore rename to bins/linker/test/fixtures/bin-name-conflicts/.gitignore diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts/node_modules/bar/index.js b/bins/linker/test/fixtures/bin-name-conflicts/node_modules/bar/index.js similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts/node_modules/bar/index.js rename to bins/linker/test/fixtures/bin-name-conflicts/node_modules/bar/index.js diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts/node_modules/bar/package.json b/bins/linker/test/fixtures/bin-name-conflicts/node_modules/bar/package.json similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts/node_modules/bar/package.json rename to bins/linker/test/fixtures/bin-name-conflicts/node_modules/bar/package.json diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts/node_modules/foo/index.js b/bins/linker/test/fixtures/bin-name-conflicts/node_modules/foo/index.js similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts/node_modules/foo/index.js rename to bins/linker/test/fixtures/bin-name-conflicts/node_modules/foo/index.js diff --git a/bins/link-bins/test/fixtures/bin-name-conflicts/node_modules/foo/package.json b/bins/linker/test/fixtures/bin-name-conflicts/node_modules/foo/package.json similarity index 100% rename from bins/link-bins/test/fixtures/bin-name-conflicts/node_modules/foo/package.json rename to bins/linker/test/fixtures/bin-name-conflicts/node_modules/foo/package.json diff --git a/bins/link-bins/test/fixtures/bin-not-exist/.gitignore b/bins/linker/test/fixtures/bin-not-exist/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/bin-not-exist/.gitignore rename to bins/linker/test/fixtures/bin-not-exist/.gitignore diff --git a/bins/link-bins/test/fixtures/bin-not-exist/node_modules/foo/package.json b/bins/linker/test/fixtures/bin-not-exist/node_modules/foo/package.json similarity index 100% rename from bins/link-bins/test/fixtures/bin-not-exist/node_modules/foo/package.json rename to bins/linker/test/fixtures/bin-not-exist/node_modules/foo/package.json diff --git a/bins/link-bins/test/fixtures/bin-window-shebang/.gitignore b/bins/linker/test/fixtures/bin-window-shebang/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/bin-window-shebang/.gitignore rename to bins/linker/test/fixtures/bin-window-shebang/.gitignore diff --git a/bins/link-bins/test/fixtures/bin-window-shebang/node_modules/crlf/bin/crlf.js b/bins/linker/test/fixtures/bin-window-shebang/node_modules/crlf/bin/crlf.js similarity index 100% rename from bins/link-bins/test/fixtures/bin-window-shebang/node_modules/crlf/bin/crlf.js rename to bins/linker/test/fixtures/bin-window-shebang/node_modules/crlf/bin/crlf.js diff --git a/bins/link-bins/test/fixtures/bin-window-shebang/node_modules/crlf/bin/lf.js b/bins/linker/test/fixtures/bin-window-shebang/node_modules/crlf/bin/lf.js similarity index 100% rename from bins/link-bins/test/fixtures/bin-window-shebang/node_modules/crlf/bin/lf.js rename to bins/linker/test/fixtures/bin-window-shebang/node_modules/crlf/bin/lf.js diff --git a/bins/link-bins/test/fixtures/bin-window-shebang/node_modules/crlf/package.json b/bins/linker/test/fixtures/bin-window-shebang/node_modules/crlf/package.json similarity index 100% rename from bins/link-bins/test/fixtures/bin-window-shebang/node_modules/crlf/package.json rename to bins/linker/test/fixtures/bin-window-shebang/node_modules/crlf/package.json diff --git a/bins/link-bins/test/fixtures/different-versions/.gitignore b/bins/linker/test/fixtures/different-versions/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/different-versions/.gitignore rename to bins/linker/test/fixtures/different-versions/.gitignore diff --git a/bins/link-bins/test/fixtures/different-versions/node_modules/my-command-greater/index.js b/bins/linker/test/fixtures/different-versions/node_modules/my-command-greater/index.js similarity index 100% rename from bins/link-bins/test/fixtures/different-versions/node_modules/my-command-greater/index.js rename to bins/linker/test/fixtures/different-versions/node_modules/my-command-greater/index.js diff --git a/bins/link-bins/test/fixtures/different-versions/node_modules/my-command-greater/package.json b/bins/linker/test/fixtures/different-versions/node_modules/my-command-greater/package.json similarity index 100% rename from bins/link-bins/test/fixtures/different-versions/node_modules/my-command-greater/package.json rename to bins/linker/test/fixtures/different-versions/node_modules/my-command-greater/package.json diff --git a/bins/link-bins/test/fixtures/different-versions/node_modules/my-command-lesser/index.js b/bins/linker/test/fixtures/different-versions/node_modules/my-command-lesser/index.js similarity index 100% rename from bins/link-bins/test/fixtures/different-versions/node_modules/my-command-lesser/index.js rename to bins/linker/test/fixtures/different-versions/node_modules/my-command-lesser/index.js diff --git a/bins/link-bins/test/fixtures/different-versions/node_modules/my-command-lesser/package.json b/bins/linker/test/fixtures/different-versions/node_modules/my-command-lesser/package.json similarity index 100% rename from bins/link-bins/test/fixtures/different-versions/node_modules/my-command-lesser/package.json rename to bins/linker/test/fixtures/different-versions/node_modules/my-command-lesser/package.json diff --git a/bins/link-bins/test/fixtures/different-versions/node_modules/my-command-middle/index.js b/bins/linker/test/fixtures/different-versions/node_modules/my-command-middle/index.js similarity index 100% rename from bins/link-bins/test/fixtures/different-versions/node_modules/my-command-middle/index.js rename to bins/linker/test/fixtures/different-versions/node_modules/my-command-middle/index.js diff --git a/bins/link-bins/test/fixtures/different-versions/node_modules/my-command-middle/package.json b/bins/linker/test/fixtures/different-versions/node_modules/my-command-middle/package.json similarity index 100% rename from bins/link-bins/test/fixtures/different-versions/node_modules/my-command-middle/package.json rename to bins/linker/test/fixtures/different-versions/node_modules/my-command-middle/package.json diff --git a/bins/link-bins/test/fixtures/dir-with-no-manifest/.gitignore b/bins/linker/test/fixtures/dir-with-no-manifest/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/dir-with-no-manifest/.gitignore rename to bins/linker/test/fixtures/dir-with-no-manifest/.gitignore diff --git a/bins/link-bins/test/fixtures/dir-with-no-manifest/node_modules/dir-with-no-manifest/.gitkeep b/bins/linker/test/fixtures/dir-with-no-manifest/node_modules/dir-with-no-manifest/.gitkeep similarity index 100% rename from bins/link-bins/test/fixtures/dir-with-no-manifest/node_modules/dir-with-no-manifest/.gitkeep rename to bins/linker/test/fixtures/dir-with-no-manifest/node_modules/dir-with-no-manifest/.gitkeep diff --git a/bins/link-bins/test/fixtures/exotic-manifest/.gitignore b/bins/linker/test/fixtures/exotic-manifest/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/exotic-manifest/.gitignore rename to bins/linker/test/fixtures/exotic-manifest/.gitignore diff --git a/bins/link-bins/test/fixtures/exotic-manifest/node_modules/simple/index.js b/bins/linker/test/fixtures/exotic-manifest/node_modules/simple/index.js similarity index 100% rename from bins/link-bins/test/fixtures/exotic-manifest/node_modules/simple/index.js rename to bins/linker/test/fixtures/exotic-manifest/node_modules/simple/index.js diff --git a/bins/link-bins/test/fixtures/exotic-manifest/node_modules/simple/package.yaml b/bins/linker/test/fixtures/exotic-manifest/node_modules/simple/package.yaml similarity index 100% rename from bins/link-bins/test/fixtures/exotic-manifest/node_modules/simple/package.yaml rename to bins/linker/test/fixtures/exotic-manifest/node_modules/simple/package.yaml diff --git a/bins/link-bins/test/fixtures/foobar/.gitignore b/bins/linker/test/fixtures/foobar/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/foobar/.gitignore rename to bins/linker/test/fixtures/foobar/.gitignore diff --git a/bins/link-bins/test/fixtures/foobar/node_modules/bar/index.js b/bins/linker/test/fixtures/foobar/node_modules/bar/index.js similarity index 100% rename from bins/link-bins/test/fixtures/foobar/node_modules/bar/index.js rename to bins/linker/test/fixtures/foobar/node_modules/bar/index.js diff --git a/bins/link-bins/test/fixtures/foobar/node_modules/bar/package.json b/bins/linker/test/fixtures/foobar/node_modules/bar/package.json similarity index 100% rename from bins/link-bins/test/fixtures/foobar/node_modules/bar/package.json rename to bins/linker/test/fixtures/foobar/node_modules/bar/package.json diff --git a/bins/link-bins/test/fixtures/foobar/node_modules/foo/index.js b/bins/linker/test/fixtures/foobar/node_modules/foo/index.js similarity index 100% rename from bins/link-bins/test/fixtures/foobar/node_modules/foo/index.js rename to bins/linker/test/fixtures/foobar/node_modules/foo/index.js diff --git a/bins/link-bins/test/fixtures/foobar/node_modules/foo/package.json b/bins/linker/test/fixtures/foobar/node_modules/foo/package.json similarity index 100% rename from bins/link-bins/test/fixtures/foobar/node_modules/foo/package.json rename to bins/linker/test/fixtures/foobar/node_modules/foo/package.json diff --git a/bins/link-bins/test/fixtures/matching-alias-vs-matching-name/.gitignore b/bins/linker/test/fixtures/matching-alias-vs-matching-name/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/matching-alias-vs-matching-name/.gitignore rename to bins/linker/test/fixtures/matching-alias-vs-matching-name/.gitignore diff --git a/bins/link-bins/test/fixtures/matching-alias-vs-matching-name/node_modules/my-command/index.js b/bins/linker/test/fixtures/matching-alias-vs-matching-name/node_modules/my-command/index.js similarity index 100% rename from bins/link-bins/test/fixtures/matching-alias-vs-matching-name/node_modules/my-command/index.js rename to bins/linker/test/fixtures/matching-alias-vs-matching-name/node_modules/my-command/index.js diff --git a/bins/link-bins/test/fixtures/matching-alias-vs-matching-name/node_modules/my-command/package.json b/bins/linker/test/fixtures/matching-alias-vs-matching-name/node_modules/my-command/package.json similarity index 100% rename from bins/link-bins/test/fixtures/matching-alias-vs-matching-name/node_modules/my-command/package.json rename to bins/linker/test/fixtures/matching-alias-vs-matching-name/node_modules/my-command/package.json diff --git a/bins/link-bins/test/fixtures/matching-alias-vs-matching-name/node_modules/original-my-command/index.js b/bins/linker/test/fixtures/matching-alias-vs-matching-name/node_modules/original-my-command/index.js similarity index 100% rename from bins/link-bins/test/fixtures/matching-alias-vs-matching-name/node_modules/original-my-command/index.js rename to bins/linker/test/fixtures/matching-alias-vs-matching-name/node_modules/original-my-command/index.js diff --git a/bins/link-bins/test/fixtures/matching-alias-vs-matching-name/node_modules/original-my-command/package.json b/bins/linker/test/fixtures/matching-alias-vs-matching-name/node_modules/original-my-command/package.json similarity index 100% rename from bins/link-bins/test/fixtures/matching-alias-vs-matching-name/node_modules/original-my-command/package.json rename to bins/linker/test/fixtures/matching-alias-vs-matching-name/node_modules/original-my-command/package.json diff --git a/bins/link-bins/test/fixtures/no-bin/.gitignore b/bins/linker/test/fixtures/no-bin/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/no-bin/.gitignore rename to bins/linker/test/fixtures/no-bin/.gitignore diff --git a/bins/link-bins/test/fixtures/no-bin/node_modules/simple/index.js b/bins/linker/test/fixtures/no-bin/node_modules/simple/index.js similarity index 100% rename from bins/link-bins/test/fixtures/no-bin/node_modules/simple/index.js rename to bins/linker/test/fixtures/no-bin/node_modules/simple/index.js diff --git a/bins/link-bins/test/fixtures/no-bin/node_modules/simple/package.json b/bins/linker/test/fixtures/no-bin/node_modules/simple/package.json similarity index 100% rename from bins/link-bins/test/fixtures/no-bin/node_modules/simple/package.json rename to bins/linker/test/fixtures/no-bin/node_modules/simple/package.json diff --git a/bins/link-bins/test/fixtures/no-bin/packages/simple/index.js b/bins/linker/test/fixtures/no-bin/packages/simple/index.js similarity index 100% rename from bins/link-bins/test/fixtures/no-bin/packages/simple/index.js rename to bins/linker/test/fixtures/no-bin/packages/simple/index.js diff --git a/bins/link-bins/test/fixtures/no-bin/packages/simple/package.json b/bins/linker/test/fixtures/no-bin/packages/simple/package.json similarity index 100% rename from bins/link-bins/test/fixtures/no-bin/packages/simple/package.json rename to bins/linker/test/fixtures/no-bin/packages/simple/package.json diff --git a/bins/link-bins/test/fixtures/no-bin/pnpm-workspace.yaml b/bins/linker/test/fixtures/no-bin/pnpm-workspace.yaml similarity index 100% rename from bins/link-bins/test/fixtures/no-bin/pnpm-workspace.yaml rename to bins/linker/test/fixtures/no-bin/pnpm-workspace.yaml diff --git a/bins/link-bins/test/fixtures/no-name/.gitignore b/bins/linker/test/fixtures/no-name/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/no-name/.gitignore rename to bins/linker/test/fixtures/no-name/.gitignore diff --git a/bins/link-bins/test/fixtures/no-name/node_modules/simple/index.js b/bins/linker/test/fixtures/no-name/node_modules/simple/index.js similarity index 100% rename from bins/link-bins/test/fixtures/no-name/node_modules/simple/index.js rename to bins/linker/test/fixtures/no-name/node_modules/simple/index.js diff --git a/bins/link-bins/test/fixtures/no-name/node_modules/simple/package.json b/bins/linker/test/fixtures/no-name/node_modules/simple/package.json similarity index 100% rename from bins/link-bins/test/fixtures/no-name/node_modules/simple/package.json rename to bins/linker/test/fixtures/no-name/node_modules/simple/package.json diff --git a/bins/link-bins/test/fixtures/pnpm-cli/.gitignore b/bins/linker/test/fixtures/pnpm-cli/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/pnpm-cli/.gitignore rename to bins/linker/test/fixtures/pnpm-cli/.gitignore diff --git a/bins/link-bins/test/fixtures/pnpm-cli/node_modules/pnpm/index.js b/bins/linker/test/fixtures/pnpm-cli/node_modules/pnpm/index.js similarity index 100% rename from bins/link-bins/test/fixtures/pnpm-cli/node_modules/pnpm/index.js rename to bins/linker/test/fixtures/pnpm-cli/node_modules/pnpm/index.js diff --git a/bins/link-bins/test/fixtures/pnpm-cli/node_modules/pnpm/package.json b/bins/linker/test/fixtures/pnpm-cli/node_modules/pnpm/package.json similarity index 100% rename from bins/link-bins/test/fixtures/pnpm-cli/node_modules/pnpm/package.json rename to bins/linker/test/fixtures/pnpm-cli/node_modules/pnpm/package.json diff --git a/bins/link-bins/test/fixtures/simple-fixture/.gitignore b/bins/linker/test/fixtures/simple-fixture/.gitignore similarity index 100% rename from bins/link-bins/test/fixtures/simple-fixture/.gitignore rename to bins/linker/test/fixtures/simple-fixture/.gitignore diff --git a/bins/link-bins/test/fixtures/simple-fixture/node_modules/simple/index.js b/bins/linker/test/fixtures/simple-fixture/node_modules/simple/index.js similarity index 100% rename from bins/link-bins/test/fixtures/simple-fixture/node_modules/simple/index.js rename to bins/linker/test/fixtures/simple-fixture/node_modules/simple/index.js diff --git a/bins/link-bins/test/fixtures/simple-fixture/node_modules/simple/package.json b/bins/linker/test/fixtures/simple-fixture/node_modules/simple/package.json similarity index 100% rename from bins/link-bins/test/fixtures/simple-fixture/node_modules/simple/package.json rename to bins/linker/test/fixtures/simple-fixture/node_modules/simple/package.json diff --git a/bins/link-bins/test/getBinNodePaths.ts b/bins/linker/test/getBinNodePaths.ts similarity index 100% rename from bins/link-bins/test/getBinNodePaths.ts rename to bins/linker/test/getBinNodePaths.ts diff --git a/bins/link-bins/test/index.ts b/bins/linker/test/index.ts similarity index 99% rename from bins/link-bins/test/index.ts rename to bins/linker/test/index.ts index aefd626a2d..6b1367eef9 100644 --- a/bins/link-bins/test/index.ts +++ b/bins/linker/test/index.ts @@ -25,7 +25,7 @@ const { linkBins, linkBinsOfPackages, linkBinsOfPkgsByAliases, -} = await import('@pnpm/link-bins') +} = await import('@pnpm/bins.linker') const binsConflictLogger = logger('bins-conflict') // The fixture directories are copied to before the tests run diff --git a/bins/link-bins/test/tsconfig.json b/bins/linker/test/tsconfig.json similarity index 100% rename from bins/link-bins/test/tsconfig.json rename to bins/linker/test/tsconfig.json diff --git a/bins/link-bins/tsconfig.json b/bins/linker/tsconfig.json similarity index 81% rename from bins/link-bins/tsconfig.json rename to bins/linker/tsconfig.json index 59aad15df2..d777e8ff13 100644 --- a/bins/link-bins/tsconfig.json +++ b/bins/linker/tsconfig.json @@ -27,17 +27,17 @@ { "path": "../../packages/types" }, - { - "path": "../../pkg-manifest/manifest-utils" - }, { "path": "../../pkg-manifest/read-package-json" }, { - "path": "../../pkg-manifest/read-project-manifest" + "path": "../../pkg-manifest/utils" }, { - "path": "../package-bins" + "path": "../../workspace/project-manifest-reader" + }, + { + "path": "../resolver" } ] } diff --git a/bins/link-bins/tsconfig.lint.json b/bins/linker/tsconfig.lint.json similarity index 100% rename from bins/link-bins/tsconfig.lint.json rename to bins/linker/tsconfig.lint.json diff --git a/bins/remove-bins/CHANGELOG.md b/bins/remover/CHANGELOG.md similarity index 100% rename from bins/remove-bins/CHANGELOG.md rename to bins/remover/CHANGELOG.md diff --git a/bins/remove-bins/README.md b/bins/remover/README.md similarity index 100% rename from bins/remove-bins/README.md rename to bins/remover/README.md diff --git a/bins/remove-bins/package.json b/bins/remover/package.json similarity index 86% rename from bins/remove-bins/package.json rename to bins/remover/package.json index bb3aaa7894..63c601cc66 100644 --- a/bins/remove-bins/package.json +++ b/bins/remover/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/remove-bins", + "name": "@pnpm/bins.remover", "version": "1000.0.15", "description": "Remove bins from .bin", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/bins/remove-bins", - "homepage": "https://github.com/pnpm/pnpm/tree/main/bins/remove-bins#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/bins/remover", + "homepage": "https://github.com/pnpm/pnpm/tree/main/bins/remover#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -31,9 +31,9 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/bins.resolver": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/package-bins": "workspace:*", - "@pnpm/read-package-json": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "catalog:", "cmd-extension": "catalog:", @@ -43,8 +43,8 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { + "@pnpm/bins.remover": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/remove-bins": "workspace:*", "@types/is-windows": "catalog:", "@types/ramda": "catalog:" }, diff --git a/bins/remove-bins/src/index.ts b/bins/remover/src/index.ts similarity index 100% rename from bins/remove-bins/src/index.ts rename to bins/remover/src/index.ts diff --git a/bins/remove-bins/src/removeBins.ts b/bins/remover/src/removeBins.ts similarity index 89% rename from bins/remove-bins/src/removeBins.ts rename to bins/remover/src/removeBins.ts index 3e57321eec..d25b053aae 100644 --- a/bins/remove-bins/src/removeBins.ts +++ b/bins/remover/src/removeBins.ts @@ -1,10 +1,10 @@ import path from 'node:path' +import { getBinsFromPackageManifest } from '@pnpm/bins.resolver' import { removalLogger, } from '@pnpm/core-loggers' -import { getBinsFromPackageManifest } from '@pnpm/package-bins' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import type { DependencyManifest } from '@pnpm/types' import { rimraf } from '@zkochan/rimraf' import { cmdExtension as CMD_EXTENSION } from 'cmd-extension' diff --git a/bins/remove-bins/tsconfig.json b/bins/remover/tsconfig.json similarity index 93% rename from bins/remove-bins/tsconfig.json rename to bins/remover/tsconfig.json index 9c9ed75f0f..431850c676 100644 --- a/bins/remove-bins/tsconfig.json +++ b/bins/remover/tsconfig.json @@ -22,7 +22,7 @@ "path": "../../pkg-manifest/read-package-json" }, { - "path": "../package-bins" + "path": "../resolver" } ] } diff --git a/bins/package-bins/tsconfig.lint.json b/bins/remover/tsconfig.lint.json similarity index 100% rename from bins/package-bins/tsconfig.lint.json rename to bins/remover/tsconfig.lint.json diff --git a/bins/package-bins/CHANGELOG.md b/bins/resolver/CHANGELOG.md similarity index 100% rename from bins/package-bins/CHANGELOG.md rename to bins/resolver/CHANGELOG.md diff --git a/bins/package-bins/README.md b/bins/resolver/README.md similarity index 100% rename from bins/package-bins/README.md rename to bins/resolver/README.md diff --git a/bins/package-bins/package.json b/bins/resolver/package.json similarity index 82% rename from bins/package-bins/package.json rename to bins/resolver/package.json index f95206428b..38210984ae 100644 --- a/bins/package-bins/package.json +++ b/bins/resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/package-bins", + "name": "@pnpm/bins.resolver", "version": "1000.0.11", "description": "Returns bins of a package", "keywords": [ @@ -9,8 +9,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/bins/package-bins", - "homepage": "https://github.com/pnpm/pnpm/tree/main/bins/package-bins#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/bins/resolver", + "homepage": "https://github.com/pnpm/pnpm/tree/main/bins/resolver#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -38,7 +38,7 @@ "tinyglobby": "catalog:" }, "devDependencies": { - "@pnpm/package-bins": "workspace:*", + "@pnpm/bins.resolver": "workspace:*", "@types/node": "catalog:", "tempy": "catalog:" }, diff --git a/bins/package-bins/src/index.ts b/bins/resolver/src/index.ts similarity index 100% rename from bins/package-bins/src/index.ts rename to bins/resolver/src/index.ts diff --git a/bins/package-bins/test/fixtures/bin-dir/rootBin.js b/bins/resolver/test/fixtures/bin-dir/rootBin.js similarity index 100% rename from bins/package-bins/test/fixtures/bin-dir/rootBin.js rename to bins/resolver/test/fixtures/bin-dir/rootBin.js diff --git a/bins/package-bins/test/fixtures/bin-dir/subdir/subBin.js b/bins/resolver/test/fixtures/bin-dir/subdir/subBin.js similarity index 100% rename from bins/package-bins/test/fixtures/bin-dir/subdir/subBin.js rename to bins/resolver/test/fixtures/bin-dir/subdir/subBin.js diff --git a/bins/package-bins/test/index.ts b/bins/resolver/test/index.ts similarity index 98% rename from bins/package-bins/test/index.ts rename to bins/resolver/test/index.ts index ac7aafb264..9cfebbb9df 100644 --- a/bins/package-bins/test/index.ts +++ b/bins/resolver/test/index.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { getBinsFromPackageManifest } from '@pnpm/package-bins' +import { getBinsFromPackageManifest } from '@pnpm/bins.resolver' test('getBinsFromPackageManifest()', async () => { expect( diff --git a/bins/package-bins/test/path-traversal.test.ts b/bins/resolver/test/path-traversal.test.ts similarity index 93% rename from bins/package-bins/test/path-traversal.test.ts rename to bins/resolver/test/path-traversal.test.ts index afca4aaf9f..48fd99e1fe 100644 --- a/bins/package-bins/test/path-traversal.test.ts +++ b/bins/resolver/test/path-traversal.test.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' -import { getBinsFromPackageManifest } from '@pnpm/package-bins' +import { getBinsFromPackageManifest } from '@pnpm/bins.resolver' import { temporaryDirectory } from 'tempy' test('skip directories.bin with real path traversal', async () => { diff --git a/bins/package-bins/test/tsconfig.json b/bins/resolver/test/tsconfig.json similarity index 100% rename from bins/package-bins/test/tsconfig.json rename to bins/resolver/test/tsconfig.json diff --git a/bins/package-bins/tsconfig.json b/bins/resolver/tsconfig.json similarity index 100% rename from bins/package-bins/tsconfig.json rename to bins/resolver/tsconfig.json diff --git a/bins/remove-bins/tsconfig.lint.json b/bins/resolver/tsconfig.lint.json similarity index 100% rename from bins/remove-bins/tsconfig.lint.json rename to bins/resolver/tsconfig.lint.json diff --git a/building/after-install/package.json b/building/after-install/package.json index 10d1495b61..d5e8e569ce 100644 --- a/building/after-install/package.json +++ b/building/after-install/package.json @@ -31,28 +31,28 @@ "test": "pnpm run compile" }, "dependencies": { + "@pnpm/bins.linker": "workspace:*", "@pnpm/building.pkg-requires-build": "workspace:*", "@pnpm/building.policy": "workspace:*", - "@pnpm/calc-dep-state": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/config.normalize-registries": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.graph-hasher": "workspace:*", "@pnpm/deps.graph-sequencer": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/get-context": "workspace:*", - "@pnpm/lifecycle": "workspace:*", - "@pnpm/link-bins": "workspace:*", + "@pnpm/exec.lifecycle": "workspace:*", + "@pnpm/installing.context": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.walker": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/normalize-registries": "workspace:*", "@pnpm/npm-package-arg": "catalog:", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/store.cafs": "workspace:*", + "@pnpm/store.connection-manager": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/types": "workspace:*", "load-json-file": "catalog:", diff --git a/building/after-install/src/extendBuildOptions.ts b/building/after-install/src/extendBuildOptions.ts index 71c3c96261..7dd69997d8 100644 --- a/building/after-install/src/extendBuildOptions.ts +++ b/building/after-install/src/extendBuildOptions.ts @@ -1,9 +1,9 @@ import path from 'node:path' -import { type Config, getOptionsFromRootManifest } from '@pnpm/config' +import { DEFAULT_REGISTRIES, normalizeRegistries } from '@pnpm/config.normalize-registries' +import { type Config, getOptionsFromRootManifest } from '@pnpm/config.reader' import type { LogBase } from '@pnpm/logger' -import { DEFAULT_REGISTRIES, normalizeRegistries } from '@pnpm/normalize-registries' -import type { StoreController } from '@pnpm/store-controller-types' +import type { StoreController } from '@pnpm/store.controller-types' import type { Registries } from '@pnpm/types' import { loadJsonFile } from 'load-json-file' diff --git a/building/after-install/src/index.ts b/building/after-install/src/index.ts index 22bf59bb14..db4f2dc9c2 100644 --- a/building/after-install/src/index.ts +++ b/building/after-install/src/index.ts @@ -2,23 +2,24 @@ import assert from 'node:assert' import path from 'node:path' import util from 'node:util' +import { linkBins } from '@pnpm/bins.linker' import { pkgRequiresBuild } from '@pnpm/building.pkg-requires-build' import { createAllowBuildFunction } from '@pnpm/building.policy' -import { calcDepState, type DepsStateCache, lockfileToDepGraph } from '@pnpm/calc-dep-state' import { LAYOUT_VERSION, WANTED_LOCKFILE, } from '@pnpm/constants' import { skippedOptionalDependencyLogger } from '@pnpm/core-loggers' -import * as dp from '@pnpm/dependency-path' +import { calcDepState, type DepsStateCache, lockfileToDepGraph } from '@pnpm/deps.graph-hasher' import { graphSequencer } from '@pnpm/deps.graph-sequencer' +import * as dp from '@pnpm/deps.path' import { PnpmError } from '@pnpm/error' -import { getContext, type PnpmContext } from '@pnpm/get-context' import { runLifecycleHooksConcurrently, runPostinstallHooks, -} from '@pnpm/lifecycle' -import { linkBins } from '@pnpm/link-bins' +} from '@pnpm/exec.lifecycle' +import { getContext, type PnpmContext } from '@pnpm/installing.context' +import { writeModulesManifest } from '@pnpm/installing.modules-yaml' import type { TarballResolution } from '@pnpm/lockfile.types' import { type LockfileObject, @@ -28,12 +29,11 @@ import { } from '@pnpm/lockfile.utils' import { lockfileWalker, type LockfileWalkerStep } from '@pnpm/lockfile.walker' import { logger, streamParser } from '@pnpm/logger' -import { writeModulesManifest } from '@pnpm/modules-yaml' import npa from '@pnpm/npm-package-arg' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import type { PackageFilesIndex } from '@pnpm/store.cafs' +import { createStoreController } from '@pnpm/store.connection-manager' import { StoreIndex, storeIndexKey } from '@pnpm/store.index' -import { createStoreController } from '@pnpm/store-connection-manager' import type { DepPath, IgnoredBuilds, @@ -77,7 +77,7 @@ function findPackages ( }) } -// TODO: move this logic to separate package as this is also used in dependencies-hierarchy +// TODO: move this logic to separate package as this is also used in tree-builder function matches ( searched: PackageSelector[], manifest: { name: string, version?: string } diff --git a/building/after-install/tsconfig.json b/building/after-install/tsconfig.json index 0cc30ce270..759ea4957f 100644 --- a/building/after-install/tsconfig.json +++ b/building/after-install/tsconfig.json @@ -10,28 +10,28 @@ ], "references": [ { - "path": "../../bins/link-bins" - }, - { - "path": "../../config/config" + "path": "../../bins/linker" }, { "path": "../../config/normalize-registries" }, { - "path": "../../deps/calc-dep-state" + "path": "../../config/reader" }, { - "path": "../../deps/dependency-path" + "path": "../../deps/graph-hasher" }, { "path": "../../deps/graph-sequencer" }, + { + "path": "../../deps/path" + }, { "path": "../../exec/lifecycle" }, { - "path": "../../installing/get-context" + "path": "../../installing/context" }, { "path": "../../installing/modules-yaml" @@ -63,15 +63,15 @@ { "path": "../../store/cafs" }, + { + "path": "../../store/connection-manager" + }, + { + "path": "../../store/controller-types" + }, { "path": "../../store/index" }, - { - "path": "../../store/store-connection-manager" - }, - { - "path": "../../store/store-controller-types" - }, { "path": "../../worker" }, diff --git a/building/commands/package.json b/building/commands/package.json index ed12bafdb5..c07e51ee7b 100644 --- a/building/commands/package.json +++ b/building/commands/package.json @@ -33,18 +33,18 @@ }, "dependencies": { "@pnpm/building.after-install": "workspace:*", - "@pnpm/cli-utils": "workspace:*", - "@pnpm/common-cli-options-help": "workspace:*", - "@pnpm/config": "workspace:*", - "@pnpm/config.config-writer": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/cli.common-cli-options-help": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.reader": "workspace:*", + "@pnpm/config.writer": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/prepare-temp-dir": "workspace:*", - "@pnpm/sort-packages": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*", + "@pnpm/store.connection-manager": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", + "@pnpm/workspace.sort-packages": "workspace:*", "chalk": "catalog:", "enquirer": "catalog:", "p-limit": "catalog:", @@ -67,7 +67,7 @@ "@pnpm/store.index": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@pnpm/test-ipc-server": "workspace:*", - "@pnpm/workspace.filter-packages-from-dir": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", "@types/ramda": "catalog:", "execa": "catalog:", "load-json-file": "catalog:", diff --git a/building/commands/src/build/rebuild.ts b/building/commands/src/build/rebuild.ts index 89ca45436c..ab19233e76 100644 --- a/building/commands/src/build/rebuild.ts +++ b/building/commands/src/build/rebuild.ts @@ -2,14 +2,14 @@ import { buildProjects, buildSelectedPkgs, } from '@pnpm/building.after-install' -import { docsUrl, readProjectManifestOnly } from '@pnpm/cli-utils' -import { FILTERING, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, types as allTypes } from '@pnpm/config' +import { FILTERING, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl, readProjectManifestOnly } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' import type { LogBase } from '@pnpm/logger' import { createStoreController, type CreateStoreControllerOptions, -} from '@pnpm/store-connection-manager' +} from '@pnpm/store.connection-manager' import type { ProjectRootDir } from '@pnpm/types' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/building/commands/src/build/recursive.ts b/building/commands/src/build/recursive.ts index 9b4fdcfb81..84e6adf9d6 100755 --- a/building/commands/src/build/recursive.ts +++ b/building/commands/src/build/recursive.ts @@ -5,16 +5,16 @@ import { type BuildOptions, buildProjects as rebuildAll, buildSelectedPkgs } fro import { type RecursiveSummary, throwOnCommandFail, -} from '@pnpm/cli-utils' +} from '@pnpm/cli.utils' import { type Config, createProjectConfigRecord, getWorkspaceConcurrency, -} from '@pnpm/config' +} from '@pnpm/config.reader' import { logger } from '@pnpm/logger' -import { sortPackages } from '@pnpm/sort-packages' -import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import type { Project, ProjectManifest, ProjectRootDir } from '@pnpm/types' +import { sortPackages } from '@pnpm/workspace.sort-packages' import pLimit from 'p-limit' type RecursiveRebuildOpts = CreateStoreControllerOptions & Pick { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa('node', [ pnpmBin, 'install', @@ -105,7 +105,7 @@ test('pnpm recursive rebuild with hoisted node linker', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) writeYamlFileSync('pnpm-workspace.yaml', { packages: ['*'] }) await execa('node', [ pnpmBin, @@ -199,7 +199,7 @@ test('rebuild multiple packages in correct order', async () => { preparePackages(pkgs) writeYamlFileSync('pnpm-workspace.yaml', { packages: pkgs.map(pkg => pkg.name) }) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa('node', [ pnpmBin, 'install', @@ -248,7 +248,7 @@ test('only build allowBuilds (not others)', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir( + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir( process.cwd(), [] ) @@ -343,7 +343,7 @@ test('only build allowBuilds', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir( + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir( process.cwd(), [] ) diff --git a/building/commands/test/policy/approveBuilds.test.ts b/building/commands/test/policy/approveBuilds.test.ts index 2c1904e6db..840487a6ad 100644 --- a/building/commands/test/policy/approveBuilds.test.ts +++ b/building/commands/test/policy/approveBuilds.test.ts @@ -3,8 +3,8 @@ import path from 'node:path' import { jest } from '@jest/globals' import type { ApproveBuildsCommandOpts, RebuildCommandOpts } from '@pnpm/building.commands' -import { getConfig } from '@pnpm/config' -import { readModulesManifest } from '@pnpm/modules-yaml' +import { getConfig } from '@pnpm/config.reader' +import { readModulesManifest } from '@pnpm/installing.modules-yaml' import { prepare } from '@pnpm/prepare' import { tempDir } from '@pnpm/prepare-temp-dir' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' diff --git a/building/commands/test/policy/ignoredBuilds.test.ts b/building/commands/test/policy/ignoredBuilds.test.ts index 35a5230142..29946d811e 100644 --- a/building/commands/test/policy/ignoredBuilds.test.ts +++ b/building/commands/test/policy/ignoredBuilds.test.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import { ignoredBuilds } from '@pnpm/building.commands' -import { writeModulesManifest } from '@pnpm/modules-yaml' +import { writeModulesManifest } from '@pnpm/installing.modules-yaml' import { tempDir } from '@pnpm/prepare-temp-dir' import type { DepPath } from '@pnpm/types' diff --git a/building/commands/tsconfig.json b/building/commands/tsconfig.json index 279e0839b6..addf783faf 100644 --- a/building/commands/tsconfig.json +++ b/building/commands/tsconfig.json @@ -24,23 +24,23 @@ { "path": "../../__utils__/test-ipc-server" }, - { - "path": "../../cli/cli-utils" - }, { "path": "../../cli/common-cli-options-help" }, { - "path": "../../config/config" + "path": "../../cli/utils" }, { - "path": "../../config/config-writer" + "path": "../../config/reader" + }, + { + "path": "../../config/writer" }, { "path": "../../crypto/object-hasher" }, { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../installing/modules-yaml" @@ -60,14 +60,14 @@ { "path": "../../store/cafs" }, + { + "path": "../../store/connection-manager" + }, { "path": "../../store/index" }, { - "path": "../../store/store-connection-manager" - }, - { - "path": "../../workspace/filter-packages-from-dir" + "path": "../../workspace/projects-filter" }, { "path": "../../workspace/sort-packages" diff --git a/building/during-install/package.json b/building/during-install/package.json index 5fb2155643..01bbac6bc9 100644 --- a/building/during-install/package.json +++ b/building/during-install/package.json @@ -33,19 +33,19 @@ "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest" }, "dependencies": { - "@pnpm/calc-dep-state": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/bins.linker": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.graph-hasher": "workspace:*", "@pnpm/deps.graph-sequencer": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", + "@pnpm/exec.lifecycle": "workspace:*", "@pnpm/fs.hard-link-dir": "workspace:*", - "@pnpm/lifecycle": "workspace:*", - "@pnpm/link-bins": "workspace:*", "@pnpm/patching.apply-patch": "workspace:*", "@pnpm/patching.types": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "p-defer": "catalog:", "ramda": "catalog:", diff --git a/building/during-install/src/buildSequence.ts b/building/during-install/src/buildSequence.ts index 8f9b75b82f..1ed1666ae7 100644 --- a/building/during-install/src/buildSequence.ts +++ b/building/during-install/src/buildSequence.ts @@ -1,6 +1,6 @@ import { graphSequencer } from '@pnpm/deps.graph-sequencer' import type { PatchInfo } from '@pnpm/patching.types' -import type { PkgRequestFetchResult } from '@pnpm/store-controller-types' +import type { PkgRequestFetchResult } from '@pnpm/store.controller-types' import type { DepPath, PkgIdWithPatchHash } from '@pnpm/types' import { filter } from 'ramda' diff --git a/building/during-install/src/index.ts b/building/during-install/src/index.ts index 4214fa951c..8c54d8bf49 100644 --- a/building/during-install/src/index.ts +++ b/building/during-install/src/index.ts @@ -3,16 +3,16 @@ import fs from 'node:fs/promises' import path from 'node:path' import util from 'node:util' -import { calcDepState, type DepsStateCache } from '@pnpm/calc-dep-state' -import { getWorkspaceConcurrency } from '@pnpm/config' +import { linkBins, linkBinsOfPackages } from '@pnpm/bins.linker' +import { getWorkspaceConcurrency } from '@pnpm/config.reader' import { skippedOptionalDependencyLogger } from '@pnpm/core-loggers' +import { calcDepState, type DepsStateCache } from '@pnpm/deps.graph-hasher' import { PnpmError } from '@pnpm/error' -import { runPostinstallHooks } from '@pnpm/lifecycle' -import { linkBins, linkBinsOfPackages } from '@pnpm/link-bins' +import { runPostinstallHooks } from '@pnpm/exec.lifecycle' import { logger } from '@pnpm/logger' import { applyPatchToDir } from '@pnpm/patching.apply-patch' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' -import type { StoreController } from '@pnpm/store-controller-types' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import type { StoreController } from '@pnpm/store.controller-types' import type { AllowBuild, DependencyManifest, @@ -277,7 +277,7 @@ export async function linkBinsOfDependencies ( .map(([alias, childDepPath]) => ({ alias, dep: depGraph[childDepPath] })) .filter(({ alias, dep }) => { if (!dep) { - // TODO: Try to reproduce this issue with a test in @pnpm/core + // TODO: Try to reproduce this issue with a test in @pnpm/installing.deps-installer logger.debug({ message: `Failed to link bins of "${alias}" to "${binPath}". This is probably not an issue.` }) return false } diff --git a/building/during-install/tsconfig.json b/building/during-install/tsconfig.json index 62286e9fad..b8d8679a88 100644 --- a/building/during-install/tsconfig.json +++ b/building/during-install/tsconfig.json @@ -10,20 +10,20 @@ ], "references": [ { - "path": "../../bins/link-bins" + "path": "../../bins/linker" }, { - "path": "../../config/config" + "path": "../../config/reader" }, { - "path": "../../deps/calc-dep-state" - }, - { - "path": "../../deps/dependency-path" + "path": "../../deps/graph-hasher" }, { "path": "../../deps/graph-sequencer" }, + { + "path": "../../deps/path" + }, { "path": "../../exec/lifecycle" }, @@ -52,7 +52,7 @@ "path": "../../pkg-manifest/read-package-json" }, { - "path": "../../store/store-controller-types" + "path": "../../store/controller-types" }, { "path": "../../worker" diff --git a/cache/api/package.json b/cache/api/package.json index ad65d6a553..5ef85360ff 100644 --- a/cache/api/package.json +++ b/cache/api/package.json @@ -31,9 +31,9 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/config": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/constants": "workspace:*", - "@pnpm/npm-resolver": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", "@pnpm/store.cafs": "workspace:*", "@pnpm/store.index": "workspace:*", "encode-registry": "catalog:", diff --git a/cache/api/src/cacheView.ts b/cache/api/src/cacheView.ts index 04a66c3012..b0101a7dd8 100644 --- a/cache/api/src/cacheView.ts +++ b/cache/api/src/cacheView.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import type { PackageMeta } from '@pnpm/npm-resolver' +import type { PackageMeta } from '@pnpm/resolving.npm-resolver' import { StoreIndex, storeIndexKey } from '@pnpm/store.index' import getRegistryName from 'encode-registry' import { glob } from 'tinyglobby' diff --git a/cache/api/tsconfig.json b/cache/api/tsconfig.json index 63e859f384..0776b252ce 100644 --- a/cache/api/tsconfig.json +++ b/cache/api/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../config/config" + "path": "../../config/reader" }, { "path": "../../packages/constants" diff --git a/cache/commands/package.json b/cache/commands/package.json index 58331fe9ac..f07aaaff75 100644 --- a/cache/commands/package.json +++ b/cache/commands/package.json @@ -33,11 +33,11 @@ }, "dependencies": { "@pnpm/cache.api": "workspace:*", - "@pnpm/cli-utils": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/store-path": "workspace:*", + "@pnpm/store.path": "workspace:*", "ramda": "catalog:", "render-help": "catalog:" }, diff --git a/cache/commands/src/cache.cmd.ts b/cache/commands/src/cache.cmd.ts index 8502b78e58..41927bb8c5 100644 --- a/cache/commands/src/cache.cmd.ts +++ b/cache/commands/src/cache.cmd.ts @@ -6,11 +6,11 @@ import { cacheListRegistries, cacheView, } from '@pnpm/cache.api' -import { docsUrl } from '@pnpm/cli-utils' -import { type Config, types as allTypes } from '@pnpm/config' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { ABBREVIATED_META_DIR, FULL_FILTERED_META_DIR } from '@pnpm/constants' import { PnpmError } from '@pnpm/error' -import { getStorePath } from '@pnpm/store-path' +import { getStorePath } from '@pnpm/store.path' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/cache/commands/tsconfig.json b/cache/commands/tsconfig.json index 59d0d92bcd..2088d4f1fa 100644 --- a/cache/commands/tsconfig.json +++ b/cache/commands/tsconfig.json @@ -13,10 +13,10 @@ "path": "../../__utils__/prepare" }, { - "path": "../../cli/cli-utils" + "path": "../../cli/utils" }, { - "path": "../../config/config" + "path": "../../config/reader" }, { "path": "../../packages/constants" @@ -28,7 +28,7 @@ "path": "../../packages/logger" }, { - "path": "../../store/store-path" + "path": "../../store/path" }, { "path": "../api" diff --git a/catalogs/config/package.json b/catalogs/config/package.json index 02dea371c1..95b3ff7d33 100644 --- a/catalogs/config/package.json +++ b/catalogs/config/package.json @@ -37,7 +37,7 @@ "devDependencies": { "@pnpm/catalogs.config": "workspace:*", "@pnpm/catalogs.types": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*" + "@pnpm/workspace.workspace-manifest-reader": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/catalogs/config/src/getCatalogsFromWorkspaceManifest.ts b/catalogs/config/src/getCatalogsFromWorkspaceManifest.ts index 80a858bf28..d2d4760eae 100644 --- a/catalogs/config/src/getCatalogsFromWorkspaceManifest.ts +++ b/catalogs/config/src/getCatalogsFromWorkspaceManifest.ts @@ -1,6 +1,6 @@ import type { Catalogs } from '@pnpm/catalogs.types' import { PnpmError } from '@pnpm/error' -import type { WorkspaceManifest } from '@pnpm/workspace.read-manifest' +import type { WorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' export function getCatalogsFromWorkspaceManifest ( workspaceManifest: Pick | undefined diff --git a/catalogs/config/tsconfig.json b/catalogs/config/tsconfig.json index 6ff20853ad..cea3648bc2 100644 --- a/catalogs/config/tsconfig.json +++ b/catalogs/config/tsconfig.json @@ -14,7 +14,7 @@ "path": "../../packages/error" }, { - "path": "../../workspace/read-manifest" + "path": "../../workspace/workspace-manifest-reader" }, { "path": "../types" diff --git a/cli/command/package.json b/cli/command/package.json index f3ccbbbd3e..5597112bdd 100644 --- a/cli/command/package.json +++ b/cli/command/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/command", + "name": "@pnpm/cli.command", "version": "1000.0.0", "description": "Types and utils for pnpm commands", "keywords": [ @@ -33,7 +33,7 @@ "@pnpm/tabtab": "catalog:" }, "devDependencies": { - "@pnpm/command": "workspace:*" + "@pnpm/cli.command": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/cli/commands/package.json b/cli/commands/package.json index 5926d8fc42..14f447f327 100644 --- a/cli/commands/package.json +++ b/cli/commands/package.json @@ -31,16 +31,16 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-utils": "workspace:^", - "@pnpm/command": "workspace:^", - "@pnpm/config": "workspace:*", + "@pnpm/cli.command": "workspace:^", + "@pnpm/cli.parse-cli-args": "workspace:^", + "@pnpm/cli.utils": "workspace:^", + "@pnpm/config.reader": "workspace:*", "@pnpm/error": "workspace:^", - "@pnpm/find-workspace-dir": "workspace:^", "@pnpm/nopt": "catalog:", - "@pnpm/parse-cli-args": "workspace:^", "@pnpm/tabtab": "catalog:", - "@pnpm/workspace.find-packages": "workspace:^", - "@pnpm/workspace.read-manifest": "workspace:^", + "@pnpm/workspace.projects-reader": "workspace:^", + "@pnpm/workspace.root-finder": "workspace:^", + "@pnpm/workspace.workspace-manifest-reader": "workspace:^", "ramda": "catalog:", "render-help": "catalog:", "split-cmd": "catalog:" diff --git a/cli/commands/src/completion/complete.ts b/cli/commands/src/completion/complete.ts index 6400534f70..00551cb5ee 100644 --- a/cli/commands/src/completion/complete.ts +++ b/cli/commands/src/completion/complete.ts @@ -1,8 +1,8 @@ -import type { CompletionFunc } from '@pnpm/command' -import { findWorkspaceDir } from '@pnpm/find-workspace-dir' +import type { CompletionFunc } from '@pnpm/cli.command' import type { CompletionItem } from '@pnpm/tabtab' -import { findWorkspacePackages } from '@pnpm/workspace.find-packages' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' +import { findWorkspaceDir } from '@pnpm/workspace.root-finder' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { getOptionCompletions } from './getOptionType.js' import { optionTypesToCompletions } from './optionTypesToCompletions.js' diff --git a/cli/commands/src/completion/completionServer.ts b/cli/commands/src/completion/completionServer.ts index f946cff3e7..f8333406cb 100644 --- a/cli/commands/src/completion/completionServer.ts +++ b/cli/commands/src/completion/completionServer.ts @@ -1,5 +1,5 @@ -import type { CompletionFunc } from '@pnpm/command' -import type { ParsedCliArgs } from '@pnpm/parse-cli-args' +import type { CompletionFunc } from '@pnpm/cli.command' +import type { ParsedCliArgs } from '@pnpm/cli.parse-cli-args' import { type CompletionItem, getShellFromEnv } from '@pnpm/tabtab' import tabtab from '@pnpm/tabtab' import { split as splitCmd } from 'split-cmd/index.modern.mjs' diff --git a/cli/commands/src/doctor/doctor.ts b/cli/commands/src/doctor/doctor.ts index caf0e44628..0154d2cb70 100644 --- a/cli/commands/src/doctor/doctor.ts +++ b/cli/commands/src/doctor/doctor.ts @@ -1,5 +1,5 @@ -import { docsUrl } from '@pnpm/cli-utils' -import type { Config } from '@pnpm/config' +import { docsUrl } from '@pnpm/cli.utils' +import type { Config } from '@pnpm/config.reader' import { logger } from '@pnpm/logger' import { renderHelp } from 'render-help' diff --git a/cli/commands/tsconfig.json b/cli/commands/tsconfig.json index 89810bc3cc..32c00dd223 100644 --- a/cli/commands/tsconfig.json +++ b/cli/commands/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../config/config" + "path": "../../config/reader" }, { "path": "../../packages/error" @@ -19,22 +19,22 @@ "path": "../../packages/logger" }, { - "path": "../../workspace/find-packages" + "path": "../../workspace/projects-reader" }, { - "path": "../../workspace/find-workspace-dir" + "path": "../../workspace/root-finder" }, { - "path": "../../workspace/read-manifest" - }, - { - "path": "../cli-utils" + "path": "../../workspace/workspace-manifest-reader" }, { "path": "../command" }, { "path": "../parse-cli-args" + }, + { + "path": "../utils" } ] } diff --git a/cli/common-cli-options-help/package.json b/cli/common-cli-options-help/package.json index 1810381e48..e8acf8bb64 100644 --- a/cli/common-cli-options-help/package.json +++ b/cli/common-cli-options-help/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/common-cli-options-help", + "name": "@pnpm/cli.common-cli-options-help", "version": "1000.0.1", "description": "Help for some common CLI options", "keywords": [ @@ -30,7 +30,7 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "devDependencies": { - "@pnpm/common-cli-options-help": "workspace:*" + "@pnpm/cli.common-cli-options-help": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/cli/default-reporter/package.json b/cli/default-reporter/package.json index 74d8721f68..d7073a37e3 100644 --- a/cli/default-reporter/package.json +++ b/cli/default-reporter/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/default-reporter", + "name": "@pnpm/cli.default-reporter", "version": "1002.0.11", "description": "The default reporter of pnpm", "keywords": [ @@ -33,13 +33,13 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-meta": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.meta": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/dedupe.issues-renderer": "workspace:*", - "@pnpm/dedupe.types": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/render-peer-issues": "workspace:*", + "@pnpm/installing.dedupe.issues-renderer": "workspace:*", + "@pnpm/installing.dedupe.types": "workspace:*", + "@pnpm/installing.render-peer-issues": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "ansi-diff": "catalog:", @@ -59,7 +59,7 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/default-reporter": "workspace:*", + "@pnpm/cli.default-reporter": "workspace:*", "@pnpm/logger": "workspace:*", "@types/normalize-path": "catalog:", "@types/ramda": "catalog:", diff --git a/cli/default-reporter/src/index.ts b/cli/default-reporter/src/index.ts index bc3a50e9b8..50e655cc7c 100644 --- a/cli/default-reporter/src/index.ts +++ b/cli/default-reporter/src/index.ts @@ -1,4 +1,4 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type * as logs from '@pnpm/core-loggers' import type { LogLevel, StreamParser } from '@pnpm/logger' import createDiffer from 'ansi-diff' diff --git a/cli/default-reporter/src/reportError.ts b/cli/default-reporter/src/reportError.ts index 25eb7b04b7..eb41a182e6 100644 --- a/cli/default-reporter/src/reportError.ts +++ b/cli/default-reporter/src/reportError.ts @@ -1,9 +1,9 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type { Log } from '@pnpm/core-loggers' -import { renderDedupeCheckIssues } from '@pnpm/dedupe.issues-renderer' -import type { DedupeCheckIssues } from '@pnpm/dedupe.types' import type { PnpmError } from '@pnpm/error' -import { renderPeerIssues } from '@pnpm/render-peer-issues' +import { renderDedupeCheckIssues } from '@pnpm/installing.dedupe.issues-renderer' +import type { DedupeCheckIssues } from '@pnpm/installing.dedupe.types' +import { renderPeerIssues } from '@pnpm/installing.render-peer-issues' import type { PeerDependencyIssuesByProjects } from '@pnpm/types' import chalk from 'chalk' import { equals } from 'ramda' diff --git a/cli/default-reporter/src/reporterForClient/index.ts b/cli/default-reporter/src/reporterForClient/index.ts index 1292ba1f42..88d6d02f94 100644 --- a/cli/default-reporter/src/reporterForClient/index.ts +++ b/cli/default-reporter/src/reporterForClient/index.ts @@ -1,4 +1,4 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type * as logs from '@pnpm/core-loggers' import type { LogLevel } from '@pnpm/logger' import type * as Rx from 'rxjs' diff --git a/cli/default-reporter/src/reporterForClient/reportExecutionTime.ts b/cli/default-reporter/src/reporterForClient/reportExecutionTime.ts index 18be9ef19d..e4cf72d02f 100644 --- a/cli/default-reporter/src/reporterForClient/reportExecutionTime.ts +++ b/cli/default-reporter/src/reporterForClient/reportExecutionTime.ts @@ -1,4 +1,4 @@ -import { packageManager } from '@pnpm/cli-meta' +import { packageManager } from '@pnpm/cli.meta' import type { ExecutionTimeLog } from '@pnpm/core-loggers' import prettyMs from 'pretty-ms' import * as Rx from 'rxjs' diff --git a/cli/default-reporter/src/reporterForClient/reportIgnoredBuilds.ts b/cli/default-reporter/src/reporterForClient/reportIgnoredBuilds.ts index 13021aa6cd..7afc952c25 100644 --- a/cli/default-reporter/src/reporterForClient/reportIgnoredBuilds.ts +++ b/cli/default-reporter/src/reporterForClient/reportIgnoredBuilds.ts @@ -1,4 +1,4 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type { IgnoredScriptsLog } from '@pnpm/core-loggers' import { lexCompare } from '@pnpm/util.lex-comparator' import boxen from 'boxen' diff --git a/cli/default-reporter/src/reporterForClient/reportMisc.ts b/cli/default-reporter/src/reporterForClient/reportMisc.ts index c34281c12a..859f4cb3c0 100644 --- a/cli/default-reporter/src/reporterForClient/reportMisc.ts +++ b/cli/default-reporter/src/reporterForClient/reportMisc.ts @@ -1,6 +1,6 @@ import os from 'node:os' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type { Log, RegistryLog } from '@pnpm/core-loggers' import type { LogLevel } from '@pnpm/logger' import * as Rx from 'rxjs' diff --git a/cli/default-reporter/src/reporterForClient/reportPeerDependencyIssues.ts b/cli/default-reporter/src/reporterForClient/reportPeerDependencyIssues.ts index dd3a9a9aeb..d6325fc7eb 100644 --- a/cli/default-reporter/src/reporterForClient/reportPeerDependencyIssues.ts +++ b/cli/default-reporter/src/reporterForClient/reportPeerDependencyIssues.ts @@ -1,5 +1,5 @@ import type { PeerDependencyIssuesLog } from '@pnpm/core-loggers' -import { renderPeerIssues } from '@pnpm/render-peer-issues' +import { renderPeerIssues } from '@pnpm/installing.render-peer-issues' import * as Rx from 'rxjs' import { map, take } from 'rxjs/operators' diff --git a/cli/default-reporter/src/reporterForClient/reportSummary.ts b/cli/default-reporter/src/reporterForClient/reportSummary.ts index b2eeaebac7..0aa6817f0c 100644 --- a/cli/default-reporter/src/reporterForClient/reportSummary.ts +++ b/cli/default-reporter/src/reporterForClient/reportSummary.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type { DeprecationLog, PackageManifestLog, diff --git a/cli/default-reporter/src/reporterForClient/reportUpdateCheck.ts b/cli/default-reporter/src/reporterForClient/reportUpdateCheck.ts index abc99b865d..295a8f46db 100644 --- a/cli/default-reporter/src/reporterForClient/reportUpdateCheck.ts +++ b/cli/default-reporter/src/reporterForClient/reportUpdateCheck.ts @@ -1,4 +1,4 @@ -import { detectIfCurrentPkgIsExecutable, isExecutedByCorepack } from '@pnpm/cli-meta' +import { detectIfCurrentPkgIsExecutable, isExecutedByCorepack } from '@pnpm/cli.meta' import type { UpdateCheckLog } from '@pnpm/core-loggers' import boxen from 'boxen' import chalk from 'chalk' diff --git a/cli/default-reporter/test/filterLogHook.ts b/cli/default-reporter/test/filterLogHook.ts index 632eefa2db..8b93da0d8b 100644 --- a/cli/default-reporter/test/filterLogHook.ts +++ b/cli/default-reporter/test/filterLogHook.ts @@ -1,5 +1,5 @@ +import { toOutput$ } from '@pnpm/cli.default-reporter' import type { Log } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser, logger } from '@pnpm/logger' import { firstValueFrom } from 'rxjs' diff --git a/cli/default-reporter/test/index.ts b/cli/default-reporter/test/index.ts index 0fdf77993d..a569dfb770 100644 --- a/cli/default-reporter/test/index.ts +++ b/cli/default-reporter/test/index.ts @@ -1,7 +1,8 @@ /// import path from 'node:path' -import type { Config } from '@pnpm/config' +import { toOutput$ } from '@pnpm/cli.default-reporter' +import type { Config } from '@pnpm/config.reader' import { deprecationLogger, hookLogger, @@ -12,7 +13,6 @@ import { statsLogger, summaryLogger, } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { PnpmError } from '@pnpm/error' import { createStreamParser, diff --git a/cli/default-reporter/test/pnpm-meta.json b/cli/default-reporter/test/pnpm-meta.json index 53de64682e..cded5025c3 100644 --- a/cli/default-reporter/test/pnpm-meta.json +++ b/cli/default-reporter/test/pnpm-meta.json @@ -8149,7 +8149,7 @@ "name": "pnpm", "version": "1.14.2", "dependencies": { - "@pnpm/outdated": "^0.0.0", + "@pnpm/deps.inspection.outdated": "^0.0.0", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8212,7 +8212,7 @@ "name": "pnpm", "version": "1.14.4", "dependencies": { - "@pnpm/outdated": "^0.0.0", + "@pnpm/deps.inspection.outdated": "^0.0.0", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8276,7 +8276,7 @@ "name": "pnpm", "version": "1.14.5", "dependencies": { - "@pnpm/outdated": "^0.0.0", + "@pnpm/deps.inspection.outdated": "^0.0.0", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8340,7 +8340,7 @@ "name": "pnpm", "version": "1.14.6", "dependencies": { - "@pnpm/outdated": "^0.0.0", + "@pnpm/deps.inspection.outdated": "^0.0.0", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8404,7 +8404,7 @@ "name": "pnpm", "version": "1.14.7", "dependencies": { - "@pnpm/outdated": "^0.0.0", + "@pnpm/deps.inspection.outdated": "^0.0.0", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8468,7 +8468,7 @@ "name": "pnpm", "version": "1.14.8", "dependencies": { - "@pnpm/outdated": "^0.0.0", + "@pnpm/deps.inspection.outdated": "^0.0.0", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8532,7 +8532,7 @@ "name": "pnpm", "version": "1.14.9", "dependencies": { - "@pnpm/outdated": "^0.0.0", + "@pnpm/deps.inspection.outdated": "^0.0.0", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8596,7 +8596,7 @@ "name": "pnpm", "version": "1.14.10", "dependencies": { - "@pnpm/outdated": "^0.0.0", + "@pnpm/deps.inspection.outdated": "^0.0.0", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8660,7 +8660,7 @@ "name": "pnpm", "version": "1.15.0", "dependencies": { - "@pnpm/outdated": "^0.0.1", + "@pnpm/deps.inspection.outdated": "^0.0.1", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8724,7 +8724,7 @@ "name": "pnpm", "version": "1.14.11", "dependencies": { - "@pnpm/outdated": "^0.0.0", + "@pnpm/deps.inspection.outdated": "^0.0.0", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8788,7 +8788,7 @@ "name": "pnpm", "version": "1.16.0", "dependencies": { - "@pnpm/outdated": "^0.0.1", + "@pnpm/deps.inspection.outdated": "^0.0.1", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8852,7 +8852,7 @@ "name": "pnpm", "version": "1.16.1", "dependencies": { - "@pnpm/outdated": "^0.0.1", + "@pnpm/deps.inspection.outdated": "^0.0.1", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -8896,7 +8896,7 @@ "typescript": "^2.4.1" }, "bundleDependencies": [ - "@pnpm/outdated", + "@pnpm/deps.inspection.outdated", "@types/byline", "@types/chalk", "@types/common-tags", @@ -8947,7 +8947,7 @@ "name": "pnpm", "version": "1.16.2", "dependencies": { - "@pnpm/outdated": "^0.0.1", + "@pnpm/deps.inspection.outdated": "^0.0.1", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -9009,7 +9009,7 @@ "name": "pnpm", "version": "1.16.3", "dependencies": { - "@pnpm/outdated": "^0.0.1", + "@pnpm/deps.inspection.outdated": "^0.0.1", "@types/byline": "^4.2.31", "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -9071,7 +9071,7 @@ "name": "pnpm", "version": "1.17.2", "dependencies": { - "@pnpm/outdated": "^0.0.1", + "@pnpm/deps.inspection.outdated": "^0.0.1", "byline": "^5.0.0", "camelcase": "^4.1.0", "chalk": "^2.1.0", @@ -9133,7 +9133,7 @@ "name": "pnpm", "version": "1.18.0", "dependencies": { - "@pnpm/outdated": "^0.0.1", + "@pnpm/deps.inspection.outdated": "^0.0.1", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9197,7 +9197,7 @@ "name": "pnpm", "version": "1.18.1", "dependencies": { - "@pnpm/outdated": "^0.0.1", + "@pnpm/deps.inspection.outdated": "^0.0.1", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9260,7 +9260,7 @@ "name": "pnpm", "version": "1.19.0", "dependencies": { - "@pnpm/outdated": "^0.0.1", + "@pnpm/deps.inspection.outdated": "^0.0.1", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9323,7 +9323,7 @@ "name": "pnpm", "version": "1.19.1", "dependencies": { - "@pnpm/outdated": "^0.0.2", + "@pnpm/deps.inspection.outdated": "^0.0.2", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9386,7 +9386,7 @@ "name": "pnpm", "version": "1.19.2", "dependencies": { - "@pnpm/outdated": "^0.0.2", + "@pnpm/deps.inspection.outdated": "^0.0.2", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9449,7 +9449,7 @@ "name": "pnpm", "version": "1.19.3", "dependencies": { - "@pnpm/outdated": "^0.0.2", + "@pnpm/deps.inspection.outdated": "^0.0.2", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9512,7 +9512,7 @@ "name": "pnpm", "version": "1.19.4", "dependencies": { - "@pnpm/outdated": "^0.1.0", + "@pnpm/deps.inspection.outdated": "^0.1.0", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9602,7 +9602,7 @@ "name": "pnpm", "version": "1.19.5", "dependencies": { - "@pnpm/outdated": "^0.1.0", + "@pnpm/deps.inspection.outdated": "^0.1.0", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9693,7 +9693,7 @@ "version": "1.19.6", "dependencies": { "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.0", + "@pnpm/deps.inspection.outdated": "^0.2.0", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9783,7 +9783,7 @@ "version": "1.19.7", "dependencies": { "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.0", + "@pnpm/deps.inspection.outdated": "^0.2.0", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9873,7 +9873,7 @@ "version": "1.20.0", "dependencies": { "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.0", + "@pnpm/deps.inspection.outdated": "^0.2.0", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -9963,7 +9963,7 @@ "version": "1.21.0", "dependencies": { "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.0", + "@pnpm/deps.inspection.outdated": "^0.2.0", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -10053,7 +10053,7 @@ "version": "1.22.0", "dependencies": { "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.0", + "@pnpm/deps.inspection.outdated": "^0.2.0", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -10143,7 +10143,7 @@ "version": "1.23.0", "dependencies": { "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.0", + "@pnpm/deps.inspection.outdated": "^0.2.0", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -10233,7 +10233,7 @@ "version": "1.23.1", "dependencies": { "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.0", + "@pnpm/deps.inspection.outdated": "^0.2.0", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -10323,7 +10323,7 @@ "version": "1.23.2", "dependencies": { "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.1", + "@pnpm/deps.inspection.outdated": "^0.2.1", "@zkochan/libnpx": "^9.6.1", "byline": "^5.0.0", "camelcase": "^4.1.0", @@ -10413,9 +10413,9 @@ "version": "1.24.0-0", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.1", + "@pnpm/deps.inspection.outdated": "^0.2.1", "@pnpm/server": "^0.3.0", "@types/write-json-file": "^2.2.1", "@zkochan/libnpx": "^9.6.1", @@ -10513,9 +10513,9 @@ "version": "1.24.0-1", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.1", + "@pnpm/deps.inspection.outdated": "^0.2.1", "@pnpm/server": "^0.4.0", "@types/write-json-file": "^2.2.1", "@zkochan/libnpx": "^9.6.1", @@ -10613,9 +10613,9 @@ "version": "1.24.0-2", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.1", + "@pnpm/deps.inspection.outdated": "^0.2.1", "@pnpm/server": "^0.4.0", "@types/get-port": "^3.2.0", "@types/write-json-file": "^2.2.1", @@ -10719,9 +10719,9 @@ "version": "1.24.0-3", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.1", + "@pnpm/deps.inspection.outdated": "^0.2.1", "@pnpm/server": "^0.4.0", "@pnpm/types": "^1.3.0", "@types/get-port": "^3.2.0", @@ -10826,9 +10826,9 @@ "version": "1.24.0", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.2", + "@pnpm/deps.inspection.outdated": "^0.2.2", "@pnpm/server": "^0.4.0", "@pnpm/types": "^1.3.0", "@types/get-port": "^3.2.0", @@ -10933,9 +10933,9 @@ "version": "1.24.1", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.2", + "@pnpm/deps.inspection.outdated": "^0.2.2", "@pnpm/server": "^0.4.0", "@pnpm/types": "^1.3.0", "@types/get-port": "^3.2.0", @@ -11040,9 +11040,9 @@ "version": "1.24.2", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.2", + "@pnpm/deps.inspection.outdated": "^0.2.2", "@pnpm/server": "^0.4.0", "@pnpm/types": "^1.3.0", "@types/get-port": "^3.2.0", @@ -11147,9 +11147,9 @@ "version": "1.24.3", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.2", + "@pnpm/deps.inspection.outdated": "^0.2.2", "@pnpm/server": "^0.4.0", "@pnpm/types": "^1.3.0", "@types/get-port": "^3.2.0", @@ -11254,9 +11254,9 @@ "version": "1.25.0", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.2", + "@pnpm/deps.inspection.outdated": "^0.2.2", "@pnpm/server": "^0.4.0", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -11361,9 +11361,9 @@ "version": "1.25.1", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.2", + "@pnpm/deps.inspection.outdated": "^0.2.2", "@pnpm/server": "^0.4.0", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -11468,9 +11468,9 @@ "version": "1.26.0", "dependencies": { "@pnpm/default-fetcher": "^0.3.0", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.3", + "@pnpm/deps.inspection.outdated": "^0.2.3", "@pnpm/server": "^0.5.0", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -11575,9 +11575,9 @@ "version": "1.27.0-1", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.4", + "@pnpm/deps.inspection.outdated": "^0.2.4", "@pnpm/server": "^0.6.0", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -11682,9 +11682,9 @@ "version": "1.27.0", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.4", + "@pnpm/deps.inspection.outdated": "^0.2.4", "@pnpm/server": "^0.6.0", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -11789,9 +11789,9 @@ "version": "1.28.0", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.4", + "@pnpm/deps.inspection.outdated": "^0.2.4", "@pnpm/server": "^0.6.0", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -11896,9 +11896,9 @@ "version": "1.29.1", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.4", + "@pnpm/deps.inspection.outdated": "^0.2.4", "@pnpm/server": "^0.6.0", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -12003,9 +12003,9 @@ "version": "1.30.0", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.4", + "@pnpm/deps.inspection.outdated": "^0.2.4", "@pnpm/server": "^0.6.2", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -12113,9 +12113,9 @@ "version": "1.30.1", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.4", + "@pnpm/deps.inspection.outdated": "^0.2.4", "@pnpm/server": "^0.6.2", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -12223,9 +12223,9 @@ "version": "1.30.2", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.4", + "@pnpm/deps.inspection.outdated": "^0.2.4", "@pnpm/server": "^0.6.2", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -12333,9 +12333,9 @@ "version": "1.31.0", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.5", + "@pnpm/deps.inspection.outdated": "^0.2.5", "@pnpm/server": "^0.7.1", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -12445,9 +12445,9 @@ "version": "1.31.1", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.0", + "@pnpm/resolving.default-resolver": "^0.1.0", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.5", + "@pnpm/deps.inspection.outdated": "^0.2.5", "@pnpm/server": "^0.7.1", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -12557,9 +12557,9 @@ "version": "1.31.2", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.3", + "@pnpm/resolving.default-resolver": "^0.1.3", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.5", + "@pnpm/deps.inspection.outdated": "^0.2.5", "@pnpm/server": "^0.7.1", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -12669,9 +12669,9 @@ "version": "1.31.3", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.3", + "@pnpm/resolving.default-resolver": "^0.1.3", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.5", + "@pnpm/deps.inspection.outdated": "^0.2.5", "@pnpm/server": "^0.7.1", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -12781,9 +12781,9 @@ "version": "1.31.4", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.3", + "@pnpm/resolving.default-resolver": "^0.1.3", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.5", + "@pnpm/deps.inspection.outdated": "^0.2.5", "@pnpm/server": "^0.7.1", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -12893,9 +12893,9 @@ "version": "1.31.5", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.3", + "@pnpm/resolving.default-resolver": "^0.1.3", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.5", + "@pnpm/deps.inspection.outdated": "^0.2.5", "@pnpm/server": "^0.7.1", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -13005,9 +13005,9 @@ "version": "1.31.6", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.3", + "@pnpm/resolving.default-resolver": "^0.1.3", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.5", + "@pnpm/deps.inspection.outdated": "^0.2.5", "@pnpm/server": "^0.7.1", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -13117,9 +13117,9 @@ "version": "1.32.0", "dependencies": { "@pnpm/default-fetcher": "^0.3.2", - "@pnpm/default-resolver": "^0.1.3", + "@pnpm/resolving.default-resolver": "^0.1.3", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.5", + "@pnpm/deps.inspection.outdated": "^0.2.5", "@pnpm/server": "^0.7.1", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -13229,9 +13229,9 @@ "version": "1.32.1", "dependencies": { "@pnpm/default-fetcher": "^0.4.0", - "@pnpm/default-resolver": "^0.1.3", + "@pnpm/resolving.default-resolver": "^0.1.3", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.6", + "@pnpm/deps.inspection.outdated": "^0.2.6", "@pnpm/server": "^0.8.0", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", @@ -13343,11 +13343,11 @@ "version": "1.33.0", "dependencies": { "@pnpm/default-fetcher": "^0.4.0", - "@pnpm/default-resolver": "^0.1.3", + "@pnpm/resolving.default-resolver": "^0.1.3", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.7", + "@pnpm/deps.inspection.outdated": "^0.2.7", "@pnpm/server": "^0.8.1", - "@pnpm/store-path": "^1.0.0", + "@pnpm/store.path": "^1.0.0", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", "@types/retry": "^0.10.2", @@ -13436,11 +13436,11 @@ }, "bundleDependencies": [ "@pnpm/default-fetcher", - "@pnpm/default-resolver", + "@pnpm/resolving.default-resolver", "@pnpm/logger", - "@pnpm/outdated", + "@pnpm/deps.inspection.outdated", "@pnpm/server", - "@pnpm/store-path", + "@pnpm/store.path", "@pnpm/types", "@types/get-port", "@types/retry", @@ -13506,11 +13506,11 @@ "version": "1.33.1", "dependencies": { "@pnpm/default-fetcher": "^0.4.0", - "@pnpm/default-resolver": "^0.1.3", + "@pnpm/resolving.default-resolver": "^0.1.3", "@pnpm/logger": "^1.0.0", - "@pnpm/outdated": "^0.2.7", + "@pnpm/deps.inspection.outdated": "^0.2.7", "@pnpm/server": "^0.8.1", - "@pnpm/store-path": "^1.0.1", + "@pnpm/store.path": "^1.0.1", "@pnpm/types": "^1.5.0", "@types/get-port": "^3.2.0", "@types/retry": "^0.10.2", @@ -13599,11 +13599,11 @@ }, "bundleDependencies": [ "@pnpm/default-fetcher", - "@pnpm/default-resolver", + "@pnpm/resolving.default-resolver", "@pnpm/logger", - "@pnpm/outdated", + "@pnpm/deps.inspection.outdated", "@pnpm/server", - "@pnpm/store-path", + "@pnpm/store.path", "@pnpm/types", "@types/get-port", "@types/retry", diff --git a/cli/default-reporter/test/reportingContext.ts b/cli/default-reporter/test/reportingContext.ts index a1465b0569..6d28af7597 100644 --- a/cli/default-reporter/test/reportingContext.ts +++ b/cli/default-reporter/test/reportingContext.ts @@ -1,7 +1,7 @@ import { setTimeout } from 'node:timers/promises' +import { toOutput$ } from '@pnpm/cli.default-reporter' import { contextLogger, packageImportMethodLogger } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser, } from '@pnpm/logger' diff --git a/cli/default-reporter/test/reportingDeprecations.ts b/cli/default-reporter/test/reportingDeprecations.ts index 4519588400..65d962653c 100644 --- a/cli/default-reporter/test/reportingDeprecations.ts +++ b/cli/default-reporter/test/reportingDeprecations.ts @@ -1,9 +1,9 @@ -import type { Config } from '@pnpm/config' +import { toOutput$ } from '@pnpm/cli.default-reporter' +import type { Config } from '@pnpm/config.reader' import { deprecationLogger, stageLogger, } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser } from '@pnpm/logger' import chalk from 'chalk' import normalizeNewline from 'normalize-newline' diff --git a/cli/default-reporter/test/reportingErrors.ts b/cli/default-reporter/test/reportingErrors.ts index c81dbc593b..03522fb5f9 100644 --- a/cli/default-reporter/test/reportingErrors.ts +++ b/cli/default-reporter/test/reportingErrors.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { toOutput$ } from '@pnpm/default-reporter' +import { toOutput$ } from '@pnpm/cli.default-reporter' import { PnpmError } from '@pnpm/error' import { createStreamParser, diff --git a/cli/default-reporter/test/reportingExecutionTime.ts b/cli/default-reporter/test/reportingExecutionTime.ts index 0838caf35f..1b5e04819b 100644 --- a/cli/default-reporter/test/reportingExecutionTime.ts +++ b/cli/default-reporter/test/reportingExecutionTime.ts @@ -1,8 +1,8 @@ import { setTimeout } from 'node:timers/promises' -import { packageManager } from '@pnpm/cli-meta' +import { toOutput$ } from '@pnpm/cli.default-reporter' +import { packageManager } from '@pnpm/cli.meta' import { executionTimeLogger } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser } from '@pnpm/logger' import { firstValueFrom } from 'rxjs' diff --git a/cli/default-reporter/test/reportingLifecycleScripts.ts b/cli/default-reporter/test/reportingLifecycleScripts.ts index f811bef886..c03a38784e 100644 --- a/cli/default-reporter/test/reportingLifecycleScripts.ts +++ b/cli/default-reporter/test/reportingLifecycleScripts.ts @@ -1,7 +1,7 @@ import path from 'node:path' +import { toOutput$ } from '@pnpm/cli.default-reporter' import { lifecycleLogger } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser } from '@pnpm/logger' import chalk from 'chalk' import normalizeNewline from 'normalize-newline' diff --git a/cli/default-reporter/test/reportingPeerDependencyIssues.ts b/cli/default-reporter/test/reportingPeerDependencyIssues.ts index 060e377a03..f6cac8a4a1 100644 --- a/cli/default-reporter/test/reportingPeerDependencyIssues.ts +++ b/cli/default-reporter/test/reportingPeerDependencyIssues.ts @@ -1,5 +1,5 @@ +import { toOutput$ } from '@pnpm/cli.default-reporter' import { peerDependencyIssuesLogger } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser, logger, diff --git a/cli/default-reporter/test/reportingProgress.ts b/cli/default-reporter/test/reportingProgress.ts index 7bb2ab7baa..99de760b48 100644 --- a/cli/default-reporter/test/reportingProgress.ts +++ b/cli/default-reporter/test/reportingProgress.ts @@ -1,11 +1,11 @@ -import type { Config } from '@pnpm/config' +import { toOutput$ } from '@pnpm/cli.default-reporter' +import type { Config } from '@pnpm/config.reader' import { fetchingProgressLogger, progressLogger, stageLogger, statsLogger, } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser, logger, diff --git a/cli/default-reporter/test/reportingRequestRetry.ts b/cli/default-reporter/test/reportingRequestRetry.ts index dfef58bf6e..e577840a6f 100644 --- a/cli/default-reporter/test/reportingRequestRetry.ts +++ b/cli/default-reporter/test/reportingRequestRetry.ts @@ -1,5 +1,5 @@ +import { toOutput$ } from '@pnpm/cli.default-reporter' import { requestRetryLogger } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser, } from '@pnpm/logger' diff --git a/cli/default-reporter/test/reportingScope.ts b/cli/default-reporter/test/reportingScope.ts index 592e14bd61..55b4c66329 100644 --- a/cli/default-reporter/test/reportingScope.ts +++ b/cli/default-reporter/test/reportingScope.ts @@ -1,8 +1,8 @@ import { setTimeout } from 'node:timers/promises' -import type { Config } from '@pnpm/config' +import { toOutput$ } from '@pnpm/cli.default-reporter' +import type { Config } from '@pnpm/config.reader' import { scopeLogger } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser } from '@pnpm/logger' import { firstValueFrom } from 'rxjs' diff --git a/cli/default-reporter/test/reportingUpdateCheck.ts b/cli/default-reporter/test/reportingUpdateCheck.ts index 702d833806..632e7607a1 100644 --- a/cli/default-reporter/test/reportingUpdateCheck.ts +++ b/cli/default-reporter/test/reportingUpdateCheck.ts @@ -1,9 +1,9 @@ import { setTimeout } from 'node:timers/promises' import { stripVTControlCharacters as stripAnsi } from 'node:util' -import type { Config } from '@pnpm/config' +import { toOutput$ } from '@pnpm/cli.default-reporter' +import type { Config } from '@pnpm/config.reader' import { updateCheckLogger } from '@pnpm/core-loggers' -import { toOutput$ } from '@pnpm/default-reporter' import { createStreamParser } from '@pnpm/logger' import { firstValueFrom } from 'rxjs' diff --git a/cli/default-reporter/tsconfig.json b/cli/default-reporter/tsconfig.json index ff879708ce..6888b6a0b4 100644 --- a/cli/default-reporter/tsconfig.json +++ b/cli/default-reporter/tsconfig.json @@ -11,7 +11,7 @@ ], "references": [ { - "path": "../../config/config" + "path": "../../config/reader" }, { "path": "../../installing/dedupe/issues-renderer" @@ -35,7 +35,7 @@ "path": "../../packages/types" }, { - "path": "../cli-meta" + "path": "../meta" } ] } diff --git a/cli/cli-meta/CHANGELOG.md b/cli/meta/CHANGELOG.md similarity index 100% rename from cli/cli-meta/CHANGELOG.md rename to cli/meta/CHANGELOG.md diff --git a/cli/cli-meta/README.md b/cli/meta/README.md similarity index 100% rename from cli/cli-meta/README.md rename to cli/meta/README.md diff --git a/cli/cli-meta/package.json b/cli/meta/package.json similarity index 82% rename from cli/cli-meta/package.json rename to cli/meta/package.json index ef21927e47..4a81388e07 100644 --- a/cli/cli-meta/package.json +++ b/cli/meta/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/cli-meta", + "name": "@pnpm/cli.meta", "version": "1000.0.11", "description": "Reads the metainfo of the currently running pnpm instance", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/cli/cli-meta", - "homepage": "https://github.com/pnpm/pnpm/tree/main/cli/cli-meta#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/cli/meta", + "homepage": "https://github.com/pnpm/pnpm/tree/main/cli/meta#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -35,7 +35,7 @@ "load-json-file": "catalog:" }, "devDependencies": { - "@pnpm/cli-meta": "workspace:*" + "@pnpm/cli.meta": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/cli/cli-meta/src/index.ts b/cli/meta/src/index.ts similarity index 100% rename from cli/cli-meta/src/index.ts rename to cli/meta/src/index.ts diff --git a/cli/cli-meta/test/getCurrentPackageName.test.ts b/cli/meta/test/getCurrentPackageName.test.ts similarity index 95% rename from cli/cli-meta/test/getCurrentPackageName.test.ts rename to cli/meta/test/getCurrentPackageName.test.ts index 2221c9d446..3c2de092bd 100644 --- a/cli/cli-meta/test/getCurrentPackageName.test.ts +++ b/cli/meta/test/getCurrentPackageName.test.ts @@ -1,4 +1,4 @@ -import { detectIfCurrentPkgIsExecutable, getCurrentPackageName, isExecutedByCorepack } from '@pnpm/cli-meta' +import { detectIfCurrentPkgIsExecutable, getCurrentPackageName, isExecutedByCorepack } from '@pnpm/cli.meta' describe('detectIfCurrentPkgIsExecutable()', () => { test('returns false when not running as a SEA binary', () => { diff --git a/cli/cli-meta/test/tsconfig.json b/cli/meta/test/tsconfig.json similarity index 100% rename from cli/cli-meta/test/tsconfig.json rename to cli/meta/test/tsconfig.json diff --git a/cli/cli-meta/tsconfig.json b/cli/meta/tsconfig.json similarity index 100% rename from cli/cli-meta/tsconfig.json rename to cli/meta/tsconfig.json diff --git a/cli/cli-meta/tsconfig.lint.json b/cli/meta/tsconfig.lint.json similarity index 100% rename from cli/cli-meta/tsconfig.lint.json rename to cli/meta/tsconfig.lint.json diff --git a/cli/parse-cli-args/package.json b/cli/parse-cli-args/package.json index e05dc53c69..5b4984c5eb 100644 --- a/cli/parse-cli-args/package.json +++ b/cli/parse-cli-args/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/parse-cli-args", + "name": "@pnpm/cli.parse-cli-args", "version": "1000.1.4", "description": "Parses the CLI args passed to pnpm", "keywords": [ @@ -33,12 +33,12 @@ }, "dependencies": { "@pnpm/error": "workspace:*", - "@pnpm/find-workspace-dir": "workspace:*", "@pnpm/nopt": "catalog:", + "@pnpm/workspace.root-finder": "workspace:*", "didyoumean2": "catalog:" }, "devDependencies": { - "@pnpm/parse-cli-args": "workspace:*", + "@pnpm/cli.parse-cli-args": "workspace:*", "tempy": "catalog:" }, "engines": { diff --git a/cli/parse-cli-args/src/index.ts b/cli/parse-cli-args/src/index.ts index 42d4ffe8e2..e7744925a1 100644 --- a/cli/parse-cli-args/src/index.ts +++ b/cli/parse-cli-args/src/index.ts @@ -1,6 +1,6 @@ import { PnpmError } from '@pnpm/error' -import { findWorkspaceDir } from '@pnpm/find-workspace-dir' import nopt from '@pnpm/nopt' +import { findWorkspaceDir } from '@pnpm/workspace.root-finder' import didYouMean, { ReturnTypeEnums } from 'didyoumean2' const RECURSIVE_CMDS = new Set(['recursive', 'multi', 'm']) diff --git a/cli/parse-cli-args/test/index.ts b/cli/parse-cli-args/test/index.ts index 99ca7ac0b2..52ce279cdd 100644 --- a/cli/parse-cli-args/test/index.ts +++ b/cli/parse-cli-args/test/index.ts @@ -1,7 +1,7 @@ import os from 'node:os' +import { parseCliArgs } from '@pnpm/cli.parse-cli-args' import type { PnpmError } from '@pnpm/error' -import { parseCliArgs } from '@pnpm/parse-cli-args' import { temporaryDirectory } from 'tempy' const DEFAULT_OPTS = { diff --git a/cli/parse-cli-args/tsconfig.json b/cli/parse-cli-args/tsconfig.json index 0e4ad314c9..c1416db916 100644 --- a/cli/parse-cli-args/tsconfig.json +++ b/cli/parse-cli-args/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../packages/error" }, { - "path": "../../workspace/find-workspace-dir" + "path": "../../workspace/root-finder" } ] } diff --git a/cli/cli-utils/CHANGELOG.md b/cli/utils/CHANGELOG.md similarity index 100% rename from cli/cli-utils/CHANGELOG.md rename to cli/utils/CHANGELOG.md diff --git a/cli/cli-utils/README.md b/cli/utils/README.md similarity index 100% rename from cli/cli-utils/README.md rename to cli/utils/README.md diff --git a/cli/cli-utils/package.json b/cli/utils/package.json similarity index 68% rename from cli/cli-utils/package.json rename to cli/utils/package.json index 4af5340968..32b4a314cb 100644 --- a/cli/cli-utils/package.json +++ b/cli/utils/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/cli-utils", + "name": "@pnpm/cli.utils", "version": "1001.2.8", "description": "Utils for pnpm commands", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/cli/cli-utils", - "homepage": "https://github.com/pnpm/pnpm/tree/main/cli/cli-utils#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/cli/utils", + "homepage": "https://github.com/pnpm/pnpm/tree/main/cli/utils#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -31,18 +31,18 @@ "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest" }, "dependencies": { - "@pnpm/cli-meta": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.default-reporter": "workspace:*", + "@pnpm/cli.meta": "workspace:*", "@pnpm/config.deps-installer": "workspace:*", - "@pnpm/default-reporter": "workspace:*", + "@pnpm/config.package-is-installable": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/manifest-utils": "workspace:*", - "@pnpm/package-is-installable": "workspace:*", - "@pnpm/pnpmfile": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*", + "@pnpm/hooks.pnpmfile": "workspace:*", + "@pnpm/pkg-manifest.utils": "workspace:*", + "@pnpm/store.connection-manager": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "chalk": "catalog:", "load-json-file": "catalog:" }, @@ -51,7 +51,7 @@ }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/cli-utils": "workspace:*", + "@pnpm/cli.utils": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/prepare": "workspace:*", "@types/ramda": "catalog:" diff --git a/cli/cli-utils/src/getConfig.ts b/cli/utils/src/getConfig.ts similarity index 93% rename from cli/cli-utils/src/getConfig.ts rename to cli/utils/src/getConfig.ts index 55831b1477..c43fa44f1e 100644 --- a/cli/cli-utils/src/getConfig.ts +++ b/cli/utils/src/getConfig.ts @@ -1,12 +1,12 @@ import fs from 'node:fs' import path from 'node:path' -import { packageManager } from '@pnpm/cli-meta' -import { type CliOptions, type Config, getConfig as _getConfig } from '@pnpm/config' +import { formatWarn } from '@pnpm/cli.default-reporter' +import { packageManager } from '@pnpm/cli.meta' import { resolveAndInstallConfigDeps } from '@pnpm/config.deps-installer' -import { formatWarn } from '@pnpm/default-reporter' -import { requireHooks } from '@pnpm/pnpmfile' -import { createStoreController } from '@pnpm/store-connection-manager' +import { type CliOptions, type Config, getConfig as _getConfig } from '@pnpm/config.reader' +import { requireHooks } from '@pnpm/hooks.pnpmfile' +import { createStoreController } from '@pnpm/store.connection-manager' import type { ConfigDependencies } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' @@ -34,7 +34,7 @@ export async function getConfig ( applyDerivedConfig(config) if (opts.excludeReporter) { - delete config.reporter // This is a silly workaround because @pnpm/core expects a function as opts.reporter + delete config.reporter // This is a silly workaround because @pnpm/installing.deps-installer expects a function as opts.reporter } if (warnings.length > 0) { diff --git a/cli/cli-utils/src/index.ts b/cli/utils/src/index.ts similarity index 90% rename from cli/cli-utils/src/index.ts rename to cli/utils/src/index.ts index 8f2ac90497..3253403eac 100644 --- a/cli/cli-utils/src/index.ts +++ b/cli/utils/src/index.ts @@ -1,4 +1,4 @@ -import { packageManager } from '@pnpm/cli-meta' +import { packageManager } from '@pnpm/cli.meta' export { calcPnpmfilePathsOfPluginDeps, getConfig, installConfigDepsAndLoadHooks } from './getConfig.js' export * from './packageIsInstallable.js' diff --git a/cli/cli-utils/src/packageIsInstallable.ts b/cli/utils/src/packageIsInstallable.ts similarity index 93% rename from cli/cli-utils/src/packageIsInstallable.ts rename to cli/utils/src/packageIsInstallable.ts index ccc13a3894..8528aa23f4 100644 --- a/cli/cli-utils/src/packageIsInstallable.ts +++ b/cli/utils/src/packageIsInstallable.ts @@ -1,6 +1,6 @@ -import { packageManager } from '@pnpm/cli-meta' +import { packageManager } from '@pnpm/cli.meta' +import { checkPackage, UnsupportedEngineError, type WantedEngine } from '@pnpm/config.package-is-installable' import { logger } from '@pnpm/logger' -import { checkPackage, UnsupportedEngineError, type WantedEngine } from '@pnpm/package-is-installable' import type { SupportedArchitectures } from '@pnpm/types' export function packageIsInstallable ( diff --git a/cli/cli-utils/src/readDepNameCompletions.ts b/cli/utils/src/readDepNameCompletions.ts similarity index 63% rename from cli/cli-utils/src/readDepNameCompletions.ts rename to cli/utils/src/readDepNameCompletions.ts index 21cb56f41f..28ffa7845a 100644 --- a/cli/cli-utils/src/readDepNameCompletions.ts +++ b/cli/utils/src/readDepNameCompletions.ts @@ -1,5 +1,5 @@ -import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils' -import { readProjectManifest } from '@pnpm/read-project-manifest' +import { getAllDependenciesFromManifest } from '@pnpm/pkg-manifest.utils' +import { readProjectManifest } from '@pnpm/workspace.project-manifest-reader' export async function readDepNameCompletions (dir?: string): Promise> { const { manifest } = await readProjectManifest(dir ?? process.cwd()) diff --git a/cli/cli-utils/src/readProjectManifest.ts b/cli/utils/src/readProjectManifest.ts similarity index 96% rename from cli/cli-utils/src/readProjectManifest.ts rename to cli/utils/src/readProjectManifest.ts index 1821930846..8eaa589ddd 100644 --- a/cli/cli-utils/src/readProjectManifest.ts +++ b/cli/utils/src/readProjectManifest.ts @@ -1,5 +1,5 @@ -import * as utils from '@pnpm/read-project-manifest' import type { ProjectManifest, SupportedArchitectures } from '@pnpm/types' +import * as utils from '@pnpm/workspace.project-manifest-reader' import { packageIsInstallable } from './packageIsInstallable.js' diff --git a/cli/cli-utils/src/recursiveSummary.ts b/cli/utils/src/recursiveSummary.ts similarity index 100% rename from cli/cli-utils/src/recursiveSummary.ts rename to cli/utils/src/recursiveSummary.ts diff --git a/cli/cli-utils/src/style.ts b/cli/utils/src/style.ts similarity index 100% rename from cli/cli-utils/src/style.ts rename to cli/utils/src/style.ts diff --git a/cli/cli-utils/test/getConfig.test.ts b/cli/utils/test/getConfig.test.ts similarity index 99% rename from cli/cli-utils/test/getConfig.test.ts rename to cli/utils/test/getConfig.test.ts index 9002626f69..6c97d8c8ed 100644 --- a/cli/cli-utils/test/getConfig.test.ts +++ b/cli/utils/test/getConfig.test.ts @@ -3,7 +3,7 @@ import fs from 'node:fs' import path from 'node:path' import { jest } from '@jest/globals' -import { calcPnpmfilePathsOfPluginDeps, getConfig } from '@pnpm/cli-utils' +import { calcPnpmfilePathsOfPluginDeps, getConfig } from '@pnpm/cli.utils' import { prepare } from '@pnpm/prepare' beforeEach(() => { diff --git a/cli/cli-utils/test/tsconfig.json b/cli/utils/test/tsconfig.json similarity index 100% rename from cli/cli-utils/test/tsconfig.json rename to cli/utils/test/tsconfig.json diff --git a/cli/cli-utils/tsconfig.json b/cli/utils/tsconfig.json similarity index 75% rename from cli/cli-utils/tsconfig.json rename to cli/utils/tsconfig.json index 86566e8e76..09f47c422e 100644 --- a/cli/cli-utils/tsconfig.json +++ b/cli/utils/tsconfig.json @@ -12,15 +12,15 @@ { "path": "../../__utils__/prepare" }, - { - "path": "../../config/config" - }, { "path": "../../config/deps-installer" }, { "path": "../../config/package-is-installable" }, + { + "path": "../../config/reader" + }, { "path": "../../hooks/pnpmfile" }, @@ -34,19 +34,19 @@ "path": "../../packages/types" }, { - "path": "../../pkg-manifest/manifest-utils" + "path": "../../pkg-manifest/utils" }, { - "path": "../../pkg-manifest/read-project-manifest" + "path": "../../store/connection-manager" }, { - "path": "../../store/store-connection-manager" - }, - { - "path": "../cli-meta" + "path": "../../workspace/project-manifest-reader" }, { "path": "../default-reporter" + }, + { + "path": "../meta" } ] } diff --git a/cli/cli-utils/tsconfig.lint.json b/cli/utils/tsconfig.lint.json similarity index 100% rename from cli/cli-utils/tsconfig.lint.json rename to cli/utils/tsconfig.lint.json diff --git a/config/commands/package.json b/config/commands/package.json index 480d260e8f..0deac9cf4c 100644 --- a/config/commands/package.json +++ b/config/commands/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/plugin-commands-config", + "name": "@pnpm/config.commands", "version": "1000.2.10", "description": "Commands for reading and writing settings to/from config files", "keywords": [ @@ -32,15 +32,15 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-utils": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/naming-cases": "workspace:*", + "@pnpm/exec.run-npm": "workspace:*", "@pnpm/object.key-sorting": "workspace:*", "@pnpm/object.property-path": "workspace:*", - "@pnpm/run-npm": "workspace:*", - "@pnpm/workspace.manifest-writer": "workspace:*", + "@pnpm/text.naming-cases": "workspace:*", + "@pnpm/workspace.workspace-manifest-writer": "workspace:*", "camelcase": "catalog:", "ini": "catalog:", "lodash.kebabcase": "catalog:", @@ -54,8 +54,8 @@ }, "devDependencies": { "@jest/globals": "catalog:", + "@pnpm/config.commands": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/plugin-commands-config": "workspace:*", "@pnpm/prepare": "workspace:*", "@types/ini": "catalog:", "@types/lodash.kebabcase": "catalog:", diff --git a/config/commands/src/ConfigCommandOptions.ts b/config/commands/src/ConfigCommandOptions.ts index d5ba635866..6bd43c007d 100644 --- a/config/commands/src/ConfigCommandOptions.ts +++ b/config/commands/src/ConfigCommandOptions.ts @@ -1,4 +1,4 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' export type ConfigCommandOptions = Pick ({ +jest.unstable_mockModule('@pnpm/exec.run-npm', () => ({ runNpm: jest.fn(), })) -const { config } = await import('@pnpm/plugin-commands-config') -const { runNpm } = await import('@pnpm/run-npm') +const { config } = await import('@pnpm/config.commands') +const { runNpm } = await import('@pnpm/exec.run-npm') describe.each( [ diff --git a/config/commands/tsconfig.json b/config/commands/tsconfig.json index bd9b6734ad..5ece286b46 100644 --- a/config/commands/tsconfig.json +++ b/config/commands/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../__utils__/prepare" }, { - "path": "../../cli/cli-utils" + "path": "../../cli/utils" }, { "path": "../../exec/run-npm" @@ -37,10 +37,10 @@ "path": "../../text/naming-cases" }, { - "path": "../../workspace/manifest-writer" + "path": "../../workspace/workspace-manifest-writer" }, { - "path": "../config" + "path": "../reader" } ] } diff --git a/config/deps-installer/package.json b/config/deps-installer/package.json index 9fcaa6f620..aa091f3d2b 100644 --- a/config/deps-installer/package.json +++ b/config/deps-installer/package.json @@ -33,25 +33,25 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/calc-dep-state": "workspace:*", - "@pnpm/config.config-writer": "workspace:*", + "@pnpm/config.pick-registry-for-package": "workspace:*", + "@pnpm/config.writer": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", + "@pnpm/deps.graph-hasher": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetch": "workspace:*", + "@pnpm/fs.read-modules-dir": "workspace:*", + "@pnpm/installing.resolve-dependencies": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.pruner": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/network.auth-header": "workspace:*", - "@pnpm/npm-resolver": "workspace:*", - "@pnpm/package-store": "workspace:*", - "@pnpm/parse-wanted-dependency": "workspace:*", - "@pnpm/pick-registry-for-package": "workspace:*", - "@pnpm/read-modules-dir": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/resolve-dependencies": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/network.fetch": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", + "@pnpm/resolving.parse-wanted-dependency": "workspace:*", + "@pnpm/store.controller": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "catalog:", "get-npm-tarball-url": "catalog:", diff --git a/config/deps-installer/src/installConfigDeps.ts b/config/deps-installer/src/installConfigDeps.ts index 4590e2bbaa..12f251db46 100644 --- a/config/deps-installer/src/installConfigDeps.ts +++ b/config/deps-installer/src/installConfigDeps.ts @@ -1,14 +1,14 @@ import fs from 'node:fs' import path from 'node:path' -import { calcLeafGlobalVirtualStorePath } from '@pnpm/calc-dep-state' +import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package' import { installingConfigDepsLogger } from '@pnpm/core-loggers' +import { calcLeafGlobalVirtualStorePath } from '@pnpm/deps.graph-hasher' import { PnpmError } from '@pnpm/error' +import { readModulesDir } from '@pnpm/fs.read-modules-dir' import { type EnvLockfile, readEnvLockfile } from '@pnpm/lockfile.fs' -import type { StoreController } from '@pnpm/package-store' -import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package' -import { readModulesDir } from '@pnpm/read-modules-dir' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import type { StoreController } from '@pnpm/store.controller' import type { ConfigDependencies, Registries } from '@pnpm/types' import { rimraf } from '@zkochan/rimraf' import getNpmTarballUrl from 'get-npm-tarball-url' diff --git a/config/deps-installer/src/migrateConfigDeps.ts b/config/deps-installer/src/migrateConfigDeps.ts index aaeec664cd..4f8b1ac0cd 100644 --- a/config/deps-installer/src/migrateConfigDeps.ts +++ b/config/deps-installer/src/migrateConfigDeps.ts @@ -1,8 +1,8 @@ -import { writeSettings } from '@pnpm/config.config-writer' +import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package' +import { writeSettings } from '@pnpm/config.writer' import { PnpmError } from '@pnpm/error' import { createEnvLockfile, writeEnvLockfile } from '@pnpm/lockfile.fs' import { toLockfileResolution } from '@pnpm/lockfile.utils' -import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package' import type { ConfigDependencies, ConfigDependencySpecifiers, Registries } from '@pnpm/types' import getNpmTarballUrl from 'get-npm-tarball-url' diff --git a/config/deps-installer/src/resolveAndInstallConfigDeps.ts b/config/deps-installer/src/resolveAndInstallConfigDeps.ts index 0968bad9b4..41fb4da85e 100644 --- a/config/deps-installer/src/resolveAndInstallConfigDeps.ts +++ b/config/deps-installer/src/resolveAndInstallConfigDeps.ts @@ -1,5 +1,5 @@ +import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package' import { PnpmError } from '@pnpm/error' -import { createFetchFromRegistry, type CreateFetchFromRegistryOptions } from '@pnpm/fetch' import { createEnvLockfile, type EnvLockfile, @@ -8,8 +8,8 @@ import { } from '@pnpm/lockfile.fs' import { toLockfileResolution } from '@pnpm/lockfile.utils' import { createGetAuthHeaderByURI } from '@pnpm/network.auth-header' -import { createNpmResolver, type ResolverFactoryOptions } from '@pnpm/npm-resolver' -import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package' +import { createFetchFromRegistry, type CreateFetchFromRegistryOptions } from '@pnpm/network.fetch' +import { createNpmResolver, type ResolverFactoryOptions } from '@pnpm/resolving.npm-resolver' import type { ConfigDependencies } from '@pnpm/types' import getNpmTarballUrl from 'get-npm-tarball-url' diff --git a/config/deps-installer/src/resolveConfigDeps.ts b/config/deps-installer/src/resolveConfigDeps.ts index 14c3b2dcce..ef8e76b8dc 100644 --- a/config/deps-installer/src/resolveConfigDeps.ts +++ b/config/deps-installer/src/resolveConfigDeps.ts @@ -1,6 +1,6 @@ -import { writeSettings } from '@pnpm/config.config-writer' +import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package' +import { writeSettings } from '@pnpm/config.writer' import { PnpmError } from '@pnpm/error' -import { createFetchFromRegistry, type CreateFetchFromRegistryOptions } from '@pnpm/fetch' import { createEnvLockfile, type EnvLockfile, @@ -9,9 +9,9 @@ import { } from '@pnpm/lockfile.fs' import { toLockfileResolution } from '@pnpm/lockfile.utils' import { createGetAuthHeaderByURI } from '@pnpm/network.auth-header' -import { createNpmResolver, type ResolverFactoryOptions } from '@pnpm/npm-resolver' -import { parseWantedDependency } from '@pnpm/parse-wanted-dependency' -import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package' +import { createFetchFromRegistry, type CreateFetchFromRegistryOptions } from '@pnpm/network.fetch' +import { createNpmResolver, type ResolverFactoryOptions } from '@pnpm/resolving.npm-resolver' +import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency' import type { ConfigDependencies, ConfigDependencySpecifiers } from '@pnpm/types' import { installConfigDeps, type InstallConfigDepsOpts } from './installConfigDeps.js' diff --git a/config/deps-installer/src/resolveManifestDependencies.ts b/config/deps-installer/src/resolveManifestDependencies.ts index 3070ab2fa4..466d5f5d0a 100644 --- a/config/deps-installer/src/resolveManifestDependencies.ts +++ b/config/deps-installer/src/resolveManifestDependencies.ts @@ -1,15 +1,15 @@ import path from 'node:path' import { LOCKFILE_VERSION } from '@pnpm/constants' +import { + getWantedDependencies, + resolveDependencies, +} from '@pnpm/installing.resolve-dependencies' import type { LockfileObject, ProjectSnapshot, } from '@pnpm/lockfile.types' -import { - getWantedDependencies, - resolveDependencies, -} from '@pnpm/resolve-dependencies' -import type { StoreController } from '@pnpm/store-controller-types' +import type { StoreController } from '@pnpm/store.controller-types' import type { ProjectId, ProjectManifest, diff --git a/config/deps-installer/src/resolvePackageManagerIntegrities.ts b/config/deps-installer/src/resolvePackageManagerIntegrities.ts index e1874fade5..eedd3c50ed 100644 --- a/config/deps-installer/src/resolvePackageManagerIntegrities.ts +++ b/config/deps-installer/src/resolvePackageManagerIntegrities.ts @@ -1,7 +1,7 @@ import { convertToLockfileFile, createEnvLockfile, readEnvLockfile, writeEnvLockfile } from '@pnpm/lockfile.fs' import { pruneSharedLockfile } from '@pnpm/lockfile.pruner' import type { EnvLockfile } from '@pnpm/lockfile.types' -import type { StoreController } from '@pnpm/package-store' +import type { StoreController } from '@pnpm/store.controller' import type { DepPath, ProjectId, Registries } from '@pnpm/types' import { convertToLockfileEnvObject } from './pruneEnvLockfile.js' diff --git a/config/deps-installer/tsconfig.json b/config/deps-installer/tsconfig.json index 051a757f3e..567518a691 100644 --- a/config/deps-installer/tsconfig.json +++ b/config/deps-installer/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../__utils__/prepare" }, { - "path": "../../deps/calc-dep-state" + "path": "../../deps/graph-hasher" }, { "path": "../../fs/read-modules-dir" @@ -61,10 +61,10 @@ "path": "../../resolving/parse-wanted-dependency" }, { - "path": "../../store/package-store" + "path": "../../store/controller" }, { - "path": "../../store/store-controller-types" + "path": "../../store/controller-types" }, { "path": "../../testing/temp-store" @@ -73,10 +73,10 @@ "path": "../../worker" }, { - "path": "../config-writer" + "path": "../pick-registry-for-package" }, { - "path": "../pick-registry-for-package" + "path": "../writer" } ] } diff --git a/config/matcher/package.json b/config/matcher/package.json index 09beb6767d..d2a7f04de1 100644 --- a/config/matcher/package.json +++ b/config/matcher/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/matcher", + "name": "@pnpm/config.matcher", "version": "1000.1.0", "description": "A simple pattern matcher for pnpm", "keywords": [ @@ -37,7 +37,7 @@ "escape-string-regexp": "catalog:" }, "devDependencies": { - "@pnpm/matcher": "workspace:*" + "@pnpm/config.matcher": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/config/matcher/test/index.ts b/config/matcher/test/index.ts index d1fb1122b1..00dff893a7 100644 --- a/config/matcher/test/index.ts +++ b/config/matcher/test/index.ts @@ -1,4 +1,4 @@ -import { createMatcher, createMatcherWithIndex } from '@pnpm/matcher' +import { createMatcher, createMatcherWithIndex } from '@pnpm/config.matcher' test('matcher()', () => { { diff --git a/config/normalize-registries/package.json b/config/normalize-registries/package.json index 41d4815337..c3b016ccda 100644 --- a/config/normalize-registries/package.json +++ b/config/normalize-registries/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/normalize-registries", + "name": "@pnpm/config.normalize-registries", "version": "1000.1.4", "description": "Accepts a mapping of registry URLs and returns a mapping with the same URLs but normalized", "keywords": [ @@ -35,7 +35,7 @@ "ramda": "catalog:" }, "devDependencies": { - "@pnpm/normalize-registries": "workspace:*", + "@pnpm/config.normalize-registries": "workspace:*", "@types/ramda": "catalog:" }, "engines": { diff --git a/config/package-is-installable/package.json b/config/package-is-installable/package.json index 6e250c3bdf..29887ba48c 100644 --- a/config/package-is-installable/package.json +++ b/config/package-is-installable/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/package-is-installable", + "name": "@pnpm/config.package-is-installable", "version": "1000.0.15", "description": "Checks if a package is installable on the current system", "keywords": [ @@ -32,9 +32,9 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-meta": "workspace:*", + "@pnpm/cli.meta": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/env.system-node-version": "workspace:*", + "@pnpm/engine.runtime.system-node-version": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/types": "workspace:*", "detect-libc": "catalog:", @@ -47,8 +47,8 @@ }, "devDependencies": { "@jest/globals": "catalog:", + "@pnpm/config.package-is-installable": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/package-is-installable": "workspace:*", "@types/semver": "catalog:" }, "engines": { diff --git a/config/package-is-installable/src/index.ts b/config/package-is-installable/src/index.ts index 00fa3827da..cfcb77edbf 100644 --- a/config/package-is-installable/src/index.ts +++ b/config/package-is-installable/src/index.ts @@ -2,7 +2,7 @@ import { installCheckLogger, skippedOptionalDependencyLogger, } from '@pnpm/core-loggers' -import { getSystemNodeVersion } from '@pnpm/env.system-node-version' +import { getSystemNodeVersion } from '@pnpm/engine.runtime.system-node-version' import type { SupportedArchitectures } from '@pnpm/types' import { checkEngine, UnsupportedEngineError, type WantedEngine } from './checkEngine.js' diff --git a/config/package-is-installable/tsconfig.json b/config/package-is-installable/tsconfig.json index 6d1881bab2..2f4900584b 100644 --- a/config/package-is-installable/tsconfig.json +++ b/config/package-is-installable/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../cli/cli-meta" + "path": "../../cli/meta" }, { "path": "../../engine/runtime/system-node-version" diff --git a/config/parse-overrides/package.json b/config/parse-overrides/package.json index ddd80801ef..1fb06ad318 100644 --- a/config/parse-overrides/package.json +++ b/config/parse-overrides/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/parse-overrides", + "name": "@pnpm/config.parse-overrides", "version": "1001.0.3", "description": "Parse overrides", "keywords": [ @@ -34,10 +34,10 @@ "@pnpm/catalogs.resolver": "workspace:*", "@pnpm/catalogs.types": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/parse-wanted-dependency": "workspace:*" + "@pnpm/resolving.parse-wanted-dependency": "workspace:*" }, "devDependencies": { - "@pnpm/parse-overrides": "workspace:*" + "@pnpm/config.parse-overrides": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/config/parse-overrides/src/index.ts b/config/parse-overrides/src/index.ts index 87660ba114..92352152a2 100644 --- a/config/parse-overrides/src/index.ts +++ b/config/parse-overrides/src/index.ts @@ -1,7 +1,7 @@ import { matchCatalogResolveResult, resolveFromCatalog } from '@pnpm/catalogs.resolver' import type { Catalogs } from '@pnpm/catalogs.types' import { PnpmError } from '@pnpm/error' -import { parseWantedDependency } from '@pnpm/parse-wanted-dependency' +import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency' const DELIMITER_REGEX = /[^ |@]>/ diff --git a/config/parse-overrides/test/index.ts b/config/parse-overrides/test/index.ts index ddba580020..f72099488c 100644 --- a/config/parse-overrides/test/index.ts +++ b/config/parse-overrides/test/index.ts @@ -1,4 +1,4 @@ -import { parseOverrides } from '@pnpm/parse-overrides' +import { parseOverrides } from '@pnpm/config.parse-overrides' test.each([ [ diff --git a/config/pick-registry-for-package/package.json b/config/pick-registry-for-package/package.json index d901f435fa..79caf5cdc8 100644 --- a/config/pick-registry-for-package/package.json +++ b/config/pick-registry-for-package/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/pick-registry-for-package", + "name": "@pnpm/config.pick-registry-for-package", "version": "1000.0.11", "description": "Picks the right registry for the package from a registries config", "keywords": [ @@ -34,7 +34,7 @@ "@pnpm/types": "workspace:*" }, "devDependencies": { - "@pnpm/pick-registry-for-package": "workspace:*" + "@pnpm/config.pick-registry-for-package": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/config/pick-registry-for-package/test/index.spec.ts b/config/pick-registry-for-package/test/index.spec.ts index 4f0111abc2..241f7cef2a 100644 --- a/config/pick-registry-for-package/test/index.spec.ts +++ b/config/pick-registry-for-package/test/index.spec.ts @@ -1,4 +1,4 @@ -import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package' +import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package' test('pick correct scope', () => { const registries = { diff --git a/config/config/CHANGELOG.md b/config/reader/CHANGELOG.md similarity index 100% rename from config/config/CHANGELOG.md rename to config/reader/CHANGELOG.md diff --git a/config/config/README.md b/config/reader/README.md similarity index 100% rename from config/config/README.md rename to config/reader/README.md diff --git a/config/config/package.json b/config/reader/package.json similarity index 80% rename from config/config/package.json rename to config/reader/package.json index 6eeb44e3d2..c3eb72a1a4 100644 --- a/config/config/package.json +++ b/config/reader/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/config", + "name": "@pnpm/config.reader", "version": "1004.4.2", "description": "Gets configuration options for pnpm", "keywords": [ @@ -9,8 +9,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/config/config", - "homepage": "https://github.com/pnpm/pnpm/tree/main/config/config#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/config/reader", + "homepage": "https://github.com/pnpm/pnpm/tree/main/config/reader#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -36,16 +36,16 @@ "@pnpm/catalogs.config": "workspace:*", "@pnpm/catalogs.types": "workspace:*", "@pnpm/config.env-replace": "catalog:", + "@pnpm/config.matcher": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/git-utils": "workspace:*", - "@pnpm/matcher": "workspace:*", - "@pnpm/naming-cases": "workspace:*", + "@pnpm/hooks.pnpmfile": "workspace:*", + "@pnpm/network.git-utils": "workspace:*", "@pnpm/npm-conf": "catalog:", - "@pnpm/pnpmfile": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", + "@pnpm/text.naming-cases": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "better-path-resolve": "catalog:", "camelcase": "catalog:", "camelcase-keys": "catalog:", @@ -68,7 +68,7 @@ }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/config": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/is-windows": "catalog:", diff --git a/config/config/src/Config.ts b/config/reader/src/Config.ts similarity index 99% rename from config/config/src/Config.ts rename to config/reader/src/Config.ts index c0d9286879..1b1df5f83e 100644 --- a/config/config/src/Config.ts +++ b/config/reader/src/Config.ts @@ -1,5 +1,5 @@ import type { Catalogs } from '@pnpm/catalogs.types' -import type { Hooks } from '@pnpm/pnpmfile' +import type { Hooks } from '@pnpm/hooks.pnpmfile' import type { EngineDependency, Finder, diff --git a/config/config/src/auth.test.ts b/config/reader/src/auth.test.ts similarity index 100% rename from config/config/src/auth.test.ts rename to config/reader/src/auth.test.ts diff --git a/config/config/src/auth.ts b/config/reader/src/auth.ts similarity index 100% rename from config/config/src/auth.ts rename to config/reader/src/auth.ts diff --git a/config/config/src/checkGlobalBinDir.ts b/config/reader/src/checkGlobalBinDir.ts similarity index 100% rename from config/config/src/checkGlobalBinDir.ts rename to config/reader/src/checkGlobalBinDir.ts diff --git a/config/config/src/concurrency.ts b/config/reader/src/concurrency.ts similarity index 100% rename from config/config/src/concurrency.ts rename to config/reader/src/concurrency.ts diff --git a/config/config/src/configFileKey.ts b/config/reader/src/configFileKey.ts similarity index 100% rename from config/config/src/configFileKey.ts rename to config/reader/src/configFileKey.ts diff --git a/config/config/src/dependencyBuildOptions.ts b/config/reader/src/dependencyBuildOptions.ts similarity index 100% rename from config/config/src/dependencyBuildOptions.ts rename to config/reader/src/dependencyBuildOptions.ts diff --git a/config/config/src/dirs.ts b/config/reader/src/dirs.ts similarity index 100% rename from config/config/src/dirs.ts rename to config/reader/src/dirs.ts diff --git a/config/config/src/env.ts b/config/reader/src/env.ts similarity index 100% rename from config/config/src/env.ts rename to config/reader/src/env.ts diff --git a/config/config/src/getNetworkConfigs.ts b/config/reader/src/getNetworkConfigs.ts similarity index 100% rename from config/config/src/getNetworkConfigs.ts rename to config/reader/src/getNetworkConfigs.ts diff --git a/config/config/src/getOptionsFromRootManifest.ts b/config/reader/src/getOptionsFromRootManifest.ts similarity index 100% rename from config/config/src/getOptionsFromRootManifest.ts rename to config/reader/src/getOptionsFromRootManifest.ts diff --git a/config/config/src/index.ts b/config/reader/src/index.ts similarity index 99% rename from config/config/src/index.ts rename to config/reader/src/index.ts index 4fa499270b..8b95cd1c85 100644 --- a/config/config/src/index.ts +++ b/config/reader/src/index.ts @@ -3,16 +3,16 @@ import os from 'node:os' import path from 'node:path' import { getCatalogsFromWorkspaceManifest } from '@pnpm/catalogs.config' +import { createMatcher } from '@pnpm/config.matcher' import { GLOBAL_CONFIG_YAML_FILENAME, GLOBAL_LAYOUT_VERSION } from '@pnpm/constants' import { PnpmError } from '@pnpm/error' -import { getCurrentBranch } from '@pnpm/git-utils' -import { createMatcher } from '@pnpm/matcher' -import { isCamelCase } from '@pnpm/naming-cases' +import { getCurrentBranch } from '@pnpm/network.git-utils' import loadNpmConf from '@pnpm/npm-conf' import type npmTypes from '@pnpm/npm-conf/lib/types.js' -import { safeReadProjectManifestOnly } from '@pnpm/read-project-manifest' +import { isCamelCase } from '@pnpm/text.naming-cases' import type { DevEngines, EngineDependency, ProjectManifest } from '@pnpm/types' -import { readWorkspaceManifest, type WorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' +import { readWorkspaceManifest, type WorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { betterPathResolve } from 'better-path-resolve' import camelcase from 'camelcase' import { isCI } from 'ci-info' diff --git a/config/config/src/inheritPickedConfig.ts b/config/reader/src/inheritPickedConfig.ts similarity index 100% rename from config/config/src/inheritPickedConfig.ts rename to config/reader/src/inheritPickedConfig.ts diff --git a/config/config/src/overrideSupportedArchitecturesWithCLI.ts b/config/reader/src/overrideSupportedArchitecturesWithCLI.ts similarity index 100% rename from config/config/src/overrideSupportedArchitecturesWithCLI.ts rename to config/reader/src/overrideSupportedArchitecturesWithCLI.ts diff --git a/config/config/src/parseAuthInfo.ts b/config/reader/src/parseAuthInfo.ts similarity index 100% rename from config/config/src/parseAuthInfo.ts rename to config/reader/src/parseAuthInfo.ts diff --git a/config/config/src/projectConfig.ts b/config/reader/src/projectConfig.ts similarity index 100% rename from config/config/src/projectConfig.ts rename to config/reader/src/projectConfig.ts diff --git a/config/config/src/transformPath.ts b/config/reader/src/transformPath.ts similarity index 100% rename from config/config/src/transformPath.ts rename to config/reader/src/transformPath.ts diff --git a/config/config/src/types.ts b/config/reader/src/types.ts similarity index 100% rename from config/config/src/types.ts rename to config/reader/src/types.ts diff --git a/config/config/test/cafile.txt b/config/reader/test/cafile.txt similarity index 100% rename from config/config/test/cafile.txt rename to config/reader/test/cafile.txt diff --git a/config/config/test/concurrency.test.ts b/config/reader/test/concurrency.test.ts similarity index 100% rename from config/config/test/concurrency.test.ts rename to config/reader/test/concurrency.test.ts diff --git a/config/config/test/dirs.test.ts b/config/reader/test/dirs.test.ts similarity index 100% rename from config/config/test/dirs.test.ts rename to config/reader/test/dirs.test.ts diff --git a/config/config/test/env.test.ts b/config/reader/test/env.test.ts similarity index 100% rename from config/config/test/env.test.ts rename to config/reader/test/env.test.ts diff --git a/config/config/test/fixtures/has-env-in-key/.npmrc b/config/reader/test/fixtures/has-env-in-key/.npmrc similarity index 100% rename from config/config/test/fixtures/has-env-in-key/.npmrc rename to config/reader/test/fixtures/has-env-in-key/.npmrc diff --git a/config/config/test/fixtures/has-number-setting/.npmrc b/config/reader/test/fixtures/has-number-setting/.npmrc similarity index 100% rename from config/config/test/fixtures/has-number-setting/.npmrc rename to config/reader/test/fixtures/has-number-setting/.npmrc diff --git a/config/config/test/fixtures/never-built-dependencies/pnpm-workspace.yaml b/config/reader/test/fixtures/never-built-dependencies/pnpm-workspace.yaml similarity index 100% rename from config/config/test/fixtures/never-built-dependencies/pnpm-workspace.yaml rename to config/reader/test/fixtures/never-built-dependencies/pnpm-workspace.yaml diff --git a/config/config/test/fixtures/pkg-using-workspaces/package.json b/config/reader/test/fixtures/pkg-using-workspaces/package.json similarity index 100% rename from config/config/test/fixtures/pkg-using-workspaces/package.json rename to config/reader/test/fixtures/pkg-using-workspaces/package.json diff --git a/config/config/test/fixtures/pkg-with-valid-workspace-yaml/pnpm-workspace.yaml b/config/reader/test/fixtures/pkg-with-valid-workspace-yaml/pnpm-workspace.yaml similarity index 100% rename from config/config/test/fixtures/pkg-with-valid-workspace-yaml/pnpm-workspace.yaml rename to config/reader/test/fixtures/pkg-with-valid-workspace-yaml/pnpm-workspace.yaml diff --git a/config/config/test/fixtures/settings-in-workspace-yaml/pnpm-workspace.yaml b/config/reader/test/fixtures/settings-in-workspace-yaml/pnpm-workspace.yaml similarity index 100% rename from config/config/test/fixtures/settings-in-workspace-yaml/pnpm-workspace.yaml rename to config/reader/test/fixtures/settings-in-workspace-yaml/pnpm-workspace.yaml diff --git a/config/config/test/getNetworkConfigs.test.ts b/config/reader/test/getNetworkConfigs.test.ts similarity index 100% rename from config/config/test/getNetworkConfigs.test.ts rename to config/reader/test/getNetworkConfigs.test.ts diff --git a/config/config/test/getOptionsFromRootManifest.test.ts b/config/reader/test/getOptionsFromRootManifest.test.ts similarity index 100% rename from config/config/test/getOptionsFromRootManifest.test.ts rename to config/reader/test/getOptionsFromRootManifest.test.ts diff --git a/config/config/test/global-bin-dir-windows/etc/npmrc b/config/reader/test/global-bin-dir-windows/etc/npmrc similarity index 100% rename from config/config/test/global-bin-dir-windows/etc/npmrc rename to config/reader/test/global-bin-dir-windows/etc/npmrc diff --git a/config/config/test/global-bin-dir/etc/npmrc b/config/reader/test/global-bin-dir/etc/npmrc similarity index 100% rename from config/config/test/global-bin-dir/etc/npmrc rename to config/reader/test/global-bin-dir/etc/npmrc diff --git a/config/config/test/globalBinDir.test.ts b/config/reader/test/globalBinDir.test.ts similarity index 98% rename from config/config/test/globalBinDir.test.ts rename to config/reader/test/globalBinDir.test.ts index 66306219b5..2b1dd4b042 100644 --- a/config/config/test/globalBinDir.test.ts +++ b/config/reader/test/globalBinDir.test.ts @@ -36,7 +36,7 @@ jest.mock('@pnpm/npm-conf/lib/conf', () => { return MockedConf }) -const { getConfig } = await import('@pnpm/config') +const { getConfig } = await import('@pnpm/config.reader') test('respects global-bin-dir in npmrc', async () => { const { config } = await getConfig({ diff --git a/config/config/test/has-workspace-yaml/pnpm-workspace.yaml b/config/reader/test/has-workspace-yaml/pnpm-workspace.yaml similarity index 100% rename from config/config/test/has-workspace-yaml/pnpm-workspace.yaml rename to config/reader/test/has-workspace-yaml/pnpm-workspace.yaml diff --git a/config/config/test/ignore-test-pattern/.npmrc b/config/reader/test/ignore-test-pattern/.npmrc similarity index 100% rename from config/config/test/ignore-test-pattern/.npmrc rename to config/reader/test/ignore-test-pattern/.npmrc diff --git a/config/config/test/index.ts b/config/reader/test/index.ts similarity index 99% rename from config/config/test/index.ts rename to config/reader/test/index.ts index 0172e1c892..34d1e218e5 100644 --- a/config/config/test/index.ts +++ b/config/reader/test/index.ts @@ -11,10 +11,10 @@ import PATH from 'path-name' import symlinkDir from 'symlink-dir' import { writeYamlFileSync } from 'write-yaml-file' -jest.unstable_mockModule('@pnpm/git-utils', () => ({ getCurrentBranch: jest.fn() })) +jest.unstable_mockModule('@pnpm/network.git-utils', () => ({ getCurrentBranch: jest.fn() })) -const { getConfig } = await import('@pnpm/config') -const { getCurrentBranch } = await import('@pnpm/git-utils') +const { getConfig } = await import('@pnpm/config.reader') +const { getCurrentBranch } = await import('@pnpm/network.git-utils') // To override any local settings, // we force the default values of config @@ -554,7 +554,7 @@ test('convert shamefully-flatten to hoist-pattern=* and warn', async () => { ]) }) -// hoist → hoistPattern processing is done in @pnpm/cli-utils +// hoist → hoistPattern processing is done in @pnpm/cli.utils test('hoist-pattern is unchanged if --no-hoist used', async () => { const { config } = await getConfig({ cliOptions: { @@ -618,7 +618,7 @@ test('throw error if --no-hoist is used with --hoist-pattern', async () => { }) }) -// public-hoist-pattern normalization is done in @pnpm/cli-utils +// public-hoist-pattern normalization is done in @pnpm/cli.utils test('normalizing the value of public-hoist-pattern', async () => { { const { config } = await getConfig({ @@ -1302,7 +1302,7 @@ test('settings sharedWorkspaceLockfile in pnpm-workspace.yaml should take effect expect(config.lockfileDir).toBeUndefined() }) -// shamefullyHoist → publicHoistPattern conversion is done in @pnpm/cli-utils +// shamefullyHoist → publicHoistPattern conversion is done in @pnpm/cli.utils test('settings shamefullyHoist in pnpm-workspace.yaml should take effect', async () => { const workspaceDir = f.find('settings-in-workspace-yaml') process.chdir(workspaceDir) diff --git a/config/config/test/overrideSupportedArchitecturesWithCLI.test.ts b/config/reader/test/overrideSupportedArchitecturesWithCLI.test.ts similarity index 100% rename from config/config/test/overrideSupportedArchitecturesWithCLI.test.ts rename to config/reader/test/overrideSupportedArchitecturesWithCLI.test.ts diff --git a/config/config/test/parseAuthInfo.test.ts b/config/reader/test/parseAuthInfo.test.ts similarity index 100% rename from config/config/test/parseAuthInfo.test.ts rename to config/reader/test/parseAuthInfo.test.ts diff --git a/config/config/test/projectConfig.test.ts b/config/reader/test/projectConfig.test.ts similarity index 100% rename from config/config/test/projectConfig.test.ts rename to config/reader/test/projectConfig.test.ts diff --git a/config/config/test/scoped-registries.ini b/config/reader/test/scoped-registries.ini similarity index 100% rename from config/config/test/scoped-registries.ini rename to config/reader/test/scoped-registries.ini diff --git a/config/config/test/transformPath.test.ts b/config/reader/test/transformPath.test.ts similarity index 100% rename from config/config/test/transformPath.test.ts rename to config/reader/test/transformPath.test.ts diff --git a/config/config/test/tsconfig.json b/config/reader/test/tsconfig.json similarity index 100% rename from config/config/test/tsconfig.json rename to config/reader/test/tsconfig.json diff --git a/config/config/test/using-test-pattern/pnpm-workspace.yaml b/config/reader/test/using-test-pattern/pnpm-workspace.yaml similarity index 100% rename from config/config/test/using-test-pattern/pnpm-workspace.yaml rename to config/reader/test/using-test-pattern/pnpm-workspace.yaml diff --git a/config/config/tsconfig.json b/config/reader/tsconfig.json similarity index 87% rename from config/config/tsconfig.json rename to config/reader/tsconfig.json index cbe599cb24..c1c26967cd 100644 --- a/config/config/tsconfig.json +++ b/config/reader/tsconfig.json @@ -36,14 +36,14 @@ { "path": "../../packages/types" }, - { - "path": "../../pkg-manifest/read-project-manifest" - }, { "path": "../../text/naming-cases" }, { - "path": "../../workspace/read-manifest" + "path": "../../workspace/project-manifest-reader" + }, + { + "path": "../../workspace/workspace-manifest-reader" }, { "path": "../matcher" diff --git a/config/config-writer/tsconfig.lint.json b/config/reader/tsconfig.lint.json similarity index 100% rename from config/config-writer/tsconfig.lint.json rename to config/reader/tsconfig.lint.json diff --git a/config/version-policy/package.json b/config/version-policy/package.json index bab46764bf..602cf7dcbf 100644 --- a/config/version-policy/package.json +++ b/config/version-policy/package.json @@ -31,8 +31,8 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/config.matcher": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/matcher": "workspace:*", "@pnpm/types": "workspace:*", "semver": "catalog:" }, diff --git a/config/version-policy/src/index.ts b/config/version-policy/src/index.ts index c536b10ba6..34bda37f1f 100644 --- a/config/version-policy/src/index.ts +++ b/config/version-policy/src/index.ts @@ -1,5 +1,5 @@ +import { createMatcher, type Matcher } from '@pnpm/config.matcher' import { PnpmError } from '@pnpm/error' -import { createMatcher, type Matcher } from '@pnpm/matcher' import type { PackageVersionPolicy } from '@pnpm/types' import semver from 'semver' diff --git a/config/config-writer/CHANGELOG.md b/config/writer/CHANGELOG.md similarity index 100% rename from config/config-writer/CHANGELOG.md rename to config/writer/CHANGELOG.md diff --git a/config/config-writer/README.md b/config/writer/README.md similarity index 100% rename from config/config-writer/README.md rename to config/writer/README.md diff --git a/config/config-writer/package.json b/config/writer/package.json similarity index 71% rename from config/config-writer/package.json rename to config/writer/package.json index 4478866325..8071aff106 100644 --- a/config/config-writer/package.json +++ b/config/writer/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/config.config-writer", + "name": "@pnpm/config.writer", "version": "1000.0.14", "description": "Functions for updating the configuration settings", "keywords": [ @@ -9,8 +9,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/config/config-writer", - "homepage": "https://github.com/pnpm/pnpm/tree/main/config/config-writer#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/config/writer", + "homepage": "https://github.com/pnpm/pnpm/tree/main/config/writer#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -32,13 +32,13 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/read-project-manifest": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/workspace.manifest-writer": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", + "@pnpm/workspace.workspace-manifest-writer": "workspace:*", "ramda": "catalog:" }, "devDependencies": { - "@pnpm/config.config-writer": "workspace:*", + "@pnpm/config.writer": "workspace:*", "@types/ramda": "catalog:" }, "engines": { diff --git a/config/config-writer/src/index.ts b/config/writer/src/index.ts similarity index 91% rename from config/config-writer/src/index.ts rename to config/writer/src/index.ts index 912be9b34a..db3bbd280e 100644 --- a/config/config-writer/src/index.ts +++ b/config/writer/src/index.ts @@ -1,6 +1,6 @@ -import { tryReadProjectManifest } from '@pnpm/read-project-manifest' import type { PnpmSettings, ProjectManifest } from '@pnpm/types' -import { updateWorkspaceManifest } from '@pnpm/workspace.manifest-writer' +import { tryReadProjectManifest } from '@pnpm/workspace.project-manifest-reader' +import { updateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-writer' import { equals } from 'ramda' export interface WriteSettingsOptions { diff --git a/config/config-writer/tsconfig.json b/config/writer/tsconfig.json similarity index 70% rename from config/config-writer/tsconfig.json rename to config/writer/tsconfig.json index 6a3a3a8586..993bf68e32 100644 --- a/config/config-writer/tsconfig.json +++ b/config/writer/tsconfig.json @@ -13,10 +13,10 @@ "path": "../../packages/types" }, { - "path": "../../pkg-manifest/read-project-manifest" + "path": "../../workspace/project-manifest-reader" }, { - "path": "../../workspace/manifest-writer" + "path": "../../workspace/workspace-manifest-writer" } ] } diff --git a/config/config/tsconfig.lint.json b/config/writer/tsconfig.lint.json similarity index 100% rename from config/config/tsconfig.lint.json rename to config/writer/tsconfig.lint.json diff --git a/crypto/hash/package.json b/crypto/hash/package.json index 128d0643cf..7689d127d7 100644 --- a/crypto/hash/package.json +++ b/crypto/hash/package.json @@ -33,7 +33,7 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/graceful-fs": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "ssri": "catalog:" }, "devDependencies": { diff --git a/crypto/hash/src/index.ts b/crypto/hash/src/index.ts index 7014d1a391..431eaadb5f 100644 --- a/crypto/hash/src/index.ts +++ b/crypto/hash/src/index.ts @@ -1,7 +1,7 @@ import crypto from 'node:crypto' import fs from 'node:fs' -import gfs from '@pnpm/graceful-fs' +import gfs from '@pnpm/fs.graceful-fs' import ssri from 'ssri' export function createShortHash (input: string): string { diff --git a/crypto/shasums-file/package.json b/crypto/shasums-file/package.json index d7865d1085..6bfdd9ee50 100644 --- a/crypto/shasums-file/package.json +++ b/crypto/shasums-file/package.json @@ -35,7 +35,7 @@ "dependencies": { "@pnpm/crypto.hash": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetching-types": "workspace:*" + "@pnpm/fetching.types": "workspace:*" }, "devDependencies": { "@pnpm/crypto.shasums-file": "workspace:*" diff --git a/crypto/shasums-file/src/index.ts b/crypto/shasums-file/src/index.ts index 24dec9bb43..b089e75354 100644 --- a/crypto/shasums-file/src/index.ts +++ b/crypto/shasums-file/src/index.ts @@ -1,7 +1,7 @@ import { PnpmError } from '@pnpm/error' import type { FetchFromRegistry, -} from '@pnpm/fetching-types' +} from '@pnpm/fetching.types' export interface ShasumsFileItem { integrity: string diff --git a/crypto/shasums-file/tsconfig.json b/crypto/shasums-file/tsconfig.json index ff688b5d8c..08bb5f09bf 100644 --- a/crypto/shasums-file/tsconfig.json +++ b/crypto/shasums-file/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../fetching/fetching-types" + "path": "../../fetching/types" }, { "path": "../../packages/error" diff --git a/deps/compliance/audit/package.json b/deps/compliance/audit/package.json index 75aea46ed0..00a3836ae6 100644 --- a/deps/compliance/audit/package.json +++ b/deps/compliance/audit/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/audit", + "name": "@pnpm/deps.compliance.audit", "version": "1002.0.14", "description": "Audit a lockfile", "keywords": [ @@ -33,23 +33,23 @@ }, "dependencies": { "@pnpm/error": "workspace:*", - "@pnpm/fetch": "workspace:*", - "@pnpm/fetching-types": "workspace:*", + "@pnpm/fetching.types": "workspace:*", "@pnpm/lockfile.detect-dep-types": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.walker": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", + "@pnpm/network.fetch": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "ramda": "catalog:" }, "peerDependencies": { "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/audit": "workspace:*", "@pnpm/constants": "workspace:*", + "@pnpm/deps.compliance.audit": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/ramda": "catalog:", diff --git a/deps/compliance/audit/src/index.ts b/deps/compliance/audit/src/index.ts index cf16efaa2f..c21b21ed3a 100644 --- a/deps/compliance/audit/src/index.ts +++ b/deps/compliance/audit/src/index.ts @@ -1,7 +1,7 @@ import { PnpmError } from '@pnpm/error' -import { type AgentOptions, fetchWithAgent, type RetryTimeoutOptions } from '@pnpm/fetch' -import type { GetAuthHeader } from '@pnpm/fetching-types' +import type { GetAuthHeader } from '@pnpm/fetching.types' import type { EnvLockfile, LockfileObject } from '@pnpm/lockfile.types' +import { type AgentOptions, fetchWithAgent, type RetryTimeoutOptions } from '@pnpm/network.fetch' import type { DependenciesField } from '@pnpm/types' import { lockfileToAuditTree } from './lockfileToAuditTree.js' diff --git a/deps/compliance/audit/src/lockfileToAuditTree.ts b/deps/compliance/audit/src/lockfileToAuditTree.ts index 87772bf4c4..98459f1f5e 100644 --- a/deps/compliance/audit/src/lockfileToAuditTree.ts +++ b/deps/compliance/audit/src/lockfileToAuditTree.ts @@ -5,8 +5,8 @@ import { convertToLockfileObject } from '@pnpm/lockfile.fs' import type { EnvLockfile, LockfileObject, TarballResolution } from '@pnpm/lockfile.types' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils' import { lockfileWalkerGroupImporterSteps, type LockfileWalkerStep } from '@pnpm/lockfile.walker' -import { safeReadProjectManifestOnly } from '@pnpm/read-project-manifest' import type { DependenciesField, ProjectId } from '@pnpm/types' +import { safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' import { map as mapValues } from 'ramda' export interface AuditNode { diff --git a/deps/compliance/audit/test/index.ts b/deps/compliance/audit/test/index.ts index 4b28a4585e..8aa4ac4c8d 100644 --- a/deps/compliance/audit/test/index.ts +++ b/deps/compliance/audit/test/index.ts @@ -1,5 +1,5 @@ -import { audit } from '@pnpm/audit' import { LOCKFILE_VERSION } from '@pnpm/constants' +import { audit } from '@pnpm/deps.compliance.audit' import type { PnpmError } from '@pnpm/error' import { fixtures } from '@pnpm/test-fixtures' import type { DepPath, ProjectId } from '@pnpm/types' diff --git a/deps/compliance/audit/tsconfig.json b/deps/compliance/audit/tsconfig.json index b0ccc2ec60..c0fec23d6b 100644 --- a/deps/compliance/audit/tsconfig.json +++ b/deps/compliance/audit/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../../__utils__/test-fixtures" }, { - "path": "../../../fetching/fetching-types" + "path": "../../../fetching/types" }, { "path": "../../../lockfile/detect-dep-types" @@ -46,7 +46,7 @@ "path": "../../../packages/types" }, { - "path": "../../../pkg-manifest/read-project-manifest" + "path": "../../../workspace/project-manifest-reader" } ] } diff --git a/deps/compliance/commands/package.json b/deps/compliance/commands/package.json index 448c801b05..1fc5e02513 100644 --- a/deps/compliance/commands/package.json +++ b/deps/compliance/commands/package.json @@ -35,26 +35,26 @@ "update-responses": "node test/audit/utils/responses/update.ts" }, "dependencies": { - "@pnpm/audit": "workspace:*", - "@pnpm/cli-meta": "workspace:*", - "@pnpm/cli-utils": "workspace:*", - "@pnpm/command": "workspace:*", - "@pnpm/common-cli-options-help": "workspace:*", - "@pnpm/config": "workspace:*", - "@pnpm/config.config-writer": "workspace:*", + "@pnpm/cli.command": "workspace:*", + "@pnpm/cli.common-cli-options-help": "workspace:*", + "@pnpm/cli.meta": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.reader": "workspace:*", + "@pnpm/config.writer": "workspace:*", "@pnpm/constants": "workspace:*", + "@pnpm/deps.compliance.audit": "workspace:*", + "@pnpm/deps.compliance.license-scanner": "workspace:*", + "@pnpm/deps.compliance.sbom": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/license-scanner": "workspace:*", + "@pnpm/installing.commands": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.walker": "workspace:*", "@pnpm/network.auth-header": "workspace:*", - "@pnpm/plugin-commands-installation": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/sbom": "workspace:*", - "@pnpm/store-path": "workspace:*", + "@pnpm/store.path": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "@zkochan/table": "catalog:", "chalk": "catalog:", "memoize": "catalog:", @@ -64,12 +64,11 @@ }, "devDependencies": { "@pnpm/deps.compliance.commands": "workspace:*", - "@pnpm/filter-workspace-packages": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/prepare": "workspace:*", - "@pnpm/read-package-json": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/test-fixtures": "workspace:*", - "@pnpm/workspace.filter-packages-from-dir": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", "@types/ramda": "catalog:", "@types/semver": "catalog:", "@types/zkochan__table": "catalog:", diff --git a/deps/compliance/commands/src/audit/audit.ts b/deps/compliance/commands/src/audit/audit.ts index db787fd102..53fef724b5 100644 --- a/deps/compliance/commands/src/audit/audit.ts +++ b/deps/compliance/commands/src/audit/audit.ts @@ -1,11 +1,11 @@ -import { audit, type AuditAdvisory, type AuditLevelNumber, type AuditLevelString, type AuditReport, type AuditVulnerabilityCounts, type IgnoredAuditVulnerabilityCounts } from '@pnpm/audit' -import { docsUrl, TABLE_OPTIONS } from '@pnpm/cli-utils' -import { type Config, types as allTypes, type UniversalOptions } from '@pnpm/config' +import { docsUrl, TABLE_OPTIONS } from '@pnpm/cli.utils' +import { type Config, types as allTypes, type UniversalOptions } from '@pnpm/config.reader' import { WANTED_LOCKFILE } from '@pnpm/constants' +import { audit, type AuditAdvisory, type AuditLevelNumber, type AuditLevelString, type AuditReport, type AuditVulnerabilityCounts, type IgnoredAuditVulnerabilityCounts } from '@pnpm/deps.compliance.audit' import { PnpmError } from '@pnpm/error' +import { type InstallCommandOptions, update } from '@pnpm/installing.commands' import { readEnvLockfile, readWantedLockfile } from '@pnpm/lockfile.fs' import { createGetAuthHeaderByURI } from '@pnpm/network.auth-header' -import { type InstallCommandOptions, update } from '@pnpm/plugin-commands-installation' import type { Registries } from '@pnpm/types' import { table } from '@zkochan/table' import chalk, { type ChalkInstance } from 'chalk' diff --git a/deps/compliance/commands/src/audit/fix.ts b/deps/compliance/commands/src/audit/fix.ts index aa95b0b475..c6fd73e170 100644 --- a/deps/compliance/commands/src/audit/fix.ts +++ b/deps/compliance/commands/src/audit/fix.ts @@ -1,5 +1,5 @@ -import type { AuditAdvisory, AuditReport } from '@pnpm/audit' -import { writeSettings } from '@pnpm/config.config-writer' +import { writeSettings } from '@pnpm/config.writer' +import type { AuditAdvisory, AuditReport } from '@pnpm/deps.compliance.audit' import { difference } from 'ramda' import type { AuditOptions } from './audit.js' diff --git a/deps/compliance/commands/src/audit/fixWithUpdate.ts b/deps/compliance/commands/src/audit/fixWithUpdate.ts index c4ca51d010..3db324b579 100644 --- a/deps/compliance/commands/src/audit/fixWithUpdate.ts +++ b/deps/compliance/commands/src/audit/fixWithUpdate.ts @@ -1,8 +1,8 @@ -import type { AuditReport } from '@pnpm/audit' import { WANTED_LOCKFILE } from '@pnpm/constants' +import type { AuditReport } from '@pnpm/deps.compliance.audit' import { PnpmError } from '@pnpm/error' +import { update } from '@pnpm/installing.commands' import { readWantedLockfile } from '@pnpm/lockfile.fs' -import { update } from '@pnpm/plugin-commands-installation' import type { DependenciesField, PackageVulnerability, diff --git a/deps/compliance/commands/src/audit/ignore.ts b/deps/compliance/commands/src/audit/ignore.ts index 254ca63b77..a3dfa62127 100644 --- a/deps/compliance/commands/src/audit/ignore.ts +++ b/deps/compliance/commands/src/audit/ignore.ts @@ -1,5 +1,5 @@ -import type { AuditAdvisory, AuditReport } from '@pnpm/audit' -import { writeSettings } from '@pnpm/config.config-writer' +import { writeSettings } from '@pnpm/config.writer' +import type { AuditAdvisory, AuditReport } from '@pnpm/deps.compliance.audit' import type { AuditConfig, ProjectManifest } from '@pnpm/types' import { difference } from 'ramda' diff --git a/deps/compliance/commands/src/licenses/licenses.ts b/deps/compliance/commands/src/licenses/licenses.ts index 50f9433b32..6447d63e66 100644 --- a/deps/compliance/commands/src/licenses/licenses.ts +++ b/deps/compliance/commands/src/licenses/licenses.ts @@ -1,10 +1,10 @@ +import type { CompletionFunc } from '@pnpm/cli.command' +import { FILTERING } from '@pnpm/cli.common-cli-options-help' import { docsUrl, readDepNameCompletions, -} from '@pnpm/cli-utils' -import type { CompletionFunc } from '@pnpm/command' -import { FILTERING } from '@pnpm/common-cli-options-help' -import { types as allTypes } from '@pnpm/config' +} from '@pnpm/cli.utils' +import { types as allTypes } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/deps/compliance/commands/src/licenses/licensesList.ts b/deps/compliance/commands/src/licenses/licensesList.ts index 2b7795179c..c4ded52b49 100644 --- a/deps/compliance/commands/src/licenses/licensesList.ts +++ b/deps/compliance/commands/src/licenses/licensesList.ts @@ -1,12 +1,12 @@ import path from 'node:path' -import { readProjectManifestOnly } from '@pnpm/cli-utils' -import { type Config, getOptionsFromRootManifest } from '@pnpm/config' +import { readProjectManifestOnly } from '@pnpm/cli.utils' +import { type Config, getOptionsFromRootManifest } from '@pnpm/config.reader' import { WANTED_LOCKFILE } from '@pnpm/constants' +import { findDependencyLicenses } from '@pnpm/deps.compliance.license-scanner' import { PnpmError } from '@pnpm/error' -import { findDependencyLicenses } from '@pnpm/license-scanner' import { getLockfileImporterId, readWantedLockfile } from '@pnpm/lockfile.fs' -import { getStorePath } from '@pnpm/store-path' +import { getStorePath } from '@pnpm/store.path' import type { LicensesCommandResult } from './LicensesCommandResult.js' import { renderLicences } from './outputRenderer.js' diff --git a/deps/compliance/commands/src/licenses/outputRenderer.ts b/deps/compliance/commands/src/licenses/outputRenderer.ts index 526a66a92e..8c4c9075b2 100644 --- a/deps/compliance/commands/src/licenses/outputRenderer.ts +++ b/deps/compliance/commands/src/licenses/outputRenderer.ts @@ -1,5 +1,5 @@ -import { TABLE_OPTIONS } from '@pnpm/cli-utils' -import type { LicensePackage } from '@pnpm/license-scanner' +import { TABLE_OPTIONS } from '@pnpm/cli.utils' +import type { LicensePackage } from '@pnpm/deps.compliance.license-scanner' import { table } from '@zkochan/table' import chalk from 'chalk' import { groupBy, omit, pick, sortWith } from 'ramda' diff --git a/deps/compliance/commands/src/sbom/sbom.ts b/deps/compliance/commands/src/sbom/sbom.ts index af9a640ec5..46525a43c7 100644 --- a/deps/compliance/commands/src/sbom/sbom.ts +++ b/deps/compliance/commands/src/sbom/sbom.ts @@ -1,18 +1,18 @@ -import { packageManager } from '@pnpm/cli-meta' -import { docsUrl, readProjectManifestOnly } from '@pnpm/cli-utils' -import { FILTERING } from '@pnpm/common-cli-options-help' -import { type Config, types as allTypes } from '@pnpm/config' +import { FILTERING } from '@pnpm/cli.common-cli-options-help' +import { packageManager } from '@pnpm/cli.meta' +import { docsUrl, readProjectManifestOnly } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { PnpmError } from '@pnpm/error' -import { getLockfileImporterId, readWantedLockfile } from '@pnpm/lockfile.fs' import { collectSbomComponents, type SbomComponentType, type SbomFormat, serializeCycloneDx, serializeSpdx, -} from '@pnpm/sbom' -import { getStorePath } from '@pnpm/store-path' +} from '@pnpm/deps.compliance.sbom' +import { PnpmError } from '@pnpm/error' +import { getLockfileImporterId, readWantedLockfile } from '@pnpm/lockfile.fs' +import { getStorePath } from '@pnpm/store.path' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/deps/compliance/commands/test/audit/fixWithUpdate.ts b/deps/compliance/commands/test/audit/fixWithUpdate.ts index c1edc360e5..957d883f9e 100644 --- a/deps/compliance/commands/test/audit/fixWithUpdate.ts +++ b/deps/compliance/commands/test/audit/fixWithUpdate.ts @@ -2,12 +2,12 @@ import { readFile } from 'node:fs/promises' import { join } from 'node:path' import { audit } from '@pnpm/deps.compliance.commands' -import { filterPackagesFromDir } from '@pnpm/filter-workspace-packages' import { readWantedLockfile } from '@pnpm/lockfile.fs' -import { readProjectManifest } from '@pnpm/read-project-manifest' import { addDistTag } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' import type { DepPath } from '@pnpm/types' +import { readProjectManifest } from '@pnpm/workspace.project-manifest-reader' +import { filterPackagesFromDir } from '@pnpm/workspace.projects-filter' import chalk from 'chalk' import nock from 'nock' import { readYamlFileSync } from 'read-yaml-file' diff --git a/deps/compliance/commands/test/audit/index.ts b/deps/compliance/commands/test/audit/index.ts index 2884f0c537..65e3a7bfc9 100644 --- a/deps/compliance/commands/test/audit/index.ts +++ b/deps/compliance/commands/test/audit/index.ts @@ -1,9 +1,9 @@ import path from 'node:path' import { stripVTControlCharacters as stripAnsi } from 'node:util' -import { AuditEndpointNotExistsError } from '@pnpm/audit' +import { AuditEndpointNotExistsError } from '@pnpm/deps.compliance.audit' import { audit } from '@pnpm/deps.compliance.commands' -import { install } from '@pnpm/plugin-commands-installation' +import { install } from '@pnpm/installing.commands' import { fixtures } from '@pnpm/test-fixtures' import nock from 'nock' diff --git a/deps/compliance/commands/test/audit/preserveReferenceOverrides.ts b/deps/compliance/commands/test/audit/preserveReferenceOverrides.ts index 4ab0f6996c..834f2b6b99 100644 --- a/deps/compliance/commands/test/audit/preserveReferenceOverrides.ts +++ b/deps/compliance/commands/test/audit/preserveReferenceOverrides.ts @@ -1,8 +1,8 @@ import path from 'node:path' import { audit } from '@pnpm/deps.compliance.commands' -import { readProjectManifest } from '@pnpm/read-project-manifest' import { fixtures } from '@pnpm/test-fixtures' +import { readProjectManifest } from '@pnpm/workspace.project-manifest-reader' import nock from 'nock' import { readYamlFileSync } from 'read-yaml-file' diff --git a/deps/compliance/commands/test/audit/utils/responses/update.ts b/deps/compliance/commands/test/audit/utils/responses/update.ts index 75f2ed110b..35e3ee59d5 100644 --- a/deps/compliance/commands/test/audit/utils/responses/update.ts +++ b/deps/compliance/commands/test/audit/utils/responses/update.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import { audit } from '@pnpm/audit' +import { audit } from '@pnpm/deps.compliance.audit' import { readWantedLockfile } from '@pnpm/lockfile.fs' import { fixtures } from '@pnpm/test-fixtures' diff --git a/deps/compliance/commands/test/licenses/index.ts b/deps/compliance/commands/test/licenses/index.ts index 9881f60e29..ec156532d4 100644 --- a/deps/compliance/commands/test/licenses/index.ts +++ b/deps/compliance/commands/test/licenses/index.ts @@ -5,10 +5,10 @@ import { stripVTControlCharacters as stripAnsi } from 'node:util' import { STORE_VERSION } from '@pnpm/constants' import { licenses } from '@pnpm/deps.compliance.commands' -import { install } from '@pnpm/plugin-commands-installation' +import { install } from '@pnpm/installing.commands' import { tempDir } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { DEFAULT_OPTS } from './utils/index.js' @@ -128,7 +128,7 @@ test('pnpm licenses: path should be correct for workspaces', async () => { f.copy('workspace-licenses', workspaceDir) const { allProjects, allProjectsGraph, selectedProjectsGraph } = - await filterPackagesFromDir(workspaceDir, []) + await filterPkgsBySelectorObjectsFromDir(workspaceDir, []) const storeDir = path.join(workspaceDir, 'store') await install.handler({ @@ -178,7 +178,7 @@ test('pnpm licenses: filter outputs', async () => { f.copy('workspace-licenses', workspaceDir) const { allProjects, allProjectsGraph, selectedProjectsGraph } = - await filterPackagesFromDir(workspaceDir, []) + await filterPkgsBySelectorObjectsFromDir(workspaceDir, []) const storeDir = path.join(workspaceDir, 'store') await install.handler({ diff --git a/deps/compliance/commands/test/sbom/index.ts b/deps/compliance/commands/test/sbom/index.ts index 39fa7d20e6..0feef888e6 100644 --- a/deps/compliance/commands/test/sbom/index.ts +++ b/deps/compliance/commands/test/sbom/index.ts @@ -3,7 +3,7 @@ import path from 'node:path' import { STORE_VERSION } from '@pnpm/constants' import { sbom } from '@pnpm/deps.compliance.commands' -import { install } from '@pnpm/plugin-commands-installation' +import { install } from '@pnpm/installing.commands' import { tempDir } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' diff --git a/deps/compliance/commands/tsconfig.json b/deps/compliance/commands/tsconfig.json index a913b0c974..551f0d667b 100644 --- a/deps/compliance/commands/tsconfig.json +++ b/deps/compliance/commands/tsconfig.json @@ -16,12 +16,6 @@ { "path": "../../../__utils__/test-fixtures" }, - { - "path": "../../../cli/cli-meta" - }, - { - "path": "../../../cli/cli-utils" - }, { "path": "../../../cli/command" }, @@ -29,10 +23,16 @@ "path": "../../../cli/common-cli-options-help" }, { - "path": "../../../config/config" + "path": "../../../cli/meta" }, { - "path": "../../../config/config-writer" + "path": "../../../cli/utils" + }, + { + "path": "../../../config/reader" + }, + { + "path": "../../../config/writer" }, { "path": "../../../installing/commands" @@ -65,16 +65,13 @@ "path": "../../../pkg-manifest/read-package-json" }, { - "path": "../../../pkg-manifest/read-project-manifest" + "path": "../../../store/path" }, { - "path": "../../../store/store-path" + "path": "../../../workspace/project-manifest-reader" }, { - "path": "../../../workspace/filter-packages-from-dir" - }, - { - "path": "../../../workspace/filter-workspace-packages" + "path": "../../../workspace/projects-filter" }, { "path": "../audit" diff --git a/deps/compliance/license-scanner/package.json b/deps/compliance/license-scanner/package.json index 809451c047..c2ddbf857b 100644 --- a/deps/compliance/license-scanner/package.json +++ b/deps/compliance/license-scanner/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/license-scanner", + "name": "@pnpm/deps.compliance.license-scanner", "version": "1001.0.27", "description": "Check for licenses packages", "keywords": [ @@ -32,15 +32,15 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/dependency-path": "workspace:*", + "@pnpm/config.package-is-installable": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/lockfile.detect-dep-types": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.walker": "workspace:*", - "@pnpm/package-is-installable": "workspace:*", - "@pnpm/read-package-json": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/store.pkg-finder": "workspace:*", "@pnpm/types": "workspace:*", @@ -55,7 +55,7 @@ "devDependencies": { "@jest/globals": "catalog:", "@pnpm/constants": "workspace:*", - "@pnpm/license-scanner": "workspace:*", + "@pnpm/deps.compliance.license-scanner": "workspace:*", "@pnpm/logger": "workspace:*", "@types/ramda": "catalog:", "@types/semver": "catalog:" diff --git a/deps/compliance/license-scanner/src/getPkgInfo.ts b/deps/compliance/license-scanner/src/getPkgInfo.ts index 1e4011f48c..8a4a25a767 100644 --- a/deps/compliance/license-scanner/src/getPkgInfo.ts +++ b/deps/compliance/license-scanner/src/getPkgInfo.ts @@ -1,10 +1,10 @@ import { readFile } from 'node:fs/promises' import path from 'node:path' -import { depPathToFilename } from '@pnpm/dependency-path' +import { depPathToFilename } from '@pnpm/deps.path' import { PnpmError } from '@pnpm/error' import { type PackageSnapshot, pkgSnapshotToResolution } from '@pnpm/lockfile.utils' -import { readPackageJson } from '@pnpm/read-package-json' +import { readPackageJson } from '@pnpm/pkg-manifest.read-package-json' import type { StoreIndex } from '@pnpm/store.index' import { readPackageFileMap } from '@pnpm/store.pkg-finder' import type { PackageManifest, Registries } from '@pnpm/types' diff --git a/deps/compliance/license-scanner/src/lockfileToLicenseNodeTree.ts b/deps/compliance/license-scanner/src/lockfileToLicenseNodeTree.ts index f8cbe05693..fdb38187b7 100644 --- a/deps/compliance/license-scanner/src/lockfileToLicenseNodeTree.ts +++ b/deps/compliance/license-scanner/src/lockfileToLicenseNodeTree.ts @@ -1,3 +1,4 @@ +import { packageIsInstallable } from '@pnpm/config.package-is-installable' import { DepType, type DepTypes, detectDepTypes } from '@pnpm/lockfile.detect-dep-types' import type { LockfileObject, TarballResolution } from '@pnpm/lockfile.types' import { nameVerFromPkgSnapshot, packageIdFromSnapshot } from '@pnpm/lockfile.utils' @@ -5,7 +6,6 @@ import { lockfileWalkerGroupImporterSteps, type LockfileWalkerStep, } from '@pnpm/lockfile.walker' -import { packageIsInstallable } from '@pnpm/package-is-installable' import { StoreIndex } from '@pnpm/store.index' import type { DependenciesField, ProjectId, Registries, SupportedArchitectures } from '@pnpm/types' import { map as mapValues } from 'ramda' diff --git a/deps/compliance/license-scanner/test/licenses.spec.ts b/deps/compliance/license-scanner/test/licenses.spec.ts index f89b80c178..a0633519a3 100644 --- a/deps/compliance/license-scanner/test/licenses.spec.ts +++ b/deps/compliance/license-scanner/test/licenses.spec.ts @@ -43,7 +43,7 @@ jest.unstable_mockModule('../lib/getPkgInfo.js', () => { } }) -const { findDependencyLicenses } = await import('@pnpm/license-scanner') +const { findDependencyLicenses } = await import('@pnpm/deps.compliance.license-scanner') describe('licences', () => { test('findDependencyLicenses()', async () => { diff --git a/deps/compliance/license-scanner/tsconfig.json b/deps/compliance/license-scanner/tsconfig.json index 5c01dc681c..7136f01e2e 100644 --- a/deps/compliance/license-scanner/tsconfig.json +++ b/deps/compliance/license-scanner/tsconfig.json @@ -49,7 +49,7 @@ "path": "../../../store/pkg-finder" }, { - "path": "../../dependency-path" + "path": "../../path" } ] } diff --git a/deps/compliance/sbom/package.json b/deps/compliance/sbom/package.json index 3fc3281d3b..576c5d894e 100644 --- a/deps/compliance/sbom/package.json +++ b/deps/compliance/sbom/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/sbom", + "name": "@pnpm/deps.compliance.sbom", "version": "1000.0.0-0", "description": "Generate SBOM from pnpm lockfile", "keywords": [ @@ -39,7 +39,7 @@ "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.walker": "workspace:*", - "@pnpm/read-package-json": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/store.pkg-finder": "workspace:*", "@pnpm/types": "workspace:*", @@ -51,8 +51,8 @@ }, "devDependencies": { "@jest/globals": "catalog:", + "@pnpm/deps.compliance.sbom": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/sbom": "workspace:*", "@types/ssri": "catalog:" }, "engines": { diff --git a/deps/compliance/sbom/src/getPkgMetadata.ts b/deps/compliance/sbom/src/getPkgMetadata.ts index 65bf1e6ac2..42339a9ccf 100644 --- a/deps/compliance/sbom/src/getPkgMetadata.ts +++ b/deps/compliance/sbom/src/getPkgMetadata.ts @@ -1,5 +1,5 @@ import { type PackageSnapshot, pkgSnapshotToResolution } from '@pnpm/lockfile.utils' -import { readPackageJson } from '@pnpm/read-package-json' +import { readPackageJson } from '@pnpm/pkg-manifest.read-package-json' import type { StoreIndex } from '@pnpm/store.index' import { readPackageFileMap } from '@pnpm/store.pkg-finder' import type { PackageManifest, Registries } from '@pnpm/types' diff --git a/deps/compliance/sbom/test/integrity.test.ts b/deps/compliance/sbom/test/integrity.test.ts index 8c32b0fd17..313f12d525 100644 --- a/deps/compliance/sbom/test/integrity.test.ts +++ b/deps/compliance/sbom/test/integrity.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from '@jest/globals' -import { integrityToHashes } from '@pnpm/sbom' +import { integrityToHashes } from '@pnpm/deps.compliance.sbom' describe('integrityToHashes', () => { it('should return empty array for undefined', () => { diff --git a/deps/compliance/sbom/test/purl.test.ts b/deps/compliance/sbom/test/purl.test.ts index 55655b1438..e63e9ef366 100644 --- a/deps/compliance/sbom/test/purl.test.ts +++ b/deps/compliance/sbom/test/purl.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from '@jest/globals' -import { buildPurl } from '@pnpm/sbom' +import { buildPurl } from '@pnpm/deps.compliance.sbom' describe('buildPurl', () => { it('should build a basic PURL for an unscoped package', () => { diff --git a/deps/compliance/sbom/test/serializeCycloneDx.test.ts b/deps/compliance/sbom/test/serializeCycloneDx.test.ts index 0f7ccac67a..a96bc9df03 100644 --- a/deps/compliance/sbom/test/serializeCycloneDx.test.ts +++ b/deps/compliance/sbom/test/serializeCycloneDx.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from '@jest/globals' +import { type SbomResult, serializeCycloneDx } from '@pnpm/deps.compliance.sbom' import { DepType } from '@pnpm/lockfile.detect-dep-types' -import { type SbomResult, serializeCycloneDx } from '@pnpm/sbom' function makeSbomResult (): SbomResult { return { diff --git a/deps/compliance/sbom/test/serializeSpdx.test.ts b/deps/compliance/sbom/test/serializeSpdx.test.ts index 7049aef822..93248d6069 100644 --- a/deps/compliance/sbom/test/serializeSpdx.test.ts +++ b/deps/compliance/sbom/test/serializeSpdx.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from '@jest/globals' +import { type SbomResult, serializeSpdx } from '@pnpm/deps.compliance.sbom' import { DepType } from '@pnpm/lockfile.detect-dep-types' -import { type SbomResult, serializeSpdx } from '@pnpm/sbom' function makeSbomResult (): SbomResult { return { diff --git a/deps/graph-builder/package.json b/deps/graph-builder/package.json index 3b74044629..22ddfac371 100644 --- a/deps/graph-builder/package.json +++ b/deps/graph-builder/package.json @@ -30,18 +30,18 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/calc-dep-state": "workspace:*", + "@pnpm/config.package-is-installable": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.graph-hasher": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/hooks.types": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/package-is-installable": "workspace:*", "@pnpm/patching.config": "workspace:*", "@pnpm/patching.types": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "path-exists": "catalog:", "ramda": "catalog:" diff --git a/deps/graph-builder/src/iteratePkgsForVirtualStore.ts b/deps/graph-builder/src/iteratePkgsForVirtualStore.ts index f41b949896..456c52fa02 100644 --- a/deps/graph-builder/src/iteratePkgsForVirtualStore.ts +++ b/deps/graph-builder/src/iteratePkgsForVirtualStore.ts @@ -9,8 +9,8 @@ import { iteratePkgMeta, lockfileToDepGraph, type PkgMetaAndSnapshot, -} from '@pnpm/calc-dep-state' -import * as dp from '@pnpm/dependency-path' +} from '@pnpm/deps.graph-hasher' +import * as dp from '@pnpm/deps.path' import type { LockfileObject } from '@pnpm/lockfile.fs' import { nameVerFromPkgSnapshot, diff --git a/deps/graph-builder/src/lockfileToDepGraph.ts b/deps/graph-builder/src/lockfileToDepGraph.ts index 0d80331a63..f4d73c1649 100644 --- a/deps/graph-builder/src/lockfileToDepGraph.ts +++ b/deps/graph-builder/src/lockfileToDepGraph.ts @@ -1,26 +1,26 @@ import fs from 'node:fs' import path from 'node:path' +import { packageIsInstallable } from '@pnpm/config.package-is-installable' import { WANTED_LOCKFILE } from '@pnpm/constants' import { progressLogger, } from '@pnpm/core-loggers' -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' +import type { IncludedDependencies } from '@pnpm/installing.modules-yaml' import type { LockfileObject, LockfileResolution } from '@pnpm/lockfile.fs' import { packageIdFromSnapshot, pkgSnapshotToResolution, } from '@pnpm/lockfile.utils' import { logger } from '@pnpm/logger' -import type { IncludedDependencies } from '@pnpm/modules-yaml' -import { packageIsInstallable } from '@pnpm/package-is-installable' import { getPatchInfo, type PatchGroupRecord } from '@pnpm/patching.config' import type { PatchInfo } from '@pnpm/patching.types' import type { FetchResponse, PkgRequestFetchResult, StoreController, -} from '@pnpm/store-controller-types' +} from '@pnpm/store.controller-types' import type { AllowBuild, DepPath, diff --git a/deps/graph-builder/tsconfig.json b/deps/graph-builder/tsconfig.json index 52d04705ea..738410413d 100644 --- a/deps/graph-builder/tsconfig.json +++ b/deps/graph-builder/tsconfig.json @@ -43,13 +43,13 @@ "path": "../../patching/types" }, { - "path": "../../store/store-controller-types" + "path": "../../store/controller-types" }, { - "path": "../calc-dep-state" + "path": "../graph-hasher" }, { - "path": "../dependency-path" + "path": "../path" } ] } diff --git a/deps/calc-dep-state/CHANGELOG.md b/deps/graph-hasher/CHANGELOG.md similarity index 100% rename from deps/calc-dep-state/CHANGELOG.md rename to deps/graph-hasher/CHANGELOG.md diff --git a/deps/calc-dep-state/README.md b/deps/graph-hasher/README.md similarity index 100% rename from deps/calc-dep-state/README.md rename to deps/graph-hasher/README.md diff --git a/deps/calc-dep-state/package.json b/deps/graph-hasher/package.json similarity index 79% rename from deps/calc-dep-state/package.json rename to deps/graph-hasher/package.json index 8552dc8707..5bd298944a 100644 --- a/deps/calc-dep-state/package.json +++ b/deps/graph-hasher/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/calc-dep-state", + "name": "@pnpm/deps.graph-hasher", "version": "1002.0.8", "description": "Calculates the state of a dependency", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/deps/calc-dep-state", - "homepage": "https://github.com/pnpm/pnpm/tree/main/deps/calc-dep-state#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/deps/graph-hasher", + "homepage": "https://github.com/pnpm/pnpm/tree/main/deps/graph-hasher#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -33,13 +33,13 @@ "dependencies": { "@pnpm/constants": "workspace:*", "@pnpm/crypto.object-hasher": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/types": "workspace:*" }, "devDependencies": { - "@pnpm/calc-dep-state": "workspace:*" + "@pnpm/deps.graph-hasher": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/deps/calc-dep-state/src/index.ts b/deps/graph-hasher/src/index.ts similarity index 99% rename from deps/calc-dep-state/src/index.ts rename to deps/graph-hasher/src/index.ts index 44c66c657a..1aa85ab435 100644 --- a/deps/calc-dep-state/src/index.ts +++ b/deps/graph-hasher/src/index.ts @@ -1,6 +1,6 @@ import { ENGINE_NAME } from '@pnpm/constants' import { hashObject, hashObjectWithoutSorting } from '@pnpm/crypto.object-hasher' -import { getPkgIdWithPatchHash, refToRelative } from '@pnpm/dependency-path' +import { getPkgIdWithPatchHash, refToRelative } from '@pnpm/deps.path' import type { LockfileObject, LockfileResolution, PackageSnapshot } from '@pnpm/lockfile.types' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils' import type { AllowBuild, DepPath, PkgIdWithPatchHash } from '@pnpm/types' diff --git a/deps/calc-dep-state/test/calcGraphNodeHash.test.ts b/deps/graph-hasher/test/calcGraphNodeHash.test.ts similarity index 99% rename from deps/calc-dep-state/test/calcGraphNodeHash.test.ts rename to deps/graph-hasher/test/calcGraphNodeHash.test.ts index fa18b8964c..5c74932324 100644 --- a/deps/calc-dep-state/test/calcGraphNodeHash.test.ts +++ b/deps/graph-hasher/test/calcGraphNodeHash.test.ts @@ -1,6 +1,6 @@ -import { calcGraphNodeHash, type DepsGraph, type DepsStateCache, type PkgMeta } from '@pnpm/calc-dep-state' import { ENGINE_NAME } from '@pnpm/constants' import { hashObject, hashObjectWithoutSorting } from '@pnpm/crypto.object-hasher' +import { calcGraphNodeHash, type DepsGraph, type DepsStateCache, type PkgMeta } from '@pnpm/deps.graph-hasher' import type { DepPath, PkgIdWithPatchHash } from '@pnpm/types' describe('calcGraphNodeHash', () => { diff --git a/deps/calc-dep-state/test/index.ts b/deps/graph-hasher/test/index.ts similarity index 98% rename from deps/calc-dep-state/test/index.ts rename to deps/graph-hasher/test/index.ts index f27bef01fc..18b3ed2a57 100644 --- a/deps/calc-dep-state/test/index.ts +++ b/deps/graph-hasher/test/index.ts @@ -1,6 +1,6 @@ -import { calcDepState, calcGraphNodeHash } from '@pnpm/calc-dep-state' import { ENGINE_NAME } from '@pnpm/constants' import { hashObject, hashObjectWithoutSorting } from '@pnpm/crypto.object-hasher' +import { calcDepState, calcGraphNodeHash } from '@pnpm/deps.graph-hasher' import type { DepPath, PkgIdWithPatchHash } from '@pnpm/types' const depsGraph = { diff --git a/deps/calc-dep-state/test/lockfileToDepGraph.test.ts b/deps/graph-hasher/test/lockfileToDepGraph.test.ts similarity index 94% rename from deps/calc-dep-state/test/lockfileToDepGraph.test.ts rename to deps/graph-hasher/test/lockfileToDepGraph.test.ts index 190c0d15b0..c138d45fd0 100644 --- a/deps/calc-dep-state/test/lockfileToDepGraph.test.ts +++ b/deps/graph-hasher/test/lockfileToDepGraph.test.ts @@ -1,4 +1,4 @@ -import { lockfileToDepGraph } from '@pnpm/calc-dep-state' +import { lockfileToDepGraph } from '@pnpm/deps.graph-hasher' import type { DepPath } from '@pnpm/types' test('lockfileToDepGraph', () => { diff --git a/deps/calc-dep-state/test/tsconfig.json b/deps/graph-hasher/test/tsconfig.json similarity index 100% rename from deps/calc-dep-state/test/tsconfig.json rename to deps/graph-hasher/test/tsconfig.json diff --git a/deps/calc-dep-state/tsconfig.json b/deps/graph-hasher/tsconfig.json similarity index 93% rename from deps/calc-dep-state/tsconfig.json rename to deps/graph-hasher/tsconfig.json index bb5506d039..f2dac3ff75 100644 --- a/deps/calc-dep-state/tsconfig.json +++ b/deps/graph-hasher/tsconfig.json @@ -25,7 +25,7 @@ "path": "../../packages/types" }, { - "path": "../dependency-path" + "path": "../path" } ] } diff --git a/deps/calc-dep-state/tsconfig.lint.json b/deps/graph-hasher/tsconfig.lint.json similarity index 100% rename from deps/calc-dep-state/tsconfig.lint.json rename to deps/graph-hasher/tsconfig.lint.json diff --git a/deps/inspection/commands/package.json b/deps/inspection/commands/package.json index fd0550be26..3659bdf934 100644 --- a/deps/inspection/commands/package.json +++ b/deps/inspection/commands/package.json @@ -31,22 +31,22 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-utils": "workspace:*", + "@pnpm/cli.command": "workspace:*", + "@pnpm/cli.common-cli-options-help": "workspace:*", + "@pnpm/cli.utils": "workspace:*", "@pnpm/colorize-semver-diff": "catalog:", - "@pnpm/command": "workspace:*", - "@pnpm/common-cli-options-help": "workspace:*", - "@pnpm/config": "workspace:*", - "@pnpm/default-resolver": "workspace:*", + "@pnpm/config.matcher": "workspace:*", + "@pnpm/config.reader": "workspace:*", + "@pnpm/deps.inspection.list": "workspace:*", + "@pnpm/deps.inspection.outdated": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/global.commands": "workspace:*", "@pnpm/global.packages": "workspace:*", - "@pnpm/list": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", - "@pnpm/matcher": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/outdated": "workspace:*", + "@pnpm/resolving.default-resolver": "workspace:*", "@pnpm/semver-diff": "catalog:", - "@pnpm/store-path": "workspace:*", + "@pnpm/store.path": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/table": "catalog:", "chalk": "catalog:", @@ -60,12 +60,11 @@ "@jest/globals": "catalog:", "@pnpm/constants": "workspace:*", "@pnpm/deps.inspection.commands": "workspace:*", - "@pnpm/filter-workspace-packages": "workspace:*", - "@pnpm/plugin-commands-installation": "workspace:*", + "@pnpm/installing.commands": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/test-fixtures": "workspace:*", - "@pnpm/workspace.filter-packages-from-dir": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", "@types/ramda": "catalog:", "@types/zkochan__table": "catalog:", "execa": "catalog:", diff --git a/deps/inspection/commands/src/listing/list.ts b/deps/inspection/commands/src/listing/list.ts index b238b9b252..f6bf882621 100644 --- a/deps/inspection/commands/src/listing/list.ts +++ b/deps/inspection/commands/src/listing/list.ts @@ -1,8 +1,8 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, types as allTypes } from '@pnpm/config' +import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' +import { list, listForPackages } from '@pnpm/deps.inspection.list' import { listGlobalPackages } from '@pnpm/global.commands' -import { list, listForPackages } from '@pnpm/list' import type { Finder, IncludedDependencies } from '@pnpm/types' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/deps/inspection/commands/src/listing/recursive.ts b/deps/inspection/commands/src/listing/recursive.ts index be7ea4c237..14b8d89bca 100644 --- a/deps/inspection/commands/src/listing/recursive.ts +++ b/deps/inspection/commands/src/listing/recursive.ts @@ -1,7 +1,7 @@ import assert from 'node:assert' import util from 'node:util' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { logger } from '@pnpm/logger' import type { IncludedDependencies, Project } from '@pnpm/types' diff --git a/deps/inspection/commands/src/listing/why.ts b/deps/inspection/commands/src/listing/why.ts index 941cbdb581..06c8acc57c 100644 --- a/deps/inspection/commands/src/listing/why.ts +++ b/deps/inspection/commands/src/listing/why.ts @@ -1,8 +1,8 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { types as allTypes } from '@pnpm/config' +import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' +import { types as allTypes } from '@pnpm/config.reader' +import { whyForPackages } from '@pnpm/deps.inspection.list' import { PnpmError } from '@pnpm/error' -import { whyForPackages } from '@pnpm/list' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/deps/inspection/commands/src/outdated/outdated.ts b/deps/inspection/commands/src/outdated/outdated.ts index cafa005497..abc5eb884f 100644 --- a/deps/inspection/commands/src/outdated/outdated.ts +++ b/deps/inspection/commands/src/outdated/outdated.ts @@ -1,21 +1,21 @@ import { stripVTControlCharacters as stripAnsi } from 'node:util' +import type { CompletionFunc } from '@pnpm/cli.command' +import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' import { docsUrl, readDepNameCompletions, readProjectManifestOnly, TABLE_OPTIONS, -} from '@pnpm/cli-utils' +} from '@pnpm/cli.utils' import colorizeSemverDiff from '@pnpm/colorize-semver-diff' -import type { CompletionFunc } from '@pnpm/command' -import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, types as allTypes } from '@pnpm/config' -import { PnpmError } from '@pnpm/error' -import { scanGlobalPackages } from '@pnpm/global.packages' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { outdatedDepsOfProjects, type OutdatedPackage, -} from '@pnpm/outdated' +} from '@pnpm/deps.inspection.outdated' +import { PnpmError } from '@pnpm/error' +import { scanGlobalPackages } from '@pnpm/global.packages' import semverDiff from '@pnpm/semver-diff' import type { DependenciesField, PackageManifest, ProjectManifest, ProjectRootDir } from '@pnpm/types' import { table } from '@zkochan/table' diff --git a/deps/inspection/commands/src/outdated/recursive.ts b/deps/inspection/commands/src/outdated/recursive.ts index 329b00b6b5..5e88a00ebe 100644 --- a/deps/inspection/commands/src/outdated/recursive.ts +++ b/deps/inspection/commands/src/outdated/recursive.ts @@ -1,9 +1,9 @@ -import { TABLE_OPTIONS } from '@pnpm/cli-utils' -import { PnpmError } from '@pnpm/error' +import { TABLE_OPTIONS } from '@pnpm/cli.utils' import { outdatedDepsOfProjects, type OutdatedPackage, -} from '@pnpm/outdated' +} from '@pnpm/deps.inspection.outdated' +import { PnpmError } from '@pnpm/error' import type { DependenciesField, IncludedDependencies, diff --git a/deps/inspection/commands/src/outdated/utils.ts b/deps/inspection/commands/src/outdated/utils.ts index 41a138f283..7de077992e 100644 --- a/deps/inspection/commands/src/outdated/utils.ts +++ b/deps/inspection/commands/src/outdated/utils.ts @@ -1,4 +1,4 @@ -import type { OutdatedPackage } from '@pnpm/outdated' +import type { OutdatedPackage } from '@pnpm/deps.inspection.outdated' import type { SEMVER_CHANGE } from '@pnpm/semver-diff' export interface OutdatedWithVersionDiff extends OutdatedPackage { diff --git a/deps/inspection/commands/test/listing/recursive.ts b/deps/inspection/commands/test/listing/recursive.ts index 5b8858d231..ebadcbc51d 100644 --- a/deps/inspection/commands/test/listing/recursive.ts +++ b/deps/inspection/commands/test/listing/recursive.ts @@ -3,10 +3,10 @@ import { stripVTControlCharacters as stripAnsi } from 'node:util' import { list, why } from '@pnpm/deps.inspection.commands' import type { PnpmError } from '@pnpm/error' -import { install } from '@pnpm/plugin-commands-installation' +import { install } from '@pnpm/installing.commands' import { prepare, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { writeYamlFileSync } from 'write-yaml-file' import { DEFAULT_OPTS } from './utils/index.js' @@ -35,7 +35,7 @@ test('recursive list', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -103,7 +103,7 @@ test('recursive list with sharedWorkspaceLockfile', async () => { sharedWorkspaceLockfile: true, }) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -175,7 +175,7 @@ test('recursive list --filter', async () => { await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), cacheDir: path.resolve('cache'), dir: process.cwd(), recursive: true, @@ -186,7 +186,7 @@ test('recursive list --filter', async () => { ...DEFAULT_OPTS, dir: process.cwd(), recursive: true, - ...await filterPackagesFromDir(process.cwd(), [ + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [ { includeDependencies: true, namePattern: 'project-1' }, ]), }, []) @@ -233,7 +233,7 @@ test('recursive list --filter link-workspace-packages=false', async () => { await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [], { linkWorkspacePackages: false }), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [], { linkWorkspacePackages: false }), cacheDir: path.resolve('cache'), dir: process.cwd(), linkWorkspacePackages: false, @@ -245,7 +245,7 @@ test('recursive list --filter link-workspace-packages=false', async () => { ...DEFAULT_OPTS, dir: process.cwd(), recursive: true, - ...await filterPackagesFromDir(process.cwd(), [ + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [ { includeDependencies: true, namePattern: 'project-1' }, ], { linkWorkspacePackages: false }), }, []) @@ -268,7 +268,7 @@ test('`pnpm recursive why` should fail if no package name was provided', async ( try { await why.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), recursive: true, }, []) diff --git a/deps/inspection/commands/test/outdated/recursive.ts b/deps/inspection/commands/test/outdated/recursive.ts index 1e43990cc9..78961d2365 100644 --- a/deps/inspection/commands/test/outdated/recursive.ts +++ b/deps/inspection/commands/test/outdated/recursive.ts @@ -2,9 +2,9 @@ import path from 'node:path' import { stripVTControlCharacters as stripAnsi } from 'node:util' import { outdated } from '@pnpm/deps.inspection.commands' -import { install } from '@pnpm/plugin-commands-installation' +import { install } from '@pnpm/installing.commands' import { preparePackages } from '@pnpm/prepare' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { DEFAULT_OPTS, DEFAULT_OUTDATED_OPTS } from './utils/index.js' @@ -40,7 +40,7 @@ test('pnpm recursive outdated', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -265,7 +265,7 @@ test('pnpm recursive outdated: format json when there are no outdated dependenci }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) const { output, exitCode } = await outdated.handler({ ...DEFAULT_OUTDATED_OPTS, allProjects, @@ -310,7 +310,7 @@ test('pnpm recursive outdated in workspace with shared lockfile', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, diff --git a/deps/inspection/commands/tsconfig.json b/deps/inspection/commands/tsconfig.json index 90f9be789b..d9c3f2f580 100644 --- a/deps/inspection/commands/tsconfig.json +++ b/deps/inspection/commands/tsconfig.json @@ -15,9 +15,6 @@ { "path": "../../../__utils__/test-fixtures" }, - { - "path": "../../../cli/cli-utils" - }, { "path": "../../../cli/command" }, @@ -25,11 +22,14 @@ "path": "../../../cli/common-cli-options-help" }, { - "path": "../../../config/config" + "path": "../../../cli/utils" }, { "path": "../../../config/matcher" }, + { + "path": "../../../config/reader" + }, { "path": "../../../global/commands" }, @@ -58,13 +58,10 @@ "path": "../../../resolving/default-resolver" }, { - "path": "../../../store/store-path" + "path": "../../../store/path" }, { - "path": "../../../workspace/filter-packages-from-dir" - }, - { - "path": "../../../workspace/filter-workspace-packages" + "path": "../../../workspace/projects-filter" }, { "path": "../list" diff --git a/deps/inspection/list/package.json b/deps/inspection/list/package.json index 946bfd473d..d803bac052 100644 --- a/deps/inspection/list/package.json +++ b/deps/inspection/list/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/list", + "name": "@pnpm/deps.inspection.list", "version": "1000.1.3", "description": "List installed packages in a symlinked `node_modules`", "keywords": [ @@ -30,25 +30,25 @@ "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"", "prepareFixtures": "cd test && node ../../pnpm recursive install --no-link-workspace-packages --no-shared-workspace-lockfile -f && cd ..", "prepublishOnly": "pnpm run compile", - "pretest": "pnpm run --filter dependencies-hierarchy pretest", + "pretest": "pnpm run --filter tree-builder pretest", "_test": "pnpm pretest && cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest", "test": "pnpm run compile && pnpm run _test", "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/deps.inspection.tree-builder": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/reviewing.dependencies-hierarchy": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/text.tree-renderer": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "chalk": "catalog:", "p-limit": "catalog:", "ramda": "catalog:" }, "devDependencies": { - "@pnpm/list": "workspace:*", + "@pnpm/deps.inspection.list": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/ramda": "catalog:" }, diff --git a/deps/inspection/list/src/index.ts b/deps/inspection/list/src/index.ts index 0a2964160b..ee37391c99 100644 --- a/deps/inspection/list/src/index.ts +++ b/deps/inspection/list/src/index.ts @@ -1,9 +1,9 @@ import path from 'node:path' +import { buildDependenciesTree, buildDependentsTree, createPackagesSearcher, type DependenciesTree, type DependencyNode, type ImporterInfo } from '@pnpm/deps.inspection.tree-builder' import { readCurrentLockfile, readWantedLockfile } from '@pnpm/lockfile.fs' -import { safeReadProjectManifestOnly } from '@pnpm/read-project-manifest' -import { buildDependenciesTree, buildDependentsTree, createPackagesSearcher, type DependenciesTree, type DependencyNode, type ImporterInfo } from '@pnpm/reviewing.dependencies-hierarchy' import type { DependenciesField, Finder, Registries } from '@pnpm/types' +import { safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' import { renderDependentsJson, renderDependentsParseable, renderDependentsTree } from './renderDependentsTree.js' import { renderJson } from './renderJson.js' @@ -11,7 +11,7 @@ import { renderParseable } from './renderParseable.js' import { renderTree } from './renderTree.js' import type { PackageDependencyHierarchy } from './types.js' -export type { DependencyNode } from '@pnpm/reviewing.dependencies-hierarchy' +export type { DependencyNode } from '@pnpm/deps.inspection.tree-builder' export { type PackageDependencyHierarchy, renderDependentsJson, diff --git a/deps/inspection/list/src/readPkg.ts b/deps/inspection/list/src/readPkg.ts index f6638c99bc..136cc6394c 100644 --- a/deps/inspection/list/src/readPkg.ts +++ b/deps/inspection/list/src/readPkg.ts @@ -1,4 +1,4 @@ -import { readPackageJson } from '@pnpm/read-package-json' +import { readPackageJson } from '@pnpm/pkg-manifest.read-package-json' import type { PackageManifest } from '@pnpm/types' import pLimit from 'p-limit' diff --git a/deps/inspection/list/src/renderDependentsTree.ts b/deps/inspection/list/src/renderDependentsTree.ts index 94262a87ce..935844ad74 100644 --- a/deps/inspection/list/src/renderDependentsTree.ts +++ b/deps/inspection/list/src/renderDependentsTree.ts @@ -1,4 +1,4 @@ -import type { DependentNode, DependentsTree } from '@pnpm/reviewing.dependencies-hierarchy' +import type { DependentNode, DependentsTree } from '@pnpm/deps.inspection.tree-builder' import { renderTree as renderArchyTree, type TreeNode } from '@pnpm/text.tree-renderer' import chalk from 'chalk' diff --git a/deps/inspection/list/src/renderJson.ts b/deps/inspection/list/src/renderJson.ts index ca35413aa9..b624eb13c7 100644 --- a/deps/inspection/list/src/renderJson.ts +++ b/deps/inspection/list/src/renderJson.ts @@ -1,4 +1,4 @@ -import type { DependencyNode } from '@pnpm/reviewing.dependencies-hierarchy' +import type { DependencyNode } from '@pnpm/deps.inspection.tree-builder' import { DEPENDENCIES_FIELDS } from '@pnpm/types' import { type Ord, path, sortBy } from 'ramda' diff --git a/deps/inspection/list/src/renderParseable.ts b/deps/inspection/list/src/renderParseable.ts index ad000553c6..3d1a6d2770 100644 --- a/deps/inspection/list/src/renderParseable.ts +++ b/deps/inspection/list/src/renderParseable.ts @@ -1,4 +1,4 @@ -import type { DependencyNode } from '@pnpm/reviewing.dependencies-hierarchy' +import type { DependencyNode } from '@pnpm/deps.inspection.tree-builder' import { prop, sortBy } from 'ramda' import type { PackageDependencyHierarchy } from './types.js' diff --git a/deps/inspection/list/src/renderTree.ts b/deps/inspection/list/src/renderTree.ts index a1ea5c62e2..1c5ecac6cb 100644 --- a/deps/inspection/list/src/renderTree.ts +++ b/deps/inspection/list/src/renderTree.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import type { DependencyNode } from '@pnpm/reviewing.dependencies-hierarchy' +import type { DependencyNode } from '@pnpm/deps.inspection.tree-builder' import { renderTree as renderArchyTree, type TreeNode, type TreeNodeGroup } from '@pnpm/text.tree-renderer' import { DEPENDENCIES_FIELDS, type DependenciesField } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' diff --git a/deps/inspection/list/src/types.ts b/deps/inspection/list/src/types.ts index a996050953..c24a50fcc7 100644 --- a/deps/inspection/list/src/types.ts +++ b/deps/inspection/list/src/types.ts @@ -1,4 +1,4 @@ -import type { DependenciesTree } from '@pnpm/reviewing.dependencies-hierarchy' +import type { DependenciesTree } from '@pnpm/deps.inspection.tree-builder' export interface PackageDependencyHierarchy extends DependenciesTree { name?: string diff --git a/deps/inspection/list/test/index.ts b/deps/inspection/list/test/index.ts index 5003fbdb4c..30c7cab746 100644 --- a/deps/inspection/list/test/index.ts +++ b/deps/inspection/list/test/index.ts @@ -1,7 +1,7 @@ /// import path from 'node:path' -import { list, listForPackages } from '@pnpm/list' +import { list, listForPackages } from '@pnpm/deps.inspection.list' import { fixtures } from '@pnpm/test-fixtures' import chalk from 'chalk' diff --git a/deps/inspection/list/test/manyDeps.ts b/deps/inspection/list/test/manyDeps.ts index baddc8f51e..48f52d79c0 100644 --- a/deps/inspection/list/test/manyDeps.ts +++ b/deps/inspection/list/test/manyDeps.ts @@ -1,4 +1,4 @@ -import { list } from '@pnpm/list' +import { list } from '@pnpm/deps.inspection.list' import { fixtures } from '@pnpm/test-fixtures' const f = fixtures(import.meta.dirname) diff --git a/deps/inspection/list/test/renderDependentsTree.test.ts b/deps/inspection/list/test/renderDependentsTree.test.ts index 9b18125c08..6558498083 100644 --- a/deps/inspection/list/test/renderDependentsTree.test.ts +++ b/deps/inspection/list/test/renderDependentsTree.test.ts @@ -1,6 +1,6 @@ import { stripVTControlCharacters as stripAnsi } from 'node:util' -import type { DependentsTree } from '@pnpm/reviewing.dependencies-hierarchy' +import type { DependentsTree } from '@pnpm/deps.inspection.tree-builder' import { renderDependentsJson, renderDependentsParseable, renderDependentsTree } from '../lib/renderDependentsTree.js' diff --git a/deps/inspection/list/tsconfig.json b/deps/inspection/list/tsconfig.json index 75f5056667..c6e7bbd2fe 100644 --- a/deps/inspection/list/tsconfig.json +++ b/deps/inspection/list/tsconfig.json @@ -21,14 +21,14 @@ { "path": "../../../pkg-manifest/read-package-json" }, - { - "path": "../../../pkg-manifest/read-project-manifest" - }, { "path": "../../../text/tree-renderer" }, { - "path": "../dependencies-hierarchy" + "path": "../../../workspace/project-manifest-reader" + }, + { + "path": "../tree-builder" } ] } diff --git a/deps/inspection/outdated/package.json b/deps/inspection/outdated/package.json index 82e97ed3d3..778d8114fe 100644 --- a/deps/inspection/outdated/package.json +++ b/deps/inspection/outdated/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/outdated", + "name": "@pnpm/deps.inspection.outdated", "version": "1001.1.1", "description": "Check for outdated packages", "keywords": [ @@ -34,19 +34,19 @@ "dependencies": { "@pnpm/catalogs.resolver": "workspace:*", "@pnpm/catalogs.types": "workspace:*", - "@pnpm/client": "workspace:*", + "@pnpm/config.matcher": "workspace:*", + "@pnpm/config.parse-overrides": "workspace:*", + "@pnpm/config.pick-registry-for-package": "workspace:*", "@pnpm/config.version-policy": "workspace:*", "@pnpm/constants": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/hooks.read-package-hook": "workspace:*", + "@pnpm/installing.client": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/manifest-utils": "workspace:*", - "@pnpm/matcher": "workspace:*", - "@pnpm/npm-resolver": "workspace:*", - "@pnpm/parse-overrides": "workspace:*", - "@pnpm/pick-registry-for-package": "workspace:*", + "@pnpm/pkg-manifest.utils": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", "@pnpm/types": "workspace:*", "ramda": "catalog:", "semver": "catalog:" @@ -56,9 +56,9 @@ }, "devDependencies": { "@jest/globals": "catalog:", + "@pnpm/deps.inspection.outdated": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/outdated": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@types/ramda": "catalog:", "@types/semver": "catalog:" }, diff --git a/deps/inspection/outdated/src/createManifestGetter.ts b/deps/inspection/outdated/src/createManifestGetter.ts index defe0ee832..3b9f00e18f 100644 --- a/deps/inspection/outdated/src/createManifestGetter.ts +++ b/deps/inspection/outdated/src/createManifestGetter.ts @@ -1,9 +1,9 @@ +import { createPackageVersionPolicy } from '@pnpm/config.version-policy' import { type ClientOptions, createResolver, type ResolveFunction, -} from '@pnpm/client' -import { createPackageVersionPolicy } from '@pnpm/config.version-policy' +} from '@pnpm/installing.client' import type { DependencyManifest, PackageVersionPolicy } from '@pnpm/types' interface GetManifestOpts { diff --git a/deps/inspection/outdated/src/outdated.ts b/deps/inspection/outdated/src/outdated.ts index 276b4c763c..22eac49f7d 100644 --- a/deps/inspection/outdated/src/outdated.ts +++ b/deps/inspection/outdated/src/outdated.ts @@ -5,8 +5,11 @@ import { type WantedDependency, } from '@pnpm/catalogs.resolver' import type { Catalogs } from '@pnpm/catalogs.types' +import { createMatcher } from '@pnpm/config.matcher' +import { parseOverrides } from '@pnpm/config.parse-overrides' +import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package' import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import { PnpmError } from '@pnpm/error' import { createReadPackageHook } from '@pnpm/hooks.read-package-hook' import { @@ -15,11 +18,8 @@ import { type ProjectSnapshot, } from '@pnpm/lockfile.fs' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils' -import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils' -import { createMatcher } from '@pnpm/matcher' -import { parseBareSpecifier } from '@pnpm/npm-resolver' -import { parseOverrides } from '@pnpm/parse-overrides' -import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package' +import { getAllDependenciesFromManifest } from '@pnpm/pkg-manifest.utils' +import { parseBareSpecifier } from '@pnpm/resolving.npm-resolver' import { DEPENDENCIES_FIELDS, type DependenciesField, diff --git a/deps/inspection/outdated/src/outdatedDepsOfProjects.ts b/deps/inspection/outdated/src/outdatedDepsOfProjects.ts index a091c82f38..383389d49c 100644 --- a/deps/inspection/outdated/src/outdatedDepsOfProjects.ts +++ b/deps/inspection/outdated/src/outdatedDepsOfProjects.ts @@ -1,11 +1,11 @@ import path from 'node:path' import type { Catalogs } from '@pnpm/catalogs.types' +import { createMatcher } from '@pnpm/config.matcher' import { readCurrentLockfile, readWantedLockfile, } from '@pnpm/lockfile.fs' -import { createMatcher } from '@pnpm/matcher' import type { IncludedDependencies, ProjectManifest, diff --git a/deps/inspection/outdated/test/getManifest.spec.ts b/deps/inspection/outdated/test/getManifest.spec.ts index cc5abe0a0a..5d02fc5a1d 100644 --- a/deps/inspection/outdated/test/getManifest.spec.ts +++ b/deps/inspection/outdated/test/getManifest.spec.ts @@ -1,6 +1,6 @@ import { jest } from '@jest/globals' -import type { ResolveFunction } from '@pnpm/client' -import type { PkgResolutionId, TarballResolution } from '@pnpm/resolver-base' +import type { ResolveFunction } from '@pnpm/installing.client' +import type { PkgResolutionId, TarballResolution } from '@pnpm/resolving.resolver-base' import { getManifest } from '../lib/createManifestGetter.js' diff --git a/deps/inspection/outdated/tsconfig.json b/deps/inspection/outdated/tsconfig.json index dbcdcf50ba..00cfaae9f9 100644 --- a/deps/inspection/outdated/tsconfig.json +++ b/deps/inspection/outdated/tsconfig.json @@ -52,7 +52,7 @@ "path": "../../../packages/types" }, { - "path": "../../../pkg-manifest/manifest-utils" + "path": "../../../pkg-manifest/utils" }, { "path": "../../../resolving/npm-resolver" @@ -61,7 +61,7 @@ "path": "../../../resolving/resolver-base" }, { - "path": "../../dependency-path" + "path": "../../path" } ] } diff --git a/deps/inspection/dependencies-hierarchy/CHANGELOG.md b/deps/inspection/tree-builder/CHANGELOG.md similarity index 100% rename from deps/inspection/dependencies-hierarchy/CHANGELOG.md rename to deps/inspection/tree-builder/CHANGELOG.md diff --git a/deps/inspection/dependencies-hierarchy/README.md b/deps/inspection/tree-builder/README.md similarity index 53% rename from deps/inspection/dependencies-hierarchy/README.md rename to deps/inspection/tree-builder/README.md index ed8d84de57..ba6a2cfd96 100644 --- a/deps/inspection/dependencies-hierarchy/README.md +++ b/deps/inspection/tree-builder/README.md @@ -1,9 +1,9 @@ -# @pnpm/reviewing.dependencies-hierarchy +# @pnpm/reviewing.tree-builder > Creates a dependencies hierarchy for a symlinked \`node_modules\` -[![npm version](https://img.shields.io/npm/v/dependencies-hierarchy.svg)](https://www.npmjs.com/package/dependencies-hierarchy) +[![npm version](https://img.shields.io/npm/v/tree-builder.svg)](https://www.npmjs.com/package/tree-builder) A symlinked `node_modules` is created when installing using [pnpm](https://github.com/pnpm/pnpm). @@ -11,7 +11,7 @@ A symlinked `node_modules` is created when installing using [pnpm](https://githu ## Installation ``` -pnpm add @pnpm/reviewing.dependencies-hierarchy +pnpm add @pnpm/reviewing.tree-builder ``` ## License diff --git a/deps/inspection/dependencies-hierarchy/example/.gitignore b/deps/inspection/tree-builder/example/.gitignore similarity index 100% rename from deps/inspection/dependencies-hierarchy/example/.gitignore rename to deps/inspection/tree-builder/example/.gitignore diff --git a/deps/inspection/dependencies-hierarchy/example/index.js b/deps/inspection/tree-builder/example/index.js similarity index 70% rename from deps/inspection/dependencies-hierarchy/example/index.js rename to deps/inspection/tree-builder/example/index.js index ddf43c0718..b9018583d0 100644 --- a/deps/inspection/dependencies-hierarchy/example/index.js +++ b/deps/inspection/tree-builder/example/index.js @@ -1,5 +1,5 @@ 'use strict' -const hierarchyForPackages = require('dependencies-hierarchy').forPackages +const hierarchyForPackages = require('tree-builder').forPackages hierarchyForPackages(['graceful-fs', {name: 'pify', range: '2'}], import.meta.dirname, {depth: 2}) .then(tree => { diff --git a/deps/inspection/dependencies-hierarchy/example/package.json b/deps/inspection/tree-builder/example/package.json similarity index 100% rename from deps/inspection/dependencies-hierarchy/example/package.json rename to deps/inspection/tree-builder/example/package.json diff --git a/deps/inspection/dependencies-hierarchy/example/pnpm-lock.yaml b/deps/inspection/tree-builder/example/pnpm-lock.yaml similarity index 100% rename from deps/inspection/dependencies-hierarchy/example/pnpm-lock.yaml rename to deps/inspection/tree-builder/example/pnpm-lock.yaml diff --git a/deps/inspection/dependencies-hierarchy/example/pnpm-workspace.yaml b/deps/inspection/tree-builder/example/pnpm-workspace.yaml similarity index 100% rename from deps/inspection/dependencies-hierarchy/example/pnpm-workspace.yaml rename to deps/inspection/tree-builder/example/pnpm-workspace.yaml diff --git a/deps/inspection/dependencies-hierarchy/package.json b/deps/inspection/tree-builder/package.json similarity index 79% rename from deps/inspection/dependencies-hierarchy/package.json rename to deps/inspection/tree-builder/package.json index 0f08a31715..cff4f2f6a7 100644 --- a/deps/inspection/dependencies-hierarchy/package.json +++ b/deps/inspection/tree-builder/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/reviewing.dependencies-hierarchy", + "name": "@pnpm/deps.inspection.tree-builder", "version": "1001.1.3", "description": "Creates a dependencies hierarchy for a symlinked `node_modules`", "keywords": [ @@ -11,8 +11,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/deps/inspection/dependencies-hierarchy", - "homepage": "https://github.com/pnpm/pnpm/tree/main/deps/inspection/dependencies-hierarchy#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/deps/inspection/tree-builder", + "homepage": "https://github.com/pnpm/pnpm/tree/main/deps/inspection/tree-builder#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -34,16 +34,16 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/dependency-path": "workspace:*", + "@pnpm/config.matcher": "workspace:*", + "@pnpm/config.normalize-registries": "workspace:*", + "@pnpm/deps.path": "workspace:*", + "@pnpm/fs.read-modules-dir": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/lockfile.detect-dep-types": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/matcher": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/normalize-registries": "workspace:*", "@pnpm/npm-package-arg": "catalog:", - "@pnpm/read-modules-dir": "workspace:*", - "@pnpm/read-package-json": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/store.cafs": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/types": "workspace:*", @@ -56,7 +56,7 @@ }, "devDependencies": { "@pnpm/constants": "workspace:*", - "@pnpm/reviewing.dependencies-hierarchy": "workspace:*", + "@pnpm/deps.inspection.tree-builder": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/normalize-path": "catalog:", "@types/semver": "catalog:" diff --git a/deps/inspection/dependencies-hierarchy/src/DependencyNode.ts b/deps/inspection/tree-builder/src/DependencyNode.ts similarity index 100% rename from deps/inspection/dependencies-hierarchy/src/DependencyNode.ts rename to deps/inspection/tree-builder/src/DependencyNode.ts diff --git a/deps/inspection/dependencies-hierarchy/src/TreeNodeId.ts b/deps/inspection/tree-builder/src/TreeNodeId.ts similarity index 100% rename from deps/inspection/dependencies-hierarchy/src/TreeNodeId.ts rename to deps/inspection/tree-builder/src/TreeNodeId.ts diff --git a/deps/inspection/dependencies-hierarchy/src/buildDependenciesTree.ts b/deps/inspection/tree-builder/src/buildDependenciesTree.ts similarity index 96% rename from deps/inspection/dependencies-hierarchy/src/buildDependenciesTree.ts rename to deps/inspection/tree-builder/src/buildDependenciesTree.ts index 69ad1d9d95..b7b5d56792 100644 --- a/deps/inspection/dependencies-hierarchy/src/buildDependenciesTree.ts +++ b/deps/inspection/tree-builder/src/buildDependenciesTree.ts @@ -1,5 +1,8 @@ import path from 'node:path' +import { normalizeRegistries } from '@pnpm/config.normalize-registries' +import { readModulesDir } from '@pnpm/fs.read-modules-dir' +import { readModulesManifest } from '@pnpm/installing.modules-yaml' import { detectDepTypes } from '@pnpm/lockfile.detect-dep-types' import { getLockfileImporterId, @@ -9,10 +12,7 @@ import { readWantedLockfile, type ResolvedDependencies, } from '@pnpm/lockfile.fs' -import { readModulesManifest } from '@pnpm/modules-yaml' -import { normalizeRegistries } from '@pnpm/normalize-registries' -import { readModulesDir } from '@pnpm/read-modules-dir' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import { StoreIndex } from '@pnpm/store.index' import { DEPENDENCIES_FIELDS, type DependenciesField, type Finder, type Registries } from '@pnpm/types' import normalizePath from 'normalize-path' diff --git a/deps/inspection/dependencies-hierarchy/src/buildDependencyGraph.ts b/deps/inspection/tree-builder/src/buildDependencyGraph.ts similarity index 100% rename from deps/inspection/dependencies-hierarchy/src/buildDependencyGraph.ts rename to deps/inspection/tree-builder/src/buildDependencyGraph.ts diff --git a/deps/inspection/dependencies-hierarchy/src/buildDependentsTree.ts b/deps/inspection/tree-builder/src/buildDependentsTree.ts similarity index 99% rename from deps/inspection/dependencies-hierarchy/src/buildDependentsTree.ts rename to deps/inspection/tree-builder/src/buildDependentsTree.ts index f8a8407346..21a8cb7b77 100644 --- a/deps/inspection/dependencies-hierarchy/src/buildDependentsTree.ts +++ b/deps/inspection/tree-builder/src/buildDependentsTree.ts @@ -1,5 +1,7 @@ import path from 'node:path' +import { normalizeRegistries } from '@pnpm/config.normalize-registries' +import { readModulesManifest } from '@pnpm/installing.modules-yaml' import { getLockfileImporterId, type LockfileObject, @@ -7,8 +9,6 @@ import { type ProjectSnapshot, } from '@pnpm/lockfile.fs' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils' -import { readModulesManifest } from '@pnpm/modules-yaml' -import { normalizeRegistries } from '@pnpm/normalize-registries' import { StoreIndex } from '@pnpm/store.index' import type { DependenciesField, DependencyManifest, Finder, Registries } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' diff --git a/deps/inspection/dependencies-hierarchy/src/createPackagesSearcher.ts b/deps/inspection/tree-builder/src/createPackagesSearcher.ts similarity index 97% rename from deps/inspection/dependencies-hierarchy/src/createPackagesSearcher.ts rename to deps/inspection/tree-builder/src/createPackagesSearcher.ts index 60ef3e7d53..b0d684c3c7 100644 --- a/deps/inspection/dependencies-hierarchy/src/createPackagesSearcher.ts +++ b/deps/inspection/tree-builder/src/createPackagesSearcher.ts @@ -1,4 +1,4 @@ -import { createMatcher } from '@pnpm/matcher' +import { createMatcher } from '@pnpm/config.matcher' import npa from '@pnpm/npm-package-arg' import type { Finder, FinderContext } from '@pnpm/types' import semver from 'semver' diff --git a/deps/inspection/dependencies-hierarchy/src/getPkgInfo.ts b/deps/inspection/tree-builder/src/getPkgInfo.ts similarity index 97% rename from deps/inspection/dependencies-hierarchy/src/getPkgInfo.ts rename to deps/inspection/tree-builder/src/getPkgInfo.ts index b56bdcbad7..c6ff5f1eaf 100644 --- a/deps/inspection/dependencies-hierarchy/src/getPkgInfo.ts +++ b/deps/inspection/tree-builder/src/getPkgInfo.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { refToRelative } from '@pnpm/dependency-path' +import { refToRelative } from '@pnpm/deps.path' import { DepType, type DepTypes } from '@pnpm/lockfile.detect-dep-types' import type { PackageSnapshot, @@ -11,7 +11,7 @@ import { nameVerFromPkgSnapshot, pkgSnapshotToResolution, } from '@pnpm/lockfile.utils' -import { readPackageJsonFromDirSync } from '@pnpm/read-package-json' +import { readPackageJsonFromDirSync } from '@pnpm/pkg-manifest.read-package-json' import type { StoreIndex } from '@pnpm/store.index' import type { DependencyManifest, Registries } from '@pnpm/types' import normalizePath from 'normalize-path' diff --git a/deps/inspection/dependencies-hierarchy/src/getTree.ts b/deps/inspection/tree-builder/src/getTree.ts similarity index 100% rename from deps/inspection/dependencies-hierarchy/src/getTree.ts rename to deps/inspection/tree-builder/src/getTree.ts diff --git a/deps/inspection/dependencies-hierarchy/src/getTreeNodeChildId.ts b/deps/inspection/tree-builder/src/getTreeNodeChildId.ts similarity index 97% rename from deps/inspection/dependencies-hierarchy/src/getTreeNodeChildId.ts rename to deps/inspection/tree-builder/src/getTreeNodeChildId.ts index 696f329fd7..5fb2a0b9d9 100644 --- a/deps/inspection/dependencies-hierarchy/src/getTreeNodeChildId.ts +++ b/deps/inspection/tree-builder/src/getTreeNodeChildId.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { refToRelative } from '@pnpm/dependency-path' +import { refToRelative } from '@pnpm/deps.path' import { getLockfileImporterId, type ProjectSnapshot } from '@pnpm/lockfile.fs' import type { TreeNodeId } from './TreeNodeId.js' diff --git a/deps/inspection/dependencies-hierarchy/src/index.ts b/deps/inspection/tree-builder/src/index.ts similarity index 100% rename from deps/inspection/dependencies-hierarchy/src/index.ts rename to deps/inspection/tree-builder/src/index.ts diff --git a/deps/inspection/dependencies-hierarchy/src/peersSuffixHash.ts b/deps/inspection/tree-builder/src/peersSuffixHash.ts similarity index 85% rename from deps/inspection/dependencies-hierarchy/src/peersSuffixHash.ts rename to deps/inspection/tree-builder/src/peersSuffixHash.ts index 1bf8f43169..423c12619c 100644 --- a/deps/inspection/dependencies-hierarchy/src/peersSuffixHash.ts +++ b/deps/inspection/tree-builder/src/peersSuffixHash.ts @@ -1,6 +1,6 @@ import crypto from 'node:crypto' -import { parseDepPath } from '@pnpm/dependency-path' +import { parseDepPath } from '@pnpm/deps.path' export function peersSuffixHashFromDepPath (depPath: string): string | undefined { const { peerDepGraphHash } = parseDepPath(depPath) diff --git a/deps/inspection/dependencies-hierarchy/src/readManifestFromCafs.ts b/deps/inspection/tree-builder/src/readManifestFromCafs.ts similarity index 100% rename from deps/inspection/dependencies-hierarchy/src/readManifestFromCafs.ts rename to deps/inspection/tree-builder/src/readManifestFromCafs.ts diff --git a/deps/inspection/dependencies-hierarchy/src/resolvePackagePath.ts b/deps/inspection/tree-builder/src/resolvePackagePath.ts similarity index 97% rename from deps/inspection/dependencies-hierarchy/src/resolvePackagePath.ts rename to deps/inspection/tree-builder/src/resolvePackagePath.ts index 540f39dd0a..8fe4b6e304 100644 --- a/deps/inspection/dependencies-hierarchy/src/resolvePackagePath.ts +++ b/deps/inspection/tree-builder/src/resolvePackagePath.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import { depPathToFilename } from '@pnpm/dependency-path' +import { depPathToFilename } from '@pnpm/deps.path' /** * Resolves the filesystem path for a package identified by its depPath. diff --git a/deps/inspection/dependencies-hierarchy/test/buildDependentsTree.test.ts b/deps/inspection/tree-builder/test/buildDependentsTree.test.ts similarity index 98% rename from deps/inspection/dependencies-hierarchy/test/buildDependentsTree.test.ts rename to deps/inspection/tree-builder/test/buildDependentsTree.test.ts index 569af92df2..4b15f7d21d 100644 --- a/deps/inspection/dependencies-hierarchy/test/buildDependentsTree.test.ts +++ b/deps/inspection/tree-builder/test/buildDependentsTree.test.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import os from 'node:os' import path from 'node:path' -import { depPathToFilename, refToRelative } from '@pnpm/dependency-path' +import { depPathToFilename, refToRelative } from '@pnpm/deps.path' import type { PackageSnapshots, ProjectSnapshot } from '@pnpm/lockfile.fs' import type { DepPath, ProjectId } from '@pnpm/types' diff --git a/deps/inspection/dependencies-hierarchy/test/circularTree.json b/deps/inspection/tree-builder/test/circularTree.json similarity index 100% rename from deps/inspection/dependencies-hierarchy/test/circularTree.json rename to deps/inspection/tree-builder/test/circularTree.json diff --git a/deps/inspection/dependencies-hierarchy/test/createPackagesSearcher.spec.ts b/deps/inspection/tree-builder/test/createPackagesSearcher.spec.ts similarity index 100% rename from deps/inspection/dependencies-hierarchy/test/createPackagesSearcher.spec.ts rename to deps/inspection/tree-builder/test/createPackagesSearcher.spec.ts diff --git a/deps/inspection/dependencies-hierarchy/test/getPkgInfo.test.ts b/deps/inspection/tree-builder/test/getPkgInfo.test.ts similarity index 100% rename from deps/inspection/dependencies-hierarchy/test/getPkgInfo.test.ts rename to deps/inspection/tree-builder/test/getPkgInfo.test.ts diff --git a/deps/inspection/dependencies-hierarchy/test/getTree.test.ts b/deps/inspection/tree-builder/test/getTree.test.ts similarity index 99% rename from deps/inspection/dependencies-hierarchy/test/getTree.test.ts rename to deps/inspection/tree-builder/test/getTree.test.ts index 7efd8133fb..104420c941 100644 --- a/deps/inspection/dependencies-hierarchy/test/getTree.test.ts +++ b/deps/inspection/tree-builder/test/getTree.test.ts @@ -1,6 +1,6 @@ -import { refToRelative } from '@pnpm/dependency-path' +import type { DependencyNode } from '@pnpm/deps.inspection.tree-builder' +import { refToRelative } from '@pnpm/deps.path' import type { PackageSnapshots } from '@pnpm/lockfile.fs' -import type { DependencyNode } from '@pnpm/reviewing.dependencies-hierarchy' import type { DepPath, Finder } from '@pnpm/types' import { buildDependencyGraph } from '../lib/buildDependencyGraph.js' diff --git a/deps/inspection/dependencies-hierarchy/test/index.ts b/deps/inspection/tree-builder/test/index.ts similarity index 99% rename from deps/inspection/dependencies-hierarchy/test/index.ts rename to deps/inspection/tree-builder/test/index.ts index f4b60dda4c..ea6d4a59f9 100644 --- a/deps/inspection/dependencies-hierarchy/test/index.ts +++ b/deps/inspection/tree-builder/test/index.ts @@ -3,8 +3,8 @@ import fs from 'node:fs' import path from 'node:path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { depPathToFilename } from '@pnpm/dependency-path' -import { buildDependenciesTree, type DependencyNode } from '@pnpm/reviewing.dependencies-hierarchy' +import { buildDependenciesTree, type DependencyNode } from '@pnpm/deps.inspection.tree-builder' +import { depPathToFilename } from '@pnpm/deps.path' import { fixtures } from '@pnpm/test-fixtures' const virtualStoreDirMaxLength = process.platform === 'win32' ? 60 : 120 diff --git a/deps/inspection/dependencies-hierarchy/test/tsconfig.json b/deps/inspection/tree-builder/test/tsconfig.json similarity index 100% rename from deps/inspection/dependencies-hierarchy/test/tsconfig.json rename to deps/inspection/tree-builder/test/tsconfig.json diff --git a/deps/inspection/dependencies-hierarchy/tsconfig.json b/deps/inspection/tree-builder/tsconfig.json similarity index 96% rename from deps/inspection/dependencies-hierarchy/tsconfig.json rename to deps/inspection/tree-builder/tsconfig.json index 24b3d5d93c..2ff5a99c69 100644 --- a/deps/inspection/dependencies-hierarchy/tsconfig.json +++ b/deps/inspection/tree-builder/tsconfig.json @@ -49,7 +49,7 @@ "path": "../../../store/index" }, { - "path": "../../dependency-path" + "path": "../../path" } ] } diff --git a/deps/inspection/dependencies-hierarchy/tsconfig.lint.json b/deps/inspection/tree-builder/tsconfig.lint.json similarity index 100% rename from deps/inspection/dependencies-hierarchy/tsconfig.lint.json rename to deps/inspection/tree-builder/tsconfig.lint.json diff --git a/deps/dependency-path/CHANGELOG.md b/deps/path/CHANGELOG.md similarity index 100% rename from deps/dependency-path/CHANGELOG.md rename to deps/path/CHANGELOG.md diff --git a/deps/dependency-path/README.md b/deps/path/README.md similarity index 100% rename from deps/dependency-path/README.md rename to deps/path/README.md diff --git a/deps/dependency-path/example.js b/deps/path/example.js similarity index 100% rename from deps/dependency-path/example.js rename to deps/path/example.js diff --git a/deps/dependency-path/package.json b/deps/path/package.json similarity index 81% rename from deps/dependency-path/package.json rename to deps/path/package.json index 22ba1f57eb..7f6fdc46fd 100644 --- a/deps/dependency-path/package.json +++ b/deps/path/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/dependency-path", + "name": "@pnpm/deps.path", "version": "1001.1.3", "description": "Utilities for working with symlinked node_modules", "keywords": [ @@ -10,8 +10,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/deps/dependency-path", - "homepage": "https://github.com/pnpm/pnpm/tree/main/deps/dependency-path#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/deps/path", + "homepage": "https://github.com/pnpm/pnpm/tree/main/deps/path#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -38,7 +38,7 @@ "semver": "catalog:" }, "devDependencies": { - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@types/semver": "catalog:" }, "engines": { diff --git a/deps/dependency-path/src/index.ts b/deps/path/src/index.ts similarity index 100% rename from deps/dependency-path/src/index.ts rename to deps/path/src/index.ts diff --git a/deps/dependency-path/test/index.ts b/deps/path/test/index.ts similarity index 99% rename from deps/dependency-path/test/index.ts rename to deps/path/test/index.ts index 2062cce4bb..7f47745bb3 100644 --- a/deps/dependency-path/test/index.ts +++ b/deps/path/test/index.ts @@ -8,7 +8,7 @@ import { refToRelative, removeSuffix, tryGetPackageId, -} from '@pnpm/dependency-path' +} from '@pnpm/deps.path' import type { DepPath } from '@pnpm/types' test('isAbsolute()', () => { diff --git a/deps/dependency-path/test/tsconfig.json b/deps/path/test/tsconfig.json similarity index 100% rename from deps/dependency-path/test/tsconfig.json rename to deps/path/test/tsconfig.json diff --git a/deps/dependency-path/tsconfig.json b/deps/path/tsconfig.json similarity index 100% rename from deps/dependency-path/tsconfig.json rename to deps/path/tsconfig.json diff --git a/deps/dependency-path/tsconfig.lint.json b/deps/path/tsconfig.lint.json similarity index 100% rename from deps/dependency-path/tsconfig.lint.json rename to deps/path/tsconfig.lint.json diff --git a/deps/peer-range/package.json b/deps/peer-range/package.json index 7abfebcdb5..f349fdbd22 100644 --- a/deps/peer-range/package.json +++ b/deps/peer-range/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/semver.peer-range", + "name": "@pnpm/deps.peer-range", "version": "1000.0.0", "description": "Validates peer ranges", "keywords": [ @@ -35,7 +35,7 @@ "semver": "catalog:" }, "devDependencies": { - "@pnpm/semver.peer-range": "workspace:*", + "@pnpm/deps.peer-range": "workspace:*", "@types/semver": "catalog:" }, "engines": { diff --git a/deps/status/package.json b/deps/status/package.json index f3d2dff100..005daafe60 100644 --- a/deps/status/package.json +++ b/deps/status/package.json @@ -33,20 +33,20 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/config": "workspace:*", + "@pnpm/config.parse-overrides": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/crypto.object-hasher": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/get-context": "workspace:*", + "@pnpm/installing.context": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.settings-checker": "workspace:*", "@pnpm/lockfile.verification": "workspace:*", - "@pnpm/parse-overrides": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/workspace.find-packages": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*", + "@pnpm/workspace.projects-reader": "workspace:*", "@pnpm/workspace.state": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "ramda": "catalog:" }, "peerDependencies": { @@ -56,7 +56,7 @@ "@jest/globals": "catalog:", "@pnpm/deps.status": "workspace:*", "@pnpm/prepare": "workspace:*", - "@pnpm/write-project-manifest": "workspace:*", + "@pnpm/workspace.project-manifest-writer": "workspace:*", "@types/ramda": "catalog:" }, "engines": { diff --git a/deps/status/src/checkDepsStatus.ts b/deps/status/src/checkDepsStatus.ts index b208c2361c..68fa022705 100644 --- a/deps/status/src/checkDepsStatus.ts +++ b/deps/status/src/checkDepsStatus.ts @@ -2,11 +2,12 @@ import fs from 'node:fs' import path from 'node:path' import util from 'node:util' -import { type Config, getOptionsFromRootManifest, type OptionsFromRootManifest } from '@pnpm/config' +import { parseOverrides } from '@pnpm/config.parse-overrides' +import { type Config, getOptionsFromRootManifest, type OptionsFromRootManifest } from '@pnpm/config.reader' import { MANIFEST_BASE_NAMES, WANTED_LOCKFILE } from '@pnpm/constants' import { hashObjectNullableWithPrefix } from '@pnpm/crypto.object-hasher' import { PnpmError } from '@pnpm/error' -import { arrayOfWorkspacePackagesToMap } from '@pnpm/get-context' +import { arrayOfWorkspacePackagesToMap } from '@pnpm/installing.context' import { getLockfileImporterId, type LockfileObject, @@ -24,17 +25,16 @@ import { satisfiesPackageManifest, } from '@pnpm/lockfile.verification' import { globalWarn, logger } from '@pnpm/logger' -import { parseOverrides } from '@pnpm/parse-overrides' -import type { WorkspacePackages } from '@pnpm/resolver-base' +import type { WorkspacePackages } from '@pnpm/resolving.resolver-base' import type { DependencyManifest, Project, ProjectId, ProjectManifest, } from '@pnpm/types' -import { findWorkspacePackages } from '@pnpm/workspace.find-packages' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' import { loadWorkspaceState, updateWorkspaceState, type WorkspaceState, type WorkspaceStateSettings } from '@pnpm/workspace.state' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { equals, filter, isEmpty, once } from 'ramda' import { assertLockfilesEqual } from './assertLockfilesEqual.js' diff --git a/deps/status/test/statManifestFile.test.ts b/deps/status/test/statManifestFile.test.ts index 231a644ef5..be601c2543 100644 --- a/deps/status/test/statManifestFile.test.ts +++ b/deps/status/test/statManifestFile.test.ts @@ -1,6 +1,6 @@ import { MANIFEST_BASE_NAMES } from '@pnpm/constants' import { prepareEmpty } from '@pnpm/prepare' -import { writeProjectManifest } from '@pnpm/write-project-manifest' +import { writeProjectManifest } from '@pnpm/workspace.project-manifest-writer' import { statManifestFile } from '../src/statManifestFile.js' diff --git a/deps/status/tsconfig.json b/deps/status/tsconfig.json index bb03d0ad33..0782260e98 100644 --- a/deps/status/tsconfig.json +++ b/deps/status/tsconfig.json @@ -13,16 +13,16 @@ "path": "../../__utils__/prepare" }, { - "path": "../../config/config" + "path": "../../config/parse-overrides" }, { - "path": "../../config/parse-overrides" + "path": "../../config/reader" }, { "path": "../../crypto/object-hasher" }, { - "path": "../../installing/get-context" + "path": "../../installing/context" }, { "path": "../../lockfile/fs" @@ -42,20 +42,20 @@ { "path": "../../packages/types" }, - { - "path": "../../pkg-manifest/write-project-manifest" - }, { "path": "../../resolving/resolver-base" }, { - "path": "../../workspace/find-packages" + "path": "../../workspace/project-manifest-writer" }, { - "path": "../../workspace/read-manifest" + "path": "../../workspace/projects-reader" }, { "path": "../../workspace/state" + }, + { + "path": "../../workspace/workspace-manifest-reader" } ] } diff --git a/engine/pm/commands/package.json b/engine/pm/commands/package.json index e99305b7b8..83351a0cd9 100644 --- a/engine/pm/commands/package.json +++ b/engine/pm/commands/package.json @@ -31,24 +31,24 @@ "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest" }, "dependencies": { - "@pnpm/calc-dep-state": "workspace:*", - "@pnpm/cli-meta": "workspace:*", - "@pnpm/cli-utils": "workspace:*", - "@pnpm/client": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/bins.linker": "workspace:*", + "@pnpm/cli.meta": "workspace:*", + "@pnpm/cli.utils": "workspace:*", "@pnpm/config.deps-installer": "workspace:*", + "@pnpm/config.reader": "workspace:*", + "@pnpm/deps.graph-hasher": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/global.commands": "workspace:*", "@pnpm/global.packages": "workspace:*", - "@pnpm/headless": "workspace:*", - "@pnpm/link-bins": "workspace:*", + "@pnpm/installing.client": "workspace:*", + "@pnpm/installing.deps-restorer": "workspace:*", "@pnpm/lockfile.types": "workspace:*", - "@pnpm/npm-resolver": "workspace:*", "@pnpm/os.env.path-extender": "catalog:", - "@pnpm/package-store": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", + "@pnpm/store.connection-manager": "workspace:*", + "@pnpm/store.controller": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "ramda": "catalog:", "render-help": "catalog:", "semver": "catalog:", @@ -60,10 +60,10 @@ "devDependencies": { "@jest/globals": "catalog:", "@pnpm/engine.pm.commands": "workspace:*", - "@pnpm/env.path": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/prepare": "workspace:*", + "@pnpm/shell.path": "workspace:*", "@types/cross-spawn": "catalog:", "@types/ramda": "catalog:", "@types/semver": "catalog:", diff --git a/engine/pm/commands/src/self-updater/installPnpm.ts b/engine/pm/commands/src/self-updater/installPnpm.ts index 0fb054e769..df0168d816 100644 --- a/engine/pm/commands/src/self-updater/installPnpm.ts +++ b/engine/pm/commands/src/self-updater/installPnpm.ts @@ -2,12 +2,13 @@ import fs from 'node:fs' import path from 'node:path' import util from 'node:util' +import { linkBins } from '@pnpm/bins.linker' +import { getCurrentPackageName } from '@pnpm/cli.meta' import { iterateHashedGraphNodes, iteratePkgMeta, lockfileToDepGraph, -} from '@pnpm/calc-dep-state' -import { getCurrentPackageName } from '@pnpm/cli-meta' +} from '@pnpm/deps.graph-hasher' import { type GlobalAddOptions, installGlobalPackages } from '@pnpm/global.commands' import { cleanOrphanedInstallDirs, @@ -16,10 +17,9 @@ import { findGlobalPackage, getHashLink, } from '@pnpm/global.packages' -import { headlessInstall } from '@pnpm/headless' -import { linkBins } from '@pnpm/link-bins' +import { headlessInstall } from '@pnpm/installing.deps-restorer' import type { EnvLockfile, LockfileObject, PackageSnapshot } from '@pnpm/lockfile.types' -import type { StoreController } from '@pnpm/package-store' +import type { StoreController } from '@pnpm/store.controller' import type { DepPath, ProjectId, ProjectRootDir, Registries } from '@pnpm/types' import symlinkDir from 'symlink-dir' diff --git a/engine/pm/commands/src/self-updater/selfUpdate.ts b/engine/pm/commands/src/self-updater/selfUpdate.ts index 56a5e21dca..3ba719398e 100644 --- a/engine/pm/commands/src/self-updater/selfUpdate.ts +++ b/engine/pm/commands/src/self-updater/selfUpdate.ts @@ -1,17 +1,17 @@ import path from 'node:path' -import { isExecutedByCorepack, packageManager } from '@pnpm/cli-meta' -import { docsUrl } from '@pnpm/cli-utils' -import { createResolver } from '@pnpm/client' -import { type Config, types as allTypes } from '@pnpm/config' +import { linkBins } from '@pnpm/bins.linker' +import { isExecutedByCorepack, packageManager } from '@pnpm/cli.meta' +import { docsUrl } from '@pnpm/cli.utils' import { resolvePackageManagerIntegrities } from '@pnpm/config.deps-installer' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' -import { linkBins } from '@pnpm/link-bins' +import { createResolver } from '@pnpm/installing.client' import { globalWarn } from '@pnpm/logger' -import { whichVersionIsPinned } from '@pnpm/npm-resolver' -import { readProjectManifest } from '@pnpm/read-project-manifest' -import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import { whichVersionIsPinned } from '@pnpm/resolving.npm-resolver' +import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import type { PinnedVersion } from '@pnpm/types' +import { readProjectManifest } from '@pnpm/workspace.project-manifest-reader' import { pick } from 'ramda' import { renderHelp } from 'render-help' import semver from 'semver' diff --git a/engine/pm/commands/src/setup/setup.ts b/engine/pm/commands/src/setup/setup.ts index 6908b5c5f9..813537da05 100644 --- a/engine/pm/commands/src/setup/setup.ts +++ b/engine/pm/commands/src/setup/setup.ts @@ -2,8 +2,8 @@ import { spawnSync } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { detectIfCurrentPkgIsExecutable, packageManager } from '@pnpm/cli-meta' -import { docsUrl } from '@pnpm/cli-utils' +import { detectIfCurrentPkgIsExecutable, packageManager } from '@pnpm/cli.meta' +import { docsUrl } from '@pnpm/cli.utils' import { logger } from '@pnpm/logger' import { addDirToEnvPath, diff --git a/engine/pm/commands/test/self-updater/selfUpdate.test.ts b/engine/pm/commands/test/self-updater/selfUpdate.test.ts index 83406526a1..cf0c04ec66 100644 --- a/engine/pm/commands/test/self-updater/selfUpdate.test.ts +++ b/engine/pm/commands/test/self-updater/selfUpdate.test.ts @@ -3,16 +3,16 @@ import { createRequire } from 'node:module' import path from 'node:path' import { jest } from '@jest/globals' -import { prependDirsToPath } from '@pnpm/env.path' import { prepare as prepareWithPkg, tempDir } from '@pnpm/prepare' +import { prependDirsToPath } from '@pnpm/shell.path' import spawn from 'cross-spawn' import nock from 'nock' const require = createRequire(import.meta.dirname) const pnpmTarballPath = require.resolve('@pnpm/tgz-fixtures/tgz/pnpm-9.1.0.tgz') -const actualModule = await import('@pnpm/cli-meta') -jest.unstable_mockModule('@pnpm/cli-meta', () => { +const actualModule = await import('@pnpm/cli.meta') +jest.unstable_mockModule('@pnpm/cli.meta', () => { return { ...actualModule, packageManager: { diff --git a/engine/pm/commands/tsconfig.json b/engine/pm/commands/tsconfig.json index 76c6f8095b..1e8d0af489 100644 --- a/engine/pm/commands/tsconfig.json +++ b/engine/pm/commands/tsconfig.json @@ -14,22 +14,22 @@ "path": "../../../__utils__/prepare" }, { - "path": "../../../bins/link-bins" + "path": "../../../bins/linker" }, { - "path": "../../../cli/cli-meta" + "path": "../../../cli/meta" }, { - "path": "../../../cli/cli-utils" - }, - { - "path": "../../../config/config" + "path": "../../../cli/utils" }, { "path": "../../../config/deps-installer" }, { - "path": "../../../deps/calc-dep-state" + "path": "../../../config/reader" + }, + { + "path": "../../../deps/graph-hasher" }, { "path": "../../../global/commands" @@ -55,9 +55,6 @@ { "path": "../../../packages/types" }, - { - "path": "../../../pkg-manifest/read-project-manifest" - }, { "path": "../../../resolving/npm-resolver" }, @@ -65,10 +62,13 @@ "path": "../../../shell/path" }, { - "path": "../../../store/package-store" + "path": "../../../store/connection-manager" }, { - "path": "../../../store/store-connection-manager" + "path": "../../../store/controller" + }, + { + "path": "../../../workspace/project-manifest-reader" } ] } diff --git a/engine/runtime/commands/package.json b/engine/runtime/commands/package.json index 2c89c736a3..e70ae6fd7e 100644 --- a/engine/runtime/commands/package.json +++ b/engine/runtime/commands/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/runtime.commands", + "name": "@pnpm/engine.runtime.commands", "version": "1000.0.0-0", "description": "pnpm commands for managing runtimes", "keywords": [ @@ -32,12 +32,12 @@ "test": "pnpm run compile && pnpm run _test" }, "dependencies": { - "@pnpm/cli-utils": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.reader": "workspace:*", + "@pnpm/engine.runtime.node.resolver": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/exec.pnpm-cli-runner": "workspace:*", - "@pnpm/fetch": "workspace:*", - "@pnpm/node.resolver": "workspace:*", + "@pnpm/network.fetch": "workspace:*", "render-help": "catalog:" }, "peerDependencies": { @@ -45,8 +45,8 @@ }, "devDependencies": { "@jest/globals": "catalog:", + "@pnpm/engine.runtime.commands": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/runtime.commands": "workspace:*", "cross-env": "catalog:" }, "engines": { diff --git a/engine/runtime/commands/src/env/env.ts b/engine/runtime/commands/src/env/env.ts index b477bb531a..23d238ac41 100644 --- a/engine/runtime/commands/src/env/env.ts +++ b/engine/runtime/commands/src/env/env.ts @@ -1,4 +1,4 @@ -import { docsUrl } from '@pnpm/cli-utils' +import { docsUrl } from '@pnpm/cli.utils' import { PnpmError } from '@pnpm/error' import { renderHelp } from 'render-help' diff --git a/engine/runtime/commands/src/env/envList.ts b/engine/runtime/commands/src/env/envList.ts index c2fcf02a11..a02549f982 100644 --- a/engine/runtime/commands/src/env/envList.ts +++ b/engine/runtime/commands/src/env/envList.ts @@ -1,5 +1,5 @@ -import { createFetchFromRegistry } from '@pnpm/fetch' -import { getNodeMirror, parseNodeSpecifier, resolveNodeVersions } from '@pnpm/node.resolver' +import { getNodeMirror, parseNodeSpecifier, resolveNodeVersions } from '@pnpm/engine.runtime.node.resolver' +import { createFetchFromRegistry } from '@pnpm/network.fetch' import type { NvmNodeCommandOptions } from './node.js' diff --git a/engine/runtime/commands/src/env/node.ts b/engine/runtime/commands/src/env/node.ts index 07cbff7c36..6a8dfab6f3 100644 --- a/engine/runtime/commands/src/env/node.ts +++ b/engine/runtime/commands/src/env/node.ts @@ -1,4 +1,4 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' export type NvmNodeCommandOptions = Pick ({ runPnpmCli: mockRunPnpmCli, })) -const { env } = await import('@pnpm/runtime.commands') +const { env } = await import('@pnpm/engine.runtime.commands') beforeEach(() => { mockRunPnpmCli.mockClear() diff --git a/engine/runtime/commands/test/runtime.test.ts b/engine/runtime/commands/test/runtime.test.ts index ddfd002c27..79f6d982a4 100644 --- a/engine/runtime/commands/test/runtime.test.ts +++ b/engine/runtime/commands/test/runtime.test.ts @@ -6,7 +6,7 @@ jest.unstable_mockModule('@pnpm/exec.pnpm-cli-runner', () => ({ runPnpmCli: mockRunPnpmCli, })) -const { runtime } = await import('@pnpm/runtime.commands') +const { runtime } = await import('@pnpm/engine.runtime.commands') beforeEach(() => { mockRunPnpmCli.mockClear() diff --git a/engine/runtime/commands/tsconfig.json b/engine/runtime/commands/tsconfig.json index 3f475e6445..3084ef64ce 100644 --- a/engine/runtime/commands/tsconfig.json +++ b/engine/runtime/commands/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../../cli/cli-utils" + "path": "../../../cli/utils" }, { - "path": "../../../config/config" + "path": "../../../config/reader" }, { "path": "../../../exec/pnpm-cli-runner" diff --git a/engine/runtime/node.fetcher/package.json b/engine/runtime/node.fetcher/package.json index 6e57cc690c..d2119f132a 100644 --- a/engine/runtime/node.fetcher/package.json +++ b/engine/runtime/node.fetcher/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/node.fetcher", + "name": "@pnpm/engine.runtime.node.fetcher", "version": "1001.0.8", "description": "Node.js artifacts fetcher", "keywords": [ @@ -33,20 +33,20 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/create-cafs-store": "workspace:*", "@pnpm/crypto.shasums-file": "workspace:*", - "@pnpm/fetching-types": "workspace:*", + "@pnpm/engine.runtime.node.resolver": "workspace:*", "@pnpm/fetching.binary-fetcher": "workspace:*", - "@pnpm/node.resolver": "workspace:*", + "@pnpm/fetching.tarball-fetcher": "workspace:*", + "@pnpm/fetching.types": "workspace:*", + "@pnpm/store.create-cafs-store": "workspace:*", "@pnpm/store.index": "workspace:*", - "@pnpm/tarball-fetcher": "workspace:*", "detect-libc": "catalog:" }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/cafs-types": "workspace:*", - "@pnpm/node.fetcher": "workspace:*", + "@pnpm/engine.runtime.node.fetcher": "workspace:*", "@pnpm/prepare": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", "@types/adm-zip": "catalog:", "adm-zip": "catalog:", "node-fetch": "catalog:" diff --git a/engine/runtime/node.fetcher/src/index.ts b/engine/runtime/node.fetcher/src/index.ts index 4fe5eb0190..23635514b2 100644 --- a/engine/runtime/node.fetcher/src/index.ts +++ b/engine/runtime/node.fetcher/src/index.ts @@ -1,20 +1,20 @@ import path from 'node:path' -import type { Cafs } from '@pnpm/cafs-types' -import { createCafsStore } from '@pnpm/create-cafs-store' import { fetchShasumsFileRaw, pickFileChecksumFromShasumsFile } from '@pnpm/crypto.shasums-file' -import { downloadAndUnpackZip } from '@pnpm/fetching.binary-fetcher' -import type { - FetchFromRegistry, - RetryTimeoutOptions, -} from '@pnpm/fetching-types' import { DEFAULT_NODE_MIRROR_BASE_URL, getNodeArtifactAddress, UNOFFICIAL_NODE_MIRROR_BASE_URL, -} from '@pnpm/node.resolver' +} from '@pnpm/engine.runtime.node.resolver' +import { downloadAndUnpackZip } from '@pnpm/fetching.binary-fetcher' +import { createTarballFetcher } from '@pnpm/fetching.tarball-fetcher' +import type { + FetchFromRegistry, + RetryTimeoutOptions, +} from '@pnpm/fetching.types' +import type { Cafs } from '@pnpm/store.cafs-types' +import { createCafsStore } from '@pnpm/store.create-cafs-store' import type { StoreIndex } from '@pnpm/store.index' -import { createTarballFetcher } from '@pnpm/tarball-fetcher' import { isNonGlibcLinux } from 'detect-libc' export interface FetchNodeOptionsToDir { diff --git a/engine/runtime/node.fetcher/test/node.test.ts b/engine/runtime/node.fetcher/test/node.test.ts index 08a9194580..efa0544ac9 100644 --- a/engine/runtime/node.fetcher/test/node.test.ts +++ b/engine/runtime/node.fetcher/test/node.test.ts @@ -2,7 +2,7 @@ import path from 'node:path' import { Readable } from 'node:stream' import { jest } from '@jest/globals' -import type { FetchNodeOptionsToDir as FetchNodeOptions } from '@pnpm/node.fetcher' +import type { FetchNodeOptionsToDir as FetchNodeOptions } from '@pnpm/engine.runtime.node.fetcher' import { tempDir } from '@pnpm/prepare' import { StoreIndex } from '@pnpm/store.index' import AdmZip from 'adm-zip' @@ -12,7 +12,7 @@ jest.unstable_mockModule('detect-libc', () => ({ isNonGlibcLinux: jest.fn(), })) -const { fetchNode } = await import('@pnpm/node.fetcher') +const { fetchNode } = await import('@pnpm/engine.runtime.node.fetcher') const { isNonGlibcLinux } = await import('detect-libc') // A stable fake hex digest used as placeholder sha256 in mock SHASUMS256.txt files. diff --git a/engine/runtime/node.fetcher/tsconfig.json b/engine/runtime/node.fetcher/tsconfig.json index 401c0add83..ba54120621 100644 --- a/engine/runtime/node.fetcher/tsconfig.json +++ b/engine/runtime/node.fetcher/tsconfig.json @@ -19,10 +19,10 @@ "path": "../../../fetching/binary-fetcher" }, { - "path": "../../../fetching/fetching-types" + "path": "../../../fetching/tarball-fetcher" }, { - "path": "../../../fetching/tarball-fetcher" + "path": "../../../fetching/types" }, { "path": "../../../store/cafs-types" diff --git a/engine/runtime/node.resolver/package.json b/engine/runtime/node.resolver/package.json index 945c93bf0e..b1d89567fb 100644 --- a/engine/runtime/node.resolver/package.json +++ b/engine/runtime/node.resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/node.resolver", + "name": "@pnpm/engine.runtime.node.resolver", "version": "1001.0.5", "description": "Resolves a Node.js version specifier to an exact Node.js version", "keywords": [ @@ -33,19 +33,19 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/config": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/crypto.shasums-file": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetching-types": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/fetching.types": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", "semver": "catalog:", "version-selector-type": "catalog:" }, "devDependencies": { - "@pnpm/fetch": "workspace:*", - "@pnpm/node.resolver": "workspace:*", + "@pnpm/engine.runtime.node.resolver": "workspace:*", + "@pnpm/network.fetch": "workspace:*", "@types/semver": "catalog:" }, "engines": { diff --git a/engine/runtime/node.resolver/src/getNodeMirror.ts b/engine/runtime/node.resolver/src/getNodeMirror.ts index 324d3e87e6..26f8d3b034 100644 --- a/engine/runtime/node.resolver/src/getNodeMirror.ts +++ b/engine/runtime/node.resolver/src/getNodeMirror.ts @@ -1,4 +1,4 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' export function getNodeMirror (rawConfig: Config['rawConfig'], releaseChannel: string): string { // This is a dynamic lookup since the 'use-node-version' option is allowed to be '/' diff --git a/engine/runtime/node.resolver/src/index.ts b/engine/runtime/node.resolver/src/index.ts index d02e7a7621..4519221de6 100644 --- a/engine/runtime/node.resolver/src/index.ts +++ b/engine/runtime/node.resolver/src/index.ts @@ -1,7 +1,7 @@ import { getNodeBinsForCurrentOS } from '@pnpm/constants' import { fetchShasumsFile } from '@pnpm/crypto.shasums-file' import { PnpmError } from '@pnpm/error' -import type { FetchFromRegistry } from '@pnpm/fetching-types' +import type { FetchFromRegistry } from '@pnpm/fetching.types' import type { BinaryResolution, PlatformAssetResolution, @@ -10,7 +10,7 @@ import type { ResolveResult, VariationsResolution, WantedDependency, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' import type { PkgResolutionId } from '@pnpm/types' import semver from 'semver' import versionSelectorType from 'version-selector-type' diff --git a/engine/runtime/node.resolver/test/resolveNodeVersion.test.ts b/engine/runtime/node.resolver/test/resolveNodeVersion.test.ts index 8aaa1c1fd9..da1302ef4d 100644 --- a/engine/runtime/node.resolver/test/resolveNodeVersion.test.ts +++ b/engine/runtime/node.resolver/test/resolveNodeVersion.test.ts @@ -1,5 +1,5 @@ -import { createFetchFromRegistry } from '@pnpm/fetch' -import { resolveNodeVersion } from '@pnpm/node.resolver' +import { resolveNodeVersion } from '@pnpm/engine.runtime.node.resolver' +import { createFetchFromRegistry } from '@pnpm/network.fetch' const fetch = createFetchFromRegistry({}) diff --git a/engine/runtime/node.resolver/test/resolveNodeVersions.test.ts b/engine/runtime/node.resolver/test/resolveNodeVersions.test.ts index 72c52c16c1..8bcaca28b5 100644 --- a/engine/runtime/node.resolver/test/resolveNodeVersions.test.ts +++ b/engine/runtime/node.resolver/test/resolveNodeVersions.test.ts @@ -1,5 +1,5 @@ -import { createFetchFromRegistry } from '@pnpm/fetch' -import { resolveNodeVersions } from '@pnpm/node.resolver' +import { resolveNodeVersions } from '@pnpm/engine.runtime.node.resolver' +import { createFetchFromRegistry } from '@pnpm/network.fetch' const fetch = createFetchFromRegistry({}) diff --git a/engine/runtime/node.resolver/tsconfig.json b/engine/runtime/node.resolver/tsconfig.json index 6f92380307..3cbe6e5a78 100644 --- a/engine/runtime/node.resolver/tsconfig.json +++ b/engine/runtime/node.resolver/tsconfig.json @@ -10,13 +10,13 @@ ], "references": [ { - "path": "../../../config/config" + "path": "../../../config/reader" }, { "path": "../../../crypto/shasums-file" }, { - "path": "../../../fetching/fetching-types" + "path": "../../../fetching/types" }, { "path": "../../../network/fetch" diff --git a/engine/runtime/system-node-version/package.json b/engine/runtime/system-node-version/package.json index f74f4ecf90..5638dd240e 100644 --- a/engine/runtime/system-node-version/package.json +++ b/engine/runtime/system-node-version/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/env.system-node-version", + "name": "@pnpm/engine.runtime.system-node-version", "version": "1000.0.11", "description": "Detects the current system node version", "keywords": [ @@ -32,13 +32,13 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-meta": "workspace:*", + "@pnpm/cli.meta": "workspace:*", "execa": "catalog:", "memoize": "catalog:" }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/env.system-node-version": "workspace:*" + "@pnpm/engine.runtime.system-node-version": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/engine/runtime/system-node-version/src/index.ts b/engine/runtime/system-node-version/src/index.ts index 0bed6704de..138cb861f4 100644 --- a/engine/runtime/system-node-version/src/index.ts +++ b/engine/runtime/system-node-version/src/index.ts @@ -1,4 +1,4 @@ -import { detectIfCurrentPkgIsExecutable } from '@pnpm/cli-meta' +import { detectIfCurrentPkgIsExecutable } from '@pnpm/cli.meta' import * as execa from 'execa' import mem from 'memoize' diff --git a/engine/runtime/system-node-version/test/getSystemNodeVersion.test.ts b/engine/runtime/system-node-version/test/getSystemNodeVersion.test.ts index e869163311..1b943c6640 100644 --- a/engine/runtime/system-node-version/test/getSystemNodeVersion.test.ts +++ b/engine/runtime/system-node-version/test/getSystemNodeVersion.test.ts @@ -2,7 +2,7 @@ import { jest } from '@jest/globals' let isSea = false -jest.unstable_mockModule('@pnpm/cli-meta', () => ({ +jest.unstable_mockModule('@pnpm/cli.meta', () => ({ detectIfCurrentPkgIsExecutable: jest.fn(() => isSea), })) diff --git a/engine/runtime/system-node-version/tsconfig.json b/engine/runtime/system-node-version/tsconfig.json index 5e3761c9aa..794facae00 100644 --- a/engine/runtime/system-node-version/tsconfig.json +++ b/engine/runtime/system-node-version/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../../cli/cli-meta" + "path": "../../../cli/meta" } ] } diff --git a/exec/commands/package.json b/exec/commands/package.json index 7af2bd4866..446ee79fc9 100644 --- a/exec/commands/package.json +++ b/exec/commands/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/plugin-commands-script-runners", + "name": "@pnpm/exec.commands", "version": "1001.0.15", "description": "Commands for running scripts", "keywords": [ @@ -33,32 +33,32 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/bins.resolver": "workspace:*", "@pnpm/catalogs.resolver": "workspace:*", - "@pnpm/cli-utils": "workspace:*", - "@pnpm/client": "workspace:*", - "@pnpm/command": "workspace:*", - "@pnpm/common-cli-options-help": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.command": "workspace:*", + "@pnpm/cli.common-cli-options-help": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/config.version-policy": "workspace:*", "@pnpm/core-loggers": "workspace:*", "@pnpm/crypto.hash": "workspace:*", "@pnpm/deps.status": "workspace:*", - "@pnpm/env.path": "workspace:*", + "@pnpm/engine.runtime.commands": "workspace:*", "@pnpm/error": "workspace:*", + "@pnpm/exec.lifecycle": "workspace:*", "@pnpm/exec.pnpm-cli-runner": "workspace:*", - "@pnpm/lifecycle": "workspace:*", + "@pnpm/installing.client": "workspace:*", + "@pnpm/installing.commands": "workspace:*", "@pnpm/log.group": "catalog:", - "@pnpm/package-bins": "workspace:*", - "@pnpm/parse-wanted-dependency": "workspace:*", - "@pnpm/plugin-commands-installation": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/runtime.commands": "workspace:*", - "@pnpm/sort-packages": "workspace:*", - "@pnpm/store-path": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/resolving.parse-wanted-dependency": "workspace:*", + "@pnpm/shell.path": "workspace:*", + "@pnpm/store.path": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "@pnpm/workspace.injected-deps-syncer": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", + "@pnpm/workspace.sort-packages": "workspace:*", "@zkochan/rimraf": "catalog:", "didyoumean2": "catalog:", "enquirer": "catalog:", @@ -76,14 +76,13 @@ }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/env.system-node-version": "workspace:*", - "@pnpm/filter-workspace-packages": "workspace:*", + "@pnpm/engine.runtime.system-node-version": "workspace:*", + "@pnpm/exec.commands": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/plugin-commands-script-runners": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/test-ipc-server": "workspace:*", - "@pnpm/workspace.filter-packages-from-dir": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", "@types/is-windows": "catalog:", "@types/ramda": "catalog:", "@types/which": "catalog:", diff --git a/exec/commands/src/create.ts b/exec/commands/src/create.ts index 5d7323135e..1d4ef30509 100644 --- a/exec/commands/src/create.ts +++ b/exec/commands/src/create.ts @@ -1,4 +1,4 @@ -import { docsUrl } from '@pnpm/cli-utils' +import { docsUrl } from '@pnpm/cli.utils' import { PnpmError } from '@pnpm/error' import { renderHelp } from 'render-help' diff --git a/exec/commands/src/dlx.ts b/exec/commands/src/dlx.ts index eab599d32e..72dfef4b3d 100644 --- a/exec/commands/src/dlx.ts +++ b/exec/commands/src/dlx.ts @@ -2,21 +2,21 @@ import fs, { type Stats } from 'node:fs' import path from 'node:path' import util from 'node:util' +import { getBinsFromPackageManifest } from '@pnpm/bins.resolver' import { type CatalogResolver, resolveFromCatalog, } from '@pnpm/catalogs.resolver' -import { docsUrl, readProjectManifestOnly } from '@pnpm/cli-utils' -import { createResolver } from '@pnpm/client' -import { OUTPUT_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, types } from '@pnpm/config' +import { OUTPUT_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl, readProjectManifestOnly } from '@pnpm/cli.utils' +import { type Config, types } from '@pnpm/config.reader' import { createPackageVersionPolicy } from '@pnpm/config.version-policy' import { createHexHash } from '@pnpm/crypto.hash' import { PnpmError } from '@pnpm/error' -import { getBinsFromPackageManifest } from '@pnpm/package-bins' -import { parseWantedDependency } from '@pnpm/parse-wanted-dependency' -import { add } from '@pnpm/plugin-commands-installation' -import { readPackageJsonFromDir } from '@pnpm/read-package-json' +import { createResolver } from '@pnpm/installing.client' +import { add } from '@pnpm/installing.commands' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency' import type { PackageManifest, PnpmSettings, SupportedArchitectures } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' import { safeExeca as execa } from 'execa' diff --git a/exec/commands/src/exec.ts b/exec/commands/src/exec.ts index 12b22fe8e3..65a2d2f25d 100644 --- a/exec/commands/src/exec.ts +++ b/exec/commands/src/exec.ts @@ -1,17 +1,17 @@ import path from 'node:path' -import { docsUrl, readProjectManifestOnly, type RecursiveSummary, throwOnCommandFail } from '@pnpm/cli-utils' -import { FILTERING, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, getWorkspaceConcurrency, types } from '@pnpm/config' +import { FILTERING, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl, readProjectManifestOnly, type RecursiveSummary, throwOnCommandFail } from '@pnpm/cli.utils' +import { type Config, getWorkspaceConcurrency, types } from '@pnpm/config.reader' import { lifecycleLogger, type LifecycleMessage } from '@pnpm/core-loggers' import type { CheckDepsStatusOptions } from '@pnpm/deps.status' -import { prependDirsToPath } from '@pnpm/env.path' import { PnpmError } from '@pnpm/error' -import { makeNodeRequireOption } from '@pnpm/lifecycle' +import { makeNodeRequireOption } from '@pnpm/exec.lifecycle' import { logger } from '@pnpm/logger' -import { tryReadProjectManifest } from '@pnpm/read-project-manifest' -import { sortPackages } from '@pnpm/sort-packages' +import { prependDirsToPath } from '@pnpm/shell.path' import type { Project, ProjectRootDir, ProjectRootDirRealPath, ProjectsGraph } from '@pnpm/types' +import { tryReadProjectManifest } from '@pnpm/workspace.project-manifest-reader' +import { sortPackages } from '@pnpm/workspace.sort-packages' import { safeExeca as execa } from 'execa' import pLimit from 'p-limit' import { pick } from 'ramda' diff --git a/exec/commands/src/makeEnv.ts b/exec/commands/src/makeEnv.ts index 58860d4bda..94276b6028 100644 --- a/exec/commands/src/makeEnv.ts +++ b/exec/commands/src/makeEnv.ts @@ -1,7 +1,7 @@ import path from 'node:path' -import { prependDirsToPath } from '@pnpm/env.path' import { PnpmError } from '@pnpm/error' +import { prependDirsToPath } from '@pnpm/shell.path' export interface Env extends NodeJS.ProcessEnv { npm_config_user_agent: string diff --git a/exec/commands/src/restart.ts b/exec/commands/src/restart.ts index 0aac210a36..58f4899223 100644 --- a/exec/commands/src/restart.ts +++ b/exec/commands/src/restart.ts @@ -1,4 +1,4 @@ -import { types as allTypes } from '@pnpm/config' +import { types as allTypes } from '@pnpm/config.reader' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/exec/commands/src/run.ts b/exec/commands/src/run.ts index 00b709ccac..6108ed5027 100644 --- a/exec/commands/src/run.ts +++ b/exec/commands/src/run.ts @@ -1,20 +1,20 @@ import path from 'node:path' +import type { CompletionFunc } from '@pnpm/cli.command' +import { FILTERING, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' import { docsUrl, readProjectManifestOnly, tryReadProjectManifest, -} from '@pnpm/cli-utils' -import type { CompletionFunc } from '@pnpm/command' -import { FILTERING, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, getWorkspaceConcurrency, types as allTypes } from '@pnpm/config' +} from '@pnpm/cli.utils' +import { type Config, getWorkspaceConcurrency, types as allTypes } from '@pnpm/config.reader' import type { CheckDepsStatusOptions } from '@pnpm/deps.status' import { PnpmError } from '@pnpm/error' import { makeNodeRequireOption, runLifecycleHook, type RunLifecycleHookOptions, -} from '@pnpm/lifecycle' +} from '@pnpm/exec.lifecycle' import type { PackageScripts, ProjectManifest } from '@pnpm/types' import { syncInjectedDeps } from '@pnpm/workspace.injected-deps-syncer' import pLimit from 'p-limit' diff --git a/exec/commands/src/runDepsStatusCheck.ts b/exec/commands/src/runDepsStatusCheck.ts index 68a3721676..eccaed19d5 100644 --- a/exec/commands/src/runDepsStatusCheck.ts +++ b/exec/commands/src/runDepsStatusCheck.ts @@ -1,4 +1,4 @@ -import type { VerifyDepsBeforeRun } from '@pnpm/config' +import type { VerifyDepsBeforeRun } from '@pnpm/config.reader' import { checkDepsStatus, type CheckDepsStatusOptions, type WorkspaceStateSettings } from '@pnpm/deps.status' import { PnpmError } from '@pnpm/error' import { runPnpmCli } from '@pnpm/exec.pnpm-cli-runner' diff --git a/exec/commands/src/runRecursive.ts b/exec/commands/src/runRecursive.ts index 981b457a48..a5b3d07537 100644 --- a/exec/commands/src/runRecursive.ts +++ b/exec/commands/src/runRecursive.ts @@ -2,16 +2,16 @@ import assert from 'node:assert' import path from 'node:path' import util from 'node:util' -import { throwOnCommandFail } from '@pnpm/cli-utils' -import { type Config, getWorkspaceConcurrency } from '@pnpm/config' +import { throwOnCommandFail } from '@pnpm/cli.utils' +import { type Config, getWorkspaceConcurrency } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' import { makeNodeRequireOption, type RunLifecycleHookOptions, -} from '@pnpm/lifecycle' +} from '@pnpm/exec.lifecycle' import { groupStart } from '@pnpm/log.group' -import { sortPackages } from '@pnpm/sort-packages' import type { PackageScripts, ProjectRootDir } from '@pnpm/types' +import { sortPackages } from '@pnpm/workspace.sort-packages' import pLimit from 'p-limit' import { realpathMissing } from 'realpath-missing' diff --git a/exec/commands/test/dlx.e2e.ts b/exec/commands/test/dlx.e2e.ts index 498305b902..cdef1c2f1a 100644 --- a/exec/commands/test/dlx.e2e.ts +++ b/exec/commands/test/dlx.e2e.ts @@ -6,20 +6,20 @@ import { prepareEmpty } from '@pnpm/prepare' import { DLX_DEFAULT_OPTS as DEFAULT_OPTS } from './utils/index.js' -const { getSystemNodeVersion: originalGetSystemNodeVersion } = await import('@pnpm/env.system-node-version') -jest.unstable_mockModule('@pnpm/env.system-node-version', () => ({ +const { getSystemNodeVersion: originalGetSystemNodeVersion } = await import('@pnpm/engine.runtime.system-node-version') +jest.unstable_mockModule('@pnpm/engine.runtime.system-node-version', () => ({ getSystemNodeVersion: jest.fn(originalGetSystemNodeVersion), })) -const { add: originalAdd } = await import('@pnpm/plugin-commands-installation') -jest.unstable_mockModule('@pnpm/plugin-commands-installation', () => ({ +const { add: originalAdd } = await import('@pnpm/installing.commands') +jest.unstable_mockModule('@pnpm/installing.commands', () => ({ add: { handler: jest.fn(originalAdd.handler), }, })) -const systemNodeVersion = await import('@pnpm/env.system-node-version') -const { add } = await import('@pnpm/plugin-commands-installation') -const { dlx } = await import('@pnpm/plugin-commands-script-runners') +const systemNodeVersion = await import('@pnpm/engine.runtime.system-node-version') +const { add } = await import('@pnpm/installing.commands') +const { dlx } = await import('@pnpm/exec.commands') const testOnWindowsOnly = process.platform === 'win32' ? test : test.skip diff --git a/exec/commands/test/dlx.ts b/exec/commands/test/dlx.ts index 7e7ab8e5b4..ef177b8c33 100644 --- a/exec/commands/test/dlx.ts +++ b/exec/commands/test/dlx.ts @@ -11,7 +11,7 @@ jest.unstable_mockModule('execa', () => ({ })) const { safeExeca: execa } = await import('execa') -const { dlx } = await import('@pnpm/plugin-commands-script-runners') +const { dlx } = await import('@pnpm/exec.commands') beforeEach(() => jest.mocked(execa).mockClear()) diff --git a/exec/commands/test/exec.e2e.ts b/exec/commands/test/exec.e2e.ts index 66b067b119..a7d88e803c 100644 --- a/exec/commands/test/exec.e2e.ts +++ b/exec/commands/test/exec.e2e.ts @@ -2,11 +2,11 @@ import fs from 'node:fs' import path from 'node:path' import type { PnpmError } from '@pnpm/error' -import { exec, run } from '@pnpm/plugin-commands-script-runners' +import { exec, run } from '@pnpm/exec.commands' import { prepare, prepareEmpty, preparePackages } from '@pnpm/prepare' import { createTestIpcServer } from '@pnpm/test-ipc-server' import type { ProjectRootDir, ProjectRootDirRealPath } from '@pnpm/types' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { safeExeca as execa } from 'execa' import { DEFAULT_OPTS, REGISTRY_URL } from './utils/index.js' @@ -53,7 +53,7 @@ test('pnpm recursive exec', async () => { }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -93,7 +93,7 @@ test('pnpm recursive exec finds bin files of workspace projects', async () => { }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -179,7 +179,7 @@ test('pnpm recursive exec sets PNPM_PACKAGE_NAME env var', async () => { }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await exec.handler({ ...DEFAULT_OPTS, dir: process.cwd(), @@ -226,7 +226,7 @@ test('testing the bail config with "pnpm recursive exec"', async () => { }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -297,7 +297,7 @@ test('pnpm recursive exec --no-sort', async () => { }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -354,7 +354,7 @@ test('pnpm recursive exec --reverse', async () => { }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -505,7 +505,7 @@ testOnPosixOnly('pnpm recursive exec works with PnP', async () => { }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -570,7 +570,7 @@ test('pnpm recursive exec --resume-from should work', async () => { }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -603,7 +603,7 @@ test('should throw error when the package specified by resume-from does not exis }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -638,7 +638,7 @@ test('pnpm exec in directory with path delimiter', async () => { }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -693,7 +693,7 @@ test('pnpm recursive exec report summary', async () => { }, }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) let error try { await exec.handler({ @@ -751,7 +751,7 @@ test('pnpm recursive exec report summary with --bail', async () => { }, }, ]) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) let error try { await exec.handler({ @@ -784,7 +784,7 @@ test('pnpm exec command not found (implicit fallback)', async () => { }, }) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) let error!: Error & { hint?: string } try { await exec.handler({ @@ -809,7 +809,7 @@ test('pnpm exec command not found (explicit call, without near name packages)', }, }) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) let error!: Error & { hint?: string } try { await exec.handler({ @@ -834,7 +834,7 @@ test('pnpm exec command not found (explicit call, with a near name package)', as }, }) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', diff --git a/exec/commands/test/exec.logs.ts b/exec/commands/test/exec.logs.ts index 88cfa3f683..41a5fb6e18 100644 --- a/exec/commands/test/exec.logs.ts +++ b/exec/commands/test/exec.logs.ts @@ -17,8 +17,8 @@ jest.unstable_mockModule('@pnpm/logger', () => { } }) -const { filterPackagesFromDir } = await import('@pnpm/workspace.filter-packages-from-dir') -const { exec } = await import('@pnpm/plugin-commands-script-runners') +const { filterPkgsBySelectorObjectsFromDir } = await import('@pnpm/workspace.projects-filter') +const { exec } = await import('@pnpm/exec.commands') afterEach(() => { jest.mocked(debug).mockClear() @@ -40,7 +40,7 @@ test('pnpm exec --recursive --no-reporter-hide-prefix prints prefixes', async () packages: ['packages/*'], }) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) const scriptFile = path.resolve('script.js') fs.writeFileSync(scriptFile, ` @@ -103,7 +103,7 @@ test('pnpm exec --recursive --reporter-hide-prefix does not print prefixes', asy packages: ['packages/*'], }) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) const scriptFile = path.resolve('script.js') fs.writeFileSync(scriptFile, ` @@ -140,7 +140,7 @@ test('pnpm exec --recursive does not print prefixes by default', async () => { packages: ['packages/*'], }) - const { selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) const scriptFile = path.resolve('script.js') fs.writeFileSync(scriptFile, ` diff --git a/exec/commands/test/exec.ts b/exec/commands/test/exec.ts index 529b57be89..32e1b12966 100644 --- a/exec/commands/test/exec.ts +++ b/exec/commands/test/exec.ts @@ -9,7 +9,7 @@ jest.unstable_mockModule('execa', () => ({ })) const { safeExeca: execa } = await import('execa') -const { exec } = await import('@pnpm/plugin-commands-script-runners') +const { exec } = await import('@pnpm/exec.commands') beforeEach(() => jest.mocked(execa).mockClear()) diff --git a/exec/commands/test/index.ts b/exec/commands/test/index.ts index c8f8efcff1..0e7b9434bf 100644 --- a/exec/commands/test/index.ts +++ b/exec/commands/test/index.ts @@ -6,10 +6,10 @@ import type { PnpmError } from '@pnpm/error' import { restart, run, -} from '@pnpm/plugin-commands-script-runners' +} from '@pnpm/exec.commands' import { prepare, preparePackages } from '@pnpm/prepare' import { createTestIpcServer } from '@pnpm/test-ipc-server' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { safeExeca as execa } from 'execa' import isWindows from 'is-windows' import { writeYamlFileSync } from 'write-yaml-file' @@ -339,7 +339,7 @@ test('"pnpm run" prints the list of available commands, including commands of th writeYamlFileSync('pnpm-workspace.yaml', {}) const workspaceDir = process.cwd() - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) { process.chdir('foo') @@ -437,7 +437,7 @@ test('if a script is not found but is present in the root, print an info message '--store-dir', path.resolve(DEFAULT_OPTS.storeDir), ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) let err!: PnpmError try { diff --git a/exec/commands/test/runCompletion.ts b/exec/commands/test/runCompletion.ts index 90e72cba1c..a2910ef4ee 100644 --- a/exec/commands/test/runCompletion.ts +++ b/exec/commands/test/runCompletion.ts @@ -1,4 +1,4 @@ -import { run } from '@pnpm/plugin-commands-script-runners' +import { run } from '@pnpm/exec.commands' import { prepare } from '@pnpm/prepare' test('run completion', async () => { diff --git a/exec/commands/test/runRecursive.ts b/exec/commands/test/runRecursive.ts index 39d6fcacef..dfac90bc70 100644 --- a/exec/commands/test/runRecursive.ts +++ b/exec/commands/test/runRecursive.ts @@ -2,11 +2,11 @@ import fs from 'node:fs' import path from 'node:path' import type { PnpmError } from '@pnpm/error' -import { filterPkgsBySelectorObjects } from '@pnpm/filter-workspace-packages' -import { run } from '@pnpm/plugin-commands-script-runners' +import { run } from '@pnpm/exec.commands' import { preparePackages } from '@pnpm/prepare' import { createTestIpcServer } from '@pnpm/test-ipc-server' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' +import { filterPkgsBySelectorObjects } from '@pnpm/workspace.projects-filter' import { safeExeca as execa } from 'execa' import { writeYamlFileSync } from 'write-yaml-file' @@ -59,7 +59,7 @@ test('pnpm recursive run', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -126,7 +126,7 @@ test('pnpm recursive run with enable-pre-post-scripts', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -194,7 +194,7 @@ test('pnpm recursive run reversed', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -240,7 +240,7 @@ test('pnpm recursive run concurrently', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -292,7 +292,7 @@ test('`pnpm recursive run` fails when run without filters and no package has the }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -360,7 +360,7 @@ test('`pnpm recursive run` fails when run with a filter that includes all packag console.log('recursive run does not fail when if-present is true') await run.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [{ namePattern: '*' }]), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: '*' }]), dir: process.cwd(), ifPresent: true, recursive: true, @@ -371,7 +371,7 @@ test('`pnpm recursive run` fails when run with a filter that includes all packag try { await run.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [{ namePattern: '*' }]), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: '*' }]), dir: process.cwd(), recursive: true, workspaceDir: process.cwd(), @@ -410,7 +410,7 @@ test('`pnpm recursive run` fails when run against a subset of packages and no pa }, ]) - const { allProjects } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -481,7 +481,7 @@ test('"pnpm run --filter " without specifying the script name', async () => }, ]) - const { allProjects } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -579,7 +579,7 @@ test('testing the bail config with "pnpm recursive run"', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa(pnpmBin, [ 'install', '-r', @@ -651,7 +651,7 @@ test('pnpm recursive run with filtering', async () => { }, ]) - const { allProjects } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) const { selectedProjectsGraph } = await filterPkgsBySelectorObjects( allProjects, [{ namePattern: 'project-1' }], @@ -705,7 +705,7 @@ test('`pnpm recursive run` should always trust the scripts', async () => { dir: process.cwd(), recursive: true, workspaceDir: process.cwd(), - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), }, ['build']) delete process.env.npm_config_unsafe_perm @@ -754,7 +754,7 @@ test('`pnpm run -r` should avoid infinite recursion', async () => { '--store-dir', path.resolve(DEFAULT_OPTS.storeDir), ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-1' }]) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-1' }]) await run.handler({ ...DEFAULT_OPTS, allProjects, @@ -796,7 +796,7 @@ test('`pnpm recursive run` should fail when no script in package with requiredSc try { await run.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [{ namePattern: '*' }]), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: '*' }]), dir: process.cwd(), recursive: true, requiredScripts: ['build'], @@ -856,7 +856,7 @@ test('`pnpm -r --resume-from run` should executed from given package', async () await run.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [{ namePattern: '*' }]), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: '*' }]), dir: process.cwd(), recursive: true, resumeFrom: 'project-3', @@ -922,7 +922,7 @@ test('pnpm run with RegExp script selector should work on recursive', async () = ]) await run.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [{ namePattern: '*' }]), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: '*' }]), dir: process.cwd(), recursive: true, rootProjectManifest: { @@ -991,7 +991,7 @@ test('pnpm recursive run report summary', async () => { try { await run.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [{ namePattern: '*' }]), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: '*' }]), dir: process.cwd(), recursive: true, reportSummary: true, @@ -1053,7 +1053,7 @@ test('pnpm recursive run report summary with --bail', async () => { try { await run.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [{ namePattern: '*' }]), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: '*' }]), dir: process.cwd(), recursive: true, reportSummary: true, @@ -1087,7 +1087,7 @@ test('pnpm recursive run with custom node-options', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await run.handler({ ...DEFAULT_OPTS, diff --git a/exec/commands/test/testRecursive.ts b/exec/commands/test/testRecursive.ts index b501f6c140..0cea9dae86 100644 --- a/exec/commands/test/testRecursive.ts +++ b/exec/commands/test/testRecursive.ts @@ -1,10 +1,10 @@ import path from 'node:path' -import { filterPkgsBySelectorObjects } from '@pnpm/filter-workspace-packages' -import { run } from '@pnpm/plugin-commands-script-runners' +import { run } from '@pnpm/exec.commands' import { preparePackages } from '@pnpm/prepare' import { createTestIpcServer } from '@pnpm/test-ipc-server' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' +import { filterPkgsBySelectorObjects } from '@pnpm/workspace.projects-filter' import { safeExeca as execa } from 'execa' import { DEFAULT_OPTS, REGISTRY_URL } from './utils/index.js' @@ -54,7 +54,7 @@ test('pnpm recursive test', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa('node', [ pnpmBin, 'install', @@ -107,7 +107,7 @@ test('`pnpm recursive test` does not fail if none of the packages has a test com }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await execa('node', [ pnpmBin, 'install', @@ -153,7 +153,7 @@ test('pnpm recursive test with filtering', async () => { }, ]) - const { allProjects } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) const { selectedProjectsGraph } = await filterPkgsBySelectorObjects( allProjects, [{ namePattern: 'project-1' }], diff --git a/exec/commands/test/verifyDepsBeforeRun.ts b/exec/commands/test/verifyDepsBeforeRun.ts index 1b3e153e7a..e3b3d7e610 100644 --- a/exec/commands/test/verifyDepsBeforeRun.ts +++ b/exec/commands/test/verifyDepsBeforeRun.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import { jest } from '@jest/globals' -import type { VerifyDepsBeforeRun } from '@pnpm/config' +import type { VerifyDepsBeforeRun } from '@pnpm/config.reader' import { prepare } from '@pnpm/prepare' import { DEFAULT_OPTS } from './utils/index.js' @@ -21,7 +21,7 @@ jest.unstable_mockModule('enquirer', () => ({ }, })) -const { run } = await import('@pnpm/plugin-commands-script-runners') +const { run } = await import('@pnpm/exec.commands') const { default: enquirer } = await import('enquirer') const { globalWarn } = await import('@pnpm/logger') diff --git a/exec/commands/tsconfig.json b/exec/commands/tsconfig.json index 0779998388..a53d526b11 100644 --- a/exec/commands/tsconfig.json +++ b/exec/commands/tsconfig.json @@ -16,14 +16,11 @@ "path": "../../__utils__/test-ipc-server" }, { - "path": "../../bins/package-bins" + "path": "../../bins/resolver" }, { "path": "../../catalogs/resolver" }, - { - "path": "../../cli/cli-utils" - }, { "path": "../../cli/command" }, @@ -31,7 +28,10 @@ "path": "../../cli/common-cli-options-help" }, { - "path": "../../config/config" + "path": "../../cli/utils" + }, + { + "path": "../../config/reader" }, { "path": "../../config/version-policy" @@ -69,9 +69,6 @@ { "path": "../../pkg-manifest/read-package-json" }, - { - "path": "../../pkg-manifest/read-project-manifest" - }, { "path": "../../resolving/parse-wanted-dependency" }, @@ -79,17 +76,17 @@ "path": "../../shell/path" }, { - "path": "../../store/store-path" - }, - { - "path": "../../workspace/filter-packages-from-dir" - }, - { - "path": "../../workspace/filter-workspace-packages" + "path": "../../store/path" }, { "path": "../../workspace/injected-deps-syncer" }, + { + "path": "../../workspace/project-manifest-reader" + }, + { + "path": "../../workspace/projects-filter" + }, { "path": "../../workspace/sort-packages" }, diff --git a/exec/lifecycle/package.json b/exec/lifecycle/package.json index b21d90a1b9..bed16e1c8a 100644 --- a/exec/lifecycle/package.json +++ b/exec/lifecycle/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/lifecycle", + "name": "@pnpm/exec.lifecycle", "version": "1001.0.25", "description": "Package lifecycle hook runner", "keywords": [ @@ -34,14 +34,14 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cafs-types": "workspace:*", + "@pnpm/bins.linker": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/directory-fetcher": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/link-bins": "workspace:*", + "@pnpm/fetching.directory-fetcher": "workspace:*", "@pnpm/npm-lifecycle": "catalog:", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "is-windows": "catalog:", "path-exists": "catalog:", @@ -52,7 +52,7 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/lifecycle": "workspace:*", + "@pnpm/exec.lifecycle": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/test-fixtures": "workspace:*", diff --git a/exec/lifecycle/src/index.ts b/exec/lifecycle/src/index.ts index a8af1b904d..36cc80a612 100644 --- a/exec/lifecycle/src/index.ts +++ b/exec/lifecycle/src/index.ts @@ -1,4 +1,4 @@ -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import { runLifecycleHook, type RunLifecycleHookOptions } from './runLifecycleHook.js' import { runLifecycleHooksConcurrently, type RunLifecycleHooksConcurrentlyOptions } from './runLifecycleHooksConcurrently.js' diff --git a/exec/lifecycle/src/runLifecycleHooksConcurrently.ts b/exec/lifecycle/src/runLifecycleHooksConcurrently.ts index a9b5395483..7ab30ec083 100644 --- a/exec/lifecycle/src/runLifecycleHooksConcurrently.ts +++ b/exec/lifecycle/src/runLifecycleHooksConcurrently.ts @@ -1,11 +1,11 @@ import fs from 'node:fs' import path from 'node:path' -import type { FilesMap } from '@pnpm/cafs-types' -import { fetchFromDir } from '@pnpm/directory-fetcher' -import { linkBins } from '@pnpm/link-bins' +import { linkBins } from '@pnpm/bins.linker' +import { fetchFromDir } from '@pnpm/fetching.directory-fetcher' import { logger } from '@pnpm/logger' -import type { StoreController } from '@pnpm/store-controller-types' +import type { FilesMap } from '@pnpm/store.cafs-types' +import type { StoreController } from '@pnpm/store.controller-types' import type { ProjectManifest, ProjectRootDir } from '@pnpm/types' import { runGroups } from 'run-groups' diff --git a/exec/lifecycle/test/index.ts b/exec/lifecycle/test/index.ts index d6399c19e5..edda9e50ec 100644 --- a/exec/lifecycle/test/index.ts +++ b/exec/lifecycle/test/index.ts @@ -3,9 +3,9 @@ import fs from 'node:fs' import path from 'node:path' import { PnpmError } from '@pnpm/error' -import { runLifecycleHook, runLifecycleHooksConcurrently, runPostinstallHooks } from '@pnpm/lifecycle' +import { runLifecycleHook, runLifecycleHooksConcurrently, runPostinstallHooks } from '@pnpm/exec.lifecycle' import { tempDir } from '@pnpm/prepare' -import type { StoreController } from '@pnpm/store-controller-types' +import type { StoreController } from '@pnpm/store.controller-types' import { fixtures } from '@pnpm/test-fixtures' import { createTestIpcServer } from '@pnpm/test-ipc-server' import type { ProjectRootDir } from '@pnpm/types' diff --git a/exec/lifecycle/tsconfig.json b/exec/lifecycle/tsconfig.json index 7e62227ca5..5536330e3c 100644 --- a/exec/lifecycle/tsconfig.json +++ b/exec/lifecycle/tsconfig.json @@ -19,7 +19,7 @@ "path": "../../__utils__/test-ipc-server" }, { - "path": "../../bins/link-bins" + "path": "../../bins/linker" }, { "path": "../../fetching/directory-fetcher" @@ -43,7 +43,7 @@ "path": "../../store/cafs-types" }, { - "path": "../../store/store-controller-types" + "path": "../../store/controller-types" } ] } diff --git a/exec/prepare-package/package.json b/exec/prepare-package/package.json index 799824fcd8..0f85134b85 100644 --- a/exec/prepare-package/package.json +++ b/exec/prepare-package/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/prepare-package", + "name": "@pnpm/exec.prepare-package", "version": "1000.0.26", "description": "Prepares a Git-hosted package", "keywords": [ @@ -32,8 +32,8 @@ }, "dependencies": { "@pnpm/error": "workspace:*", - "@pnpm/lifecycle": "workspace:*", - "@pnpm/read-package-json": "workspace:*", + "@pnpm/exec.lifecycle": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "catalog:", "execa": "catalog:", @@ -41,8 +41,8 @@ "ramda": "catalog:" }, "devDependencies": { + "@pnpm/exec.prepare-package": "workspace:*", "@pnpm/prepare": "workspace:*", - "@pnpm/prepare-package": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@pnpm/test-ipc-server": "workspace:*", "@types/ramda": "catalog:", diff --git a/exec/prepare-package/src/index.ts b/exec/prepare-package/src/index.ts index a2a3afd4cb..ec43641b84 100644 --- a/exec/prepare-package/src/index.ts +++ b/exec/prepare-package/src/index.ts @@ -4,8 +4,8 @@ import path from 'node:path' import util from 'node:util' import { PnpmError } from '@pnpm/error' -import { runLifecycleHook, type RunLifecycleHookOptions } from '@pnpm/lifecycle' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +import { runLifecycleHook, type RunLifecycleHookOptions } from '@pnpm/exec.lifecycle' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import type { AllowBuild, PackageManifest } from '@pnpm/types' import { rimraf } from '@zkochan/rimraf' import { preferredPM } from 'preferred-pm' diff --git a/exec/prepare-package/test/index.ts b/exec/prepare-package/test/index.ts index 5ff82b67c7..ecfce41521 100644 --- a/exec/prepare-package/test/index.ts +++ b/exec/prepare-package/test/index.ts @@ -1,7 +1,7 @@ import path from 'node:path' +import { preparePackage } from '@pnpm/exec.prepare-package' import { tempDir } from '@pnpm/prepare' -import { preparePackage } from '@pnpm/prepare-package' import { fixtures } from '@pnpm/test-fixtures' import { createTestIpcServer } from '@pnpm/test-ipc-server' diff --git a/exec/run-npm/package.json b/exec/run-npm/package.json index 284c8fad1a..4ebd2ad96f 100644 --- a/exec/run-npm/package.json +++ b/exec/run-npm/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/run-npm", + "name": "@pnpm/exec.run-npm", "version": "1000.0.0", "description": "Runs the npm CLI", "keywords": [ @@ -34,7 +34,7 @@ "path-name": "catalog:" }, "devDependencies": { - "@pnpm/run-npm": "workspace:*", + "@pnpm/exec.run-npm": "workspace:*", "@types/cross-spawn": "catalog:" }, "engines": { diff --git a/fetching/binary-fetcher/package.json b/fetching/binary-fetcher/package.json index e6b17055e7..33e9c65873 100644 --- a/fetching/binary-fetcher/package.json +++ b/fetching/binary-fetcher/package.json @@ -32,8 +32,8 @@ }, "dependencies": { "@pnpm/error": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", - "@pnpm/fetching-types": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/fetching.types": "workspace:*", "@pnpm/store.index": "workspace:*", "adm-zip": "catalog:", "is-subdir": "catalog:", diff --git a/fetching/binary-fetcher/src/index.ts b/fetching/binary-fetcher/src/index.ts index 8a04ad105e..fe97d11f9e 100644 --- a/fetching/binary-fetcher/src/index.ts +++ b/fetching/binary-fetcher/src/index.ts @@ -2,8 +2,8 @@ import fsPromises from 'node:fs/promises' import path from 'node:path' import { PnpmError } from '@pnpm/error' -import type { BinaryFetcher, FetchFunction, FetchResult } from '@pnpm/fetcher-base' -import type { FetchFromRegistry } from '@pnpm/fetching-types' +import type { BinaryFetcher, FetchFunction, FetchResult } from '@pnpm/fetching.fetcher-base' +import type { FetchFromRegistry } from '@pnpm/fetching.types' import type { StoreIndex } from '@pnpm/store.index' import { addFilesFromDir } from '@pnpm/worker' import AdmZip from 'adm-zip' diff --git a/fetching/binary-fetcher/tsconfig.json b/fetching/binary-fetcher/tsconfig.json index 84166bc061..e13f2f63cb 100644 --- a/fetching/binary-fetcher/tsconfig.json +++ b/fetching/binary-fetcher/tsconfig.json @@ -22,7 +22,7 @@ "path": "../fetcher-base" }, { - "path": "../fetching-types" + "path": "../types" } ] } diff --git a/fetching/directory-fetcher/package.json b/fetching/directory-fetcher/package.json index d16c9c92dc..b5b6c37f47 100644 --- a/fetching/directory-fetcher/package.json +++ b/fetching/directory-fetcher/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/directory-fetcher", + "name": "@pnpm/fetching.directory-fetcher", "version": "1000.1.14", "description": "A fetcher for local directory packages", "keywords": [ @@ -33,19 +33,19 @@ }, "dependencies": { "@pnpm/building.pkg-requires-build": "workspace:*", - "@pnpm/cafs-types": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", "@pnpm/fs.packlist": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/resolver-base": "workspace:*", - "@pnpm/types": "workspace:*" + "@pnpm/resolving.resolver-base": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", + "@pnpm/types": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*" }, "peerDependencies": { "@pnpm/logger": "catalog:" }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/directory-fetcher": "workspace:*", + "@pnpm/fetching.directory-fetcher": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", diff --git a/fetching/directory-fetcher/src/index.ts b/fetching/directory-fetcher/src/index.ts index 0693d190b4..bf4b0f161d 100644 --- a/fetching/directory-fetcher/src/index.ts +++ b/fetching/directory-fetcher/src/index.ts @@ -3,12 +3,12 @@ import path from 'node:path' import util from 'node:util' import { pkgRequiresBuild } from '@pnpm/building.pkg-requires-build' -import type { FilesMap } from '@pnpm/cafs-types' -import type { DirectoryFetcher, DirectoryFetcherOptions } from '@pnpm/fetcher-base' +import type { DirectoryFetcher, DirectoryFetcherOptions } from '@pnpm/fetching.fetcher-base' import { packlist } from '@pnpm/fs.packlist' import { logger } from '@pnpm/logger' -import { safeReadProjectManifestOnly } from '@pnpm/read-project-manifest' +import type { FilesMap } from '@pnpm/store.cafs-types' import type { DependencyManifest } from '@pnpm/types' +import { safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' const directoryFetcherLogger = logger('directory-fetcher') diff --git a/fetching/directory-fetcher/test/index.ts b/fetching/directory-fetcher/test/index.ts index 94445b13c5..087006de72 100644 --- a/fetching/directory-fetcher/test/index.ts +++ b/fetching/directory-fetcher/test/index.ts @@ -11,7 +11,7 @@ const debug = jest.fn() jest.unstable_mockModule('@pnpm/logger', () => { return ({ globalWarn: jest.fn(), debug, logger: () => ({ debug }) }) }) -const { createDirectoryFetcher } = await import('@pnpm/directory-fetcher') +const { createDirectoryFetcher } = await import('@pnpm/fetching.directory-fetcher') const f = fixtures(import.meta.dirname) diff --git a/fetching/directory-fetcher/tsconfig.json b/fetching/directory-fetcher/tsconfig.json index 958de6e155..736e329b72 100644 --- a/fetching/directory-fetcher/tsconfig.json +++ b/fetching/directory-fetcher/tsconfig.json @@ -24,15 +24,15 @@ { "path": "../../packages/types" }, - { - "path": "../../pkg-manifest/read-project-manifest" - }, { "path": "../../resolving/resolver-base" }, { "path": "../../store/cafs-types" }, + { + "path": "../../workspace/project-manifest-reader" + }, { "path": "../fetcher-base" } diff --git a/fetching/fetcher-base/package.json b/fetching/fetcher-base/package.json index dd8d2c1cea..c30f5b7c4c 100644 --- a/fetching/fetcher-base/package.json +++ b/fetching/fetcher-base/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/fetcher-base", + "name": "@pnpm/fetching.fetcher-base", "version": "1001.0.2", "description": "Types for pnpm-compatible fetchers", "keywords": [ @@ -32,13 +32,13 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/resolver-base": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", "@types/ssri": "catalog:" }, "devDependencies": { - "@pnpm/cafs-types": "workspace:*", - "@pnpm/fetcher-base": "workspace:*" + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/fetching/fetcher-base/src/index.ts b/fetching/fetcher-base/src/index.ts index 14491379ec..0b79339d15 100644 --- a/fetching/fetcher-base/src/index.ts +++ b/fetching/fetcher-base/src/index.ts @@ -1,10 +1,10 @@ -import type { Cafs, FilesMap } from '@pnpm/cafs-types' import type { BinaryResolution, DirectoryResolution, GitResolution, Resolution, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' +import type { Cafs, FilesMap } from '@pnpm/store.cafs-types' import type { AllowBuild, BundledManifest, DependencyManifest } from '@pnpm/types' export interface PkgNameVersion { diff --git a/fetching/git-fetcher/package.json b/fetching/git-fetcher/package.json index 0984ba5c3d..79f9182b65 100644 --- a/fetching/git-fetcher/package.json +++ b/fetching/git-fetcher/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/git-fetcher", + "name": "@pnpm/fetching.git-fetcher", "version": "1003.0.0", "description": "A fetcher for git-hosted packages", "keywords": [ @@ -33,9 +33,9 @@ }, "dependencies": { "@pnpm/error": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", + "@pnpm/exec.prepare-package": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", "@pnpm/fs.packlist": "workspace:*", - "@pnpm/prepare-package": "workspace:*", "@pnpm/store.index": "workspace:*", "@zkochan/rimraf": "catalog:", "execa": "catalog:" @@ -46,10 +46,10 @@ }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/create-cafs-store": "workspace:*", - "@pnpm/git-fetcher": "workspace:*", + "@pnpm/fetching.git-fetcher": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/store.cafs": "workspace:*", + "@pnpm/store.create-cafs-store": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "tempy": "catalog:" diff --git a/fetching/git-fetcher/src/index.ts b/fetching/git-fetcher/src/index.ts index 7fea76c541..a399eca319 100644 --- a/fetching/git-fetcher/src/index.ts +++ b/fetching/git-fetcher/src/index.ts @@ -4,10 +4,10 @@ import { URL } from 'node:url' import util from 'node:util' import { PnpmError } from '@pnpm/error' -import type { GitFetcher } from '@pnpm/fetcher-base' +import { preparePackage } from '@pnpm/exec.prepare-package' +import type { GitFetcher } from '@pnpm/fetching.fetcher-base' import { packlist } from '@pnpm/fs.packlist' import { globalWarn } from '@pnpm/logger' -import { preparePackage } from '@pnpm/prepare-package' import type { StoreIndex } from '@pnpm/store.index' import { addFilesFromDir } from '@pnpm/worker' import { rimraf } from '@zkochan/rimraf' diff --git a/fetching/git-fetcher/test/index.ts b/fetching/git-fetcher/test/index.ts index b8eceb8822..c24f2af1b6 100644 --- a/fetching/git-fetcher/test/index.ts +++ b/fetching/git-fetcher/test/index.ts @@ -2,7 +2,7 @@ import path from 'node:path' import { jest } from '@jest/globals' -import { createCafsStore } from '@pnpm/create-cafs-store' +import { createCafsStore } from '@pnpm/store.create-cafs-store' import { StoreIndex } from '@pnpm/store.index' import { lexCompare } from '@pnpm/util.lex-comparator' import { temporaryDirectory } from 'tempy' @@ -29,7 +29,7 @@ import { temporaryDirectory } from 'tempy' const { globalWarn } = await import('@pnpm/logger') const { safeExeca: execa } = await import('execa') -const { createGitFetcher } = await import('@pnpm/git-fetcher') +const { createGitFetcher } = await import('@pnpm/fetching.git-fetcher') const storeIndexes: StoreIndex[] = [] afterAll(() => { diff --git a/fetching/pick-fetcher/package.json b/fetching/pick-fetcher/package.json index 9343b8a5c2..955dd0e9fb 100644 --- a/fetching/pick-fetcher/package.json +++ b/fetching/pick-fetcher/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/pick-fetcher", + "name": "@pnpm/fetching.pick-fetcher", "version": "1001.0.0", "description": "Pick a package fetcher by type", "keywords": [ @@ -31,19 +31,19 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cafs-types": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", "@pnpm/hooks.types": "workspace:*", - "@pnpm/resolver-base": "workspace:*" + "@pnpm/resolving.resolver-base": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*" }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/create-cafs-store": "workspace:*", - "@pnpm/fetch": "workspace:*", - "@pnpm/pick-fetcher": "workspace:*", + "@pnpm/fetching.pick-fetcher": "workspace:*", + "@pnpm/fetching.tarball-fetcher": "workspace:*", + "@pnpm/network.fetch": "workspace:*", + "@pnpm/store.create-cafs-store": "workspace:*", "@pnpm/store.index": "workspace:*", - "@pnpm/tarball-fetcher": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "nock": "catalog:", "tempy": "catalog:" diff --git a/fetching/pick-fetcher/src/index.ts b/fetching/pick-fetcher/src/index.ts index 97f6939222..b87b157602 100644 --- a/fetching/pick-fetcher/src/index.ts +++ b/fetching/pick-fetcher/src/index.ts @@ -1,8 +1,8 @@ -import type { Cafs } from '@pnpm/cafs-types' import { PnpmError } from '@pnpm/error' -import type { BinaryFetcher, DirectoryFetcher, Fetchers, FetchFunction, FetchOptions, GitFetcher } from '@pnpm/fetcher-base' +import type { BinaryFetcher, DirectoryFetcher, Fetchers, FetchFunction, FetchOptions, GitFetcher } from '@pnpm/fetching.fetcher-base' import type { CustomFetcher } from '@pnpm/hooks.types' -import type { AtomicResolution } from '@pnpm/resolver-base' +import type { AtomicResolution } from '@pnpm/resolving.resolver-base' +import type { Cafs } from '@pnpm/store.cafs-types' export async function pickFetcher ( fetcherByHostingType: Fetchers, diff --git a/fetching/pick-fetcher/test/customFetch.ts b/fetching/pick-fetcher/test/customFetch.ts index 61432448a9..03c0d82049 100644 --- a/fetching/pick-fetcher/test/customFetch.ts +++ b/fetching/pick-fetcher/test/customFetch.ts @@ -1,15 +1,15 @@ import path from 'node:path' import { jest } from '@jest/globals' -import type { Cafs } from '@pnpm/cafs-types' -import { createCafsStore } from '@pnpm/create-cafs-store' -import { createFetchFromRegistry } from '@pnpm/fetch' -import type { Fetchers, FetchFunction, FetchOptions } from '@pnpm/fetcher-base' +import type { Fetchers, FetchFunction, FetchOptions } from '@pnpm/fetching.fetcher-base' +import { pickFetcher } from '@pnpm/fetching.pick-fetcher' +import { createTarballFetcher } from '@pnpm/fetching.tarball-fetcher' import type { CustomFetcher } from '@pnpm/hooks.types' -import { pickFetcher } from '@pnpm/pick-fetcher' -import type { AtomicResolution } from '@pnpm/resolver-base' +import { createFetchFromRegistry } from '@pnpm/network.fetch' +import type { AtomicResolution } from '@pnpm/resolving.resolver-base' +import type { Cafs } from '@pnpm/store.cafs-types' +import { createCafsStore } from '@pnpm/store.create-cafs-store' import { StoreIndex } from '@pnpm/store.index' -import { createTarballFetcher } from '@pnpm/tarball-fetcher' import { fixtures } from '@pnpm/test-fixtures' import nock from 'nock' import { temporaryDirectory } from 'tempy' diff --git a/fetching/pick-fetcher/test/pickFetcher.ts b/fetching/pick-fetcher/test/pickFetcher.ts index ce33f4b78d..156de57bf7 100644 --- a/fetching/pick-fetcher/test/pickFetcher.ts +++ b/fetching/pick-fetcher/test/pickFetcher.ts @@ -1,7 +1,7 @@ import { jest } from '@jest/globals' -import type { Fetchers, FetchFunction } from '@pnpm/fetcher-base' +import type { Fetchers, FetchFunction } from '@pnpm/fetching.fetcher-base' +import { pickFetcher } from '@pnpm/fetching.pick-fetcher' import type { CustomFetcher } from '@pnpm/hooks.types' -import { pickFetcher } from '@pnpm/pick-fetcher' // Helper to create a mock Fetchers object with only the needed fetcher function createMockFetchers (partial: Partial): Fetchers { diff --git a/fetching/tarball-fetcher/package.json b/fetching/tarball-fetcher/package.json index 103e87a51b..df04aa8271 100644 --- a/fetching/tarball-fetcher/package.json +++ b/fetching/tarball-fetcher/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/tarball-fetcher", + "name": "@pnpm/fetching.tarball-fetcher", "version": "1003.0.0", "description": "Fetcher for packages hosted as tarballs", "keywords": [ @@ -35,11 +35,11 @@ "dependencies": { "@pnpm/core-loggers": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", - "@pnpm/fetching-types": "workspace:*", + "@pnpm/exec.prepare-package": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/fetching.types": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "@pnpm/fs.packlist": "workspace:*", - "@pnpm/graceful-fs": "workspace:*", - "@pnpm/prepare-package": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/retry": "catalog:", @@ -53,11 +53,11 @@ }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/cafs-types": "workspace:*", - "@pnpm/create-cafs-store": "workspace:*", - "@pnpm/fetch": "workspace:*", + "@pnpm/fetching.tarball-fetcher": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/tarball-fetcher": "workspace:*", + "@pnpm/network.fetch": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", + "@pnpm/store.create-cafs-store": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", diff --git a/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts b/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts index b0a7ec8db6..64d5b1d7d6 100644 --- a/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts +++ b/fetching/tarball-fetcher/src/gitHostedTarballFetcher.ts @@ -1,11 +1,11 @@ import assert from 'node:assert' import util from 'node:util' -import type { Cafs, FilesMap } from '@pnpm/cafs-types' -import type { FetchFunction, FetchOptions } from '@pnpm/fetcher-base' +import { preparePackage } from '@pnpm/exec.prepare-package' +import type { FetchFunction, FetchOptions } from '@pnpm/fetching.fetcher-base' import { packlist } from '@pnpm/fs.packlist' import { globalWarn } from '@pnpm/logger' -import { preparePackage } from '@pnpm/prepare-package' +import type { Cafs, FilesMap } from '@pnpm/store.cafs-types' import type { StoreIndex } from '@pnpm/store.index' import type { BundledManifest } from '@pnpm/types' import { addFilesFromDir } from '@pnpm/worker' diff --git a/fetching/tarball-fetcher/src/index.ts b/fetching/tarball-fetcher/src/index.ts index 5cc10b43d9..d4f023cbe8 100644 --- a/fetching/tarball-fetcher/src/index.ts +++ b/fetching/tarball-fetcher/src/index.ts @@ -1,15 +1,15 @@ -import type { Cafs } from '@pnpm/cafs-types' import { PnpmError } from '@pnpm/error' import type { FetchFunction, FetchOptions, FetchResult, -} from '@pnpm/fetcher-base' +} from '@pnpm/fetching.fetcher-base' import type { FetchFromRegistry, GetAuthHeader, RetryTimeoutOptions, -} from '@pnpm/fetching-types' +} from '@pnpm/fetching.types' +import type { Cafs } from '@pnpm/store.cafs-types' import type { StoreIndex } from '@pnpm/store.index' import { TarballIntegrityError } from '@pnpm/worker' diff --git a/fetching/tarball-fetcher/src/localTarballFetcher.ts b/fetching/tarball-fetcher/src/localTarballFetcher.ts index 5be10c8103..2ac8bf9ca6 100644 --- a/fetching/tarball-fetcher/src/localTarballFetcher.ts +++ b/fetching/tarball-fetcher/src/localTarballFetcher.ts @@ -1,8 +1,8 @@ import path from 'node:path' -import type { Cafs } from '@pnpm/cafs-types' -import type { FetchFunction, FetchOptions } from '@pnpm/fetcher-base' -import gfs from '@pnpm/graceful-fs' +import type { FetchFunction, FetchOptions } from '@pnpm/fetching.fetcher-base' +import gfs from '@pnpm/fs.graceful-fs' +import type { Cafs } from '@pnpm/store.cafs-types' import type { StoreIndex } from '@pnpm/store.index' import { addFilesFromTarball } from '@pnpm/worker' diff --git a/fetching/tarball-fetcher/src/remoteTarballFetcher.ts b/fetching/tarball-fetcher/src/remoteTarballFetcher.ts index 893c0199cb..0a272ee0bf 100644 --- a/fetching/tarball-fetcher/src/remoteTarballFetcher.ts +++ b/fetching/tarball-fetcher/src/remoteTarballFetcher.ts @@ -2,12 +2,12 @@ import assert from 'node:assert' import type { IncomingMessage } from 'node:http' import util from 'node:util' -import type { Cafs } from '@pnpm/cafs-types' import { requestRetryLogger } from '@pnpm/core-loggers' import { FetchError } from '@pnpm/error' -import type { FetchOptions, FetchResult } from '@pnpm/fetcher-base' -import type { FetchFromRegistry } from '@pnpm/fetching-types' +import type { FetchOptions, FetchResult } from '@pnpm/fetching.fetcher-base' +import type { FetchFromRegistry } from '@pnpm/fetching.types' import { globalWarn } from '@pnpm/logger' +import type { Cafs } from '@pnpm/store.cafs-types' import type { StoreIndex } from '@pnpm/store.index' import { addFilesFromTarball } from '@pnpm/worker' import * as retry from '@zkochan/retry' diff --git a/fetching/tarball-fetcher/test/fetch.ts b/fetching/tarball-fetcher/test/fetch.ts index 81c73dc271..252177d95f 100644 --- a/fetching/tarball-fetcher/test/fetch.ts +++ b/fetching/tarball-fetcher/test/fetch.ts @@ -3,9 +3,9 @@ import fs from 'node:fs' import path from 'node:path' import { jest } from '@jest/globals' -import { createCafsStore } from '@pnpm/create-cafs-store' import { FetchError, PnpmError } from '@pnpm/error' -import { createFetchFromRegistry } from '@pnpm/fetch' +import { createFetchFromRegistry } from '@pnpm/network.fetch' +import { createCafsStore } from '@pnpm/store.create-cafs-store' import { StoreIndex } from '@pnpm/store.index' import { fixtures } from '@pnpm/test-fixtures' import { lexCompare } from '@pnpm/util.lex-comparator' @@ -27,7 +27,7 @@ const { createTarballFetcher, BadTarballError, TarballIntegrityError, -} = await import('@pnpm/tarball-fetcher') +} = await import('@pnpm/fetching.tarball-fetcher') beforeEach(() => { jest.mocked(globalWarn).mockClear() diff --git a/fetching/tarball-fetcher/tsconfig.json b/fetching/tarball-fetcher/tsconfig.json index f8c505bf32..d95c36102b 100644 --- a/fetching/tarball-fetcher/tsconfig.json +++ b/fetching/tarball-fetcher/tsconfig.json @@ -52,7 +52,7 @@ "path": "../fetcher-base" }, { - "path": "../fetching-types" + "path": "../types" } ] } diff --git a/fetching/fetching-types/CHANGELOG.md b/fetching/types/CHANGELOG.md similarity index 100% rename from fetching/fetching-types/CHANGELOG.md rename to fetching/types/CHANGELOG.md diff --git a/fetching/fetching-types/README.md b/fetching/types/README.md similarity index 100% rename from fetching/fetching-types/README.md rename to fetching/types/README.md diff --git a/fetching/fetching-types/package.json b/fetching/types/package.json similarity index 82% rename from fetching/fetching-types/package.json rename to fetching/types/package.json index 76c8589604..0dc0ed476c 100644 --- a/fetching/fetching-types/package.json +++ b/fetching/types/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/fetching-types", + "name": "@pnpm/fetching.types", "version": "1000.2.0", "description": "Types for fetching", "keywords": [ @@ -9,8 +9,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/fetching/fetching-types", - "homepage": "https://github.com/pnpm/pnpm/tree/main/fetching/fetching-types#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/fetching/types", + "homepage": "https://github.com/pnpm/pnpm/tree/main/fetching/types#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -35,7 +35,7 @@ "node-fetch": "catalog:" }, "devDependencies": { - "@pnpm/fetching-types": "workspace:*" + "@pnpm/fetching.types": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/fetching/fetching-types/src/index.ts b/fetching/types/src/index.ts similarity index 100% rename from fetching/fetching-types/src/index.ts rename to fetching/types/src/index.ts diff --git a/fetching/fetching-types/tsconfig.json b/fetching/types/tsconfig.json similarity index 100% rename from fetching/fetching-types/tsconfig.json rename to fetching/types/tsconfig.json diff --git a/fetching/fetching-types/tsconfig.lint.json b/fetching/types/tsconfig.lint.json similarity index 100% rename from fetching/fetching-types/tsconfig.lint.json rename to fetching/types/tsconfig.lint.json diff --git a/fix-duplicates.mjs b/fix-duplicates.mjs new file mode 100644 index 0000000000..903254216a --- /dev/null +++ b/fix-duplicates.mjs @@ -0,0 +1,46 @@ +import fs from 'fs'; +import path from 'path'; + +const affectedDirs = [ + 'cli/commands', + 'installing/commands', + 'patching/commands', + 'releasing/commands', + 'workspace/projects-filter', + 'exec/commands', + 'deps/compliance/commands', + 'deps/inspection/commands' +]; + +for (const dir of affectedDirs) { + const pkgPath = path.join(process.cwd(), dir, 'package.json'); + try { + const raw = fs.readFileSync(pkgPath, 'utf8'); + // Using simple regex substitution if it literally appears twice + let count = 0; + const lines = raw.split('\n'); + const newLines = []; + for (const line of lines) { + if (line.includes('"@pnpm/workspace.projects-filter"')) { + count++; + if (count > 1) { + // Skip the second duplicate + console.log(`Removed duplicate from ${pkgPath}`); + continue; + } + } + newLines.push(line); + } + + // Check if the previous line now ends with a comma that it shouldn't, or similar + // Actually, just using regex might leave a trailing comma. + + // Alternative: since we know JS handles this mostly fine with JSON.parse: + const asJson = JSON.parse(raw); + const formatted = JSON.stringify(asJson, null, 2) + '\n'; + fs.writeFileSync(pkgPath, formatted, 'utf8'); + console.log(`Rewrote ${pkgPath}`); + } catch(e) { + console.log(`Failed on ${pkgPath}: ` + e); + } +} diff --git a/fs/find-packages/package.json b/fs/find-packages/package.json index ef2c197c76..032b4f61b3 100644 --- a/fs/find-packages/package.json +++ b/fs/find-packages/package.json @@ -33,9 +33,9 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/read-project-manifest": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "p-filter": "catalog:", "tinyglobby": "catalog:" }, diff --git a/fs/find-packages/src/index.ts b/fs/find-packages/src/index.ts index bb9104ffa3..7e08db68f0 100644 --- a/fs/find-packages/src/index.ts +++ b/fs/find-packages/src/index.ts @@ -2,9 +2,9 @@ import { promises as fs } from 'node:fs' import path from 'node:path' import util from 'node:util' -import { readExactProjectManifest } from '@pnpm/read-project-manifest' import type { Project, ProjectRootDir, ProjectRootDirRealPath } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' +import { readExactProjectManifest } from '@pnpm/workspace.project-manifest-reader' import pFilter from 'p-filter' import { glob } from 'tinyglobby' diff --git a/fs/find-packages/tsconfig.json b/fs/find-packages/tsconfig.json index 5892f86ac3..161fc50269 100644 --- a/fs/find-packages/tsconfig.json +++ b/fs/find-packages/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../packages/types" }, { - "path": "../../pkg-manifest/read-project-manifest" + "path": "../../workspace/project-manifest-reader" } ] } diff --git a/fs/graceful-fs/package.json b/fs/graceful-fs/package.json index 7ed98db3e9..b15b350462 100644 --- a/fs/graceful-fs/package.json +++ b/fs/graceful-fs/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/graceful-fs", + "name": "@pnpm/fs.graceful-fs", "version": "1000.0.1", "description": "Promisified graceful-fs", "keywords": [ @@ -33,7 +33,7 @@ "graceful-fs": "catalog:" }, "devDependencies": { - "@pnpm/graceful-fs": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "@types/graceful-fs": "catalog:" }, "engines": { diff --git a/fs/hard-link-dir/package.json b/fs/hard-link-dir/package.json index a3c8d983d8..2362383724 100644 --- a/fs/hard-link-dir/package.json +++ b/fs/hard-link-dir/package.json @@ -33,7 +33,7 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/graceful-fs": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "path-temp": "catalog:", "rename-overwrite": "catalog:" }, diff --git a/fs/hard-link-dir/src/index.ts b/fs/hard-link-dir/src/index.ts index 694f053635..1cd6917d07 100644 --- a/fs/hard-link-dir/src/index.ts +++ b/fs/hard-link-dir/src/index.ts @@ -3,7 +3,7 @@ import fs from 'node:fs' import path from 'node:path' import util from 'node:util' -import gfs from '@pnpm/graceful-fs' +import gfs from '@pnpm/fs.graceful-fs' import { globalWarn } from '@pnpm/logger' import { pathTemp } from 'path-temp' import { renameOverwriteSync } from 'rename-overwrite' diff --git a/fs/indexed-pkg-importer/package.json b/fs/indexed-pkg-importer/package.json index 3f26680428..881ebb65b5 100644 --- a/fs/indexed-pkg-importer/package.json +++ b/fs/indexed-pkg-importer/package.json @@ -45,8 +45,8 @@ }, "dependencies": { "@pnpm/core-loggers": "workspace:*", - "@pnpm/graceful-fs": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@reflink/reflink": "catalog:", "@zkochan/rimraf": "catalog:", "fs-extra": "catalog:", diff --git a/fs/indexed-pkg-importer/src/importIndexedDir.ts b/fs/indexed-pkg-importer/src/importIndexedDir.ts index 7a576c7955..4092e697c9 100644 --- a/fs/indexed-pkg-importer/src/importIndexedDir.ts +++ b/fs/indexed-pkg-importer/src/importIndexedDir.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import util from 'node:util' -import gfs from '@pnpm/graceful-fs' +import gfs from '@pnpm/fs.graceful-fs' import { globalInfo, globalWarn, logger } from '@pnpm/logger' import { rimrafSync } from '@zkochan/rimraf' import fsx from 'fs-extra' diff --git a/fs/indexed-pkg-importer/src/index.ts b/fs/indexed-pkg-importer/src/index.ts index f0b5b51105..e906b38f4b 100644 --- a/fs/indexed-pkg-importer/src/index.ts +++ b/fs/indexed-pkg-importer/src/index.ts @@ -4,9 +4,9 @@ import path from 'node:path' import util from 'node:util' import { packageImportMethodLogger } from '@pnpm/core-loggers' -import fs from '@pnpm/graceful-fs' +import fs from '@pnpm/fs.graceful-fs' import { globalInfo, globalWarn } from '@pnpm/logger' -import type { FilesMap, ImportIndexedPackage, ImportOptions } from '@pnpm/store-controller-types' +import type { FilesMap, ImportIndexedPackage, ImportOptions } from '@pnpm/store.controller-types' import { type ImportFile, importIndexedDir } from './importIndexedDir.js' diff --git a/fs/indexed-pkg-importer/test/createImportPackage.test.ts b/fs/indexed-pkg-importer/test/createImportPackage.test.ts index fd0f92fab4..553b88ea1f 100644 --- a/fs/indexed-pkg-importer/test/createImportPackage.test.ts +++ b/fs/indexed-pkg-importer/test/createImportPackage.test.ts @@ -5,7 +5,7 @@ import { jest } from '@jest/globals' const testOnLinuxOnly = (process.platform === 'darwin' || process.platform === 'win32') ? test.skip : test -jest.unstable_mockModule('@pnpm/graceful-fs', () => { +jest.unstable_mockModule('@pnpm/fs.graceful-fs', () => { const { access } = jest.requireActual('fs') const fsMock = { access, @@ -36,7 +36,7 @@ jest.unstable_mockModule('@pnpm/logger', () => ({ globalInfo: jest.fn(), })) -const { default: gfs } = await import('@pnpm/graceful-fs') +const { default: gfs } = await import('@pnpm/fs.graceful-fs') const { createIndexedPkgImporter } = await import('@pnpm/fs.indexed-pkg-importer') const { globalInfo } = await import('@pnpm/logger') diff --git a/fs/indexed-pkg-importer/tsconfig.json b/fs/indexed-pkg-importer/tsconfig.json index a4eda6df6d..66370cd81d 100644 --- a/fs/indexed-pkg-importer/tsconfig.json +++ b/fs/indexed-pkg-importer/tsconfig.json @@ -19,7 +19,7 @@ "path": "../../packages/logger" }, { - "path": "../../store/store-controller-types" + "path": "../../store/controller-types" }, { "path": "../graceful-fs" diff --git a/fs/msgpack-file/package.json b/fs/msgpack-file/package.json index 4eaf3dafa7..c7a91e68c4 100644 --- a/fs/msgpack-file/package.json +++ b/fs/msgpack-file/package.json @@ -32,7 +32,7 @@ "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest" }, "dependencies": { - "@pnpm/graceful-fs": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "msgpackr": "catalog:" }, "devDependencies": { diff --git a/fs/msgpack-file/src/index.ts b/fs/msgpack-file/src/index.ts index 8422889331..635a544df7 100644 --- a/fs/msgpack-file/src/index.ts +++ b/fs/msgpack-file/src/index.ts @@ -1,4 +1,4 @@ -import gfs from '@pnpm/graceful-fs' +import gfs from '@pnpm/fs.graceful-fs' import { Packr } from 'msgpackr' /** diff --git a/fs/read-modules-dir/package.json b/fs/read-modules-dir/package.json index ecd90956a6..b1a985e5d1 100644 --- a/fs/read-modules-dir/package.json +++ b/fs/read-modules-dir/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/read-modules-dir", + "name": "@pnpm/fs.read-modules-dir", "version": "1000.0.0", "description": "Finds all direct packages in node_modules", "keywords": [ @@ -34,7 +34,7 @@ "graceful-fs": "catalog:" }, "devDependencies": { - "@pnpm/read-modules-dir": "workspace:*", + "@pnpm/fs.read-modules-dir": "workspace:*", "@types/graceful-fs": "catalog:" }, "engines": { diff --git a/fs/symlink-dependency/package.json b/fs/symlink-dependency/package.json index 0d68479c44..0f3df7d044 100644 --- a/fs/symlink-dependency/package.json +++ b/fs/symlink-dependency/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/symlink-dependency", + "name": "@pnpm/fs.symlink-dependency", "version": "1000.0.12", "description": "Symlink a dependency to node_modules", "keywords": [ @@ -43,9 +43,9 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { + "@pnpm/fs.symlink-dependency": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/prepare": "workspace:*", - "@pnpm/symlink-dependency": "workspace:*" + "@pnpm/prepare": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/fs/symlink-dependency/test/symlinkDirectRootDependency.test.ts b/fs/symlink-dependency/test/symlinkDirectRootDependency.test.ts index 0bd43b01a3..08aaa9a1b1 100644 --- a/fs/symlink-dependency/test/symlinkDirectRootDependency.test.ts +++ b/fs/symlink-dependency/test/symlinkDirectRootDependency.test.ts @@ -1,8 +1,8 @@ import fs from 'node:fs' import path from 'node:path' +import { symlinkDirectRootDependency } from '@pnpm/fs.symlink-dependency' import { tempDir } from '@pnpm/prepare' -import { symlinkDirectRootDependency } from '@pnpm/symlink-dependency' test('symlink is created to directory that does not yet exist', async () => { const tmp = tempDir(false) diff --git a/global/commands/package.json b/global/commands/package.json index c1aa202a26..3aa226d10e 100644 --- a/global/commands/package.json +++ b/global/commands/package.json @@ -32,18 +32,18 @@ "test": "pnpm run compile && pnpm run _test" }, "dependencies": { + "@pnpm/bins.linker": "workspace:*", + "@pnpm/bins.remover": "workspace:*", + "@pnpm/bins.resolver": "workspace:*", "@pnpm/building.commands": "workspace:*", - "@pnpm/cli-utils": "workspace:*", - "@pnpm/config": "workspace:*", - "@pnpm/core": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.matcher": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/global.packages": "workspace:*", - "@pnpm/link-bins": "workspace:*", - "@pnpm/matcher": "workspace:*", - "@pnpm/package-bins": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/remove-bins": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*", + "@pnpm/installing.deps-installer": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/store.connection-manager": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "is-subdir": "catalog:", diff --git a/global/commands/src/checkGlobalBinConflicts.ts b/global/commands/src/checkGlobalBinConflicts.ts index 2847f4d3ce..57a5c7e6a2 100644 --- a/global/commands/src/checkGlobalBinConflicts.ts +++ b/global/commands/src/checkGlobalBinConflicts.ts @@ -1,13 +1,13 @@ import fs from 'node:fs' import path from 'node:path' +import { getBinsFromPackageManifest } from '@pnpm/bins.resolver' import { PnpmError } from '@pnpm/error' import { type GlobalPackageInfo, scanGlobalPackages, } from '@pnpm/global.packages' -import { getBinsFromPackageManifest } from '@pnpm/package-bins' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import type { DependencyManifest } from '@pnpm/types' // Maps a bin name to all packages that are legitimate owners of it, beyond diff --git a/global/commands/src/globalAdd.ts b/global/commands/src/globalAdd.ts index 1d78151dba..a2f562c10f 100644 --- a/global/commands/src/globalAdd.ts +++ b/global/commands/src/globalAdd.ts @@ -1,6 +1,8 @@ import fs from 'node:fs' import path from 'node:path' +import { linkBinsOfPackages } from '@pnpm/bins.linker' +import { removeBin } from '@pnpm/bins.remover' import { approveBuilds } from '@pnpm/building.commands' import { cleanOrphanedInstallDirs, @@ -10,10 +12,8 @@ import { getHashLink, getInstalledBinNames, } from '@pnpm/global.packages' -import { linkBinsOfPackages } from '@pnpm/link-bins' -import { readPackageJsonFromDirRawSync } from '@pnpm/read-package-json' -import { removeBin } from '@pnpm/remove-bins' -import type { CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import { readPackageJsonFromDirRawSync } from '@pnpm/pkg-manifest.read-package-json' +import type { CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import { isSubdir } from 'is-subdir' import symlinkDir from 'symlink-dir' diff --git a/global/commands/src/globalRemove.ts b/global/commands/src/globalRemove.ts index 05f111f220..aa79c7bbe3 100644 --- a/global/commands/src/globalRemove.ts +++ b/global/commands/src/globalRemove.ts @@ -1,6 +1,7 @@ import fs from 'node:fs' import path from 'node:path' +import { removeBin } from '@pnpm/bins.remover' import { PnpmError } from '@pnpm/error' import { findGlobalPackage, @@ -8,7 +9,6 @@ import { getInstalledBinNames, type GlobalPackageInfo, } from '@pnpm/global.packages' -import { removeBin } from '@pnpm/remove-bins' import { isSubdir } from 'is-subdir' export async function handleGlobalRemove ( diff --git a/global/commands/src/globalUpdate.ts b/global/commands/src/globalUpdate.ts index c122fe01d5..f7477d6640 100644 --- a/global/commands/src/globalUpdate.ts +++ b/global/commands/src/globalUpdate.ts @@ -1,6 +1,8 @@ import fs from 'node:fs' import path from 'node:path' +import { linkBinsOfPackages } from '@pnpm/bins.linker' +import { removeBin } from '@pnpm/bins.remover' import { approveBuilds } from '@pnpm/building.commands' import { cleanOrphanedInstallDirs, @@ -10,9 +12,7 @@ import { type GlobalPackageInfo, scanGlobalPackages, } from '@pnpm/global.packages' -import { linkBinsOfPackages } from '@pnpm/link-bins' -import { removeBin } from '@pnpm/remove-bins' -import type { CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import type { CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import { isSubdir } from 'is-subdir' import symlinkDir from 'symlink-dir' diff --git a/global/commands/src/installGlobalPackages.ts b/global/commands/src/installGlobalPackages.ts index 6dfdd12d70..d6cdb314b0 100644 --- a/global/commands/src/installGlobalPackages.ts +++ b/global/commands/src/installGlobalPackages.ts @@ -1,7 +1,7 @@ -import { tryReadProjectManifest } from '@pnpm/cli-utils' -import { getOptionsFromRootManifest } from '@pnpm/config' -import { mutateModulesInSingleProject } from '@pnpm/core' -import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import { tryReadProjectManifest } from '@pnpm/cli.utils' +import { getOptionsFromRootManifest } from '@pnpm/config.reader' +import { mutateModulesInSingleProject } from '@pnpm/installing.deps-installer' +import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import type { IgnoredBuilds, IncludedDependencies, ProjectRootDir } from '@pnpm/types' export interface InstallGlobalPackagesOptions extends CreateStoreControllerOptions { diff --git a/global/commands/src/listGlobalPackages.ts b/global/commands/src/listGlobalPackages.ts index ee4bc3a5c5..414f256d5e 100644 --- a/global/commands/src/listGlobalPackages.ts +++ b/global/commands/src/listGlobalPackages.ts @@ -1,8 +1,8 @@ +import { createMatcher } from '@pnpm/config.matcher' import { getGlobalPackageDetails, scanGlobalPackages, } from '@pnpm/global.packages' -import { createMatcher } from '@pnpm/matcher' import { lexCompare } from '@pnpm/util.lex-comparator' export async function listGlobalPackages (globalPkgDir: string, params: string[]): Promise { diff --git a/global/commands/src/readInstalledPackages.ts b/global/commands/src/readInstalledPackages.ts index 40856eb497..163a29c2dd 100644 --- a/global/commands/src/readInstalledPackages.ts +++ b/global/commands/src/readInstalledPackages.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { readPackageJsonFromDir, readPackageJsonFromDirRawSync } from '@pnpm/read-package-json' +import { readPackageJsonFromDir, readPackageJsonFromDirRawSync } from '@pnpm/pkg-manifest.read-package-json' import type { DependencyManifest } from '@pnpm/types' export async function readInstalledPackages (installDir: string): Promise> { diff --git a/global/commands/tsconfig.json b/global/commands/tsconfig.json index 3215b9f5a5..8121b663e9 100644 --- a/global/commands/tsconfig.json +++ b/global/commands/tsconfig.json @@ -10,26 +10,26 @@ ], "references": [ { - "path": "../../bins/link-bins" + "path": "../../bins/linker" }, { - "path": "../../bins/package-bins" + "path": "../../bins/remover" }, { - "path": "../../bins/remove-bins" + "path": "../../bins/resolver" }, { "path": "../../building/commands" }, { - "path": "../../cli/cli-utils" - }, - { - "path": "../../config/config" + "path": "../../cli/utils" }, { "path": "../../config/matcher" }, + { + "path": "../../config/reader" + }, { "path": "../../installing/deps-installer" }, @@ -43,7 +43,7 @@ "path": "../../pkg-manifest/read-package-json" }, { - "path": "../../store/store-connection-manager" + "path": "../../store/connection-manager" }, { "path": "../packages" diff --git a/global/packages/package.json b/global/packages/package.json index 2ab94b6c8d..ddfb5ad5e0 100644 --- a/global/packages/package.json +++ b/global/packages/package.json @@ -31,9 +31,9 @@ "test": "pnpm run compile" }, "dependencies": { + "@pnpm/bins.resolver": "workspace:*", "@pnpm/crypto.hash": "workspace:*", - "@pnpm/package-bins": "workspace:*", - "@pnpm/read-package-json": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:" }, diff --git a/global/packages/src/scanGlobalPackages.ts b/global/packages/src/scanGlobalPackages.ts index 2bcb53d4dc..01c4b5f6bb 100644 --- a/global/packages/src/scanGlobalPackages.ts +++ b/global/packages/src/scanGlobalPackages.ts @@ -2,8 +2,8 @@ import fs from 'node:fs' import path from 'node:path' import util from 'node:util' -import { getBinsFromPackageManifest } from '@pnpm/package-bins' -import { readPackageJsonFromDirRawSync, safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +import { getBinsFromPackageManifest } from '@pnpm/bins.resolver' +import { readPackageJsonFromDirRawSync, safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import type { PackageManifest } from '@pnpm/types' export interface GlobalPackageInfo { diff --git a/global/packages/tsconfig.json b/global/packages/tsconfig.json index f975226d19..06cc063117 100644 --- a/global/packages/tsconfig.json +++ b/global/packages/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../bins/package-bins" + "path": "../../bins/resolver" }, { "path": "../../crypto/hash" diff --git a/hooks/pnpmfile/package.json b/hooks/pnpmfile/package.json index cb1c81d474..c82470a103 100644 --- a/hooks/pnpmfile/package.json +++ b/hooks/pnpmfile/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/pnpmfile", + "name": "@pnpm/hooks.pnpmfile", "version": "1002.1.3", "description": "Reading a .pnpmfile.cjs", "keywords": [ @@ -36,7 +36,7 @@ "@pnpm/error": "workspace:*", "@pnpm/hooks.types": "workspace:*", "@pnpm/lockfile.types": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "chalk": "catalog:", "path-absolute": "catalog:" @@ -45,9 +45,9 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/fetcher-base": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/hooks.pnpmfile": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/pnpmfile": "workspace:*", "@pnpm/test-fixtures": "workspace:*" }, "engines": { diff --git a/hooks/pnpmfile/src/Hooks.ts b/hooks/pnpmfile/src/Hooks.ts index 4721080d0c..794170918f 100644 --- a/hooks/pnpmfile/src/Hooks.ts +++ b/hooks/pnpmfile/src/Hooks.ts @@ -1,7 +1,7 @@ import type { Log } from '@pnpm/core-loggers' import type { PreResolutionHook } from '@pnpm/hooks.types' import type { LockfileObject } from '@pnpm/lockfile.types' -import type { ImportIndexedPackageAsync } from '@pnpm/store-controller-types' +import type { ImportIndexedPackageAsync } from '@pnpm/store.controller-types' export interface HookContext { log: (message: string) => void diff --git a/hooks/pnpmfile/src/requireHooks.ts b/hooks/pnpmfile/src/requireHooks.ts index 176cce512c..7437389a91 100644 --- a/hooks/pnpmfile/src/requireHooks.ts +++ b/hooks/pnpmfile/src/requireHooks.ts @@ -3,7 +3,7 @@ import { createHashFromMultipleFiles } from '@pnpm/crypto.hash' import { PnpmError } from '@pnpm/error' import type { CustomFetcher, CustomResolver, PreResolutionHookContext, PreResolutionHookLogger } from '@pnpm/hooks.types' import type { LockfileObject } from '@pnpm/lockfile.types' -import type { ImportIndexedPackageAsync } from '@pnpm/store-controller-types' +import type { ImportIndexedPackageAsync } from '@pnpm/store.controller-types' import type { BaseManifest, BeforePackingHook, ReadPackageHook } from '@pnpm/types' import { pathAbsolute } from 'path-absolute' diff --git a/hooks/pnpmfile/test/index.ts b/hooks/pnpmfile/test/index.ts index d79fa5bc8a..7b3e3b1687 100644 --- a/hooks/pnpmfile/test/index.ts +++ b/hooks/pnpmfile/test/index.ts @@ -1,7 +1,7 @@ import path from 'node:path' import type { Log } from '@pnpm/core-loggers' -import { BadReadPackageHookError, type HookContext, requireHooks } from '@pnpm/pnpmfile' +import { BadReadPackageHookError, type HookContext, requireHooks } from '@pnpm/hooks.pnpmfile' import { fixtures } from '@pnpm/test-fixtures' import { requirePnpmfile } from '../src/requirePnpmfile.js' diff --git a/hooks/pnpmfile/tsconfig.json b/hooks/pnpmfile/tsconfig.json index 69f377ab9a..4dec0a3f3b 100644 --- a/hooks/pnpmfile/tsconfig.json +++ b/hooks/pnpmfile/tsconfig.json @@ -34,7 +34,7 @@ "path": "../../packages/types" }, { - "path": "../../store/store-controller-types" + "path": "../../store/controller-types" }, { "path": "../types" diff --git a/hooks/read-package-hook/package.json b/hooks/read-package-hook/package.json index 9bfd208709..5afd307ae6 100644 --- a/hooks/read-package-hook/package.json +++ b/hooks/read-package-hook/package.json @@ -31,11 +31,11 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/config.matcher": "workspace:*", + "@pnpm/config.parse-overrides": "workspace:*", + "@pnpm/deps.peer-range": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/matcher": "workspace:*", - "@pnpm/parse-overrides": "workspace:*", - "@pnpm/parse-wanted-dependency": "workspace:*", - "@pnpm/semver.peer-range": "workspace:*", + "@pnpm/resolving.parse-wanted-dependency": "workspace:*", "@pnpm/types": "workspace:*", "@yarnpkg/extensions": "catalog:", "normalize-path": "catalog:", diff --git a/hooks/read-package-hook/src/createOptionalDependenciesRemover.ts b/hooks/read-package-hook/src/createOptionalDependenciesRemover.ts index 66ba3c67cf..9524a6faf7 100644 --- a/hooks/read-package-hook/src/createOptionalDependenciesRemover.ts +++ b/hooks/read-package-hook/src/createOptionalDependenciesRemover.ts @@ -1,4 +1,4 @@ -import { createMatcher } from '@pnpm/matcher' +import { createMatcher } from '@pnpm/config.matcher' import type { BaseManifest, ReadPackageHook } from '@pnpm/types' export function createOptionalDependenciesRemover (toBeRemoved: string[]): ReadPackageHook { diff --git a/hooks/read-package-hook/src/createPackageExtender.ts b/hooks/read-package-hook/src/createPackageExtender.ts index e5e73b1e9a..f9606f52d6 100644 --- a/hooks/read-package-hook/src/createPackageExtender.ts +++ b/hooks/read-package-hook/src/createPackageExtender.ts @@ -1,4 +1,4 @@ -import { parseWantedDependency } from '@pnpm/parse-wanted-dependency' +import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency' import type { PackageExtension, PackageManifest, ReadPackageHook } from '@pnpm/types' import semver from 'semver' diff --git a/hooks/read-package-hook/src/createVersionsOverrider.ts b/hooks/read-package-hook/src/createVersionsOverrider.ts index 5f5d0b321d..6769780b14 100644 --- a/hooks/read-package-hook/src/createVersionsOverrider.ts +++ b/hooks/read-package-hook/src/createVersionsOverrider.ts @@ -1,7 +1,7 @@ import path from 'node:path' -import type { PackageSelector, VersionOverride as VersionOverrideBase } from '@pnpm/parse-overrides' -import { isValidPeerRange } from '@pnpm/semver.peer-range' +import type { PackageSelector, VersionOverride as VersionOverrideBase } from '@pnpm/config.parse-overrides' +import { isValidPeerRange } from '@pnpm/deps.peer-range' import type { Dependencies, PackageManifest, ReadPackageHook } from '@pnpm/types' import normalizePath from 'normalize-path' import { partition } from 'ramda' diff --git a/hooks/types/package.json b/hooks/types/package.json index 7b4d3baa6c..5b2d7a9ee1 100644 --- a/hooks/types/package.json +++ b/hooks/types/package.json @@ -31,10 +31,10 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cafs-types": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", "@pnpm/lockfile.types": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", "@pnpm/types": "workspace:*" }, "devDependencies": { diff --git a/hooks/types/src/index.ts b/hooks/types/src/index.ts index 4bbaf27d76..18e1f73213 100644 --- a/hooks/types/src/index.ts +++ b/hooks/types/src/index.ts @@ -1,7 +1,7 @@ -import type { Cafs } from '@pnpm/cafs-types' -import type { Fetchers, FetchOptions, FetchResult } from '@pnpm/fetcher-base' +import type { Fetchers, FetchOptions, FetchResult } from '@pnpm/fetching.fetcher-base' import type { LockfileObject, PackageSnapshot } from '@pnpm/lockfile.types' -import type { Resolution, WantedDependency } from '@pnpm/resolver-base' +import type { Resolution, WantedDependency } from '@pnpm/resolving.resolver-base' +import type { Cafs } from '@pnpm/store.cafs-types' import type { Registries } from '@pnpm/types' // Custom resolution types must use scoped naming to avoid conflicts with pnpm's built-in types diff --git a/installing/client/package.json b/installing/client/package.json index 6585c31709..f46788657b 100644 --- a/installing/client/package.json +++ b/installing/client/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/client", + "name": "@pnpm/installing.client", "version": "1001.1.4", "description": "Creates the package resolve and fetch functions", "keywords": [ @@ -33,24 +33,24 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/default-resolver": "workspace:*", - "@pnpm/directory-fetcher": "workspace:*", - "@pnpm/fetch": "workspace:*", - "@pnpm/fetching-types": "workspace:*", + "@pnpm/engine.runtime.node.fetcher": "workspace:*", "@pnpm/fetching.binary-fetcher": "workspace:*", - "@pnpm/git-fetcher": "workspace:*", + "@pnpm/fetching.directory-fetcher": "workspace:*", + "@pnpm/fetching.git-fetcher": "workspace:*", + "@pnpm/fetching.tarball-fetcher": "workspace:*", + "@pnpm/fetching.types": "workspace:*", "@pnpm/hooks.types": "workspace:*", "@pnpm/network.auth-header": "workspace:*", - "@pnpm/node.fetcher": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/network.fetch": "workspace:*", + "@pnpm/resolving.default-resolver": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/store.index": "workspace:*", - "@pnpm/tarball-fetcher": "workspace:*", "@pnpm/types": "workspace:*", "ramda": "catalog:" }, "devDependencies": { - "@pnpm/client": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/installing.client": "workspace:*", "@types/ramda": "catalog:" }, "engines": { diff --git a/installing/client/src/index.ts b/installing/client/src/index.ts index f8601a1e3d..3191d1b374 100644 --- a/installing/client/src/index.ts +++ b/installing/client/src/index.ts @@ -1,18 +1,18 @@ +import { createBinaryFetcher } from '@pnpm/fetching.binary-fetcher' +import { createDirectoryFetcher } from '@pnpm/fetching.directory-fetcher' +import type { BinaryFetcher, DirectoryFetcher, GitFetcher } from '@pnpm/fetching.fetcher-base' +import { createGitFetcher } from '@pnpm/fetching.git-fetcher' +import { createTarballFetcher, type TarballFetchers } from '@pnpm/fetching.tarball-fetcher' +import type { FetchFromRegistry, GetAuthHeader, RetryTimeoutOptions } from '@pnpm/fetching.types' +import type { CustomFetcher, CustomResolver } from '@pnpm/hooks.types' +import { createGetAuthHeaderByURI } from '@pnpm/network.auth-header' +import { type AgentOptions, createFetchFromRegistry } from '@pnpm/network.fetch' import { createResolver as _createResolver, type ResolveFunction, type ResolverFactoryOptions, -} from '@pnpm/default-resolver' -import { createDirectoryFetcher } from '@pnpm/directory-fetcher' -import { type AgentOptions, createFetchFromRegistry } from '@pnpm/fetch' -import type { BinaryFetcher, DirectoryFetcher, GitFetcher } from '@pnpm/fetcher-base' -import { createBinaryFetcher } from '@pnpm/fetching.binary-fetcher' -import type { FetchFromRegistry, GetAuthHeader, RetryTimeoutOptions } from '@pnpm/fetching-types' -import { createGitFetcher } from '@pnpm/git-fetcher' -import type { CustomFetcher, CustomResolver } from '@pnpm/hooks.types' -import { createGetAuthHeaderByURI } from '@pnpm/network.auth-header' +} from '@pnpm/resolving.default-resolver' import type { StoreIndex } from '@pnpm/store.index' -import { createTarballFetcher, type TarballFetchers } from '@pnpm/tarball-fetcher' import type { SslConfig } from '@pnpm/types' export type { ResolveFunction } diff --git a/installing/client/test/index.ts b/installing/client/test/index.ts index 90a30f0c19..ba596dfec6 100644 --- a/installing/client/test/index.ts +++ b/installing/client/test/index.ts @@ -1,5 +1,5 @@ /// -import { createClient, createResolver } from '@pnpm/client' +import { createClient, createResolver } from '@pnpm/installing.client' import { StoreIndex } from '@pnpm/store.index' const storeIndexes: StoreIndex[] = [] diff --git a/installing/client/tsconfig.json b/installing/client/tsconfig.json index 176c39915a..14990cfa17 100644 --- a/installing/client/tsconfig.json +++ b/installing/client/tsconfig.json @@ -21,15 +21,15 @@ { "path": "../../fetching/fetcher-base" }, - { - "path": "../../fetching/fetching-types" - }, { "path": "../../fetching/git-fetcher" }, { "path": "../../fetching/tarball-fetcher" }, + { + "path": "../../fetching/types" + }, { "path": "../../hooks/types" }, diff --git a/installing/commands/package.json b/installing/commands/package.json index 7c0d345010..6bfea42fab 100644 --- a/installing/commands/package.json +++ b/installing/commands/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/plugin-commands-installation", + "name": "@pnpm/installing.commands", "version": "1004.6.10", "description": "Commands for installation", "keywords": [ @@ -35,44 +35,44 @@ "@pnpm/building.after-install": "workspace:*", "@pnpm/building.commands": "workspace:*", "@pnpm/catalogs.types": "workspace:*", - "@pnpm/cli-utils": "workspace:*", + "@pnpm/cli.command": "workspace:*", + "@pnpm/cli.common-cli-options-help": "workspace:*", + "@pnpm/cli.utils": "workspace:*", "@pnpm/colorize-semver-diff": "catalog:", - "@pnpm/command": "workspace:*", - "@pnpm/common-cli-options-help": "workspace:*", - "@pnpm/config": "workspace:*", - "@pnpm/config.config-writer": "workspace:*", "@pnpm/config.deps-installer": "workspace:*", + "@pnpm/config.matcher": "workspace:*", + "@pnpm/config.pick-registry-for-package": "workspace:*", + "@pnpm/config.reader": "workspace:*", + "@pnpm/config.writer": "workspace:*", "@pnpm/constants": "workspace:*", - "@pnpm/core": "workspace:*", - "@pnpm/dedupe.check": "workspace:*", + "@pnpm/deps.inspection.outdated": "workspace:*", "@pnpm/deps.status": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/filter-workspace-packages": "workspace:*", - "@pnpm/find-workspace-dir": "workspace:*", - "@pnpm/get-context": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", + "@pnpm/fs.read-modules-dir": "workspace:*", "@pnpm/global.commands": "workspace:*", - "@pnpm/graceful-fs": "workspace:*", + "@pnpm/hooks.pnpmfile": "workspace:*", + "@pnpm/installing.context": "workspace:*", + "@pnpm/installing.dedupe.check": "workspace:*", + "@pnpm/installing.deps-installer": "workspace:*", "@pnpm/lockfile.types": "workspace:*", - "@pnpm/manifest-utils": "workspace:*", - "@pnpm/matcher": "workspace:*", - "@pnpm/outdated": "workspace:*", - "@pnpm/package-store": "workspace:*", - "@pnpm/parse-wanted-dependency": "workspace:*", - "@pnpm/pick-registry-for-package": "workspace:*", - "@pnpm/pnpmfile": "workspace:*", - "@pnpm/read-modules-dir": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.utils": "workspace:*", + "@pnpm/resolving.parse-wanted-dependency": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/semver-diff": "catalog:", - "@pnpm/sort-packages": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*", + "@pnpm/store.connection-manager": "workspace:*", + "@pnpm/store.controller": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/workspace.find-packages": "workspace:*", - "@pnpm/workspace.manifest-writer": "workspace:*", "@pnpm/workspace.pkgs-graph": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", + "@pnpm/workspace.project-manifest-writer": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", + "@pnpm/workspace.projects-reader": "workspace:*", + "@pnpm/workspace.root-finder": "workspace:*", + "@pnpm/workspace.sort-packages": "workspace:*", "@pnpm/workspace.state": "workspace:*", - "@pnpm/write-project-manifest": "workspace:*", + "@pnpm/workspace.workspace-manifest-writer": "workspace:*", "@yarnpkg/core": "catalog:", "@yarnpkg/lockfile": "catalog:", "@yarnpkg/parsers": "catalog:", @@ -97,16 +97,16 @@ "devDependencies": { "@jest/globals": "catalog:", "@pnpm/assert-project": "workspace:*", + "@pnpm/installing.commands": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/plugin-commands-installation": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/store.index": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@pnpm/test-ipc-server": "workspace:*", "@pnpm/worker": "workspace:*", - "@pnpm/workspace.filter-packages-from-dir": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", "@types/normalize-path": "catalog:", "@types/proxyquire": "catalog:", "@types/ramda": "catalog:", diff --git a/installing/commands/src/add.ts b/installing/commands/src/add.ts index c3f81b0ec3..c31b85ac29 100644 --- a/installing/commands/src/add.ts +++ b/installing/commands/src/add.ts @@ -1,11 +1,11 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { types as allTypes } from '@pnpm/config' -import { writeSettings } from '@pnpm/config.config-writer' +import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' import { resolveConfigDeps } from '@pnpm/config.deps-installer' +import { types as allTypes } from '@pnpm/config.reader' +import { writeSettings } from '@pnpm/config.writer' import { PnpmError } from '@pnpm/error' import { handleGlobalAdd } from '@pnpm/global.commands' -import { createStoreController } from '@pnpm/store-connection-manager' +import { createStoreController } from '@pnpm/store.connection-manager' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/installing/commands/src/ci.ts b/installing/commands/src/ci.ts index e637471477..eaba67a7c7 100644 --- a/installing/commands/src/ci.ts +++ b/installing/commands/src/ci.ts @@ -1,4 +1,4 @@ -import { docsUrl } from '@pnpm/cli-utils' +import { docsUrl } from '@pnpm/cli.utils' import { PnpmError } from '@pnpm/error' import { renderHelp } from 'render-help' diff --git a/installing/commands/src/createProjectManifestWriter.ts b/installing/commands/src/createProjectManifestWriter.ts index 2c0f4040c6..bdde923fff 100644 --- a/installing/commands/src/createProjectManifestWriter.ts +++ b/installing/commands/src/createProjectManifestWriter.ts @@ -1,8 +1,8 @@ import path from 'node:path' import util from 'node:util' -import { readProjectManifest, type WriteProjectManifest } from '@pnpm/read-project-manifest' -import { writeProjectManifest } from '@pnpm/write-project-manifest' +import { readProjectManifest, type WriteProjectManifest } from '@pnpm/workspace.project-manifest-reader' +import { writeProjectManifest } from '@pnpm/workspace.project-manifest-writer' export async function createProjectManifestWriter (projectDir: string): Promise { try { diff --git a/installing/commands/src/dedupe.ts b/installing/commands/src/dedupe.ts index 329672671f..e2201bee72 100644 --- a/installing/commands/src/dedupe.ts +++ b/installing/commands/src/dedupe.ts @@ -1,6 +1,6 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { dedupeDiffCheck } from '@pnpm/dedupe.check' +import { OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' +import { dedupeDiffCheck } from '@pnpm/installing.dedupe.check' import { omit } from 'ramda' import { renderHelp } from 'render-help' diff --git a/installing/commands/src/fetch.ts b/installing/commands/src/fetch.ts index c720bedb75..1064b2f9e0 100644 --- a/installing/commands/src/fetch.ts +++ b/installing/commands/src/fetch.ts @@ -1,8 +1,8 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, getOptionsFromRootManifest } from '@pnpm/config' -import { type InstallOptions, mutateModulesInSingleProject } from '@pnpm/core' -import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import { UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, getOptionsFromRootManifest } from '@pnpm/config.reader' +import { type InstallOptions, mutateModulesInSingleProject } from '@pnpm/installing.deps-installer' +import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import type { ProjectRootDir } from '@pnpm/types' import { renderHelp } from 'render-help' diff --git a/installing/commands/src/getSaveType.ts b/installing/commands/src/getSaveType.ts index 4da65c66b0..f190d0c585 100644 --- a/installing/commands/src/getSaveType.ts +++ b/installing/commands/src/getSaveType.ts @@ -1,4 +1,4 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type { DependenciesField } from '@pnpm/types' export function getSaveType ( diff --git a/installing/commands/src/import/index.ts b/installing/commands/src/import/index.ts index d1dfedad98..a818f177f3 100644 --- a/installing/commands/src/import/index.ts +++ b/installing/commands/src/import/index.ts @@ -1,21 +1,21 @@ import fs from 'node:fs' import path from 'node:path' -import { docsUrl } from '@pnpm/cli-utils' -import { type Config, getOptionsFromRootManifest } from '@pnpm/config' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, getOptionsFromRootManifest } from '@pnpm/config.reader' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { install, type InstallOptions } from '@pnpm/core' import { PnpmError } from '@pnpm/error' -import gfs from '@pnpm/graceful-fs' +import gfs from '@pnpm/fs.graceful-fs' +import { install, type InstallOptions } from '@pnpm/installing.deps-installer' import { logger } from '@pnpm/logger' -import { readProjectManifestOnly } from '@pnpm/read-project-manifest' -import { sequenceGraph } from '@pnpm/sort-packages' import { createStoreController, type CreateStoreControllerOptions, -} from '@pnpm/store-connection-manager' +} from '@pnpm/store.connection-manager' import type { Project, ProjectsGraph } from '@pnpm/types' -import { findWorkspacePackages } from '@pnpm/workspace.find-packages' +import { readProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' +import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' +import { sequenceGraph } from '@pnpm/workspace.sort-packages' import * as structUtils from '@yarnpkg/core/structUtils' import type { LockFileObject } from '@yarnpkg/lockfile' import yarnLockfileLib from '@yarnpkg/lockfile' diff --git a/installing/commands/src/install.ts b/installing/commands/src/install.ts index a73ad12e1f..3c2d59f374 100644 --- a/installing/commands/src/install.ts +++ b/installing/commands/src/install.ts @@ -1,9 +1,9 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { FILTERING, OPTIONS, OUTPUT_OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, types as allTypes } from '@pnpm/config' +import { FILTERING, OPTIONS, OUTPUT_OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { WANTED_LOCKFILE } from '@pnpm/constants' import { PnpmError } from '@pnpm/error' -import type { CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import type { CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/installing/commands/src/installDeps.ts b/installing/commands/src/installDeps.ts index 4930cd78ed..ad341eaedc 100644 --- a/installing/commands/src/installDeps.ts +++ b/installing/commands/src/installDeps.ts @@ -4,8 +4,11 @@ import { buildProjects } from '@pnpm/building.after-install' import { readProjectManifestOnly, tryReadProjectManifest, -} from '@pnpm/cli-utils' -import { type Config, getOptionsFromRootManifest } from '@pnpm/config' +} from '@pnpm/cli.utils' +import { type Config, getOptionsFromRootManifest } from '@pnpm/config.reader' +import { checkDepsStatus } from '@pnpm/deps.status' +import { PnpmError } from '@pnpm/error' +import { arrayOfWorkspacePackagesToMap } from '@pnpm/installing.context' import { IgnoredBuildsError, install, @@ -13,17 +16,12 @@ import { type MutateModulesOptions, type UpdateMatchingFunction, type WorkspacePackages, -} from '@pnpm/core' -import { checkDepsStatus } from '@pnpm/deps.status' -import { PnpmError } from '@pnpm/error' -import { filterPkgsBySelectorObjects } from '@pnpm/filter-workspace-packages' -import { arrayOfWorkspacePackagesToMap } from '@pnpm/get-context' +} from '@pnpm/installing.deps-installer' import type { LockfileObject } from '@pnpm/lockfile.types' import { globalInfo, logger } from '@pnpm/logger' -import { filterDependenciesByType } from '@pnpm/manifest-utils' -import type { PreferredVersions, VersionSelectors } from '@pnpm/resolver-base' -import { sequenceGraph } from '@pnpm/sort-packages' -import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import { filterDependenciesByType } from '@pnpm/pkg-manifest.utils' +import type { PreferredVersions, VersionSelectors } from '@pnpm/resolving.resolver-base' +import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import type { IncludedDependencies, PackageVulnerabilityAudit, @@ -32,10 +30,12 @@ import type { ProjectsGraph, VulnerabilitySeverity, } from '@pnpm/types' -import { findWorkspacePackages } from '@pnpm/workspace.find-packages' -import { updateWorkspaceManifest } from '@pnpm/workspace.manifest-writer' import { createPkgGraph } from '@pnpm/workspace.pkgs-graph' +import { filterPkgsBySelectorObjects } from '@pnpm/workspace.projects-filter' +import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' +import { sequenceGraph } from '@pnpm/workspace.sort-packages' import { updateWorkspaceState, type WorkspaceStateSettings } from '@pnpm/workspace.state' +import { updateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-writer' import { getPinnedVersion } from './getPinnedVersion.js' import { getSaveType } from './getSaveType.js' @@ -478,7 +478,7 @@ function severityStringToNumber (severity: VulnerabilitySeverity): number { function getVulnerabilityPenalty (severity: VulnerabilitySeverity): number { switch (severity) { - case 'low': return -1100 // 100 more than DIRECT_DEP_SELECTOR_WEIGHT from @pnpm/resolver-base + case 'low': return -1100 // 100 more than DIRECT_DEP_SELECTOR_WEIGHT from @pnpm/resolving.resolver-base case 'moderate': return -2000 case 'high': return -3000 case 'critical': return -4000 diff --git a/installing/commands/src/link.ts b/installing/commands/src/link.ts index 5506a78b2b..0337369cf8 100644 --- a/installing/commands/src/link.ts +++ b/installing/commands/src/link.ts @@ -1,20 +1,20 @@ import path from 'node:path' +import { UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' import { docsUrl, tryReadProjectManifest, -} from '@pnpm/cli-utils' -import { UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, types as allTypes } from '@pnpm/config' -import { writeSettings } from '@pnpm/config.config-writer' +} from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' +import { writeSettings } from '@pnpm/config.writer' +import { PnpmError } from '@pnpm/error' +import { arrayOfWorkspacePackagesToMap } from '@pnpm/installing.context' import type { WorkspacePackages, -} from '@pnpm/core' -import { PnpmError } from '@pnpm/error' -import { arrayOfWorkspacePackagesToMap } from '@pnpm/get-context' +} from '@pnpm/installing.deps-installer' import { logger } from '@pnpm/logger' import { DEPENDENCIES_FIELDS, type Project, type ProjectManifest } from '@pnpm/types' -import { findWorkspacePackages } from '@pnpm/workspace.find-packages' +import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' import normalize from 'normalize-path' import { partition, pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/installing/commands/src/prune.ts b/installing/commands/src/prune.ts index 43ea29dea4..7a4828fbbb 100644 --- a/installing/commands/src/prune.ts +++ b/installing/commands/src/prune.ts @@ -1,6 +1,6 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { types as allTypes } from '@pnpm/config' +import { OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' +import { types as allTypes } from '@pnpm/config.reader' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/installing/commands/src/recursive.ts b/installing/commands/src/recursive.ts index d8de3291e8..e350930571 100755 --- a/installing/commands/src/recursive.ts +++ b/installing/commands/src/recursive.ts @@ -6,7 +6,8 @@ import type { Catalogs } from '@pnpm/catalogs.types' import { type RecursiveSummary, throwOnCommandFail, -} from '@pnpm/cli-utils' +} from '@pnpm/cli.utils' +import { createMatcherWithIndex } from '@pnpm/config.matcher' import { type Config, createProjectConfigRecord, @@ -14,7 +15,10 @@ import { getWorkspaceConcurrency, type OptionsFromRootManifest, type ProjectConfig, -} from '@pnpm/config' +} from '@pnpm/config.reader' +import { PnpmError } from '@pnpm/error' +import { requireHooks } from '@pnpm/hooks.pnpmfile' +import { arrayOfWorkspacePackagesToMap } from '@pnpm/installing.context' import { addDependenciesToPackage, IgnoredBuildsError, @@ -25,17 +29,12 @@ import { type ProjectOptions, type UpdateMatchingFunction, type WorkspacePackages, -} from '@pnpm/core' -import { PnpmError } from '@pnpm/error' -import { arrayOfWorkspacePackagesToMap } from '@pnpm/get-context' +} from '@pnpm/installing.deps-installer' import { logger } from '@pnpm/logger' -import { filterDependenciesByType } from '@pnpm/manifest-utils' -import { createMatcherWithIndex } from '@pnpm/matcher' -import type { StoreController } from '@pnpm/package-store' -import { requireHooks } from '@pnpm/pnpmfile' -import type { PreferredVersions } from '@pnpm/resolver-base' -import { sortPackages } from '@pnpm/sort-packages' -import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import { filterDependenciesByType } from '@pnpm/pkg-manifest.utils' +import type { PreferredVersions } from '@pnpm/resolving.resolver-base' +import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store.connection-manager' +import type { StoreController } from '@pnpm/store.controller' import type { IgnoredBuilds, IncludedDependencies, @@ -46,7 +45,8 @@ import type { ProjectRootDirRealPath, ProjectsGraph, } from '@pnpm/types' -import { updateWorkspaceManifest } from '@pnpm/workspace.manifest-writer' +import { sortPackages } from '@pnpm/workspace.sort-packages' +import { updateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-writer' import { isSubdir } from 'is-subdir' import pFilter from 'p-filter' import pLimit from 'p-limit' diff --git a/installing/commands/src/remove.ts b/installing/commands/src/remove.ts index 5e2531f766..e2e0cf1b60 100644 --- a/installing/commands/src/remove.ts +++ b/installing/commands/src/remove.ts @@ -1,20 +1,20 @@ +import type { CompletionFunc } from '@pnpm/cli.command' +import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' import { docsUrl, readDepNameCompletions, readProjectManifest, -} from '@pnpm/cli-utils' -import type { CompletionFunc } from '@pnpm/command' -import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { type Config, getOptionsFromRootManifest, types as allTypes } from '@pnpm/config' -import { mutateModulesInSingleProject } from '@pnpm/core' +} from '@pnpm/cli.utils' +import { type Config, getOptionsFromRootManifest, types as allTypes } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' -import { arrayOfWorkspacePackagesToMap } from '@pnpm/get-context' import { handleGlobalRemove } from '@pnpm/global.commands' -import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils' -import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager' +import { arrayOfWorkspacePackagesToMap } from '@pnpm/installing.context' +import { mutateModulesInSingleProject } from '@pnpm/installing.deps-installer' +import { getAllDependenciesFromManifest } from '@pnpm/pkg-manifest.utils' +import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import type { DependenciesField, Project, ProjectRootDir } from '@pnpm/types' -import { findWorkspacePackages } from '@pnpm/workspace.find-packages' -import { updateWorkspaceManifest } from '@pnpm/workspace.manifest-writer' +import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' +import { updateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-writer' import { pick, without } from 'ramda' import { renderHelp } from 'render-help' diff --git a/installing/commands/src/unlink.ts b/installing/commands/src/unlink.ts index c1c882be39..a5ddea8953 100644 --- a/installing/commands/src/unlink.ts +++ b/installing/commands/src/unlink.ts @@ -1,5 +1,5 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' +import { UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' import { renderHelp } from 'render-help' import { createProjectManifestWriter } from './createProjectManifestWriter.js' diff --git a/installing/commands/src/update/getUpdateChoices.ts b/installing/commands/src/update/getUpdateChoices.ts index 00c979faed..7c499c1e1a 100644 --- a/installing/commands/src/update/getUpdateChoices.ts +++ b/installing/commands/src/update/getUpdateChoices.ts @@ -1,7 +1,7 @@ import { stripVTControlCharacters } from 'node:util' import colorizeSemverDiff from '@pnpm/colorize-semver-diff' -import type { OutdatedPackage } from '@pnpm/outdated' +import type { OutdatedPackage } from '@pnpm/deps.inspection.outdated' import semverDiff from '@pnpm/semver-diff' import { getBorderCharacters, table } from '@zkochan/table' import { and, groupBy, isEmpty, pickBy, pipe, pluck, uniqBy } from 'ramda' diff --git a/installing/commands/src/update/index.ts b/installing/commands/src/update/index.ts index cd70bc8790..da8e03ff41 100644 --- a/installing/commands/src/update/index.ts +++ b/installing/commands/src/update/index.ts @@ -1,17 +1,17 @@ +import type { CompletionFunc } from '@pnpm/cli.command' +import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/cli.common-cli-options-help' import { docsUrl, readDepNameCompletions, readProjectManifestOnly, -} from '@pnpm/cli-utils' -import type { CompletionFunc } from '@pnpm/command' -import { FILTERING, OPTIONS, UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help' -import { types as allTypes } from '@pnpm/config' -import type { UpdateMatchingFunction } from '@pnpm/core' +} from '@pnpm/cli.utils' +import { createMatcher } from '@pnpm/config.matcher' +import { types as allTypes } from '@pnpm/config.reader' +import { outdatedDepsOfProjects } from '@pnpm/deps.inspection.outdated' import { PnpmError } from '@pnpm/error' import { handleGlobalUpdate } from '@pnpm/global.commands' +import type { UpdateMatchingFunction } from '@pnpm/installing.deps-installer' import { globalInfo } from '@pnpm/logger' -import { createMatcher } from '@pnpm/matcher' -import { outdatedDepsOfProjects } from '@pnpm/outdated' import type { IncludedDependencies, PackageVulnerabilityAudit, ProjectRootDir } from '@pnpm/types' import chalk from 'chalk' import enquirer from 'enquirer' diff --git a/installing/commands/src/updateWorkspaceDependencies.ts b/installing/commands/src/updateWorkspaceDependencies.ts index b12629ddec..d3f697ef62 100644 --- a/installing/commands/src/updateWorkspaceDependencies.ts +++ b/installing/commands/src/updateWorkspaceDependencies.ts @@ -1,6 +1,6 @@ import { PnpmError } from '@pnpm/error' -import { parseWantedDependency } from '@pnpm/parse-wanted-dependency' -import type { WorkspacePackages } from '@pnpm/resolver-base' +import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency' +import type { WorkspacePackages } from '@pnpm/resolving.resolver-base' import type { IncludedDependencies, ProjectManifest } from '@pnpm/types' export function updateToWorkspacePackagesFromManifest ( diff --git a/installing/commands/test/add.ts b/installing/commands/test/add.ts index ff0b69d1e1..82a34538a0 100644 --- a/installing/commands/test/add.ts +++ b/installing/commands/test/add.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import type { PnpmError } from '@pnpm/error' -import { add, remove } from '@pnpm/plugin-commands-installation' +import { add, remove } from '@pnpm/installing.commands' import { prepare, prepareEmpty, preparePackages } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import type { ProjectManifest } from '@pnpm/types' diff --git a/installing/commands/test/addJsr.ts b/installing/commands/test/addJsr.ts index ad007751b1..d98fa623d5 100644 --- a/installing/commands/test/addJsr.ts +++ b/installing/commands/test/addJsr.ts @@ -1,7 +1,7 @@ import path from 'node:path' +import { add } from '@pnpm/installing.commands' import type { LockfileFile } from '@pnpm/lockfile.types' -import { add } from '@pnpm/plugin-commands-installation' import { prepare } from '@pnpm/prepare' import type { ProjectManifest } from '@pnpm/types' import { loadJsonFileSync } from 'load-json-file' diff --git a/installing/commands/test/addRecursive.ts b/installing/commands/test/addRecursive.ts index c490366326..8b0426bd33 100644 --- a/installing/commands/test/addRecursive.ts +++ b/installing/commands/test/addRecursive.ts @@ -1,10 +1,10 @@ import path from 'node:path' +import { add } from '@pnpm/installing.commands' import type { LockfileObject } from '@pnpm/lockfile.types' -import { add } from '@pnpm/plugin-commands-installation' import { preparePackages } from '@pnpm/prepare' import type { ProjectId } from '@pnpm/types' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { readYamlFileSync } from 'read-yaml-file' import { DEFAULT_OPTS } from './utils/index.js' @@ -21,7 +21,7 @@ test('recursive add --save-dev, --save-peer on workspace with multiple lockfiles }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await add.handler({ ...DEFAULT_OPTS, @@ -111,7 +111,7 @@ test('recursive add --save-dev, --save-peer on workspace with single lockfile', }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await add.handler({ ...DEFAULT_OPTS, diff --git a/installing/commands/test/dedupe.ts b/installing/commands/test/dedupe.ts index ccd3bdb82f..a260ea14c1 100644 --- a/installing/commands/test/dedupe.ts +++ b/installing/commands/test/dedupe.ts @@ -1,13 +1,13 @@ import fs from 'node:fs' import path from 'node:path' -import { DedupeCheckIssuesError } from '@pnpm/dedupe.check' +import { dedupe, install } from '@pnpm/installing.commands' +import { DedupeCheckIssuesError } from '@pnpm/installing.dedupe.check' import type { LockfileObject } from '@pnpm/lockfile.types' -import { dedupe, install } from '@pnpm/plugin-commands-installation' import { prepare } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' import { createTestIpcServer } from '@pnpm/test-ipc-server' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { diff } from 'jest-diff' import { readYamlFileSync } from 'read-yaml-file' @@ -146,7 +146,7 @@ async function testFixture (fixtureName: string) { const project = prepare(undefined) f.copy(fixtureName, project.dir()) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(project.dir(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(project.dir(), []) const opts = { ...DEFAULT_OPTS, diff --git a/installing/commands/test/disallowWorkspaceCycles.test.ts b/installing/commands/test/disallowWorkspaceCycles.test.ts index 08323135be..5ba11590c7 100644 --- a/installing/commands/test/disallowWorkspaceCycles.test.ts +++ b/installing/commands/test/disallowWorkspaceCycles.test.ts @@ -1,7 +1,7 @@ import type { PnpmError } from '@pnpm/error' -import { install } from '@pnpm/plugin-commands-installation' +import { install } from '@pnpm/installing.commands' import { preparePackages } from '@pnpm/prepare' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { DEFAULT_OPTS } from './utils/index.js' @@ -19,7 +19,7 @@ test('should error if disallow-workspace-cycles is set', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) let err!: PnpmError try { @@ -52,7 +52,7 @@ test('should not error if disallow-workspace-cycles is not set', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) let err!: PnpmError try { @@ -83,7 +83,7 @@ test('should not error if there are no cyclic dependencies', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) let err!: PnpmError try { diff --git a/installing/commands/test/fetch.ts b/installing/commands/test/fetch.ts index 586ec4d498..98145d8c2e 100644 --- a/installing/commands/test/fetch.ts +++ b/installing/commands/test/fetch.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import { STORE_VERSION } from '@pnpm/constants' -import { fetch, install } from '@pnpm/plugin-commands-installation' +import { fetch, install } from '@pnpm/installing.commands' import { prepare } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { closeAllStoreIndexes } from '@pnpm/store.index' diff --git a/installing/commands/test/import.ts b/installing/commands/test/import.ts index d798baaea7..cca9cf49cd 100644 --- a/installing/commands/test/import.ts +++ b/installing/commands/test/import.ts @@ -3,7 +3,7 @@ import path from 'node:path' import { assertProject } from '@pnpm/assert-project' import { PnpmError } from '@pnpm/error' -import { importCommand } from '@pnpm/plugin-commands-installation' +import { importCommand } from '@pnpm/installing.commands' import { prepare } from '@pnpm/prepare' import { addDistTag, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' diff --git a/installing/commands/test/importRecursive.ts b/installing/commands/test/importRecursive.ts index 45aaeb5709..7508f5ff03 100644 --- a/installing/commands/test/importRecursive.ts +++ b/installing/commands/test/importRecursive.ts @@ -2,10 +2,10 @@ import path from 'node:path' import { assertProject } from '@pnpm/assert-project' -import { importCommand } from '@pnpm/plugin-commands-installation' +import { importCommand } from '@pnpm/installing.commands' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { temporaryDirectory } from 'tempy' const f = fixtures(import.meta.dirname) @@ -45,7 +45,7 @@ const DEFAULT_OPTS = { test('import from shared yarn.lock of monorepo', async () => { f.prepare('workspace-has-shared-yarn-lock') - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await importCommand.handler({ ...DEFAULT_OPTS, allProjects: allProjects as any, // eslint-disable-line @typescript-eslint/no-explicit-any @@ -69,7 +69,7 @@ test('import from shared yarn.lock of monorepo', async () => { test('import from shared package-lock.json of monorepo', async () => { f.prepare('workspace-has-shared-package-lock-json') - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await importCommand.handler({ ...DEFAULT_OPTS, allProjects: allProjects as any, // eslint-disable-line @typescript-eslint/no-explicit-any @@ -93,7 +93,7 @@ test('import from shared package-lock.json of monorepo', async () => { test('import from shared npm-shrinkwrap.json of monorepo', async () => { f.prepare('workspace-has-shared-npm-shrinkwrap-json') - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await importCommand.handler({ ...DEFAULT_OPTS, allProjects: allProjects as any, // eslint-disable-line @typescript-eslint/no-explicit-any diff --git a/installing/commands/test/install.ts b/installing/commands/test/install.ts index 5f41b6cf3f..6d17cce001 100644 --- a/installing/commands/test/install.ts +++ b/installing/commands/test/install.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import { STORE_VERSION } from '@pnpm/constants' -import { add, install } from '@pnpm/plugin-commands-installation' +import { add, install } from '@pnpm/installing.commands' import { prepare, prepareEmpty } from '@pnpm/prepare' import { rimrafSync } from '@zkochan/rimraf' import delay from 'delay' diff --git a/installing/commands/test/link.ts b/installing/commands/test/link.ts index c9513616b5..ba90a3b61d 100644 --- a/installing/commands/test/link.ts +++ b/installing/commands/test/link.ts @@ -25,7 +25,7 @@ jest.unstable_mockModule('@pnpm/logger', () => { }) const { logger } = await import('@pnpm/logger') -const { install, link } = await import('@pnpm/plugin-commands-installation') +const { install, link } = await import('@pnpm/installing.commands') const f = fixtures(import.meta.dirname) diff --git a/installing/commands/test/miscRecursive.ts b/installing/commands/test/miscRecursive.ts index 1fa53ee1ec..8515a63076 100644 --- a/installing/commands/test/miscRecursive.ts +++ b/installing/commands/test/miscRecursive.ts @@ -2,12 +2,12 @@ import fs from 'node:fs' import path from 'node:path' import type { PnpmError } from '@pnpm/error' +import { add, install, remove, update } from '@pnpm/installing.commands' import type { LockfileFile } from '@pnpm/lockfile.types' -import { add, install, remove, update } from '@pnpm/plugin-commands-installation' import { preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import type { ProjectManifest } from '@pnpm/types' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { loadJsonFile } from 'load-json-file' import { readYamlFileSync } from 'read-yaml-file' import symlinkDir from 'symlink-dir' @@ -36,7 +36,7 @@ test('recursive add/remove', async () => { }, ]) - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -97,7 +97,7 @@ test('recursive add/remove in workspace with many lockfiles', async () => { }, ]) - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -187,7 +187,7 @@ test('recursive install with package that has link', async () => { await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), recursive: true, workspaceDir: process.cwd(), @@ -222,7 +222,7 @@ test('running `pnpm recursive` on a subset of packages', async () => { await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), recursive: true, workspaceDir: process.cwd(), @@ -274,7 +274,7 @@ test('running `pnpm recursive` only for packages in subdirectories of cwd', asyn await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), recursive: true, workspaceDir: process.cwd(), @@ -309,7 +309,7 @@ test('recursive installation fails when installation in one of the packages fail try { await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), recursive: true, workspaceDir: process.cwd(), @@ -336,7 +336,7 @@ test('second run of `recursive install` after package.json has been edited manua }, ]) - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -407,7 +407,7 @@ test('recursive --filter ignore excluded packages', async () => { await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [ + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [ { includeDependencies: true, namePattern: 'project-1' }, ]), dir: process.cwd(), @@ -451,7 +451,7 @@ test('recursive filter multiple times', async () => { await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), [ + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [ { namePattern: 'project-1' }, { namePattern: 'project-2' }, ]), @@ -489,7 +489,7 @@ test('recursive install --no-bail', async () => { try { await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), bail: false, dir: process.cwd(), recursive: true, @@ -522,7 +522,7 @@ test('installing with "workspace=true" should work even if link-workspace-packag await update.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), linkWorkspacePackages: false, lockfileDir: process.cwd(), @@ -563,7 +563,7 @@ test('installing with "workspace=true" should work even if link-workspace-packag await update.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), linkWorkspacePackages: false, lockfileDir: process.cwd(), @@ -607,7 +607,7 @@ test('recursive install on workspace with custom lockfile-dir', async () => { ]) const lockfileDir = path.resolve('_') - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -643,7 +643,7 @@ test('recursive install in a monorepo with different modules directories specifi }, ]) - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -682,7 +682,7 @@ test('recursive install in a monorepo with different modules directories specifi }, ]) - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -727,7 +727,7 @@ test('prefer-workspace-package', async () => { await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), linkWorkspacePackages: true, preferWorkspacePackages: true, @@ -755,7 +755,7 @@ test('installing in monorepo with shared lockfile should work on virtual drives' const virtualPath = process.cwd() + '-virtual-disk' // symlink simulates windows' subst await symlinkDir(process.cwd(), virtualPath) - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(virtualPath, []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(virtualPath, []) await install.handler({ ...DEFAULT_OPTS, lockfileDir: virtualPath, diff --git a/installing/commands/test/patchedDependencies.ts b/installing/commands/test/patchedDependencies.ts index ba11687560..01137679b5 100644 --- a/installing/commands/test/patchedDependencies.ts +++ b/installing/commands/test/patchedDependencies.ts @@ -17,7 +17,7 @@ jest.unstable_mockModule('@pnpm/logger', () => { }) const { globalWarn } = await import('@pnpm/logger') -const { add, install } = await import('@pnpm/plugin-commands-installation') +const { add, install } = await import('@pnpm/installing.commands') beforeEach(() => { jest.mocked(globalWarn).mockClear() diff --git a/installing/commands/test/peerDependencies.ts b/installing/commands/test/peerDependencies.ts index 9faa22f06c..ed9ad7b31a 100644 --- a/installing/commands/test/peerDependencies.ts +++ b/installing/commands/test/peerDependencies.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { add, install } from '@pnpm/plugin-commands-installation' +import { add, install } from '@pnpm/installing.commands' import { prepare } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { temporaryDirectory } from 'tempy' diff --git a/installing/commands/test/prune.ts b/installing/commands/test/prune.ts index a0ff45d62b..21d2ad3fa7 100644 --- a/installing/commands/test/prune.ts +++ b/installing/commands/test/prune.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import { add, install, prune } from '@pnpm/plugin-commands-installation' +import { add, install, prune } from '@pnpm/installing.commands' import { prepare } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' diff --git a/installing/commands/test/remove/completion.ts b/installing/commands/test/remove/completion.ts index 9b69c3a83b..6cc287bdb7 100644 --- a/installing/commands/test/remove/completion.ts +++ b/installing/commands/test/remove/completion.ts @@ -1,4 +1,4 @@ -import { remove } from '@pnpm/plugin-commands-installation' +import { remove } from '@pnpm/installing.commands' import { prepare } from '@pnpm/prepare' test('remove arg completions', async () => { diff --git a/installing/commands/test/remove/remove.ts b/installing/commands/test/remove/remove.ts index 04caca4082..eae973aef7 100644 --- a/installing/commands/test/remove/remove.ts +++ b/installing/commands/test/remove/remove.ts @@ -1,5 +1,5 @@ import type { PnpmError } from '@pnpm/error' -import { remove } from '@pnpm/plugin-commands-installation' +import { remove } from '@pnpm/installing.commands' import { prepare } from '@pnpm/prepare' import { DEFAULT_OPTS } from '../utils/index.js' diff --git a/installing/commands/test/remove/workspace.ts b/installing/commands/test/remove/workspace.ts index 130dfa76e7..2c1c92bde5 100644 --- a/installing/commands/test/remove/workspace.ts +++ b/installing/commands/test/remove/workspace.ts @@ -1,9 +1,9 @@ import path from 'node:path' +import { install, remove } from '@pnpm/installing.commands' import type { LockfileFile } from '@pnpm/lockfile.types' -import { install, remove } from '@pnpm/plugin-commands-installation' import { preparePackages } from '@pnpm/prepare' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { readYamlFileSync } from 'read-yaml-file' import { DEFAULT_OPTS } from '../utils/index.js' @@ -40,14 +40,14 @@ test('remove --filter only changes the specified dependency, when run with link- await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), ...sharedOpts, }) await remove.handler({ ...DEFAULT_OPTS, // Only remove is-negative from project-2 - ...await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-2' }]), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-2' }]), ...sharedOpts, }, ['is-negative']) @@ -117,7 +117,7 @@ test('remove from within a workspace package dir only affects the specified depe await install.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), ...sharedOpts, recursive: true, }) diff --git a/installing/commands/test/saveCatalog.ts b/installing/commands/test/saveCatalog.ts index 18c0cf84d3..e4cf642c90 100644 --- a/installing/commands/test/saveCatalog.ts +++ b/installing/commands/test/saveCatalog.ts @@ -1,8 +1,8 @@ import fs from 'node:fs' import path from 'node:path' +import { add } from '@pnpm/installing.commands' import type { LockfileFile } from '@pnpm/lockfile.types' -import { add } from '@pnpm/plugin-commands-installation' import { prepare, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import { loadJsonFileSync } from 'load-json-file' @@ -77,7 +77,7 @@ test('saveCatalogName works with different protocols', async () => { version: '0.0.0', private: true, }) - // Mock the HEAD request that isRepoPublic() in @pnpm/git-resolver makes. + // Mock the HEAD request that isRepoPublic() in @pnpm/resolving.git-resolver makes. // Without this, transient network failures cause fallback to git+https:// resolution. const githubNock = nock('https://github.com', { allowUnmocked: true }) .head('/kevva/is-positive') diff --git a/installing/commands/test/update/interactive.ts b/installing/commands/test/update/interactive.ts index 0efa99f49b..d3c79963c1 100644 --- a/installing/commands/test/update/interactive.ts +++ b/installing/commands/test/update/interactive.ts @@ -4,13 +4,13 @@ import { jest } from '@jest/globals' import type { LockfileObject } from '@pnpm/lockfile.types' import { prepare, preparePackages } from '@pnpm/prepare' import { addDistTag, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import chalk from 'chalk' import { readYamlFileSync } from 'read-yaml-file' jest.unstable_mockModule('enquirer', () => ({ default: { prompt: jest.fn() } })) const { default: enquirer } = await import('enquirer') -const { add, install, update } = await import('@pnpm/plugin-commands-installation') +const { add, install, update } = await import('@pnpm/installing.commands') const prompt = jest.mocked(enquirer.prompt) @@ -233,7 +233,7 @@ test('interactive update of dev dependencies only', async () => { ], }) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir( + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir( process.cwd(), [] ) diff --git a/installing/commands/test/update/issue-7415.ts b/installing/commands/test/update/issue-7415.ts index 140c6cdeea..89ac8b9229 100644 --- a/installing/commands/test/update/issue-7415.ts +++ b/installing/commands/test/update/issue-7415.ts @@ -3,12 +3,12 @@ import path from 'node:path' import { jest } from '@jest/globals' import { preparePackages } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' jest.unstable_mockModule('enquirer', () => ({ default: { prompt: jest.fn() } })) const { default: enquirer } = await import('enquirer') -const { update, install } = await import('@pnpm/plugin-commands-installation') +const { update, install } = await import('@pnpm/installing.commands') const prompt = jest.mocked(enquirer.prompt) @@ -71,7 +71,7 @@ test('interactive recursive should not error on git specifier override', async ( updateDependencies: [], }) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) const sharedOptions = { ...DEFAULT_OPTIONS, allProjects, diff --git a/installing/commands/test/update/jsr.ts b/installing/commands/test/update/jsr.ts index 482485d27a..3cda2b203b 100644 --- a/installing/commands/test/update/jsr.ts +++ b/installing/commands/test/update/jsr.ts @@ -1,7 +1,7 @@ import path from 'node:path' +import { install, update } from '@pnpm/installing.commands' import type { LockfileFile } from '@pnpm/lockfile.types' -import { install, update } from '@pnpm/plugin-commands-installation' import { prepare } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import type { ProjectManifest } from '@pnpm/types' diff --git a/installing/commands/test/update/recursive.ts b/installing/commands/test/update/recursive.ts index 2397cedf61..1f291a26b7 100644 --- a/installing/commands/test/update/recursive.ts +++ b/installing/commands/test/update/recursive.ts @@ -1,11 +1,11 @@ import type { PnpmError } from '@pnpm/error' +import { install, update } from '@pnpm/installing.commands' +import { readModulesManifest } from '@pnpm/installing.modules-yaml' import type { LockfileObject } from '@pnpm/lockfile.types' -import { readModulesManifest } from '@pnpm/modules-yaml' -import { install, update } from '@pnpm/plugin-commands-installation' import { preparePackages } from '@pnpm/prepare' -import { readProjectManifestOnly } from '@pnpm/read-project-manifest' import { addDistTag } from '@pnpm/registry-mock' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { readProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { readYamlFileSync } from 'read-yaml-file' import { DEFAULT_OPTS } from '../utils/index.js' @@ -30,7 +30,7 @@ test('recursive update', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -76,7 +76,7 @@ test('recursive update prod dependencies only', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -145,7 +145,7 @@ test('recursive update with pattern', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -203,7 +203,7 @@ test('recursive update with pattern and name in project', async () => { const lockfileDir = process.cwd() - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -290,7 +290,7 @@ test('recursive update --latest foo should only update projects that have foo', const lockfileDir = process.cwd() - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -350,7 +350,7 @@ test('recursive update --latest foo should only update packages that have foo', }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -402,7 +402,7 @@ test('recursive update in workspace should not add new dependencies', async () = try { await update.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), depth: 0, dir: process.cwd(), recursive: true, @@ -435,7 +435,7 @@ test('recursive update with aliased workspace dependency (#7975)', async () => { await update.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), depth: 0, dir: process.cwd(), recursive: true, diff --git a/installing/commands/test/update/update.ts b/installing/commands/test/update/update.ts index cf5fc28816..73806588cd 100644 --- a/installing/commands/test/update/update.ts +++ b/installing/commands/test/update/update.ts @@ -1,7 +1,7 @@ import path from 'node:path' import type { PnpmError } from '@pnpm/error' -import { install, update } from '@pnpm/plugin-commands-installation' +import { install, update } from '@pnpm/installing.commands' import { prepare, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import type { ProjectManifest } from '@pnpm/types' diff --git a/installing/commands/test/warnCyclicDependencies.ts b/installing/commands/test/warnCyclicDependencies.ts index a57c1ff8c1..852b899cd7 100644 --- a/installing/commands/test/warnCyclicDependencies.ts +++ b/installing/commands/test/warnCyclicDependencies.ts @@ -1,6 +1,6 @@ import { jest } from '@jest/globals' import { preparePackages } from '@pnpm/prepare' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { DEFAULT_OPTS } from './utils/index.js' @@ -12,7 +12,7 @@ jest.unstable_mockModule('@pnpm/logger', () => ({ ...original, logger: Object.assign(() => ({ warn, info, debug }), { warn, info, debug }), })) -const { install } = await import('@pnpm/plugin-commands-installation') +const { install } = await import('@pnpm/installing.commands') afterEach(() => { jest.mocked(warn).mockRestore() @@ -32,7 +32,7 @@ test('should warn about cyclic dependencies', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -63,7 +63,7 @@ test('should not warn about cyclic dependencies if ignore-workspace-cycles is se }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, @@ -90,7 +90,7 @@ test('should not warn about cyclic dependencies if there are not', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, allProjects, diff --git a/installing/commands/tsconfig.json b/installing/commands/tsconfig.json index 0e9eb91ae9..4e2ea60eca 100644 --- a/installing/commands/tsconfig.json +++ b/installing/commands/tsconfig.json @@ -30,9 +30,6 @@ { "path": "../../catalogs/types" }, - { - "path": "../../cli/cli-utils" - }, { "path": "../../cli/command" }, @@ -40,10 +37,7 @@ "path": "../../cli/common-cli-options-help" }, { - "path": "../../config/config" - }, - { - "path": "../../config/config-writer" + "path": "../../cli/utils" }, { "path": "../../config/deps-installer" @@ -54,6 +48,12 @@ { "path": "../../config/pick-registry-for-package" }, + { + "path": "../../config/reader" + }, + { + "path": "../../config/writer" + }, { "path": "../../deps/inspection/outdated" }, @@ -87,17 +87,11 @@ { "path": "../../packages/types" }, - { - "path": "../../pkg-manifest/manifest-utils" - }, { "path": "../../pkg-manifest/read-package-json" }, { - "path": "../../pkg-manifest/read-project-manifest" - }, - { - "path": "../../pkg-manifest/write-project-manifest" + "path": "../../pkg-manifest/utils" }, { "path": "../../resolving/parse-wanted-dependency" @@ -105,51 +99,54 @@ { "path": "../../resolving/resolver-base" }, + { + "path": "../../store/connection-manager" + }, + { + "path": "../../store/controller" + }, { "path": "../../store/index" }, - { - "path": "../../store/package-store" - }, - { - "path": "../../store/store-connection-manager" - }, { "path": "../../worker" }, - { - "path": "../../workspace/filter-packages-from-dir" - }, - { - "path": "../../workspace/filter-workspace-packages" - }, - { - "path": "../../workspace/find-packages" - }, - { - "path": "../../workspace/find-workspace-dir" - }, - { - "path": "../../workspace/manifest-writer" - }, { "path": "../../workspace/pkgs-graph" }, + { + "path": "../../workspace/project-manifest-reader" + }, + { + "path": "../../workspace/project-manifest-writer" + }, + { + "path": "../../workspace/projects-filter" + }, + { + "path": "../../workspace/projects-reader" + }, + { + "path": "../../workspace/root-finder" + }, { "path": "../../workspace/sort-packages" }, { "path": "../../workspace/state" }, + { + "path": "../../workspace/workspace-manifest-writer" + }, + { + "path": "../context" + }, { "path": "../dedupe/check" }, { "path": "../deps-installer" }, - { - "path": "../get-context" - }, { "path": "../modules-yaml" } diff --git a/installing/get-context/CHANGELOG.md b/installing/context/CHANGELOG.md similarity index 100% rename from installing/get-context/CHANGELOG.md rename to installing/context/CHANGELOG.md diff --git a/installing/get-context/README.md b/installing/context/README.md similarity index 100% rename from installing/get-context/README.md rename to installing/context/README.md diff --git a/installing/get-context/package.json b/installing/context/package.json similarity index 80% rename from installing/get-context/package.json rename to installing/context/package.json index 81c41686b6..2f2fee3a96 100644 --- a/installing/get-context/package.json +++ b/installing/context/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/get-context", + "name": "@pnpm/installing.context", "version": "1001.1.8", "description": "Gets context information about a project", "keywords": [ @@ -9,8 +9,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/installing/get-context", - "homepage": "https://github.com/pnpm/pnpm/tree/main/installing/get-context#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/installing/context", + "homepage": "https://github.com/pnpm/pnpm/tree/main/installing/context#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -34,11 +34,11 @@ "dependencies": { "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", + "@pnpm/installing.read-projects-context": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/package-store": "workspace:*", - "@pnpm/read-projects-context": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", + "@pnpm/store.controller": "workspace:*", "@pnpm/types": "workspace:*", "path-absolute": "catalog:", "ramda": "catalog:" @@ -47,7 +47,7 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/get-context": "workspace:*", + "@pnpm/installing.context": "workspace:*", "@pnpm/logger": "workspace:*", "@types/ramda": "catalog:" }, diff --git a/installing/get-context/src/index.ts b/installing/context/src/index.ts similarity index 98% rename from installing/get-context/src/index.ts rename to installing/context/src/index.ts index bb452c4114..354c6ce259 100644 --- a/installing/get-context/src/index.ts +++ b/installing/context/src/index.ts @@ -2,14 +2,14 @@ import { promises as fs } from 'node:fs' import path from 'node:path' import { contextLogger, packageManifestLogger } from '@pnpm/core-loggers' -import type { LockfileObject } from '@pnpm/lockfile.fs' import type { IncludedDependencies, Modules, -} from '@pnpm/modules-yaml' -import { registerProject } from '@pnpm/package-store' -import { readProjectsContext } from '@pnpm/read-projects-context' -import type { WorkspacePackages } from '@pnpm/resolver-base' +} from '@pnpm/installing.modules-yaml' +import { readProjectsContext } from '@pnpm/installing.read-projects-context' +import type { LockfileObject } from '@pnpm/lockfile.fs' +import type { WorkspacePackages } from '@pnpm/resolving.resolver-base' +import { registerProject } from '@pnpm/store.controller' import type { DependencyManifest, DepPath, diff --git a/installing/get-context/src/readLockfiles.ts b/installing/context/src/readLockfiles.ts similarity index 100% rename from installing/get-context/src/readLockfiles.ts rename to installing/context/src/readLockfiles.ts diff --git a/installing/get-context/test/index.ts b/installing/context/test/index.ts similarity index 99% rename from installing/get-context/test/index.ts rename to installing/context/test/index.ts index eaec0dba67..9d8e6a0586 100644 --- a/installing/get-context/test/index.ts +++ b/installing/context/test/index.ts @@ -3,7 +3,7 @@ import { promises as fs } from 'node:fs' import os from 'node:os' import path from 'node:path' -import { arrayOfWorkspacePackagesToMap, getContext } from '@pnpm/get-context' +import { arrayOfWorkspacePackagesToMap, getContext } from '@pnpm/installing.context' import type { ProjectId, ProjectRootDir } from '@pnpm/types' import type { GetContextOptions } from '../src/index.js' diff --git a/installing/get-context/test/tsconfig.json b/installing/context/test/tsconfig.json similarity index 100% rename from installing/get-context/test/tsconfig.json rename to installing/context/test/tsconfig.json diff --git a/installing/get-context/tsconfig.json b/installing/context/tsconfig.json similarity index 93% rename from installing/get-context/tsconfig.json rename to installing/context/tsconfig.json index c4a345013c..11b9f8a2d4 100644 --- a/installing/get-context/tsconfig.json +++ b/installing/context/tsconfig.json @@ -28,7 +28,7 @@ "path": "../../resolving/resolver-base" }, { - "path": "../../store/package-store" + "path": "../../store/controller" }, { "path": "../modules-yaml" diff --git a/installing/get-context/tsconfig.lint.json b/installing/context/tsconfig.lint.json similarity index 100% rename from installing/get-context/tsconfig.lint.json rename to installing/context/tsconfig.lint.json diff --git a/installing/dedupe/check/package.json b/installing/dedupe/check/package.json index e375ea3131..57cb319d79 100644 --- a/installing/dedupe/check/package.json +++ b/installing/dedupe/check/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/dedupe.check", + "name": "@pnpm/installing.dedupe.check", "version": "1001.0.13", "description": "Visualize pnpm dedupe --check issues.", "keywords": [ @@ -31,13 +31,13 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/dedupe.types": "workspace:*", "@pnpm/error": "workspace:*", + "@pnpm/installing.dedupe.types": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*" }, "devDependencies": { - "@pnpm/dedupe.check": "workspace:*" + "@pnpm/installing.dedupe.check": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/installing/dedupe/check/src/DedupeCheckIssuesError.ts b/installing/dedupe/check/src/DedupeCheckIssuesError.ts index 0d265f08c8..bbe1cd4415 100644 --- a/installing/dedupe/check/src/DedupeCheckIssuesError.ts +++ b/installing/dedupe/check/src/DedupeCheckIssuesError.ts @@ -1,5 +1,5 @@ -import type { DedupeCheckIssues } from '@pnpm/dedupe.types' import { PnpmError } from '@pnpm/error' +import type { DedupeCheckIssues } from '@pnpm/installing.dedupe.types' export class DedupeCheckIssuesError extends PnpmError { public dedupeCheckIssues: DedupeCheckIssues diff --git a/installing/dedupe/check/src/dedupeDiffCheck.ts b/installing/dedupe/check/src/dedupeDiffCheck.ts index f9ddb25d27..bc648ce11b 100644 --- a/installing/dedupe/check/src/dedupeDiffCheck.ts +++ b/installing/dedupe/check/src/dedupeDiffCheck.ts @@ -2,7 +2,7 @@ import type { DedupeCheckIssues, ResolutionChangesByAlias, SnapshotsChanges, -} from '@pnpm/dedupe.types' +} from '@pnpm/installing.dedupe.types' import type { LockfileObject, ResolvedDependencies } from '@pnpm/lockfile.types' import { DEPENDENCIES_FIELDS, type DepPath } from '@pnpm/types' diff --git a/installing/dedupe/check/test/dedupeDiffCheck.ts b/installing/dedupe/check/test/dedupeDiffCheck.ts index 44dfd84adb..82e25f0591 100644 --- a/installing/dedupe/check/test/dedupeDiffCheck.ts +++ b/installing/dedupe/check/test/dedupeDiffCheck.ts @@ -1,4 +1,4 @@ -import { DedupeCheckIssuesError, dedupeDiffCheck } from '@pnpm/dedupe.check' +import { DedupeCheckIssuesError, dedupeDiffCheck } from '@pnpm/installing.dedupe.check' import type { LockfileObject } from '@pnpm/lockfile.types' import type { DepPath, ProjectId } from '@pnpm/types' diff --git a/installing/dedupe/issues-renderer/package.json b/installing/dedupe/issues-renderer/package.json index 85be1c3cf2..79cf4636e2 100644 --- a/installing/dedupe/issues-renderer/package.json +++ b/installing/dedupe/issues-renderer/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/dedupe.issues-renderer", + "name": "@pnpm/installing.dedupe.issues-renderer", "version": "1000.0.1", "description": "Visualize pnpm dedupe --check issues.", "keywords": [ @@ -31,12 +31,12 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/dedupe.types": "workspace:*", + "@pnpm/installing.dedupe.types": "workspace:*", "@pnpm/text.tree-renderer": "workspace:*", "chalk": "catalog:" }, "devDependencies": { - "@pnpm/dedupe.issues-renderer": "workspace:*" + "@pnpm/installing.dedupe.issues-renderer": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/installing/dedupe/issues-renderer/src/index.ts b/installing/dedupe/issues-renderer/src/index.ts index 36f3070f7c..8eb59b8b9c 100644 --- a/installing/dedupe/issues-renderer/src/index.ts +++ b/installing/dedupe/issues-renderer/src/index.ts @@ -3,7 +3,7 @@ import type { ResolutionChange, ResolutionChangesByAlias, SnapshotsChanges, -} from '@pnpm/dedupe.types' +} from '@pnpm/installing.dedupe.types' import { renderTree, type TreeNode } from '@pnpm/text.tree-renderer' import chalk from 'chalk' diff --git a/installing/dedupe/issues-renderer/test/index.ts b/installing/dedupe/issues-renderer/test/index.ts index 23d65ed760..c0c0bdeb8f 100644 --- a/installing/dedupe/issues-renderer/test/index.ts +++ b/installing/dedupe/issues-renderer/test/index.ts @@ -1,6 +1,6 @@ import { stripVTControlCharacters as stripAnsi } from 'node:util' -import { renderDedupeCheckIssues } from '@pnpm/dedupe.issues-renderer' +import { renderDedupeCheckIssues } from '@pnpm/installing.dedupe.issues-renderer' describe('renderDedupeCheckIssues', () => { test('prints removed packages and updated resolutions', () => { diff --git a/installing/dedupe/types/package.json b/installing/dedupe/types/package.json index de85f61be4..6c22d5ccc1 100644 --- a/installing/dedupe/types/package.json +++ b/installing/dedupe/types/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/dedupe.types", + "name": "@pnpm/installing.dedupe.types", "version": "1000.0.0", "description": "Types for the pnpm dedupe command", "keywords": [ @@ -30,7 +30,7 @@ "lint": "eslint \"src/**/*.ts\"" }, "devDependencies": { - "@pnpm/dedupe.types": "workspace:*" + "@pnpm/installing.dedupe.types": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/installing/deps-installer/package.json b/installing/deps-installer/package.json index f4ab1c0564..57bf42d6df 100644 --- a/installing/deps-installer/package.json +++ b/installing/deps-installer/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/core", + "name": "@pnpm/installing.deps-installer", "version": "1012.0.1", "description": "Fast, disk space efficient installation engine", "keywords": [ @@ -56,56 +56,56 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/bins.linker": "workspace:*", + "@pnpm/bins.remover": "workspace:*", "@pnpm/building.after-install": "workspace:*", "@pnpm/building.during-install": "workspace:*", "@pnpm/building.policy": "workspace:*", - "@pnpm/calc-dep-state": "workspace:*", "@pnpm/catalogs.protocol-parser": "workspace:*", "@pnpm/catalogs.resolver": "workspace:*", "@pnpm/catalogs.types": "workspace:*", + "@pnpm/config.matcher": "workspace:*", + "@pnpm/config.normalize-registries": "workspace:*", + "@pnpm/config.parse-overrides": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", "@pnpm/crypto.hash": "workspace:*", "@pnpm/crypto.object-hasher": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.graph-hasher": "workspace:*", "@pnpm/deps.graph-sequencer": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/get-context": "workspace:*", - "@pnpm/headless": "workspace:*", - "@pnpm/hoist": "workspace:*", + "@pnpm/exec.lifecycle": "workspace:*", + "@pnpm/fs.read-modules-dir": "workspace:*", + "@pnpm/fs.symlink-dependency": "workspace:*", "@pnpm/hooks.read-package-hook": "workspace:*", "@pnpm/hooks.types": "workspace:*", - "@pnpm/lifecycle": "workspace:*", - "@pnpm/link-bins": "workspace:*", - "@pnpm/lockfile-to-pnp": "workspace:*", + "@pnpm/installing.context": "workspace:*", + "@pnpm/installing.deps-restorer": "workspace:*", + "@pnpm/installing.linking.direct-dep-linker": "workspace:*", + "@pnpm/installing.linking.hoist": "workspace:*", + "@pnpm/installing.linking.modules-cleaner": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", + "@pnpm/installing.package-requester": "workspace:*", + "@pnpm/installing.resolve-dependencies": "workspace:*", "@pnpm/lockfile.filtering": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.preferred-versions": "workspace:*", "@pnpm/lockfile.pruner": "workspace:*", "@pnpm/lockfile.settings-checker": "workspace:*", + "@pnpm/lockfile.to-pnp": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.verification": "workspace:*", "@pnpm/lockfile.walker": "workspace:*", - "@pnpm/manifest-utils": "workspace:*", - "@pnpm/matcher": "workspace:*", - "@pnpm/modules-cleaner": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/normalize-registries": "workspace:*", "@pnpm/npm-package-arg": "catalog:", - "@pnpm/package-requester": "workspace:*", - "@pnpm/parse-overrides": "workspace:*", - "@pnpm/parse-wanted-dependency": "workspace:*", "@pnpm/patching.config": "workspace:*", - "@pnpm/pkg-manager.direct-dep-linker": "workspace:*", - "@pnpm/read-modules-dir": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/remove-bins": "workspace:*", - "@pnpm/resolve-dependencies": "workspace:*", - "@pnpm/resolver-base": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", - "@pnpm/symlink-dependency": "workspace:*", + "@pnpm/pkg-manifest.utils": "workspace:*", + "@pnpm/resolving.parse-wanted-dependency": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "@zkochan/rimraf": "catalog:", "enquirer": "catalog:", "is-inner-link": "catalog:", @@ -127,17 +127,17 @@ "@jest/globals": "catalog:", "@pnpm/assert-project": "workspace:*", "@pnpm/assert-store": "workspace:*", - "@pnpm/core": "workspace:*", "@pnpm/fs.msgpack-file": "workspace:*", - "@pnpm/git-utils": "workspace:*", + "@pnpm/installing.deps-installer": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/logger": "workspace:*", + "@pnpm/network.git-utils": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/prepare": "workspace:*", - "@pnpm/read-package-json": "workspace:*", "@pnpm/registry-mock": "catalog:", - "@pnpm/store-path": "workspace:*", "@pnpm/store.cafs": "workspace:*", "@pnpm/store.index": "workspace:*", + "@pnpm/store.path": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@pnpm/test-ipc-server": "workspace:*", "@pnpm/testing.temp-store": "workspace:*", diff --git a/installing/deps-installer/src/getPeerDependencyIssues.ts b/installing/deps-installer/src/getPeerDependencyIssues.ts index 398deef393..093124510d 100644 --- a/installing/deps-installer/src/getPeerDependencyIssues.ts +++ b/installing/deps-installer/src/getPeerDependencyIssues.ts @@ -1,9 +1,9 @@ -import { getContext, type GetContextOptions, type ProjectOptions } from '@pnpm/get-context' +import { DEFAULT_REGISTRIES } from '@pnpm/config.normalize-registries' +import { parseOverrides } from '@pnpm/config.parse-overrides' import { createReadPackageHook } from '@pnpm/hooks.read-package-hook' +import { getContext, type GetContextOptions, type ProjectOptions } from '@pnpm/installing.context' +import { getWantedDependencies, resolveDependencies } from '@pnpm/installing.resolve-dependencies' import { getPreferredVersionsFromLockfileAndManifests } from '@pnpm/lockfile.preferred-versions' -import { DEFAULT_REGISTRIES } from '@pnpm/normalize-registries' -import { parseOverrides } from '@pnpm/parse-overrides' -import { getWantedDependencies, resolveDependencies } from '@pnpm/resolve-dependencies' import type { PeerDependencyIssuesByProjects } from '@pnpm/types' import type { InstallOptions } from './install/extendInstallOptions.js' diff --git a/installing/deps-installer/src/index.ts b/installing/deps-installer/src/index.ts index c1732dab80..cdfd2fd088 100644 --- a/installing/deps-installer/src/index.ts +++ b/installing/deps-installer/src/index.ts @@ -2,10 +2,10 @@ export * from './api.js' export { UnexpectedStoreError } from './install/checkCompatibility/UnexpectedStoreError.js' export { UnexpectedVirtualStoreDirError } from './install/checkCompatibility/UnexpectedVirtualStoreDirError.js' export type { InstallOptions } from './install/extendInstallOptions.js' -export { type ProjectOptions } from '@pnpm/get-context' -export type { HoistingLimits } from '@pnpm/headless' -export type { UpdateMatchingFunction } from '@pnpm/resolve-dependencies' -export type { WorkspacePackages } from '@pnpm/resolver-base' +export { type ProjectOptions } from '@pnpm/installing.context' +export type { HoistingLimits } from '@pnpm/installing.deps-restorer' +export type { UpdateMatchingFunction } from '@pnpm/installing.resolve-dependencies' +export type { WorkspacePackages } from '@pnpm/resolving.resolver-base' export type { BadPeerDependencyIssue, MissingPeerDependencyIssue, diff --git a/installing/deps-installer/src/install/checkCompatibility/index.ts b/installing/deps-installer/src/install/checkCompatibility/index.ts index d9491129ed..5735abfaf9 100644 --- a/installing/deps-installer/src/install/checkCompatibility/index.ts +++ b/installing/deps-installer/src/install/checkCompatibility/index.ts @@ -1,7 +1,7 @@ import path from 'node:path' import { LAYOUT_VERSION } from '@pnpm/constants' -import type { Modules } from '@pnpm/modules-yaml' +import type { Modules } from '@pnpm/installing.modules-yaml' import { ModulesBreakingChangeError } from './ModulesBreakingChangeError.js' import { UnexpectedStoreError } from './UnexpectedStoreError.js' diff --git a/installing/deps-installer/src/install/extendInstallOptions.ts b/installing/deps-installer/src/install/extendInstallOptions.ts index f9bde57401..c385410b5d 100644 --- a/installing/deps-installer/src/install/extendInstallOptions.ts +++ b/installing/deps-installer/src/install/extendInstallOptions.ts @@ -1,18 +1,18 @@ import path from 'node:path' import type { Catalogs } from '@pnpm/catalogs.types' +import { DEFAULT_REGISTRIES, normalizeRegistries } from '@pnpm/config.normalize-registries' +import { parseOverrides, type VersionOverride } from '@pnpm/config.parse-overrides' import { WANTED_LOCKFILE } from '@pnpm/constants' import { PnpmError } from '@pnpm/error' -import type { ProjectOptions } from '@pnpm/get-context' -import type { HoistingLimits } from '@pnpm/headless' import { createReadPackageHook } from '@pnpm/hooks.read-package-hook' import type { CustomFetcher, CustomResolver, PreResolutionHookContext } from '@pnpm/hooks.types' +import type { ProjectOptions } from '@pnpm/installing.context' +import type { HoistingLimits } from '@pnpm/installing.deps-restorer' +import type { IncludedDependencies } from '@pnpm/installing.modules-yaml' import type { LockfileObject } from '@pnpm/lockfile.fs' -import type { IncludedDependencies } from '@pnpm/modules-yaml' -import { DEFAULT_REGISTRIES, normalizeRegistries } from '@pnpm/normalize-registries' -import { parseOverrides, type VersionOverride } from '@pnpm/parse-overrides' -import type { WorkspacePackages } from '@pnpm/resolver-base' -import type { StoreController } from '@pnpm/store-controller-types' +import type { WorkspacePackages } from '@pnpm/resolving.resolver-base' +import type { StoreController } from '@pnpm/store.controller-types' import type { AllowedDeprecatedVersions, PackageExtension, diff --git a/installing/deps-installer/src/install/index.ts b/installing/deps-installer/src/install/index.ts index b6f6a12e99..fac376fc50 100644 --- a/installing/deps-installer/src/install/index.ts +++ b/installing/deps-installer/src/install/index.ts @@ -1,5 +1,6 @@ import path from 'node:path' +import { linkBins, linkBinsOfPackages } from '@pnpm/bins.linker' import { buildSelectedPkgs } from '@pnpm/building.after-install' import { buildModules, type DepsStateCache, linkBinsOfDependencies } from '@pnpm/building.during-install' import { createAllowBuildFunction } from '@pnpm/building.policy' @@ -18,17 +19,26 @@ import { summaryLogger, } from '@pnpm/core-loggers' import { hashObjectNullableWithPrefix } from '@pnpm/crypto.object-hasher' -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import { PnpmError } from '@pnpm/error' -import { getContext, type PnpmContext } from '@pnpm/get-context' -import { extendProjectsWithTargetDirs, headlessInstall, type InstallationResultStats } from '@pnpm/headless' import { makeNodeRequireOption, runLifecycleHook, runLifecycleHooksConcurrently, type RunLifecycleHooksConcurrentlyOptions, -} from '@pnpm/lifecycle' -import { linkBins, linkBinsOfPackages } from '@pnpm/link-bins' +} from '@pnpm/exec.lifecycle' +import { getContext, type PnpmContext } from '@pnpm/installing.context' +import { extendProjectsWithTargetDirs, headlessInstall, type InstallationResultStats } from '@pnpm/installing.deps-restorer' +import { writeModulesManifest } from '@pnpm/installing.modules-yaml' +import { + type DependenciesGraph, + type DependenciesGraphNode, + getWantedDependencies, + type PinnedVersion, + resolveDependencies, + type UpdateMatchingFunction, + type WantedDependency, +} from '@pnpm/installing.resolve-dependencies' import { type CatalogSnapshots, cleanGitBranchLockfiles, @@ -44,25 +54,14 @@ import { createOverridesMapFromParsed, getOutdatedLockfileSetting, } from '@pnpm/lockfile.settings-checker' +import { writePnpFile } from '@pnpm/lockfile.to-pnp' import { allProjectsAreUpToDate, satisfiesPackageManifest } from '@pnpm/lockfile.verification' -import { writePnpFile } from '@pnpm/lockfile-to-pnp' import { globalInfo, logger, streamParser } from '@pnpm/logger' -import { getAllDependenciesFromManifest, getAllUniqueSpecs } from '@pnpm/manifest-utils' -import { writeModulesManifest } from '@pnpm/modules-yaml' import { groupPatchedDependencies, type PatchGroupRecord } from '@pnpm/patching.config' -import { safeReadProjectManifestOnly } from '@pnpm/read-project-manifest' -import { - type DependenciesGraph, - type DependenciesGraphNode, - getWantedDependencies, - type PinnedVersion, - resolveDependencies, - type UpdateMatchingFunction, - type WantedDependency, -} from '@pnpm/resolve-dependencies' +import { getAllDependenciesFromManifest, getAllUniqueSpecs } from '@pnpm/pkg-manifest.utils' import type { PreferredVersions, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' import type { AllowBuild, DependenciesField, @@ -76,6 +75,7 @@ import type { ReadPackageHook, } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' +import { safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' import { isSubdir } from 'is-subdir' import pLimit from 'p-limit' import { clone, isEmpty, map as mapValues, pipeWith, props } from 'ramda' diff --git a/installing/deps-installer/src/install/link.ts b/installing/deps-installer/src/install/link.ts index 53917bd737..57e7c66cd5 100644 --- a/installing/deps-installer/src/install/link.ts +++ b/installing/deps-installer/src/install/link.ts @@ -1,29 +1,29 @@ import { promises as fs } from 'node:fs' import path from 'node:path' -import { calcDepState, type DepsStateCache } from '@pnpm/calc-dep-state' import { progressLogger, stageLogger, statsLogger, } from '@pnpm/core-loggers' -import type { InstallationResultStats } from '@pnpm/headless' -import { hoist, type HoistedWorkspaceProject } from '@pnpm/hoist' +import { calcDepState, type DepsStateCache } from '@pnpm/deps.graph-hasher' +import { symlinkDependency } from '@pnpm/fs.symlink-dependency' +import type { InstallationResultStats } from '@pnpm/installing.deps-restorer' +import { linkDirectDeps } from '@pnpm/installing.linking.direct-dep-linker' +import { hoist, type HoistedWorkspaceProject } from '@pnpm/installing.linking.hoist' +import { prune } from '@pnpm/installing.linking.modules-cleaner' +import type { IncludedDependencies } from '@pnpm/installing.modules-yaml' +import type { + DependenciesGraph, + DependenciesGraphNode, + LinkedDependency, +} from '@pnpm/installing.resolve-dependencies' import { filterLockfileByImporters, } from '@pnpm/lockfile.filtering' import type { LockfileObject } from '@pnpm/lockfile.fs' import { logger } from '@pnpm/logger' -import { prune } from '@pnpm/modules-cleaner' -import type { IncludedDependencies } from '@pnpm/modules-yaml' -import { linkDirectDeps } from '@pnpm/pkg-manager.direct-dep-linker' -import type { - DependenciesGraph, - DependenciesGraphNode, - LinkedDependency, -} from '@pnpm/resolve-dependencies' -import type { StoreController, TarballResolution } from '@pnpm/store-controller-types' -import { symlinkDependency } from '@pnpm/symlink-dependency' +import type { StoreController, TarballResolution } from '@pnpm/store.controller-types' import type { AllowBuild, DepPath, @@ -312,7 +312,7 @@ export async function linkPackages (projects: ImporterToUpdate[], depGraph: Depe const isAbsolutePath = /^\/|^[A-Z]:/i -// This function is copied from @pnpm/local-resolver +// This function is copied from @pnpm/resolving.local-resolver function resolvePath (where: string, spec: string): string { if (isAbsolutePath.test(spec)) return spec return path.resolve(where, spec) diff --git a/installing/deps-installer/src/install/reportPeerDependencyIssues.ts b/installing/deps-installer/src/install/reportPeerDependencyIssues.ts index 0bfa7aee48..3caf32c1f1 100644 --- a/installing/deps-installer/src/install/reportPeerDependencyIssues.ts +++ b/installing/deps-installer/src/install/reportPeerDependencyIssues.ts @@ -1,7 +1,7 @@ +import { createMatcher } from '@pnpm/config.matcher' +import { parseOverrides, type VersionOverride } from '@pnpm/config.parse-overrides' import { peerDependencyIssuesLogger } from '@pnpm/core-loggers' import { PnpmError } from '@pnpm/error' -import { createMatcher } from '@pnpm/matcher' -import { parseOverrides, type VersionOverride } from '@pnpm/parse-overrides' import type { BadPeerDependencyIssue, PeerDependencyIssuesByProjects, PeerDependencyRules } from '@pnpm/types' import { isEmpty } from 'ramda' import semver from 'semver' diff --git a/installing/deps-installer/src/install/validateModules.ts b/installing/deps-installer/src/install/validateModules.ts index 7f2619ddbe..d4e8f77513 100644 --- a/installing/deps-installer/src/install/validateModules.ts +++ b/installing/deps-installer/src/install/validateModules.ts @@ -2,11 +2,11 @@ import { promises as fs } from 'node:fs' import path from 'node:path' import { PnpmError } from '@pnpm/error' -import { logger } from '@pnpm/logger' import type { IncludedDependencies, Modules, -} from '@pnpm/modules-yaml' +} from '@pnpm/installing.modules-yaml' +import { logger } from '@pnpm/logger' import { DEPENDENCIES_FIELDS, type ProjectRootDir, diff --git a/installing/deps-installer/src/parseWantedDependencies.ts b/installing/deps-installer/src/parseWantedDependencies.ts index ab27b5856a..9c8c07c485 100644 --- a/installing/deps-installer/src/parseWantedDependencies.ts +++ b/installing/deps-installer/src/parseWantedDependencies.ts @@ -1,6 +1,6 @@ import type { Catalog } from '@pnpm/catalogs.types' -import { parseWantedDependency } from '@pnpm/parse-wanted-dependency' -import type { WantedDependency } from '@pnpm/resolve-dependencies' +import type { WantedDependency } from '@pnpm/installing.resolve-dependencies' +import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency' import type { Dependencies } from '@pnpm/types' export function parseWantedDependencies ( diff --git a/installing/deps-installer/test/api.ts b/installing/deps-installer/test/api.ts index def6774404..491af7c395 100644 --- a/installing/deps-installer/test/api.ts +++ b/installing/deps-installer/test/api.ts @@ -1,4 +1,4 @@ -import * as pnpm from '@pnpm/core' +import * as pnpm from '@pnpm/installing.deps-installer' import { testDefaults } from './utils/index.js' diff --git a/installing/deps-installer/test/breakingChanges.ts b/installing/deps-installer/test/breakingChanges.ts index 5499d5bfa0..ea4930471f 100644 --- a/installing/deps-installer/test/breakingChanges.ts +++ b/installing/deps-installer/test/breakingChanges.ts @@ -3,8 +3,8 @@ import path from 'node:path' import util from 'node:util' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { addDependenciesToPackage, install } from '@pnpm/core' import type { PnpmError } from '@pnpm/error' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { rimrafSync } from '@zkochan/rimraf' import { isCI } from 'ci-info' diff --git a/installing/deps-installer/test/brokenLockfileIntegrity.ts b/installing/deps-installer/test/brokenLockfileIntegrity.ts index acf61a8ccf..c33c9807ff 100644 --- a/installing/deps-installer/test/brokenLockfileIntegrity.ts +++ b/installing/deps-installer/test/brokenLockfileIntegrity.ts @@ -3,7 +3,7 @@ import { WANTED_LOCKFILE } from '@pnpm/constants' import { addDependenciesToPackage, mutateModulesInSingleProject, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import type { TarballResolution } from '@pnpm/lockfile.fs' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/cache.ts b/installing/deps-installer/test/cache.ts index cfaf2f5023..3d0ca8bbc7 100644 --- a/installing/deps-installer/test/cache.ts +++ b/installing/deps-installer/test/cache.ts @@ -1,4 +1,4 @@ -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/catalogs.ts b/installing/deps-installer/test/catalogs.ts index 92929febce..0f4e1a3143 100644 --- a/installing/deps-installer/test/catalogs.ts +++ b/installing/deps-installer/test/catalogs.ts @@ -1,8 +1,8 @@ import path from 'node:path' import { jest } from '@jest/globals' -import type { MutatedProject, MutateModulesOptions, ProjectOptions } from '@pnpm/core' -import { createPeerDepGraphHash } from '@pnpm/dependency-path' +import { createPeerDepGraphHash } from '@pnpm/deps.path' +import type { MutatedProject, MutateModulesOptions, ProjectOptions } from '@pnpm/installing.deps-installer' import type { CatalogSnapshots } from '@pnpm/lockfile.types' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' @@ -18,7 +18,7 @@ jest.unstable_mockModule('@pnpm/logger', () => { }) const { logger } = await import('@pnpm/logger') -const { mutateModules, addDependenciesToPackage } = await import('@pnpm/core') +const { mutateModules, addDependenciesToPackage } = await import('@pnpm/installing.deps-installer') function preparePackagesAndReturnObjects (manifests: Array>>) { const project = prepareEmpty() diff --git a/installing/deps-installer/test/getPeerDependencyIssues.test.ts b/installing/deps-installer/test/getPeerDependencyIssues.test.ts index 071948415a..61178d6d4b 100644 --- a/installing/deps-installer/test/getPeerDependencyIssues.test.ts +++ b/installing/deps-installer/test/getPeerDependencyIssues.test.ts @@ -1,4 +1,4 @@ -import { getPeerDependencyIssues } from '@pnpm/core' +import { getPeerDependencyIssues } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/hoistedNodeLinker/install.ts b/installing/deps-installer/test/hoistedNodeLinker/install.ts index abb29d4639..7f0febdbb0 100644 --- a/installing/deps-installer/test/hoistedNodeLinker/install.ts +++ b/installing/deps-installer/test/hoistedNodeLinker/install.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import { addDependenciesToPackage, install, mutateModules, mutateModulesInSingleProject } from '@pnpm/core' +import { addDependenciesToPackage, install, mutateModules, mutateModulesInSingleProject } from '@pnpm/installing.deps-installer' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/hoistedNodeLinker/uninstall.ts b/installing/deps-installer/test/hoistedNodeLinker/uninstall.ts index 97199b1a46..3ecb911383 100644 --- a/installing/deps-installer/test/hoistedNodeLinker/uninstall.ts +++ b/installing/deps-installer/test/hoistedNodeLinker/uninstall.ts @@ -1,12 +1,12 @@ import { jest } from '@jest/globals' -import { - addDependenciesToPackage, - mutateModulesInSingleProject, -} from '@pnpm/core' import type { PackageManifestLog, StatsLog, } from '@pnpm/core-loggers' +import { + addDependenciesToPackage, + mutateModulesInSingleProject, +} from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/aliases.ts b/installing/deps-installer/test/install/aliases.ts index f673174042..14af45d192 100644 --- a/installing/deps-installer/test/install/aliases.ts +++ b/installing/deps-installer/test/install/aliases.ts @@ -1,5 +1,5 @@ import { LOCKFILE_VERSION } from '@pnpm/constants' -import { addDependenciesToPackage } from '@pnpm/core' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag, getIntegrity } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/auth.ts b/installing/deps-installer/test/install/auth.ts index 675232832c..cc50eafd81 100644 --- a/installing/deps-installer/test/install/auth.ts +++ b/installing/deps-installer/test/install/auth.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { addUser, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { rimrafSync } from '@zkochan/rimraf' diff --git a/installing/deps-installer/test/install/autoInstallPeers.ts b/installing/deps-installer/test/install/autoInstallPeers.ts index 00477349bc..778fe11ce8 100644 --- a/installing/deps-installer/test/install/autoInstallPeers.ts +++ b/installing/deps-installer/test/install/autoInstallPeers.ts @@ -1,8 +1,8 @@ import path from 'node:path' import { assertProject } from '@pnpm/assert-project' -import { addDependenciesToPackage, install, mutateModules, mutateModulesInSingleProject, type PackageManifest } from '@pnpm/core' -import { createPeerDepGraphHash } from '@pnpm/dependency-path' +import { createPeerDepGraphHash } from '@pnpm/deps.path' +import { addDependenciesToPackage, install, mutateModules, mutateModulesInSingleProject, type PackageManifest } from '@pnpm/installing.deps-installer' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/blockExoticSubdeps.ts b/installing/deps-installer/test/install/blockExoticSubdeps.ts index d7bb1e8ebd..61c6fd564f 100644 --- a/installing/deps-installer/test/install/blockExoticSubdeps.ts +++ b/installing/deps-installer/test/install/blockExoticSubdeps.ts @@ -1,4 +1,4 @@ -import { addDependenciesToPackage } from '@pnpm/core' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import nock from 'nock' @@ -20,7 +20,7 @@ test('blockExoticSubdeps disallows git dependencies in subdependencies', async ( }) test('blockExoticSubdeps allows git dependencies in direct dependencies', async () => { - // Mock the HEAD request that isRepoPublic() in @pnpm/git-resolver makes to check if the repo is public. + // Mock the HEAD request that isRepoPublic() in @pnpm/resolving.git-resolver makes to check if the repo is public. // Without this, transient network failures cause the resolver to fall back to git+https:// instead of // resolving via the codeload tarball URL. const githubNock = nock('https://github.com', { allowUnmocked: true }) diff --git a/installing/deps-installer/test/install/bunRuntime.ts b/installing/deps-installer/test/install/bunRuntime.ts index d085b4878e..a90229cccd 100644 --- a/installing/deps-installer/test/install/bunRuntime.ts +++ b/installing/deps-installer/test/install/bunRuntime.ts @@ -1,5 +1,5 @@ import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { getIntegrity } from '@pnpm/registry-mock' import { rimrafSync } from '@zkochan/rimraf' diff --git a/installing/deps-installer/test/install/bundledDependencies.ts b/installing/deps-installer/test/install/bundledDependencies.ts index f190936b9e..adb88b9ac6 100644 --- a/installing/deps-installer/test/install/bundledDependencies.ts +++ b/installing/deps-installer/test/install/bundledDependencies.ts @@ -1,4 +1,4 @@ -import { addDependenciesToPackage } from '@pnpm/core' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' diff --git a/installing/deps-installer/test/install/customResolvers.ts b/installing/deps-installer/test/install/customResolvers.ts index c238a63fb0..507a239d9d 100644 --- a/installing/deps-installer/test/install/customResolvers.ts +++ b/installing/deps-installer/test/install/customResolvers.ts @@ -1,5 +1,5 @@ -import { addDependenciesToPackage } from '@pnpm/core' import type { CustomResolver } from '@pnpm/hooks.types' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/dedupe.ts b/installing/deps-installer/test/install/dedupe.ts index fe7ff18afe..39e6b6ced4 100644 --- a/installing/deps-installer/test/install/dedupe.ts +++ b/installing/deps-installer/test/install/dedupe.ts @@ -1,4 +1,4 @@ -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/dedupeDirectDeps.ts b/installing/deps-installer/test/install/dedupeDirectDeps.ts index 8430e5ca86..7559ca86c0 100644 --- a/installing/deps-installer/test/install/dedupeDirectDeps.ts +++ b/installing/deps-installer/test/install/dedupeDirectDeps.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import { type MutatedProject, mutateModules } from '@pnpm/core' +import { type MutatedProject, mutateModules } from '@pnpm/installing.deps-installer' import { preparePackages } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' import { rimrafSync } from '@zkochan/rimraf' diff --git a/installing/deps-installer/test/install/dedupeInWorkspace.ts b/installing/deps-installer/test/install/dedupeInWorkspace.ts index 211d7ae58f..92ca839b37 100644 --- a/installing/deps-installer/test/install/dedupeInWorkspace.ts +++ b/installing/deps-installer/test/install/dedupeInWorkspace.ts @@ -1,7 +1,7 @@ import path from 'node:path' import { assertProject } from '@pnpm/assert-project' -import { type MutatedProject, mutateModules } from '@pnpm/core' +import { type MutatedProject, mutateModules } from '@pnpm/installing.deps-installer' import { preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/deepRecursive.ts b/installing/deps-installer/test/install/deepRecursive.ts index 83b993a2f5..7582fa639a 100644 --- a/installing/deps-installer/test/install/deepRecursive.ts +++ b/installing/deps-installer/test/install/deepRecursive.ts @@ -1,6 +1,6 @@ import fs from 'node:fs' -import { addDependenciesToPackage } from '@pnpm/core' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { testDefaults } from '../utils/index.js' diff --git a/installing/deps-installer/test/install/defaultPeerDependencies.ts b/installing/deps-installer/test/install/defaultPeerDependencies.ts index 1e7da40439..2d8590c2b3 100644 --- a/installing/deps-installer/test/install/defaultPeerDependencies.ts +++ b/installing/deps-installer/test/install/defaultPeerDependencies.ts @@ -1,8 +1,8 @@ import fs from 'node:fs' import path from 'node:path' -import { addDependenciesToPackage } from '@pnpm/core' -import { createPeerDepGraphHash } from '@pnpm/dependency-path' +import { createPeerDepGraphHash } from '@pnpm/deps.path' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import deepRequireCwd from 'deep-require-cwd' diff --git a/installing/deps-installer/test/install/denoRuntime.ts b/installing/deps-installer/test/install/denoRuntime.ts index 62cfc3b7c2..6cc703712b 100644 --- a/installing/deps-installer/test/install/denoRuntime.ts +++ b/installing/deps-installer/test/install/denoRuntime.ts @@ -1,5 +1,5 @@ import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { getIntegrity } from '@pnpm/registry-mock' import { rimrafSync } from '@zkochan/rimraf' diff --git a/installing/deps-installer/test/install/errors.ts b/installing/deps-installer/test/install/errors.ts index cae83d9025..7115178571 100644 --- a/installing/deps-installer/test/install/errors.ts +++ b/installing/deps-installer/test/install/errors.ts @@ -1,5 +1,5 @@ -import { addDependenciesToPackage, mutateModulesInSingleProject } from '@pnpm/core' import type { PnpmError } from '@pnpm/error' +import { addDependenciesToPackage, mutateModulesInSingleProject } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' diff --git a/installing/deps-installer/test/install/excludeLinksFromLockfile.ts b/installing/deps-installer/test/install/excludeLinksFromLockfile.ts index e13b7fa146..a6f24627d1 100644 --- a/installing/deps-installer/test/install/excludeLinksFromLockfile.ts +++ b/installing/deps-installer/test/install/excludeLinksFromLockfile.ts @@ -8,7 +8,7 @@ import { type MutatedProject, mutateModules, type ProjectOptions, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import type { LockfileFile, LockfileObject } from '@pnpm/lockfile.types' import { prepareEmpty, preparePackages, tempDir } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/fixLockfile.ts b/installing/deps-installer/test/install/fixLockfile.ts index 38ac8cb712..6806ad0b5b 100644 --- a/installing/deps-installer/test/install/fixLockfile.ts +++ b/installing/deps-installer/test/install/fixLockfile.ts @@ -1,7 +1,7 @@ import path from 'node:path' import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' -import { install, type MutatedProject, mutateModules } from '@pnpm/core' +import { install, type MutatedProject, mutateModules } from '@pnpm/installing.deps-installer' import type { LockfileFile, PackageSnapshots } from '@pnpm/lockfile.fs' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/fromRepo.ts b/installing/deps-installer/test/install/fromRepo.ts index f5de80378d..2a27a1f7d9 100644 --- a/installing/deps-installer/test/install/fromRepo.ts +++ b/installing/deps-installer/test/install/fromRepo.ts @@ -3,12 +3,12 @@ import path from 'node:path' import { jest } from '@jest/globals' import { assertProject } from '@pnpm/assert-project' +import type { RootLog } from '@pnpm/core-loggers' +import { depPathToFilename } from '@pnpm/deps.path' import { addDependenciesToPackage, install, -} from '@pnpm/core' -import type { RootLog } from '@pnpm/core-loggers' -import { depPathToFilename } from '@pnpm/dependency-path' +} from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' import { rimrafSync } from '@zkochan/rimraf' @@ -27,7 +27,7 @@ afterEach(() => { test('from a github repo', async () => { const project = prepareEmpty() - // Mock the HEAD request that isRepoPublic() in @pnpm/git-resolver makes. + // Mock the HEAD request that isRepoPublic() in @pnpm/resolving.git-resolver makes. // Without this, transient network failures cause fallback to git+https:// resolution. const githubNock = nock('https://github.com', { allowUnmocked: true }) .head('/kevva/is-negative') diff --git a/installing/deps-installer/test/install/fromTarball.ts b/installing/deps-installer/test/install/fromTarball.ts index 022a5c009a..70c1a602fb 100644 --- a/installing/deps-installer/test/install/fromTarball.ts +++ b/installing/deps-installer/test/install/fromTarball.ts @@ -1,4 +1,4 @@ -import { addDependenciesToPackage } from '@pnpm/core' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/frozenLockfile.ts b/installing/deps-installer/test/install/frozenLockfile.ts index 3e94599e00..4679fcd6bf 100644 --- a/installing/deps-installer/test/install/frozenLockfile.ts +++ b/installing/deps-installer/test/install/frozenLockfile.ts @@ -6,7 +6,7 @@ import { install, type MutatedProject, mutateModules, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/gitBranchLockfile.test.ts b/installing/deps-installer/test/install/gitBranchLockfile.test.ts index f38b0b349a..39595bedd9 100644 --- a/installing/deps-installer/test/install/gitBranchLockfile.test.ts +++ b/installing/deps-installer/test/install/gitBranchLockfile.test.ts @@ -9,10 +9,10 @@ import { writeYamlFileSync } from 'write-yaml-file' import { testDefaults } from '../utils/index.js' -jest.unstable_mockModule('@pnpm/git-utils', () => ({ getCurrentBranch: jest.fn() })) +jest.unstable_mockModule('@pnpm/network.git-utils', () => ({ getCurrentBranch: jest.fn() })) -const { getCurrentBranch } = await import('@pnpm/git-utils') -const { install, mutateModules } = await import('@pnpm/core') +const { getCurrentBranch } = await import('@pnpm/network.git-utils') +const { install, mutateModules } = await import('@pnpm/installing.deps-installer') test('install with git-branch-lockfile = true', async () => { prepareEmpty() diff --git a/installing/deps-installer/test/install/globalVirtualStore.ts b/installing/deps-installer/test/install/globalVirtualStore.ts index 5cd9d3b23b..236c6ecc56 100644 --- a/installing/deps-installer/test/install/globalVirtualStore.ts +++ b/installing/deps-installer/test/install/globalVirtualStore.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import { assertProject } from '@pnpm/assert-project' -import { install, type MutatedProject, mutateModules, type ProjectOptions } from '@pnpm/core' +import { install, type MutatedProject, mutateModules, type ProjectOptions } from '@pnpm/installing.deps-installer' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag, getIntegrity } from '@pnpm/registry-mock' import type { PackageFilesIndex } from '@pnpm/store.cafs' diff --git a/installing/deps-installer/test/install/hoist.ts b/installing/deps-installer/test/install/hoist.ts index d46493cd0f..b992b67be0 100644 --- a/installing/deps-installer/test/install/hoist.ts +++ b/installing/deps-installer/test/install/hoist.ts @@ -9,7 +9,7 @@ import { type MutatedProject, mutateModules, mutateModulesInSingleProject, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import type { DepPath, ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/hooks.ts b/installing/deps-installer/test/install/hooks.ts index 36003ebfe4..881691a17e 100644 --- a/installing/deps-installer/test/install/hooks.ts +++ b/installing/deps-installer/test/install/hooks.ts @@ -3,7 +3,7 @@ import { LOCKFILE_VERSION } from '@pnpm/constants' import { addDependenciesToPackage, type PackageManifest, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import type { LockfileObject } from '@pnpm/lockfile.fs' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/ignoredOptionalDependencies.ts b/installing/deps-installer/test/install/ignoredOptionalDependencies.ts index 41a91a8ec3..01684f876b 100644 --- a/installing/deps-installer/test/install/ignoredOptionalDependencies.ts +++ b/installing/deps-installer/test/install/ignoredOptionalDependencies.ts @@ -1,4 +1,4 @@ -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import type { ProjectManifest } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/injectLocalPackages.ts b/installing/deps-installer/test/install/injectLocalPackages.ts index 3a84a921c0..b22ee38b07 100644 --- a/installing/deps-installer/test/install/injectLocalPackages.ts +++ b/installing/deps-installer/test/install/injectLocalPackages.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import { assertProject } from '@pnpm/assert-project' -import { type MutatedProject, mutateModules, type ProjectOptions } from '@pnpm/core' +import { type MutatedProject, mutateModules, type ProjectOptions } from '@pnpm/installing.deps-installer' import { preparePackages } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' import { rimrafSync } from '@zkochan/rimraf' diff --git a/installing/deps-installer/test/install/injectWorkspacePackagesPersistence.test.ts b/installing/deps-installer/test/install/injectWorkspacePackagesPersistence.test.ts index 5e7504155b..90dcfb19f3 100644 --- a/installing/deps-installer/test/install/injectWorkspacePackagesPersistence.test.ts +++ b/installing/deps-installer/test/install/injectWorkspacePackagesPersistence.test.ts @@ -1,7 +1,7 @@ import path from 'node:path' import { assertProject } from '@pnpm/assert-project' -import { mutateModules, mutateModulesInSingleProject, type ProjectOptions } from '@pnpm/core' +import { mutateModules, mutateModulesInSingleProject, type ProjectOptions } from '@pnpm/installing.deps-installer' import { preparePackages } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/installationChecks.ts b/installing/deps-installer/test/install/installationChecks.ts index c75b2b90bf..890449f92e 100644 --- a/installing/deps-installer/test/install/installationChecks.ts +++ b/installing/deps-installer/test/install/installationChecks.ts @@ -1,5 +1,5 @@ import { WANTED_LOCKFILE } from '@pnpm/constants' -import { addDependenciesToPackage } from '@pnpm/core' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { testDefaults } from '../utils/index.js' diff --git a/installing/deps-installer/test/install/lifecycleScripts.ts b/installing/deps-installer/test/install/lifecycleScripts.ts index 8820662fe3..fcea9dda4f 100644 --- a/installing/deps-installer/test/install/lifecycleScripts.ts +++ b/installing/deps-installer/test/install/lifecycleScripts.ts @@ -3,14 +3,14 @@ import * as path from 'node:path' import { jest } from '@jest/globals' import { assertProject } from '@pnpm/assert-project' +import type { LifecycleLog } from '@pnpm/core-loggers' import { addDependenciesToPackage, install, type MutatedProject, mutateModules, mutateModulesInSingleProject, -} from '@pnpm/core' -import type { LifecycleLog } from '@pnpm/core-loggers' +} from '@pnpm/installing.deps-installer' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { createTestIpcServer } from '@pnpm/test-ipc-server' import type { ProjectRootDir } from '@pnpm/types' @@ -214,7 +214,7 @@ test('INIT_CWD is always set to lockfile directory', async () => { expect(output).toStrictEqual(process.cwd()) }) -// TODO: duplicate this test to @pnpm/lifecycle +// TODO: duplicate this test to @pnpm/exec.lifecycle test("reports child's output", async () => { prepareEmpty() diff --git a/installing/deps-installer/test/install/local.ts b/installing/deps-installer/test/install/local.ts index 1154da02a8..0c05a1de45 100644 --- a/installing/deps-installer/test/install/local.ts +++ b/installing/deps-installer/test/install/local.ts @@ -9,7 +9,7 @@ import { mutateModules, mutateModulesInSingleProject, type ProjectOptions, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import type { LockfileFile } from '@pnpm/lockfile.fs' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/lockfileDir.ts b/installing/deps-installer/test/install/lockfileDir.ts index 9af598b835..84a15f919b 100644 --- a/installing/deps-installer/test/install/lockfileDir.ts +++ b/installing/deps-installer/test/install/lockfileDir.ts @@ -1,7 +1,7 @@ import path from 'node:path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { addDependenciesToPackage, mutateModulesInSingleProject } from '@pnpm/core' +import { addDependenciesToPackage, mutateModulesInSingleProject } from '@pnpm/installing.deps-installer' import type { LockfileObject } from '@pnpm/lockfile.fs' import { prepareEmpty } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' diff --git a/installing/deps-installer/test/install/lockfileOnly.ts b/installing/deps-installer/test/install/lockfileOnly.ts index 8f08c87e1d..4109ef21fc 100644 --- a/installing/deps-installer/test/install/lockfileOnly.ts +++ b/installing/deps-installer/test/install/lockfileOnly.ts @@ -6,7 +6,7 @@ import { ABBREVIATED_META_DIR } from '@pnpm/constants' import { addDependenciesToPackage, install, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/minimumReleaseAge.ts b/installing/deps-installer/test/install/minimumReleaseAge.ts index e783aedff5..3584a103e6 100644 --- a/installing/deps-installer/test/install/minimumReleaseAge.ts +++ b/installing/deps-installer/test/install/minimumReleaseAge.ts @@ -1,4 +1,4 @@ -import { addDependenciesToPackage } from '@pnpm/core' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { testDefaults } from '../utils/index.js' diff --git a/installing/deps-installer/test/install/misc.ts b/installing/deps-installer/test/install/misc.ts index f0768f9994..b603e90a82 100644 --- a/installing/deps-installer/test/install/misc.ts +++ b/installing/deps-installer/test/install/misc.ts @@ -3,13 +3,6 @@ import * as path from 'node:path' import { jest } from '@jest/globals' import { LOCKFILE_VERSION } from '@pnpm/constants' -import { - addDependenciesToPackage, - install, - mutateModulesInSingleProject, - UnexpectedStoreError, - UnexpectedVirtualStoreDirError, -} from '@pnpm/core' import type { PackageManifestLog, ProgressLog, @@ -17,6 +10,13 @@ import type { StageLog, StatsLog, } from '@pnpm/core-loggers' +import { + addDependenciesToPackage, + install, + mutateModulesInSingleProject, + UnexpectedStoreError, + UnexpectedVirtualStoreDirError, +} from '@pnpm/installing.deps-installer' import { prepare, prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag, getIntegrity, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' @@ -806,7 +806,7 @@ test('rewrites node_modules created by npm', async () => { // Covers https://github.com/pnpm/pnpm/issues/1685 // also, there's a better version of this test (with the same name) in the pnpm package -// TODO: move this test to @pnpm/package-store +// TODO: move this test to @pnpm/store.controller test("don't fail on case insensitive filesystems when package has 2 files with same name", async () => { const project = prepareEmpty() const reporter = jest.fn() diff --git a/installing/deps-installer/test/install/modulesCache.ts b/installing/deps-installer/test/install/modulesCache.ts index ac63841348..da435e813a 100644 --- a/installing/deps-installer/test/install/modulesCache.ts +++ b/installing/deps-installer/test/install/modulesCache.ts @@ -4,8 +4,8 @@ import { addDependenciesToPackage, install, mutateModulesInSingleProject, -} from '@pnpm/core' -import { readModulesManifest, writeModulesManifest } from '@pnpm/modules-yaml' +} from '@pnpm/installing.deps-installer' +import { readModulesManifest, writeModulesManifest } from '@pnpm/installing.modules-yaml' import { prepareEmpty } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/modulesDir.ts b/installing/deps-installer/test/install/modulesDir.ts index e9d0168a5a..8f8a98163e 100644 --- a/installing/deps-installer/test/install/modulesDir.ts +++ b/installing/deps-installer/test/install/modulesDir.ts @@ -4,7 +4,7 @@ import { install, type MutatedProject, mutateModules, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' import { rimrafSync } from '@zkochan/rimraf' diff --git a/installing/deps-installer/test/install/multipleImporters.ts b/installing/deps-installer/test/install/multipleImporters.ts index 62f1fff687..34cd7cba95 100644 --- a/installing/deps-installer/test/install/multipleImporters.ts +++ b/installing/deps-installer/test/install/multipleImporters.ts @@ -4,13 +4,13 @@ import path from 'node:path' import { jest } from '@jest/globals' import { assertProject } from '@pnpm/assert-project' import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' +import { createPeerDepGraphHash } from '@pnpm/deps.path' import { addDependenciesToPackage, type MutatedProject, mutateModules, mutateModulesInSingleProject, -} from '@pnpm/core' -import { createPeerDepGraphHash } from '@pnpm/dependency-path' +} from '@pnpm/installing.deps-installer' import { readCurrentLockfile } from '@pnpm/lockfile.fs' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/nodeRuntime.ts b/installing/deps-installer/test/install/nodeRuntime.ts index ad5cc6fcb2..696bb8c6ea 100644 --- a/installing/deps-installer/test/install/nodeRuntime.ts +++ b/installing/deps-installer/test/install/nodeRuntime.ts @@ -2,10 +2,10 @@ import fs from 'node:fs' import path from 'node:path' import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { getIntegrity } from '@pnpm/registry-mock' -import type { VariationsResolution } from '@pnpm/resolver-base' +import type { VariationsResolution } from '@pnpm/resolving.resolver-base' import { rimrafSync } from '@zkochan/rimraf' import { writeYamlFileSync } from 'write-yaml-file' diff --git a/installing/deps-installer/test/install/only.ts b/installing/deps-installer/test/install/only.ts index fccf83045a..f24641555c 100644 --- a/installing/deps-installer/test/install/only.ts +++ b/installing/deps-installer/test/install/only.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { testDefaults } from '../utils/index.js' diff --git a/installing/deps-installer/test/install/optionalDependencies.ts b/installing/deps-installer/test/install/optionalDependencies.ts index 35ee4f338e..068cc52c50 100644 --- a/installing/deps-installer/test/install/optionalDependencies.ts +++ b/installing/deps-installer/test/install/optionalDependencies.ts @@ -8,7 +8,7 @@ import { type MutatedProject, mutateModules, mutateModulesInSingleProject, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import type { LockfileFile } from '@pnpm/lockfile.fs' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' @@ -325,7 +325,7 @@ test('optional subdependency is skipped', async () => { // forced headless install should install non-compatible optional deps - // TODO: move next case to @pnpm/headless tests + // TODO: move next case to @pnpm/installing.deps-restorer tests await mutateModulesInSingleProject({ manifest, mutation: 'install', diff --git a/installing/deps-installer/test/install/overrides.ts b/installing/deps-installer/test/install/overrides.ts index 1e4926f38f..7028b5e5b8 100644 --- a/installing/deps-installer/test/install/overrides.ts +++ b/installing/deps-installer/test/install/overrides.ts @@ -2,8 +2,8 @@ import fs from 'node:fs' import path from 'node:path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { addDependenciesToPackage, type MutatedProject, mutateModules, mutateModulesInSingleProject, type ProjectOptions } from '@pnpm/core' import { PnpmError } from '@pnpm/error' +import { addDependenciesToPackage, type MutatedProject, mutateModules, mutateModulesInSingleProject, type ProjectOptions } from '@pnpm/installing.deps-installer' import type { LockfileFile } from '@pnpm/lockfile.types' import { prepare, prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/packageExtensions.ts b/installing/deps-installer/test/install/packageExtensions.ts index acd085a98a..073638c04e 100644 --- a/installing/deps-installer/test/install/packageExtensions.ts +++ b/installing/deps-installer/test/install/packageExtensions.ts @@ -1,6 +1,6 @@ -import { addDependenciesToPackage, install, mutateModulesInSingleProject } from '@pnpm/core' import { hashObject as _hashObject } from '@pnpm/crypto.object-hasher' import { PnpmError } from '@pnpm/error' +import { addDependenciesToPackage, install, mutateModulesInSingleProject } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import type { PackageExtension, ProjectManifest, ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/patch.ts b/installing/deps-installer/test/install/patch.ts index 2bcc2275cb..76b66ff5f9 100644 --- a/installing/deps-installer/test/install/patch.ts +++ b/installing/deps-installer/test/install/patch.ts @@ -3,9 +3,9 @@ import path from 'node:path' import { jest } from '@jest/globals' import { ENGINE_NAME } from '@pnpm/constants' -import { install } from '@pnpm/core' import type { IgnoredScriptsLog } from '@pnpm/core-loggers' import { createHexHashFromFile } from '@pnpm/crypto.hash' +import { install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { getIntegrity } from '@pnpm/registry-mock' import type { PackageFilesIndex } from '@pnpm/store.cafs' diff --git a/installing/deps-installer/test/install/peerDependencies.ts b/installing/deps-installer/test/install/peerDependencies.ts index f3987d545a..f9804bfe9a 100644 --- a/installing/deps-installer/test/install/peerDependencies.ts +++ b/installing/deps-installer/test/install/peerDependencies.ts @@ -4,6 +4,7 @@ import path from 'node:path' import { jest } from '@jest/globals' import type { Project } from '@pnpm/assert-project' import { WANTED_LOCKFILE } from '@pnpm/constants' +import { createPeerDepGraphHash, depPathToFilename } from '@pnpm/deps.path' import { addDependenciesToPackage, install, @@ -12,8 +13,7 @@ import { mutateModulesInSingleProject, type PeerDependencyIssuesError, type ProjectOptions, -} from '@pnpm/core' -import { createPeerDepGraphHash, depPathToFilename } from '@pnpm/dependency-path' +} from '@pnpm/installing.deps-installer' import type { LockfileFile } from '@pnpm/lockfile.fs' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/reporting.ts b/installing/deps-installer/test/install/reporting.ts index e3777b7d57..d5282ca644 100644 --- a/installing/deps-installer/test/install/reporting.ts +++ b/installing/deps-installer/test/install/reporting.ts @@ -1,8 +1,8 @@ import { jest } from '@jest/globals' +import type { DeprecationLog } from '@pnpm/core-loggers' import { addDependenciesToPackage, -} from '@pnpm/core' -import type { DeprecationLog } from '@pnpm/core-loggers' +} from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { testDefaults } from '../utils/index.js' diff --git a/installing/deps-installer/test/install/resolutionMode.ts b/installing/deps-installer/test/install/resolutionMode.ts index 87ea83d852..b37f9274a2 100644 --- a/installing/deps-installer/test/install/resolutionMode.ts +++ b/installing/deps-installer/test/install/resolutionMode.ts @@ -1,4 +1,4 @@ -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/setExtraNodePath.ts b/installing/deps-installer/test/install/setExtraNodePath.ts index c698443f85..c80a484ba8 100644 --- a/installing/deps-installer/test/install/setExtraNodePath.ts +++ b/installing/deps-installer/test/install/setExtraNodePath.ts @@ -5,7 +5,7 @@ import { install, type MutatedProject, mutateModules, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import { preparePackages, tempDir } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/sideEffects.ts b/installing/deps-installer/test/install/sideEffects.ts index d27f5f89c4..12fd2389ea 100644 --- a/installing/deps-installer/test/install/sideEffects.ts +++ b/installing/deps-installer/test/install/sideEffects.ts @@ -2,8 +2,8 @@ import fs from 'node:fs' import path from 'node:path' import { ENGINE_NAME } from '@pnpm/constants' -import { addDependenciesToPackage, install } from '@pnpm/core' import { hashObject } from '@pnpm/crypto.object-hasher' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { getIntegrity, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { getFilePathByModeInCafs, type PackageFilesIndex } from '@pnpm/store.cafs' diff --git a/installing/deps-installer/test/install/stats.ts b/installing/deps-installer/test/install/stats.ts index 14e9cc0e35..fad7c01015 100644 --- a/installing/deps-installer/test/install/stats.ts +++ b/installing/deps-installer/test/install/stats.ts @@ -1,7 +1,7 @@ import { type MutatedProject, mutateModules, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import type { ProjectRootDir } from '@pnpm/types' import { rimrafSync } from '@zkochan/rimraf' diff --git a/installing/deps-installer/test/install/update.ts b/installing/deps-installer/test/install/update.ts index f24fc0b413..f976b86714 100644 --- a/installing/deps-installer/test/install/update.ts +++ b/installing/deps-installer/test/install/update.ts @@ -1,7 +1,7 @@ import path from 'node:path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import type { LockfileFile } from '@pnpm/lockfile.fs' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/install/updatingPkgJson.ts b/installing/deps-installer/test/install/updatingPkgJson.ts index 3e4ee7d399..bdfb7e052d 100644 --- a/installing/deps-installer/test/install/updatingPkgJson.ts +++ b/installing/deps-installer/test/install/updatingPkgJson.ts @@ -2,7 +2,7 @@ import { addDependenciesToPackage, install, mutateModulesInSingleProject, -} from '@pnpm/core' +} from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/install/validatePeerDependencies.ts b/installing/deps-installer/test/install/validatePeerDependencies.ts index 1d27bd8364..296914e400 100644 --- a/installing/deps-installer/test/install/validatePeerDependencies.ts +++ b/installing/deps-installer/test/install/validatePeerDependencies.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import { install } from '@pnpm/core' +import { install } from '@pnpm/installing.deps-installer' import { readWantedLockfile } from '@pnpm/lockfile.fs' import { preparePackages } from '@pnpm/prepare' diff --git a/installing/deps-installer/test/install/virtualStoreDirMaxLength.ts b/installing/deps-installer/test/install/virtualStoreDirMaxLength.ts index a0f7f04835..b4de7d7f87 100644 --- a/installing/deps-installer/test/install/virtualStoreDirMaxLength.ts +++ b/installing/deps-installer/test/install/virtualStoreDirMaxLength.ts @@ -1,6 +1,6 @@ import fs from 'node:fs' -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { testDefaults } from '../utils/index.js' diff --git a/installing/deps-installer/test/link.ts b/installing/deps-installer/test/link.ts index 476c692a90..89e0a9455b 100644 --- a/installing/deps-installer/test/link.ts +++ b/installing/deps-installer/test/link.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' diff --git a/installing/deps-installer/test/lockfile.ts b/installing/deps-installer/test/lockfile.ts index fa8fa7313d..181e02d1bf 100644 --- a/installing/deps-installer/test/lockfile.ts +++ b/installing/deps-installer/test/lockfile.ts @@ -3,6 +3,8 @@ import path from 'node:path' import { jest } from '@jest/globals' import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' +import type { RootLog } from '@pnpm/core-loggers' +import type { PnpmError } from '@pnpm/error' import { addDependenciesToPackage, install, @@ -10,13 +12,11 @@ import { mutateModules, mutateModulesInSingleProject, type ProjectOptions, -} from '@pnpm/core' -import type { RootLog } from '@pnpm/core-loggers' -import type { PnpmError } from '@pnpm/error' +} from '@pnpm/installing.deps-installer' import type { LockfileObject, TarballResolution } from '@pnpm/lockfile.fs' import type { LockfileFile } from '@pnpm/lockfile.types' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import { prepareEmpty, preparePackages, tempDir } from '@pnpm/prepare' -import { readPackageJsonFromDir } from '@pnpm/read-package-json' import { addDistTag, getIntegrity, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' import type { DepPath, ProjectManifest, ProjectRootDir } from '@pnpm/types' @@ -43,7 +43,7 @@ const LOCKFILE_WARN_LOG = { test('lockfile has correct format', async () => { await addDistTag({ package: '@pnpm.e2e/pkg-with-1-dep', version: '100.0.0', distTag: 'latest' }) - // Mock the HEAD request that isRepoPublic() in @pnpm/git-resolver makes to check if the repo is public. + // Mock the HEAD request that isRepoPublic() in @pnpm/resolving.git-resolver makes to check if the repo is public. // Without this, transient network failures cause the resolver to fall back to git+https:// instead of // resolving via the codeload tarball URL. const githubNock = nock('https://github.com', { allowUnmocked: true }) @@ -822,7 +822,7 @@ test('packages installed via tarball URL from the default registry are normalize test('lockfile file has correct format when lockfile directory does not equal the prefix directory', async () => { await addDistTag({ package: '@pnpm.e2e/pkg-with-1-dep', version: '100.0.0', distTag: 'latest' }) - // Mock the HEAD request that isRepoPublic() in @pnpm/git-resolver makes to check if the repo is public. + // Mock the HEAD request that isRepoPublic() in @pnpm/resolving.git-resolver makes to check if the repo is public. // Without this, transient network failures cause the resolver to fall back to git+https:// instead of // resolving via the codeload tarball URL. const githubNock = nock('https://github.com', { allowUnmocked: true }) diff --git a/installing/deps-installer/test/offline.ts b/installing/deps-installer/test/offline.ts index e2c7d015c5..e5b68bcadb 100644 --- a/installing/deps-installer/test/offline.ts +++ b/installing/deps-installer/test/offline.ts @@ -1,4 +1,4 @@ -import { addDependenciesToPackage, install } from '@pnpm/core' +import { addDependenciesToPackage, install } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { rimrafSync } from '@zkochan/rimraf' diff --git a/installing/deps-installer/test/packageImportMethods.ts b/installing/deps-installer/test/packageImportMethods.ts index 463669dbfa..1e64d77444 100644 --- a/installing/deps-installer/test/packageImportMethods.ts +++ b/installing/deps-installer/test/packageImportMethods.ts @@ -1,6 +1,6 @@ import fs from 'node:fs' -import { addDependenciesToPackage } from '@pnpm/core' +import { addDependenciesToPackage } from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { loadJsonFileSync } from 'load-json-file' diff --git a/installing/deps-installer/test/prune.ts b/installing/deps-installer/test/prune.ts index 6bcfc61887..289675d67b 100644 --- a/installing/deps-installer/test/prune.ts +++ b/installing/deps-installer/test/prune.ts @@ -1,12 +1,12 @@ import path from 'node:path' import { jest } from '@jest/globals' +import type { RootLog } from '@pnpm/core-loggers' import { addDependenciesToPackage, install, mutateModulesInSingleProject, -} from '@pnpm/core' -import type { RootLog } from '@pnpm/core-loggers' +} from '@pnpm/installing.deps-installer' import { prepareEmpty } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' import type { ProjectRootDir } from '@pnpm/types' diff --git a/installing/deps-installer/test/uninstall.ts b/installing/deps-installer/test/uninstall.ts index f13e9d3320..fcc8578006 100644 --- a/installing/deps-installer/test/uninstall.ts +++ b/installing/deps-installer/test/uninstall.ts @@ -3,16 +3,16 @@ import path from 'node:path' import { jest } from '@jest/globals' import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' -import { - addDependenciesToPackage, - mutateModules, - mutateModulesInSingleProject, -} from '@pnpm/core' import type { PackageManifestLog, RootLog, StatsLog, } from '@pnpm/core-loggers' +import { + addDependenciesToPackage, + mutateModules, + mutateModulesInSingleProject, +} from '@pnpm/installing.deps-installer' import type { LockfileObject } from '@pnpm/lockfile.fs' import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' diff --git a/installing/deps-installer/test/utils/testDefaults.ts b/installing/deps-installer/test/utils/testDefaults.ts index 7e548952b1..8e67a1f824 100644 --- a/installing/deps-installer/test/utils/testDefaults.ts +++ b/installing/deps-installer/test/utils/testDefaults.ts @@ -1,7 +1,7 @@ -import type { InstallOptions } from '@pnpm/core' import type { CustomResolver } from '@pnpm/hooks.types' +import type { InstallOptions } from '@pnpm/installing.deps-installer' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' -import type { StoreController } from '@pnpm/store-controller-types' +import type { StoreController } from '@pnpm/store.controller-types' import { createTempStore } from '@pnpm/testing.temp-store' import type { Registries } from '@pnpm/types' diff --git a/installing/deps-installer/tsconfig.json b/installing/deps-installer/tsconfig.json index f770dc2f8a..594191e48b 100644 --- a/installing/deps-installer/tsconfig.json +++ b/installing/deps-installer/tsconfig.json @@ -25,10 +25,10 @@ "path": "../../__utils__/test-ipc-server" }, { - "path": "../../bins/link-bins" + "path": "../../bins/linker" }, { - "path": "../../bins/remove-bins" + "path": "../../bins/remover" }, { "path": "../../building/after-install" @@ -64,14 +64,14 @@ "path": "../../crypto/object-hasher" }, { - "path": "../../deps/calc-dep-state" - }, - { - "path": "../../deps/dependency-path" + "path": "../../deps/graph-hasher" }, { "path": "../../deps/graph-sequencer" }, + { + "path": "../../deps/path" + }, { "path": "../../exec/lifecycle" }, @@ -96,9 +96,6 @@ { "path": "../../lockfile/fs" }, - { - "path": "../../lockfile/lockfile-to-pnp" - }, { "path": "../../lockfile/preferred-versions" }, @@ -108,6 +105,9 @@ { "path": "../../lockfile/settings-checker" }, + { + "path": "../../lockfile/to-pnp" + }, { "path": "../../lockfile/types" }, @@ -141,14 +141,11 @@ { "path": "../../patching/config" }, - { - "path": "../../pkg-manifest/manifest-utils" - }, { "path": "../../pkg-manifest/read-package-json" }, { - "path": "../../pkg-manifest/read-project-manifest" + "path": "../../pkg-manifest/utils" }, { "path": "../../resolving/parse-wanted-dependency" @@ -159,14 +156,14 @@ { "path": "../../store/cafs" }, + { + "path": "../../store/controller-types" + }, { "path": "../../store/index" }, { - "path": "../../store/store-controller-types" - }, - { - "path": "../../store/store-path" + "path": "../../store/path" }, { "path": "../../testing/temp-store" @@ -175,10 +172,13 @@ "path": "../../worker" }, { - "path": "../deps-restorer" + "path": "../../workspace/project-manifest-reader" }, { - "path": "../get-context" + "path": "../context" + }, + { + "path": "../deps-restorer" }, { "path": "../linking/direct-dep-linker" diff --git a/installing/deps-restorer/package.json b/installing/deps-restorer/package.json index 113ede3b5b..5b7582bcd1 100644 --- a/installing/deps-restorer/package.json +++ b/installing/deps-restorer/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/headless", + "name": "@pnpm/installing.deps-restorer", "version": "1006.0.0", "description": "Fast installation using only pnpm-lock.yaml", "keywords": [ @@ -39,33 +39,33 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/bins.linker": "workspace:*", "@pnpm/building.during-install": "workspace:*", "@pnpm/building.policy": "workspace:*", - "@pnpm/calc-dep-state": "workspace:*", + "@pnpm/config.package-is-installable": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/dependency-path": "workspace:*", "@pnpm/deps.graph-builder": "workspace:*", + "@pnpm/deps.graph-hasher": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/hoist": "workspace:*", - "@pnpm/lifecycle": "workspace:*", - "@pnpm/link-bins": "workspace:*", - "@pnpm/lockfile-to-pnp": "workspace:*", + "@pnpm/exec.lifecycle": "workspace:*", + "@pnpm/fs.symlink-dependency": "workspace:*", + "@pnpm/installing.linking.direct-dep-linker": "workspace:*", + "@pnpm/installing.linking.hoist": "workspace:*", + "@pnpm/installing.linking.modules-cleaner": "workspace:*", + "@pnpm/installing.linking.real-hoist": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", + "@pnpm/installing.package-requester": "workspace:*", "@pnpm/lockfile.filtering": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", + "@pnpm/lockfile.to-pnp": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/modules-cleaner": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/package-is-installable": "workspace:*", - "@pnpm/package-requester": "workspace:*", "@pnpm/patching.config": "workspace:*", - "@pnpm/pkg-manager.direct-dep-linker": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/real-hoist": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", - "@pnpm/symlink-dependency": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "@zkochan/rimraf": "catalog:", "p-limit": "catalog:", "path-absolute": "catalog:", @@ -81,14 +81,14 @@ "@jest/globals": "catalog:", "@pnpm/assert-project": "workspace:*", "@pnpm/crypto.object-hasher": "workspace:*", - "@pnpm/headless": "workspace:*", + "@pnpm/installing.deps-restorer": "workspace:*", + "@pnpm/installing.read-projects-context": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/prepare": "workspace:*", - "@pnpm/read-projects-context": "workspace:*", "@pnpm/registry-mock": "catalog:", - "@pnpm/store-path": "workspace:*", "@pnpm/store.cafs": "workspace:*", "@pnpm/store.index": "workspace:*", + "@pnpm/store.path": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@pnpm/test-ipc-server": "workspace:*", "@pnpm/testing.temp-store": "workspace:*", diff --git a/installing/deps-restorer/src/extendProjectsWithTargetDirs.ts b/installing/deps-restorer/src/extendProjectsWithTargetDirs.ts index b624c2dfd7..2490e2ef8b 100644 --- a/installing/deps-restorer/src/extendProjectsWithTargetDirs.ts +++ b/installing/deps-restorer/src/extendProjectsWithTargetDirs.ts @@ -1,4 +1,4 @@ -import { parse as parseDepPath } from '@pnpm/dependency-path' +import { parse as parseDepPath } from '@pnpm/deps.path' import type { ProjectId } from '@pnpm/types' export function extendProjectsWithTargetDirs ( diff --git a/installing/deps-restorer/src/index.ts b/installing/deps-restorer/src/index.ts index 29ede9d26e..c1d5f23174 100644 --- a/installing/deps-restorer/src/index.ts +++ b/installing/deps-restorer/src/index.ts @@ -1,9 +1,9 @@ import { promises as fs } from 'node:fs' import path from 'node:path' +import { linkBins, linkBinsOfPackages } from '@pnpm/bins.linker' import { buildModules } from '@pnpm/building.during-install' import { createAllowBuildFunction } from '@pnpm/building.policy' -import { calcDepState, type DepsStateCache } from '@pnpm/calc-dep-state' import { LAYOUT_VERSION, WANTED_LOCKFILE, @@ -15,7 +15,6 @@ import { statsLogger, summaryLogger, } from '@pnpm/core-loggers' -import * as dp from '@pnpm/dependency-path' import { type DependenciesGraph, type DependenciesGraphNode, @@ -23,13 +22,23 @@ import { lockfileToDepGraph, type LockfileToDepGraphOptions, } from '@pnpm/deps.graph-builder' +import { calcDepState, type DepsStateCache } from '@pnpm/deps.graph-hasher' +import * as dp from '@pnpm/deps.path' import { PnpmError } from '@pnpm/error' -import { hoist, type HoistedWorkspaceProject } from '@pnpm/hoist' import { makeNodeRequireOption, runLifecycleHooksConcurrently, -} from '@pnpm/lifecycle' -import { linkBins, linkBinsOfPackages } from '@pnpm/link-bins' +} from '@pnpm/exec.lifecycle' +import { symlinkDependency } from '@pnpm/fs.symlink-dependency' +import { linkDirectDeps, type LinkedDirectDep } from '@pnpm/installing.linking.direct-dep-linker' +import { hoist, type HoistedWorkspaceProject } from '@pnpm/installing.linking.hoist' +import { prune } from '@pnpm/installing.linking.modules-cleaner' +import type { HoistingLimits } from '@pnpm/installing.linking.real-hoist' +import { + type IncludedDependencies, + type Modules, + writeModulesManifest, +} from '@pnpm/installing.modules-yaml' import { filterLockfileByEngine, filterLockfileByImportersAndEngine, @@ -42,31 +51,21 @@ import { writeCurrentLockfile, writeLockfiles, } from '@pnpm/lockfile.fs' +import { writePnpFile } from '@pnpm/lockfile.to-pnp' import { nameVerFromPkgSnapshot, } from '@pnpm/lockfile.utils' -import { writePnpFile } from '@pnpm/lockfile-to-pnp' import { type LogBase, logger, streamParser, } from '@pnpm/logger' -import { prune } from '@pnpm/modules-cleaner' -import { - type IncludedDependencies, - type Modules, - writeModulesManifest, -} from '@pnpm/modules-yaml' import type { PatchGroupRecord } from '@pnpm/patching.config' -import { linkDirectDeps, type LinkedDirectDep } from '@pnpm/pkg-manager.direct-dep-linker' -import { readPackageJsonFromDir } from '@pnpm/read-package-json' -import { readProjectManifestOnly, safeReadProjectManifestOnly } from '@pnpm/read-project-manifest' -import type { HoistingLimits } from '@pnpm/real-hoist' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import type { PackageFilesResponse, StoreController, -} from '@pnpm/store-controller-types' -import { symlinkDependency } from '@pnpm/symlink-dependency' +} from '@pnpm/store.controller-types' import { type AllowBuild, DEPENDENCIES_FIELDS, @@ -81,6 +80,7 @@ import { type SupportedArchitectures, } from '@pnpm/types' import { symlinkAllModules } from '@pnpm/worker' +import { readProjectManifestOnly, safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' import pLimit from 'p-limit' import { pathAbsolute } from 'path-absolute' import { equals, isEmpty, omit, pick, pickBy, props, union } from 'ramda' diff --git a/installing/deps-restorer/src/linkHoistedModules.ts b/installing/deps-restorer/src/linkHoistedModules.ts index a39af3b184..385fb6ab9b 100644 --- a/installing/deps-restorer/src/linkHoistedModules.ts +++ b/installing/deps-restorer/src/linkHoistedModules.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { calcDepState, type DepsStateCache } from '@pnpm/calc-dep-state' +import { linkBins } from '@pnpm/bins.linker' import { progressLogger, removalLogger, @@ -10,12 +10,12 @@ import type { DependenciesGraph, DepHierarchy, } from '@pnpm/deps.graph-builder' -import { linkBins } from '@pnpm/link-bins' +import { calcDepState, type DepsStateCache } from '@pnpm/deps.graph-hasher' import { logger } from '@pnpm/logger' import type { PackageFilesResponse, StoreController, -} from '@pnpm/store-controller-types' +} from '@pnpm/store.controller-types' import type { AllowBuild } from '@pnpm/types' import { rimraf } from '@zkochan/rimraf' import pLimit from 'p-limit' diff --git a/installing/deps-restorer/src/lockfileToHoistedDepGraph.ts b/installing/deps-restorer/src/lockfileToHoistedDepGraph.ts index 3c759c2478..4891306490 100644 --- a/installing/deps-restorer/src/lockfileToHoistedDepGraph.ts +++ b/installing/deps-restorer/src/lockfileToHoistedDepGraph.ts @@ -1,12 +1,15 @@ import path from 'node:path' -import * as dp from '@pnpm/dependency-path' +import { packageIsInstallable } from '@pnpm/config.package-is-installable' import type { DependenciesGraph, DepHierarchy, DirectDependenciesByImporterId, LockfileToDepGraphResult, } from '@pnpm/deps.graph-builder' +import * as dp from '@pnpm/deps.path' +import { hoist, type HoisterResult, type HoistingLimits } from '@pnpm/installing.linking.real-hoist' +import type { IncludedDependencies } from '@pnpm/installing.modules-yaml' import type { LockfileObject, PackageSnapshot, @@ -18,15 +21,12 @@ import { pkgSnapshotToResolution, } from '@pnpm/lockfile.utils' import { logger } from '@pnpm/logger' -import type { IncludedDependencies } from '@pnpm/modules-yaml' -import { packageIsInstallable } from '@pnpm/package-is-installable' import { getPatchInfo, type PatchGroupRecord } from '@pnpm/patching.config' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' -import { hoist, type HoisterResult, type HoistingLimits } from '@pnpm/real-hoist' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import type { FetchPackageToStoreFunction, StoreController, -} from '@pnpm/store-controller-types' +} from '@pnpm/store.controller-types' import type { AllowBuild, DepPath, ProjectId, Registries, SupportedArchitectures } from '@pnpm/types' import { pathExists } from 'path-exists' diff --git a/installing/deps-restorer/test/index.ts b/installing/deps-restorer/test/index.ts index 0660035a1c..005bba1b91 100644 --- a/installing/deps-restorer/test/index.ts +++ b/installing/deps-restorer/test/index.ts @@ -12,9 +12,9 @@ import type { StatsLog, } from '@pnpm/core-loggers' import { hashObject } from '@pnpm/crypto.object-hasher' -import { headlessInstall } from '@pnpm/headless' +import { headlessInstall } from '@pnpm/installing.deps-restorer' +import { readModulesManifest } from '@pnpm/installing.modules-yaml' import { readWantedLockfile } from '@pnpm/lockfile.fs' -import { readModulesManifest } from '@pnpm/modules-yaml' import { tempDir } from '@pnpm/prepare' import { getIntegrity } from '@pnpm/registry-mock' import type { PackageFilesIndex } from '@pnpm/store.cafs' diff --git a/installing/deps-restorer/test/utils/testDefaults.ts b/installing/deps-restorer/test/utils/testDefaults.ts index f29f5b32e7..096f2a05fa 100644 --- a/installing/deps-restorer/test/utils/testDefaults.ts +++ b/installing/deps-restorer/test/utils/testDefaults.ts @@ -1,10 +1,10 @@ import path from 'node:path' -import type { HeadlessOptions } from '@pnpm/headless' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' -import { readProjectsContext } from '@pnpm/read-projects-context' +import type { HeadlessOptions } from '@pnpm/installing.deps-restorer' +import { readProjectsContext } from '@pnpm/installing.read-projects-context' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' -import { getStorePath } from '@pnpm/store-path' +import { getStorePath } from '@pnpm/store.path' import { createTempStore } from '@pnpm/testing.temp-store' import { temporaryDirectory } from 'tempy' diff --git a/installing/deps-restorer/tsconfig.json b/installing/deps-restorer/tsconfig.json index 458e9655f3..b714c3e41d 100644 --- a/installing/deps-restorer/tsconfig.json +++ b/installing/deps-restorer/tsconfig.json @@ -22,7 +22,7 @@ "path": "../../__utils__/test-ipc-server" }, { - "path": "../../bins/link-bins" + "path": "../../bins/linker" }, { "path": "../../building/during-install" @@ -36,15 +36,15 @@ { "path": "../../crypto/object-hasher" }, - { - "path": "../../deps/calc-dep-state" - }, - { - "path": "../../deps/dependency-path" - }, { "path": "../../deps/graph-builder" }, + { + "path": "../../deps/graph-hasher" + }, + { + "path": "../../deps/path" + }, { "path": "../../exec/lifecycle" }, @@ -58,7 +58,7 @@ "path": "../../lockfile/fs" }, { - "path": "../../lockfile/lockfile-to-pnp" + "path": "../../lockfile/to-pnp" }, { "path": "../../lockfile/utils" @@ -85,19 +85,16 @@ "path": "../../pkg-manifest/read-package-json" }, { - "path": "../../pkg-manifest/read-project-manifest" + "path": "../../store/cafs" }, { - "path": "../../store/cafs" + "path": "../../store/controller-types" }, { "path": "../../store/index" }, { - "path": "../../store/store-controller-types" - }, - { - "path": "../../store/store-path" + "path": "../../store/path" }, { "path": "../../testing/temp-store" @@ -105,6 +102,9 @@ { "path": "../../worker" }, + { + "path": "../../workspace/project-manifest-reader" + }, { "path": "../linking/direct-dep-linker" }, diff --git a/installing/linking/direct-dep-linker/package.json b/installing/linking/direct-dep-linker/package.json index 7626fc731d..0a121c2038 100644 --- a/installing/linking/direct-dep-linker/package.json +++ b/installing/linking/direct-dep-linker/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/pkg-manager.direct-dep-linker", + "name": "@pnpm/installing.linking.direct-dep-linker", "version": "1000.0.12", "description": "Fast installation using only pnpm-lock.yaml", "keywords": [ @@ -31,8 +31,8 @@ }, "dependencies": { "@pnpm/core-loggers": "workspace:*", - "@pnpm/read-modules-dir": "workspace:*", - "@pnpm/symlink-dependency": "workspace:*", + "@pnpm/fs.read-modules-dir": "workspace:*", + "@pnpm/fs.symlink-dependency": "workspace:*", "@zkochan/rimraf": "catalog:", "ramda": "catalog:", "resolve-link-target": "catalog:" @@ -41,8 +41,8 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { + "@pnpm/installing.linking.direct-dep-linker": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/pkg-manager.direct-dep-linker": "workspace:*", "@types/ramda": "catalog:" }, "engines": { diff --git a/installing/linking/direct-dep-linker/src/linkDirectDeps.ts b/installing/linking/direct-dep-linker/src/linkDirectDeps.ts index 388d34e238..2ba44ddea4 100644 --- a/installing/linking/direct-dep-linker/src/linkDirectDeps.ts +++ b/installing/linking/direct-dep-linker/src/linkDirectDeps.ts @@ -2,8 +2,8 @@ import fs from 'node:fs' import path from 'node:path' import { rootLogger } from '@pnpm/core-loggers' -import { readModulesDir } from '@pnpm/read-modules-dir' -import { symlinkDependency, symlinkDirectRootDependency } from '@pnpm/symlink-dependency' +import { readModulesDir } from '@pnpm/fs.read-modules-dir' +import { symlinkDependency, symlinkDirectRootDependency } from '@pnpm/fs.symlink-dependency' import { rimraf } from '@zkochan/rimraf' import { omit } from 'ramda' import { resolveLinkTarget } from 'resolve-link-target' diff --git a/installing/linking/hoist/package.json b/installing/linking/hoist/package.json index 348f5019e5..332063aaf3 100644 --- a/installing/linking/hoist/package.json +++ b/installing/linking/hoist/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/hoist", + "name": "@pnpm/installing.linking.hoist", "version": "1002.0.8", "description": "Hoists dependencies in a node_modules created by pnpm", "keywords": [ @@ -34,10 +34,10 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/bins.linker": "workspace:*", + "@pnpm/config.matcher": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/link-bins": "workspace:*", - "@pnpm/matcher": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "is-subdir": "catalog:", @@ -49,7 +49,7 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/hoist": "workspace:*", + "@pnpm/installing.linking.hoist": "workspace:*", "@pnpm/logger": "workspace:*", "@types/ramda": "catalog:" }, diff --git a/installing/linking/hoist/src/index.ts b/installing/linking/hoist/src/index.ts index 4f06268270..d40df12cbc 100644 --- a/installing/linking/hoist/src/index.ts +++ b/installing/linking/hoist/src/index.ts @@ -1,11 +1,11 @@ import fs from 'node:fs' import path from 'node:path' +import { linkBinsOfPkgsByAliases, type WarnFunction } from '@pnpm/bins.linker' +import { createMatcher } from '@pnpm/config.matcher' import { WANTED_LOCKFILE } from '@pnpm/constants' import { linkLogger } from '@pnpm/core-loggers' -import { linkBinsOfPkgsByAliases, type WarnFunction } from '@pnpm/link-bins' import { logger } from '@pnpm/logger' -import { createMatcher } from '@pnpm/matcher' import type { DependenciesField, DepPath, HoistedDependencies, ProjectId } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' import { isSubdir } from 'is-subdir' diff --git a/installing/linking/hoist/tsconfig.json b/installing/linking/hoist/tsconfig.json index f1210fe47d..dc6ec4b4b7 100644 --- a/installing/linking/hoist/tsconfig.json +++ b/installing/linking/hoist/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../../bins/link-bins" + "path": "../../../bins/linker" }, { "path": "../../../config/matcher" diff --git a/installing/linking/modules-cleaner/package.json b/installing/linking/modules-cleaner/package.json index b67443e973..96071dc5fc 100644 --- a/installing/linking/modules-cleaner/package.json +++ b/installing/linking/modules-cleaner/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/modules-cleaner", + "name": "@pnpm/installing.linking.modules-cleaner", "version": "1001.0.23", "description": "Exports util functions to clean up node_modules", "keywords": [ @@ -31,14 +31,14 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/bins.remover": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", + "@pnpm/fs.read-modules-dir": "workspace:*", "@pnpm/lockfile.filtering": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/read-modules-dir": "workspace:*", - "@pnpm/remove-bins": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "catalog:", "ramda": "catalog:" @@ -47,8 +47,8 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { + "@pnpm/installing.linking.modules-cleaner": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/modules-cleaner": "workspace:*", "@types/ramda": "catalog:" }, "engines": { diff --git a/installing/linking/modules-cleaner/src/prune.ts b/installing/linking/modules-cleaner/src/prune.ts index db753ea19e..9dc643a12c 100644 --- a/installing/linking/modules-cleaner/src/prune.ts +++ b/installing/linking/modules-cleaner/src/prune.ts @@ -5,7 +5,8 @@ import { removalLogger, statsLogger, } from '@pnpm/core-loggers' -import { depPathToFilename } from '@pnpm/dependency-path' +import { depPathToFilename } from '@pnpm/deps.path' +import { readModulesDir } from '@pnpm/fs.read-modules-dir' import { filterLockfile, filterLockfileByImporters } from '@pnpm/lockfile.filtering' import type { LockfileObject, @@ -14,8 +15,7 @@ import type { } from '@pnpm/lockfile.types' import { packageIdFromSnapshot } from '@pnpm/lockfile.utils' import { logger } from '@pnpm/logger' -import { readModulesDir } from '@pnpm/read-modules-dir' -import type { StoreController } from '@pnpm/store-controller-types' +import type { StoreController } from '@pnpm/store.controller-types' import { DEPENDENCIES_FIELDS, type DependenciesField, diff --git a/installing/linking/modules-cleaner/src/removeDirectDependency.ts b/installing/linking/modules-cleaner/src/removeDirectDependency.ts index 348658660d..658dae6eb4 100644 --- a/installing/linking/modules-cleaner/src/removeDirectDependency.ts +++ b/installing/linking/modules-cleaner/src/removeDirectDependency.ts @@ -1,8 +1,8 @@ import { promises as fs } from 'node:fs' import path from 'node:path' +import { removeBin, removeBinsOfDependency } from '@pnpm/bins.remover' import { rootLogger } from '@pnpm/core-loggers' -import { removeBin, removeBinsOfDependency } from '@pnpm/remove-bins' import type { DependenciesField, ProjectRootDir } from '@pnpm/types' import { rimraf } from '@zkochan/rimraf' diff --git a/installing/linking/modules-cleaner/tsconfig.json b/installing/linking/modules-cleaner/tsconfig.json index 9126e4e047..3e5efecdb3 100644 --- a/installing/linking/modules-cleaner/tsconfig.json +++ b/installing/linking/modules-cleaner/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../../bins/remove-bins" + "path": "../../../bins/remover" }, { - "path": "../../../deps/dependency-path" + "path": "../../../deps/path" }, { "path": "../../../fs/read-modules-dir" @@ -37,7 +37,7 @@ "path": "../../../packages/types" }, { - "path": "../../../store/store-controller-types" + "path": "../../../store/controller-types" } ] } diff --git a/installing/linking/real-hoist/package.json b/installing/linking/real-hoist/package.json index 72d797001d..80e53914a2 100644 --- a/installing/linking/real-hoist/package.json +++ b/installing/linking/real-hoist/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/real-hoist", + "name": "@pnpm/installing.linking.real-hoist", "version": "1001.0.20", "description": "Hoists dependencies in a node_modules created by pnpm", "keywords": [ @@ -32,14 +32,14 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@yarnpkg/nm": "catalog:" }, "devDependencies": { + "@pnpm/installing.linking.real-hoist": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", - "@pnpm/real-hoist": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@pnpm/types": "workspace:*" }, diff --git a/installing/linking/real-hoist/src/index.ts b/installing/linking/real-hoist/src/index.ts index 7890f57760..105b1c6a1c 100644 --- a/installing/linking/real-hoist/src/index.ts +++ b/installing/linking/real-hoist/src/index.ts @@ -1,4 +1,4 @@ -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import { LockfileMissingDependencyError } from '@pnpm/error' import { type LockfileObject, diff --git a/installing/linking/real-hoist/test/index.ts b/installing/linking/real-hoist/test/index.ts index c6512c6448..af79e4026d 100644 --- a/installing/linking/real-hoist/test/index.ts +++ b/installing/linking/real-hoist/test/index.ts @@ -1,5 +1,5 @@ +import { hoist } from '@pnpm/installing.linking.real-hoist' import { readWantedLockfile } from '@pnpm/lockfile.fs' -import { hoist } from '@pnpm/real-hoist' import { fixtures } from '@pnpm/test-fixtures' import type { ProjectId } from '@pnpm/types' diff --git a/installing/linking/real-hoist/tsconfig.json b/installing/linking/real-hoist/tsconfig.json index ae43f4886b..90a3325dcb 100644 --- a/installing/linking/real-hoist/tsconfig.json +++ b/installing/linking/real-hoist/tsconfig.json @@ -15,7 +15,7 @@ "path": "../../../__utils__/test-fixtures" }, { - "path": "../../../deps/dependency-path" + "path": "../../../deps/path" }, { "path": "../../../lockfile/fs" diff --git a/installing/modules-yaml/package.json b/installing/modules-yaml/package.json index 45b3155bd4..b81f153544 100644 --- a/installing/modules-yaml/package.json +++ b/installing/modules-yaml/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/modules-yaml", + "name": "@pnpm/installing.modules-yaml", "version": "1000.3.6", "description": "Reads/writes `node_modules/.modules.yaml`", "keywords": [ @@ -33,14 +33,14 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/graceful-fs": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "@pnpm/types": "workspace:*", "is-windows": "catalog:", "ramda": "catalog:", "read-yaml-file": "catalog:" }, "devDependencies": { - "@pnpm/modules-yaml": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@types/is-windows": "catalog:", "@types/ramda": "catalog:", "tempy": "catalog:" diff --git a/installing/modules-yaml/src/index.ts b/installing/modules-yaml/src/index.ts index 12b6119030..421a91ff6a 100644 --- a/installing/modules-yaml/src/index.ts +++ b/installing/modules-yaml/src/index.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import fs from '@pnpm/graceful-fs' +import fs from '@pnpm/fs.graceful-fs' import type { DependenciesField, DepPath, diff --git a/installing/modules-yaml/test/index.ts b/installing/modules-yaml/test/index.ts index d5ec963843..ba2d217685 100644 --- a/installing/modules-yaml/test/index.ts +++ b/installing/modules-yaml/test/index.ts @@ -1,7 +1,7 @@ /// import path from 'node:path' -import { readModulesManifest, type StrictModules, writeModulesManifest } from '@pnpm/modules-yaml' +import { readModulesManifest, type StrictModules, writeModulesManifest } from '@pnpm/installing.modules-yaml' import isWindows from 'is-windows' import { readYamlFileSync } from 'read-yaml-file' import { temporaryDirectory } from 'tempy' diff --git a/installing/package-requester/package.json b/installing/package-requester/package.json index 92a870f0e3..0b65674e27 100644 --- a/installing/package-requester/package.json +++ b/installing/package-requester/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/package-requester", + "name": "@pnpm/installing.package-requester", "version": "1008.0.0", "description": "Concurrent downloader of npm-compatible packages", "keywords": [ @@ -34,17 +34,17 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/config.package-is-installable": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", - "@pnpm/graceful-fs": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/fetching.pick-fetcher": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "@pnpm/hooks.types": "workspace:*", - "@pnpm/package-is-installable": "workspace:*", - "@pnpm/pick-fetcher": "workspace:*", - "@pnpm/resolver-base": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/store.cafs": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/types": "workspace:*", "detect-libc": "catalog:", @@ -63,13 +63,13 @@ }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/cafs-types": "workspace:*", - "@pnpm/client": "workspace:*", - "@pnpm/create-cafs-store": "workspace:*", "@pnpm/fs.msgpack-file": "workspace:*", + "@pnpm/installing.client": "workspace:*", + "@pnpm/installing.package-requester": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/package-requester": "workspace:*", "@pnpm/registry-mock": "catalog:", + "@pnpm/store.cafs-types": "workspace:*", + "@pnpm/store.create-cafs-store": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/normalize-path": "catalog:", "@types/ramda": "catalog:", diff --git a/installing/package-requester/src/index.ts b/installing/package-requester/src/index.ts index a30e307a61..e8ed2b1fe5 100644 --- a/installing/package-requester/src/index.ts +++ b/installing/package-requester/src/index.ts @@ -1,2 +1,2 @@ export { createPackageRequester } from './packageRequester.js' -export type { PackageResponse } from '@pnpm/store-controller-types' +export type { PackageResponse } from '@pnpm/store.controller-types' diff --git a/installing/package-requester/src/packageRequester.ts b/installing/package-requester/src/packageRequester.ts index f5cc4517af..79536f80c0 100644 --- a/installing/package-requester/src/packageRequester.ts +++ b/installing/package-requester/src/packageRequester.ts @@ -1,21 +1,20 @@ import { createReadStream, promises as fs } from 'node:fs' import path from 'node:path' -import type { Cafs } from '@pnpm/cafs-types' +import { packageIsInstallable } from '@pnpm/config.package-is-installable' import { fetchingProgressLogger, progressLogger } from '@pnpm/core-loggers' -import { depPathToFilename } from '@pnpm/dependency-path' +import { depPathToFilename } from '@pnpm/deps.path' import { PnpmError } from '@pnpm/error' import type { DirectoryFetcherResult, Fetchers, FetchOptions, FetchResult, -} from '@pnpm/fetcher-base' -import gfs from '@pnpm/graceful-fs' +} from '@pnpm/fetching.fetcher-base' +import { pickFetcher } from '@pnpm/fetching.pick-fetcher' +import gfs from '@pnpm/fs.graceful-fs' import type { CustomFetcher } from '@pnpm/hooks.types' import { logger } from '@pnpm/logger' -import { packageIsInstallable } from '@pnpm/package-is-installable' -import { pickFetcher } from '@pnpm/pick-fetcher' import type { AtomicResolution, DirectoryResolution, @@ -25,11 +24,11 @@ import type { ResolveFunction, ResolveResult, TarballResolution, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' import { normalizeBundledManifest, } from '@pnpm/store.cafs' -import { gitHostedStoreIndexKey, storeIndexKey } from '@pnpm/store.index' +import type { Cafs } from '@pnpm/store.cafs-types' import type { BundledManifest, FetchPackageToStoreFunction, @@ -41,7 +40,8 @@ import type { RequestPackageFunction, RequestPackageOptions, WantedDependency, -} from '@pnpm/store-controller-types' +} from '@pnpm/store.controller-types' +import { gitHostedStoreIndexKey, storeIndexKey } from '@pnpm/store.index' import type { DependencyManifest, SupportedArchitectures } from '@pnpm/types' import { calcMaxWorkers, diff --git a/installing/package-requester/test/index.ts b/installing/package-requester/test/index.ts index ce1b4fcf0a..e8cb1644d4 100644 --- a/installing/package-requester/test/index.ts +++ b/installing/package-requester/test/index.ts @@ -3,15 +3,15 @@ import fs from 'node:fs' import path from 'node:path' import { jest } from '@jest/globals' -import { createClient } from '@pnpm/client' -import { createCafsStore } from '@pnpm/create-cafs-store' -import { depPathToFilename } from '@pnpm/dependency-path' +import { depPathToFilename } from '@pnpm/deps.path' +import { createClient } from '@pnpm/installing.client' +import { createPackageRequester, type PackageResponse } from '@pnpm/installing.package-requester' import { streamParser } from '@pnpm/logger' -import { createPackageRequester, type PackageResponse } from '@pnpm/package-requester' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import type { PackageFilesIndex } from '@pnpm/store.cafs' +import type { PkgRequestFetchResult, PkgResolutionId, RequestPackageOptions } from '@pnpm/store.controller-types' +import { createCafsStore } from '@pnpm/store.create-cafs-store' import { StoreIndex } from '@pnpm/store.index' -import type { PkgRequestFetchResult, PkgResolutionId, RequestPackageOptions } from '@pnpm/store-controller-types' import { fixtures } from '@pnpm/test-fixtures' import { restartWorkerPool } from '@pnpm/worker' import delay from 'delay' @@ -883,7 +883,7 @@ test('fetch a git package without a package.json', async () => { const repo = 'denolib/camelcase' const commit = 'aeb6b15f9c9957c8fa56f9731e914c4d8a6d2f2b' - // Mock the HEAD request that isRepoPublic() in @pnpm/git-resolver makes to check if the repo is public. + // Mock the HEAD request that isRepoPublic() in @pnpm/resolving.git-resolver makes to check if the repo is public. // Without this, transient network failures cause the resolver to fall back to git+https:// instead of // resolving via the codeload tarball URL. const githubNock = nock('https://github.com', { allowUnmocked: true }) diff --git a/installing/package-requester/tsconfig.json b/installing/package-requester/tsconfig.json index f3a4c770cd..a3adde09ef 100644 --- a/installing/package-requester/tsconfig.json +++ b/installing/package-requester/tsconfig.json @@ -16,7 +16,7 @@ "path": "../../config/package-is-installable" }, { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../fetching/fetcher-base" @@ -54,15 +54,15 @@ { "path": "../../store/cafs-types" }, + { + "path": "../../store/controller-types" + }, { "path": "../../store/create-cafs-store" }, { "path": "../../store/index" }, - { - "path": "../../store/store-controller-types" - }, { "path": "../../worker" }, diff --git a/installing/read-projects-context/package.json b/installing/read-projects-context/package.json index 9b83732a80..bf7c61463f 100644 --- a/installing/read-projects-context/package.json +++ b/installing/read-projects-context/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/read-projects-context", + "name": "@pnpm/installing.read-projects-context", "version": "1000.0.24", "description": "Reads the current state of projects from modules manifest", "keywords": [ @@ -31,9 +31,9 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/config.normalize-registries": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/normalize-registries": "workspace:*", "@pnpm/types": "workspace:*", "realpath-missing": "catalog:" }, @@ -41,8 +41,8 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/logger": "workspace:*", - "@pnpm/read-projects-context": "workspace:*" + "@pnpm/installing.read-projects-context": "workspace:*", + "@pnpm/logger": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/installing/read-projects-context/src/index.ts b/installing/read-projects-context/src/index.ts index 61ab6fd644..c8ae951b62 100644 --- a/installing/read-projects-context/src/index.ts +++ b/installing/read-projects-context/src/index.ts @@ -2,9 +2,9 @@ import { promises as fs } from 'node:fs' import path from 'node:path' import util from 'node:util' +import { normalizeRegistries } from '@pnpm/config.normalize-registries' +import { type Modules, readModulesManifest } from '@pnpm/installing.modules-yaml' import { getLockfileImporterId } from '@pnpm/lockfile.fs' -import { type Modules, readModulesManifest } from '@pnpm/modules-yaml' -import { normalizeRegistries } from '@pnpm/normalize-registries' import type { DependenciesField, DepPath, diff --git a/installing/render-peer-issues/package.json b/installing/render-peer-issues/package.json index 94346eef4e..532dfa70e5 100644 --- a/installing/render-peer-issues/package.json +++ b/installing/render-peer-issues/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/render-peer-issues", + "name": "@pnpm/installing.render-peer-issues", "version": "1002.0.5", "description": "Visualizes peer dependency issues", "keywords": [ @@ -38,7 +38,7 @@ "cli-columns": "catalog:" }, "devDependencies": { - "@pnpm/render-peer-issues": "workspace:*" + "@pnpm/installing.render-peer-issues": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/installing/render-peer-issues/test/index.ts b/installing/render-peer-issues/test/index.ts index bc8325c2e8..2301048213 100644 --- a/installing/render-peer-issues/test/index.ts +++ b/installing/render-peer-issues/test/index.ts @@ -1,6 +1,6 @@ import { stripVTControlCharacters as stripAnsi } from 'node:util' -import { renderPeerIssues } from '@pnpm/render-peer-issues' +import { renderPeerIssues } from '@pnpm/installing.render-peer-issues' test('renderPeerIssues()', () => { expect(stripAnsi(renderPeerIssues({ diff --git a/installing/resolve-dependencies/package.json b/installing/resolve-dependencies/package.json index 7f047c9476..5fabf1a563 100644 --- a/installing/resolve-dependencies/package.json +++ b/installing/resolve-dependencies/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/resolve-dependencies", + "name": "@pnpm/installing.resolve-dependencies", "version": "1008.3.1", "description": "Resolves dependency graph of a package", "keywords": [ @@ -32,28 +32,28 @@ "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest" }, "dependencies": { - "@pnpm/calc-dep-state": "workspace:*", "@pnpm/catalogs.resolver": "workspace:*", "@pnpm/catalogs.types": "workspace:*", "@pnpm/config.version-policy": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.graph-hasher": "workspace:*", + "@pnpm/deps.path": "workspace:*", + "@pnpm/deps.peer-range": "workspace:*", "@pnpm/error": "workspace:*", + "@pnpm/fetching.pick-fetcher": "workspace:*", "@pnpm/hooks.types": "workspace:*", "@pnpm/lockfile.preferred-versions": "workspace:*", "@pnpm/lockfile.pruner": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/manifest-utils": "workspace:*", - "@pnpm/npm-resolver": "workspace:*", "@pnpm/patching.config": "workspace:*", "@pnpm/patching.types": "workspace:*", - "@pnpm/pick-fetcher": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/resolver-base": "workspace:*", - "@pnpm/semver.peer-range": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.utils": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "@pnpm/workspace.spec-parser": "workspace:*", @@ -77,8 +77,8 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { + "@pnpm/installing.resolve-dependencies": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/resolve-dependencies": "workspace:*", "@types/normalize-path": "catalog:", "@types/ramda": "catalog:", "@types/semver": "catalog:" diff --git a/installing/resolve-dependencies/src/getExactSinglePreferredVersions.ts b/installing/resolve-dependencies/src/getExactSinglePreferredVersions.ts index ab225916dc..8fc7c90c18 100644 --- a/installing/resolve-dependencies/src/getExactSinglePreferredVersions.ts +++ b/installing/resolve-dependencies/src/getExactSinglePreferredVersions.ts @@ -1,4 +1,4 @@ -import type { PreferredVersions } from '@pnpm/resolver-base' +import type { PreferredVersions } from '@pnpm/resolving.resolver-base' import type { WantedDependency } from './getWantedDependencies.js' import { unwrapPackageName } from './unwrapPackageName.js' diff --git a/installing/resolve-dependencies/src/getWantedDependencies.ts b/installing/resolve-dependencies/src/getWantedDependencies.ts index 2996a1280c..56f7aa9b2f 100644 --- a/installing/resolve-dependencies/src/getWantedDependencies.ts +++ b/installing/resolve-dependencies/src/getWantedDependencies.ts @@ -1,4 +1,4 @@ -import { filterDependenciesByType } from '@pnpm/manifest-utils' +import { filterDependenciesByType } from '@pnpm/pkg-manifest.utils' import type { Dependencies, DependenciesMeta, diff --git a/installing/resolve-dependencies/src/hoistPeers.ts b/installing/resolve-dependencies/src/hoistPeers.ts index a464441022..8b56cbced8 100644 --- a/installing/resolve-dependencies/src/hoistPeers.ts +++ b/installing/resolve-dependencies/src/hoistPeers.ts @@ -1,4 +1,4 @@ -import type { PreferredVersions } from '@pnpm/resolver-base' +import type { PreferredVersions } from '@pnpm/resolving.resolver-base' import { lexCompare } from '@pnpm/util.lex-comparator' import semver from 'semver' diff --git a/installing/resolve-dependencies/src/index.ts b/installing/resolve-dependencies/src/index.ts index c932430745..1e83cb1f72 100644 --- a/installing/resolve-dependencies/src/index.ts +++ b/installing/resolve-dependencies/src/index.ts @@ -1,21 +1,21 @@ import path from 'node:path' -import { iterateHashedGraphNodes } from '@pnpm/calc-dep-state' import type { Catalogs } from '@pnpm/catalogs.types' import { packageManifestLogger, } from '@pnpm/core-loggers' -import { isRuntimeDepPath } from '@pnpm/dependency-path' +import { iterateHashedGraphNodes } from '@pnpm/deps.graph-hasher' +import { isRuntimeDepPath } from '@pnpm/deps.path' import type { LockfileObject, ProjectSnapshot, } from '@pnpm/lockfile.types' +import { verifyPatches } from '@pnpm/patching.config' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import { getAllDependenciesFromManifest, getSpecFromPackageManifest, -} from '@pnpm/manifest-utils' -import { verifyPatches } from '@pnpm/patching.config' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +} from '@pnpm/pkg-manifest.utils' import { type AllowBuild, DEPENDENCIES_FIELDS, diff --git a/installing/resolve-dependencies/src/resolveDependencies.ts b/installing/resolve-dependencies/src/resolveDependencies.ts index f571a333dd..45500d3718 100644 --- a/installing/resolve-dependencies/src/resolveDependencies.ts +++ b/installing/resolve-dependencies/src/resolveDependencies.ts @@ -6,7 +6,7 @@ import { progressLogger, skippedOptionalDependencyLogger, } from '@pnpm/core-loggers' -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import { PnpmError } from '@pnpm/error' import { getPreferredVersionsFromLockfileAndManifests } from '@pnpm/lockfile.preferred-versions' import type { @@ -19,9 +19,9 @@ import { pkgSnapshotToResolution, } from '@pnpm/lockfile.utils' import { logger } from '@pnpm/logger' -import { convertEnginesRuntimeToDependencies } from '@pnpm/manifest-utils' import { getPatchInfo, type PatchGroupRecord } from '@pnpm/patching.config' import type { PatchInfo } from '@pnpm/patching.types' +import { convertEnginesRuntimeToDependencies } from '@pnpm/pkg-manifest.utils' import { DIRECT_DEP_SELECTOR_WEIGHT, type DirectoryResolution, @@ -29,12 +29,12 @@ import { type PreferredVersions, type Resolution, type WorkspacePackages, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' import type { PackageResponse, PkgRequestFetchResult, StoreController, -} from '@pnpm/store-controller-types' +} from '@pnpm/store.controller-types' import type { AllowBuild, AllowedDeprecatedVersions, diff --git a/installing/resolve-dependencies/src/resolveDependencyTree.ts b/installing/resolve-dependencies/src/resolveDependencyTree.ts index 642951845a..f973e546e2 100644 --- a/installing/resolve-dependencies/src/resolveDependencyTree.ts +++ b/installing/resolve-dependencies/src/resolveDependencyTree.ts @@ -5,8 +5,8 @@ import { PnpmError } from '@pnpm/error' import type { LockfileObject } from '@pnpm/lockfile.types' import { globalWarn } from '@pnpm/logger' import type { PatchGroupRecord } from '@pnpm/patching.config' -import type { PreferredVersions, Resolution, WorkspacePackages } from '@pnpm/resolver-base' -import type { StoreController } from '@pnpm/store-controller-types' +import type { PreferredVersions, Resolution, WorkspacePackages } from '@pnpm/resolving.resolver-base' +import type { StoreController } from '@pnpm/store.controller-types' import type { AllowBuild, AllowedDeprecatedVersions, diff --git a/installing/resolve-dependencies/src/resolvePeers.ts b/installing/resolve-dependencies/src/resolvePeers.ts index 4454497a48..f9e0fd0eaa 100644 --- a/installing/resolve-dependencies/src/resolvePeers.ts +++ b/installing/resolve-dependencies/src/resolvePeers.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { createPeerDepGraphHash, depPathToFilename, type PeerId } from '@pnpm/dependency-path' +import { createPeerDepGraphHash, depPathToFilename, type PeerId } from '@pnpm/deps.path' import type { DepPath, ParentPackages, diff --git a/installing/resolve-dependencies/src/toResolveImporter.ts b/installing/resolve-dependencies/src/toResolveImporter.ts index a18cdf8d59..5d06ba7e42 100644 --- a/installing/resolve-dependencies/src/toResolveImporter.ts +++ b/installing/resolve-dependencies/src/toResolveImporter.ts @@ -1,9 +1,9 @@ import { logger } from '@pnpm/logger' -import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils' +import { getAllDependenciesFromManifest } from '@pnpm/pkg-manifest.utils' import type { PreferredVersions, WorkspacePackages, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' import type { Dependencies, ProjectManifest } from '@pnpm/types' import getVerSelType from 'version-selector-type' diff --git a/installing/resolve-dependencies/src/updateLockfile.ts b/installing/resolve-dependencies/src/updateLockfile.ts index cf58f980b3..91ca455025 100644 --- a/installing/resolve-dependencies/src/updateLockfile.ts +++ b/installing/resolve-dependencies/src/updateLockfile.ts @@ -1,4 +1,4 @@ -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import { type LockfileObject, type PackageSnapshot, diff --git a/installing/resolve-dependencies/src/updateProjectManifest.ts b/installing/resolve-dependencies/src/updateProjectManifest.ts index d197da57e8..c8e0292dc8 100644 --- a/installing/resolve-dependencies/src/updateProjectManifest.ts +++ b/installing/resolve-dependencies/src/updateProjectManifest.ts @@ -1,7 +1,7 @@ import { type PackageSpecObject, updateProjectManifestObject, -} from '@pnpm/manifest-utils' +} from '@pnpm/pkg-manifest.utils' import type { ProjectManifest } from '@pnpm/types' import type { ImporterToResolve } from './index.js' diff --git a/installing/resolve-dependencies/src/validatePeerDependencies.ts b/installing/resolve-dependencies/src/validatePeerDependencies.ts index d10aa4be4b..a90ffd30c0 100644 --- a/installing/resolve-dependencies/src/validatePeerDependencies.ts +++ b/installing/resolve-dependencies/src/validatePeerDependencies.ts @@ -1,5 +1,5 @@ +import { isValidPeerRange } from '@pnpm/deps.peer-range' import { PnpmError } from '@pnpm/error' -import { isValidPeerRange } from '@pnpm/semver.peer-range' import type { ProjectManifest } from '@pnpm/types' export interface ProjectToValidate { diff --git a/installing/resolve-dependencies/src/wantedDepIsLocallyAvailable.ts b/installing/resolve-dependencies/src/wantedDepIsLocallyAvailable.ts index 11095b3ed4..e5b5f294ce 100644 --- a/installing/resolve-dependencies/src/wantedDepIsLocallyAvailable.ts +++ b/installing/resolve-dependencies/src/wantedDepIsLocallyAvailable.ts @@ -1,5 +1,5 @@ -import { parseBareSpecifier, type RegistryPackageSpec } from '@pnpm/npm-resolver' -import type { WorkspacePackages, WorkspacePackagesByVersion } from '@pnpm/resolver-base' +import { parseBareSpecifier, type RegistryPackageSpec } from '@pnpm/resolving.npm-resolver' +import type { WorkspacePackages, WorkspacePackagesByVersion } from '@pnpm/resolving.resolver-base' import semver from 'semver' import type { WantedDependency } from './getNonDevWantedDependencies.js' @@ -17,7 +17,7 @@ export function wantedDepIsLocallyAvailable ( return pickMatchingLocalVersionOrNull(workspacePackages.get(spec.name)!, spec) !== null } -// TODO: move this function to separate package or import from @pnpm/npm-resolver +// TODO: move this function to separate package or import from @pnpm/resolving.npm-resolver function pickMatchingLocalVersionOrNull ( versions: WorkspacePackagesByVersion, spec: RegistryPackageSpec diff --git a/installing/resolve-dependencies/test/getManifestFromResponse.test.ts b/installing/resolve-dependencies/test/getManifestFromResponse.test.ts index ca5f663768..5ea4806df7 100644 --- a/installing/resolve-dependencies/test/getManifestFromResponse.test.ts +++ b/installing/resolve-dependencies/test/getManifestFromResponse.test.ts @@ -1,4 +1,4 @@ -import type { PackageResponse } from '@pnpm/store-controller-types' +import type { PackageResponse } from '@pnpm/store.controller-types' import { getManifestFromResponse, type WantedDependency } from '../lib/resolveDependencies.js' diff --git a/installing/resolve-dependencies/tsconfig.json b/installing/resolve-dependencies/tsconfig.json index 1680d05560..87626c8ab2 100644 --- a/installing/resolve-dependencies/tsconfig.json +++ b/installing/resolve-dependencies/tsconfig.json @@ -19,10 +19,10 @@ "path": "../../config/version-policy" }, { - "path": "../../deps/calc-dep-state" + "path": "../../deps/graph-hasher" }, { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../deps/peer-range" @@ -67,10 +67,10 @@ "path": "../../patching/types" }, { - "path": "../../pkg-manifest/manifest-utils" + "path": "../../pkg-manifest/read-package-json" }, { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/utils" }, { "path": "../../resolving/npm-resolver" @@ -79,7 +79,7 @@ "path": "../../resolving/resolver-base" }, { - "path": "../../store/store-controller-types" + "path": "../../store/controller-types" }, { "path": "../../workspace/spec-parser" diff --git a/lockfile/detect-dep-types/package.json b/lockfile/detect-dep-types/package.json index a6a5d2a1b9..5be9591f09 100644 --- a/lockfile/detect-dep-types/package.json +++ b/lockfile/detect-dep-types/package.json @@ -32,7 +32,7 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*" }, diff --git a/lockfile/detect-dep-types/src/index.ts b/lockfile/detect-dep-types/src/index.ts index 8f519cadd7..12703c1ee3 100644 --- a/lockfile/detect-dep-types/src/index.ts +++ b/lockfile/detect-dep-types/src/index.ts @@ -1,4 +1,4 @@ -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import type { LockfileObject, PackageSnapshots, ResolvedDependencies } from '@pnpm/lockfile.types' import type { DepPath } from '@pnpm/types' diff --git a/lockfile/detect-dep-types/tsconfig.json b/lockfile/detect-dep-types/tsconfig.json index 23d5a39170..7bd3ad681b 100644 --- a/lockfile/detect-dep-types/tsconfig.json +++ b/lockfile/detect-dep-types/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../packages/types" diff --git a/lockfile/filtering/package.json b/lockfile/filtering/package.json index 7b43b17c24..f1c1ff7d40 100644 --- a/lockfile/filtering/package.json +++ b/lockfile/filtering/package.json @@ -33,13 +33,13 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/config.package-is-installable": "workspace:*", "@pnpm/constants": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/lockfile.walker": "workspace:*", - "@pnpm/package-is-installable": "workspace:*", "@pnpm/types": "workspace:*", "ramda": "catalog:" }, diff --git a/lockfile/filtering/src/filterLockfileByImportersAndEngine.ts b/lockfile/filtering/src/filterLockfileByImportersAndEngine.ts index 28ab8f17ad..a21d80be37 100644 --- a/lockfile/filtering/src/filterLockfileByImportersAndEngine.ts +++ b/lockfile/filtering/src/filterLockfileByImportersAndEngine.ts @@ -1,5 +1,6 @@ +import { packageIsInstallable } from '@pnpm/config.package-is-installable' import { WANTED_LOCKFILE } from '@pnpm/constants' -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import { LockfileMissingDependencyError } from '@pnpm/error' import type { LockfileObject, @@ -7,7 +8,6 @@ import type { } from '@pnpm/lockfile.types' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils' import { logger } from '@pnpm/logger' -import { packageIsInstallable } from '@pnpm/package-is-installable' import type { DependenciesField, DepPath, ProjectId, SupportedArchitectures } from '@pnpm/types' import { map as mapValues, pickBy, unnest } from 'ramda' diff --git a/lockfile/filtering/tsconfig.json b/lockfile/filtering/tsconfig.json index 75e77bca86..342636b44b 100644 --- a/lockfile/filtering/tsconfig.json +++ b/lockfile/filtering/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../config/package-is-installable" }, { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../packages/constants" diff --git a/lockfile/fs/package.json b/lockfile/fs/package.json index 0e3812ad3c..f4056839d3 100644 --- a/lockfile/fs/package.json +++ b/lockfile/fs/package.json @@ -35,12 +35,12 @@ }, "dependencies": { "@pnpm/constants": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/git-utils": "workspace:*", "@pnpm/lockfile.merger": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", + "@pnpm/network.git-utils": "workspace:*", "@pnpm/object.key-sorting": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "catalog:", diff --git a/lockfile/fs/src/lockfileFormatConverters.ts b/lockfile/fs/src/lockfileFormatConverters.ts index e0a2668135..fb2470ade8 100644 --- a/lockfile/fs/src/lockfileFormatConverters.ts +++ b/lockfile/fs/src/lockfileFormatConverters.ts @@ -1,5 +1,5 @@ import { LOCKFILE_VERSION } from '@pnpm/constants' -import { refToRelative, removeSuffix } from '@pnpm/dependency-path' +import { refToRelative, removeSuffix } from '@pnpm/deps.path' import type { LockfileFile, LockfileFileProjectResolvedDependencies, diff --git a/lockfile/fs/src/lockfileName.ts b/lockfile/fs/src/lockfileName.ts index a17debe5f5..c0d92ed9a4 100644 --- a/lockfile/fs/src/lockfileName.ts +++ b/lockfile/fs/src/lockfileName.ts @@ -1,5 +1,5 @@ import { WANTED_LOCKFILE } from '@pnpm/constants' -import { getCurrentBranch } from '@pnpm/git-utils' +import { getCurrentBranch } from '@pnpm/network.git-utils' export interface GetWantedLockfileNameOptions { useGitBranchLockfile?: boolean diff --git a/lockfile/fs/test/lockfileName.test.ts b/lockfile/fs/test/lockfileName.test.ts index e40fd2fa4e..2754bea6c2 100644 --- a/lockfile/fs/test/lockfileName.test.ts +++ b/lockfile/fs/test/lockfileName.test.ts @@ -1,9 +1,9 @@ import { jest } from '@jest/globals' import { WANTED_LOCKFILE } from '@pnpm/constants' -jest.unstable_mockModule('@pnpm/git-utils', () => ({ getCurrentBranch: jest.fn() })) +jest.unstable_mockModule('@pnpm/network.git-utils', () => ({ getCurrentBranch: jest.fn() })) -const { getCurrentBranch } = await import('@pnpm/git-utils') +const { getCurrentBranch } = await import('@pnpm/network.git-utils') const { getWantedLockfileName } = await import('../lib/lockfileName.js') describe('lockfileName', () => { diff --git a/lockfile/fs/test/read.test.ts b/lockfile/fs/test/read.test.ts index 1199368705..324fd40587 100644 --- a/lockfile/fs/test/read.test.ts +++ b/lockfile/fs/test/read.test.ts @@ -4,9 +4,9 @@ import { jest } from '@jest/globals' import type { DepPath, ProjectId } from '@pnpm/types' import { temporaryDirectory } from 'tempy' -jest.unstable_mockModule('@pnpm/git-utils', () => ({ getCurrentBranch: jest.fn() })) +jest.unstable_mockModule('@pnpm/network.git-utils', () => ({ getCurrentBranch: jest.fn() })) -const { getCurrentBranch } = await import('@pnpm/git-utils') +const { getCurrentBranch } = await import('@pnpm/network.git-utils') const { existsNonEmptyWantedLockfile, readCurrentLockfile, diff --git a/lockfile/fs/test/write.test.ts b/lockfile/fs/test/write.test.ts index 844a91212c..0c1ec6dd1b 100644 --- a/lockfile/fs/test/write.test.ts +++ b/lockfile/fs/test/write.test.ts @@ -7,9 +7,9 @@ import type { ProjectId } from '@pnpm/types' import { temporaryDirectory } from 'tempy' import yaml from 'yaml-tag' -jest.unstable_mockModule('@pnpm/git-utils', () => ({ getCurrentBranch: jest.fn() })) +jest.unstable_mockModule('@pnpm/network.git-utils', () => ({ getCurrentBranch: jest.fn() })) -const { getCurrentBranch } = await import('@pnpm/git-utils') +const { getCurrentBranch } = await import('@pnpm/network.git-utils') const { readCurrentLockfile, readWantedLockfile, diff --git a/lockfile/fs/tsconfig.json b/lockfile/fs/tsconfig.json index 41de387076..083bc57290 100644 --- a/lockfile/fs/tsconfig.json +++ b/lockfile/fs/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../network/git-utils" diff --git a/lockfile/make-dedicated-lockfile/package.json b/lockfile/make-dedicated-lockfile/package.json index 625bd996e6..a6f55fd706 100644 --- a/lockfile/make-dedicated-lockfile/package.json +++ b/lockfile/make-dedicated-lockfile/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/make-dedicated-lockfile", + "name": "@pnpm/lockfile.make-dedicated-lockfile", "version": "1000.0.28", "description": "Creates a dedicated lockfile for a subset of workspace projects", "keywords": [ @@ -36,18 +36,18 @@ "dependencies": { "@pnpm/error": "workspace:*", "@pnpm/exec": "catalog:", - "@pnpm/exportable-manifest": "workspace:*", - "@pnpm/find-workspace-dir": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.pruner": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", + "@pnpm/releasing.exportable-manifest": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", + "@pnpm/workspace.root-finder": "workspace:*", "ramda": "catalog:", "rename-overwrite": "catalog:" }, "devDependencies": { - "@pnpm/make-dedicated-lockfile": "workspace:*", + "@pnpm/lockfile.make-dedicated-lockfile": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/ramda": "catalog:", "execa": "catalog:" diff --git a/lockfile/make-dedicated-lockfile/src/bin.ts b/lockfile/make-dedicated-lockfile/src/bin.ts index 3ed869a2ff..ab58a2b171 100644 --- a/lockfile/make-dedicated-lockfile/src/bin.ts +++ b/lockfile/make-dedicated-lockfile/src/bin.ts @@ -1,5 +1,5 @@ import { PnpmError } from '@pnpm/error' -import { findWorkspaceDir } from '@pnpm/find-workspace-dir' +import { findWorkspaceDir } from '@pnpm/workspace.root-finder' import { makeDedicatedLockfile } from './index.js' diff --git a/lockfile/make-dedicated-lockfile/src/index.ts b/lockfile/make-dedicated-lockfile/src/index.ts index b35cc297aa..077f3850a6 100644 --- a/lockfile/make-dedicated-lockfile/src/index.ts +++ b/lockfile/make-dedicated-lockfile/src/index.ts @@ -1,7 +1,6 @@ import path from 'node:path' import pnpmExec from '@pnpm/exec' -import { createExportableManifest } from '@pnpm/exportable-manifest' import { getLockfileImporterId, type ProjectSnapshot, @@ -9,8 +8,9 @@ import { writeWantedLockfile, } from '@pnpm/lockfile.fs' import { pruneSharedLockfile } from '@pnpm/lockfile.pruner' -import { readProjectManifest } from '@pnpm/read-project-manifest' +import { createExportableManifest } from '@pnpm/releasing.exportable-manifest' import { DEPENDENCIES_FIELDS, type ProjectId, type ProjectManifest } from '@pnpm/types' +import { readProjectManifest } from '@pnpm/workspace.project-manifest-reader' import { pickBy } from 'ramda' import { renameOverwrite } from 'rename-overwrite' @@ -38,7 +38,7 @@ export async function makeDedicatedLockfile (lockfileDir: string, projectDir: st const { manifest, writeProjectManifest } = await readProjectManifest(projectDir) const publishManifest = await createExportableManifest(projectDir, manifest, { - // Since @pnpm/make-dedicated-lockfile is deprecated, avoid supporting new + // Since @pnpm/lockfile.make-dedicated-lockfile is deprecated, avoid supporting new // features like pnpm catalogs. Passing in an empty catalog object // intentionally. catalogs: {}, diff --git a/lockfile/make-dedicated-lockfile/tsconfig.json b/lockfile/make-dedicated-lockfile/tsconfig.json index 288ea1f8de..c7c0f63477 100644 --- a/lockfile/make-dedicated-lockfile/tsconfig.json +++ b/lockfile/make-dedicated-lockfile/tsconfig.json @@ -22,13 +22,13 @@ "path": "../../packages/types" }, { - "path": "../../pkg-manifest/exportable-manifest" + "path": "../../releasing/exportable-manifest" }, { - "path": "../../pkg-manifest/read-project-manifest" + "path": "../../workspace/project-manifest-reader" }, { - "path": "../../workspace/find-workspace-dir" + "path": "../../workspace/root-finder" }, { "path": "../fs" diff --git a/lockfile/preferred-versions/package.json b/lockfile/preferred-versions/package.json index b9b35f637e..e4735ae4f5 100644 --- a/lockfile/preferred-versions/package.json +++ b/lockfile/preferred-versions/package.json @@ -33,8 +33,8 @@ }, "dependencies": { "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/manifest-utils": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/pkg-manifest.utils": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", "version-selector-type": "catalog:" }, diff --git a/lockfile/preferred-versions/src/index.ts b/lockfile/preferred-versions/src/index.ts index 461eda80e1..71293ae569 100644 --- a/lockfile/preferred-versions/src/index.ts +++ b/lockfile/preferred-versions/src/index.ts @@ -1,6 +1,6 @@ import { nameVerFromPkgSnapshot, type PackageSnapshots } from '@pnpm/lockfile.utils' -import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils' -import { DIRECT_DEP_SELECTOR_WEIGHT, type PreferredVersions } from '@pnpm/resolver-base' +import { getAllDependenciesFromManifest } from '@pnpm/pkg-manifest.utils' +import { DIRECT_DEP_SELECTOR_WEIGHT, type PreferredVersions } from '@pnpm/resolving.resolver-base' import type { DependencyManifest, ProjectManifest } from '@pnpm/types' import getVersionSelectorType from 'version-selector-type' diff --git a/lockfile/preferred-versions/tsconfig.json b/lockfile/preferred-versions/tsconfig.json index c82fdcfdda..e0b2998d24 100644 --- a/lockfile/preferred-versions/tsconfig.json +++ b/lockfile/preferred-versions/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../packages/types" }, { - "path": "../../pkg-manifest/manifest-utils" + "path": "../../pkg-manifest/utils" }, { "path": "../../resolving/resolver-base" diff --git a/lockfile/pruner/package.json b/lockfile/pruner/package.json index 067d6f01ef..830e8797da 100644 --- a/lockfile/pruner/package.json +++ b/lockfile/pruner/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@pnpm/constants": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*", "ramda": "catalog:" diff --git a/lockfile/pruner/src/index.ts b/lockfile/pruner/src/index.ts index ee21c6c38e..f340421edf 100644 --- a/lockfile/pruner/src/index.ts +++ b/lockfile/pruner/src/index.ts @@ -1,5 +1,5 @@ import { LOCKFILE_VERSION } from '@pnpm/constants' -import { refToRelative } from '@pnpm/dependency-path' +import { refToRelative } from '@pnpm/deps.path' import type { LockfileObject, PackageSnapshots, @@ -11,7 +11,7 @@ import { difference, isEmpty, unnest } from 'ramda' export * from '@pnpm/lockfile.types' -// cannot import DependenciesGraph from @pnpm/resolve-dependencies due to circular dependency +// cannot import DependenciesGraph from @pnpm/installing.resolve-dependencies due to circular dependency type DependenciesGraph = Record export function pruneSharedLockfile ( diff --git a/lockfile/pruner/tsconfig.json b/lockfile/pruner/tsconfig.json index 78977c60c4..dcbe541f47 100644 --- a/lockfile/pruner/tsconfig.json +++ b/lockfile/pruner/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../packages/constants" diff --git a/lockfile/settings-checker/package.json b/lockfile/settings-checker/package.json index 0cb81c8b3e..47cfdce7ea 100644 --- a/lockfile/settings-checker/package.json +++ b/lockfile/settings-checker/package.json @@ -34,10 +34,10 @@ }, "dependencies": { "@pnpm/catalogs.types": "workspace:*", + "@pnpm/config.parse-overrides": "workspace:*", "@pnpm/crypto.hash": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.verification": "workspace:*", - "@pnpm/parse-overrides": "workspace:*", "p-map-values": "catalog:", "ramda": "catalog:" }, diff --git a/lockfile/settings-checker/src/createOverridesMapFromParsed.ts b/lockfile/settings-checker/src/createOverridesMapFromParsed.ts index ac6cfa731d..7589ce75a8 100644 --- a/lockfile/settings-checker/src/createOverridesMapFromParsed.ts +++ b/lockfile/settings-checker/src/createOverridesMapFromParsed.ts @@ -1,4 +1,4 @@ -import type { VersionOverride } from '@pnpm/parse-overrides' +import type { VersionOverride } from '@pnpm/config.parse-overrides' export function createOverridesMapFromParsed (parsedOverrides: VersionOverride[] | undefined): Record { if (!parsedOverrides) return {} diff --git a/lockfile/lockfile-to-pnp/CHANGELOG.md b/lockfile/to-pnp/CHANGELOG.md similarity index 100% rename from lockfile/lockfile-to-pnp/CHANGELOG.md rename to lockfile/to-pnp/CHANGELOG.md diff --git a/lockfile/lockfile-to-pnp/README.md b/lockfile/to-pnp/README.md similarity index 100% rename from lockfile/lockfile-to-pnp/README.md rename to lockfile/to-pnp/README.md diff --git a/lockfile/lockfile-to-pnp/package.json b/lockfile/to-pnp/package.json similarity index 85% rename from lockfile/lockfile-to-pnp/package.json rename to lockfile/to-pnp/package.json index 9cfa364547..5f7a70878b 100644 --- a/lockfile/lockfile-to-pnp/package.json +++ b/lockfile/to-pnp/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/lockfile-to-pnp", + "name": "@pnpm/lockfile.to-pnp", "version": "1001.0.23", "description": "Creates a Plug'n'Play file from a pnpm-lock.yaml", "keywords": [ @@ -10,8 +10,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/lockfile/lockfile-to-pnp", - "homepage": "https://github.com/pnpm/pnpm/tree/main/lockfile/lockfile-to-pnp#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/lockfile/to-pnp", + "homepage": "https://github.com/pnpm/pnpm/tree/main/lockfile/to-pnp#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -33,7 +33,7 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/types": "workspace:*", @@ -45,7 +45,7 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/lockfile-to-pnp": "workspace:*", + "@pnpm/lockfile.to-pnp": "workspace:*", "@pnpm/logger": "workspace:*", "@types/normalize-path": "catalog:", "@types/ramda": "catalog:" diff --git a/lockfile/lockfile-to-pnp/src/index.ts b/lockfile/to-pnp/src/index.ts similarity index 98% rename from lockfile/lockfile-to-pnp/src/index.ts rename to lockfile/to-pnp/src/index.ts index 4e00c931a3..284f055559 100644 --- a/lockfile/lockfile-to-pnp/src/index.ts +++ b/lockfile/to-pnp/src/index.ts @@ -1,7 +1,7 @@ import { promises as fs } from 'node:fs' import path from 'node:path' -import { depPathToFilename, refToRelative } from '@pnpm/dependency-path' +import { depPathToFilename, refToRelative } from '@pnpm/deps.path' import type { LockfileObject } from '@pnpm/lockfile.fs' import { nameVerFromPkgSnapshot, diff --git a/lockfile/lockfile-to-pnp/test/index.ts b/lockfile/to-pnp/test/index.ts similarity index 98% rename from lockfile/lockfile-to-pnp/test/index.ts rename to lockfile/to-pnp/test/index.ts index e30f4f4704..352f3e2537 100644 --- a/lockfile/lockfile-to-pnp/test/index.ts +++ b/lockfile/to-pnp/test/index.ts @@ -1,7 +1,7 @@ // cspell:ignore haspeer import path from 'node:path' -import { lockfileToPackageRegistry } from '@pnpm/lockfile-to-pnp' +import { lockfileToPackageRegistry } from '@pnpm/lockfile.to-pnp' import type { DepPath, ProjectId } from '@pnpm/types' test('lockfileToPackageRegistry', () => { diff --git a/lockfile/lockfile-to-pnp/test/tsconfig.json b/lockfile/to-pnp/test/tsconfig.json similarity index 100% rename from lockfile/lockfile-to-pnp/test/tsconfig.json rename to lockfile/to-pnp/test/tsconfig.json diff --git a/lockfile/lockfile-to-pnp/tsconfig.json b/lockfile/to-pnp/tsconfig.json similarity index 89% rename from lockfile/lockfile-to-pnp/tsconfig.json rename to lockfile/to-pnp/tsconfig.json index 716bb289fe..1729923945 100644 --- a/lockfile/lockfile-to-pnp/tsconfig.json +++ b/lockfile/to-pnp/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../packages/logger" diff --git a/lockfile/lockfile-to-pnp/tsconfig.lint.json b/lockfile/to-pnp/tsconfig.lint.json similarity index 100% rename from lockfile/lockfile-to-pnp/tsconfig.lint.json rename to lockfile/to-pnp/tsconfig.lint.json diff --git a/lockfile/types/package.json b/lockfile/types/package.json index 3afe446d6b..56224cec43 100644 --- a/lockfile/types/package.json +++ b/lockfile/types/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@pnpm/patching.types": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*" }, "devDependencies": { diff --git a/lockfile/types/src/index.ts b/lockfile/types/src/index.ts index d96c326f03..64f2740567 100644 --- a/lockfile/types/src/index.ts +++ b/lockfile/types/src/index.ts @@ -1,4 +1,4 @@ -import type { PlatformAssetTarget } from '@pnpm/resolver-base' +import type { PlatformAssetTarget } from '@pnpm/resolving.resolver-base' import type { DependenciesMeta, DepPath, ProjectId } from '@pnpm/types' export type { ProjectId } diff --git a/lockfile/utils/package.json b/lockfile/utils/package.json index dac142e47c..d00612457c 100644 --- a/lockfile/utils/package.json +++ b/lockfile/utils/package.json @@ -33,12 +33,12 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", + "@pnpm/fetching.pick-fetcher": "workspace:*", "@pnpm/hooks.types": "workspace:*", "@pnpm/lockfile.types": "workspace:*", - "@pnpm/pick-fetcher": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", "get-npm-tarball-url": "catalog:", "ramda": "catalog:" diff --git a/lockfile/utils/src/index.ts b/lockfile/utils/src/index.ts index a894bef614..0130d787ed 100644 --- a/lockfile/utils/src/index.ts +++ b/lockfile/utils/src/index.ts @@ -1,4 +1,4 @@ -import { refToRelative } from '@pnpm/dependency-path' +import { refToRelative } from '@pnpm/deps.path' export { nameVerFromPkgSnapshot } from './nameVerFromPkgSnapshot.js' export { packageIdFromSnapshot } from './packageIdFromSnapshot.js' diff --git a/lockfile/utils/src/nameVerFromPkgSnapshot.ts b/lockfile/utils/src/nameVerFromPkgSnapshot.ts index 0e46c68848..265954f4c4 100644 --- a/lockfile/utils/src/nameVerFromPkgSnapshot.ts +++ b/lockfile/utils/src/nameVerFromPkgSnapshot.ts @@ -1,4 +1,4 @@ -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import type { PackageSnapshot } from '@pnpm/lockfile.types' import type { PkgResolutionId } from '@pnpm/types' diff --git a/lockfile/utils/src/packageIdFromSnapshot.ts b/lockfile/utils/src/packageIdFromSnapshot.ts index ad14425e84..7114362b3a 100644 --- a/lockfile/utils/src/packageIdFromSnapshot.ts +++ b/lockfile/utils/src/packageIdFromSnapshot.ts @@ -1,4 +1,4 @@ -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import type { PackageSnapshot } from '@pnpm/lockfile.types' import type { DepPath, PkgId } from '@pnpm/types' diff --git a/lockfile/utils/src/pkgSnapshotToResolution.ts b/lockfile/utils/src/pkgSnapshotToResolution.ts index 3ecc6cf450..967a2351d0 100644 --- a/lockfile/utils/src/pkgSnapshotToResolution.ts +++ b/lockfile/utils/src/pkgSnapshotToResolution.ts @@ -1,8 +1,8 @@ import url from 'node:url' +import { isGitHostedPkgUrl } from '@pnpm/fetching.pick-fetcher' import type { PackageSnapshot, TarballResolution } from '@pnpm/lockfile.types' -import { isGitHostedPkgUrl } from '@pnpm/pick-fetcher' -import type { Resolution } from '@pnpm/resolver-base' +import type { Resolution } from '@pnpm/resolving.resolver-base' import type { Registries } from '@pnpm/types' import getNpmTarballUrl from 'get-npm-tarball-url' diff --git a/lockfile/utils/src/toLockfileResolution.ts b/lockfile/utils/src/toLockfileResolution.ts index 22c89e7dcb..631eb8ae8e 100644 --- a/lockfile/utils/src/toLockfileResolution.ts +++ b/lockfile/utils/src/toLockfileResolution.ts @@ -1,5 +1,5 @@ import type { LockfileResolution } from '@pnpm/lockfile.types' -import type { Resolution } from '@pnpm/resolver-base' +import type { Resolution } from '@pnpm/resolving.resolver-base' import getNpmTarballUrl from 'get-npm-tarball-url' export function toLockfileResolution ( diff --git a/lockfile/utils/tsconfig.json b/lockfile/utils/tsconfig.json index 563d0aaf05..409e3a92b9 100644 --- a/lockfile/utils/tsconfig.json +++ b/lockfile/utils/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../fetching/pick-fetcher" diff --git a/lockfile/verification/package.json b/lockfile/verification/package.json index 922e502622..c9ea9be0bc 100644 --- a/lockfile/verification/package.json +++ b/lockfile/verification/package.json @@ -34,12 +34,12 @@ "dependencies": { "@pnpm/catalogs.types": "workspace:*", "@pnpm/crypto.hash": "workspace:*", - "@pnpm/dependency-path": "workspace:*", - "@pnpm/get-context": "workspace:*", + "@pnpm/deps.path": "workspace:*", + "@pnpm/installing.context": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", "p-every": "catalog:", "ramda": "catalog:", diff --git a/lockfile/verification/src/allProjectsAreUpToDate.ts b/lockfile/verification/src/allProjectsAreUpToDate.ts index d4986966b1..ddca84b859 100644 --- a/lockfile/verification/src/allProjectsAreUpToDate.ts +++ b/lockfile/verification/src/allProjectsAreUpToDate.ts @@ -1,9 +1,9 @@ import type { Catalogs } from '@pnpm/catalogs.types' -import type { ProjectOptions } from '@pnpm/get-context' +import type { ProjectOptions } from '@pnpm/installing.context' import type { LockfileObject, } from '@pnpm/lockfile.types' -import type { WorkspacePackages } from '@pnpm/resolver-base' +import type { WorkspacePackages } from '@pnpm/resolving.resolver-base' import { DEPENDENCIES_FIELDS, type ProjectId } from '@pnpm/types' import pEvery from 'p-every' import { isEmpty } from 'ramda' diff --git a/lockfile/verification/src/getWorkspacePackagesByDirectory.ts b/lockfile/verification/src/getWorkspacePackagesByDirectory.ts index 4dcb0b0a0f..9d32842712 100644 --- a/lockfile/verification/src/getWorkspacePackagesByDirectory.ts +++ b/lockfile/verification/src/getWorkspacePackagesByDirectory.ts @@ -1,4 +1,4 @@ -import type { WorkspacePackages } from '@pnpm/resolver-base' +import type { WorkspacePackages } from '@pnpm/resolving.resolver-base' import type { DependencyManifest } from '@pnpm/types' export function getWorkspacePackagesByDirectory (workspacePackages: WorkspacePackages): Record { diff --git a/lockfile/verification/src/linkedPackagesAreUpToDate.ts b/lockfile/verification/src/linkedPackagesAreUpToDate.ts index 8ce87701d6..b0172c2a69 100644 --- a/lockfile/verification/src/linkedPackagesAreUpToDate.ts +++ b/lockfile/verification/src/linkedPackagesAreUpToDate.ts @@ -1,14 +1,14 @@ import path from 'node:path' -import { refToRelative } from '@pnpm/dependency-path' +import { refToRelative } from '@pnpm/deps.path' import type { PackageSnapshot, PackageSnapshots, ProjectSnapshot, } from '@pnpm/lockfile.types' import { refIsLocalDirectory } from '@pnpm/lockfile.utils' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' -import type { DirectoryResolution, WorkspacePackages } from '@pnpm/resolver-base' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import type { DirectoryResolution, WorkspacePackages } from '@pnpm/resolving.resolver-base' import { DEPENDENCIES_FIELDS, DEPENDENCIES_OR_PEER_FIELDS, @@ -87,7 +87,7 @@ export async function linkedPackagesAreUpToDate ( } const linkedPkg = manifestsByDir[linkedDir] ?? await safeReadPackageJsonFromDir(linkedDir) const availableRange = getVersionRange(currentSpec) - // This should pass the same options to semver as @pnpm/npm-resolver + // This should pass the same options to semver as @pnpm/resolving.npm-resolver const localPackageSatisfiesRange = availableRange === '*' || availableRange === '^' || availableRange === '~' || linkedPkg && semver.satisfies(linkedPkg.version, availableRange, { loose: true }) if (isLinked !== localPackageSatisfiesRange) return false diff --git a/lockfile/verification/src/localTarballDepsAreUpToDate.ts b/lockfile/verification/src/localTarballDepsAreUpToDate.ts index e0fb932da8..c57ba40c66 100644 --- a/lockfile/verification/src/localTarballDepsAreUpToDate.ts +++ b/lockfile/verification/src/localTarballDepsAreUpToDate.ts @@ -1,7 +1,7 @@ import path from 'node:path' import { getTarballIntegrity } from '@pnpm/crypto.hash' -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import type { PackageSnapshots, ProjectSnapshot, diff --git a/lockfile/verification/src/satisfiesPackageManifest.ts b/lockfile/verification/src/satisfiesPackageManifest.ts index 656c226ef5..68d0ec0e13 100644 --- a/lockfile/verification/src/satisfiesPackageManifest.ts +++ b/lockfile/verification/src/satisfiesPackageManifest.ts @@ -1,4 +1,4 @@ -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import type { ProjectSnapshot } from '@pnpm/lockfile.types' import { DEPENDENCIES_FIELDS, diff --git a/lockfile/verification/test/allProjectsAreUpToDate.test.ts b/lockfile/verification/test/allProjectsAreUpToDate.test.ts index 41cb777ba8..32b7d27a2a 100644 --- a/lockfile/verification/test/allProjectsAreUpToDate.test.ts +++ b/lockfile/verification/test/allProjectsAreUpToDate.test.ts @@ -7,7 +7,7 @@ import { getTarballIntegrity } from '@pnpm/crypto.hash' import type { LockfileObject } from '@pnpm/lockfile.types' import { allProjectsAreUpToDate } from '@pnpm/lockfile.verification' import { prepareEmpty } from '@pnpm/prepare' -import type { WorkspacePackages } from '@pnpm/resolver-base' +import type { WorkspacePackages } from '@pnpm/resolving.resolver-base' import type { DependencyManifest, DepPath, ProjectId, ProjectRootDir } from '@pnpm/types' import tar from 'tar-stream' diff --git a/lockfile/verification/tsconfig.json b/lockfile/verification/tsconfig.json index 3d0510e2a2..0e42e7f9ce 100644 --- a/lockfile/verification/tsconfig.json +++ b/lockfile/verification/tsconfig.json @@ -19,10 +19,10 @@ "path": "../../crypto/hash" }, { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { - "path": "../../installing/get-context" + "path": "../../installing/context" }, { "path": "../../packages/constants" diff --git a/lockfile/walker/package.json b/lockfile/walker/package.json index 5516ce5dff..0c35debb10 100644 --- a/lockfile/walker/package.json +++ b/lockfile/walker/package.json @@ -32,7 +32,7 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*" }, diff --git a/lockfile/walker/src/index.ts b/lockfile/walker/src/index.ts index 2fe4655ec8..6f686fc7b5 100644 --- a/lockfile/walker/src/index.ts +++ b/lockfile/walker/src/index.ts @@ -1,4 +1,4 @@ -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import type { LockfileObject, PackageSnapshot } from '@pnpm/lockfile.types' import type { DependenciesField, DepPath, ProjectId } from '@pnpm/types' diff --git a/lockfile/walker/tsconfig.json b/lockfile/walker/tsconfig.json index 23d5a39170..7bd3ad681b 100644 --- a/lockfile/walker/tsconfig.json +++ b/lockfile/walker/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../packages/types" diff --git a/modules-mounter/daemon/package.json b/modules-mounter/daemon/package.json index 9727413c0f..44479f6812 100644 --- a/modules-mounter/daemon/package.json +++ b/modules-mounter/daemon/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/mount-modules", + "name": "@pnpm/modules-mounter.daemon", "version": "1001.0.34", "description": "Mounts a node_modules directory with FUSE", "keywords": [ @@ -36,14 +36,14 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/config": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/config.reader": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/store-path": "workspace:*", "@pnpm/store.cafs": "workspace:*", "@pnpm/store.index": "workspace:*", + "@pnpm/store.path": "workspace:*", "@pnpm/types": "workspace:*", "hyperdrive-schemas": "catalog:", "normalize-path": "catalog:" @@ -58,7 +58,7 @@ "@jest/globals": "catalog:", "@pnpm/constants": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/mount-modules": "workspace:*", + "@pnpm/modules-mounter.daemon": "workspace:*", "@types/normalize-path": "catalog:", "rimraf": "catalog:" }, diff --git a/modules-mounter/daemon/src/cli.ts b/modules-mounter/daemon/src/cli.ts index 755598a71a..b543d9f3fa 100644 --- a/modules-mounter/daemon/src/cli.ts +++ b/modules-mounter/daemon/src/cli.ts @@ -1,8 +1,8 @@ import { promises as fs } from 'node:fs' import path from 'node:path' -import { getConfig } from '@pnpm/config' -import { getStorePath } from '@pnpm/store-path' +import { getConfig } from '@pnpm/config.reader' +import { getStorePath } from '@pnpm/store.path' import Fuse from 'fuse-native' import { createFuseHandlers } from './createFuseHandlers.js' diff --git a/modules-mounter/daemon/src/makeVirtualNodeModules.ts b/modules-mounter/daemon/src/makeVirtualNodeModules.ts index bb4a0088e5..10b5d458f1 100644 --- a/modules-mounter/daemon/src/makeVirtualNodeModules.ts +++ b/modules-mounter/daemon/src/makeVirtualNodeModules.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import type { LockfileObject } from '@pnpm/lockfile.fs' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils' import { DEPENDENCIES_FIELDS, type ProjectId } from '@pnpm/types' diff --git a/modules-mounter/daemon/tsconfig.json b/modules-mounter/daemon/tsconfig.json index 7485a55beb..7a2dca1e24 100644 --- a/modules-mounter/daemon/tsconfig.json +++ b/modules-mounter/daemon/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../config/config" + "path": "../../config/reader" }, { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../lockfile/fs" @@ -37,7 +37,7 @@ "path": "../../store/index" }, { - "path": "../../store/store-path" + "path": "../../store/path" } ] } diff --git a/network/fetch/package.json b/network/fetch/package.json index 802035526d..1fd4c5cea7 100644 --- a/network/fetch/package.json +++ b/network/fetch/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/fetch", + "name": "@pnpm/network.fetch", "version": "1000.2.6", "description": "node-fetch with retries", "keywords": [ @@ -34,7 +34,7 @@ }, "dependencies": { "@pnpm/core-loggers": "workspace:*", - "@pnpm/fetching-types": "workspace:*", + "@pnpm/fetching.types": "workspace:*", "@pnpm/network.agent": "catalog:", "@pnpm/types": "workspace:*", "@zkochan/retry": "catalog:", @@ -44,8 +44,8 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/fetch": "workspace:*", "@pnpm/logger": "workspace:*", + "@pnpm/network.fetch": "workspace:*", "https-proxy-server-express": "catalog:", "nock": "catalog:" }, diff --git a/network/fetch/src/fetchFromRegistry.ts b/network/fetch/src/fetchFromRegistry.ts index be2cb95a78..8a52899bbb 100644 --- a/network/fetch/src/fetchFromRegistry.ts +++ b/network/fetch/src/fetchFromRegistry.ts @@ -1,6 +1,6 @@ import { URL } from 'node:url' -import type { FetchFromRegistry } from '@pnpm/fetching-types' +import type { FetchFromRegistry } from '@pnpm/fetching.types' import { type AgentOptions, getAgent } from '@pnpm/network.agent' import type { SslConfig } from '@pnpm/types' diff --git a/network/fetch/src/index.ts b/network/fetch/src/index.ts index f6db731293..65bec1e796 100644 --- a/network/fetch/src/index.ts +++ b/network/fetch/src/index.ts @@ -1,3 +1,3 @@ export { fetch, type RetryTimeoutOptions } from './fetch.js' export { type AgentOptions, createFetchFromRegistry, type CreateFetchFromRegistryOptions, fetchWithAgent } from './fetchFromRegistry.js' -export type { FetchFromRegistry } from '@pnpm/fetching-types' +export type { FetchFromRegistry } from '@pnpm/fetching.types' diff --git a/network/fetch/test/fetchFromRegistry.test.ts b/network/fetch/test/fetchFromRegistry.test.ts index b50ae2b76d..d8430e50e2 100644 --- a/network/fetch/test/fetchFromRegistry.test.ts +++ b/network/fetch/test/fetchFromRegistry.test.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' -import { createFetchFromRegistry } from '@pnpm/fetch' +import { createFetchFromRegistry } from '@pnpm/network.fetch' import { ProxyServer } from 'https-proxy-server-express' import nock from 'nock' diff --git a/network/fetch/tsconfig.json b/network/fetch/tsconfig.json index c19751248b..f2bdfa3dd0 100644 --- a/network/fetch/tsconfig.json +++ b/network/fetch/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../fetching/fetching-types" + "path": "../../fetching/types" }, { "path": "../../packages/core-loggers" diff --git a/network/git-utils/package.json b/network/git-utils/package.json index 74831ab8dd..144ae0702d 100644 --- a/network/git-utils/package.json +++ b/network/git-utils/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/git-utils", + "name": "@pnpm/network.git-utils", "version": "1000.0.0", "description": "Utilities for git", "keywords": [ @@ -38,7 +38,7 @@ "execa": "catalog:" }, "devDependencies": { - "@pnpm/git-utils": "workspace:*", + "@pnpm/network.git-utils": "workspace:*", "tempy": "catalog:" }, "engines": { diff --git a/network/git-utils/test/index.test.ts b/network/git-utils/test/index.test.ts index c3ca5854a4..f3bb2724f8 100644 --- a/network/git-utils/test/index.test.ts +++ b/network/git-utils/test/index.test.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import { getCurrentBranch, isGitRepo, isWorkingTreeClean } from '@pnpm/git-utils' +import { getCurrentBranch, isGitRepo, isWorkingTreeClean } from '@pnpm/network.git-utils' import { safeExeca as execa } from 'execa' import { temporaryDirectory } from 'tempy' diff --git a/package.json b/package.json index fa7cf36281..91a8803ce3 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "test-branch": "pnpm pretest && pnpm lint && git remote set-branches --add origin main && git fetch origin main && pnpm run test-pkgs-branch", "ci:test-branch": "pnpm run prepare-fixtures && pnpm run test-pkgs-branch", "test-pkgs-branch": "pnpm remove-temp-dir && pnpm --workspace-concurrency=1 --filter=...[origin/main] run --no-sort --if-present _test", - "compile-only": "pnpm dlx node@runtime:24.6.0 __utils__/scripts/src/typecheck-only.ts && pnpm -F pnpm compile", + "compile-only": "tsgo --build workspace/workspace-manifest-reader workspace/projects-reader && pnpm dlx node@runtime:24.6.0 __utils__/scripts/src/typecheck-only.ts && pnpm -F pnpm compile", "compile": "pnpm compile-only && pnpm run update-manifests", "make-lcov": "shx mkdir -p coverage && lcov-result-merger './packages/*/coverage/lcov.info' 'coverage/lcov.info'", "update-manifests": "pnpm run meta-updater && pnpm install", diff --git a/patching/commands/package.json b/patching/commands/package.json index 8b000d730a..1b512b457a 100644 --- a/patching/commands/package.json +++ b/patching/commands/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/plugin-commands-patching", + "name": "@pnpm/patching.commands", "version": "1000.3.21", "description": "Commands for creating patches", "keywords": [ @@ -33,26 +33,26 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-utils": "workspace:*", - "@pnpm/config": "workspace:*", - "@pnpm/config.config-writer": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.reader": "workspace:*", + "@pnpm/config.writer": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/crypto.hash": "workspace:*", "@pnpm/error": "workspace:*", + "@pnpm/fetching.pick-fetcher": "workspace:*", "@pnpm/fs.packlist": "workspace:*", + "@pnpm/installing.commands": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/parse-wanted-dependency": "workspace:*", "@pnpm/patching.apply-patch": "workspace:*", - "@pnpm/pick-fetcher": "workspace:*", - "@pnpm/plugin-commands-installation": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*", - "@pnpm/store-path": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/resolving.parse-wanted-dependency": "workspace:*", + "@pnpm/store.connection-manager": "workspace:*", + "@pnpm/store.path": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "chalk": "catalog:", "enquirer": "catalog:", "escape-string-regexp": "catalog:", @@ -73,11 +73,11 @@ "devDependencies": { "@jest/globals": "catalog:", "@pnpm/logger": "workspace:*", - "@pnpm/plugin-commands-patching": "workspace:*", + "@pnpm/patching.commands": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/test-fixtures": "workspace:*", - "@pnpm/workspace.filter-packages-from-dir": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", "@types/is-windows": "catalog:", "@types/normalize-path": "catalog:", "@types/ramda": "catalog:", diff --git a/patching/commands/src/getEditDirPath.ts b/patching/commands/src/getEditDirPath.ts index 28854887d8..4020b17128 100644 --- a/patching/commands/src/getEditDirPath.ts +++ b/patching/commands/src/getEditDirPath.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import type { ParseWantedDependencyResult } from '@pnpm/parse-wanted-dependency' +import type { ParseWantedDependencyResult } from '@pnpm/resolving.parse-wanted-dependency' export interface GetEditDirOptions { modulesDir: string diff --git a/patching/commands/src/getPatchedDependency.ts b/patching/commands/src/getPatchedDependency.ts index e3ba4720a1..c9bde50df8 100644 --- a/patching/commands/src/getPatchedDependency.ts +++ b/patching/commands/src/getPatchedDependency.ts @@ -1,11 +1,11 @@ import path from 'node:path' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' +import { isGitHostedPkgUrl } from '@pnpm/fetching.pick-fetcher' import { readCurrentLockfile, type TarballResolution } from '@pnpm/lockfile.fs' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils' -import { parseWantedDependency, type ParseWantedDependencyResult } from '@pnpm/parse-wanted-dependency' -import { isGitHostedPkgUrl } from '@pnpm/pick-fetcher' +import { parseWantedDependency, type ParseWantedDependencyResult } from '@pnpm/resolving.parse-wanted-dependency' import enquirer from 'enquirer' import { realpathMissing } from 'realpath-missing' import semver from 'semver' diff --git a/patching/commands/src/patch.ts b/patching/commands/src/patch.ts index 82cc429359..2aefeda175 100644 --- a/patching/commands/src/patch.ts +++ b/patching/commands/src/patch.ts @@ -1,14 +1,14 @@ import fs from 'node:fs' import path from 'node:path' -import { docsUrl } from '@pnpm/cli-utils' -import { type Config, types as allTypes } from '@pnpm/config' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' import type { LogBase } from '@pnpm/logger' import { applyPatchToDir } from '@pnpm/patching.apply-patch' import type { CreateStoreControllerOptions, -} from '@pnpm/store-connection-manager' +} from '@pnpm/store.connection-manager' import chalk from 'chalk' import isWindows from 'is-windows' import { pick } from 'ramda' diff --git a/patching/commands/src/patchCommit.ts b/patching/commands/src/patchCommit.ts index 2944078ce2..aa26919758 100644 --- a/patching/commands/src/patchCommit.ts +++ b/patching/commands/src/patchCommit.ts @@ -1,16 +1,16 @@ import fs from 'node:fs' import path from 'node:path' -import { docsUrl } from '@pnpm/cli-utils' -import { type Config, types as allTypes } from '@pnpm/config' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { createShortHash } from '@pnpm/crypto.hash' import { PnpmError } from '@pnpm/error' import { packlist } from '@pnpm/fs.packlist' +import { install } from '@pnpm/installing.commands' import { globalWarn } from '@pnpm/logger' -import { parseWantedDependency, type ParseWantedDependencyResult } from '@pnpm/parse-wanted-dependency' -import { install } from '@pnpm/plugin-commands-installation' -import { readPackageJsonFromDir } from '@pnpm/read-package-json' -import { getStorePath } from '@pnpm/store-path' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { parseWantedDependency, type ParseWantedDependencyResult } from '@pnpm/resolving.parse-wanted-dependency' +import { getStorePath } from '@pnpm/store.path' import type { ProjectRootDir } from '@pnpm/types' import escapeStringRegexp from 'escape-string-regexp' import { makeEmptyDir } from 'make-empty-dir' diff --git a/patching/commands/src/patchRemove.ts b/patching/commands/src/patchRemove.ts index 1b8c14d917..21ea7a479e 100644 --- a/patching/commands/src/patchRemove.ts +++ b/patching/commands/src/patchRemove.ts @@ -1,10 +1,10 @@ import fs from 'node:fs/promises' import path from 'node:path' -import { docsUrl } from '@pnpm/cli-utils' -import { type Config, types as allTypes } from '@pnpm/config' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' -import { install } from '@pnpm/plugin-commands-installation' +import { install } from '@pnpm/installing.commands' import enquirer from 'enquirer' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/patching/commands/src/updatePatchedDependencies.ts b/patching/commands/src/updatePatchedDependencies.ts index fc5fa4f3d8..54e6abfbab 100644 --- a/patching/commands/src/updatePatchedDependencies.ts +++ b/patching/commands/src/updatePatchedDependencies.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { writeSettings, type WriteSettingsOptions } from '@pnpm/config.config-writer' +import { writeSettings, type WriteSettingsOptions } from '@pnpm/config.writer' import normalizePath from 'normalize-path' export async function updatePatchedDependencies ( diff --git a/patching/commands/src/writePackage.ts b/patching/commands/src/writePackage.ts index 1135a2510c..f33286b0af 100644 --- a/patching/commands/src/writePackage.ts +++ b/patching/commands/src/writePackage.ts @@ -1,9 +1,9 @@ -import type { Config } from '@pnpm/config' -import type { ParseWantedDependencyResult } from '@pnpm/parse-wanted-dependency' +import type { Config } from '@pnpm/config.reader' +import type { ParseWantedDependencyResult } from '@pnpm/resolving.parse-wanted-dependency' import { createStoreController, type CreateStoreControllerOptions, -} from '@pnpm/store-connection-manager' +} from '@pnpm/store.connection-manager' export type WritePackageOptions = CreateStoreControllerOptions & Pick diff --git a/patching/commands/test/patch.test.ts b/patching/commands/test/patch.test.ts index 38193b7568..317d5f7c7e 100644 --- a/patching/commands/test/patch.test.ts +++ b/patching/commands/test/patch.test.ts @@ -3,14 +3,14 @@ import os from 'node:os' import path from 'node:path' import { jest } from '@jest/globals' -import { install } from '@pnpm/plugin-commands-installation' -import type { PatchCommandOptions, PatchRemoveCommandOptions } from '@pnpm/plugin-commands-patching' +import { install } from '@pnpm/installing.commands' +import type { PatchCommandOptions, PatchRemoveCommandOptions } from '@pnpm/patching.commands' import { prepare, preparePackages, tempDir } from '@pnpm/prepare' -import { readProjectManifest } from '@pnpm/read-project-manifest' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { readProjectManifest } from '@pnpm/workspace.project-manifest-reader' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { temporaryDirectory } from 'tempy' import { writeYamlFileSync } from 'write-yaml-file' @@ -18,7 +18,7 @@ import { DEFAULT_OPTS } from './utils/index.js' jest.unstable_mockModule('enquirer', () => ({ default: { prompt: jest.fn() } })) const { default: enquirer } = await import('enquirer') -const { patch, patchCommit, patchRemove } = await import('@pnpm/plugin-commands-patching') +const { patch, patchCommit, patchRemove } = await import('@pnpm/patching.commands') const prompt = jest.mocked(enquirer.prompt) const f = fixtures(import.meta.dirname) @@ -1006,7 +1006,7 @@ describe('patch and commit in workspaces', () => { }) test('patch commit should work in workspaces', async () => { - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, cacheDir, @@ -1062,7 +1062,7 @@ describe('patch and commit in workspaces', () => { }) test('patch and patch-commit should work with shared-workspace-lockfile=false', async () => { - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, cacheDir, @@ -1126,7 +1126,7 @@ describe('patch and commit in workspaces', () => { }) test('reusing existing patch file should work with shared-workspace-lockfile=false', async () => { - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, cacheDir, @@ -1194,7 +1194,7 @@ describe('patch and commit in workspaces', () => { }) test('patch and patch-commit for git hosted dependency', async () => { - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), []) await install.handler({ ...DEFAULT_OPTS, cacheDir, @@ -1291,7 +1291,7 @@ describe('patch with custom modules-dir and virtual-store-dir', () => { }) test('should work with custom modules-dir and virtual-store-dir', async () => { - const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPackagesFromDir(customModulesDirFixture, []) + const { allProjects, allProjectsGraph, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(customModulesDirFixture, []) await install.handler({ ...DEFAULT_OPTS, ...defaultPatchOption, diff --git a/patching/commands/tsconfig.json b/patching/commands/tsconfig.json index aea954e0ab..cecf8d586a 100644 --- a/patching/commands/tsconfig.json +++ b/patching/commands/tsconfig.json @@ -16,13 +16,13 @@ "path": "../../__utils__/test-fixtures" }, { - "path": "../../cli/cli-utils" + "path": "../../cli/utils" }, { - "path": "../../config/config" + "path": "../../config/reader" }, { - "path": "../../config/config-writer" + "path": "../../config/writer" }, { "path": "../../crypto/hash" @@ -60,23 +60,23 @@ { "path": "../../pkg-manifest/read-package-json" }, - { - "path": "../../pkg-manifest/read-project-manifest" - }, { "path": "../../resolving/parse-wanted-dependency" }, { - "path": "../../store/store-connection-manager" + "path": "../../store/connection-manager" }, { - "path": "../../store/store-path" + "path": "../../store/path" }, { - "path": "../../workspace/filter-packages-from-dir" + "path": "../../workspace/project-manifest-reader" }, { - "path": "../../workspace/read-manifest" + "path": "../../workspace/projects-filter" + }, + { + "path": "../../workspace/workspace-manifest-reader" }, { "path": "../apply-patch" diff --git a/patching/config/package.json b/patching/config/package.json index 393de097be..767219bcc5 100644 --- a/patching/config/package.json +++ b/patching/config/package.json @@ -32,7 +32,7 @@ "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"" }, "dependencies": { - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/patching.types": "workspace:*", "semver": "catalog:" diff --git a/patching/config/src/groupPatchedDependencies.ts b/patching/config/src/groupPatchedDependencies.ts index 6d69a61a00..a5b7f9c154 100644 --- a/patching/config/src/groupPatchedDependencies.ts +++ b/patching/config/src/groupPatchedDependencies.ts @@ -1,4 +1,4 @@ -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import { PnpmError } from '@pnpm/error' import type { PatchGroup, PatchGroupRecord, PatchInfo } from '@pnpm/patching.types' import { validRange } from 'semver' diff --git a/patching/config/tsconfig.json b/patching/config/tsconfig.json index 6d9dc76937..0f13cebc2b 100644 --- a/patching/config/tsconfig.json +++ b/patching/config/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../packages/error" diff --git a/pkg-manifest/read-package-json/package.json b/pkg-manifest/read-package-json/package.json index d72ff23437..caf29dc57c 100644 --- a/pkg-manifest/read-package-json/package.json +++ b/pkg-manifest/read-package-json/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/read-package-json", + "name": "@pnpm/pkg-manifest.read-package-json", "version": "1000.1.2", "description": "Read a package.json", "keywords": [ @@ -38,7 +38,7 @@ "normalize-package-data": "catalog:" }, "devDependencies": { - "@pnpm/read-package-json": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@types/normalize-package-data": "catalog:" }, "engines": { diff --git a/pkg-manifest/read-package-json/test/index.ts b/pkg-manifest/read-package-json/test/index.ts index 014796c357..cef71e8569 100644 --- a/pkg-manifest/read-package-json/test/index.ts +++ b/pkg-manifest/read-package-json/test/index.ts @@ -1,16 +1,16 @@ /// import path from 'node:path' -import { readPackageJson, readPackageJsonFromDir } from '@pnpm/read-package-json' +import { readPackageJson, readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' const fixtures = path.join(import.meta.dirname, 'fixtures') test('readPackageJson()', async () => { - expect((await readPackageJson(path.join(import.meta.dirname, '..', 'package.json'))).name).toBe('@pnpm/read-package-json') + expect((await readPackageJson(path.join(import.meta.dirname, '..', 'package.json'))).name).toBe('@pnpm/pkg-manifest.read-package-json') }) test('fromDir()', async () => { - expect((await readPackageJsonFromDir(path.join(import.meta.dirname, '..'))).name).toBe('@pnpm/read-package-json') + expect((await readPackageJsonFromDir(path.join(import.meta.dirname, '..'))).name).toBe('@pnpm/pkg-manifest.read-package-json') }) test('readPackageJson() throw error when name is invalid', async () => { diff --git a/pkg-manifest/manifest-utils/CHANGELOG.md b/pkg-manifest/utils/CHANGELOG.md similarity index 100% rename from pkg-manifest/manifest-utils/CHANGELOG.md rename to pkg-manifest/utils/CHANGELOG.md diff --git a/pkg-manifest/manifest-utils/README.md b/pkg-manifest/utils/README.md similarity index 100% rename from pkg-manifest/manifest-utils/README.md rename to pkg-manifest/utils/README.md diff --git a/pkg-manifest/manifest-utils/package.json b/pkg-manifest/utils/package.json similarity index 88% rename from pkg-manifest/manifest-utils/package.json rename to pkg-manifest/utils/package.json index 80f3c19163..b4d367bc61 100644 --- a/pkg-manifest/manifest-utils/package.json +++ b/pkg-manifest/utils/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/manifest-utils", + "name": "@pnpm/pkg-manifest.utils", "version": "1001.0.6", "description": "Utils for dealing with package manifest", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/manifest-utils", - "homepage": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/manifest-utils#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/utils", + "homepage": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/utils#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -33,8 +33,8 @@ }, "dependencies": { "@pnpm/core-loggers": "workspace:*", + "@pnpm/deps.peer-range": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/semver.peer-range": "workspace:*", "@pnpm/types": "workspace:*", "semver": "catalog:" }, @@ -43,7 +43,7 @@ }, "devDependencies": { "@pnpm/logger": "workspace:*", - "@pnpm/manifest-utils": "workspace:*", + "@pnpm/pkg-manifest.utils": "workspace:*", "@types/semver": "catalog:" }, "engines": { diff --git a/pkg-manifest/manifest-utils/src/convertEnginesRuntimeToDependencies.ts b/pkg-manifest/utils/src/convertEnginesRuntimeToDependencies.ts similarity index 100% rename from pkg-manifest/manifest-utils/src/convertEnginesRuntimeToDependencies.ts rename to pkg-manifest/utils/src/convertEnginesRuntimeToDependencies.ts diff --git a/pkg-manifest/manifest-utils/src/filterDependenciesByType.ts b/pkg-manifest/utils/src/filterDependenciesByType.ts similarity index 100% rename from pkg-manifest/manifest-utils/src/filterDependenciesByType.ts rename to pkg-manifest/utils/src/filterDependenciesByType.ts diff --git a/pkg-manifest/manifest-utils/src/getAllDependenciesFromManifest.ts b/pkg-manifest/utils/src/getAllDependenciesFromManifest.ts similarity index 100% rename from pkg-manifest/manifest-utils/src/getAllDependenciesFromManifest.ts rename to pkg-manifest/utils/src/getAllDependenciesFromManifest.ts diff --git a/pkg-manifest/manifest-utils/src/getAllUniqueSpecs.ts b/pkg-manifest/utils/src/getAllUniqueSpecs.ts similarity index 100% rename from pkg-manifest/manifest-utils/src/getAllUniqueSpecs.ts rename to pkg-manifest/utils/src/getAllUniqueSpecs.ts diff --git a/pkg-manifest/manifest-utils/src/getDependencyTypeFromManifest.ts b/pkg-manifest/utils/src/getDependencyTypeFromManifest.ts similarity index 100% rename from pkg-manifest/manifest-utils/src/getDependencyTypeFromManifest.ts rename to pkg-manifest/utils/src/getDependencyTypeFromManifest.ts diff --git a/pkg-manifest/manifest-utils/src/getSpecFromPackageManifest.ts b/pkg-manifest/utils/src/getSpecFromPackageManifest.ts similarity index 100% rename from pkg-manifest/manifest-utils/src/getSpecFromPackageManifest.ts rename to pkg-manifest/utils/src/getSpecFromPackageManifest.ts diff --git a/pkg-manifest/manifest-utils/src/index.ts b/pkg-manifest/utils/src/index.ts similarity index 100% rename from pkg-manifest/manifest-utils/src/index.ts rename to pkg-manifest/utils/src/index.ts diff --git a/pkg-manifest/manifest-utils/src/updateProjectManifestObject.ts b/pkg-manifest/utils/src/updateProjectManifestObject.ts similarity index 98% rename from pkg-manifest/manifest-utils/src/updateProjectManifestObject.ts rename to pkg-manifest/utils/src/updateProjectManifestObject.ts index bb7538ab42..fcddacfbf4 100644 --- a/pkg-manifest/manifest-utils/src/updateProjectManifestObject.ts +++ b/pkg-manifest/utils/src/updateProjectManifestObject.ts @@ -1,5 +1,5 @@ import { packageManifestLogger } from '@pnpm/core-loggers' -import { isValidPeerRange } from '@pnpm/semver.peer-range' +import { isValidPeerRange } from '@pnpm/deps.peer-range' import { DEPENDENCIES_FIELDS, DEPENDENCIES_OR_PEER_FIELDS, diff --git a/pkg-manifest/manifest-utils/test/getAllUniqueSpecs.test.ts b/pkg-manifest/utils/test/getAllUniqueSpecs.test.ts similarity index 88% rename from pkg-manifest/manifest-utils/test/getAllUniqueSpecs.test.ts rename to pkg-manifest/utils/test/getAllUniqueSpecs.test.ts index 2c0411e4f0..e4735099c8 100644 --- a/pkg-manifest/manifest-utils/test/getAllUniqueSpecs.test.ts +++ b/pkg-manifest/utils/test/getAllUniqueSpecs.test.ts @@ -1,4 +1,4 @@ -import { getAllUniqueSpecs } from '@pnpm/manifest-utils' +import { getAllUniqueSpecs } from '@pnpm/pkg-manifest.utils' test('getAllUniqueSpecs()', () => { expect(getAllUniqueSpecs([ diff --git a/pkg-manifest/manifest-utils/test/getDependencyTypeFromManifest.test.ts b/pkg-manifest/utils/test/getDependencyTypeFromManifest.test.ts similarity index 91% rename from pkg-manifest/manifest-utils/test/getDependencyTypeFromManifest.test.ts rename to pkg-manifest/utils/test/getDependencyTypeFromManifest.test.ts index 75cde489f6..8041a954b1 100644 --- a/pkg-manifest/manifest-utils/test/getDependencyTypeFromManifest.test.ts +++ b/pkg-manifest/utils/test/getDependencyTypeFromManifest.test.ts @@ -1,4 +1,4 @@ -import { getDependencyTypeFromManifest } from '@pnpm/manifest-utils' +import { getDependencyTypeFromManifest } from '@pnpm/pkg-manifest.utils' test('getDependencyTypeFromManifest()', () => { expect( diff --git a/pkg-manifest/manifest-utils/test/getSpecFromPackageManifest.test.ts b/pkg-manifest/utils/test/getSpecFromPackageManifest.test.ts similarity index 89% rename from pkg-manifest/manifest-utils/test/getSpecFromPackageManifest.test.ts rename to pkg-manifest/utils/test/getSpecFromPackageManifest.test.ts index 47d4f2d809..9e3778229c 100644 --- a/pkg-manifest/manifest-utils/test/getSpecFromPackageManifest.test.ts +++ b/pkg-manifest/utils/test/getSpecFromPackageManifest.test.ts @@ -1,4 +1,4 @@ -import { getSpecFromPackageManifest } from '@pnpm/manifest-utils' +import { getSpecFromPackageManifest } from '@pnpm/pkg-manifest.utils' test('getSpecFromPackageManifest()', () => { expect( diff --git a/pkg-manifest/manifest-utils/test/index.ts b/pkg-manifest/utils/test/index.ts similarity index 100% rename from pkg-manifest/manifest-utils/test/index.ts rename to pkg-manifest/utils/test/index.ts diff --git a/pkg-manifest/exportable-manifest/test/tsconfig.json b/pkg-manifest/utils/test/tsconfig.json similarity index 100% rename from pkg-manifest/exportable-manifest/test/tsconfig.json rename to pkg-manifest/utils/test/tsconfig.json diff --git a/pkg-manifest/manifest-utils/test/updateProjectManifestObject.test.ts b/pkg-manifest/utils/test/updateProjectManifestObject.test.ts similarity index 99% rename from pkg-manifest/manifest-utils/test/updateProjectManifestObject.test.ts rename to pkg-manifest/utils/test/updateProjectManifestObject.test.ts index ebbed1523d..0f078dec85 100644 --- a/pkg-manifest/manifest-utils/test/updateProjectManifestObject.test.ts +++ b/pkg-manifest/utils/test/updateProjectManifestObject.test.ts @@ -1,4 +1,4 @@ -import { guessDependencyType, updateProjectManifestObject } from '@pnpm/manifest-utils' +import { guessDependencyType, updateProjectManifestObject } from '@pnpm/pkg-manifest.utils' test('guessDependencyType()', () => { expect( diff --git a/pkg-manifest/manifest-utils/tsconfig.json b/pkg-manifest/utils/tsconfig.json similarity index 100% rename from pkg-manifest/manifest-utils/tsconfig.json rename to pkg-manifest/utils/tsconfig.json diff --git a/pkg-manifest/exportable-manifest/tsconfig.lint.json b/pkg-manifest/utils/tsconfig.lint.json similarity index 100% rename from pkg-manifest/exportable-manifest/tsconfig.lint.json rename to pkg-manifest/utils/tsconfig.lint.json diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 084312076c..c2857fa829 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -277,12 +277,6 @@ catalogs: '@pnpm/util.lex-comparator': specifier: ^3.0.2 version: 3.0.2 - '@pnpm/workspace.find-packages': - specifier: ^1000.0.15 - version: 1000.0.63 - '@pnpm/workspace.read-manifest': - specifier: ^1000.1.1 - version: 1000.3.0 '@reflink/reflink': specifier: 0.1.19 version: 0.1.19 @@ -1081,12 +1075,12 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../packages/types - '@pnpm/workspace.find-packages': + '@pnpm/workspace.projects-reader': specifier: workspace:* - version: link:../workspace/find-packages - '@pnpm/workspace.read-manifest': + version: link:../workspace/projects-reader + '@pnpm/workspace.workspace-manifest-reader': specifier: workspace:* - version: link:../workspace/read-manifest + version: link:../workspace/workspace-manifest-reader '@types/normalize-path': specifier: 'catalog:' version: 3.0.2 @@ -1136,12 +1130,12 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../../installing/modules-yaml '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../../installing/modules-yaml '@pnpm/registry-mock': specifier: 'catalog:' version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) @@ -1328,12 +1322,12 @@ importers: __utils__/scripts: dependencies: - '@pnpm/workspace.find-packages': - specifier: 'catalog:' - version: 1000.0.63(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/workspace.read-manifest': - specifier: 'catalog:' - version: 1000.3.0 + '@pnpm/workspace.projects-reader': + specifier: workspace:* + version: link:../../workspace/projects-reader + '@pnpm/workspace.workspace-manifest-reader': + specifier: workspace:* + version: link:../../workspace/workspace-manifest-reader execa: specifier: 'catalog:' version: safe-execa@0.3.0 @@ -1403,32 +1397,32 @@ importers: specifier: workspace:* version: 'link:' - bins/link-bins: + bins/linker: dependencies: + '@pnpm/bins.resolver': + specifier: workspace:* + version: link:../resolver '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/manifest-utils': - specifier: workspace:* - version: link:../../pkg-manifest/manifest-utils - '@pnpm/package-bins': - specifier: workspace:* - version: link:../package-bins - '@pnpm/read-modules-dir': + '@pnpm/fs.read-modules-dir': specifier: workspace:* version: link:../../fs/read-modules-dir - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/read-project-manifest': + '@pnpm/pkg-manifest.utils': specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest + version: link:../../pkg-manifest/utils '@pnpm/types': specifier: workspace:* version: link:../../packages/types + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader '@zkochan/cmd-shim': specifier: 'catalog:' version: 8.0.1 @@ -1460,7 +1454,7 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/link-bins': + '@pnpm/bins.linker': specifier: workspace:* version: 'link:' '@pnpm/logger': @@ -1491,37 +1485,15 @@ importers: specifier: 'catalog:' version: 3.0.0 - bins/package-bins: + bins/remover: dependencies: - '@pnpm/types': + '@pnpm/bins.resolver': specifier: workspace:* - version: link:../../packages/types - is-subdir: - specifier: 'catalog:' - version: 2.0.0 - tinyglobby: - specifier: 'catalog:' - version: 0.2.15 - devDependencies: - '@pnpm/package-bins': - specifier: workspace:* - version: 'link:' - '@types/node': - specifier: 'catalog:' - version: 22.19.15 - tempy: - specifier: 'catalog:' - version: 3.0.0 - - bins/remove-bins: - dependencies: + version: link:../resolver '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/package-bins': - specifier: workspace:* - version: link:../package-bins - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json '@pnpm/types': @@ -1537,12 +1509,12 @@ importers: specifier: 'catalog:' version: 1.0.2 devDependencies: + '@pnpm/bins.remover': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/remove-bins': - specifier: workspace:* - version: 'link:' '@types/is-windows': specifier: 'catalog:' version: 1.0.2 @@ -1550,44 +1522,72 @@ importers: specifier: 'catalog:' version: 0.29.12 + bins/resolver: + dependencies: + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + is-subdir: + specifier: 'catalog:' + version: 2.0.0 + tinyglobby: + specifier: 'catalog:' + version: 0.2.15 + devDependencies: + '@pnpm/bins.resolver': + specifier: workspace:* + version: 'link:' + '@types/node': + specifier: 'catalog:' + version: 22.19.15 + tempy: + specifier: 'catalog:' + version: 3.0.0 + building/after-install: dependencies: + '@pnpm/bins.linker': + specifier: workspace:* + version: link:../../bins/linker '@pnpm/building.pkg-requires-build': specifier: workspace:* version: link:../pkg-requires-build '@pnpm/building.policy': specifier: workspace:* version: link:../policy - '@pnpm/calc-dep-state': + '@pnpm/config.normalize-registries': specifier: workspace:* - version: link:../../deps/calc-dep-state - '@pnpm/config': + version: link:../../config/normalize-registries + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config + version: link:../../config/reader '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/dependency-path': + '@pnpm/deps.graph-hasher': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/graph-hasher '@pnpm/deps.graph-sequencer': specifier: workspace:* version: link:../../deps/graph-sequencer + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/get-context': - specifier: workspace:* - version: link:../../installing/get-context - '@pnpm/lifecycle': + '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../../exec/lifecycle - '@pnpm/link-bins': + '@pnpm/installing.context': specifier: workspace:* - version: link:../../bins/link-bins + version: link:../../installing/context + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../../installing/modules-yaml '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types @@ -1600,27 +1600,21 @@ importers: '@pnpm/logger': specifier: 'catalog:' version: 1001.0.1 - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../../installing/modules-yaml - '@pnpm/normalize-registries': - specifier: workspace:* - version: link:../../config/normalize-registries '@pnpm/npm-package-arg': specifier: 'catalog:' version: 2.0.0 - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/store-connection-manager': - specifier: workspace:* - version: link:../../store/store-connection-manager - '@pnpm/store-controller-types': - specifier: workspace:* - version: link:../../store/store-controller-types '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs + '@pnpm/store.connection-manager': + specifier: workspace:* + version: link:../../store/connection-manager + '@pnpm/store.controller-types': + specifier: workspace:* + version: link:../../store/controller-types '@pnpm/store.index': specifier: workspace:* version: link:../../store/index @@ -1655,42 +1649,42 @@ importers: '@pnpm/building.after-install': specifier: workspace:* version: link:../after-install - '@pnpm/cli-utils': - specifier: workspace:* - version: link:../../cli/cli-utils - '@pnpm/common-cli-options-help': + '@pnpm/cli.common-cli-options-help': specifier: workspace:* version: link:../../cli/common-cli-options-help - '@pnpm/config': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../config/config - '@pnpm/config.config-writer': + version: link:../../cli/utils + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config-writer - '@pnpm/dependency-path': + version: link:../../config/reader + '@pnpm/config.writer': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../config/writer + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/modules-yaml': + '@pnpm/installing.modules-yaml': specifier: workspace:* version: link:../../installing/modules-yaml '@pnpm/prepare-temp-dir': specifier: workspace:* version: link:../../__utils__/prepare-temp-dir - '@pnpm/sort-packages': + '@pnpm/store.connection-manager': specifier: workspace:* - version: link:../../workspace/sort-packages - '@pnpm/store-connection-manager': - specifier: workspace:* - version: link:../../store/store-connection-manager + version: link:../../store/connection-manager '@pnpm/types': specifier: workspace:* version: link:../../packages/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 + '@pnpm/workspace.sort-packages': + specifier: workspace:* + version: link:../../workspace/sort-packages chalk: specifier: 'catalog:' version: 5.6.2 @@ -1743,9 +1737,9 @@ importers: '@pnpm/test-ipc-server': specifier: workspace:* version: link:../../__utils__/test-ipc-server - '@pnpm/workspace.filter-packages-from-dir': + '@pnpm/workspace.projects-filter': specifier: workspace:* - version: link:../../workspace/filter-packages-from-dir + version: link:../../workspace/projects-filter '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -1767,45 +1761,45 @@ importers: building/during-install: dependencies: - '@pnpm/calc-dep-state': + '@pnpm/bins.linker': specifier: workspace:* - version: link:../../deps/calc-dep-state - '@pnpm/config': + version: link:../../bins/linker + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config + version: link:../../config/reader '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/dependency-path': + '@pnpm/deps.graph-hasher': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/graph-hasher '@pnpm/deps.graph-sequencer': specifier: workspace:* version: link:../../deps/graph-sequencer + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error + '@pnpm/exec.lifecycle': + specifier: workspace:* + version: link:../../exec/lifecycle '@pnpm/fs.hard-link-dir': specifier: workspace:* version: link:../../fs/hard-link-dir - '@pnpm/lifecycle': - specifier: workspace:* - version: link:../../exec/lifecycle - '@pnpm/link-bins': - specifier: workspace:* - version: link:../../bins/link-bins '@pnpm/patching.apply-patch': specifier: workspace:* version: link:../../patching/apply-patch '@pnpm/patching.types': specifier: workspace:* version: link:../../patching/types - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/store-controller-types': + '@pnpm/store.controller-types': specifier: workspace:* - version: link:../../store/store-controller-types + version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -1857,13 +1851,13 @@ importers: cache/api: dependencies: - '@pnpm/config': + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config + version: link:../../config/reader '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants - '@pnpm/npm-resolver': + '@pnpm/resolving.npm-resolver': specifier: workspace:* version: link:../../resolving/npm-resolver '@pnpm/store.cafs': @@ -1891,21 +1885,21 @@ importers: '@pnpm/cache.api': specifier: workspace:* version: link:../api - '@pnpm/cli-utils': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../cli/cli-utils - '@pnpm/config': + version: link:../../cli/utils + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config + version: link:../../config/reader '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/store-path': + '@pnpm/store.path': specifier: workspace:* - version: link:../../store/store-path + version: link:../../store/path ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -1947,9 +1941,9 @@ importers: '@pnpm/catalogs.types': specifier: workspace:* version: link:../types - '@pnpm/workspace.read-manifest': + '@pnpm/workspace.workspace-manifest-reader': specifier: workspace:* - version: link:../../workspace/read-manifest + version: link:../../workspace/workspace-manifest-reader catalogs/protocol-parser: devDependencies: @@ -1982,122 +1976,48 @@ importers: specifier: workspace:* version: 'link:' - cli/cli-meta: - dependencies: - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - load-json-file: - specifier: 'catalog:' - version: 7.0.1 - devDependencies: - '@pnpm/cli-meta': - specifier: workspace:* - version: 'link:' - - cli/cli-utils: - dependencies: - '@pnpm/cli-meta': - specifier: workspace:* - version: link:../cli-meta - '@pnpm/config': - specifier: workspace:* - version: link:../../config/config - '@pnpm/config.deps-installer': - specifier: workspace:* - version: link:../../config/deps-installer - '@pnpm/default-reporter': - specifier: workspace:* - version: link:../default-reporter - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error - '@pnpm/manifest-utils': - specifier: workspace:* - version: link:../../pkg-manifest/manifest-utils - '@pnpm/package-is-installable': - specifier: workspace:* - version: link:../../config/package-is-installable - '@pnpm/pnpmfile': - specifier: workspace:* - version: link:../../hooks/pnpmfile - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest - '@pnpm/store-connection-manager': - specifier: workspace:* - version: link:../../store/store-connection-manager - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - '@pnpm/util.lex-comparator': - specifier: 'catalog:' - version: 3.0.2 - chalk: - specifier: 'catalog:' - version: 5.6.2 - load-json-file: - specifier: 'catalog:' - version: 7.0.1 - devDependencies: - '@jest/globals': - specifier: 'catalog:' - version: 30.0.5 - '@pnpm/cli-utils': - specifier: workspace:* - version: 'link:' - '@pnpm/logger': - specifier: workspace:* - version: link:../../packages/logger - '@pnpm/prepare': - specifier: workspace:* - version: link:../../__utils__/prepare - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - cli/command: dependencies: '@pnpm/tabtab': specifier: 'catalog:' version: 0.5.4 devDependencies: - '@pnpm/command': + '@pnpm/cli.command': specifier: workspace:* version: 'link:' cli/commands: dependencies: - '@pnpm/cli-utils': - specifier: workspace:^ - version: link:../cli-utils - '@pnpm/command': + '@pnpm/cli.command': specifier: workspace:^ version: link:../command - '@pnpm/config': + '@pnpm/cli.parse-cli-args': + specifier: workspace:^ + version: link:../parse-cli-args + '@pnpm/cli.utils': + specifier: workspace:^ + version: link:../utils + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config + version: link:../../config/reader '@pnpm/error': specifier: workspace:^ version: link:../../packages/error - '@pnpm/find-workspace-dir': - specifier: workspace:^ - version: link:../../workspace/find-workspace-dir '@pnpm/nopt': specifier: 'catalog:' version: 0.3.1 - '@pnpm/parse-cli-args': - specifier: workspace:^ - version: link:../parse-cli-args '@pnpm/tabtab': specifier: 'catalog:' version: 0.5.4 - '@pnpm/workspace.find-packages': + '@pnpm/workspace.projects-reader': specifier: workspace:^ - version: link:../../workspace/find-packages - '@pnpm/workspace.read-manifest': + version: link:../../workspace/projects-reader + '@pnpm/workspace.root-finder': specifier: workspace:^ - version: link:../../workspace/read-manifest + version: link:../../workspace/root-finder + '@pnpm/workspace.workspace-manifest-reader': + specifier: workspace:^ + version: link:../../workspace/workspace-manifest-reader ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -2123,31 +2043,31 @@ importers: cli/common-cli-options-help: devDependencies: - '@pnpm/common-cli-options-help': + '@pnpm/cli.common-cli-options-help': specifier: workspace:* version: 'link:' cli/default-reporter: dependencies: - '@pnpm/cli-meta': + '@pnpm/cli.meta': specifier: workspace:* - version: link:../cli-meta - '@pnpm/config': + version: link:../meta + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config + version: link:../../config/reader '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/dedupe.issues-renderer': - specifier: workspace:* - version: link:../../installing/dedupe/issues-renderer - '@pnpm/dedupe.types': - specifier: workspace:* - version: link:../../installing/dedupe/types '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/render-peer-issues': + '@pnpm/installing.dedupe.issues-renderer': + specifier: workspace:* + version: link:../../installing/dedupe/issues-renderer + '@pnpm/installing.dedupe.types': + specifier: workspace:* + version: link:../../installing/dedupe/types + '@pnpm/installing.render-peer-issues': specifier: workspace:* version: link:../../installing/render-peer-issues '@pnpm/types': @@ -2193,7 +2113,7 @@ importers: specifier: 'catalog:' version: 6.0.0 devDependencies: - '@pnpm/default-reporter': + '@pnpm/cli.default-reporter': specifier: workspace:* version: 'link:' '@pnpm/logger': @@ -2218,57 +2138,131 @@ importers: specifier: 'catalog:' version: 4.1.0 + cli/meta: + dependencies: + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + load-json-file: + specifier: 'catalog:' + version: 7.0.1 + devDependencies: + '@pnpm/cli.meta': + specifier: workspace:* + version: 'link:' + cli/parse-cli-args: dependencies: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/find-workspace-dir': - specifier: workspace:* - version: link:../../workspace/find-workspace-dir '@pnpm/nopt': specifier: 'catalog:' version: 0.3.1 + '@pnpm/workspace.root-finder': + specifier: workspace:* + version: link:../../workspace/root-finder didyoumean2: specifier: 'catalog:' version: 7.0.4 devDependencies: - '@pnpm/parse-cli-args': + '@pnpm/cli.parse-cli-args': specifier: workspace:* version: 'link:' tempy: specifier: 'catalog:' version: 3.0.0 + cli/utils: + dependencies: + '@pnpm/cli.default-reporter': + specifier: workspace:* + version: link:../default-reporter + '@pnpm/cli.meta': + specifier: workspace:* + version: link:../meta + '@pnpm/config.deps-installer': + specifier: workspace:* + version: link:../../config/deps-installer + '@pnpm/config.package-is-installable': + specifier: workspace:* + version: link:../../config/package-is-installable + '@pnpm/config.reader': + specifier: workspace:* + version: link:../../config/reader + '@pnpm/error': + specifier: workspace:* + version: link:../../packages/error + '@pnpm/hooks.pnpmfile': + specifier: workspace:* + version: link:../../hooks/pnpmfile + '@pnpm/pkg-manifest.utils': + specifier: workspace:* + version: link:../../pkg-manifest/utils + '@pnpm/store.connection-manager': + specifier: workspace:* + version: link:../../store/connection-manager + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + '@pnpm/util.lex-comparator': + specifier: 'catalog:' + version: 3.0.2 + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader + chalk: + specifier: 'catalog:' + version: 5.6.2 + load-json-file: + specifier: 'catalog:' + version: 7.0.1 + devDependencies: + '@jest/globals': + specifier: 'catalog:' + version: 30.0.5 + '@pnpm/cli.utils': + specifier: workspace:* + version: 'link:' + '@pnpm/logger': + specifier: workspace:* + version: link:../../packages/logger + '@pnpm/prepare': + specifier: workspace:* + version: link:../../__utils__/prepare + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + config/commands: dependencies: - '@pnpm/cli-utils': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../cli/cli-utils - '@pnpm/config': + version: link:../../cli/utils + '@pnpm/config.reader': specifier: workspace:* - version: link:../config + version: link:../reader '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/naming-cases': + '@pnpm/exec.run-npm': specifier: workspace:* - version: link:../../text/naming-cases + version: link:../../exec/run-npm '@pnpm/object.key-sorting': specifier: workspace:* version: link:../../object/key-sorting '@pnpm/object.property-path': specifier: workspace:* version: link:../../object/property-path - '@pnpm/run-npm': + '@pnpm/text.naming-cases': specifier: workspace:* - version: link:../../exec/run-npm - '@pnpm/workspace.manifest-writer': + version: link:../../text/naming-cases + '@pnpm/workspace.workspace-manifest-writer': specifier: workspace:* - version: link:../../workspace/manifest-writer + version: link:../../workspace/workspace-manifest-writer camelcase: specifier: 'catalog:' version: 9.0.0 @@ -2294,12 +2288,12 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 + '@pnpm/config.commands': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/plugin-commands-config': - specifier: workspace:* - version: 'link:' '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -2313,7 +2307,205 @@ importers: specifier: 'catalog:' version: 3.0.0 - config/config: + config/deps-installer: + dependencies: + '@pnpm/config.pick-registry-for-package': + specifier: workspace:* + version: link:../pick-registry-for-package + '@pnpm/config.writer': + specifier: workspace:* + version: link:../writer + '@pnpm/constants': + specifier: workspace:* + version: link:../../packages/constants + '@pnpm/core-loggers': + specifier: workspace:* + version: link:../../packages/core-loggers + '@pnpm/deps.graph-hasher': + specifier: workspace:* + version: link:../../deps/graph-hasher + '@pnpm/error': + specifier: workspace:* + version: link:../../packages/error + '@pnpm/fs.read-modules-dir': + specifier: workspace:* + version: link:../../fs/read-modules-dir + '@pnpm/installing.resolve-dependencies': + specifier: workspace:* + version: link:../../installing/resolve-dependencies + '@pnpm/lockfile.fs': + specifier: workspace:* + version: link:../../lockfile/fs + '@pnpm/lockfile.pruner': + specifier: workspace:* + version: link:../../lockfile/pruner + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../../lockfile/types + '@pnpm/lockfile.utils': + specifier: workspace:* + version: link:../../lockfile/utils + '@pnpm/logger': + specifier: 'catalog:' + version: 1001.0.1 + '@pnpm/network.auth-header': + specifier: workspace:* + version: link:../../network/auth-header + '@pnpm/network.fetch': + specifier: workspace:* + version: link:../../network/fetch + '@pnpm/pkg-manifest.read-package-json': + specifier: workspace:* + version: link:../../pkg-manifest/read-package-json + '@pnpm/resolving.npm-resolver': + specifier: workspace:* + version: link:../../resolving/npm-resolver + '@pnpm/resolving.parse-wanted-dependency': + specifier: workspace:* + version: link:../../resolving/parse-wanted-dependency + '@pnpm/store.controller': + specifier: workspace:* + version: link:../../store/controller + '@pnpm/store.controller-types': + specifier: workspace:* + version: link:../../store/controller-types + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + '@pnpm/worker': + specifier: workspace:^ + version: link:../../worker + '@zkochan/rimraf': + specifier: 'catalog:' + version: 4.0.0 + get-npm-tarball-url: + specifier: 'catalog:' + version: 2.1.0 + symlink-dir: + specifier: 'catalog:' + version: 7.1.0 + devDependencies: + '@pnpm/config.deps-installer': + specifier: workspace:* + version: 'link:' + '@pnpm/prepare': + specifier: workspace:* + version: link:../../__utils__/prepare + '@pnpm/registry-mock': + specifier: 'catalog:' + version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) + '@pnpm/testing.temp-store': + specifier: workspace:* + version: link:../../testing/temp-store + load-json-file: + specifier: 'catalog:' + version: 7.0.1 + read-yaml-file: + specifier: 'catalog:' + version: 3.0.0 + + config/matcher: + dependencies: + escape-string-regexp: + specifier: 'catalog:' + version: 5.0.0 + devDependencies: + '@pnpm/config.matcher': + specifier: workspace:* + version: 'link:' + + config/normalize-registries: + dependencies: + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + normalize-registry-url: + specifier: 'catalog:' + version: 2.0.1 + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + devDependencies: + '@pnpm/config.normalize-registries': + specifier: workspace:* + version: 'link:' + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + + config/package-is-installable: + dependencies: + '@pnpm/cli.meta': + specifier: workspace:* + version: link:../../cli/meta + '@pnpm/core-loggers': + specifier: workspace:* + version: link:../../packages/core-loggers + '@pnpm/engine.runtime.system-node-version': + specifier: workspace:* + version: link:../../engine/runtime/system-node-version + '@pnpm/error': + specifier: workspace:* + version: link:../../packages/error + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + detect-libc: + specifier: 'catalog:' + version: 2.1.2 + execa: + specifier: 'catalog:' + version: safe-execa@0.3.0 + memoize: + specifier: 'catalog:' + version: 10.2.0 + semver: + specifier: 'catalog:' + version: 7.7.4 + devDependencies: + '@jest/globals': + specifier: 'catalog:' + version: 30.0.5 + '@pnpm/config.package-is-installable': + specifier: workspace:* + version: 'link:' + '@pnpm/logger': + specifier: workspace:* + version: link:../../packages/logger + '@types/semver': + specifier: 'catalog:' + version: 7.7.1 + + config/parse-overrides: + dependencies: + '@pnpm/catalogs.resolver': + specifier: workspace:* + version: link:../../catalogs/resolver + '@pnpm/catalogs.types': + specifier: workspace:* + version: link:../../catalogs/types + '@pnpm/error': + specifier: workspace:* + version: link:../../packages/error + '@pnpm/resolving.parse-wanted-dependency': + specifier: workspace:* + version: link:../../resolving/parse-wanted-dependency + devDependencies: + '@pnpm/config.parse-overrides': + specifier: workspace:* + version: 'link:' + + config/pick-registry-for-package: + dependencies: + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + devDependencies: + '@pnpm/config.pick-registry-for-package': + specifier: workspace:* + version: 'link:' + + config/reader: dependencies: '@pnpm/catalogs.config': specifier: workspace:* @@ -2324,39 +2516,39 @@ importers: '@pnpm/config.env-replace': specifier: 'catalog:' version: 3.0.2 + '@pnpm/config.matcher': + specifier: workspace:* + version: link:../matcher '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/git-utils': + '@pnpm/hooks.pnpmfile': specifier: workspace:* - version: link:../../network/git-utils + version: link:../../hooks/pnpmfile '@pnpm/logger': specifier: 'catalog:' version: 1001.0.1 - '@pnpm/matcher': + '@pnpm/network.git-utils': specifier: workspace:* - version: link:../matcher - '@pnpm/naming-cases': - specifier: workspace:* - version: link:../../text/naming-cases + version: link:../../network/git-utils '@pnpm/npm-conf': specifier: 'catalog:' version: 3.0.2 - '@pnpm/pnpmfile': + '@pnpm/text.naming-cases': specifier: workspace:* - version: link:../../hooks/pnpmfile - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest + version: link:../../text/naming-cases '@pnpm/types': specifier: workspace:* version: link:../../packages/types - '@pnpm/workspace.read-manifest': + '@pnpm/workspace.project-manifest-reader': specifier: workspace:* - version: link:../../workspace/read-manifest + version: link:../../workspace/project-manifest-reader + '@pnpm/workspace.workspace-manifest-reader': + specifier: workspace:* + version: link:../../workspace/workspace-manifest-reader better-path-resolve: specifier: 'catalog:' version: 2.0.0 @@ -2409,7 +2601,7 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/config': + '@pnpm/config.reader': specifier: workspace:* version: 'link:' '@pnpm/prepare': @@ -2440,234 +2632,14 @@ importers: specifier: 'catalog:' version: 6.0.0 - config/config-writer: - dependencies: - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - '@pnpm/workspace.manifest-writer': - specifier: workspace:* - version: link:../../workspace/manifest-writer - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' - devDependencies: - '@pnpm/config.config-writer': - specifier: workspace:* - version: 'link:' - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - - config/deps-installer: - dependencies: - '@pnpm/calc-dep-state': - specifier: workspace:* - version: link:../../deps/calc-dep-state - '@pnpm/config.config-writer': - specifier: workspace:* - version: link:../config-writer - '@pnpm/constants': - specifier: workspace:* - version: link:../../packages/constants - '@pnpm/core-loggers': - specifier: workspace:* - version: link:../../packages/core-loggers - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error - '@pnpm/fetch': - specifier: workspace:* - version: link:../../network/fetch - '@pnpm/lockfile.fs': - specifier: workspace:* - version: link:../../lockfile/fs - '@pnpm/lockfile.pruner': - specifier: workspace:* - version: link:../../lockfile/pruner - '@pnpm/lockfile.types': - specifier: workspace:* - version: link:../../lockfile/types - '@pnpm/lockfile.utils': - specifier: workspace:* - version: link:../../lockfile/utils - '@pnpm/logger': - specifier: 'catalog:' - version: 1001.0.1 - '@pnpm/network.auth-header': - specifier: workspace:* - version: link:../../network/auth-header - '@pnpm/npm-resolver': - specifier: workspace:* - version: link:../../resolving/npm-resolver - '@pnpm/package-store': - specifier: workspace:* - version: link:../../store/package-store - '@pnpm/parse-wanted-dependency': - specifier: workspace:* - version: link:../../resolving/parse-wanted-dependency - '@pnpm/pick-registry-for-package': - specifier: workspace:* - version: link:../pick-registry-for-package - '@pnpm/read-modules-dir': - specifier: workspace:* - version: link:../../fs/read-modules-dir - '@pnpm/read-package-json': - specifier: workspace:* - version: link:../../pkg-manifest/read-package-json - '@pnpm/resolve-dependencies': - specifier: workspace:* - version: link:../../installing/resolve-dependencies - '@pnpm/store-controller-types': - specifier: workspace:* - version: link:../../store/store-controller-types - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - '@pnpm/worker': - specifier: workspace:^ - version: link:../../worker - '@zkochan/rimraf': - specifier: 'catalog:' - version: 4.0.0 - get-npm-tarball-url: - specifier: 'catalog:' - version: 2.1.0 - symlink-dir: - specifier: 'catalog:' - version: 7.1.0 - devDependencies: - '@pnpm/config.deps-installer': - specifier: workspace:* - version: 'link:' - '@pnpm/prepare': - specifier: workspace:* - version: link:../../__utils__/prepare - '@pnpm/registry-mock': - specifier: 'catalog:' - version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) - '@pnpm/testing.temp-store': - specifier: workspace:* - version: link:../../testing/temp-store - load-json-file: - specifier: 'catalog:' - version: 7.0.1 - read-yaml-file: - specifier: 'catalog:' - version: 3.0.0 - - config/matcher: - dependencies: - escape-string-regexp: - specifier: 'catalog:' - version: 5.0.0 - devDependencies: - '@pnpm/matcher': - specifier: workspace:* - version: 'link:' - - config/normalize-registries: - dependencies: - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - normalize-registry-url: - specifier: 'catalog:' - version: 2.0.1 - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' - devDependencies: - '@pnpm/normalize-registries': - specifier: workspace:* - version: 'link:' - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - - config/package-is-installable: - dependencies: - '@pnpm/cli-meta': - specifier: workspace:* - version: link:../../cli/cli-meta - '@pnpm/core-loggers': - specifier: workspace:* - version: link:../../packages/core-loggers - '@pnpm/env.system-node-version': - specifier: workspace:* - version: link:../../engine/runtime/system-node-version - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - detect-libc: - specifier: 'catalog:' - version: 2.1.2 - execa: - specifier: 'catalog:' - version: safe-execa@0.3.0 - memoize: - specifier: 'catalog:' - version: 10.2.0 - semver: - specifier: 'catalog:' - version: 7.7.4 - devDependencies: - '@jest/globals': - specifier: 'catalog:' - version: 30.0.5 - '@pnpm/logger': - specifier: workspace:* - version: link:../../packages/logger - '@pnpm/package-is-installable': - specifier: workspace:* - version: 'link:' - '@types/semver': - specifier: 'catalog:' - version: 7.7.1 - - config/parse-overrides: - dependencies: - '@pnpm/catalogs.resolver': - specifier: workspace:* - version: link:../../catalogs/resolver - '@pnpm/catalogs.types': - specifier: workspace:* - version: link:../../catalogs/types - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error - '@pnpm/parse-wanted-dependency': - specifier: workspace:* - version: link:../../resolving/parse-wanted-dependency - devDependencies: - '@pnpm/parse-overrides': - specifier: workspace:* - version: 'link:' - - config/pick-registry-for-package: - dependencies: - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - devDependencies: - '@pnpm/pick-registry-for-package': - specifier: workspace:* - version: 'link:' - config/version-policy: dependencies: + '@pnpm/config.matcher': + specifier: workspace:* + version: link:../matcher '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/matcher': - specifier: workspace:* - version: link:../matcher '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -2682,9 +2654,31 @@ importers: specifier: 'catalog:' version: 7.7.1 + config/writer: + dependencies: + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader + '@pnpm/workspace.workspace-manifest-writer': + specifier: workspace:* + version: link:../../workspace/workspace-manifest-writer + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + devDependencies: + '@pnpm/config.writer': + specifier: workspace:* + version: 'link:' + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + crypto/hash: dependencies: - '@pnpm/graceful-fs': + '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs ssri: @@ -2744,50 +2738,22 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetching-types': + '@pnpm/fetching.types': specifier: workspace:* - version: link:../../fetching/fetching-types + version: link:../../fetching/types devDependencies: '@pnpm/crypto.shasums-file': specifier: workspace:* version: 'link:' - deps/calc-dep-state: - dependencies: - '@pnpm/constants': - specifier: workspace:* - version: link:../../packages/constants - '@pnpm/crypto.object-hasher': - specifier: workspace:* - version: link:../../crypto/object-hasher - '@pnpm/dependency-path': - specifier: workspace:* - version: link:../dependency-path - '@pnpm/lockfile.types': - specifier: workspace:* - version: link:../../lockfile/types - '@pnpm/lockfile.utils': - specifier: workspace:* - version: link:../../lockfile/utils - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - devDependencies: - '@pnpm/calc-dep-state': - specifier: workspace:* - version: 'link:' - deps/compliance/audit: dependencies: '@pnpm/error': specifier: workspace:* version: link:../../../packages/error - '@pnpm/fetch': + '@pnpm/fetching.types': specifier: workspace:* - version: link:../../../network/fetch - '@pnpm/fetching-types': - specifier: workspace:* - version: link:../../../fetching/fetching-types + version: link:../../../fetching/types '@pnpm/lockfile.detect-dep-types': specifier: workspace:* version: link:../../../lockfile/detect-dep-types @@ -2803,22 +2769,25 @@ importers: '@pnpm/lockfile.walker': specifier: workspace:* version: link:../../../lockfile/walker - '@pnpm/read-project-manifest': + '@pnpm/network.fetch': specifier: workspace:* - version: link:../../../pkg-manifest/read-project-manifest + version: link:../../../network/fetch '@pnpm/types': specifier: workspace:* version: link:../../../packages/types + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../../workspace/project-manifest-reader ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' devDependencies: - '@pnpm/audit': - specifier: workspace:* - version: 'link:' '@pnpm/constants': specifier: workspace:* version: link:../../../packages/constants + '@pnpm/deps.compliance.audit': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../../packages/logger @@ -2834,36 +2803,42 @@ importers: deps/compliance/commands: dependencies: - '@pnpm/audit': - specifier: workspace:* - version: link:../audit - '@pnpm/cli-meta': - specifier: workspace:* - version: link:../../../cli/cli-meta - '@pnpm/cli-utils': - specifier: workspace:* - version: link:../../../cli/cli-utils - '@pnpm/command': + '@pnpm/cli.command': specifier: workspace:* version: link:../../../cli/command - '@pnpm/common-cli-options-help': + '@pnpm/cli.common-cli-options-help': specifier: workspace:* version: link:../../../cli/common-cli-options-help - '@pnpm/config': + '@pnpm/cli.meta': specifier: workspace:* - version: link:../../../config/config - '@pnpm/config.config-writer': + version: link:../../../cli/meta + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../../config/config-writer + version: link:../../../cli/utils + '@pnpm/config.reader': + specifier: workspace:* + version: link:../../../config/reader + '@pnpm/config.writer': + specifier: workspace:* + version: link:../../../config/writer '@pnpm/constants': specifier: workspace:* version: link:../../../packages/constants + '@pnpm/deps.compliance.audit': + specifier: workspace:* + version: link:../audit + '@pnpm/deps.compliance.license-scanner': + specifier: workspace:* + version: link:../license-scanner + '@pnpm/deps.compliance.sbom': + specifier: workspace:* + version: link:../sbom '@pnpm/error': specifier: workspace:* version: link:../../../packages/error - '@pnpm/license-scanner': + '@pnpm/installing.commands': specifier: workspace:* - version: link:../license-scanner + version: link:../../../installing/commands '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../../lockfile/fs @@ -2879,21 +2854,15 @@ importers: '@pnpm/network.auth-header': specifier: workspace:* version: link:../../../network/auth-header - '@pnpm/plugin-commands-installation': + '@pnpm/store.path': specifier: workspace:* - version: link:../../../installing/commands - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../../../pkg-manifest/read-project-manifest - '@pnpm/sbom': - specifier: workspace:* - version: link:../sbom - '@pnpm/store-path': - specifier: workspace:* - version: link:../../../store/store-path + version: link:../../../store/path '@pnpm/types': specifier: workspace:* version: link:../../../packages/types + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../../workspace/project-manifest-reader '@zkochan/table': specifier: 'catalog:' version: 2.0.1 @@ -2916,24 +2885,21 @@ importers: '@pnpm/deps.compliance.commands': specifier: workspace:* version: 'link:' - '@pnpm/filter-workspace-packages': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* - version: link:../../../workspace/filter-workspace-packages + version: link:../../../pkg-manifest/read-package-json '@pnpm/prepare': specifier: workspace:* version: link:../../../__utils__/prepare - '@pnpm/read-package-json': - specifier: workspace:* - version: link:../../../pkg-manifest/read-package-json '@pnpm/registry-mock': specifier: 'catalog:' version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) '@pnpm/test-fixtures': specifier: workspace:* version: link:../../../__utils__/test-fixtures - '@pnpm/workspace.filter-packages-from-dir': + '@pnpm/workspace.projects-filter': specifier: workspace:* - version: link:../../../workspace/filter-packages-from-dir + version: link:../../../workspace/projects-filter '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -2958,9 +2924,12 @@ importers: deps/compliance/license-scanner: dependencies: - '@pnpm/dependency-path': + '@pnpm/config.package-is-installable': specifier: workspace:* - version: link:../../dependency-path + version: link:../../../config/package-is-installable + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../path '@pnpm/error': specifier: workspace:* version: link:../../../packages/error @@ -2979,10 +2948,7 @@ importers: '@pnpm/lockfile.walker': specifier: workspace:* version: link:../../../lockfile/walker - '@pnpm/package-is-installable': - specifier: workspace:* - version: link:../../../config/package-is-installable - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../../pkg-manifest/read-package-json '@pnpm/store.index': @@ -3013,7 +2979,7 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../../packages/constants - '@pnpm/license-scanner': + '@pnpm/deps.compliance.license-scanner': specifier: workspace:* version: 'link:' '@pnpm/logger': @@ -3043,7 +3009,7 @@ importers: '@pnpm/lockfile.walker': specifier: workspace:* version: link:../../../lockfile/walker - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../../pkg-manifest/read-package-json '@pnpm/store.index': @@ -3065,73 +3031,54 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 + '@pnpm/deps.compliance.sbom': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../../packages/logger - '@pnpm/sbom': - specifier: workspace:* - version: 'link:' '@types/ssri': specifier: 'catalog:' version: 7.1.5 - deps/dependency-path: - dependencies: - '@pnpm/crypto.hash': - specifier: workspace:* - version: link:../../crypto/hash - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - semver: - specifier: 'catalog:' - version: 7.7.4 - devDependencies: - '@pnpm/dependency-path': - specifier: workspace:* - version: 'link:' - '@types/semver': - specifier: 'catalog:' - version: 7.7.1 - deps/graph-builder: dependencies: - '@pnpm/calc-dep-state': + '@pnpm/config.package-is-installable': specifier: workspace:* - version: link:../calc-dep-state + version: link:../../config/package-is-installable '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/dependency-path': + '@pnpm/deps.graph-hasher': specifier: workspace:* - version: link:../dependency-path + version: link:../graph-hasher + '@pnpm/deps.path': + specifier: workspace:* + version: link:../path '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../../installing/modules-yaml '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../lockfile/fs '@pnpm/lockfile.utils': specifier: workspace:* version: link:../../lockfile/utils - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../../installing/modules-yaml - '@pnpm/package-is-installable': - specifier: workspace:* - version: link:../../config/package-is-installable '@pnpm/patching.config': specifier: workspace:* version: link:../../patching/config '@pnpm/patching.types': specifier: workspace:* version: link:../../patching/types - '@pnpm/store-controller-types': + '@pnpm/store.controller-types': specifier: workspace:* - version: link:../../store/store-controller-types + version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -3152,6 +3099,31 @@ importers: specifier: 'catalog:' version: 0.29.12 + deps/graph-hasher: + dependencies: + '@pnpm/constants': + specifier: workspace:* + version: link:../../packages/constants + '@pnpm/crypto.object-hasher': + specifier: workspace:* + version: link:../../crypto/object-hasher + '@pnpm/deps.path': + specifier: workspace:* + version: link:../path + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../../lockfile/types + '@pnpm/lockfile.utils': + specifier: workspace:* + version: link:../../lockfile/utils + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + devDependencies: + '@pnpm/deps.graph-hasher': + specifier: workspace:* + version: 'link:' + deps/graph-sequencer: devDependencies: '@pnpm/deps.graph-sequencer': @@ -3160,24 +3132,30 @@ importers: deps/inspection/commands: dependencies: - '@pnpm/cli-utils': + '@pnpm/cli.command': specifier: workspace:* - version: link:../../../cli/cli-utils + version: link:../../../cli/command + '@pnpm/cli.common-cli-options-help': + specifier: workspace:* + version: link:../../../cli/common-cli-options-help + '@pnpm/cli.utils': + specifier: workspace:* + version: link:../../../cli/utils '@pnpm/colorize-semver-diff': specifier: 'catalog:' version: 1.0.1 - '@pnpm/command': + '@pnpm/config.matcher': specifier: workspace:* - version: link:../../../cli/command - '@pnpm/common-cli-options-help': + version: link:../../../config/matcher + '@pnpm/config.reader': specifier: workspace:* - version: link:../../../cli/common-cli-options-help - '@pnpm/config': + version: link:../../../config/reader + '@pnpm/deps.inspection.list': specifier: workspace:* - version: link:../../../config/config - '@pnpm/default-resolver': + version: link:../list + '@pnpm/deps.inspection.outdated': specifier: workspace:* - version: link:../../../resolving/default-resolver + version: link:../outdated '@pnpm/error': specifier: workspace:* version: link:../../../packages/error @@ -3187,30 +3165,24 @@ importers: '@pnpm/global.packages': specifier: workspace:* version: link:../../../global/packages - '@pnpm/list': + '@pnpm/installing.modules-yaml': specifier: workspace:* - version: link:../list + version: link:../../../installing/modules-yaml '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../../lockfile/fs '@pnpm/logger': specifier: 'catalog:' version: 1001.0.1 - '@pnpm/matcher': + '@pnpm/resolving.default-resolver': specifier: workspace:* - version: link:../../../config/matcher - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../../../installing/modules-yaml - '@pnpm/outdated': - specifier: workspace:* - version: link:../outdated + version: link:../../../resolving/default-resolver '@pnpm/semver-diff': specifier: 'catalog:' version: 1.1.0 - '@pnpm/store-path': + '@pnpm/store.path': specifier: workspace:* - version: link:../../../store/store-path + version: link:../../../store/path '@pnpm/types': specifier: workspace:* version: link:../../../packages/types @@ -3236,10 +3208,7 @@ importers: '@pnpm/deps.inspection.commands': specifier: workspace:* version: 'link:' - '@pnpm/filter-workspace-packages': - specifier: workspace:* - version: link:../../../workspace/filter-workspace-packages - '@pnpm/plugin-commands-installation': + '@pnpm/installing.commands': specifier: workspace:* version: link:../../../installing/commands '@pnpm/prepare': @@ -3251,9 +3220,9 @@ importers: '@pnpm/test-fixtures': specifier: workspace:* version: link:../../../__utils__/test-fixtures - '@pnpm/workspace.filter-packages-from-dir': + '@pnpm/workspace.projects-filter': specifier: workspace:* - version: link:../../../workspace/filter-packages-from-dir + version: link:../../../workspace/projects-filter '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -3270,11 +3239,142 @@ importers: specifier: 'catalog:' version: 6.0.0 - deps/inspection/dependencies-hierarchy: + deps/inspection/list: dependencies: - '@pnpm/dependency-path': + '@pnpm/deps.inspection.tree-builder': specifier: workspace:* - version: link:../../dependency-path + version: link:../tree-builder + '@pnpm/lockfile.fs': + specifier: workspace:* + version: link:../../../lockfile/fs + '@pnpm/pkg-manifest.read-package-json': + specifier: workspace:* + version: link:../../../pkg-manifest/read-package-json + '@pnpm/text.tree-renderer': + specifier: workspace:* + version: link:../../../text/tree-renderer + '@pnpm/types': + specifier: workspace:* + version: link:../../../packages/types + '@pnpm/util.lex-comparator': + specifier: 'catalog:' + version: 3.0.2 + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../../workspace/project-manifest-reader + chalk: + specifier: 'catalog:' + version: 5.6.2 + p-limit: + specifier: 'catalog:' + version: 7.3.0 + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + devDependencies: + '@pnpm/deps.inspection.list': + specifier: workspace:* + version: 'link:' + '@pnpm/test-fixtures': + specifier: workspace:* + version: link:../../../__utils__/test-fixtures + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + + deps/inspection/outdated: + dependencies: + '@pnpm/catalogs.resolver': + specifier: workspace:* + version: link:../../../catalogs/resolver + '@pnpm/catalogs.types': + specifier: workspace:* + version: link:../../../catalogs/types + '@pnpm/config.matcher': + specifier: workspace:* + version: link:../../../config/matcher + '@pnpm/config.parse-overrides': + specifier: workspace:* + version: link:../../../config/parse-overrides + '@pnpm/config.pick-registry-for-package': + specifier: workspace:* + version: link:../../../config/pick-registry-for-package + '@pnpm/config.version-policy': + specifier: workspace:* + version: link:../../../config/version-policy + '@pnpm/constants': + specifier: workspace:* + version: link:../../../packages/constants + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../path + '@pnpm/error': + specifier: workspace:* + version: link:../../../packages/error + '@pnpm/hooks.read-package-hook': + specifier: workspace:* + version: link:../../../hooks/read-package-hook + '@pnpm/installing.client': + specifier: workspace:* + version: link:../../../installing/client + '@pnpm/lockfile.fs': + specifier: workspace:* + version: link:../../../lockfile/fs + '@pnpm/lockfile.utils': + specifier: workspace:* + version: link:../../../lockfile/utils + '@pnpm/pkg-manifest.utils': + specifier: workspace:* + version: link:../../../pkg-manifest/utils + '@pnpm/resolving.npm-resolver': + specifier: workspace:* + version: link:../../../resolving/npm-resolver + '@pnpm/types': + specifier: workspace:* + version: link:../../../packages/types + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + semver: + specifier: 'catalog:' + version: 7.7.4 + devDependencies: + '@jest/globals': + specifier: 'catalog:' + version: 30.0.5 + '@pnpm/deps.inspection.outdated': + specifier: workspace:* + version: 'link:' + '@pnpm/logger': + specifier: workspace:* + version: link:../../../packages/logger + '@pnpm/resolving.resolver-base': + specifier: workspace:* + version: link:../../../resolving/resolver-base + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + '@types/semver': + specifier: 'catalog:' + version: 7.7.1 + + deps/inspection/tree-builder: + dependencies: + '@pnpm/config.matcher': + specifier: workspace:* + version: link:../../../config/matcher + '@pnpm/config.normalize-registries': + specifier: workspace:* + version: link:../../../config/normalize-registries + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../path + '@pnpm/fs.read-modules-dir': + specifier: workspace:* + version: link:../../../fs/read-modules-dir + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../../../installing/modules-yaml '@pnpm/lockfile.detect-dep-types': specifier: workspace:* version: link:../../../lockfile/detect-dep-types @@ -3284,22 +3384,10 @@ importers: '@pnpm/lockfile.utils': specifier: workspace:* version: link:../../../lockfile/utils - '@pnpm/matcher': - specifier: workspace:* - version: link:../../../config/matcher - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../../../installing/modules-yaml - '@pnpm/normalize-registries': - specifier: workspace:* - version: link:../../../config/normalize-registries '@pnpm/npm-package-arg': specifier: 'catalog:' version: 2.0.0 - '@pnpm/read-modules-dir': - specifier: workspace:* - version: link:../../../fs/read-modules-dir - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../../pkg-manifest/read-package-json '@pnpm/store.cafs': @@ -3333,7 +3421,7 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../../packages/constants - '@pnpm/reviewing.dependencies-hierarchy': + '@pnpm/deps.inspection.tree-builder': specifier: workspace:* version: 'link:' '@pnpm/test-fixtures': @@ -3346,121 +3434,21 @@ importers: specifier: 'catalog:' version: 7.7.1 - deps/inspection/list: + deps/path: dependencies: - '@pnpm/lockfile.fs': + '@pnpm/crypto.hash': specifier: workspace:* - version: link:../../../lockfile/fs - '@pnpm/read-package-json': - specifier: workspace:* - version: link:../../../pkg-manifest/read-package-json - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../../../pkg-manifest/read-project-manifest - '@pnpm/reviewing.dependencies-hierarchy': - specifier: workspace:* - version: link:../dependencies-hierarchy - '@pnpm/text.tree-renderer': - specifier: workspace:* - version: link:../../../text/tree-renderer + version: link:../../crypto/hash '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types - '@pnpm/util.lex-comparator': - specifier: 'catalog:' - version: 3.0.2 - chalk: - specifier: 'catalog:' - version: 5.6.2 - p-limit: - specifier: 'catalog:' - version: 7.3.0 - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' - devDependencies: - '@pnpm/list': - specifier: workspace:* - version: 'link:' - '@pnpm/test-fixtures': - specifier: workspace:* - version: link:../../../__utils__/test-fixtures - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - - deps/inspection/outdated: - dependencies: - '@pnpm/catalogs.resolver': - specifier: workspace:* - version: link:../../../catalogs/resolver - '@pnpm/catalogs.types': - specifier: workspace:* - version: link:../../../catalogs/types - '@pnpm/client': - specifier: workspace:* - version: link:../../../installing/client - '@pnpm/config.version-policy': - specifier: workspace:* - version: link:../../../config/version-policy - '@pnpm/constants': - specifier: workspace:* - version: link:../../../packages/constants - '@pnpm/dependency-path': - specifier: workspace:* - version: link:../../dependency-path - '@pnpm/error': - specifier: workspace:* - version: link:../../../packages/error - '@pnpm/hooks.read-package-hook': - specifier: workspace:* - version: link:../../../hooks/read-package-hook - '@pnpm/lockfile.fs': - specifier: workspace:* - version: link:../../../lockfile/fs - '@pnpm/lockfile.utils': - specifier: workspace:* - version: link:../../../lockfile/utils - '@pnpm/manifest-utils': - specifier: workspace:* - version: link:../../../pkg-manifest/manifest-utils - '@pnpm/matcher': - specifier: workspace:* - version: link:../../../config/matcher - '@pnpm/npm-resolver': - specifier: workspace:* - version: link:../../../resolving/npm-resolver - '@pnpm/parse-overrides': - specifier: workspace:* - version: link:../../../config/parse-overrides - '@pnpm/pick-registry-for-package': - specifier: workspace:* - version: link:../../../config/pick-registry-for-package - '@pnpm/types': - specifier: workspace:* - version: link:../../../packages/types - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' + version: link:../../packages/types semver: specifier: 'catalog:' version: 7.7.4 devDependencies: - '@jest/globals': - specifier: 'catalog:' - version: 30.0.5 - '@pnpm/logger': - specifier: workspace:* - version: link:../../../packages/logger - '@pnpm/outdated': + '@pnpm/deps.path': specifier: workspace:* version: 'link:' - '@pnpm/resolver-base': - specifier: workspace:* - version: link:../../../resolving/resolver-base - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 '@types/semver': specifier: 'catalog:' version: 7.7.1 @@ -3471,7 +3459,7 @@ importers: specifier: 'catalog:' version: 7.7.4 devDependencies: - '@pnpm/semver.peer-range': + '@pnpm/deps.peer-range': specifier: workspace:* version: 'link:' '@types/semver': @@ -3480,9 +3468,12 @@ importers: deps/status: dependencies: - '@pnpm/config': + '@pnpm/config.parse-overrides': specifier: workspace:* - version: link:../../config/config + version: link:../../config/parse-overrides + '@pnpm/config.reader': + specifier: workspace:* + version: link:../../config/reader '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants @@ -3492,9 +3483,9 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/get-context': + '@pnpm/installing.context': specifier: workspace:* - version: link:../../installing/get-context + version: link:../../installing/context '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../lockfile/fs @@ -3507,24 +3498,21 @@ importers: '@pnpm/logger': specifier: 'catalog:' version: 1001.0.1 - '@pnpm/parse-overrides': - specifier: workspace:* - version: link:../../config/parse-overrides - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* version: link:../../packages/types - '@pnpm/workspace.find-packages': + '@pnpm/workspace.projects-reader': specifier: workspace:* - version: link:../../workspace/find-packages - '@pnpm/workspace.read-manifest': - specifier: workspace:* - version: link:../../workspace/read-manifest + version: link:../../workspace/projects-reader '@pnpm/workspace.state': specifier: workspace:* version: link:../../workspace/state + '@pnpm/workspace.workspace-manifest-reader': + specifier: workspace:* + version: link:../../workspace/workspace-manifest-reader ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -3538,33 +3526,33 @@ importers: '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare - '@pnpm/write-project-manifest': + '@pnpm/workspace.project-manifest-writer': specifier: workspace:* - version: link:../../pkg-manifest/write-project-manifest + version: link:../../workspace/project-manifest-writer '@types/ramda': specifier: 'catalog:' version: 0.29.12 engine/pm/commands: dependencies: - '@pnpm/calc-dep-state': + '@pnpm/bins.linker': specifier: workspace:* - version: link:../../../deps/calc-dep-state - '@pnpm/cli-meta': + version: link:../../../bins/linker + '@pnpm/cli.meta': specifier: workspace:* - version: link:../../../cli/cli-meta - '@pnpm/cli-utils': + version: link:../../../cli/meta + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../../cli/cli-utils - '@pnpm/client': - specifier: workspace:* - version: link:../../../installing/client - '@pnpm/config': - specifier: workspace:* - version: link:../../../config/config + version: link:../../../cli/utils '@pnpm/config.deps-installer': specifier: workspace:* version: link:../../../config/deps-installer + '@pnpm/config.reader': + specifier: workspace:* + version: link:../../../config/reader + '@pnpm/deps.graph-hasher': + specifier: workspace:* + version: link:../../../deps/graph-hasher '@pnpm/error': specifier: workspace:* version: link:../../../packages/error @@ -3574,33 +3562,33 @@ importers: '@pnpm/global.packages': specifier: workspace:* version: link:../../../global/packages - '@pnpm/headless': + '@pnpm/installing.client': + specifier: workspace:* + version: link:../../../installing/client + '@pnpm/installing.deps-restorer': specifier: workspace:* version: link:../../../installing/deps-restorer - '@pnpm/link-bins': - specifier: workspace:* - version: link:../../../bins/link-bins '@pnpm/lockfile.types': specifier: workspace:* version: link:../../../lockfile/types - '@pnpm/npm-resolver': - specifier: workspace:* - version: link:../../../resolving/npm-resolver '@pnpm/os.env.path-extender': specifier: 'catalog:' version: 2.0.3 - '@pnpm/package-store': + '@pnpm/resolving.npm-resolver': specifier: workspace:* - version: link:../../../store/package-store - '@pnpm/read-project-manifest': + version: link:../../../resolving/npm-resolver + '@pnpm/store.connection-manager': specifier: workspace:* - version: link:../../../pkg-manifest/read-project-manifest - '@pnpm/store-connection-manager': + version: link:../../../store/connection-manager + '@pnpm/store.controller': specifier: workspace:* - version: link:../../../store/store-connection-manager + version: link:../../../store/controller '@pnpm/types': specifier: workspace:* version: link:../../../packages/types + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../../workspace/project-manifest-reader ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -3620,15 +3608,15 @@ importers: '@pnpm/engine.pm.commands': specifier: workspace:* version: 'link:' - '@pnpm/env.path': - specifier: workspace:* - version: link:../../../shell/path '@pnpm/logger': specifier: workspace:* version: link:../../../packages/logger '@pnpm/prepare': specifier: workspace:* version: link:../../../__utils__/prepare + '@pnpm/shell.path': + specifier: workspace:* + version: link:../../../shell/path '@types/cross-spawn': specifier: 'catalog:' version: 6.0.6 @@ -3647,24 +3635,24 @@ importers: engine/runtime/commands: dependencies: - '@pnpm/cli-utils': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../../cli/cli-utils - '@pnpm/config': + version: link:../../../cli/utils + '@pnpm/config.reader': specifier: workspace:* - version: link:../../../config/config + version: link:../../../config/reader + '@pnpm/engine.runtime.node.resolver': + specifier: workspace:* + version: link:../node.resolver '@pnpm/error': specifier: workspace:* version: link:../../../packages/error '@pnpm/exec.pnpm-cli-runner': specifier: workspace:* version: link:../../../exec/pnpm-cli-runner - '@pnpm/fetch': + '@pnpm/network.fetch': specifier: workspace:* version: link:../../../network/fetch - '@pnpm/node.resolver': - specifier: workspace:* - version: link:../node.resolver render-help: specifier: 'catalog:' version: 2.0.0 @@ -3672,39 +3660,39 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 + '@pnpm/engine.runtime.commands': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../../packages/logger - '@pnpm/runtime.commands': - specifier: workspace:* - version: 'link:' cross-env: specifier: 'catalog:' version: 10.1.0 engine/runtime/node.fetcher: dependencies: - '@pnpm/create-cafs-store': - specifier: workspace:* - version: link:../../../store/create-cafs-store '@pnpm/crypto.shasums-file': specifier: workspace:* version: link:../../../crypto/shasums-file - '@pnpm/fetching-types': + '@pnpm/engine.runtime.node.resolver': specifier: workspace:* - version: link:../../../fetching/fetching-types + version: link:../node.resolver '@pnpm/fetching.binary-fetcher': specifier: workspace:* version: link:../../../fetching/binary-fetcher - '@pnpm/node.resolver': + '@pnpm/fetching.tarball-fetcher': specifier: workspace:* - version: link:../node.resolver + version: link:../../../fetching/tarball-fetcher + '@pnpm/fetching.types': + specifier: workspace:* + version: link:../../../fetching/types + '@pnpm/store.create-cafs-store': + specifier: workspace:* + version: link:../../../store/create-cafs-store '@pnpm/store.index': specifier: workspace:* version: link:../../../store/index - '@pnpm/tarball-fetcher': - specifier: workspace:* - version: link:../../../fetching/tarball-fetcher detect-libc: specifier: 'catalog:' version: 2.1.2 @@ -3712,15 +3700,15 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../../../store/cafs-types - '@pnpm/node.fetcher': + '@pnpm/engine.runtime.node.fetcher': specifier: workspace:* version: 'link:' '@pnpm/prepare': specifier: workspace:* version: link:../../../__utils__/prepare + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../../../store/cafs-types '@types/adm-zip': specifier: 'catalog:' version: 0.5.7 @@ -3733,9 +3721,9 @@ importers: engine/runtime/node.resolver: dependencies: - '@pnpm/config': + '@pnpm/config.reader': specifier: workspace:* - version: link:../../../config/config + version: link:../../../config/reader '@pnpm/constants': specifier: workspace:* version: link:../../../packages/constants @@ -3745,10 +3733,10 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../../packages/error - '@pnpm/fetching-types': + '@pnpm/fetching.types': specifier: workspace:* - version: link:../../../fetching/fetching-types - '@pnpm/resolver-base': + version: link:../../../fetching/types + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../../resolving/resolver-base '@pnpm/types': @@ -3761,21 +3749,21 @@ importers: specifier: 'catalog:' version: 3.0.0 devDependencies: - '@pnpm/fetch': - specifier: workspace:* - version: link:../../../network/fetch - '@pnpm/node.resolver': + '@pnpm/engine.runtime.node.resolver': specifier: workspace:* version: 'link:' + '@pnpm/network.fetch': + specifier: workspace:* + version: link:../../../network/fetch '@types/semver': specifier: 'catalog:' version: 7.7.1 engine/runtime/system-node-version: dependencies: - '@pnpm/cli-meta': + '@pnpm/cli.meta': specifier: workspace:* - version: link:../../../cli/cli-meta + version: link:../../../cli/meta execa: specifier: 'catalog:' version: safe-execa@0.3.0 @@ -3786,30 +3774,30 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/env.system-node-version': + '@pnpm/engine.runtime.system-node-version': specifier: workspace:* version: 'link:' exec/commands: dependencies: + '@pnpm/bins.resolver': + specifier: workspace:* + version: link:../../bins/resolver '@pnpm/catalogs.resolver': specifier: workspace:* version: link:../../catalogs/resolver - '@pnpm/cli-utils': - specifier: workspace:* - version: link:../../cli/cli-utils - '@pnpm/client': - specifier: workspace:* - version: link:../../installing/client - '@pnpm/command': + '@pnpm/cli.command': specifier: workspace:* version: link:../../cli/command - '@pnpm/common-cli-options-help': + '@pnpm/cli.common-cli-options-help': specifier: workspace:* version: link:../../cli/common-cli-options-help - '@pnpm/config': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../config/config + version: link:../../cli/utils + '@pnpm/config.reader': + specifier: workspace:* + version: link:../../config/reader '@pnpm/config.version-policy': specifier: workspace:* version: link:../../config/version-policy @@ -3822,45 +3810,39 @@ importers: '@pnpm/deps.status': specifier: workspace:* version: link:../../deps/status - '@pnpm/env.path': + '@pnpm/engine.runtime.commands': specifier: workspace:* - version: link:../../shell/path + version: link:../../engine/runtime/commands '@pnpm/error': specifier: workspace:* version: link:../../packages/error + '@pnpm/exec.lifecycle': + specifier: workspace:* + version: link:../lifecycle '@pnpm/exec.pnpm-cli-runner': specifier: workspace:* version: link:../pnpm-cli-runner - '@pnpm/lifecycle': + '@pnpm/installing.client': specifier: workspace:* - version: link:../lifecycle + version: link:../../installing/client + '@pnpm/installing.commands': + specifier: workspace:* + version: link:../../installing/commands '@pnpm/log.group': specifier: 'catalog:' version: 3.0.1 - '@pnpm/package-bins': - specifier: workspace:* - version: link:../../bins/package-bins - '@pnpm/parse-wanted-dependency': - specifier: workspace:* - version: link:../../resolving/parse-wanted-dependency - '@pnpm/plugin-commands-installation': - specifier: workspace:* - version: link:../../installing/commands - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/read-project-manifest': + '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest - '@pnpm/runtime.commands': + version: link:../../resolving/parse-wanted-dependency + '@pnpm/shell.path': specifier: workspace:* - version: link:../../engine/runtime/commands - '@pnpm/sort-packages': + version: link:../../shell/path + '@pnpm/store.path': specifier: workspace:* - version: link:../../workspace/sort-packages - '@pnpm/store-path': - specifier: workspace:* - version: link:../../store/store-path + version: link:../../store/path '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -3870,6 +3852,12 @@ importers: '@pnpm/workspace.injected-deps-syncer': specifier: workspace:* version: link:../../workspace/injected-deps-syncer + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader + '@pnpm/workspace.sort-packages': + specifier: workspace:* + version: link:../../workspace/sort-packages '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -3907,18 +3895,15 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/env.system-node-version': + '@pnpm/engine.runtime.system-node-version': specifier: workspace:* version: link:../../engine/runtime/system-node-version - '@pnpm/filter-workspace-packages': + '@pnpm/exec.commands': specifier: workspace:* - version: link:../../workspace/filter-workspace-packages + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/plugin-commands-script-runners': - specifier: workspace:* - version: 'link:' '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -3928,9 +3913,9 @@ importers: '@pnpm/test-ipc-server': specifier: workspace:* version: link:../../__utils__/test-ipc-server - '@pnpm/workspace.filter-packages-from-dir': + '@pnpm/workspace.projects-filter': specifier: workspace:* - version: link:../../workspace/filter-packages-from-dir + version: link:../../workspace/projects-filter '@types/is-windows': specifier: 'catalog:' version: 1.0.2 @@ -3949,30 +3934,30 @@ importers: exec/lifecycle: dependencies: - '@pnpm/cafs-types': + '@pnpm/bins.linker': specifier: workspace:* - version: link:../../store/cafs-types + version: link:../../bins/linker '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/directory-fetcher': - specifier: workspace:* - version: link:../../fetching/directory-fetcher '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/link-bins': + '@pnpm/fetching.directory-fetcher': specifier: workspace:* - version: link:../../bins/link-bins + version: link:../../fetching/directory-fetcher '@pnpm/npm-lifecycle': specifier: 'catalog:' version: 1001.0.0(patch_hash=9ca23edf604c5e8ff290e3c0a5443646b5f9865624042a5c41d9b2beb8f98972)(typanion@3.14.0) - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/store-controller-types': + '@pnpm/store.cafs-types': specifier: workspace:* - version: link:../../store/store-controller-types + version: link:../../store/cafs-types + '@pnpm/store.controller-types': + specifier: workspace:* + version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -3989,7 +3974,7 @@ importers: specifier: 'catalog:' version: 3.0.0 devDependencies: - '@pnpm/lifecycle': + '@pnpm/exec.lifecycle': specifier: workspace:* version: 'link:' '@pnpm/logger': @@ -4029,10 +4014,10 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/lifecycle': + '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../lifecycle - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json '@pnpm/types': @@ -4051,12 +4036,12 @@ importers: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' devDependencies: + '@pnpm/exec.prepare-package': + specifier: workspace:* + version: 'link:' '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare - '@pnpm/prepare-package': - specifier: workspace:* - version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -4079,7 +4064,7 @@ importers: specifier: 'catalog:' version: 1.0.0 devDependencies: - '@pnpm/run-npm': + '@pnpm/exec.run-npm': specifier: workspace:* version: 'link:' '@types/cross-spawn': @@ -4091,12 +4076,12 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../fetcher-base - '@pnpm/fetching-types': + '@pnpm/fetching.types': specifier: workspace:* - version: link:../fetching-types + version: link:../types '@pnpm/store.index': specifier: workspace:* version: link:../../store/index @@ -4137,29 +4122,29 @@ importers: '@pnpm/building.pkg-requires-build': specifier: workspace:* version: link:../../building/pkg-requires-build - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../../store/cafs-types - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../fetcher-base '@pnpm/fs.packlist': specifier: workspace:* version: link:../../fs/packlist - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../../store/cafs-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader devDependencies: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/directory-fetcher': + '@pnpm/fetching.directory-fetcher': specifier: workspace:* version: 'link:' '@pnpm/logger': @@ -4177,7 +4162,7 @@ importers: fetching/fetcher-base: dependencies: - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/types': @@ -4187,40 +4172,27 @@ importers: specifier: 'catalog:' version: 7.1.5 devDependencies: - '@pnpm/cafs-types': + '@pnpm/fetching.fetcher-base': + specifier: workspace:* + version: 'link:' + '@pnpm/store.cafs-types': specifier: workspace:* version: link:../../store/cafs-types - '@pnpm/fetcher-base': - specifier: workspace:* - version: 'link:' - - fetching/fetching-types: - dependencies: - '@zkochan/retry': - specifier: 'catalog:' - version: 0.2.0 - node-fetch: - specifier: 'catalog:' - version: 3.3.2 - devDependencies: - '@pnpm/fetching-types': - specifier: workspace:* - version: 'link:' fetching/git-fetcher: dependencies: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetcher-base': + '@pnpm/exec.prepare-package': + specifier: workspace:* + version: link:../../exec/prepare-package + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../fetcher-base '@pnpm/fs.packlist': specifier: workspace:* version: link:../../fs/packlist - '@pnpm/prepare-package': - specifier: workspace:* - version: link:../../exec/prepare-package '@pnpm/store.index': specifier: workspace:* version: link:../../store/index @@ -4237,10 +4209,7 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/create-cafs-store': - specifier: workspace:* - version: link:../../store/create-cafs-store - '@pnpm/git-fetcher': + '@pnpm/fetching.git-fetcher': specifier: workspace:* version: 'link:' '@pnpm/logger': @@ -4249,6 +4218,9 @@ importers: '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs + '@pnpm/store.create-cafs-store': + specifier: workspace:* + version: link:../../store/create-cafs-store '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -4261,40 +4233,40 @@ importers: fetching/pick-fetcher: dependencies: - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../../store/cafs-types '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../fetcher-base '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../../store/cafs-types devDependencies: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/create-cafs-store': - specifier: workspace:* - version: link:../../store/create-cafs-store - '@pnpm/fetch': - specifier: workspace:* - version: link:../../network/fetch - '@pnpm/pick-fetcher': + '@pnpm/fetching.pick-fetcher': specifier: workspace:* version: 'link:' + '@pnpm/fetching.tarball-fetcher': + specifier: workspace:* + version: link:../tarball-fetcher + '@pnpm/network.fetch': + specifier: workspace:* + version: link:../../network/fetch + '@pnpm/store.create-cafs-store': + specifier: workspace:* + version: link:../../store/create-cafs-store '@pnpm/store.index': specifier: workspace:* version: link:../../store/index - '@pnpm/tarball-fetcher': - specifier: workspace:* - version: link:../tarball-fetcher '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -4313,21 +4285,21 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetcher-base': + '@pnpm/exec.prepare-package': + specifier: workspace:* + version: link:../../exec/prepare-package + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../fetcher-base - '@pnpm/fetching-types': + '@pnpm/fetching.types': specifier: workspace:* - version: link:../fetching-types + version: link:../types + '@pnpm/fs.graceful-fs': + specifier: workspace:* + version: link:../../fs/graceful-fs '@pnpm/fs.packlist': specifier: workspace:* version: link:../../fs/packlist - '@pnpm/graceful-fs': - specifier: workspace:* - version: link:../../fs/graceful-fs - '@pnpm/prepare-package': - specifier: workspace:* - version: link:../../exec/prepare-package '@pnpm/store.index': specifier: workspace:* version: link:../../store/index @@ -4353,21 +4325,21 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/cafs-types': + '@pnpm/fetching.tarball-fetcher': specifier: workspace:* - version: link:../../store/cafs-types - '@pnpm/create-cafs-store': - specifier: workspace:* - version: link:../../store/create-cafs-store - '@pnpm/fetch': - specifier: workspace:* - version: link:../../network/fetch + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/tarball-fetcher': + '@pnpm/network.fetch': specifier: workspace:* - version: 'link:' + version: link:../../network/fetch + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../../store/cafs-types + '@pnpm/store.create-cafs-store': + specifier: workspace:* + version: link:../../store/create-cafs-store '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -4396,17 +4368,30 @@ importers: specifier: 'catalog:' version: 3.0.0 + fetching/types: + dependencies: + '@zkochan/retry': + specifier: 'catalog:' + version: 0.2.0 + node-fetch: + specifier: 'catalog:' + version: 3.3.2 + devDependencies: + '@pnpm/fetching.types': + specifier: workspace:* + version: 'link:' + fs/find-packages: dependencies: - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest '@pnpm/types': specifier: workspace:* version: link:../../packages/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader p-filter: specifier: 'catalog:' version: 4.1.0 @@ -4427,7 +4412,7 @@ importers: specifier: 'catalog:' version: 4.2.11(patch_hash=68ebc232025360cb3dcd3081f4067f4e9fc022ab6b6f71a3230e86c7a5b337d1) devDependencies: - '@pnpm/graceful-fs': + '@pnpm/fs.graceful-fs': specifier: workspace:* version: 'link:' '@types/graceful-fs': @@ -4436,7 +4421,7 @@ importers: fs/hard-link-dir: dependencies: - '@pnpm/graceful-fs': + '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../graceful-fs path-temp: @@ -4461,12 +4446,12 @@ importers: '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/graceful-fs': + '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../graceful-fs - '@pnpm/store-controller-types': + '@pnpm/store.controller-types': specifier: workspace:* - version: link:../../store/store-controller-types + version: link:../../store/controller-types '@reflink/reflink': specifier: 'catalog:' version: 0.1.19 @@ -4516,7 +4501,7 @@ importers: fs/msgpack-file: dependencies: - '@pnpm/graceful-fs': + '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../graceful-fs msgpackr: @@ -4546,7 +4531,7 @@ importers: specifier: 'catalog:' version: 4.2.11(patch_hash=68ebc232025360cb3dcd3081f4067f4e9fc022ab6b6f71a3230e86c7a5b337d1) devDependencies: - '@pnpm/read-modules-dir': + '@pnpm/fs.read-modules-dir': specifier: workspace:* version: 'link:' '@types/graceful-fs': @@ -4565,54 +4550,54 @@ importers: specifier: 'catalog:' version: 7.1.0 devDependencies: + '@pnpm/fs.symlink-dependency': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare - '@pnpm/symlink-dependency': - specifier: workspace:* - version: 'link:' global/commands: dependencies: + '@pnpm/bins.linker': + specifier: workspace:* + version: link:../../bins/linker + '@pnpm/bins.remover': + specifier: workspace:* + version: link:../../bins/remover + '@pnpm/bins.resolver': + specifier: workspace:* + version: link:../../bins/resolver '@pnpm/building.commands': specifier: workspace:* version: link:../../building/commands - '@pnpm/cli-utils': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../cli/cli-utils - '@pnpm/config': + version: link:../../cli/utils + '@pnpm/config.matcher': specifier: workspace:* - version: link:../../config/config - '@pnpm/core': + version: link:../../config/matcher + '@pnpm/config.reader': specifier: workspace:* - version: link:../../installing/deps-installer + version: link:../../config/reader '@pnpm/error': specifier: workspace:* version: link:../../packages/error '@pnpm/global.packages': specifier: workspace:* version: link:../packages - '@pnpm/link-bins': + '@pnpm/installing.deps-installer': specifier: workspace:* - version: link:../../bins/link-bins - '@pnpm/matcher': - specifier: workspace:* - version: link:../../config/matcher - '@pnpm/package-bins': - specifier: workspace:* - version: link:../../bins/package-bins - '@pnpm/read-package-json': + version: link:../../installing/deps-installer + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/remove-bins': + '@pnpm/store.connection-manager': specifier: workspace:* - version: link:../../bins/remove-bins - '@pnpm/store-connection-manager': - specifier: workspace:* - version: link:../../store/store-connection-manager + version: link:../../store/connection-manager '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -4632,13 +4617,13 @@ importers: global/packages: dependencies: + '@pnpm/bins.resolver': + specifier: workspace:* + version: link:../../bins/resolver '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash - '@pnpm/package-bins': - specifier: workspace:* - version: link:../../bins/package-bins - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json '@pnpm/types': @@ -4669,9 +4654,9 @@ importers: '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types - '@pnpm/store-controller-types': + '@pnpm/store.controller-types': specifier: workspace:* - version: link:../../store/store-controller-types + version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -4682,36 +4667,36 @@ importers: specifier: 'catalog:' version: 2.0.0 devDependencies: - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base + '@pnpm/hooks.pnpmfile': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/pnpmfile': - specifier: workspace:* - version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures hooks/read-package-hook: dependencies: + '@pnpm/config.matcher': + specifier: workspace:* + version: link:../../config/matcher + '@pnpm/config.parse-overrides': + specifier: workspace:* + version: link:../../config/parse-overrides + '@pnpm/deps.peer-range': + specifier: workspace:* + version: link:../../deps/peer-range '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/matcher': - specifier: workspace:* - version: link:../../config/matcher - '@pnpm/parse-overrides': - specifier: workspace:* - version: link:../../config/parse-overrides - '@pnpm/parse-wanted-dependency': + '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* version: link:../../resolving/parse-wanted-dependency - '@pnpm/semver.peer-range': - specifier: workspace:* - version: link:../../deps/peer-range '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -4749,18 +4734,18 @@ importers: hooks/types: dependencies: - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../../store/cafs-types - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../../store/cafs-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -4774,42 +4759,42 @@ importers: installing/client: dependencies: - '@pnpm/default-resolver': + '@pnpm/engine.runtime.node.fetcher': specifier: workspace:* - version: link:../../resolving/default-resolver - '@pnpm/directory-fetcher': - specifier: workspace:* - version: link:../../fetching/directory-fetcher - '@pnpm/fetch': - specifier: workspace:* - version: link:../../network/fetch - '@pnpm/fetching-types': - specifier: workspace:* - version: link:../../fetching/fetching-types + version: link:../../engine/runtime/node.fetcher '@pnpm/fetching.binary-fetcher': specifier: workspace:* version: link:../../fetching/binary-fetcher - '@pnpm/git-fetcher': + '@pnpm/fetching.directory-fetcher': + specifier: workspace:* + version: link:../../fetching/directory-fetcher + '@pnpm/fetching.git-fetcher': specifier: workspace:* version: link:../../fetching/git-fetcher + '@pnpm/fetching.tarball-fetcher': + specifier: workspace:* + version: link:../../fetching/tarball-fetcher + '@pnpm/fetching.types': + specifier: workspace:* + version: link:../../fetching/types '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types '@pnpm/network.auth-header': specifier: workspace:* version: link:../../network/auth-header - '@pnpm/node.fetcher': + '@pnpm/network.fetch': specifier: workspace:* - version: link:../../engine/runtime/node.fetcher - '@pnpm/resolver-base': + version: link:../../network/fetch + '@pnpm/resolving.default-resolver': + specifier: workspace:* + version: link:../../resolving/default-resolver + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/store.index': specifier: workspace:* version: link:../../store/index - '@pnpm/tarball-fetcher': - specifier: workspace:* - version: link:../../fetching/tarball-fetcher '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -4817,12 +4802,12 @@ importers: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' devDependencies: - '@pnpm/client': - specifier: workspace:* - version: 'link:' - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base + '@pnpm/installing.client': + specifier: workspace:* + version: 'link:' '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -4838,120 +4823,120 @@ importers: '@pnpm/catalogs.types': specifier: workspace:* version: link:../../catalogs/types - '@pnpm/cli-utils': + '@pnpm/cli.command': specifier: workspace:* - version: link:../../cli/cli-utils + version: link:../../cli/command + '@pnpm/cli.common-cli-options-help': + specifier: workspace:* + version: link:../../cli/common-cli-options-help + '@pnpm/cli.utils': + specifier: workspace:* + version: link:../../cli/utils '@pnpm/colorize-semver-diff': specifier: 'catalog:' version: 1.0.1 - '@pnpm/command': - specifier: workspace:* - version: link:../../cli/command - '@pnpm/common-cli-options-help': - specifier: workspace:* - version: link:../../cli/common-cli-options-help - '@pnpm/config': - specifier: workspace:* - version: link:../../config/config - '@pnpm/config.config-writer': - specifier: workspace:* - version: link:../../config/config-writer '@pnpm/config.deps-installer': specifier: workspace:* version: link:../../config/deps-installer + '@pnpm/config.matcher': + specifier: workspace:* + version: link:../../config/matcher + '@pnpm/config.pick-registry-for-package': + specifier: workspace:* + version: link:../../config/pick-registry-for-package + '@pnpm/config.reader': + specifier: workspace:* + version: link:../../config/reader + '@pnpm/config.writer': + specifier: workspace:* + version: link:../../config/writer '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants - '@pnpm/core': + '@pnpm/deps.inspection.outdated': specifier: workspace:* - version: link:../deps-installer - '@pnpm/dedupe.check': - specifier: workspace:* - version: link:../dedupe/check + version: link:../../deps/inspection/outdated '@pnpm/deps.status': specifier: workspace:* version: link:../../deps/status '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/filter-workspace-packages': + '@pnpm/fs.graceful-fs': specifier: workspace:* - version: link:../../workspace/filter-workspace-packages - '@pnpm/find-workspace-dir': + version: link:../../fs/graceful-fs + '@pnpm/fs.read-modules-dir': specifier: workspace:* - version: link:../../workspace/find-workspace-dir - '@pnpm/get-context': - specifier: workspace:* - version: link:../get-context + version: link:../../fs/read-modules-dir '@pnpm/global.commands': specifier: workspace:* version: link:../../global/commands - '@pnpm/graceful-fs': + '@pnpm/hooks.pnpmfile': specifier: workspace:* - version: link:../../fs/graceful-fs + version: link:../../hooks/pnpmfile + '@pnpm/installing.context': + specifier: workspace:* + version: link:../context + '@pnpm/installing.dedupe.check': + specifier: workspace:* + version: link:../dedupe/check + '@pnpm/installing.deps-installer': + specifier: workspace:* + version: link:../deps-installer '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types - '@pnpm/manifest-utils': - specifier: workspace:* - version: link:../../pkg-manifest/manifest-utils - '@pnpm/matcher': - specifier: workspace:* - version: link:../../config/matcher - '@pnpm/outdated': - specifier: workspace:* - version: link:../../deps/inspection/outdated - '@pnpm/package-store': - specifier: workspace:* - version: link:../../store/package-store - '@pnpm/parse-wanted-dependency': - specifier: workspace:* - version: link:../../resolving/parse-wanted-dependency - '@pnpm/pick-registry-for-package': - specifier: workspace:* - version: link:../../config/pick-registry-for-package - '@pnpm/pnpmfile': - specifier: workspace:* - version: link:../../hooks/pnpmfile - '@pnpm/read-modules-dir': - specifier: workspace:* - version: link:../../fs/read-modules-dir - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/read-project-manifest': + '@pnpm/pkg-manifest.utils': specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest - '@pnpm/resolver-base': + version: link:../../pkg-manifest/utils + '@pnpm/resolving.parse-wanted-dependency': + specifier: workspace:* + version: link:../../resolving/parse-wanted-dependency + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/semver-diff': specifier: 'catalog:' version: 1.1.0 - '@pnpm/sort-packages': + '@pnpm/store.connection-manager': specifier: workspace:* - version: link:../../workspace/sort-packages - '@pnpm/store-connection-manager': + version: link:../../store/connection-manager + '@pnpm/store.controller': specifier: workspace:* - version: link:../../store/store-connection-manager + version: link:../../store/controller '@pnpm/types': specifier: workspace:* version: link:../../packages/types - '@pnpm/workspace.find-packages': - specifier: workspace:* - version: link:../../workspace/find-packages - '@pnpm/workspace.manifest-writer': - specifier: workspace:* - version: link:../../workspace/manifest-writer '@pnpm/workspace.pkgs-graph': specifier: workspace:* version: link:../../workspace/pkgs-graph + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader + '@pnpm/workspace.project-manifest-writer': + specifier: workspace:* + version: link:../../workspace/project-manifest-writer + '@pnpm/workspace.projects-filter': + specifier: workspace:* + version: link:../../workspace/projects-filter + '@pnpm/workspace.projects-reader': + specifier: workspace:* + version: link:../../workspace/projects-reader + '@pnpm/workspace.root-finder': + specifier: workspace:* + version: link:../../workspace/root-finder + '@pnpm/workspace.sort-packages': + specifier: workspace:* + version: link:../../workspace/sort-packages '@pnpm/workspace.state': specifier: workspace:* version: link:../../workspace/state - '@pnpm/write-project-manifest': + '@pnpm/workspace.workspace-manifest-writer': specifier: workspace:* - version: link:../../pkg-manifest/write-project-manifest + version: link:../../workspace/workspace-manifest-writer '@yarnpkg/core': specifier: 'catalog:' version: 4.2.0(typanion@3.14.0) @@ -5010,15 +4995,15 @@ importers: '@pnpm/assert-project': specifier: workspace:* version: link:../../__utils__/assert-project + '@pnpm/installing.commands': + specifier: workspace:* + version: 'link:' + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../modules-yaml '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../modules-yaml - '@pnpm/plugin-commands-installation': - specifier: workspace:* - version: 'link:' '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -5037,9 +5022,6 @@ importers: '@pnpm/worker': specifier: workspace:* version: link:../../worker - '@pnpm/workspace.filter-packages-from-dir': - specifier: workspace:* - version: link:../../workspace/filter-packages-from-dir '@types/normalize-path': specifier: 'catalog:' version: 3.0.2 @@ -5095,14 +5077,57 @@ importers: specifier: 'catalog:' version: 6.0.0 + installing/context: + dependencies: + '@pnpm/constants': + specifier: workspace:* + version: link:../../packages/constants + '@pnpm/core-loggers': + specifier: workspace:* + version: link:../../packages/core-loggers + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../modules-yaml + '@pnpm/installing.read-projects-context': + specifier: workspace:* + version: link:../read-projects-context + '@pnpm/lockfile.fs': + specifier: workspace:* + version: link:../../lockfile/fs + '@pnpm/resolving.resolver-base': + specifier: workspace:* + version: link:../../resolving/resolver-base + '@pnpm/store.controller': + specifier: workspace:* + version: link:../../store/controller + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + path-absolute: + specifier: 'catalog:' + version: 2.0.0 + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + devDependencies: + '@pnpm/installing.context': + specifier: workspace:* + version: 'link:' + '@pnpm/logger': + specifier: workspace:* + version: link:../../packages/logger + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + installing/dedupe/check: dependencies: - '@pnpm/dedupe.types': - specifier: workspace:* - version: link:../types '@pnpm/error': specifier: workspace:* version: link:../../../packages/error + '@pnpm/installing.dedupe.types': + specifier: workspace:* + version: link:../types '@pnpm/lockfile.types': specifier: workspace:* version: link:../../../lockfile/types @@ -5110,13 +5135,13 @@ importers: specifier: workspace:* version: link:../../../packages/types devDependencies: - '@pnpm/dedupe.check': + '@pnpm/installing.dedupe.check': specifier: workspace:* version: 'link:' installing/dedupe/issues-renderer: dependencies: - '@pnpm/dedupe.types': + '@pnpm/installing.dedupe.types': specifier: workspace:* version: link:../types '@pnpm/text.tree-renderer': @@ -5126,18 +5151,24 @@ importers: specifier: 'catalog:' version: 5.6.2 devDependencies: - '@pnpm/dedupe.issues-renderer': + '@pnpm/installing.dedupe.issues-renderer': specifier: workspace:* version: 'link:' installing/dedupe/types: devDependencies: - '@pnpm/dedupe.types': + '@pnpm/installing.dedupe.types': specifier: workspace:* version: 'link:' installing/deps-installer: dependencies: + '@pnpm/bins.linker': + specifier: workspace:* + version: link:../../bins/linker + '@pnpm/bins.remover': + specifier: workspace:* + version: link:../../bins/remover '@pnpm/building.after-install': specifier: workspace:* version: link:../../building/after-install @@ -5147,9 +5178,6 @@ importers: '@pnpm/building.policy': specifier: workspace:* version: link:../../building/policy - '@pnpm/calc-dep-state': - specifier: workspace:* - version: link:../../deps/calc-dep-state '@pnpm/catalogs.protocol-parser': specifier: workspace:* version: link:../../catalogs/protocol-parser @@ -5159,6 +5187,15 @@ importers: '@pnpm/catalogs.types': specifier: workspace:* version: link:../../catalogs/types + '@pnpm/config.matcher': + specifier: workspace:* + version: link:../../config/matcher + '@pnpm/config.normalize-registries': + specifier: workspace:* + version: link:../../config/normalize-registries + '@pnpm/config.parse-overrides': + specifier: workspace:* + version: link:../../config/parse-overrides '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants @@ -5171,39 +5208,57 @@ importers: '@pnpm/crypto.object-hasher': specifier: workspace:* version: link:../../crypto/object-hasher - '@pnpm/dependency-path': + '@pnpm/deps.graph-hasher': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/graph-hasher '@pnpm/deps.graph-sequencer': specifier: workspace:* version: link:../../deps/graph-sequencer + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/get-context': + '@pnpm/exec.lifecycle': specifier: workspace:* - version: link:../get-context - '@pnpm/headless': + version: link:../../exec/lifecycle + '@pnpm/fs.read-modules-dir': specifier: workspace:* - version: link:../deps-restorer - '@pnpm/hoist': + version: link:../../fs/read-modules-dir + '@pnpm/fs.symlink-dependency': specifier: workspace:* - version: link:../linking/hoist + version: link:../../fs/symlink-dependency '@pnpm/hooks.read-package-hook': specifier: workspace:* version: link:../../hooks/read-package-hook '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types - '@pnpm/lifecycle': + '@pnpm/installing.context': specifier: workspace:* - version: link:../../exec/lifecycle - '@pnpm/link-bins': + version: link:../context + '@pnpm/installing.deps-restorer': specifier: workspace:* - version: link:../../bins/link-bins - '@pnpm/lockfile-to-pnp': + version: link:../deps-restorer + '@pnpm/installing.linking.direct-dep-linker': specifier: workspace:* - version: link:../../lockfile/lockfile-to-pnp + version: link:../linking/direct-dep-linker + '@pnpm/installing.linking.hoist': + specifier: workspace:* + version: link:../linking/hoist + '@pnpm/installing.linking.modules-cleaner': + specifier: workspace:* + version: link:../linking/modules-cleaner + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../modules-yaml + '@pnpm/installing.package-requester': + specifier: workspace:* + version: link:../package-requester + '@pnpm/installing.resolve-dependencies': + specifier: workspace:* + version: link:../resolve-dependencies '@pnpm/lockfile.filtering': specifier: workspace:* version: link:../../lockfile/filtering @@ -5219,6 +5274,9 @@ importers: '@pnpm/lockfile.settings-checker': specifier: workspace:* version: link:../../lockfile/settings-checker + '@pnpm/lockfile.to-pnp': + specifier: workspace:* + version: link:../../lockfile/to-pnp '@pnpm/lockfile.utils': specifier: workspace:* version: link:../../lockfile/utils @@ -5228,60 +5286,24 @@ importers: '@pnpm/lockfile.walker': specifier: workspace:* version: link:../../lockfile/walker - '@pnpm/manifest-utils': - specifier: workspace:* - version: link:../../pkg-manifest/manifest-utils - '@pnpm/matcher': - specifier: workspace:* - version: link:../../config/matcher - '@pnpm/modules-cleaner': - specifier: workspace:* - version: link:../linking/modules-cleaner - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../modules-yaml - '@pnpm/normalize-registries': - specifier: workspace:* - version: link:../../config/normalize-registries '@pnpm/npm-package-arg': specifier: 'catalog:' version: 2.0.0 - '@pnpm/package-requester': - specifier: workspace:* - version: link:../package-requester - '@pnpm/parse-overrides': - specifier: workspace:* - version: link:../../config/parse-overrides - '@pnpm/parse-wanted-dependency': - specifier: workspace:* - version: link:../../resolving/parse-wanted-dependency '@pnpm/patching.config': specifier: workspace:* version: link:../../patching/config - '@pnpm/pkg-manager.direct-dep-linker': + '@pnpm/pkg-manifest.utils': specifier: workspace:* - version: link:../linking/direct-dep-linker - '@pnpm/read-modules-dir': + version: link:../../pkg-manifest/utils + '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* - version: link:../../fs/read-modules-dir - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest - '@pnpm/remove-bins': - specifier: workspace:* - version: link:../../bins/remove-bins - '@pnpm/resolve-dependencies': - specifier: workspace:* - version: link:../resolve-dependencies - '@pnpm/resolver-base': + version: link:../../resolving/parse-wanted-dependency + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base - '@pnpm/store-controller-types': + '@pnpm/store.controller-types': specifier: workspace:* - version: link:../../store/store-controller-types - '@pnpm/symlink-dependency': - specifier: workspace:* - version: link:../../fs/symlink-dependency + version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -5291,6 +5313,9 @@ importers: '@pnpm/worker': specifier: workspace:^ version: link:../../worker + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -5337,39 +5362,39 @@ importers: '@pnpm/assert-store': specifier: workspace:* version: link:../../__utils__/assert-store - '@pnpm/core': - specifier: workspace:* - version: 'link:' '@pnpm/fs.msgpack-file': specifier: workspace:* version: link:../../fs/msgpack-file - '@pnpm/git-utils': + '@pnpm/installing.deps-installer': specifier: workspace:* - version: link:../../network/git-utils + version: 'link:' '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger + '@pnpm/network.git-utils': + specifier: workspace:* + version: link:../../network/git-utils + '@pnpm/pkg-manifest.read-package-json': + specifier: workspace:* + version: link:../../pkg-manifest/read-package-json '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare - '@pnpm/read-package-json': - specifier: workspace:* - version: link:../../pkg-manifest/read-package-json '@pnpm/registry-mock': specifier: 'catalog:' version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) - '@pnpm/store-path': - specifier: workspace:* - version: link:../../store/store-path '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs '@pnpm/store.index': specifier: workspace:* version: link:../../store/index + '@pnpm/store.path': + specifier: workspace:* + version: link:../../store/path '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -5436,90 +5461,90 @@ importers: installing/deps-restorer: dependencies: + '@pnpm/bins.linker': + specifier: workspace:* + version: link:../../bins/linker '@pnpm/building.during-install': specifier: workspace:* version: link:../../building/during-install '@pnpm/building.policy': specifier: workspace:* version: link:../../building/policy - '@pnpm/calc-dep-state': + '@pnpm/config.package-is-installable': specifier: workspace:* - version: link:../../deps/calc-dep-state + version: link:../../config/package-is-installable '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/dependency-path': - specifier: workspace:* - version: link:../../deps/dependency-path '@pnpm/deps.graph-builder': specifier: workspace:* version: link:../../deps/graph-builder + '@pnpm/deps.graph-hasher': + specifier: workspace:* + version: link:../../deps/graph-hasher + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/hoist': - specifier: workspace:* - version: link:../linking/hoist - '@pnpm/lifecycle': + '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../../exec/lifecycle - '@pnpm/link-bins': + '@pnpm/fs.symlink-dependency': specifier: workspace:* - version: link:../../bins/link-bins - '@pnpm/lockfile-to-pnp': + version: link:../../fs/symlink-dependency + '@pnpm/installing.linking.direct-dep-linker': specifier: workspace:* - version: link:../../lockfile/lockfile-to-pnp + version: link:../linking/direct-dep-linker + '@pnpm/installing.linking.hoist': + specifier: workspace:* + version: link:../linking/hoist + '@pnpm/installing.linking.modules-cleaner': + specifier: workspace:* + version: link:../linking/modules-cleaner + '@pnpm/installing.linking.real-hoist': + specifier: workspace:* + version: link:../linking/real-hoist + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../modules-yaml + '@pnpm/installing.package-requester': + specifier: workspace:* + version: link:../package-requester '@pnpm/lockfile.filtering': specifier: workspace:* version: link:../../lockfile/filtering '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../lockfile/fs + '@pnpm/lockfile.to-pnp': + specifier: workspace:* + version: link:../../lockfile/to-pnp '@pnpm/lockfile.utils': specifier: workspace:* version: link:../../lockfile/utils - '@pnpm/modules-cleaner': - specifier: workspace:* - version: link:../linking/modules-cleaner - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../modules-yaml - '@pnpm/package-is-installable': - specifier: workspace:* - version: link:../../config/package-is-installable - '@pnpm/package-requester': - specifier: workspace:* - version: link:../package-requester '@pnpm/patching.config': specifier: workspace:* version: link:../../patching/config - '@pnpm/pkg-manager.direct-dep-linker': - specifier: workspace:* - version: link:../linking/direct-dep-linker - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/read-project-manifest': + '@pnpm/store.controller-types': specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest - '@pnpm/real-hoist': - specifier: workspace:* - version: link:../linking/real-hoist - '@pnpm/store-controller-types': - specifier: workspace:* - version: link:../../store/store-controller-types - '@pnpm/symlink-dependency': - specifier: workspace:* - version: link:../../fs/symlink-dependency + version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types '@pnpm/worker': specifier: workspace:^ version: link:../../worker + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -5548,30 +5573,30 @@ importers: '@pnpm/crypto.object-hasher': specifier: workspace:* version: link:../../crypto/object-hasher - '@pnpm/headless': + '@pnpm/installing.deps-restorer': specifier: workspace:* version: 'link:' + '@pnpm/installing.read-projects-context': + specifier: workspace:* + version: link:../read-projects-context '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare - '@pnpm/read-projects-context': - specifier: workspace:* - version: link:../read-projects-context '@pnpm/registry-mock': specifier: 'catalog:' version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) - '@pnpm/store-path': - specifier: workspace:* - version: link:../../store/store-path '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs '@pnpm/store.index': specifier: workspace:* version: link:../../store/index + '@pnpm/store.path': + specifier: workspace:* + version: link:../../store/path '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -5603,58 +5628,15 @@ importers: specifier: 'catalog:' version: 7.0.0 - installing/get-context: - dependencies: - '@pnpm/constants': - specifier: workspace:* - version: link:../../packages/constants - '@pnpm/core-loggers': - specifier: workspace:* - version: link:../../packages/core-loggers - '@pnpm/lockfile.fs': - specifier: workspace:* - version: link:../../lockfile/fs - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../modules-yaml - '@pnpm/package-store': - specifier: workspace:* - version: link:../../store/package-store - '@pnpm/read-projects-context': - specifier: workspace:* - version: link:../read-projects-context - '@pnpm/resolver-base': - specifier: workspace:* - version: link:../../resolving/resolver-base - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - path-absolute: - specifier: 'catalog:' - version: 2.0.0 - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' - devDependencies: - '@pnpm/get-context': - specifier: workspace:* - version: 'link:' - '@pnpm/logger': - specifier: workspace:* - version: link:../../packages/logger - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - installing/linking/direct-dep-linker: dependencies: '@pnpm/core-loggers': specifier: workspace:* version: link:../../../packages/core-loggers - '@pnpm/read-modules-dir': + '@pnpm/fs.read-modules-dir': specifier: workspace:* version: link:../../../fs/read-modules-dir - '@pnpm/symlink-dependency': + '@pnpm/fs.symlink-dependency': specifier: workspace:* version: link:../../../fs/symlink-dependency '@zkochan/rimraf': @@ -5667,30 +5649,30 @@ importers: specifier: 'catalog:' version: 3.0.0 devDependencies: + '@pnpm/installing.linking.direct-dep-linker': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../../packages/logger - '@pnpm/pkg-manager.direct-dep-linker': - specifier: workspace:* - version: 'link:' '@types/ramda': specifier: 'catalog:' version: 0.29.12 installing/linking/hoist: dependencies: + '@pnpm/bins.linker': + specifier: workspace:* + version: link:../../../bins/linker + '@pnpm/config.matcher': + specifier: workspace:* + version: link:../../../config/matcher '@pnpm/constants': specifier: workspace:* version: link:../../../packages/constants '@pnpm/core-loggers': specifier: workspace:* version: link:../../../packages/core-loggers - '@pnpm/link-bins': - specifier: workspace:* - version: link:../../../bins/link-bins - '@pnpm/matcher': - specifier: workspace:* - version: link:../../../config/matcher '@pnpm/types': specifier: workspace:* version: link:../../../packages/types @@ -5710,7 +5692,7 @@ importers: specifier: 'catalog:' version: 7.1.0 devDependencies: - '@pnpm/hoist': + '@pnpm/installing.linking.hoist': specifier: workspace:* version: 'link:' '@pnpm/logger': @@ -5722,12 +5704,18 @@ importers: installing/linking/modules-cleaner: dependencies: + '@pnpm/bins.remover': + specifier: workspace:* + version: link:../../../bins/remover '@pnpm/core-loggers': specifier: workspace:* version: link:../../../packages/core-loggers - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../../deps/dependency-path + version: link:../../../deps/path + '@pnpm/fs.read-modules-dir': + specifier: workspace:* + version: link:../../../fs/read-modules-dir '@pnpm/lockfile.filtering': specifier: workspace:* version: link:../../../lockfile/filtering @@ -5737,15 +5725,9 @@ importers: '@pnpm/lockfile.utils': specifier: workspace:* version: link:../../../lockfile/utils - '@pnpm/read-modules-dir': + '@pnpm/store.controller-types': specifier: workspace:* - version: link:../../../fs/read-modules-dir - '@pnpm/remove-bins': - specifier: workspace:* - version: link:../../../bins/remove-bins - '@pnpm/store-controller-types': - specifier: workspace:* - version: link:../../../store/store-controller-types + version: link:../../../store/controller-types '@pnpm/types': specifier: workspace:* version: link:../../../packages/types @@ -5756,21 +5738,21 @@ importers: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' devDependencies: + '@pnpm/installing.linking.modules-cleaner': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../../packages/logger - '@pnpm/modules-cleaner': - specifier: workspace:* - version: 'link:' '@types/ramda': specifier: 'catalog:' version: 0.29.12 installing/linking/real-hoist: dependencies: - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../../deps/dependency-path + version: link:../../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../../packages/error @@ -5781,12 +5763,12 @@ importers: specifier: 'catalog:' version: 4.0.5(typanion@3.14.0) devDependencies: + '@pnpm/installing.linking.real-hoist': + specifier: workspace:* + version: 'link:' '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../../lockfile/fs - '@pnpm/real-hoist': - specifier: workspace:* - version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* version: link:../../../__utils__/test-fixtures @@ -5796,7 +5778,7 @@ importers: installing/modules-yaml: dependencies: - '@pnpm/graceful-fs': + '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs '@pnpm/types': @@ -5812,7 +5794,7 @@ importers: specifier: 'catalog:' version: 3.0.0 devDependencies: - '@pnpm/modules-yaml': + '@pnpm/installing.modules-yaml': specifier: workspace:* version: 'link:' '@types/is-windows': @@ -5827,39 +5809,39 @@ importers: installing/package-requester: dependencies: + '@pnpm/config.package-is-installable': + specifier: workspace:* + version: link:../../config/package-is-installable '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base - '@pnpm/graceful-fs': + '@pnpm/fetching.pick-fetcher': + specifier: workspace:* + version: link:../../fetching/pick-fetcher + '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types - '@pnpm/package-is-installable': - specifier: workspace:* - version: link:../../config/package-is-installable - '@pnpm/pick-fetcher': - specifier: workspace:* - version: link:../../fetching/pick-fetcher - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base - '@pnpm/store-controller-types': - specifier: workspace:* - version: link:../../store/store-controller-types '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs + '@pnpm/store.controller-types': + specifier: workspace:* + version: link:../../store/controller-types '@pnpm/store.index': specifier: workspace:* version: link:../../store/index @@ -5900,27 +5882,27 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../../store/cafs-types - '@pnpm/client': - specifier: workspace:* - version: link:../client - '@pnpm/create-cafs-store': - specifier: workspace:* - version: link:../../store/create-cafs-store '@pnpm/fs.msgpack-file': specifier: workspace:* version: link:../../fs/msgpack-file + '@pnpm/installing.client': + specifier: workspace:* + version: link:../client + '@pnpm/installing.package-requester': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/package-requester': - specifier: workspace:* - version: 'link:' '@pnpm/registry-mock': specifier: 'catalog:' version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../../store/cafs-types + '@pnpm/store.create-cafs-store': + specifier: workspace:* + version: link:../../store/create-cafs-store '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -5951,15 +5933,15 @@ importers: installing/read-projects-context: dependencies: + '@pnpm/config.normalize-registries': + specifier: workspace:* + version: link:../../config/normalize-registries + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../modules-yaml '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../lockfile/fs - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../modules-yaml - '@pnpm/normalize-registries': - specifier: workspace:* - version: link:../../config/normalize-registries '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -5967,12 +5949,12 @@ importers: specifier: 'catalog:' version: 2.0.0 devDependencies: + '@pnpm/installing.read-projects-context': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/read-projects-context': - specifier: workspace:* - version: 'link:' installing/render-peer-issues: dependencies: @@ -5992,15 +5974,12 @@ importers: specifier: 'catalog:' version: 4.0.0 devDependencies: - '@pnpm/render-peer-issues': + '@pnpm/installing.render-peer-issues': specifier: workspace:* version: 'link:' installing/resolve-dependencies: dependencies: - '@pnpm/calc-dep-state': - specifier: workspace:* - version: link:../../deps/calc-dep-state '@pnpm/catalogs.resolver': specifier: workspace:* version: link:../../catalogs/resolver @@ -6016,12 +5995,21 @@ importers: '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/dependency-path': + '@pnpm/deps.graph-hasher': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/graph-hasher + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../deps/path + '@pnpm/deps.peer-range': + specifier: workspace:* + version: link:../../deps/peer-range '@pnpm/error': specifier: workspace:* version: link:../../packages/error + '@pnpm/fetching.pick-fetcher': + specifier: workspace:* + version: link:../../fetching/pick-fetcher '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types @@ -6037,33 +6025,27 @@ importers: '@pnpm/lockfile.utils': specifier: workspace:* version: link:../../lockfile/utils - '@pnpm/manifest-utils': - specifier: workspace:* - version: link:../../pkg-manifest/manifest-utils - '@pnpm/npm-resolver': - specifier: workspace:* - version: link:../../resolving/npm-resolver '@pnpm/patching.config': specifier: workspace:* version: link:../../patching/config '@pnpm/patching.types': specifier: workspace:* version: link:../../patching/types - '@pnpm/pick-fetcher': - specifier: workspace:* - version: link:../../fetching/pick-fetcher - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/resolver-base': + '@pnpm/pkg-manifest.utils': + specifier: workspace:* + version: link:../../pkg-manifest/utils + '@pnpm/resolving.npm-resolver': + specifier: workspace:* + version: link:../../resolving/npm-resolver + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base - '@pnpm/semver.peer-range': + '@pnpm/store.controller-types': specifier: workspace:* - version: link:../../deps/peer-range - '@pnpm/store-controller-types': - specifier: workspace:* - version: link:../../store/store-controller-types + version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -6119,12 +6101,12 @@ importers: specifier: 'catalog:' version: 3.0.0 devDependencies: + '@pnpm/installing.resolve-dependencies': + specifier: workspace:* + version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/resolve-dependencies': - specifier: workspace:* - version: 'link:' '@types/normalize-path': specifier: 'catalog:' version: 3.0.2 @@ -6137,9 +6119,9 @@ importers: lockfile/detect-dep-types: dependencies: - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/lockfile.types': specifier: workspace:* version: link:../types @@ -6156,12 +6138,15 @@ importers: lockfile/filtering: dependencies: + '@pnpm/config.package-is-installable': + specifier: workspace:* + version: link:../../config/package-is-installable '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -6174,9 +6159,6 @@ importers: '@pnpm/lockfile.walker': specifier: workspace:* version: link:../walker - '@pnpm/package-is-installable': - specifier: workspace:* - version: link:../../config/package-is-installable '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -6214,15 +6196,12 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/git-utils': - specifier: workspace:* - version: link:../../network/git-utils '@pnpm/lockfile.merger': specifier: workspace:* version: link:../merger @@ -6232,6 +6211,9 @@ importers: '@pnpm/lockfile.utils': specifier: workspace:* version: link:../utils + '@pnpm/network.git-utils': + specifier: workspace:* + version: link:../../network/git-utils '@pnpm/object.key-sorting': specifier: workspace:* version: link:../../object/key-sorting @@ -6297,43 +6279,6 @@ importers: specifier: 'catalog:' version: 1.1.0 - lockfile/lockfile-to-pnp: - dependencies: - '@pnpm/dependency-path': - specifier: workspace:* - version: link:../../deps/dependency-path - '@pnpm/lockfile.fs': - specifier: workspace:* - version: link:../fs - '@pnpm/lockfile.utils': - specifier: workspace:* - version: link:../utils - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - '@yarnpkg/pnp': - specifier: 'catalog:' - version: 4.1.3 - normalize-path: - specifier: 'catalog:' - version: 3.0.0 - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' - devDependencies: - '@pnpm/lockfile-to-pnp': - specifier: workspace:* - version: 'link:' - '@pnpm/logger': - specifier: workspace:* - version: link:../../packages/logger - '@types/normalize-path': - specifier: 'catalog:' - version: 3.0.2 - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - lockfile/make-dedicated-lockfile: dependencies: '@pnpm/error': @@ -6342,12 +6287,6 @@ importers: '@pnpm/exec': specifier: 'catalog:' version: 2.0.0 - '@pnpm/exportable-manifest': - specifier: workspace:* - version: link:../../pkg-manifest/exportable-manifest - '@pnpm/find-workspace-dir': - specifier: workspace:* - version: link:../../workspace/find-workspace-dir '@pnpm/lockfile.fs': specifier: workspace:* version: link:../fs @@ -6357,12 +6296,18 @@ importers: '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/read-project-manifest': + '@pnpm/releasing.exportable-manifest': specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest + version: link:../../releasing/exportable-manifest '@pnpm/types': specifier: workspace:* version: link:../../packages/types + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader + '@pnpm/workspace.root-finder': + specifier: workspace:* + version: link:../../workspace/root-finder ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -6370,7 +6315,7 @@ importers: specifier: 'catalog:' version: 7.0.0 devDependencies: - '@pnpm/make-dedicated-lockfile': + '@pnpm/lockfile.make-dedicated-lockfile': specifier: workspace:* version: 'link:' '@pnpm/test-fixtures': @@ -6416,10 +6361,10 @@ importers: '@pnpm/lockfile.utils': specifier: workspace:* version: link:../utils - '@pnpm/manifest-utils': + '@pnpm/pkg-manifest.utils': specifier: workspace:* - version: link:../../pkg-manifest/manifest-utils - '@pnpm/resolver-base': + version: link:../../pkg-manifest/utils + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/types': @@ -6438,9 +6383,9 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/lockfile.types': specifier: workspace:* version: link:../types @@ -6466,6 +6411,9 @@ importers: '@pnpm/catalogs.types': specifier: workspace:* version: link:../../catalogs/types + '@pnpm/config.parse-overrides': + specifier: workspace:* + version: link:../../config/parse-overrides '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash @@ -6475,9 +6423,6 @@ importers: '@pnpm/lockfile.verification': specifier: workspace:* version: link:../verification - '@pnpm/parse-overrides': - specifier: workspace:* - version: link:../../config/parse-overrides p-map-values: specifier: 'catalog:' version: 0.1.0 @@ -6495,12 +6440,49 @@ importers: specifier: 'catalog:' version: 0.29.12 + lockfile/to-pnp: + dependencies: + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../deps/path + '@pnpm/lockfile.fs': + specifier: workspace:* + version: link:../fs + '@pnpm/lockfile.utils': + specifier: workspace:* + version: link:../utils + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + '@yarnpkg/pnp': + specifier: 'catalog:' + version: 4.1.3 + normalize-path: + specifier: 'catalog:' + version: 3.0.0 + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + devDependencies: + '@pnpm/lockfile.to-pnp': + specifier: workspace:* + version: 'link:' + '@pnpm/logger': + specifier: workspace:* + version: link:../../packages/logger + '@types/normalize-path': + specifier: 'catalog:' + version: 3.0.2 + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + lockfile/types: dependencies: '@pnpm/patching.types': specifier: workspace:* version: link:../../patching/types - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/types': @@ -6513,22 +6495,22 @@ importers: lockfile/utils: dependencies: - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error + '@pnpm/fetching.pick-fetcher': + specifier: workspace:* + version: link:../../fetching/pick-fetcher '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types '@pnpm/lockfile.types': specifier: workspace:* version: link:../types - '@pnpm/pick-fetcher': - specifier: workspace:* - version: link:../../fetching/pick-fetcher - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/types': @@ -6565,22 +6547,22 @@ importers: '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path - '@pnpm/get-context': + version: link:../../deps/path + '@pnpm/installing.context': specifier: workspace:* - version: link:../../installing/get-context + version: link:../../installing/context '@pnpm/lockfile.types': specifier: workspace:* version: link:../types '@pnpm/lockfile.utils': specifier: workspace:* version: link:../utils - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/types': @@ -6626,9 +6608,9 @@ importers: lockfile/walker: dependencies: - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/lockfile.types': specifier: workspace:* version: link:../types @@ -6645,12 +6627,12 @@ importers: modules-mounter/daemon: dependencies: - '@pnpm/config': + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config - '@pnpm/dependency-path': + version: link:../../config/reader + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../lockfile/fs @@ -6660,15 +6642,15 @@ importers: '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/store-path': - specifier: workspace:* - version: link:../../store/store-path '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs '@pnpm/store.index': specifier: workspace:* version: link:../../store/index + '@pnpm/store.path': + specifier: workspace:* + version: link:../../store/path '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -6685,7 +6667,7 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants - '@pnpm/mount-modules': + '@pnpm/modules-mounter.daemon': specifier: workspace:* version: 'link:' '@types/normalize-path': @@ -6720,9 +6702,9 @@ importers: '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers - '@pnpm/fetching-types': + '@pnpm/fetching.types': specifier: workspace:* - version: link:../../fetching/fetching-types + version: link:../../fetching/types '@pnpm/network.agent': specifier: 'catalog:' version: 2.0.3 @@ -6736,12 +6718,12 @@ importers: specifier: 'catalog:' version: 3.3.2 devDependencies: - '@pnpm/fetch': - specifier: workspace:* - version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger + '@pnpm/network.fetch': + specifier: workspace:* + version: 'link:' https-proxy-server-express: specifier: 'catalog:' version: 0.1.2 @@ -6755,7 +6737,7 @@ importers: specifier: 'catalog:' version: safe-execa@0.3.0 devDependencies: - '@pnpm/git-utils': + '@pnpm/network.git-utils': specifier: workspace:* version: 'link:' tempy: @@ -6860,15 +6842,15 @@ importers: patching/commands: dependencies: - '@pnpm/cli-utils': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../cli/cli-utils - '@pnpm/config': + version: link:../../cli/utils + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config - '@pnpm/config.config-writer': + version: link:../../config/reader + '@pnpm/config.writer': specifier: workspace:* - version: link:../../config/config-writer + version: link:../../config/writer '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants @@ -6878,48 +6860,48 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error + '@pnpm/fetching.pick-fetcher': + specifier: workspace:* + version: link:../../fetching/pick-fetcher '@pnpm/fs.packlist': specifier: workspace:* version: link:../../fs/packlist + '@pnpm/installing.commands': + specifier: workspace:* + version: link:../../installing/commands + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../../installing/modules-yaml '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../lockfile/fs '@pnpm/lockfile.utils': specifier: workspace:* version: link:../../lockfile/utils - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../../installing/modules-yaml - '@pnpm/parse-wanted-dependency': - specifier: workspace:* - version: link:../../resolving/parse-wanted-dependency '@pnpm/patching.apply-patch': specifier: workspace:* version: link:../apply-patch - '@pnpm/pick-fetcher': - specifier: workspace:* - version: link:../../fetching/pick-fetcher - '@pnpm/plugin-commands-installation': - specifier: workspace:* - version: link:../../installing/commands - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: link:../../pkg-manifest/read-package-json - '@pnpm/read-project-manifest': + '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest - '@pnpm/store-connection-manager': + version: link:../../resolving/parse-wanted-dependency + '@pnpm/store.connection-manager': specifier: workspace:* - version: link:../../store/store-connection-manager - '@pnpm/store-path': + version: link:../../store/connection-manager + '@pnpm/store.path': specifier: workspace:* - version: link:../../store/store-path + version: link:../../store/path '@pnpm/types': specifier: workspace:* version: link:../../packages/types - '@pnpm/workspace.read-manifest': + '@pnpm/workspace.project-manifest-reader': specifier: workspace:* - version: link:../../workspace/read-manifest + version: link:../../workspace/project-manifest-reader + '@pnpm/workspace.workspace-manifest-reader': + specifier: workspace:* + version: link:../../workspace/workspace-manifest-reader chalk: specifier: 'catalog:' version: 5.6.2 @@ -6966,7 +6948,7 @@ importers: '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/plugin-commands-patching': + '@pnpm/patching.commands': specifier: workspace:* version: 'link:' '@pnpm/prepare': @@ -6978,9 +6960,9 @@ importers: '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures - '@pnpm/workspace.filter-packages-from-dir': + '@pnpm/workspace.projects-filter': specifier: workspace:* - version: link:../../workspace/filter-packages-from-dir + version: link:../../workspace/projects-filter '@types/is-windows': specifier: 'catalog:' version: 1.0.2 @@ -7002,9 +6984,9 @@ importers: patching/config: dependencies: - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -7031,92 +7013,6 @@ importers: specifier: workspace:* version: 'link:' - pkg-manifest/exportable-manifest: - dependencies: - '@npm/types': - specifier: 'catalog:' - version: 2.1.0 - '@pnpm/catalogs.resolver': - specifier: workspace:* - version: link:../../catalogs/resolver - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error - '@pnpm/package-bins': - specifier: workspace:* - version: link:../../bins/package-bins - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../read-project-manifest - '@pnpm/resolving.jsr-specifier-parser': - specifier: workspace:* - version: link:../../resolving/jsr-specifier-parser - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - p-map-values: - specifier: 'catalog:' - version: 0.1.0 - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' - devDependencies: - '@pnpm/catalogs.config': - specifier: workspace:* - version: link:../../catalogs/config - '@pnpm/catalogs.types': - specifier: workspace:* - version: link:../../catalogs/types - '@pnpm/exportable-manifest': - specifier: workspace:* - version: 'link:' - '@pnpm/pnpmfile': - specifier: workspace:* - version: link:../../hooks/pnpmfile - '@pnpm/prepare': - specifier: workspace:* - version: link:../../__utils__/prepare - '@types/cross-spawn': - specifier: 'catalog:' - version: 6.0.6 - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - cross-spawn: - specifier: 'catalog:' - version: 7.0.6 - write-yaml-file: - specifier: 'catalog:' - version: 6.0.0 - - pkg-manifest/manifest-utils: - dependencies: - '@pnpm/core-loggers': - specifier: workspace:* - version: link:../../packages/core-loggers - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error - '@pnpm/semver.peer-range': - specifier: workspace:* - version: link:../../deps/peer-range - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - semver: - specifier: 'catalog:' - version: 7.7.4 - devDependencies: - '@pnpm/logger': - specifier: workspace:* - version: link:../../packages/logger - '@pnpm/manifest-utils': - specifier: workspace:* - version: 'link:' - '@types/semver': - specifier: 'catalog:' - version: 7.7.1 - pkg-manifest/read-package-json: dependencies: '@pnpm/error': @@ -7132,101 +7028,40 @@ importers: specifier: 'catalog:' version: 8.0.0 devDependencies: - '@pnpm/read-package-json': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* version: 'link:' '@types/normalize-package-data': specifier: 'catalog:' version: 2.4.4 - pkg-manifest/read-project-manifest: + pkg-manifest/utils: dependencies: + '@pnpm/core-loggers': + specifier: workspace:* + version: link:../../packages/core-loggers + '@pnpm/deps.peer-range': + specifier: workspace:* + version: link:../../deps/peer-range '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/graceful-fs': + '@pnpm/types': specifier: workspace:* - version: link:../../fs/graceful-fs + version: link:../../packages/types + semver: + specifier: 'catalog:' + version: 7.7.4 + devDependencies: '@pnpm/logger': - specifier: 'catalog:' - version: 1001.0.1 - '@pnpm/manifest-utils': specifier: workspace:* - version: link:../manifest-utils - '@pnpm/text.comments-parser': - specifier: workspace:* - version: link:../../text/comments-parser - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - '@pnpm/write-project-manifest': - specifier: workspace:* - version: link:../write-project-manifest - detect-indent: - specifier: 'catalog:' - version: 7.0.1 - fast-deep-equal: - specifier: 'catalog:' - version: 3.1.3 - is-windows: - specifier: 'catalog:' - version: 1.0.2 - json5: - specifier: 'catalog:' - version: 2.2.3 - parse-json: - specifier: 'catalog:' - version: 8.3.0 - read-yaml-file: - specifier: 'catalog:' - version: 3.0.0 - strip-bom: - specifier: 'catalog:' - version: 5.0.0 - devDependencies: - '@pnpm/read-project-manifest': + version: link:../../packages/logger + '@pnpm/pkg-manifest.utils': specifier: workspace:* version: 'link:' - '@pnpm/test-fixtures': - specifier: workspace:* - version: link:../../__utils__/test-fixtures - '@types/is-windows': + '@types/semver': specifier: 'catalog:' - version: 1.0.2 - '@types/parse-json': - specifier: 'catalog:' - version: 4.0.2 - tempy: - specifier: 'catalog:' - version: 3.0.0 - - pkg-manifest/write-project-manifest: - dependencies: - '@pnpm/text.comments-parser': - specifier: workspace:* - version: link:../../text/comments-parser - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - json5: - specifier: 'catalog:' - version: 2.2.3 - write-file-atomic: - specifier: 'catalog:' - version: 7.0.1 - write-yaml-file: - specifier: 'catalog:' - version: 6.0.0 - devDependencies: - '@pnpm/write-project-manifest': - specifier: workspace:* - version: 'link:' - '@types/write-file-atomic': - specifier: 'catalog:' - version: 4.0.3 - tempy: - specifier: 'catalog:' - version: 3.0.0 + version: 7.7.1 pnpm: dependencies: @@ -7255,30 +7090,36 @@ importers: '@pnpm/cache.commands': specifier: workspace:* version: link:../cache/commands - '@pnpm/cli-meta': + '@pnpm/cli.command': specifier: workspace:* - version: link:../cli/cli-meta - '@pnpm/cli-utils': - specifier: workspace:* - version: link:../cli/cli-utils + version: link:../cli/command '@pnpm/cli.commands': specifier: workspace:* version: link:../cli/commands - '@pnpm/client': - specifier: workspace:* - version: link:../installing/client - '@pnpm/command': - specifier: workspace:* - version: link:../cli/command - '@pnpm/common-cli-options-help': + '@pnpm/cli.common-cli-options-help': specifier: workspace:* version: link:../cli/common-cli-options-help - '@pnpm/config': + '@pnpm/cli.default-reporter': specifier: workspace:* - version: link:../config/config + version: link:../cli/default-reporter + '@pnpm/cli.meta': + specifier: workspace:* + version: link:../cli/meta + '@pnpm/cli.parse-cli-args': + specifier: workspace:* + version: link:../cli/parse-cli-args + '@pnpm/cli.utils': + specifier: workspace:* + version: link:../cli/utils + '@pnpm/config.commands': + specifier: workspace:* + version: link:../config/commands '@pnpm/config.deps-installer': specifier: workspace:* version: link:../config/deps-installer + '@pnpm/config.reader': + specifier: workspace:* + version: link:../config/reader '@pnpm/config.version-policy': specifier: workspace:* version: link:../config/version-policy @@ -7291,36 +7132,42 @@ importers: '@pnpm/crypto.hash': specifier: workspace:* version: link:../crypto/hash - '@pnpm/default-reporter': - specifier: workspace:* - version: link:../cli/default-reporter - '@pnpm/dependency-path': - specifier: workspace:* - version: link:../deps/dependency-path '@pnpm/deps.compliance.commands': specifier: workspace:* version: link:../deps/compliance/commands '@pnpm/deps.inspection.commands': specifier: workspace:* version: link:../deps/inspection/commands + '@pnpm/deps.path': + specifier: workspace:* + version: link:../deps/path '@pnpm/engine.pm.commands': specifier: workspace:* version: link:../engine/pm/commands - '@pnpm/env.path': + '@pnpm/engine.runtime.commands': specifier: workspace:* - version: link:../shell/path + version: link:../engine/runtime/commands '@pnpm/error': specifier: workspace:* version: link:../packages/error - '@pnpm/filter-workspace-packages': + '@pnpm/exec.commands': specifier: workspace:* - version: link:../workspace/filter-workspace-packages - '@pnpm/find-workspace-dir': + version: link:../exec/commands + '@pnpm/exec.run-npm': specifier: workspace:* - version: link:../workspace/find-workspace-dir + version: link:../exec/run-npm '@pnpm/fs.msgpack-file': specifier: workspace:* version: link:../fs/msgpack-file + '@pnpm/installing.client': + specifier: workspace:* + version: link:../installing/client + '@pnpm/installing.commands': + specifier: workspace:* + version: link:../installing/commands + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../installing/modules-yaml '@pnpm/lockfile.fs': specifier: workspace:* version: link:../lockfile/fs @@ -7330,60 +7177,36 @@ importers: '@pnpm/logger': specifier: workspace:* version: link:../packages/logger - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../installing/modules-yaml '@pnpm/nopt': specifier: 'catalog:' version: 0.3.1 - '@pnpm/parse-cli-args': - specifier: workspace:* - version: link:../cli/parse-cli-args - '@pnpm/plugin-commands-config': - specifier: workspace:* - version: link:../config/commands - '@pnpm/plugin-commands-init': - specifier: workspace:* - version: link:../workspace/commands - '@pnpm/plugin-commands-installation': - specifier: workspace:* - version: link:../installing/commands - '@pnpm/plugin-commands-patching': + '@pnpm/patching.commands': specifier: workspace:* version: link:../patching/commands - '@pnpm/plugin-commands-script-runners': + '@pnpm/pkg-manifest.read-package-json': specifier: workspace:* - version: link:../exec/commands + version: link:../pkg-manifest/read-package-json '@pnpm/prepare': specifier: workspace:* version: link:../__utils__/prepare - '@pnpm/read-package-json': - specifier: workspace:* - version: link:../pkg-manifest/read-package-json - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../pkg-manifest/read-project-manifest '@pnpm/registry-mock': specifier: 'catalog:' version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) '@pnpm/releasing.commands': specifier: workspace:* version: link:../releasing/commands - '@pnpm/run-npm': + '@pnpm/shell.path': specifier: workspace:* - version: link:../exec/run-npm - '@pnpm/runtime.commands': - specifier: workspace:* - version: link:../engine/runtime/commands - '@pnpm/store-connection-manager': - specifier: workspace:* - version: link:../store/store-connection-manager + version: link:../shell/path '@pnpm/store.cafs': specifier: workspace:* version: link:../store/cafs '@pnpm/store.commands': specifier: workspace:* version: link:../store/commands + '@pnpm/store.connection-manager': + specifier: workspace:* + version: link:../store/connection-manager '@pnpm/store.index': specifier: workspace:* version: link:../store/index @@ -7405,21 +7228,33 @@ importers: '@pnpm/worker': specifier: workspace:* version: link:../worker - '@pnpm/workspace.find-packages': + '@pnpm/workspace.commands': specifier: workspace:* - version: link:../workspace/find-packages + version: link:../workspace/commands '@pnpm/workspace.pkgs-graph': specifier: workspace:* version: link:../workspace/pkgs-graph - '@pnpm/workspace.read-manifest': + '@pnpm/workspace.project-manifest-reader': specifier: workspace:* - version: link:../workspace/read-manifest + version: link:../workspace/project-manifest-reader + '@pnpm/workspace.project-manifest-writer': + specifier: workspace:* + version: link:../workspace/project-manifest-writer + '@pnpm/workspace.projects-filter': + specifier: workspace:* + version: link:../workspace/projects-filter + '@pnpm/workspace.projects-reader': + specifier: workspace:* + version: link:../workspace/projects-reader + '@pnpm/workspace.root-finder': + specifier: workspace:* + version: link:../workspace/root-finder '@pnpm/workspace.state': specifier: workspace:* version: link:../workspace/state - '@pnpm/write-project-manifest': + '@pnpm/workspace.workspace-manifest-reader': specifier: workspace:* - version: link:../pkg-manifest/write-project-manifest + version: link:../workspace/workspace-manifest-reader '@types/cross-spawn': specifier: 'catalog:' version: 6.0.6 @@ -7617,15 +7452,15 @@ importers: pnpm/dev: dependencies: - '@pnpm/find-workspace-dir': + '@pnpm/workspace.projects-reader': specifier: workspace:* - version: link:../../workspace/find-workspace-dir - '@pnpm/workspace.find-packages': + version: link:../../workspace/projects-reader + '@pnpm/workspace.root-finder': specifier: workspace:* - version: link:../../workspace/find-packages - '@pnpm/workspace.read-manifest': + version: link:../../workspace/root-finder + '@pnpm/workspace.workspace-manifest-reader': specifier: workspace:* - version: link:../../workspace/read-manifest + version: link:../../workspace/workspace-manifest-reader esbuild: specifier: 'catalog:' version: 0.25.12 @@ -7636,39 +7471,42 @@ importers: releasing/commands: dependencies: + '@pnpm/bins.resolver': + specifier: workspace:* + version: link:../../bins/resolver '@pnpm/catalogs.types': specifier: workspace:* version: link:../../catalogs/types - '@pnpm/cli-utils': - specifier: workspace:* - version: link:../../cli/cli-utils - '@pnpm/client': - specifier: workspace:* - version: link:../../installing/client - '@pnpm/common-cli-options-help': + '@pnpm/cli.common-cli-options-help': specifier: workspace:* version: link:../../cli/common-cli-options-help - '@pnpm/config': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../config/config + version: link:../../cli/utils + '@pnpm/config.pick-registry-for-package': + specifier: workspace:* + version: link:../../config/pick-registry-for-package + '@pnpm/config.reader': + specifier: workspace:* + version: link:../../config/reader '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path - '@pnpm/directory-fetcher': + version: link:../../deps/path + '@pnpm/engine.runtime.commands': specifier: workspace:* - version: link:../../fetching/directory-fetcher + version: link:../../engine/runtime/commands '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/exportable-manifest': + '@pnpm/exec.lifecycle': specifier: workspace:* - version: link:../../pkg-manifest/exportable-manifest - '@pnpm/fetch': + version: link:../../exec/lifecycle + '@pnpm/fetching.directory-fetcher': specifier: workspace:* - version: link:../../network/fetch + version: link:../../fetching/directory-fetcher '@pnpm/fs.indexed-pkg-importer': specifier: workspace:* version: link:../../fs/indexed-pkg-importer @@ -7678,39 +7516,36 @@ importers: '@pnpm/fs.packlist': specifier: workspace:* version: link:../../fs/packlist - '@pnpm/git-utils': + '@pnpm/installing.client': specifier: workspace:* - version: link:../../network/git-utils - '@pnpm/lifecycle': + version: link:../../installing/client + '@pnpm/installing.commands': specifier: workspace:* - version: link:../../exec/lifecycle + version: link:../../installing/commands '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../lockfile/fs '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types - '@pnpm/package-bins': + '@pnpm/network.fetch': specifier: workspace:* - version: link:../../bins/package-bins - '@pnpm/pick-registry-for-package': + version: link:../../network/fetch + '@pnpm/network.git-utils': specifier: workspace:* - version: link:../../config/pick-registry-for-package - '@pnpm/plugin-commands-installation': + version: link:../../network/git-utils + '@pnpm/releasing.exportable-manifest': specifier: workspace:* - version: link:../../installing/commands - '@pnpm/resolver-base': + version: link:../exportable-manifest + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base - '@pnpm/runtime.commands': - specifier: workspace:* - version: link:../../engine/runtime/commands - '@pnpm/sort-packages': - specifier: workspace:* - version: link:../../workspace/sort-packages '@pnpm/types': specifier: workspace:* version: link:../../packages/types + '@pnpm/workspace.sort-packages': + specifier: workspace:* + version: link:../../workspace/sort-packages '@types/normalize-path': specifier: 'catalog:' version: 3.0.2 @@ -7781,12 +7616,12 @@ importers: '@pnpm/catalogs.config': specifier: workspace:* version: link:../../catalogs/config + '@pnpm/hooks.pnpmfile': + specifier: workspace:* + version: link:../../hooks/pnpmfile '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/pnpmfile': - specifier: workspace:* - version: link:../../hooks/pnpmfile '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -7802,9 +7637,9 @@ importers: '@pnpm/test-ipc-server': specifier: workspace:* version: link:../../__utils__/test-ipc-server - '@pnpm/workspace.filter-packages-from-dir': + '@pnpm/workspace.projects-filter': specifier: workspace:* - version: link:../../workspace/filter-packages-from-dir + version: link:../../workspace/projects-filter '@types/cross-spawn': specifier: 'catalog:' version: 6.0.6 @@ -7842,6 +7677,64 @@ importers: specifier: 'catalog:' version: 7.5.11 + releasing/exportable-manifest: + dependencies: + '@npm/types': + specifier: 'catalog:' + version: 2.1.0 + '@pnpm/bins.resolver': + specifier: workspace:* + version: link:../../bins/resolver + '@pnpm/catalogs.resolver': + specifier: workspace:* + version: link:../../catalogs/resolver + '@pnpm/error': + specifier: workspace:* + version: link:../../packages/error + '@pnpm/resolving.jsr-specifier-parser': + specifier: workspace:* + version: link:../../resolving/jsr-specifier-parser + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader + p-map-values: + specifier: 'catalog:' + version: 0.1.0 + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + devDependencies: + '@pnpm/catalogs.config': + specifier: workspace:* + version: link:../../catalogs/config + '@pnpm/catalogs.types': + specifier: workspace:* + version: link:../../catalogs/types + '@pnpm/hooks.pnpmfile': + specifier: workspace:* + version: link:../../hooks/pnpmfile + '@pnpm/prepare': + specifier: workspace:* + version: link:../../__utils__/prepare + '@pnpm/releasing.exportable-manifest': + specifier: workspace:* + version: 'link:' + '@types/cross-spawn': + specifier: 'catalog:' + version: 6.0.6 + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + cross-spawn: + specifier: 'catalog:' + version: 7.0.6 + write-yaml-file: + specifier: 'catalog:' + version: 6.0.0 + resolving/bun-resolver: dependencies: '@pnpm/constants': @@ -7850,25 +7743,25 @@ importers: '@pnpm/crypto.shasums-file': specifier: workspace:* version: link:../../crypto/shasums-file + '@pnpm/engine.runtime.node.fetcher': + specifier: workspace:* + version: link:../../engine/runtime/node.fetcher '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetcher-base': - specifier: workspace:* - version: link:../../fetching/fetcher-base - '@pnpm/fetching-types': - specifier: workspace:* - version: link:../../fetching/fetching-types '@pnpm/fetching.binary-fetcher': specifier: workspace:* version: link:../../fetching/binary-fetcher - '@pnpm/node.fetcher': + '@pnpm/fetching.fetcher-base': specifier: workspace:* - version: link:../../engine/runtime/node.fetcher - '@pnpm/npm-resolver': + version: link:../../fetching/fetcher-base + '@pnpm/fetching.types': + specifier: workspace:* + version: link:../../fetching/types + '@pnpm/resolving.npm-resolver': specifier: workspace:* version: link:../npm-resolver - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../resolver-base '@pnpm/types': @@ -7896,37 +7789,37 @@ importers: resolving/default-resolver: dependencies: + '@pnpm/engine.runtime.node.resolver': + specifier: workspace:* + version: link:../../engine/runtime/node.resolver '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetching-types': + '@pnpm/fetching.types': specifier: workspace:* - version: link:../../fetching/fetching-types - '@pnpm/git-resolver': - specifier: workspace:* - version: link:../git-resolver + version: link:../../fetching/types '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types - '@pnpm/local-resolver': - specifier: workspace:* - version: link:../local-resolver - '@pnpm/node.resolver': - specifier: workspace:* - version: link:../../engine/runtime/node.resolver - '@pnpm/npm-resolver': - specifier: workspace:* - version: link:../npm-resolver - '@pnpm/resolver-base': - specifier: workspace:* - version: link:../resolver-base '@pnpm/resolving.bun-resolver': specifier: workspace:* version: link:../bun-resolver '@pnpm/resolving.deno-resolver': specifier: workspace:* version: link:../deno-resolver - '@pnpm/tarball-resolver': + '@pnpm/resolving.git-resolver': + specifier: workspace:* + version: link:../git-resolver + '@pnpm/resolving.local-resolver': + specifier: workspace:* + version: link:../local-resolver + '@pnpm/resolving.npm-resolver': + specifier: workspace:* + version: link:../npm-resolver + '@pnpm/resolving.resolver-base': + specifier: workspace:* + version: link:../resolver-base + '@pnpm/resolving.tarball-resolver': specifier: workspace:* version: link:../tarball-resolver '@pnpm/types': @@ -7936,21 +7829,21 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../../store/cafs-types - '@pnpm/default-resolver': - specifier: workspace:* - version: 'link:' - '@pnpm/fetch': - specifier: workspace:* - version: link:../../network/fetch - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base - '@pnpm/tarball-fetcher': + '@pnpm/fetching.tarball-fetcher': specifier: workspace:* version: link:../../fetching/tarball-fetcher + '@pnpm/network.fetch': + specifier: workspace:* + version: link:../../network/fetch + '@pnpm/resolving.default-resolver': + specifier: workspace:* + version: 'link:' + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../../store/cafs-types node-fetch: specifier: 'catalog:' version: 3.3.2 @@ -7963,25 +7856,25 @@ importers: '@pnpm/crypto.shasums-file': specifier: workspace:* version: link:../../crypto/shasums-file + '@pnpm/engine.runtime.node.fetcher': + specifier: workspace:* + version: link:../../engine/runtime/node.fetcher '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetcher-base': - specifier: workspace:* - version: link:../../fetching/fetcher-base - '@pnpm/fetching-types': - specifier: workspace:* - version: link:../../fetching/fetching-types '@pnpm/fetching.binary-fetcher': specifier: workspace:* version: link:../../fetching/binary-fetcher - '@pnpm/node.fetcher': + '@pnpm/fetching.fetcher-base': specifier: workspace:* - version: link:../../engine/runtime/node.fetcher - '@pnpm/npm-resolver': + version: link:../../fetching/fetcher-base + '@pnpm/fetching.types': + specifier: workspace:* + version: link:../../fetching/types + '@pnpm/resolving.npm-resolver': specifier: workspace:* version: link:../npm-resolver - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../resolver-base '@pnpm/types': @@ -8009,10 +7902,10 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetch': + '@pnpm/network.fetch': specifier: workspace:* version: link:../../network/fetch - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../resolver-base graceful-git: @@ -8028,12 +7921,12 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/git-resolver': - specifier: workspace:* - version: 'link:' '@pnpm/network.agent': specifier: 'catalog:' version: 2.0.3 + '@pnpm/resolving.git-resolver': + specifier: workspace:* + version: 'link:' '@types/hosted-git-info': specifier: 'catalog:' version: 3.0.5 @@ -8065,15 +7958,15 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/read-project-manifest': - specifier: workspace:* - version: link:../../pkg-manifest/read-project-manifest - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../resolver-base '@pnpm/types': specifier: workspace:* version: link:../../packages/types + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: link:../../workspace/project-manifest-reader normalize-path: specifier: 'catalog:' version: 3.0.0 @@ -8081,18 +7974,21 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/local-resolver': - specifier: workspace:* - version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger + '@pnpm/resolving.local-resolver': + specifier: workspace:* + version: 'link:' '@types/normalize-path': specifier: 'catalog:' version: 3.0.2 resolving/npm-resolver: dependencies: + '@pnpm/config.pick-registry-for-package': + specifier: workspace:* + version: link:../../config/pick-registry-for-package '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants @@ -8105,30 +8001,24 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetching-types': + '@pnpm/fetching.types': specifier: workspace:* - version: link:../../fetching/fetching-types - '@pnpm/graceful-fs': + version: link:../../fetching/types + '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs - '@pnpm/pick-registry-for-package': - specifier: workspace:* - version: link:../../config/pick-registry-for-package - '@pnpm/registry.pkg-metadata-filter': - specifier: workspace:* - version: link:../registry/pkg-metadata-filter - '@pnpm/registry.types': - specifier: workspace:* - version: link:../registry/types - '@pnpm/resolve-workspace-range': - specifier: workspace:* - version: link:../../workspace/resolve-workspace-range - '@pnpm/resolver-base': - specifier: workspace:* - version: link:../resolver-base '@pnpm/resolving.jsr-specifier-parser': specifier: workspace:* version: link:../jsr-specifier-parser + '@pnpm/resolving.registry.pkg-metadata-filter': + specifier: workspace:* + version: link:../registry/pkg-metadata-filter + '@pnpm/resolving.registry.types': + specifier: workspace:* + version: link:../registry/types + '@pnpm/resolving.resolver-base': + specifier: workspace:* + version: link:../resolver-base '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs @@ -8141,6 +8031,9 @@ importers: '@pnpm/worker': specifier: workspace:^ version: link:../../worker + '@pnpm/workspace.range-resolver': + specifier: workspace:* + version: link:../../workspace/range-resolver '@pnpm/workspace.spec-parser': specifier: workspace:* version: link:../../workspace/spec-parser @@ -8190,13 +8083,13 @@ importers: '@pnpm/config.version-policy': specifier: workspace:* version: link:../../config/version-policy - '@pnpm/fetch': - specifier: workspace:* - version: link:../../network/fetch '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/npm-resolver': + '@pnpm/network.fetch': + specifier: workspace:* + version: link:../../network/fetch + '@pnpm/resolving.npm-resolver': specifier: workspace:* version: 'link:' '@pnpm/test-fixtures': @@ -8230,7 +8123,7 @@ importers: specifier: 'catalog:' version: 7.0.2 devDependencies: - '@pnpm/parse-wanted-dependency': + '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* version: 'link:' '@types/validate-npm-package-name': @@ -8239,7 +8132,7 @@ importers: resolving/registry/pkg-metadata-filter: dependencies: - '@pnpm/registry.types': + '@pnpm/resolving.registry.types': specifier: workspace:* version: link:../types semver: @@ -8249,7 +8142,7 @@ importers: '@pnpm/logger': specifier: workspace:* version: link:../../../packages/logger - '@pnpm/registry.pkg-metadata-filter': + '@pnpm/resolving.registry.pkg-metadata-filter': specifier: workspace:* version: 'link:' '@types/semver': @@ -8262,7 +8155,7 @@ importers: specifier: workspace:* version: link:../../../packages/types devDependencies: - '@pnpm/registry.types': + '@pnpm/resolving.registry.types': specifier: workspace:* version: 'link:' @@ -8272,23 +8165,23 @@ importers: specifier: workspace:* version: link:../../packages/types devDependencies: - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: 'link:' resolving/tarball-resolver: dependencies: - '@pnpm/fetching-types': + '@pnpm/fetching.types': specifier: workspace:* - version: link:../../fetching/fetching-types - '@pnpm/resolver-base': + version: link:../../fetching/types + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../resolver-base devDependencies: - '@pnpm/fetch': + '@pnpm/network.fetch': specifier: workspace:* version: link:../../network/fetch - '@pnpm/tarball-resolver': + '@pnpm/resolving.tarball-resolver': specifier: workspace:* version: 'link:' @@ -8298,7 +8191,7 @@ importers: specifier: 'catalog:' version: 1.0.0 devDependencies: - '@pnpm/env.path': + '@pnpm/shell.path': specifier: workspace:* version: 'link:' @@ -8307,15 +8200,15 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base - '@pnpm/graceful-fs': + '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs - '@pnpm/store-controller-types': + '@pnpm/store.controller-types': specifier: workspace:* - version: link:../store-controller-types + version: link:../controller-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -8341,12 +8234,12 @@ importers: specifier: 'catalog:' version: 5.0.0 devDependencies: - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../cafs-types '@pnpm/store.cafs': specifier: workspace:* version: 'link:' + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../cafs-types '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -8368,7 +8261,7 @@ importers: store/cafs-types: devDependencies: - '@pnpm/cafs-types': + '@pnpm/store.cafs-types': specifier: workspace:* version: 'link:' '@pnpm/types': @@ -8380,63 +8273,63 @@ importers: store/commands: dependencies: - '@pnpm/cli-utils': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../cli/cli-utils - '@pnpm/client': + version: link:../../cli/utils + '@pnpm/config.normalize-registries': specifier: workspace:* - version: link:../../installing/client - '@pnpm/config': + version: link:../../config/normalize-registries + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config + version: link:../../config/reader '@pnpm/crypto.integrity': specifier: workspace:* version: link:../../crypto/integrity - '@pnpm/dependency-path': + '@pnpm/deps.path': specifier: workspace:* - version: link:../../deps/dependency-path + version: link:../../deps/path '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/get-context': + '@pnpm/fs.graceful-fs': specifier: workspace:* - version: link:../../installing/get-context + version: link:../../fs/graceful-fs '@pnpm/global.packages': specifier: workspace:* version: link:../../global/packages - '@pnpm/graceful-fs': + '@pnpm/installing.client': specifier: workspace:* - version: link:../../fs/graceful-fs + version: link:../../installing/client + '@pnpm/installing.context': + specifier: workspace:* + version: link:../../installing/context '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types '@pnpm/lockfile.utils': specifier: workspace:* version: link:../../lockfile/utils - '@pnpm/normalize-registries': - specifier: workspace:* - version: link:../../config/normalize-registries '@pnpm/object.key-sorting': specifier: workspace:* version: link:../../object/key-sorting - '@pnpm/parse-wanted-dependency': + '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* version: link:../../resolving/parse-wanted-dependency - '@pnpm/store-connection-manager': - specifier: workspace:* - version: link:../store-connection-manager - '@pnpm/store-controller-types': - specifier: workspace:* - version: link:../store-controller-types - '@pnpm/store-path': - specifier: workspace:* - version: link:../store-path '@pnpm/store.cafs': specifier: workspace:* version: link:../cafs + '@pnpm/store.connection-manager': + specifier: workspace:* + version: link:../connection-manager + '@pnpm/store.controller-types': + specifier: workspace:* + version: link:../controller-types '@pnpm/store.index': specifier: workspace:* version: link:../index + '@pnpm/store.path': + specifier: workspace:* + version: link:../path '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -8471,18 +8364,15 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants + '@pnpm/exec.commands': + specifier: workspace:* + version: link:../../exec/commands '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../lockfile/fs '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/package-store': - specifier: workspace:* - version: link:../package-store - '@pnpm/plugin-commands-script-runners': - specifier: workspace:* - version: link:../../exec/commands '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -8492,6 +8382,9 @@ importers: '@pnpm/store.commands': specifier: workspace:* version: 'link:' + '@pnpm/store.controller': + specifier: workspace:* + version: link:../controller '@types/archy': specifier: 'catalog:' version: 0.0.36 @@ -8517,94 +8410,66 @@ importers: specifier: 'catalog:' version: 3.0.0 - store/create-cafs-store: + store/connection-manager: dependencies: - '@pnpm/building.pkg-requires-build': + '@pnpm/cli.meta': specifier: workspace:* - version: link:../../building/pkg-requires-build - '@pnpm/fetcher-base': + version: link:../../cli/meta + '@pnpm/config.reader': specifier: workspace:* - version: link:../../fetching/fetcher-base - '@pnpm/fs.indexed-pkg-importer': + version: link:../../config/reader + '@pnpm/installing.client': specifier: workspace:* - version: link:../../fs/indexed-pkg-importer - '@pnpm/store-controller-types': + version: link:../../installing/client + '@pnpm/store.controller': specifier: workspace:* - version: link:../store-controller-types - '@pnpm/store.cafs': + version: link:../controller + '@pnpm/store.index': specifier: workspace:* - version: link:../cafs - memoize: - specifier: 'catalog:' - version: 10.2.0 - path-temp: + version: link:../index + '@pnpm/store.path': + specifier: workspace:* + version: link:../path + dir-is-case-sensitive: specifier: 'catalog:' version: 3.0.0 - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' devDependencies: - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../cafs-types - '@pnpm/create-cafs-store': - specifier: workspace:* - version: 'link:' '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/prepare': - specifier: workspace:* - version: link:../../__utils__/prepare - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - - store/index: - dependencies: - msgpackr: - specifier: 'catalog:' - version: 1.11.8 - devDependencies: - '@pnpm/store.index': + '@pnpm/store.connection-manager': specifier: workspace:* version: 'link:' - '@types/node': - specifier: 'catalog:' - version: 22.19.15 - tempy: - specifier: 'catalog:' - version: 3.0.0 - store/package-store: + store/controller: dependencies: - '@pnpm/create-cafs-store': - specifier: workspace:* - version: link:../create-cafs-store '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types - '@pnpm/package-requester': + '@pnpm/installing.package-requester': specifier: workspace:* version: link:../../installing/package-requester - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base - '@pnpm/store-controller-types': - specifier: workspace:* - version: link:../store-controller-types '@pnpm/store.cafs': specifier: workspace:* version: link:../cafs + '@pnpm/store.controller-types': + specifier: workspace:* + version: link:../controller-types + '@pnpm/store.create-cafs-store': + specifier: workspace:* + version: link:../create-cafs-store '@pnpm/store.index': specifier: workspace:* version: link:../index @@ -8630,18 +8495,18 @@ importers: specifier: 'catalog:' version: 7.1.0 devDependencies: - '@pnpm/client': + '@pnpm/installing.client': specifier: workspace:* version: link:../../installing/client '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/package-store': - specifier: workspace:* - version: 'link:' '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare + '@pnpm/store.controller': + specifier: workspace:* + version: 'link:' '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -8652,79 +8517,85 @@ importers: specifier: 'catalog:' version: 3.0.0 - store/pkg-finder: + store/controller-types: dependencies: - '@pnpm/dependency-path': - specifier: workspace:* - version: link:../../deps/dependency-path - '@pnpm/directory-fetcher': - specifier: workspace:* - version: link:../../fetching/directory-fetcher - '@pnpm/resolver-base': - specifier: workspace:* - version: link:../../resolving/resolver-base - '@pnpm/store.cafs': - specifier: workspace:* - version: link:../cafs - '@pnpm/store.index': - specifier: workspace:* - version: link:../index - devDependencies: - '@pnpm/store.pkg-finder': - specifier: workspace:* - version: 'link:' - - store/store-connection-manager: - dependencies: - '@pnpm/cli-meta': - specifier: workspace:* - version: link:../../cli/cli-meta - '@pnpm/client': - specifier: workspace:* - version: link:../../installing/client - '@pnpm/config': - specifier: workspace:* - version: link:../../config/config - '@pnpm/package-store': - specifier: workspace:* - version: link:../package-store - '@pnpm/store-path': - specifier: workspace:* - version: link:../store-path - '@pnpm/store.index': - specifier: workspace:* - version: link:../index - dir-is-case-sensitive: - specifier: 'catalog:' - version: 3.0.0 - devDependencies: - '@pnpm/logger': - specifier: workspace:* - version: link:../../packages/logger - '@pnpm/store-connection-manager': - specifier: workspace:* - version: 'link:' - - store/store-controller-types: - dependencies: - '@pnpm/fetcher-base': + '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base - '@pnpm/resolver-base': + '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* version: link:../../packages/types devDependencies: - '@pnpm/cafs-types': + '@pnpm/store.cafs-types': specifier: workspace:* version: link:../cafs-types - '@pnpm/store-controller-types': + '@pnpm/store.controller-types': specifier: workspace:* version: 'link:' - store/store-path: + store/create-cafs-store: + dependencies: + '@pnpm/building.pkg-requires-build': + specifier: workspace:* + version: link:../../building/pkg-requires-build + '@pnpm/fetching.fetcher-base': + specifier: workspace:* + version: link:../../fetching/fetcher-base + '@pnpm/fs.indexed-pkg-importer': + specifier: workspace:* + version: link:../../fs/indexed-pkg-importer + '@pnpm/store.cafs': + specifier: workspace:* + version: link:../cafs + '@pnpm/store.controller-types': + specifier: workspace:* + version: link:../controller-types + memoize: + specifier: 'catalog:' + version: 10.2.0 + path-temp: + specifier: 'catalog:' + version: 3.0.0 + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + devDependencies: + '@pnpm/logger': + specifier: workspace:* + version: link:../../packages/logger + '@pnpm/prepare': + specifier: workspace:* + version: link:../../__utils__/prepare + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../cafs-types + '@pnpm/store.create-cafs-store': + specifier: workspace:* + version: 'link:' + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + + store/index: + dependencies: + msgpackr: + specifier: 'catalog:' + version: 1.11.8 + devDependencies: + '@pnpm/store.index': + specifier: workspace:* + version: 'link:' + '@types/node': + specifier: 'catalog:' + version: 22.19.15 + tempy: + specifier: 'catalog:' + version: 3.0.0 + + store/path: dependencies: '@pnpm/constants': specifier: workspace:* @@ -8754,7 +8625,7 @@ importers: '@jest/globals': specifier: 'catalog:' version: 30.0.5 - '@pnpm/store-path': + '@pnpm/store.path': specifier: workspace:* version: 'link:' '@types/is-windows': @@ -8773,20 +8644,42 @@ importers: specifier: 'catalog:' version: 6.1.3 + store/pkg-finder: + dependencies: + '@pnpm/deps.path': + specifier: workspace:* + version: link:../../deps/path + '@pnpm/fetching.directory-fetcher': + specifier: workspace:* + version: link:../../fetching/directory-fetcher + '@pnpm/resolving.resolver-base': + specifier: workspace:* + version: link:../../resolving/resolver-base + '@pnpm/store.cafs': + specifier: workspace:* + version: link:../cafs + '@pnpm/store.index': + specifier: workspace:* + version: link:../index + devDependencies: + '@pnpm/store.pkg-finder': + specifier: workspace:* + version: 'link:' + testing/temp-store: dependencies: - '@pnpm/client': + '@pnpm/installing.client': specifier: workspace:* version: link:../../installing/client - '@pnpm/package-store': - specifier: workspace:* - version: link:../../store/package-store '@pnpm/registry-mock': specifier: 'catalog:' version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) - '@pnpm/store-controller-types': + '@pnpm/store.controller': specifier: workspace:* - version: link:../../store/store-controller-types + version: link:../../store/controller + '@pnpm/store.controller-types': + specifier: workspace:* + version: link:../../store/controller-types '@pnpm/store.index': specifier: workspace:* version: link:../../store/index @@ -8807,7 +8700,7 @@ importers: text/naming-cases: devDependencies: - '@pnpm/naming-cases': + '@pnpm/text.naming-cases': specifier: workspace:* version: 'link:' @@ -8822,33 +8715,33 @@ importers: '@pnpm/building.pkg-requires-build': specifier: workspace:* version: link:../building/pkg-requires-build - '@pnpm/cafs-types': - specifier: workspace:* - version: link:../store/cafs-types - '@pnpm/create-cafs-store': - specifier: workspace:* - version: link:../store/create-cafs-store '@pnpm/crypto.integrity': specifier: workspace:* version: link:../crypto/integrity '@pnpm/error': specifier: workspace:* version: link:../packages/error + '@pnpm/fs.graceful-fs': + specifier: workspace:* + version: link:../fs/graceful-fs '@pnpm/fs.hard-link-dir': specifier: workspace:* version: link:../fs/hard-link-dir - '@pnpm/graceful-fs': + '@pnpm/fs.symlink-dependency': specifier: workspace:* - version: link:../fs/graceful-fs + version: link:../fs/symlink-dependency '@pnpm/store.cafs': specifier: workspace:* version: link:../store/cafs + '@pnpm/store.cafs-types': + specifier: workspace:* + version: link:../store/cafs-types + '@pnpm/store.create-cafs-store': + specifier: workspace:* + version: link:../store/create-cafs-store '@pnpm/store.index': specifier: workspace:* version: link:../store/index - '@pnpm/symlink-dependency': - specifier: workspace:* - version: link:../fs/symlink-dependency '@rushstack/worker-pool': specifier: 'catalog:' version: 0.7.1(@types/node@25.4.0) @@ -8880,15 +8773,15 @@ importers: workspace/commands: dependencies: - '@pnpm/cli-meta': + '@pnpm/cli.meta': specifier: workspace:* - version: link:../../cli/cli-meta - '@pnpm/cli-utils': + version: link:../../cli/meta + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../cli/cli-utils - '@pnpm/config': + version: link:../../cli/utils + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config + version: link:../../config/reader '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -8898,9 +8791,9 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../../packages/types - '@pnpm/write-project-manifest': + '@pnpm/workspace.project-manifest-writer': specifier: workspace:* - version: link:../../pkg-manifest/write-project-manifest + version: link:../project-manifest-writer camelcase-keys: specifier: 'catalog:' version: 10.0.2 @@ -8911,15 +8804,15 @@ importers: specifier: 'catalog:' version: 2.0.0 devDependencies: - '@pnpm/plugin-commands-init': - specifier: workspace:* - version: 'link:' '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures + '@pnpm/workspace.commands': + specifier: workspace:* + version: 'link:' '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -8927,39 +8820,186 @@ importers: specifier: 'catalog:' version: 7.0.1 - workspace/filter-packages-from-dir: + workspace/injected-deps-syncer: dependencies: - '@pnpm/filter-workspace-packages': + '@pnpm/bins.linker': specifier: workspace:* - version: link:../filter-workspace-packages - '@pnpm/workspace.find-packages': + version: link:../../bins/linker + '@pnpm/error': specifier: workspace:* - version: link:../find-packages - '@pnpm/workspace.read-manifest': + version: link:../../packages/error + '@pnpm/fetching.directory-fetcher': specifier: workspace:* - version: link:../read-manifest - devDependencies: + version: link:../../fetching/directory-fetcher + '@pnpm/installing.modules-yaml': + specifier: workspace:* + version: link:../../installing/modules-yaml + '@pnpm/pkg-manifest.read-package-json': + specifier: workspace:* + version: link:../../pkg-manifest/read-package-json '@pnpm/types': specifier: workspace:* version: link:../../packages/types - '@pnpm/workspace.filter-packages-from-dir': + '@pnpm/util.lex-comparator': + specifier: 'catalog:' + version: 3.0.2 + '@pnpm/workspace.projects-reader': + specifier: workspace:* + version: link:../projects-reader + '@types/normalize-path': + specifier: 'catalog:' + version: 3.0.2 + normalize-path: + specifier: 'catalog:' + version: 3.0.0 + devDependencies: + '@jest/globals': + specifier: 'catalog:' + version: 30.0.5 + '@pnpm/logger': + specifier: workspace:* + version: link:../../packages/logger + '@pnpm/prepare': + specifier: workspace:* + version: link:../../__utils__/prepare + '@pnpm/workspace.injected-deps-syncer': specifier: workspace:* version: 'link:' - workspace/filter-workspace-packages: + workspace/pkgs-graph: + dependencies: + '@pnpm/npm-package-arg': + specifier: 'catalog:' + version: 2.0.0 + '@pnpm/resolving.npm-resolver': + specifier: workspace:* + version: link:../../resolving/npm-resolver + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + '@pnpm/workspace.range-resolver': + specifier: workspace:* + version: link:../range-resolver + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + devDependencies: + '@pnpm/workspace.pkgs-graph': + specifier: workspace:* + version: 'link:' + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + better-path-resolve: + specifier: 'catalog:' + version: 2.0.0 + + workspace/project-manifest-reader: dependencies: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/matcher': + '@pnpm/fs.graceful-fs': + specifier: workspace:* + version: link:../../fs/graceful-fs + '@pnpm/logger': + specifier: 'catalog:' + version: 1001.0.1 + '@pnpm/pkg-manifest.utils': + specifier: workspace:* + version: link:../../pkg-manifest/utils + '@pnpm/text.comments-parser': + specifier: workspace:* + version: link:../../text/comments-parser + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + '@pnpm/workspace.project-manifest-writer': + specifier: workspace:* + version: link:../project-manifest-writer + detect-indent: + specifier: 'catalog:' + version: 7.0.1 + fast-deep-equal: + specifier: 'catalog:' + version: 3.1.3 + is-windows: + specifier: 'catalog:' + version: 1.0.2 + json5: + specifier: 'catalog:' + version: 2.2.3 + parse-json: + specifier: 'catalog:' + version: 8.3.0 + read-yaml-file: + specifier: 'catalog:' + version: 3.0.0 + strip-bom: + specifier: 'catalog:' + version: 5.0.0 + devDependencies: + '@pnpm/test-fixtures': + specifier: workspace:* + version: link:../../__utils__/test-fixtures + '@pnpm/workspace.project-manifest-reader': + specifier: workspace:* + version: 'link:' + '@types/is-windows': + specifier: 'catalog:' + version: 1.0.2 + '@types/parse-json': + specifier: 'catalog:' + version: 4.0.2 + tempy: + specifier: 'catalog:' + version: 3.0.0 + + workspace/project-manifest-writer: + dependencies: + '@pnpm/text.comments-parser': + specifier: workspace:* + version: link:../../text/comments-parser + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + json5: + specifier: 'catalog:' + version: 2.2.3 + write-file-atomic: + specifier: 'catalog:' + version: 7.0.1 + write-yaml-file: + specifier: 'catalog:' + version: 6.0.0 + devDependencies: + '@pnpm/workspace.project-manifest-writer': + specifier: workspace:* + version: 'link:' + '@types/write-file-atomic': + specifier: 'catalog:' + version: 4.0.3 + tempy: + specifier: 'catalog:' + version: 3.0.0 + + workspace/projects-filter: + dependencies: + '@pnpm/config.matcher': specifier: workspace:* version: link:../../config/matcher - '@pnpm/workspace.find-packages': + '@pnpm/error': specifier: workspace:* - version: link:../find-packages + version: link:../../packages/error '@pnpm/workspace.pkgs-graph': specifier: workspace:* version: link:../pkgs-graph + '@pnpm/workspace.projects-reader': + specifier: workspace:* + version: link:../projects-reader + '@pnpm/workspace.workspace-manifest-reader': + specifier: workspace:* + version: link:../workspace-manifest-reader execa: specifier: 'catalog:' version: safe-execa@0.3.0 @@ -8976,12 +9016,12 @@ importers: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' devDependencies: - '@pnpm/filter-workspace-packages': - specifier: workspace:* - version: 'link:' '@pnpm/types': specifier: workspace:* version: link:../../packages/types + '@pnpm/workspace.projects-filter': + specifier: workspace:* + version: 'link:' '@types/is-windows': specifier: 'catalog:' version: 1.0.2 @@ -9007,11 +9047,11 @@ importers: specifier: 'catalog:' version: 3.1.0 - workspace/find-packages: + workspace/projects-reader: dependencies: - '@pnpm/cli-utils': + '@pnpm/cli.utils': specifier: workspace:* - version: link:../../cli/cli-utils + version: link:../../cli/utils '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants @@ -9031,14 +9071,27 @@ importers: '@pnpm/logger': specifier: workspace:* version: link:../../packages/logger - '@pnpm/workspace.find-packages': + '@pnpm/workspace.projects-reader': specifier: workspace:* version: 'link:' - '@pnpm/workspace.read-manifest': + '@pnpm/workspace.workspace-manifest-reader': specifier: workspace:* - version: link:../read-manifest + version: link:../workspace-manifest-reader - workspace/find-workspace-dir: + workspace/range-resolver: + dependencies: + semver: + specifier: 'catalog:' + version: 7.7.4 + devDependencies: + '@pnpm/workspace.range-resolver': + specifier: workspace:* + version: 'link:' + '@types/semver': + specifier: 'catalog:' + version: 7.7.1 + + workspace/root-finder: dependencies: '@pnpm/error': specifier: workspace:* @@ -9047,174 +9100,10 @@ importers: specifier: 'catalog:' version: 7.0.0 devDependencies: - '@pnpm/find-workspace-dir': + '@pnpm/workspace.root-finder': specifier: workspace:* version: 'link:' - workspace/injected-deps-syncer: - dependencies: - '@pnpm/directory-fetcher': - specifier: workspace:* - version: link:../../fetching/directory-fetcher - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error - '@pnpm/link-bins': - specifier: workspace:* - version: link:../../bins/link-bins - '@pnpm/modules-yaml': - specifier: workspace:* - version: link:../../installing/modules-yaml - '@pnpm/read-package-json': - specifier: workspace:* - version: link:../../pkg-manifest/read-package-json - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - '@pnpm/util.lex-comparator': - specifier: 'catalog:' - version: 3.0.2 - '@pnpm/workspace.find-packages': - specifier: workspace:* - version: link:../find-packages - '@types/normalize-path': - specifier: 'catalog:' - version: 3.0.2 - normalize-path: - specifier: 'catalog:' - version: 3.0.0 - devDependencies: - '@jest/globals': - specifier: 'catalog:' - version: 30.0.5 - '@pnpm/logger': - specifier: workspace:* - version: link:../../packages/logger - '@pnpm/prepare': - specifier: workspace:* - version: link:../../__utils__/prepare - '@pnpm/workspace.injected-deps-syncer': - specifier: workspace:* - version: 'link:' - - workspace/manifest-writer: - dependencies: - '@pnpm/catalogs.types': - specifier: workspace:* - version: link:../../catalogs/types - '@pnpm/constants': - specifier: workspace:* - version: link:../../packages/constants - '@pnpm/lockfile.types': - specifier: workspace:* - version: link:../../lockfile/types - '@pnpm/object.key-sorting': - specifier: workspace:* - version: link:../../object/key-sorting - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - '@pnpm/workspace.read-manifest': - specifier: workspace:* - version: link:../read-manifest - '@pnpm/yaml.document-sync': - specifier: workspace:* - version: link:../../yaml/document-sync - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' - write-file-atomic: - specifier: 'catalog:' - version: 7.0.1 - yaml: - specifier: 'catalog:' - version: 2.8.2 - devDependencies: - '@pnpm/fs.find-packages': - specifier: workspace:* - version: link:../../fs/find-packages - '@pnpm/prepare': - specifier: workspace:* - version: link:../../__utils__/prepare - '@pnpm/prepare-temp-dir': - specifier: workspace:* - version: link:../../__utils__/prepare-temp-dir - '@pnpm/workspace.manifest-writer': - specifier: workspace:* - version: 'link:' - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - '@types/write-file-atomic': - specifier: 'catalog:' - version: 4.0.3 - read-yaml-file: - specifier: 'catalog:' - version: 3.0.0 - write-yaml-file: - specifier: 'catalog:' - version: 6.0.0 - - workspace/pkgs-graph: - dependencies: - '@pnpm/npm-package-arg': - specifier: 'catalog:' - version: 2.0.0 - '@pnpm/npm-resolver': - specifier: workspace:* - version: link:../../resolving/npm-resolver - '@pnpm/resolve-workspace-range': - specifier: workspace:* - version: link:../resolve-workspace-range - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - ramda: - specifier: 'catalog:' - version: '@pnpm/ramda@0.28.1' - devDependencies: - '@pnpm/workspace.pkgs-graph': - specifier: workspace:* - version: 'link:' - '@types/ramda': - specifier: 'catalog:' - version: 0.29.12 - better-path-resolve: - specifier: 'catalog:' - version: 2.0.0 - - workspace/read-manifest: - dependencies: - '@pnpm/constants': - specifier: workspace:* - version: link:../../packages/constants - '@pnpm/error': - specifier: workspace:* - version: link:../../packages/error - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - read-yaml-file: - specifier: 'catalog:' - version: 3.0.0 - devDependencies: - '@pnpm/workspace.read-manifest': - specifier: workspace:* - version: 'link:' - - workspace/resolve-workspace-range: - dependencies: - semver: - specifier: 'catalog:' - version: 7.7.4 - devDependencies: - '@pnpm/resolve-workspace-range': - specifier: workspace:* - version: 'link:' - '@types/semver': - specifier: 'catalog:' - version: 7.7.1 - workspace/sort-packages: dependencies: '@pnpm/deps.graph-sequencer': @@ -9224,7 +9113,7 @@ importers: specifier: workspace:* version: link:../../packages/types devDependencies: - '@pnpm/sort-packages': + '@pnpm/workspace.sort-packages': specifier: workspace:* version: 'link:' @@ -9239,9 +9128,9 @@ importers: '@pnpm/catalogs.types': specifier: workspace:* version: link:../../catalogs/types - '@pnpm/config': + '@pnpm/config.reader': specifier: workspace:* - version: link:../../config/config + version: link:../../config/reader '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -9265,6 +9154,83 @@ importers: specifier: 'catalog:' version: 0.29.12 + workspace/workspace-manifest-reader: + dependencies: + '@pnpm/constants': + specifier: workspace:* + version: link:../../packages/constants + '@pnpm/error': + specifier: workspace:* + version: link:../../packages/error + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + read-yaml-file: + specifier: 'catalog:' + version: 3.0.0 + devDependencies: + '@pnpm/workspace.workspace-manifest-reader': + specifier: workspace:* + version: 'link:' + + workspace/workspace-manifest-writer: + dependencies: + '@pnpm/catalogs.types': + specifier: workspace:* + version: link:../../catalogs/types + '@pnpm/constants': + specifier: workspace:* + version: link:../../packages/constants + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../../lockfile/types + '@pnpm/object.key-sorting': + specifier: workspace:* + version: link:../../object/key-sorting + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + '@pnpm/workspace.workspace-manifest-reader': + specifier: workspace:* + version: link:../workspace-manifest-reader + '@pnpm/yaml.document-sync': + specifier: workspace:* + version: link:../../yaml/document-sync + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + write-file-atomic: + specifier: 'catalog:' + version: 7.0.1 + yaml: + specifier: 'catalog:' + version: 2.8.2 + devDependencies: + '@pnpm/fs.find-packages': + specifier: workspace:* + version: link:../../fs/find-packages + '@pnpm/prepare': + specifier: workspace:* + version: link:../../__utils__/prepare + '@pnpm/prepare-temp-dir': + specifier: workspace:* + version: link:../../__utils__/prepare-temp-dir + '@pnpm/workspace.workspace-manifest-writer': + specifier: workspace:* + version: 'link:' + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + '@types/write-file-atomic': + specifier: 'catalog:' + version: 4.0.3 + read-yaml-file: + specifier: 'catalog:' + version: 3.0.0 + write-yaml-file: + specifier: 'catalog:' + version: 6.0.0 + yaml/document-sync: dependencies: yaml: @@ -18130,29 +18096,6 @@ snapshots: - supports-color - typanion - '@pnpm/cli-utils@1001.3.8(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/cli-meta': 1000.0.16 - '@pnpm/config': 1004.10.3(@pnpm/logger@1001.0.1) - '@pnpm/config.deps-installer': 1000.1.4(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0)) - '@pnpm/default-reporter': 1002.1.12(@pnpm/logger@1001.0.1) - '@pnpm/error': 1000.0.5 - '@pnpm/logger': 1001.0.1 - '@pnpm/manifest-utils': 1002.0.4(@pnpm/logger@1001.0.1) - '@pnpm/package-is-installable': 1000.0.20(@pnpm/logger@1001.0.1) - '@pnpm/pnpmfile': 1002.1.12(@pnpm/logger@1001.0.1) - '@pnpm/read-project-manifest': 1001.2.5(@pnpm/logger@1001.0.1) - '@pnpm/store-connection-manager': 1002.3.17(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/types': 1001.3.0 - '@pnpm/util.lex-comparator': 3.0.2 - chalk: 4.1.2 - load-json-file: 6.2.0 - transitivePeerDependencies: - - '@pnpm/worker' - - domexception - - supports-color - - typanion - '@pnpm/client@1001.1.22(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@22.19.15))(typanion@3.14.0)': dependencies: '@pnpm/default-resolver': 1002.3.6(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@22.19.15))(typanion@3.14.0) @@ -18174,27 +18117,6 @@ snapshots: - supports-color - typanion - '@pnpm/client@1001.1.22(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/default-resolver': 1002.3.6(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/directory-fetcher': 1000.1.23(@pnpm/logger@1001.0.1) - '@pnpm/fetch': 1001.0.0(@pnpm/logger@1001.0.1) - '@pnpm/fetching-types': 1000.2.1 - '@pnpm/fetching.binary-fetcher': 1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0)) - '@pnpm/git-fetcher': 1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/network.auth-header': 1000.0.6 - '@pnpm/node.fetcher': 1001.0.25(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/resolver-base': 1005.4.1 - '@pnpm/tarball-fetcher': 1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/types': 1001.3.0 - ramda: '@pnpm/ramda@0.28.1' - transitivePeerDependencies: - - '@pnpm/logger' - - '@pnpm/worker' - - domexception - - supports-color - - typanion - '@pnpm/colorize-semver-diff@1.0.1': dependencies: chalk: 4.1.2 @@ -18230,28 +18152,6 @@ snapshots: - domexception - supports-color - '@pnpm/config.deps-installer@1000.1.4(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))': - dependencies: - '@pnpm/config.config-writer': 1000.1.2(@pnpm/logger@1001.0.1) - '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/error': 1000.0.5 - '@pnpm/fetch': 1001.0.0(@pnpm/logger@1001.0.1) - '@pnpm/logger': 1001.0.1 - '@pnpm/network.auth-header': 1000.0.6 - '@pnpm/npm-resolver': 1005.2.2(@pnpm/logger@1001.0.1) - '@pnpm/package-store': 1007.1.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0)) - '@pnpm/parse-wanted-dependency': 1001.0.0 - '@pnpm/pick-registry-for-package': 1000.0.16 - '@pnpm/read-modules-dir': 1000.0.0 - '@pnpm/read-package-json': 1000.1.7 - '@pnpm/types': 1001.3.0 - '@zkochan/rimraf': 3.0.2 - get-npm-tarball-url: 2.1.0 - transitivePeerDependencies: - - '@pnpm/worker' - - domexception - - supports-color - '@pnpm/config.env-replace@1.1.0': {} '@pnpm/config.env-replace@3.0.2': {} @@ -18376,25 +18276,6 @@ snapshots: - supports-color - typanion - '@pnpm/default-resolver@1002.3.6(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/error': 1000.0.5 - '@pnpm/fetching-types': 1000.2.1 - '@pnpm/git-resolver': 1001.2.1(@pnpm/logger@1001.0.1) - '@pnpm/local-resolver': 1002.1.12(@pnpm/logger@1001.0.1) - '@pnpm/node.resolver': 1001.0.21(@pnpm/logger@1001.0.1) - '@pnpm/npm-resolver': 1005.2.2(@pnpm/logger@1001.0.1) - '@pnpm/resolver-base': 1005.4.1 - '@pnpm/resolving.bun-resolver': 1005.0.9(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/resolving.deno-resolver': 1005.0.9(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/tarball-resolver': 1002.2.1 - transitivePeerDependencies: - - '@pnpm/logger' - - '@pnpm/worker' - - domexception - - supports-color - - typanion - '@pnpm/dependency-path@1001.1.10': dependencies: '@pnpm/crypto.hash': 1000.2.2 @@ -18471,20 +18352,6 @@ snapshots: transitivePeerDependencies: - domexception - '@pnpm/fetching.binary-fetcher@1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))': - dependencies: - '@pnpm/error': 1000.0.5 - '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fetching-types': 1000.2.1 - '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0) - adm-zip: 0.5.16 - is-subdir: 1.2.0 - rename-overwrite: 6.0.6 - ssri: 10.0.5 - tempy: 1.0.1 - transitivePeerDependencies: - - domexception - '@pnpm/find-workspace-dir@1000.1.4': dependencies: '@pnpm/error': 1000.0.5 @@ -18540,20 +18407,6 @@ snapshots: - supports-color - typanion - '@pnpm/git-fetcher@1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/error': 1000.0.5 - '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fs.packlist': 1000.0.0 - '@pnpm/logger': 1001.0.1 - '@pnpm/prepare-package': 1001.0.6(@pnpm/logger@1001.0.1)(typanion@3.14.0) - '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0) - '@zkochan/rimraf': 3.0.2 - execa: safe-execa@0.1.2 - transitivePeerDependencies: - - supports-color - - typanion - '@pnpm/git-resolver@1001.2.1(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/error': 1000.0.5 @@ -18736,23 +18589,6 @@ snapshots: - supports-color - typanion - '@pnpm/node.fetcher@1001.0.25(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/create-cafs-store': 1000.0.32(@pnpm/logger@1001.0.1) - '@pnpm/crypto.shasums-file': 1001.0.4 - '@pnpm/error': 1000.0.5 - '@pnpm/fetching-types': 1000.2.1 - '@pnpm/fetching.binary-fetcher': 1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0)) - '@pnpm/node.resolver': 1001.0.21(@pnpm/logger@1001.0.1) - '@pnpm/tarball-fetcher': 1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - detect-libc: 2.1.2 - transitivePeerDependencies: - - '@pnpm/logger' - - '@pnpm/worker' - - domexception - - supports-color - - typanion - '@pnpm/node.resolver@1001.0.21(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/config': 1004.10.3(@pnpm/logger@1001.0.1) @@ -18899,31 +18735,6 @@ snapshots: semver: 7.7.4 ssri: 10.0.5 - '@pnpm/package-requester@1011.2.3(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))': - dependencies: - '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/dependency-path': 1001.1.10 - '@pnpm/error': 1000.0.5 - '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/graceful-fs': 1000.1.0 - '@pnpm/logger': 1001.0.1 - '@pnpm/package-is-installable': 1000.0.20(@pnpm/logger@1001.0.1) - '@pnpm/pick-fetcher': 1001.0.0 - '@pnpm/read-package-json': 1000.1.7 - '@pnpm/resolver-base': 1005.4.1 - '@pnpm/store-controller-types': 1004.5.1 - '@pnpm/store.cafs': 1000.1.4 - '@pnpm/types': 1001.3.0 - '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0) - detect-libc: 2.1.2 - p-defer: 3.0.0 - p-limit: 3.1.0 - p-queue: 6.6.2 - promise-share: 1.0.0 - ramda: '@pnpm/ramda@0.28.1' - semver: 7.7.4 - ssri: 10.0.5 - '@pnpm/package-store@1007.1.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@22.19.15))': dependencies: '@pnpm/create-cafs-store': 1000.0.32(@pnpm/logger@1001.0.1) @@ -18944,26 +18755,6 @@ snapshots: ssri: 10.0.5 symlink-dir: 6.0.5 - '@pnpm/package-store@1007.1.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))': - dependencies: - '@pnpm/create-cafs-store': 1000.0.32(@pnpm/logger@1001.0.1) - '@pnpm/crypto.hash': 1000.2.2 - '@pnpm/error': 1000.0.5 - '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/logger': 1001.0.1 - '@pnpm/package-requester': 1011.2.3(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0)) - '@pnpm/resolver-base': 1005.4.1 - '@pnpm/store-controller-types': 1004.5.1 - '@pnpm/store.cafs': 1000.1.4 - '@pnpm/types': 1001.3.0 - '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0) - '@zkochan/rimraf': 3.0.2 - is-subdir: 1.2.0 - load-json-file: 6.2.0 - ramda: '@pnpm/ramda@0.28.1' - ssri: 10.0.5 - symlink-dir: 6.0.5 - '@pnpm/parse-wanted-dependency@1001.0.0': dependencies: validate-npm-package-name: 5.0.0 @@ -19109,27 +18900,6 @@ snapshots: - supports-color - typanion - '@pnpm/resolving.bun-resolver@1005.0.9(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/constants': 1001.3.1 - '@pnpm/crypto.shasums-file': 1001.0.4 - '@pnpm/error': 1000.0.5 - '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fetching-types': 1000.2.1 - '@pnpm/fetching.binary-fetcher': 1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0)) - '@pnpm/node.fetcher': 1001.0.25(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/npm-resolver': 1005.2.2(@pnpm/logger@1001.0.1) - '@pnpm/resolver-base': 1005.4.1 - '@pnpm/types': 1001.3.0 - '@pnpm/util.lex-comparator': 3.0.2 - '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0) - semver: 7.7.4 - transitivePeerDependencies: - - '@pnpm/logger' - - domexception - - supports-color - - typanion - '@pnpm/resolving.deno-resolver@1005.0.9(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@22.19.15))(typanion@3.14.0)': dependencies: '@pnpm/constants': 1001.3.1 @@ -19151,27 +18921,6 @@ snapshots: - supports-color - typanion - '@pnpm/resolving.deno-resolver@1005.0.9(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/constants': 1001.3.1 - '@pnpm/crypto.shasums-file': 1001.0.4 - '@pnpm/error': 1000.0.5 - '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fetching-types': 1000.2.1 - '@pnpm/fetching.binary-fetcher': 1005.0.3(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0)) - '@pnpm/node.fetcher': 1001.0.25(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/npm-resolver': 1005.2.2(@pnpm/logger@1001.0.1) - '@pnpm/resolver-base': 1005.4.1 - '@pnpm/types': 1001.3.0 - '@pnpm/util.lex-comparator': 3.0.2 - '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0) - semver: 7.7.4 - transitivePeerDependencies: - - '@pnpm/logger' - - domexception - - supports-color - - typanion - '@pnpm/resolving.jsr-specifier-parser@1000.0.3': dependencies: '@pnpm/error': 1000.0.5 @@ -19220,25 +18969,6 @@ snapshots: - supports-color - typanion - '@pnpm/store-connection-manager@1002.3.17(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/cli-meta': 1000.0.16 - '@pnpm/client': 1001.1.22(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/config': 1004.10.3(@pnpm/logger@1001.0.1) - '@pnpm/error': 1000.0.5 - '@pnpm/logger': 1001.0.1 - '@pnpm/package-store': 1007.1.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0)) - '@pnpm/server': 1001.0.20(@pnpm/logger@1001.0.1) - '@pnpm/store-path': 1000.0.5 - '@zkochan/diable': 1.0.2 - delay: 5.0.0 - dir-is-case-sensitive: 2.0.0 - transitivePeerDependencies: - - '@pnpm/worker' - - domexception - - supports-color - - typanion - '@pnpm/store-controller-types@1004.5.1': dependencies: '@pnpm/fetcher-base': 1001.2.2 @@ -19308,29 +19038,6 @@ snapshots: - supports-color - typanion - '@pnpm/tarball-fetcher@1006.0.5(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/core-loggers': 1001.0.9(@pnpm/logger@1001.0.1) - '@pnpm/error': 1000.0.5 - '@pnpm/fetcher-base': 1001.2.2 - '@pnpm/fetching-types': 1000.2.1 - '@pnpm/fs.packlist': 1000.0.0 - '@pnpm/graceful-fs': 1000.1.0 - '@pnpm/logger': 1001.0.1 - '@pnpm/prepare-package': 1001.0.6(@pnpm/logger@1001.0.1)(typanion@3.14.0) - '@pnpm/types': 1001.3.0 - '@pnpm/worker': 1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0) - '@zkochan/retry': 0.2.0 - lodash.throttle: 4.1.1 - p-map-values: 1.0.0 - path-temp: 2.1.1 - ramda: '@pnpm/ramda@0.28.1' - rename-overwrite: 6.0.6 - transitivePeerDependencies: - - domexception - - supports-color - - typanion - '@pnpm/tarball-resolver@1002.2.1': dependencies: '@pnpm/fetching-types': 1000.2.1 @@ -19375,25 +19082,6 @@ snapshots: transitivePeerDependencies: - '@types/node' - '@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0)': - dependencies: - '@pnpm/cafs-types': 1000.1.0 - '@pnpm/create-cafs-store': 1000.0.32(@pnpm/logger@1001.0.1) - '@pnpm/crypto.polyfill': 1000.1.0 - '@pnpm/error': 1000.0.5 - '@pnpm/exec.pkg-requires-build': 1000.0.16 - '@pnpm/fs.hard-link-dir': 1000.0.6(@pnpm/logger@1001.0.1) - '@pnpm/graceful-fs': 1000.1.0 - '@pnpm/logger': 1001.0.1 - '@pnpm/store.cafs': 1000.1.4 - '@pnpm/symlink-dependency': 1000.0.17(@pnpm/logger@1001.0.1) - '@rushstack/worker-pool': 0.4.9(@types/node@25.4.0) - is-windows: 1.0.2 - load-json-file: 6.2.0 - p-limit: 3.1.0 - transitivePeerDependencies: - - '@types/node' - '@pnpm/workspace.find-packages@1000.0.63(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@22.19.15))(typanion@3.14.0)': dependencies: '@pnpm/cli-utils': 1001.3.8(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@22.19.15))(typanion@3.14.0) @@ -19408,20 +19096,6 @@ snapshots: - supports-color - typanion - '@pnpm/workspace.find-packages@1000.0.63(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0)': - dependencies: - '@pnpm/cli-utils': 1001.3.8(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.6(@pnpm/logger@1001.0.1)(@types/node@25.4.0))(typanion@3.14.0) - '@pnpm/constants': 1001.3.1 - '@pnpm/fs.find-packages': 1000.0.23(@pnpm/logger@1001.0.1) - '@pnpm/logger': 1001.0.1 - '@pnpm/types': 1001.3.0 - '@pnpm/util.lex-comparator': 3.0.2 - transitivePeerDependencies: - - '@pnpm/worker' - - domexception - - supports-color - - typanion - '@pnpm/workspace.manifest-writer@1001.3.0': dependencies: '@pnpm/catalogs.types': 1000.0.0 @@ -19498,10 +19172,6 @@ snapshots: optionalDependencies: '@types/node': 22.19.15 - '@rushstack/worker-pool@0.4.9(@types/node@25.4.0)': - optionalDependencies: - '@types/node': 25.4.0 - '@rushstack/worker-pool@0.7.1(@types/node@25.4.0)': optionalDependencies: '@types/node': 25.4.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1cae279f8a..728beac55a 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -97,8 +97,6 @@ catalog: '@pnpm/tabtab': ^0.5.4 '@pnpm/tgz-fixtures': 0.0.0 '@pnpm/util.lex-comparator': ^3.0.2 - '@pnpm/workspace.find-packages': ^1000.0.15 - '@pnpm/workspace.read-manifest': ^1000.1.1 '@reflink/reflink': 0.1.19 '@rushstack/worker-pool': 0.7.1 '@stylistic/eslint-plugin': ^4.4.1 diff --git a/pnpm/dev/package.json b/pnpm/dev/package.json index b0acaf7549..5f2178d44c 100644 --- a/pnpm/dev/package.json +++ b/pnpm/dev/package.json @@ -9,9 +9,9 @@ "_test": "node pd.js --version" }, "dependencies": { - "@pnpm/find-workspace-dir": "workspace:*", - "@pnpm/workspace.find-packages": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*", + "@pnpm/workspace.projects-reader": "workspace:*", + "@pnpm/workspace.root-finder": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "esbuild": "catalog:" }, "devDependencies": { diff --git a/pnpm/dev/pd.js b/pnpm/dev/pd.js index d59e4e533c..56c0a5974f 100755 --- a/pnpm/dev/pd.js +++ b/pnpm/dev/pd.js @@ -4,9 +4,9 @@ import esbuild from 'esbuild' import pathLib from 'path' import childProcess from 'child_process' import { createRequire } from 'module' -import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.find-packages' -import { findWorkspaceDir } from '@pnpm/find-workspace-dir' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.projects-reader' +import { findWorkspaceDir } from '@pnpm/workspace.root-finder' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' const pnpmPackageJson = JSON.parse(fs.readFileSync(pathLib.join(import.meta.dirname, 'package.json'), 'utf8')) @@ -25,7 +25,7 @@ const pnpmPackageJson = JSON.parse(fs.readFileSync(pathLib.join(import.meta.dirn const spnpmImportsPlugin = { name: 'spnpmImports', setup: (build) => { - // E.g. @pnpm/config -> //pnpm/packages/config/src/index.ts + // E.g. @pnpm/config.reader -> //pnpm/packages/config/src/index.ts build.onResolve({ filter: /@pnpm\// }, ({ path }) => { // Bail if the package isn't present locally if (!localPackages.includes(path)) { diff --git a/pnpm/package.json b/pnpm/package.json index a87d52d374..1139f8f698 100644 --- a/pnpm/package.json +++ b/pnpm/package.json @@ -79,47 +79,47 @@ "@pnpm/assert-project": "workspace:*", "@pnpm/byline": "catalog:", "@pnpm/cache.commands": "workspace:*", - "@pnpm/cli-meta": "workspace:*", - "@pnpm/cli-utils": "workspace:*", - "@pnpm/client": "workspace:*", - "@pnpm/command": "workspace:*", - "@pnpm/common-cli-options-help": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.meta": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/installing.client": "workspace:*", + "@pnpm/cli.command": "workspace:*", + "@pnpm/cli.common-cli-options-help": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/config.deps-installer": "workspace:*", "@pnpm/config.version-policy": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", "@pnpm/crypto.hash": "workspace:*", - "@pnpm/default-reporter": "workspace:*", - "@pnpm/dependency-path": "workspace:*", - "@pnpm/env.path": "workspace:*", + "@pnpm/cli.default-reporter": "workspace:*", + "@pnpm/deps.path": "workspace:*", + "@pnpm/shell.path": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/building.commands": "workspace:*", - "@pnpm/filter-workspace-packages": "workspace:*", - "@pnpm/find-workspace-dir": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", + "@pnpm/workspace.root-finder": "workspace:*", "@pnpm/fs.msgpack-file": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", "@pnpm/nopt": "catalog:", - "@pnpm/parse-cli-args": "workspace:*", + "@pnpm/cli.parse-cli-args": "workspace:*", "@pnpm/deps.compliance.commands": "workspace:*", "@pnpm/cli.commands": "workspace:*", "@pnpm/releasing.commands": "workspace:*", - "@pnpm/plugin-commands-init": "workspace:*", - "@pnpm/plugin-commands-installation": "workspace:*", + "@pnpm/workspace.commands": "workspace:*", + "@pnpm/installing.commands": "workspace:*", "@pnpm/deps.inspection.commands": "workspace:*", - "@pnpm/plugin-commands-script-runners": "workspace:*", + "@pnpm/exec.commands": "workspace:*", "@pnpm/engine.pm.commands": "workspace:*", "@pnpm/store.commands": "workspace:*", "@pnpm/prepare": "workspace:*", - "@pnpm/read-package-json": "workspace:*", - "@pnpm/runtime.commands": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/engine.runtime.commands": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "@pnpm/registry-mock": "catalog:", - "@pnpm/run-npm": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*", + "@pnpm/exec.run-npm": "workspace:*", + "@pnpm/store.connection-manager": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/store.cafs": "workspace:*", "@pnpm/tabtab": "catalog:", @@ -128,11 +128,11 @@ "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "@pnpm/worker": "workspace:*", - "@pnpm/workspace.find-packages": "workspace:*", + "@pnpm/workspace.projects-reader": "workspace:*", "@pnpm/workspace.pkgs-graph": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "@pnpm/workspace.state": "workspace:*", - "@pnpm/write-project-manifest": "workspace:*", + "@pnpm/workspace.project-manifest-writer": "workspace:*", "@types/cross-spawn": "catalog:", "@types/ini": "catalog:", "@types/is-windows": "catalog:", @@ -174,8 +174,8 @@ "write-json-file": "catalog:", "write-package": "catalog:", "write-yaml-file": "catalog:", - "@pnpm/plugin-commands-config": "workspace:*", - "@pnpm/plugin-commands-patching": "workspace:*" + "@pnpm/config.commands": "workspace:*", + "@pnpm/patching.commands": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/pnpm/src/checkForUpdates.test.ts b/pnpm/src/checkForUpdates.test.ts index 6bb0a4c2a0..30cb125983 100644 --- a/pnpm/src/checkForUpdates.test.ts +++ b/pnpm/src/checkForUpdates.test.ts @@ -1,5 +1,5 @@ import { jest } from '@jest/globals' -import { getConfig } from '@pnpm/config' +import { getConfig } from '@pnpm/config.reader' import { prepareEmpty } from '@pnpm/prepare' import { loadJsonFileSync } from 'load-json-file' import { writeJsonFileSync } from 'write-json-file' diff --git a/pnpm/src/checkForUpdates.ts b/pnpm/src/checkForUpdates.ts index 05d95f6a9d..42566f84b9 100644 --- a/pnpm/src/checkForUpdates.ts +++ b/pnpm/src/checkForUpdates.ts @@ -1,9 +1,9 @@ import path from 'node:path' -import { packageManager } from '@pnpm/cli-meta' -import { createResolver } from '@pnpm/client' -import type { Config } from '@pnpm/config' +import { packageManager } from '@pnpm/cli.meta' +import type { Config } from '@pnpm/config.reader' import { updateCheckLogger } from '@pnpm/core-loggers' +import { createResolver } from '@pnpm/installing.client' import { loadJsonFile } from 'load-json-file' import { writeJsonFile } from 'write-json-file' diff --git a/pnpm/src/cmd/bin.ts b/pnpm/src/cmd/bin.ts index ed30c6369e..11d4c332ee 100644 --- a/pnpm/src/cmd/bin.ts +++ b/pnpm/src/cmd/bin.ts @@ -1,5 +1,5 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { types as allTypes } from '@pnpm/config' +import { docsUrl } from '@pnpm/cli.utils' +import { types as allTypes } from '@pnpm/config.reader' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/pnpm/src/cmd/clean.ts b/pnpm/src/cmd/clean.ts index 906420e587..72b5a0b988 100644 --- a/pnpm/src/cmd/clean.ts +++ b/pnpm/src/cmd/clean.ts @@ -1,8 +1,8 @@ import { promises as fs } from 'node:fs' import path from 'node:path' -import { docsUrl } from '@pnpm/cli-utils' -import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.find-packages' +import { docsUrl } from '@pnpm/cli.utils' +import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.projects-reader' import { rimraf } from '@zkochan/rimraf' import { isSubdir } from 'is-subdir' import { pathExists } from 'path-exists' diff --git a/pnpm/src/cmd/help.ts b/pnpm/src/cmd/help.ts index 44e2f0f47d..c166cc2010 100644 --- a/pnpm/src/cmd/help.ts +++ b/pnpm/src/cmd/help.ts @@ -1,5 +1,5 @@ -import { detectIfCurrentPkgIsExecutable, packageManager } from '@pnpm/cli-meta' -import { docsUrl } from '@pnpm/cli-utils' +import { detectIfCurrentPkgIsExecutable, packageManager } from '@pnpm/cli.meta' +import { docsUrl } from '@pnpm/cli.utils' import { renderHelp } from 'render-help' import type { CommandDefinition } from './index.js' diff --git a/pnpm/src/cmd/index.ts b/pnpm/src/cmd/index.ts index d531bb75cf..2acb697806 100644 --- a/pnpm/src/cmd/index.ts +++ b/pnpm/src/cmd/index.ts @@ -1,25 +1,25 @@ import { approveBuilds, ignoredBuilds, rebuild } from '@pnpm/building.commands' import { cache } from '@pnpm/cache.commands' +import type { CompletionFunc } from '@pnpm/cli.command' import { createCompletionServer, doctor, generateCompletion } from '@pnpm/cli.commands' -import type { CompletionFunc } from '@pnpm/command' -import { types as allTypes } from '@pnpm/config' +import { config, getCommand, setCommand } from '@pnpm/config.commands' +import { types as allTypes } from '@pnpm/config.reader' import { audit, licenses, sbom } from '@pnpm/deps.compliance.commands' import { list, ll, outdated, why } from '@pnpm/deps.inspection.commands' import { selfUpdate, setup } from '@pnpm/engine.pm.commands' -import { config, getCommand, setCommand } from '@pnpm/plugin-commands-config' -import { init } from '@pnpm/plugin-commands-init' -import { add, ci, dedupe, fetch, importCommand, install, link, prune, remove, unlink, update } from '@pnpm/plugin-commands-installation' -import { patch, patchCommit, patchRemove } from '@pnpm/plugin-commands-patching' +import { env, runtime } from '@pnpm/engine.runtime.commands' import { create, dlx, exec, restart, run, -} from '@pnpm/plugin-commands-script-runners' +} from '@pnpm/exec.commands' +import { add, ci, dedupe, fetch, importCommand, install, link, prune, remove, unlink, update } from '@pnpm/installing.commands' +import { patch, patchCommit, patchRemove } from '@pnpm/patching.commands' import { deploy, pack, publish } from '@pnpm/releasing.commands' -import { env, runtime } from '@pnpm/runtime.commands' import { catFile, catIndex, findHash, store } from '@pnpm/store.commands' +import { init } from '@pnpm/workspace.commands' import { pick } from 'ramda' import { parseCliArgs } from '../parseCliArgs.js' diff --git a/pnpm/src/cmd/installTest.ts b/pnpm/src/cmd/installTest.ts index 2a872724d7..fc1270518a 100644 --- a/pnpm/src/cmd/installTest.ts +++ b/pnpm/src/cmd/installTest.ts @@ -1,6 +1,6 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { install } from '@pnpm/plugin-commands-installation' -import { run } from '@pnpm/plugin-commands-script-runners' +import { docsUrl } from '@pnpm/cli.utils' +import { run } from '@pnpm/exec.commands' +import { install } from '@pnpm/installing.commands' import { renderHelp } from 'render-help' import type { PnpmOptions } from '../types.js' diff --git a/pnpm/src/cmd/recursive.ts b/pnpm/src/cmd/recursive.ts index 6597cb1995..5b99124693 100644 --- a/pnpm/src/cmd/recursive.ts +++ b/pnpm/src/cmd/recursive.ts @@ -1,6 +1,6 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { FILTERING } from '@pnpm/common-cli-options-help' -import { getDefaultWorkspaceConcurrency } from '@pnpm/config' +import { FILTERING } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' +import { getDefaultWorkspaceConcurrency } from '@pnpm/config.reader' import { WANTED_LOCKFILE } from '@pnpm/constants' import { renderHelp } from 'render-help' diff --git a/pnpm/src/cmd/root.ts b/pnpm/src/cmd/root.ts index 72488ea749..aca5b6c0ff 100644 --- a/pnpm/src/cmd/root.ts +++ b/pnpm/src/cmd/root.ts @@ -1,7 +1,7 @@ import path from 'node:path' -import { docsUrl } from '@pnpm/cli-utils' -import { types as allTypes } from '@pnpm/config' +import { docsUrl } from '@pnpm/cli.utils' +import { types as allTypes } from '@pnpm/config.reader' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/pnpm/src/main.ts b/pnpm/src/main.ts index b855102d7c..a64a76b555 100644 --- a/pnpm/src/main.ts +++ b/pnpm/src/main.ts @@ -9,16 +9,16 @@ if (!global['pnpm__startedAt']) { import path from 'node:path' import { stripVTControlCharacters as stripAnsi } from 'node:util' -import { isExecutedByCorepack, packageManager } from '@pnpm/cli-meta' -import { getConfig, installConfigDepsAndLoadHooks } from '@pnpm/cli-utils' -import type { Config } from '@pnpm/config' +import { isExecutedByCorepack, packageManager } from '@pnpm/cli.meta' +import type { ParsedCliArgs } from '@pnpm/cli.parse-cli-args' +import { getConfig, installConfigDepsAndLoadHooks } from '@pnpm/cli.utils' +import type { Config } from '@pnpm/config.reader' import { executionTimeLogger, scopeLogger } from '@pnpm/core-loggers' import { PnpmError } from '@pnpm/error' -import { filterPackagesFromDir } from '@pnpm/filter-workspace-packages' import { globalWarn, logger } from '@pnpm/logger' -import type { ParsedCliArgs } from '@pnpm/parse-cli-args' import type { EngineDependency } from '@pnpm/types' import { finishWorkers } from '@pnpm/worker' +import { filterPackagesFromDir } from '@pnpm/workspace.projects-filter' import chalk from 'chalk' import loudRejection from 'loud-rejection' import { isEmpty } from 'ramda' diff --git a/pnpm/src/parseCliArgs.ts b/pnpm/src/parseCliArgs.ts index 4c14a3c02c..932b58f401 100644 --- a/pnpm/src/parseCliArgs.ts +++ b/pnpm/src/parseCliArgs.ts @@ -1,4 +1,4 @@ -import { parseCliArgs as parseCliArgsLib, type ParsedCliArgs } from '@pnpm/parse-cli-args' +import { parseCliArgs as parseCliArgsLib, type ParsedCliArgs } from '@pnpm/cli.parse-cli-args' import { getCliOptionsTypes, diff --git a/pnpm/src/reporter/index.ts b/pnpm/src/reporter/index.ts index 52d0011170..a181957a04 100644 --- a/pnpm/src/reporter/index.ts +++ b/pnpm/src/reporter/index.ts @@ -1,6 +1,6 @@ -import type { Config } from '@pnpm/config' +import { initDefaultReporter } from '@pnpm/cli.default-reporter' +import type { Config } from '@pnpm/config.reader' import type { Log } from '@pnpm/core-loggers' -import { initDefaultReporter } from '@pnpm/default-reporter' import { type LogLevel, type StreamParser, streamParser, writeToConsole } from '@pnpm/logger' import { silentReporter } from './silentReporter.js' diff --git a/pnpm/src/runNpm.ts b/pnpm/src/runNpm.ts index f9b28934fe..f60292e223 100644 --- a/pnpm/src/runNpm.ts +++ b/pnpm/src/runNpm.ts @@ -1,9 +1,9 @@ import type { SpawnSyncReturns } from 'node:child_process' import path from 'node:path' -import { packageManager } from '@pnpm/cli-meta' -import { getConfig, types as allTypes } from '@pnpm/config' -import { runNpm as _runNpm } from '@pnpm/run-npm' +import { packageManager } from '@pnpm/cli.meta' +import { getConfig, types as allTypes } from '@pnpm/config.reader' +import { runNpm as _runNpm } from '@pnpm/exec.run-npm' import { pick } from 'ramda' export async function runNpm (args: string[]): Promise> { diff --git a/pnpm/src/switchCliVersion.ts b/pnpm/src/switchCliVersion.ts index d9761ce859..267f0f0c90 100644 --- a/pnpm/src/switchCliVersion.ts +++ b/pnpm/src/switchCliVersion.ts @@ -1,14 +1,14 @@ import path from 'node:path' -import { packageManager } from '@pnpm/cli-meta' -import type { Config } from '@pnpm/config' +import { packageManager } from '@pnpm/cli.meta' import { isPackageManagerResolved, resolvePackageManagerIntegrities } from '@pnpm/config.deps-installer' +import type { Config } from '@pnpm/config.reader' import { installPnpmToStore } from '@pnpm/engine.pm.commands' -import { prependDirsToPath } from '@pnpm/env.path' import { PnpmError } from '@pnpm/error' import { readEnvLockfile } from '@pnpm/lockfile.fs' import { globalWarn } from '@pnpm/logger' -import { createStoreController } from '@pnpm/store-connection-manager' +import { prependDirsToPath } from '@pnpm/shell.path' +import { createStoreController } from '@pnpm/store.connection-manager' import spawn from 'cross-spawn' import semver from 'semver' diff --git a/pnpm/src/types.ts b/pnpm/src/types.ts index 11689b5ef9..b0483fdbe0 100644 --- a/pnpm/src/types.ts +++ b/pnpm/src/types.ts @@ -1,4 +1,4 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type { LogBase, ReadPackageHook, diff --git a/pnpm/test/config/get.ts b/pnpm/test/config/get.ts index 198c191df4..ea39c29a3d 100644 --- a/pnpm/test/config/get.ts +++ b/pnpm/test/config/get.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import { prepare } from '@pnpm/prepare' -import type { WorkspaceManifest } from '@pnpm/workspace.read-manifest' +import type { WorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { writeYamlFileSync } from 'write-yaml-file' import { execPnpmSync } from '../utils/index.js' diff --git a/pnpm/test/config/list.ts b/pnpm/test/config/list.ts index ba0f77617a..5fa545054d 100644 --- a/pnpm/test/config/list.ts +++ b/pnpm/test/config/list.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { prepare } from '@pnpm/prepare' import { writeYamlFileSync } from 'write-yaml-file' diff --git a/pnpm/test/dlx.ts b/pnpm/test/dlx.ts index 05d9b63f33..f8895f2a43 100644 --- a/pnpm/test/dlx.ts +++ b/pnpm/test/dlx.ts @@ -1,9 +1,9 @@ import fs from 'node:fs' import path from 'node:path' -import { getConfig } from '@pnpm/config' -import { readModulesManifest } from '@pnpm/modules-yaml' -import { dlx } from '@pnpm/plugin-commands-script-runners' +import { getConfig } from '@pnpm/config.reader' +import { dlx } from '@pnpm/exec.commands' +import { readModulesManifest } from '@pnpm/installing.modules-yaml' import { prepare, prepareEmpty } from '@pnpm/prepare' import { addUser, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import type { BaseManifest } from '@pnpm/types' diff --git a/pnpm/test/install/lifecycleScripts.ts b/pnpm/test/install/lifecycleScripts.ts index 9e931431fb..9c66d972fc 100644 --- a/pnpm/test/install/lifecycleScripts.ts +++ b/pnpm/test/install/lifecycleScripts.ts @@ -3,7 +3,7 @@ import path from 'node:path' import { prepare } from '@pnpm/prepare' import type { PackageManifest, ProjectManifest } from '@pnpm/types' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { loadJsonFileSync } from 'load-json-file' import PATH from 'path-name' import { writeYamlFile } from 'write-yaml-file' diff --git a/pnpm/test/install/misc.ts b/pnpm/test/install/misc.ts index 0bf67ce92e..2166f7d1f9 100644 --- a/pnpm/test/install/misc.ts +++ b/pnpm/test/install/misc.ts @@ -3,15 +3,15 @@ import path from 'node:path' import { STORE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' import type { LockfileObject } from '@pnpm/lockfile.types' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import { prepare, prepareEmpty, preparePackages } from '@pnpm/prepare' -import { readPackageJsonFromDir } from '@pnpm/read-package-json' -import { readProjectManifest } from '@pnpm/read-project-manifest' import { getIntegrity } from '@pnpm/registry-mock' import type { PackageFilesIndex } from '@pnpm/store.cafs' import { StoreIndex, storeIndexKey } from '@pnpm/store.index' import { fixtures } from '@pnpm/test-fixtures' import { lexCompare } from '@pnpm/util.lex-comparator' -import { writeProjectManifest } from '@pnpm/write-project-manifest' +import { readProjectManifest } from '@pnpm/workspace.project-manifest-reader' +import { writeProjectManifest } from '@pnpm/workspace.project-manifest-writer' import { rimrafSync } from '@zkochan/rimraf' import crossSpawn from 'cross-spawn' import { dirIsCaseSensitive } from 'dir-is-case-sensitive' diff --git a/pnpm/test/install/supportedArchitectures.ts b/pnpm/test/install/supportedArchitectures.ts index dde02a9f11..eb53ee2dbf 100644 --- a/pnpm/test/install/supportedArchitectures.ts +++ b/pnpm/test/install/supportedArchitectures.ts @@ -1,8 +1,8 @@ import fs from 'node:fs' -import { readModulesManifest } from '@pnpm/modules-yaml' +import { readModulesManifest } from '@pnpm/installing.modules-yaml' import { prepare, prepareEmpty } from '@pnpm/prepare' -import type { WorkspaceManifest } from '@pnpm/workspace.read-manifest' +import type { WorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { writeYamlFileSync } from 'write-yaml-file' import { execPnpm } from '../utils/index.js' diff --git a/pnpm/test/monorepo/dedupePeers.test.ts b/pnpm/test/monorepo/dedupePeers.test.ts index 19563fa2a0..d2ba5edf61 100644 --- a/pnpm/test/monorepo/dedupePeers.test.ts +++ b/pnpm/test/monorepo/dedupePeers.test.ts @@ -1,7 +1,7 @@ import path from 'node:path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { createPeerDepGraphHash } from '@pnpm/dependency-path' +import { createPeerDepGraphHash } from '@pnpm/deps.path' import type { LockfileFile } from '@pnpm/lockfile.types' import { preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/pnpm/test/monorepo/index.ts b/pnpm/test/monorepo/index.ts index 52f640b020..9bc77d482b 100644 --- a/pnpm/test/monorepo/index.ts +++ b/pnpm/test/monorepo/index.ts @@ -2,22 +2,22 @@ import fs from 'node:fs' import path from 'node:path' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' +import { readModulesManifest } from '@pnpm/installing.modules-yaml' import type { LockfileFile } from '@pnpm/lockfile.types' -import { readModulesManifest } from '@pnpm/modules-yaml' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import { prepare, prepareEmpty, preparePackages, tempDir as makeTempDir, } from '@pnpm/prepare' -import { readPackageJsonFromDir } from '@pnpm/read-package-json' import { addDistTag } from '@pnpm/registry-mock' import { createTestIpcServer } from '@pnpm/test-ipc-server' import type { ProjectManifest } from '@pnpm/types' -import { findWorkspacePackages } from '@pnpm/workspace.find-packages' -import type { WorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' +import type { WorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { rimrafSync } from '@zkochan/rimraf' import { safeExeca as execa } from 'execa' import { readYamlFileSync } from 'read-yaml-file' @@ -802,7 +802,7 @@ test('recursive install with shared-workspace-lockfile builds workspace projects server1.clear() server2.clear() - // TODO: duplicate this test in @pnpm/headless + // TODO: duplicate this test in @pnpm/installing.deps-restorer await execPnpm(['recursive', 'install', '--frozen-lockfile', '--link-workspace-packages', '--shared-workspace-lockfile=true']) expect(server1.getLines()).toStrictEqual([ diff --git a/pnpm/test/recursive/misc.ts b/pnpm/test/recursive/misc.ts index 2c1931a712..42d9bbe922 100644 --- a/pnpm/test/recursive/misc.ts +++ b/pnpm/test/recursive/misc.ts @@ -1,10 +1,10 @@ import fs from 'node:fs' import path from 'node:path' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type { LockfileFile } from '@pnpm/lockfile.types' import { preparePackages } from '@pnpm/prepare' -import type { WorkspaceManifest } from '@pnpm/workspace.read-manifest' +import type { WorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { isCI } from 'ci-info' import isWindows from 'is-windows' import { readYamlFileSync } from 'read-yaml-file' diff --git a/pnpm/test/recursive/update.ts b/pnpm/test/recursive/update.ts index 5909e3425d..bb9008cc09 100644 --- a/pnpm/test/recursive/update.ts +++ b/pnpm/test/recursive/update.ts @@ -1,9 +1,9 @@ import path from 'node:path' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' -import type { WorkspaceManifest } from '@pnpm/workspace.read-manifest' +import type { WorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { writeYamlFileSync } from 'write-yaml-file' import { execPnpm } from '../utils/index.js' diff --git a/pnpm/test/syncInjectedDepsAfterScripts.ts b/pnpm/test/syncInjectedDepsAfterScripts.ts index 7e509aa17d..4deda5e2cc 100644 --- a/pnpm/test/syncInjectedDepsAfterScripts.ts +++ b/pnpm/test/syncInjectedDepsAfterScripts.ts @@ -242,7 +242,7 @@ test('directories and symlinks', async () => { ).toStrictEqual(['foo.txt']) // should recreate the structure of the symlinks at the injected location - // NOTE: The current implementation of @pnpm/directory-fetcher would treat symlinks to dir at real dir + // NOTE: The current implementation of @pnpm/fetching.directory-fetcher would treat symlinks to dir at real dir // because it uses fs.stat instead of fs.lstat, so testing with fs.realpathSync wouldn't work. expect(fs.readFileSync('node_modules/.pnpm/foo@file+foo/node_modules/foo/link-to-a-file', 'utf-8')).toBe('This is foo_bar') expect( diff --git a/pnpm/test/uninstall.ts b/pnpm/test/uninstall.ts index 3e33c03e0a..48137e2684 100644 --- a/pnpm/test/uninstall.ts +++ b/pnpm/test/uninstall.ts @@ -1,8 +1,8 @@ import fs from 'node:fs' import path from 'node:path' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import { prepare } from '@pnpm/prepare' -import { readPackageJsonFromDir } from '@pnpm/read-package-json' import PATH from 'path-name' import { execPnpm } from './utils/index.js' diff --git a/pnpm/test/update.ts b/pnpm/test/update.ts index ebe8b35c5e..09017c81a2 100644 --- a/pnpm/test/update.ts +++ b/pnpm/test/update.ts @@ -1,7 +1,7 @@ import path from 'node:path' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import { prepare, preparePackages } from '@pnpm/prepare' -import { readPackageJsonFromDir } from '@pnpm/read-package-json' import { readYamlFileSync } from 'read-yaml-file' import { writeYamlFileSync } from 'write-yaml-file' diff --git a/pnpm/test/utils/execPnpm.ts b/pnpm/test/utils/execPnpm.ts index 565e57453b..c4c9c1e990 100644 --- a/pnpm/test/utils/execPnpm.ts +++ b/pnpm/test/utils/execPnpm.ts @@ -1,7 +1,7 @@ import type { ChildProcess as NodeChildProcess, StdioOptions } from 'node:child_process' import path from 'node:path' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import crossSpawn from 'cross-spawn' import isWindows from 'is-windows' diff --git a/pnpm/tsconfig.json b/pnpm/tsconfig.json index fdbaf0498d..6a27bb473e 100644 --- a/pnpm/tsconfig.json +++ b/pnpm/tsconfig.json @@ -29,12 +29,6 @@ { "path": "../cache/commands" }, - { - "path": "../cli/cli-meta" - }, - { - "path": "../cli/cli-utils" - }, { "path": "../cli/command" }, @@ -47,17 +41,23 @@ { "path": "../cli/default-reporter" }, + { + "path": "../cli/meta" + }, { "path": "../cli/parse-cli-args" }, + { + "path": "../cli/utils" + }, { "path": "../config/commands" }, { - "path": "../config/config" + "path": "../config/deps-installer" }, { - "path": "../config/deps-installer" + "path": "../config/reader" }, { "path": "../config/version-policy" @@ -69,10 +69,10 @@ "path": "../deps/compliance/commands" }, { - "path": "../deps/dependency-path" + "path": "../deps/inspection/commands" }, { - "path": "../deps/inspection/commands" + "path": "../deps/path" }, { "path": "../engine/pm/commands" @@ -125,12 +125,6 @@ { "path": "../pkg-manifest/read-package-json" }, - { - "path": "../pkg-manifest/read-project-manifest" - }, - { - "path": "../pkg-manifest/write-project-manifest" - }, { "path": "../releasing/commands" }, @@ -144,10 +138,10 @@ "path": "../store/commands" }, { - "path": "../store/index" + "path": "../store/connection-manager" }, { - "path": "../store/store-connection-manager" + "path": "../store/index" }, { "path": "../worker" @@ -155,23 +149,29 @@ { "path": "../workspace/commands" }, - { - "path": "../workspace/filter-workspace-packages" - }, - { - "path": "../workspace/find-packages" - }, - { - "path": "../workspace/find-workspace-dir" - }, { "path": "../workspace/pkgs-graph" }, { - "path": "../workspace/read-manifest" + "path": "../workspace/project-manifest-reader" + }, + { + "path": "../workspace/project-manifest-writer" + }, + { + "path": "../workspace/projects-filter" + }, + { + "path": "../workspace/projects-reader" + }, + { + "path": "../workspace/root-finder" }, { "path": "../workspace/state" + }, + { + "path": "../workspace/workspace-manifest-reader" } ] } diff --git a/releasing/commands/package.json b/releasing/commands/package.json index c57ba7d915..6ae2145141 100644 --- a/releasing/commands/package.json +++ b/releasing/commands/package.json @@ -32,31 +32,31 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/bins.resolver": "workspace:*", "@pnpm/catalogs.types": "workspace:*", - "@pnpm/cli-utils": "workspace:*", - "@pnpm/client": "workspace:*", - "@pnpm/common-cli-options-help": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.common-cli-options-help": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.pick-registry-for-package": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/constants": "workspace:*", - "@pnpm/dependency-path": "workspace:*", - "@pnpm/directory-fetcher": "workspace:*", + "@pnpm/deps.path": "workspace:*", + "@pnpm/engine.runtime.commands": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/exportable-manifest": "workspace:*", - "@pnpm/fetch": "workspace:*", + "@pnpm/exec.lifecycle": "workspace:*", + "@pnpm/fetching.directory-fetcher": "workspace:*", "@pnpm/fs.indexed-pkg-importer": "workspace:*", "@pnpm/fs.is-empty-dir-or-nothing": "workspace:*", "@pnpm/fs.packlist": "workspace:*", - "@pnpm/git-utils": "workspace:*", - "@pnpm/lifecycle": "workspace:*", + "@pnpm/installing.client": "workspace:*", + "@pnpm/installing.commands": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.types": "workspace:*", - "@pnpm/package-bins": "workspace:*", - "@pnpm/pick-registry-for-package": "workspace:*", - "@pnpm/plugin-commands-installation": "workspace:*", - "@pnpm/resolver-base": "workspace:*", - "@pnpm/runtime.commands": "workspace:*", - "@pnpm/sort-packages": "workspace:*", + "@pnpm/network.fetch": "workspace:*", + "@pnpm/network.git-utils": "workspace:*", + "@pnpm/releasing.exportable-manifest": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.sort-packages": "workspace:*", "@types/normalize-path": "catalog:", "@zkochan/rimraf": "catalog:", "chalk": "catalog:", @@ -85,14 +85,14 @@ "@jest/globals": "catalog:", "@pnpm/assert-project": "workspace:*", "@pnpm/catalogs.config": "workspace:*", + "@pnpm/hooks.pnpmfile": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/pnpmfile": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/releasing.commands": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@pnpm/test-ipc-server": "workspace:*", - "@pnpm/workspace.filter-packages-from-dir": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", "@types/cross-spawn": "catalog:", "@types/is-windows": "catalog:", "@types/libnpmpublish": "catalog:", diff --git a/releasing/commands/src/deploy/createDeployFiles.ts b/releasing/commands/src/deploy/createDeployFiles.ts index 5da4dd5b71..53d943f7d6 100644 --- a/releasing/commands/src/deploy/createDeployFiles.ts +++ b/releasing/commands/src/deploy/createDeployFiles.ts @@ -1,7 +1,7 @@ import path from 'node:path' import url from 'node:url' -import * as dp from '@pnpm/dependency-path' +import * as dp from '@pnpm/deps.path' import type { DirectoryResolution, LockfileObject, diff --git a/releasing/commands/src/deploy/deploy.ts b/releasing/commands/src/deploy/deploy.ts index 498167ec9a..c9a0ba15fe 100644 --- a/releasing/commands/src/deploy/deploy.ts +++ b/releasing/commands/src/deploy/deploy.ts @@ -1,17 +1,17 @@ import fs from 'node:fs' import path from 'node:path' -import { docsUrl } from '@pnpm/cli-utils' -import { FILTERING } from '@pnpm/common-cli-options-help' -import { type Config, types as configTypes } from '@pnpm/config' +import { FILTERING } from '@pnpm/cli.common-cli-options-help' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, types as configTypes } from '@pnpm/config.reader' import { WORKSPACE_MANIFEST_FILENAME } from '@pnpm/constants' -import { fetchFromDir } from '@pnpm/directory-fetcher' import { PnpmError } from '@pnpm/error' +import { fetchFromDir } from '@pnpm/fetching.directory-fetcher' import { createIndexedPkgImporter } from '@pnpm/fs.indexed-pkg-importer' import { isEmptyDirOrNothing } from '@pnpm/fs.is-empty-dir-or-nothing' +import { install } from '@pnpm/installing.commands' import { getLockfileImporterId, readWantedLockfile, writeWantedLockfile } from '@pnpm/lockfile.fs' import { globalWarn, logger } from '@pnpm/logger' -import { install } from '@pnpm/plugin-commands-installation' import type { Project } from '@pnpm/types' import { rimraf } from '@zkochan/rimraf' import { pick } from 'ramda' diff --git a/releasing/commands/src/publish/extractManifestFromPacked.ts b/releasing/commands/src/publish/extractManifestFromPacked.ts index 8c66450471..f66a55d60b 100644 --- a/releasing/commands/src/publish/extractManifestFromPacked.ts +++ b/releasing/commands/src/publish/extractManifestFromPacked.ts @@ -3,7 +3,7 @@ import path from 'node:path' import { createGunzip } from 'node:zlib' import { PnpmError } from '@pnpm/error' -import type { ExportedManifest } from '@pnpm/exportable-manifest' +import type { ExportedManifest } from '@pnpm/releasing.exportable-manifest' import tar from 'tar-stream' const TARBALL_SUFFIXES = ['.tar.gz', '.tgz'] as const diff --git a/releasing/commands/src/publish/oidc/utils/shared-context.ts b/releasing/commands/src/publish/oidc/utils/shared-context.ts index 266658e5d0..e76713919e 100644 --- a/releasing/commands/src/publish/oidc/utils/shared-context.ts +++ b/releasing/commands/src/publish/oidc/utils/shared-context.ts @@ -1,5 +1,5 @@ -import { fetch } from '@pnpm/fetch' import { globalInfo } from '@pnpm/logger' +import { fetch } from '@pnpm/network.fetch' import ciInfo from 'ci-info' import type { AuthTokenContext } from '../authToken.js' diff --git a/releasing/commands/src/publish/pack.ts b/releasing/commands/src/publish/pack.ts index d4b39687dd..5cbe1015c6 100644 --- a/releasing/commands/src/publish/pack.ts +++ b/releasing/commands/src/publish/pack.ts @@ -2,18 +2,18 @@ import fs from 'node:fs' import path from 'node:path' import { createGzip } from 'node:zlib' +import { getBinsFromPackageManifest } from '@pnpm/bins.resolver' import type { Catalogs } from '@pnpm/catalogs.types' -import { readProjectManifest } from '@pnpm/cli-utils' -import { FILTERING } from '@pnpm/common-cli-options-help' -import { type Config, getDefaultWorkspaceConcurrency, getWorkspaceConcurrency, types as allTypes, type UniversalOptions } from '@pnpm/config' +import { FILTERING } from '@pnpm/cli.common-cli-options-help' +import { readProjectManifest } from '@pnpm/cli.utils' +import { type Config, getDefaultWorkspaceConcurrency, getWorkspaceConcurrency, types as allTypes, type UniversalOptions } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' -import { createExportableManifest, type ExportedManifest } from '@pnpm/exportable-manifest' import { packlist } from '@pnpm/fs.packlist' +import type { Hooks } from '@pnpm/hooks.pnpmfile' import { logger } from '@pnpm/logger' -import { getBinsFromPackageManifest } from '@pnpm/package-bins' -import type { Hooks } from '@pnpm/pnpmfile' -import { sortPackages } from '@pnpm/sort-packages' +import { createExportableManifest, type ExportedManifest } from '@pnpm/releasing.exportable-manifest' import type { DependencyManifest, Project, ProjectManifest, ProjectRootDir, ProjectsGraph } from '@pnpm/types' +import { sortPackages } from '@pnpm/workspace.sort-packages' import chalk from 'chalk' import pLimit from 'p-limit' import { pick } from 'ramda' diff --git a/releasing/commands/src/publish/publish.ts b/releasing/commands/src/publish/publish.ts index 21c022485c..58da5d2590 100644 --- a/releasing/commands/src/publish/publish.ts +++ b/releasing/commands/src/publish/publish.ts @@ -1,11 +1,11 @@ import path from 'node:path' -import { docsUrl, readProjectManifest } from '@pnpm/cli-utils' -import { FILTERING } from '@pnpm/common-cli-options-help' -import { type Config, types as allTypes } from '@pnpm/config' +import { FILTERING } from '@pnpm/cli.common-cli-options-help' +import { docsUrl, readProjectManifest } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' -import { getCurrentBranch, isGitRepo, isRemoteHistoryClean, isWorkingTreeClean } from '@pnpm/git-utils' -import { runLifecycleHook, type RunLifecycleHookOptions } from '@pnpm/lifecycle' +import { runLifecycleHook, type RunLifecycleHookOptions } from '@pnpm/exec.lifecycle' +import { getCurrentBranch, isGitRepo, isRemoteHistoryClean, isWorkingTreeClean } from '@pnpm/network.git-utils' import type { ProjectManifest } from '@pnpm/types' import { rimraf } from '@zkochan/rimraf' import enquirer from 'enquirer' diff --git a/releasing/commands/src/publish/publishPackedPkg.ts b/releasing/commands/src/publish/publishPackedPkg.ts index dcf957011f..8ac8f8f7c5 100644 --- a/releasing/commands/src/publish/publishPackedPkg.ts +++ b/releasing/commands/src/publish/publishPackedPkg.ts @@ -1,9 +1,9 @@ import fs from 'node:fs/promises' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' -import type { ExportedManifest } from '@pnpm/exportable-manifest' import { globalInfo, globalWarn } from '@pnpm/logger' +import type { ExportedManifest } from '@pnpm/releasing.exportable-manifest' import { publish, type PublishOptions } from 'libnpmpublish' import { displayError } from './displayError.js' diff --git a/releasing/commands/src/publish/recursivePublish.ts b/releasing/commands/src/publish/recursivePublish.ts index e4040acc2e..31f1eeeb3a 100644 --- a/releasing/commands/src/publish/recursivePublish.ts +++ b/releasing/commands/src/publish/recursivePublish.ts @@ -1,12 +1,12 @@ import path from 'node:path' -import { createResolver } from '@pnpm/client' -import type { Config } from '@pnpm/config' +import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package' +import type { Config } from '@pnpm/config.reader' +import { createResolver } from '@pnpm/installing.client' import { logger } from '@pnpm/logger' -import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package' -import type { ResolveFunction } from '@pnpm/resolver-base' -import { sortPackages } from '@pnpm/sort-packages' +import type { ResolveFunction } from '@pnpm/resolving.resolver-base' import type { ProjectRootDir, Registries } from '@pnpm/types' +import { sortPackages } from '@pnpm/workspace.sort-packages' import pFilter from 'p-filter' import { pick } from 'ramda' import { writeJsonFile } from 'write-json-file' diff --git a/releasing/commands/test/deploy/deploy.test.ts b/releasing/commands/test/deploy/deploy.test.ts index 4589989bb2..2208fd293c 100644 --- a/releasing/commands/test/deploy/deploy.test.ts +++ b/releasing/commands/test/deploy/deploy.test.ts @@ -3,9 +3,9 @@ import path from 'node:path' import { jest } from '@jest/globals' import { assertProject } from '@pnpm/assert-project' -import { install } from '@pnpm/plugin-commands-installation' +import { install } from '@pnpm/installing.commands' import { preparePackages } from '@pnpm/prepare' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { DEFAULT_OPTS } from './utils/index.js' @@ -73,7 +73,7 @@ test('deploy without existing lockfile', async () => { fs.writeFileSync(`${name}/index.js`, '', 'utf8') } - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-1' }]) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-1' }]) await deploy.handler({ ...DEFAULT_OPTS, @@ -145,7 +145,7 @@ test('deploy in workspace with shared-workspace-lockfile=false', async () => { fs.writeFileSync(`${name}/index.js`, '', 'utf8') } - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-1' }]) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-1' }]) await deploy.handler({ ...DEFAULT_OPTS, @@ -220,7 +220,7 @@ test('deploy with node-linker=hoisted', async () => { fs.writeFileSync(`${name}/index.js`, '', 'utf8') }) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-1' }]) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-1' }]) await deploy.handler({ ...DEFAULT_OPTS, @@ -287,7 +287,7 @@ test.each(['isolated', 'hoisted'] as const)( }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-1' }]) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-1' }]) await deploy.handler({ ...DEFAULT_OPTS, @@ -332,7 +332,7 @@ test('deploy fails when the destination directory exists and is not empty', asyn fs.writeFileSync(deployPath, 'aaa', 'utf8') const deployFullPath = path.resolve(deployPath) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project' }]) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project' }]) await expect(() => deploy.handler({ @@ -372,7 +372,7 @@ test('forced deploy succeeds with a warning when destination directory exists an fs.writeFileSync(deployPath, 'aaa', 'utf8') const deployFullPath = path.resolve(deployPath) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project' }]) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project' }]) await deploy.handler({ ...DEFAULT_OPTS, @@ -431,7 +431,7 @@ test('deploy with dedupePeerDependents=true ignores the value of dedupePeerDepen }, ]) - const { allProjects, selectedProjectsGraph, allProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-1' }]) + const { allProjects, selectedProjectsGraph, allProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-1' }]) await deploy.handler({ ...DEFAULT_OPTS, @@ -478,7 +478,7 @@ test('deploy works when workspace packages use catalog protocol', async () => { }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-1' }]) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-1' }]) await deploy.handler({ ...DEFAULT_OPTS, @@ -518,7 +518,7 @@ test('deploy does not preserve the inject workspace packages settings in the loc }, ]) - const { allProjects, selectedProjectsGraph } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project' }]) + const { allProjects, selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project' }]) await install.handler({ ...DEFAULT_OPTS, diff --git a/releasing/commands/test/deploy/shared-lockfile.test.ts b/releasing/commands/test/deploy/shared-lockfile.test.ts index e5ca9718fc..cc7ab27696 100644 --- a/releasing/commands/test/deploy/shared-lockfile.test.ts +++ b/releasing/commands/test/deploy/shared-lockfile.test.ts @@ -4,12 +4,12 @@ import url from 'node:url' import { jest } from '@jest/globals' import { assertProject } from '@pnpm/assert-project' +import { install } from '@pnpm/installing.commands' import type { LockfileFile, LockfilePackageSnapshot } from '@pnpm/lockfile.types' -import { install } from '@pnpm/plugin-commands-installation' import { preparePackages } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' import type { ProjectManifest } from '@pnpm/types' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import { writeYamlFile } from 'write-yaml-file' import { DEFAULT_OPTS } from './utils/index.js' @@ -107,7 +107,7 @@ test('deploy with a shared lockfile after full install', async () => { allProjects, allProjectsGraph, selectedProjectsGraph, - } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-1' }]) + } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-1' }]) await install.handler({ ...DEFAULT_OPTS, @@ -314,7 +314,7 @@ test('the deploy manifest should inherit some fields from the pnpm object from t allProjects, allProjectsGraph, selectedProjectsGraph, - } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-0' }]) + } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-0' }]) await install.handler({ ...DEFAULT_OPTS, @@ -407,7 +407,7 @@ test('deploy with a shared lockfile and --prod filter should not fail even if de allProjects, allProjectsGraph, selectedProjectsGraph, - } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'prod-0' }]) + } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'prod-0' }]) await install.handler({ ...DEFAULT_OPTS, @@ -510,7 +510,7 @@ test('deploy with a shared lockfile should correctly handle workspace dependenci allProjects, allProjectsGraph, selectedProjectsGraph, - } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-0' }]) + } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-0' }]) await install.handler({ ...DEFAULT_OPTS, @@ -588,7 +588,7 @@ test('deploy with a shared lockfile should correctly handle package that depends allProjects, allProjectsGraph, selectedProjectsGraph, - } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-0' }]) + } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-0' }]) await install.handler({ ...DEFAULT_OPTS, @@ -707,7 +707,7 @@ test('deploy with a shared lockfile should correctly handle packageExtensions', allProjects, allProjectsGraph, selectedProjectsGraph, - } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-0' }]) + } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-0' }]) await install.handler({ ...DEFAULT_OPTS, @@ -820,7 +820,7 @@ test('deploy with a shared lockfile should correctly handle patchedDependencies' allProjects, allProjectsGraph, selectedProjectsGraph, - } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-0' }]) + } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-0' }]) await install.handler({ ...DEFAULT_OPTS, @@ -931,7 +931,7 @@ test('deploy with a shared lockfile that has peer dependencies suffix in workspa allProjects, allProjectsGraph, selectedProjectsGraph, - } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-0' }]) + } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-0' }]) await install.handler({ ...DEFAULT_OPTS, @@ -1103,7 +1103,7 @@ test('deploy with a shared lockfile should keep files created by lifecycle scrip allProjects, allProjectsGraph, selectedProjectsGraph, - } = await filterPackagesFromDir(process.cwd(), [{ namePattern: 'project-0' }]) + } = await filterPkgsBySelectorObjectsFromDir(process.cwd(), [{ namePattern: 'project-0' }]) await install.handler({ ...DEFAULT_OPTS, diff --git a/releasing/commands/test/publish/extractManifestFromPacked.test.ts b/releasing/commands/test/publish/extractManifestFromPacked.test.ts index 5775c9f400..b9935eab43 100644 --- a/releasing/commands/test/publish/extractManifestFromPacked.test.ts +++ b/releasing/commands/test/publish/extractManifestFromPacked.test.ts @@ -1,8 +1,8 @@ import fs from 'node:fs' import { createGzip } from 'node:zlib' -import type { ExportedManifest } from '@pnpm/exportable-manifest' import { prepareEmpty } from '@pnpm/prepare' +import type { ExportedManifest } from '@pnpm/releasing.exportable-manifest' import tar from 'tar-stream' import { diff --git a/releasing/commands/test/publish/pack.ts b/releasing/commands/test/publish/pack.ts index ae4054d382..c97a40942e 100644 --- a/releasing/commands/test/publish/pack.ts +++ b/releasing/commands/test/publish/pack.ts @@ -3,7 +3,7 @@ import path from 'node:path' import { prepare, preparePackages, tempDir } from '@pnpm/prepare' import { pack } from '@pnpm/releasing.commands' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import chalk from 'chalk' import * as tar from 'tar' import { writeYamlFileSync } from 'write-yaml-file' @@ -642,7 +642,7 @@ test('pack: recursive pack and display in json format', async () => { writeYamlFileSync(path.join(dir, 'pnpm-workspace.yaml'), { packages: pkgs.filter(pkg => pkg).map(pkg => pkg.name) }) - const { selectedProjectsGraph } = await filterPackagesFromDir(dir, []) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(dir, []) const output = await pack.handler({ ...DEFAULT_OPTS, @@ -727,7 +727,7 @@ test('pack: recursive pack with filter', async () => { writeYamlFileSync(path.join(dir, 'pnpm-workspace.yaml'), { packages: pkgs.filter(pkg => pkg).map(pkg => pkg.name) }) - const { selectedProjectsGraph } = await filterPackagesFromDir(dir, [{ namePattern: '@pnpmtest/*' }]) + const { selectedProjectsGraph } = await filterPkgsBySelectorObjectsFromDir(dir, [{ namePattern: '@pnpmtest/*' }]) const output = await pack.handler({ ...DEFAULT_OPTS, diff --git a/releasing/commands/test/publish/recursivePublish.ts b/releasing/commands/test/publish/recursivePublish.ts index 79998c0077..b595c0870f 100644 --- a/releasing/commands/test/publish/recursivePublish.ts +++ b/releasing/commands/test/publish/recursivePublish.ts @@ -7,7 +7,7 @@ import { preparePackages } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { publish } from '@pnpm/releasing.commands' import type { ProjectManifest } from '@pnpm/types' -import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' +import { filterPkgsBySelectorObjectsFromDir } from '@pnpm/workspace.projects-filter' import crossSpawn from 'cross-spawn' import { safeExeca as execa } from 'execa' import { loadJsonFileSync } from 'load-json-file' @@ -77,7 +77,7 @@ test('recursive publish', async () => { await publish.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), dryRun: true, recursive: true, @@ -95,7 +95,7 @@ test('recursive publish', async () => { process.env.npm_config_userconfig = path.join('.npmrc') await publish.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), recursive: true, }, []) @@ -107,7 +107,7 @@ test('recursive publish', async () => { await publish.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), recursive: true, tag: 'next', @@ -158,7 +158,7 @@ test('print info when no packages are published', async () => { await publish.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), dryRun: true, recursive: true, @@ -190,7 +190,7 @@ test('packages are released even if their current version is published, when for await publish.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), force: true, dir: process.cwd(), dryRun: true, @@ -254,7 +254,7 @@ test('recursive publish writes publish summary', async () => { process.env.npm_config_userconfig = path.join('.npmrc') await publish.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), recursive: true, reportSummary: true, @@ -268,7 +268,7 @@ test('recursive publish writes publish summary', async () => { await publish.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), dir: process.cwd(), recursive: true, reportSummary: true, @@ -298,7 +298,7 @@ test('errors on fake registry', async () => { const promise = publish.handler({ ...DEFAULT_OPTS, - ...await filterPackagesFromDir(process.cwd(), []), + ...await filterPkgsBySelectorObjectsFromDir(process.cwd(), []), rawConfig: { ...DEFAULT_OPTS.rawConfig, registry: fakeRegistry, diff --git a/releasing/commands/tsconfig.json b/releasing/commands/tsconfig.json index e7afa60581..11f4ab871e 100644 --- a/releasing/commands/tsconfig.json +++ b/releasing/commands/tsconfig.json @@ -22,7 +22,7 @@ "path": "../../__utils__/test-ipc-server" }, { - "path": "../../bins/package-bins" + "path": "../../bins/resolver" }, { "path": "../../catalogs/config" @@ -30,20 +30,20 @@ { "path": "../../catalogs/types" }, - { - "path": "../../cli/cli-utils" - }, { "path": "../../cli/common-cli-options-help" }, { - "path": "../../config/config" + "path": "../../cli/utils" }, { "path": "../../config/pick-registry-for-package" }, { - "path": "../../deps/dependency-path" + "path": "../../config/reader" + }, + { + "path": "../../deps/path" }, { "path": "../../engine/runtime/commands" @@ -96,17 +96,17 @@ { "path": "../../packages/types" }, - { - "path": "../../pkg-manifest/exportable-manifest" - }, { "path": "../../resolving/resolver-base" }, { - "path": "../../workspace/filter-packages-from-dir" + "path": "../../workspace/projects-filter" }, { "path": "../../workspace/sort-packages" + }, + { + "path": "../exportable-manifest" } ] } diff --git a/pkg-manifest/exportable-manifest/CHANGELOG.md b/releasing/exportable-manifest/CHANGELOG.md similarity index 100% rename from pkg-manifest/exportable-manifest/CHANGELOG.md rename to releasing/exportable-manifest/CHANGELOG.md diff --git a/pkg-manifest/exportable-manifest/README.md b/releasing/exportable-manifest/README.md similarity index 100% rename from pkg-manifest/exportable-manifest/README.md rename to releasing/exportable-manifest/README.md diff --git a/pkg-manifest/exportable-manifest/package.json b/releasing/exportable-manifest/package.json similarity index 76% rename from pkg-manifest/exportable-manifest/package.json rename to releasing/exportable-manifest/package.json index 45cf72bfa4..d04775e8e3 100644 --- a/pkg-manifest/exportable-manifest/package.json +++ b/releasing/exportable-manifest/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/exportable-manifest", + "name": "@pnpm/releasing.exportable-manifest", "version": "1000.1.7", "description": "Creates an exportable manifest", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/exportable-manifest", - "homepage": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/exportable-manifest#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/releasing/exportable-manifest", + "homepage": "https://github.com/pnpm/pnpm/tree/main/releasing/exportable-manifest#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -32,21 +32,21 @@ }, "dependencies": { "@npm/types": "catalog:", + "@pnpm/bins.resolver": "workspace:*", "@pnpm/catalogs.resolver": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/package-bins": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", "@pnpm/resolving.jsr-specifier-parser": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "p-map-values": "catalog:", "ramda": "catalog:" }, "devDependencies": { "@pnpm/catalogs.config": "workspace:*", "@pnpm/catalogs.types": "workspace:*", - "@pnpm/exportable-manifest": "workspace:*", - "@pnpm/pnpmfile": "workspace:*", + "@pnpm/hooks.pnpmfile": "workspace:*", "@pnpm/prepare": "workspace:*", + "@pnpm/releasing.exportable-manifest": "workspace:*", "@types/cross-spawn": "catalog:", "@types/ramda": "catalog:", "cross-spawn": "catalog:", diff --git a/pkg-manifest/exportable-manifest/src/index.ts b/releasing/exportable-manifest/src/index.ts similarity index 98% rename from pkg-manifest/exportable-manifest/src/index.ts rename to releasing/exportable-manifest/src/index.ts index e01aa96283..8757bde0fd 100644 --- a/pkg-manifest/exportable-manifest/src/index.ts +++ b/releasing/exportable-manifest/src/index.ts @@ -3,10 +3,10 @@ import path from 'node:path' import { type CatalogResolver, resolveFromCatalog } from '@pnpm/catalogs.resolver' import type { Catalogs } from '@pnpm/catalogs.types' import { PnpmError } from '@pnpm/error' -import type { Hooks } from '@pnpm/pnpmfile' -import { tryReadProjectManifest } from '@pnpm/read-project-manifest' +import type { Hooks } from '@pnpm/hooks.pnpmfile' import { parseJsrSpecifier } from '@pnpm/resolving.jsr-specifier-parser' import type { Dependencies, ProjectManifest } from '@pnpm/types' +import { tryReadProjectManifest } from '@pnpm/workspace.project-manifest-reader' import { pMapValues } from 'p-map-values' import { omit } from 'ramda' diff --git a/pkg-manifest/exportable-manifest/src/overridePublishConfig.ts b/releasing/exportable-manifest/src/overridePublishConfig.ts similarity index 100% rename from pkg-manifest/exportable-manifest/src/overridePublishConfig.ts rename to releasing/exportable-manifest/src/overridePublishConfig.ts diff --git a/pkg-manifest/exportable-manifest/src/transform/bin.ts b/releasing/exportable-manifest/src/transform/bin.ts similarity index 100% rename from pkg-manifest/exportable-manifest/src/transform/bin.ts rename to releasing/exportable-manifest/src/transform/bin.ts diff --git a/pkg-manifest/exportable-manifest/src/transform/engines.ts b/releasing/exportable-manifest/src/transform/engines.ts similarity index 100% rename from pkg-manifest/exportable-manifest/src/transform/engines.ts rename to releasing/exportable-manifest/src/transform/engines.ts diff --git a/pkg-manifest/exportable-manifest/src/transform/index.ts b/releasing/exportable-manifest/src/transform/index.ts similarity index 100% rename from pkg-manifest/exportable-manifest/src/transform/index.ts rename to releasing/exportable-manifest/src/transform/index.ts diff --git a/pkg-manifest/exportable-manifest/src/transform/peerDependenciesMeta.ts b/releasing/exportable-manifest/src/transform/peerDependenciesMeta.ts similarity index 100% rename from pkg-manifest/exportable-manifest/src/transform/peerDependenciesMeta.ts rename to releasing/exportable-manifest/src/transform/peerDependenciesMeta.ts diff --git a/pkg-manifest/exportable-manifest/src/transform/requiredFields.ts b/releasing/exportable-manifest/src/transform/requiredFields.ts similarity index 100% rename from pkg-manifest/exportable-manifest/src/transform/requiredFields.ts rename to releasing/exportable-manifest/src/transform/requiredFields.ts diff --git a/pkg-manifest/exportable-manifest/test/beforePackingHook.test.ts b/releasing/exportable-manifest/test/beforePackingHook.test.ts similarity index 95% rename from pkg-manifest/exportable-manifest/test/beforePackingHook.test.ts rename to releasing/exportable-manifest/test/beforePackingHook.test.ts index 8ac8ad6804..5e79842ceb 100644 --- a/pkg-manifest/exportable-manifest/test/beforePackingHook.test.ts +++ b/releasing/exportable-manifest/test/beforePackingHook.test.ts @@ -1,8 +1,8 @@ import fs from 'node:fs' -import { createExportableManifest, type MakePublishManifestOptions } from '@pnpm/exportable-manifest' -import { requireHooks } from '@pnpm/pnpmfile' +import { requireHooks } from '@pnpm/hooks.pnpmfile' import { prepare } from '@pnpm/prepare' +import { createExportableManifest, type MakePublishManifestOptions } from '@pnpm/releasing.exportable-manifest' import { writeYamlFileSync } from 'write-yaml-file' const defaultOpts: MakePublishManifestOptions = { diff --git a/pkg-manifest/exportable-manifest/test/index.test.ts b/releasing/exportable-manifest/test/index.test.ts similarity index 99% rename from pkg-manifest/exportable-manifest/test/index.test.ts rename to releasing/exportable-manifest/test/index.test.ts index 05b9287abf..3067a8da89 100644 --- a/pkg-manifest/exportable-manifest/test/index.test.ts +++ b/releasing/exportable-manifest/test/index.test.ts @@ -2,8 +2,8 @@ import path from 'node:path' import { getCatalogsFromWorkspaceManifest } from '@pnpm/catalogs.config' -import { createExportableManifest, type MakePublishManifestOptions } from '@pnpm/exportable-manifest' import { preparePackages } from '@pnpm/prepare' +import { createExportableManifest, type MakePublishManifestOptions } from '@pnpm/releasing.exportable-manifest' import type { ProjectManifest } from '@pnpm/types' import crossSpawn from 'cross-spawn' import { writeYamlFileSync } from 'write-yaml-file' diff --git a/pkg-manifest/exportable-manifest/test/normalizeBinObject.test.ts b/releasing/exportable-manifest/test/normalizeBinObject.test.ts similarity index 100% rename from pkg-manifest/exportable-manifest/test/normalizeBinObject.test.ts rename to releasing/exportable-manifest/test/normalizeBinObject.test.ts diff --git a/pkg-manifest/exportable-manifest/test/overridePublishConfig.test.ts b/releasing/exportable-manifest/test/overridePublishConfig.test.ts similarity index 100% rename from pkg-manifest/exportable-manifest/test/overridePublishConfig.test.ts rename to releasing/exportable-manifest/test/overridePublishConfig.test.ts diff --git a/pkg-manifest/exportable-manifest/test/transformEngines.test.ts b/releasing/exportable-manifest/test/transformEngines.test.ts similarity index 100% rename from pkg-manifest/exportable-manifest/test/transformEngines.test.ts rename to releasing/exportable-manifest/test/transformEngines.test.ts diff --git a/pkg-manifest/exportable-manifest/test/transformPeerDependenciesMeta.test.ts b/releasing/exportable-manifest/test/transformPeerDependenciesMeta.test.ts similarity index 100% rename from pkg-manifest/exportable-manifest/test/transformPeerDependenciesMeta.test.ts rename to releasing/exportable-manifest/test/transformPeerDependenciesMeta.test.ts diff --git a/pkg-manifest/manifest-utils/test/tsconfig.json b/releasing/exportable-manifest/test/tsconfig.json similarity index 100% rename from pkg-manifest/manifest-utils/test/tsconfig.json rename to releasing/exportable-manifest/test/tsconfig.json diff --git a/pkg-manifest/exportable-manifest/tsconfig.json b/releasing/exportable-manifest/tsconfig.json similarity index 87% rename from pkg-manifest/exportable-manifest/tsconfig.json rename to releasing/exportable-manifest/tsconfig.json index e2ba4c52ec..e6f8e309b8 100644 --- a/pkg-manifest/exportable-manifest/tsconfig.json +++ b/releasing/exportable-manifest/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../__utils__/prepare" }, { - "path": "../../bins/package-bins" + "path": "../../bins/resolver" }, { "path": "../../catalogs/config" @@ -37,7 +37,7 @@ "path": "../../resolving/jsr-specifier-parser" }, { - "path": "../read-project-manifest" + "path": "../../workspace/project-manifest-reader" } ] } diff --git a/pkg-manifest/manifest-utils/tsconfig.lint.json b/releasing/exportable-manifest/tsconfig.lint.json similarity index 100% rename from pkg-manifest/manifest-utils/tsconfig.lint.json rename to releasing/exportable-manifest/tsconfig.lint.json diff --git a/renovate.json b/renovate.json index 752802cc15..1aa9ce4ba0 100644 --- a/renovate.json +++ b/renovate.json @@ -6,60 +6,60 @@ "ignoreDeps": [ "@pnpm/assert-project", "@pnpm/building.during-install", - "@pnpm/config", + "@pnpm/config.reader", "@pnpm/constants", "@pnpm/core-loggers", "@pnpm/default-fetcher", - "@pnpm/default-reporter", - "@pnpm/default-resolver", - "@pnpm/fetch", - "@pnpm/fetcher-base", + "@pnpm/cli.default-reporter", + "@pnpm/resolving.default-resolver", + "@pnpm/network.fetch", + "@pnpm/fetching.fetcher-base", "@pnpm/filter-lockfile", - "@pnpm/git-fetcher", - "@pnpm/git-resolver", - "@pnpm/headless", - "@pnpm/lifecycle", - "@pnpm/list", - "@pnpm/local-resolver", + "@pnpm/fetching.git-fetcher", + "@pnpm/resolving.git-resolver", + "@pnpm/installing.deps-restorer", + "@pnpm/exec.lifecycle", + "@pnpm/deps.inspection.list", + "@pnpm/resolving.local-resolver", "@pnpm/lockfile-file", "@pnpm/lockfile-types", "@pnpm/lockfile.utils", "@pnpm/logger", - "@pnpm/modules-cleaner", - "@pnpm/modules-yaml", + "@pnpm/installing.linking.modules-cleaner", + "@pnpm/installing.modules-yaml", "@pnpm/npm-registry-agent", - "@pnpm/npm-resolver", - "@pnpm/outdated", - "@pnpm/package-is-installable", - "@pnpm/package-requester", - "@pnpm/package-store", + "@pnpm/resolving.npm-resolver", + "@pnpm/deps.inspection.outdated", + "@pnpm/config.package-is-installable", + "@pnpm/installing.package-requester", + "@pnpm/store.controller", "@pnpm/pkgid-to-filename", "@pnpm/lockfile.pruner", - "@pnpm/read-projects-context", - "@pnpm/read-project-manifest", - "@pnpm/read-modules-dir", - "@pnpm/read-package-json", + "@pnpm/installing.read-projects-context", + "@pnpm/workspace.project-manifest-reader", + "@pnpm/fs.read-modules-dir", + "@pnpm/pkg-manifest.read-package-json", "@pnpm/registry-mock", - "@pnpm/resolve-dependencies", - "@pnpm/resolver-base", + "@pnpm/installing.resolve-dependencies", + "@pnpm/resolving.resolver-base", "@pnpm/server", - "@pnpm/hoist", - "@pnpm/store-controller-types", - "@pnpm/store-path", - "@pnpm/symlink-dependency", - "@pnpm/tarball-fetcher", - "@pnpm/tarball-resolver", + "@pnpm/installing.linking.hoist", + "@pnpm/store.controller-types", + "@pnpm/store.path", + "@pnpm/fs.symlink-dependency", + "@pnpm/fetching.tarball-fetcher", + "@pnpm/resolving.tarball-resolver", "@pnpm/types", "@pnpm/utils", - "@pnpm/write-project-manifest", - "dependencies-hierarchy", - "@pnpm/dependency-path", + "@pnpm/workspace.project-manifest-writer", + "tree-builder", + "@pnpm/deps.path", "fetch-from-npm-registry", "find-packages", "npm", "pkgs-graph", "remove-all-except-outer-links", - "@pnpm/core", + "@pnpm/installing.deps-installer", "ts-node", "@types/ramda", "@types/table" @@ -67,9 +67,9 @@ "ignorePaths": [ "fixtures", "test/", - "packages/dependencies-hierarchy/fixtures", - "packages/dependencies-hierarchy/fixtureWithLinks", - "packages/dependencies-hierarchy/example", + "packages/tree-builder/fixtures", + "packages/tree-builder/fixtureWithLinks", + "packages/tree-builder/example", "packages/list/test/", "packages/list/example/" ], diff --git a/resolving/bun-resolver/package.json b/resolving/bun-resolver/package.json index b5ab48abd6..5f40f8afff 100644 --- a/resolving/bun-resolver/package.json +++ b/resolving/bun-resolver/package.json @@ -34,13 +34,13 @@ "dependencies": { "@pnpm/constants": "workspace:*", "@pnpm/crypto.shasums-file": "workspace:*", + "@pnpm/engine.runtime.node.fetcher": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", - "@pnpm/fetching-types": "workspace:*", "@pnpm/fetching.binary-fetcher": "workspace:*", - "@pnpm/node.fetcher": "workspace:*", - "@pnpm/npm-resolver": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/fetching.types": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "semver": "catalog:" diff --git a/resolving/bun-resolver/src/index.ts b/resolving/bun-resolver/src/index.ts index 8b54152942..d415f37dce 100644 --- a/resolving/bun-resolver/src/index.ts +++ b/resolving/bun-resolver/src/index.ts @@ -1,8 +1,8 @@ import { getBunBinLocationForCurrentOS } from '@pnpm/constants' import { fetchShasumsFile } from '@pnpm/crypto.shasums-file' import { PnpmError } from '@pnpm/error' -import type { FetchFromRegistry } from '@pnpm/fetching-types' -import type { NpmResolver } from '@pnpm/npm-resolver' +import type { FetchFromRegistry } from '@pnpm/fetching.types' +import type { NpmResolver } from '@pnpm/resolving.npm-resolver' import type { BinaryResolution, PlatformAssetResolution, @@ -11,7 +11,7 @@ import type { ResolveResult, VariationsResolution, WantedDependency, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' import type { PkgResolutionId } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' diff --git a/resolving/bun-resolver/tsconfig.json b/resolving/bun-resolver/tsconfig.json index f61141661c..83a70e91f4 100644 --- a/resolving/bun-resolver/tsconfig.json +++ b/resolving/bun-resolver/tsconfig.json @@ -22,7 +22,7 @@ "path": "../../fetching/fetcher-base" }, { - "path": "../../fetching/fetching-types" + "path": "../../fetching/types" }, { "path": "../../packages/constants" diff --git a/resolving/default-resolver/package.json b/resolving/default-resolver/package.json index c9f541f8ae..94a1ff0011 100644 --- a/resolving/default-resolver/package.json +++ b/resolving/default-resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/default-resolver", + "name": "@pnpm/resolving.default-resolver", "version": "1002.2.12", "description": "pnpm's default package resolver", "keywords": [ @@ -33,26 +33,26 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/engine.runtime.node.resolver": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetching-types": "workspace:*", - "@pnpm/git-resolver": "workspace:*", + "@pnpm/fetching.types": "workspace:*", "@pnpm/hooks.types": "workspace:*", - "@pnpm/local-resolver": "workspace:*", - "@pnpm/node.resolver": "workspace:*", - "@pnpm/npm-resolver": "workspace:*", - "@pnpm/resolver-base": "workspace:*", "@pnpm/resolving.bun-resolver": "workspace:*", "@pnpm/resolving.deno-resolver": "workspace:*", - "@pnpm/tarball-resolver": "workspace:*", + "@pnpm/resolving.git-resolver": "workspace:*", + "@pnpm/resolving.local-resolver": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", + "@pnpm/resolving.tarball-resolver": "workspace:*", "@pnpm/types": "workspace:*" }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/cafs-types": "workspace:*", - "@pnpm/default-resolver": "workspace:*", - "@pnpm/fetch": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", - "@pnpm/tarball-fetcher": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/fetching.tarball-fetcher": "workspace:*", + "@pnpm/network.fetch": "workspace:*", + "@pnpm/resolving.default-resolver": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", "node-fetch": "catalog:" }, "engines": { diff --git a/resolving/default-resolver/src/index.ts b/resolving/default-resolver/src/index.ts index a05b230440..c329800edb 100644 --- a/resolving/default-resolver/src/index.ts +++ b/resolving/default-resolver/src/index.ts @@ -1,9 +1,11 @@ +import { type NodeRuntimeResolveResult, resolveNodeRuntime } from '@pnpm/engine.runtime.node.resolver' import { PnpmError } from '@pnpm/error' -import type { FetchFromRegistry, GetAuthHeader } from '@pnpm/fetching-types' -import { createGitResolver, type GitResolveResult } from '@pnpm/git-resolver' +import type { FetchFromRegistry, GetAuthHeader } from '@pnpm/fetching.types' import { checkCustomResolverCanResolve, type CustomResolver } from '@pnpm/hooks.types' -import { type LocalResolveResult, resolveFromLocal } from '@pnpm/local-resolver' -import { type NodeRuntimeResolveResult, resolveNodeRuntime } from '@pnpm/node.resolver' +import { type BunRuntimeResolveResult, resolveBunRuntime } from '@pnpm/resolving.bun-resolver' +import { type DenoRuntimeResolveResult, resolveDenoRuntime } from '@pnpm/resolving.deno-resolver' +import { createGitResolver, type GitResolveResult } from '@pnpm/resolving.git-resolver' +import { type LocalResolveResult, resolveFromLocal } from '@pnpm/resolving.local-resolver' import { createNpmResolver, type JsrResolveResult, @@ -13,16 +15,14 @@ import { type ResolveFromNpmOptions, type ResolverFactoryOptions, type WorkspaceResolveResult, -} from '@pnpm/npm-resolver' +} from '@pnpm/resolving.npm-resolver' import type { ResolveFunction, ResolveOptions, ResolveResult, WantedDependency, -} from '@pnpm/resolver-base' -import { type BunRuntimeResolveResult, resolveBunRuntime } from '@pnpm/resolving.bun-resolver' -import { type DenoRuntimeResolveResult, resolveDenoRuntime } from '@pnpm/resolving.deno-resolver' -import { resolveFromTarball, type TarballResolveResult } from '@pnpm/tarball-resolver' +} from '@pnpm/resolving.resolver-base' +import { resolveFromTarball, type TarballResolveResult } from '@pnpm/resolving.tarball-resolver' export type { PackageMeta, diff --git a/resolving/default-resolver/test/customResolver.ts b/resolving/default-resolver/test/customResolver.ts index 4a433f36e5..9f26eccdf2 100644 --- a/resolving/default-resolver/test/customResolver.ts +++ b/resolving/default-resolver/test/customResolver.ts @@ -1,7 +1,7 @@ /// import { jest } from '@jest/globals' -import { createResolver } from '@pnpm/default-resolver' import type { CustomResolver, WantedDependency } from '@pnpm/hooks.types' +import { createResolver } from '@pnpm/resolving.default-resolver' import { Response } from 'node-fetch' test('custom resolver intercepts matching packages', async () => { diff --git a/resolving/default-resolver/test/index.ts b/resolving/default-resolver/test/index.ts index 15828cf22f..e447d0a8ec 100644 --- a/resolving/default-resolver/test/index.ts +++ b/resolving/default-resolver/test/index.ts @@ -1,6 +1,6 @@ /// -import { createResolver } from '@pnpm/default-resolver' -import { createFetchFromRegistry } from '@pnpm/fetch' +import { createFetchFromRegistry } from '@pnpm/network.fetch' +import { createResolver } from '@pnpm/resolving.default-resolver' test('createResolver()', () => { const getAuthHeader = () => undefined diff --git a/resolving/default-resolver/tsconfig.json b/resolving/default-resolver/tsconfig.json index b3d5716ed5..06f95f0b25 100644 --- a/resolving/default-resolver/tsconfig.json +++ b/resolving/default-resolver/tsconfig.json @@ -16,10 +16,10 @@ "path": "../../fetching/fetcher-base" }, { - "path": "../../fetching/fetching-types" + "path": "../../fetching/tarball-fetcher" }, { - "path": "../../fetching/tarball-fetcher" + "path": "../../fetching/types" }, { "path": "../../hooks/types" diff --git a/resolving/deno-resolver/package.json b/resolving/deno-resolver/package.json index 490be9ed8c..15dae9d556 100644 --- a/resolving/deno-resolver/package.json +++ b/resolving/deno-resolver/package.json @@ -34,13 +34,13 @@ "dependencies": { "@pnpm/constants": "workspace:*", "@pnpm/crypto.shasums-file": "workspace:*", + "@pnpm/engine.runtime.node.fetcher": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", - "@pnpm/fetching-types": "workspace:*", "@pnpm/fetching.binary-fetcher": "workspace:*", - "@pnpm/node.fetcher": "workspace:*", - "@pnpm/npm-resolver": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/fetching.types": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "semver": "catalog:" diff --git a/resolving/deno-resolver/src/index.ts b/resolving/deno-resolver/src/index.ts index 7300c96445..263c068f2e 100644 --- a/resolving/deno-resolver/src/index.ts +++ b/resolving/deno-resolver/src/index.ts @@ -1,7 +1,7 @@ import { getDenoBinLocationForCurrentOS } from '@pnpm/constants' import { PnpmError } from '@pnpm/error' -import type { FetchFromRegistry } from '@pnpm/fetching-types' -import type { NpmResolver } from '@pnpm/npm-resolver' +import type { FetchFromRegistry } from '@pnpm/fetching.types' +import type { NpmResolver } from '@pnpm/resolving.npm-resolver' import type { BinaryResolution, PlatformAssetResolution, @@ -10,7 +10,7 @@ import type { ResolveResult, VariationsResolution, WantedDependency, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' import type { PkgResolutionId } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' diff --git a/resolving/deno-resolver/tsconfig.json b/resolving/deno-resolver/tsconfig.json index fa14b2172e..239fed66e3 100644 --- a/resolving/deno-resolver/tsconfig.json +++ b/resolving/deno-resolver/tsconfig.json @@ -22,7 +22,7 @@ "path": "../../fetching/fetcher-base" }, { - "path": "../../fetching/fetching-types" + "path": "../../fetching/types" }, { "path": "../../packages/constants" diff --git a/resolving/git-resolver/__mocks__/@pnpm/fetch.js b/resolving/git-resolver/__mocks__/@pnpm/fetch.js index 3cd956ef3a..a140553653 100644 --- a/resolving/git-resolver/__mocks__/@pnpm/fetch.js +++ b/resolving/git-resolver/__mocks__/@pnpm/fetch.js @@ -1,4 +1,4 @@ -module.exports = jest.createMockFromModule('@pnpm/fetch') +module.exports = jest.createMockFromModule('@pnpm/network.fetch') // default implementation module.exports.fetchWithAgent.mockImplementation(async (_url, _opts) => { diff --git a/resolving/git-resolver/example.js b/resolving/git-resolver/example.js index 08aaaaa1de..6bab621c15 100644 --- a/resolving/git-resolver/example.js +++ b/resolving/git-resolver/example.js @@ -1,5 +1,5 @@ 'use strict' -const createResolveFromNpm = require('@pnpm/git-resolver').default +const createResolveFromNpm = require('@pnpm/resolving.git-resolver').default const resolveFromNpm = createResolveFromNpm({}) diff --git a/resolving/git-resolver/package.json b/resolving/git-resolver/package.json index aace4e2e4a..7b9ae15b52 100644 --- a/resolving/git-resolver/package.json +++ b/resolving/git-resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/git-resolver", + "name": "@pnpm/resolving.git-resolver", "version": "1001.1.5", "description": "Resolver for git-hosted packages", "keywords": [ @@ -35,16 +35,16 @@ }, "dependencies": { "@pnpm/error": "workspace:*", - "@pnpm/fetch": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/network.fetch": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "graceful-git": "catalog:", "hosted-git-info": "catalog:", "semver": "catalog:" }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/git-resolver": "workspace:*", "@pnpm/network.agent": "catalog:", + "@pnpm/resolving.git-resolver": "workspace:*", "@types/hosted-git-info": "catalog:", "@types/is-windows": "catalog:", "@types/semver": "catalog:", diff --git a/resolving/git-resolver/src/createGitHostedPkgId.ts b/resolving/git-resolver/src/createGitHostedPkgId.ts index 1d586a13e4..51496f2c1a 100644 --- a/resolving/git-resolver/src/createGitHostedPkgId.ts +++ b/resolving/git-resolver/src/createGitHostedPkgId.ts @@ -1,4 +1,4 @@ -import type { PkgResolutionId } from '@pnpm/resolver-base' +import type { PkgResolutionId } from '@pnpm/resolving.resolver-base' export function createGitHostedPkgId ({ repo, commit, path }: { repo: string, commit: string, path?: string }): PkgResolutionId { let id = `${repo.includes('://') ? '' : 'https://'}${repo}#${commit}` diff --git a/resolving/git-resolver/src/index.ts b/resolving/git-resolver/src/index.ts index 5ce9c14daa..27ec96528f 100644 --- a/resolving/git-resolver/src/index.ts +++ b/resolving/git-resolver/src/index.ts @@ -1,6 +1,6 @@ import { PnpmError } from '@pnpm/error' import type { AgentOptions } from '@pnpm/network.agent' -import type { GitResolution, PkgResolutionId, ResolveOptions, ResolveResult, TarballResolution } from '@pnpm/resolver-base' +import type { GitResolution, PkgResolutionId, ResolveOptions, ResolveResult, TarballResolution } from '@pnpm/resolving.resolver-base' import { gracefulGit as git } from 'graceful-git' import semver from 'semver' diff --git a/resolving/git-resolver/src/parseBareSpecifier.ts b/resolving/git-resolver/src/parseBareSpecifier.ts index 5256bb5e4a..b9d401c633 100644 --- a/resolving/git-resolver/src/parseBareSpecifier.ts +++ b/resolving/git-resolver/src/parseBareSpecifier.ts @@ -1,8 +1,8 @@ // cspell:ignore sshurl import urlLib, { URL } from 'node:url' -import { fetchWithAgent } from '@pnpm/fetch' import type { AgentOptions } from '@pnpm/network.agent' +import { fetchWithAgent } from '@pnpm/network.fetch' import { gracefulGit as git } from 'graceful-git' import HostedGit from 'hosted-git-info' diff --git a/resolving/git-resolver/test/createGitHostedPkgId.test.ts b/resolving/git-resolver/test/createGitHostedPkgId.test.ts index 6a6f64dd25..a48cac25e1 100644 --- a/resolving/git-resolver/test/createGitHostedPkgId.test.ts +++ b/resolving/git-resolver/test/createGitHostedPkgId.test.ts @@ -1,4 +1,4 @@ -import { createGitHostedPkgId } from '@pnpm/git-resolver' +import { createGitHostedPkgId } from '@pnpm/resolving.git-resolver' test.each([ [{ repo: 'ssh://git@example.com/org/repo.git', commit: 'cba04669e621b85fbdb33371604de1a2898e68e9' }, 'git+ssh://git@example.com/org/repo.git#cba04669e621b85fbdb33371604de1a2898e68e9'], diff --git a/resolving/git-resolver/test/index.ts b/resolving/git-resolver/test/index.ts index a2d9a1f93b..0b49313efd 100644 --- a/resolving/git-resolver/test/index.ts +++ b/resolving/git-resolver/test/index.ts @@ -4,17 +4,17 @@ import path from 'node:path' import { jest } from '@jest/globals' import isWindows from 'is-windows' -const { fetchWithAgent: fetchWithAgentOriginal } = await import('@pnpm/fetch') -jest.unstable_mockModule('@pnpm/fetch', () => ({ +const { fetchWithAgent: fetchWithAgentOriginal } = await import('@pnpm/network.fetch') +jest.unstable_mockModule('@pnpm/network.fetch', () => ({ fetchWithAgent: jest.fn(), })) const { gracefulGit: gitOriginal } = await import('graceful-git') jest.unstable_mockModule('graceful-git', () => ({ gracefulGit: jest.fn(), })) -const { fetchWithAgent } = await import('@pnpm/fetch') +const { fetchWithAgent } = await import('@pnpm/network.fetch') const { gracefulGit: git } = await import('graceful-git') -const { createGitResolver } = await import('@pnpm/git-resolver') +const { createGitResolver } = await import('@pnpm/resolving.git-resolver') const resolveFromGit = createGitResolver({}) diff --git a/resolving/local-resolver/example.js b/resolving/local-resolver/example.js index 165386773c..a4566f578c 100644 --- a/resolving/local-resolver/example.js +++ b/resolving/local-resolver/example.js @@ -1,5 +1,5 @@ 'use strict' -const resolveFromLocal = require('@pnpm/local-resolver').default +const resolveFromLocal = require('@pnpm/resolving.local-resolver').default resolveFromLocal({bareSpecifier: './example-package'}, {prefix: process.cwd()}) .then(resolveResult => console.log(resolveResult)) diff --git a/resolving/local-resolver/package.json b/resolving/local-resolver/package.json index 10b49dccdd..b0056a9d86 100644 --- a/resolving/local-resolver/package.json +++ b/resolving/local-resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/local-resolver", + "name": "@pnpm/resolving.local-resolver", "version": "1002.1.4", "description": "Resolver for local packages", "keywords": [ @@ -36,9 +36,9 @@ "dependencies": { "@pnpm/crypto.hash": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/read-project-manifest": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "normalize-path": "catalog:" }, "peerDependencies": { @@ -46,8 +46,8 @@ }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/local-resolver": "workspace:*", "@pnpm/logger": "workspace:*", + "@pnpm/resolving.local-resolver": "workspace:*", "@types/normalize-path": "catalog:" }, "engines": { diff --git a/resolving/local-resolver/src/index.ts b/resolving/local-resolver/src/index.ts index e24e1feaa9..2e933df3ad 100644 --- a/resolving/local-resolver/src/index.ts +++ b/resolving/local-resolver/src/index.ts @@ -4,9 +4,9 @@ import path from 'node:path' import { getTarballIntegrity } from '@pnpm/crypto.hash' import { PnpmError } from '@pnpm/error' import { logger } from '@pnpm/logger' -import { readProjectManifestOnly } from '@pnpm/read-project-manifest' -import type { DirectoryResolution, Resolution, ResolveResult, TarballResolution } from '@pnpm/resolver-base' +import type { DirectoryResolution, Resolution, ResolveResult, TarballResolution } from '@pnpm/resolving.resolver-base' import type { DependencyManifest, PkgResolutionId } from '@pnpm/types' +import { readProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' import { parseBareSpecifier, type WantedLocalDependency } from './parseBareSpecifier.js' diff --git a/resolving/local-resolver/src/parseBareSpecifier.ts b/resolving/local-resolver/src/parseBareSpecifier.ts index 7d86ae14b1..469a83652e 100644 --- a/resolving/local-resolver/src/parseBareSpecifier.ts +++ b/resolving/local-resolver/src/parseBareSpecifier.ts @@ -2,7 +2,7 @@ import os from 'node:os' import path from 'node:path' import { PnpmError } from '@pnpm/error' -import type { PkgResolutionId } from '@pnpm/resolver-base' +import type { PkgResolutionId } from '@pnpm/resolving.resolver-base' import normalize from 'normalize-path' // @ts-expect-error diff --git a/resolving/local-resolver/test/index.ts b/resolving/local-resolver/test/index.ts index 1eb868c8b0..42920bb4a3 100644 --- a/resolving/local-resolver/test/index.ts +++ b/resolving/local-resolver/test/index.ts @@ -3,9 +3,9 @@ import { createRequire } from 'node:module' import path from 'node:path' import { jest } from '@jest/globals' -import { resolveFromLocal } from '@pnpm/local-resolver' import { logger } from '@pnpm/logger' -import type { DirectoryResolution } from '@pnpm/resolver-base' +import { resolveFromLocal } from '@pnpm/resolving.local-resolver' +import type { DirectoryResolution } from '@pnpm/resolving.resolver-base' import normalize from 'normalize-path' const require = createRequire(import.meta.dirname) @@ -15,7 +15,7 @@ test('resolve directory', async () => { const resolveResult = await resolveFromLocal({}, { bareSpecifier: '..' }, { projectDir: import.meta.dirname }) expect(resolveResult!.id).toBe('link:..') expect(resolveResult!.normalizedBareSpecifier).toBe('link:..') - expect(resolveResult!['manifest']!.name).toBe('@pnpm/local-resolver') + expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver') expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalize(path.join(import.meta.dirname, '..'))) expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory') }) @@ -26,7 +26,7 @@ test('resolve directory specified using absolute path', async () => { const resolveResult = await resolveFromLocal({}, { bareSpecifier: `link:${linkedDir}` }, { projectDir: import.meta.dirname }) expect(resolveResult!.id).toBe('link:..') expect(resolveResult!.normalizedBareSpecifier).toBe(`link:${normalizedLinkedDir}`) - expect(resolveResult!['manifest']!.name).toBe('@pnpm/local-resolver') + expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver') expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalizedLinkedDir) expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory') }) @@ -37,7 +37,7 @@ test('resolve directory specified using absolute path with preserveAbsolutePaths const resolveResult = await resolveFromLocal({ preserveAbsolutePaths: true }, { bareSpecifier: `link:${linkedDir}` }, { projectDir: import.meta.dirname }) expect(resolveResult!.id).toBe(`link:${normalizedLinkedDir}`) expect(resolveResult!.normalizedBareSpecifier).toBe(`link:${normalizedLinkedDir}`) - expect(resolveResult!['manifest']!.name).toBe('@pnpm/local-resolver') + expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver') expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalizedLinkedDir) expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory') }) @@ -52,7 +52,7 @@ test('resolve directory specified using absolute path with preserveAbsolutePaths ) expect(resolveResult!.id).toBe(`file:${normalizedLinkedDir}`) expect(resolveResult!.normalizedBareSpecifier).toBe(`file:${normalizedLinkedDir}`) - expect(resolveResult!['manifest']!.name).toBe('@pnpm/local-resolver') + expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver') expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalizedLinkedDir) expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory') }) @@ -61,7 +61,7 @@ test('resolve injected directory', async () => { const resolveResult = await resolveFromLocal({}, { injected: true, bareSpecifier: '..' }, { projectDir: import.meta.dirname }) expect(resolveResult!.id).toBe('file:..') expect(resolveResult!.normalizedBareSpecifier).toBe('file:..') - expect(resolveResult!['manifest']!.name).toBe('@pnpm/local-resolver') + expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver') expect((resolveResult!.resolution as DirectoryResolution).directory).toBe('..') expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory') }) @@ -70,7 +70,7 @@ test('resolve workspace directory', async () => { const resolveResult = await resolveFromLocal({}, { bareSpecifier: 'workspace:..' }, { projectDir: import.meta.dirname }) expect(resolveResult!.id).toBe('link:..') expect(resolveResult!.normalizedBareSpecifier).toBe('link:..') - expect(resolveResult!['manifest']!.name).toBe('@pnpm/local-resolver') + expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver') expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalize(path.join(import.meta.dirname, '..'))) expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory') }) @@ -79,7 +79,7 @@ test('resolve directory specified using the file: protocol', async () => { const resolveResult = await resolveFromLocal({}, { bareSpecifier: 'file:..' }, { projectDir: import.meta.dirname }) expect(resolveResult!.id).toBe('file:..') expect(resolveResult!.normalizedBareSpecifier).toBe('file:..') - expect(resolveResult!['manifest']!.name).toBe('@pnpm/local-resolver') + expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver') expect((resolveResult!.resolution as DirectoryResolution).directory).toBe('..') expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory') }) @@ -88,7 +88,7 @@ test('resolve directory specified using the link: protocol', async () => { const resolveResult = await resolveFromLocal({}, { bareSpecifier: 'link:..' }, { projectDir: import.meta.dirname }) expect(resolveResult!.id).toBe('link:..') expect(resolveResult!.normalizedBareSpecifier).toBe('link:..') - expect(resolveResult!['manifest']!.name).toBe('@pnpm/local-resolver') + expect(resolveResult!['manifest']!.name).toBe('@pnpm/resolving.local-resolver') expect((resolveResult!.resolution as DirectoryResolution).directory).toEqual(normalize(path.join(import.meta.dirname, '..'))) expect((resolveResult!.resolution as DirectoryResolution).type).toBe('directory') }) diff --git a/resolving/local-resolver/tsconfig.json b/resolving/local-resolver/tsconfig.json index 494cf1c010..f0e795386e 100644 --- a/resolving/local-resolver/tsconfig.json +++ b/resolving/local-resolver/tsconfig.json @@ -22,7 +22,7 @@ "path": "../../packages/types" }, { - "path": "../../pkg-manifest/read-project-manifest" + "path": "../../workspace/project-manifest-reader" }, { "path": "../resolver-base" diff --git a/resolving/npm-resolver/example.js b/resolving/npm-resolver/example.js index e8fc0c8e98..f052e93f41 100644 --- a/resolving/npm-resolver/example.js +++ b/resolving/npm-resolver/example.js @@ -1,5 +1,5 @@ 'use strict' -const createResolveFromNpm = require('@pnpm/npm-resolver').default +const createResolveFromNpm = require('@pnpm/resolving.npm-resolver').default const resolveFromNpm = createResolveFromNpm({ storeDir: '.store', diff --git a/resolving/npm-resolver/package.json b/resolving/npm-resolver/package.json index b1fcaef76c..ff21d3a1b2 100644 --- a/resolving/npm-resolver/package.json +++ b/resolving/npm-resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/npm-resolver", + "name": "@pnpm/resolving.npm-resolver", "version": "1004.4.1", "description": "Resolver for npm-hosted packages", "keywords": [ @@ -33,21 +33,21 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/config.pick-registry-for-package": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/core-loggers": "workspace:*", "@pnpm/crypto.hash": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetching-types": "workspace:*", - "@pnpm/graceful-fs": "workspace:*", - "@pnpm/pick-registry-for-package": "workspace:*", - "@pnpm/registry.pkg-metadata-filter": "workspace:*", - "@pnpm/registry.types": "workspace:*", - "@pnpm/resolve-workspace-range": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/fetching.types": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "@pnpm/resolving.jsr-specifier-parser": "workspace:*", + "@pnpm/resolving.registry.pkg-metadata-filter": "workspace:*", + "@pnpm/resolving.registry.types": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/store.cafs": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.range-resolver": "workspace:*", "@pnpm/workspace.spec-parser": "workspace:*", "@zkochan/retry": "catalog:", "encode-registry": "catalog:", @@ -70,9 +70,9 @@ }, "devDependencies": { "@pnpm/config.version-policy": "workspace:*", - "@pnpm/fetch": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/npm-resolver": "workspace:*", + "@pnpm/network.fetch": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/normalize-path": "catalog:", "@types/ramda": "catalog:", diff --git a/resolving/npm-resolver/src/fetch.ts b/resolving/npm-resolver/src/fetch.ts index 261f5d3dc2..a3d564ae1c 100644 --- a/resolving/npm-resolver/src/fetch.ts +++ b/resolving/npm-resolver/src/fetch.ts @@ -7,9 +7,9 @@ import { type FetchErrorResponse, PnpmError, } from '@pnpm/error' -import type { FetchFromRegistry, RetryTimeoutOptions } from '@pnpm/fetching-types' +import type { FetchFromRegistry, RetryTimeoutOptions } from '@pnpm/fetching.types' import { globalWarn } from '@pnpm/logger' -import type { PackageMeta } from '@pnpm/registry.types' +import type { PackageMeta } from '@pnpm/resolving.registry.types' import * as retry from '@zkochan/retry' interface RegistryResponse { @@ -99,7 +99,7 @@ export async function fetchMetadataFromFromRegistry ( } // Here we only retry broken JSON responses. - // Other HTTP issues are retried by the @pnpm/fetch library + // Other HTTP issues are retried by the @pnpm/network.fetch library try { const jsonText = await response.text() const meta = JSON.parse(jsonText) as PackageMeta diff --git a/resolving/npm-resolver/src/index.ts b/resolving/npm-resolver/src/index.ts index cf21afe879..9c21789c5e 100644 --- a/resolving/npm-resolver/src/index.ts +++ b/resolving/npm-resolver/src/index.ts @@ -1,14 +1,13 @@ import path from 'node:path' +import { pickRegistryForPackage } from '@pnpm/config.pick-registry-for-package' import { PnpmError } from '@pnpm/error' import type { FetchFromRegistry, GetAuthHeader, RetryTimeoutOptions, -} from '@pnpm/fetching-types' -import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package' -import type { PackageInRegistry, PackageMeta } from '@pnpm/registry.types' -import { resolveWorkspaceRange } from '@pnpm/resolve-workspace-range' +} from '@pnpm/fetching.types' +import type { PackageInRegistry, PackageMeta } from '@pnpm/resolving.registry.types' import type { DirectoryResolution, PkgResolutionId, @@ -19,7 +18,7 @@ import type { WorkspacePackage, WorkspacePackages, WorkspacePackagesByVersion, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' import { storeIndexKey } from '@pnpm/store.index' import type { DependencyManifest, @@ -31,6 +30,7 @@ import type { import { readPkgFromCafs, } from '@pnpm/worker' +import { resolveWorkspaceRange } from '@pnpm/workspace.range-resolver' import { LRUCache } from 'lru-cache' import normalize from 'normalize-path' import pMemoize from 'p-memoize' diff --git a/resolving/npm-resolver/src/pickPackage.ts b/resolving/npm-resolver/src/pickPackage.ts index 37422caf62..aa9a3c2c29 100644 --- a/resolving/npm-resolver/src/pickPackage.ts +++ b/resolving/npm-resolver/src/pickPackage.ts @@ -4,9 +4,9 @@ import path from 'node:path' import { ABBREVIATED_META_DIR, FULL_FILTERED_META_DIR, FULL_META_DIR } from '@pnpm/constants' import { createHexHash } from '@pnpm/crypto.hash' import { PnpmError } from '@pnpm/error' -import gfs from '@pnpm/graceful-fs' +import gfs from '@pnpm/fs.graceful-fs' import { logger } from '@pnpm/logger' -import type { PackageInRegistry, PackageMeta } from '@pnpm/registry.types' +import type { PackageInRegistry, PackageMeta } from '@pnpm/resolving.registry.types' import getRegistryName from 'encode-registry' import pLimit, { type LimitFunction } from 'p-limit' import { fastPathTemp as pathTemp } from 'path-temp' diff --git a/resolving/npm-resolver/src/pickPackageFromMeta.ts b/resolving/npm-resolver/src/pickPackageFromMeta.ts index 815dc0b9f1..2eb018d2c5 100644 --- a/resolving/npm-resolver/src/pickPackageFromMeta.ts +++ b/resolving/npm-resolver/src/pickPackageFromMeta.ts @@ -1,9 +1,9 @@ import util from 'node:util' import { PnpmError } from '@pnpm/error' -import { filterPkgMetadataByPublishDate } from '@pnpm/registry.pkg-metadata-filter' -import type { PackageInRegistry, PackageMeta, PackageMetaWithTime } from '@pnpm/registry.types' -import type { VersionSelectors } from '@pnpm/resolver-base' +import { filterPkgMetadataByPublishDate } from '@pnpm/resolving.registry.pkg-metadata-filter' +import type { PackageInRegistry, PackageMeta, PackageMetaWithTime } from '@pnpm/resolving.registry.types' +import type { VersionSelectors } from '@pnpm/resolving.resolver-base' import type { PackageVersionPolicy } from '@pnpm/types' import semver from 'semver' diff --git a/resolving/npm-resolver/src/trustChecks.ts b/resolving/npm-resolver/src/trustChecks.ts index b6edb00ee5..5a972adc0f 100644 --- a/resolving/npm-resolver/src/trustChecks.ts +++ b/resolving/npm-resolver/src/trustChecks.ts @@ -1,5 +1,5 @@ import { PnpmError } from '@pnpm/error' -import type { PackageInRegistry, PackageMeta, PackageMetaWithTime } from '@pnpm/registry.types' +import type { PackageInRegistry, PackageMeta, PackageMetaWithTime } from '@pnpm/resolving.registry.types' import type { PackageVersionPolicy } from '@pnpm/types' import semver from 'semver' diff --git a/resolving/npm-resolver/test/distTagsByDate.test.ts b/resolving/npm-resolver/test/distTagsByDate.test.ts index 6b7f033ed1..6f47403af3 100644 --- a/resolving/npm-resolver/test/distTagsByDate.test.ts +++ b/resolving/npm-resolver/test/distTagsByDate.test.ts @@ -1,5 +1,5 @@ -import { createFetchFromRegistry } from '@pnpm/fetch' -import { createNpmResolver } from '@pnpm/npm-resolver' +import { createFetchFromRegistry } from '@pnpm/network.fetch' +import { createNpmResolver } from '@pnpm/resolving.npm-resolver' import type { Registries } from '@pnpm/types' import nock from 'nock' import { temporaryDirectory } from 'tempy' diff --git a/resolving/npm-resolver/test/index.ts b/resolving/npm-resolver/test/index.ts index 5ed585fbf6..e7bef14c19 100644 --- a/resolving/npm-resolver/test/index.ts +++ b/resolving/npm-resolver/test/index.ts @@ -5,12 +5,12 @@ import path from 'node:path' import { ABBREVIATED_META_DIR } from '@pnpm/constants' import { createHexHash } from '@pnpm/crypto.hash' import { PnpmError } from '@pnpm/error' -import { createFetchFromRegistry } from '@pnpm/fetch' +import { createFetchFromRegistry } from '@pnpm/network.fetch' import { createNpmResolver, NoMatchingVersionError, RegistryResponseError, -} from '@pnpm/npm-resolver' +} from '@pnpm/resolving.npm-resolver' import { fixtures } from '@pnpm/test-fixtures' import type { ProjectRootDir, Registries } from '@pnpm/types' import { loadJsonFileSync } from 'load-json-file' diff --git a/resolving/npm-resolver/test/optionalDependencies.test.ts b/resolving/npm-resolver/test/optionalDependencies.test.ts index 34ea9ba325..88eebb359a 100644 --- a/resolving/npm-resolver/test/optionalDependencies.test.ts +++ b/resolving/npm-resolver/test/optionalDependencies.test.ts @@ -1,6 +1,6 @@ /// -import { createFetchFromRegistry } from '@pnpm/fetch' -import { createNpmResolver } from '@pnpm/npm-resolver' +import { createFetchFromRegistry } from '@pnpm/network.fetch' +import { createNpmResolver } from '@pnpm/resolving.npm-resolver' import type { Registries } from '@pnpm/types' import nock from 'nock' import { temporaryDirectory } from 'tempy' diff --git a/resolving/npm-resolver/test/publishedBy.test.ts b/resolving/npm-resolver/test/publishedBy.test.ts index 67853e9ffc..692a828c7a 100644 --- a/resolving/npm-resolver/test/publishedBy.test.ts +++ b/resolving/npm-resolver/test/publishedBy.test.ts @@ -2,8 +2,8 @@ import fs from 'node:fs' import path from 'node:path' import { FULL_FILTERED_META_DIR } from '@pnpm/constants' -import { createFetchFromRegistry } from '@pnpm/fetch' -import { createNpmResolver } from '@pnpm/npm-resolver' +import { createFetchFromRegistry } from '@pnpm/network.fetch' +import { createNpmResolver } from '@pnpm/resolving.npm-resolver' import { fixtures } from '@pnpm/test-fixtures' import type { Registries } from '@pnpm/types' import { loadJsonFileSync } from 'load-json-file' diff --git a/resolving/npm-resolver/test/resolveJsr.test.ts b/resolving/npm-resolver/test/resolveJsr.test.ts index 6ce789af8f..b8141c283d 100644 --- a/resolving/npm-resolver/test/resolveJsr.test.ts +++ b/resolving/npm-resolver/test/resolveJsr.test.ts @@ -1,8 +1,8 @@ import path from 'node:path' import { ABBREVIATED_META_DIR } from '@pnpm/constants' -import { createFetchFromRegistry } from '@pnpm/fetch' -import { createNpmResolver } from '@pnpm/npm-resolver' +import { createFetchFromRegistry } from '@pnpm/network.fetch' +import { createNpmResolver } from '@pnpm/resolving.npm-resolver' import { fixtures } from '@pnpm/test-fixtures' import type { Registries } from '@pnpm/types' import { loadJsonFileSync } from 'load-json-file' diff --git a/resolving/npm-resolver/test/trustChecks.test.ts b/resolving/npm-resolver/test/trustChecks.test.ts index e03030b847..4a30d0f7ae 100644 --- a/resolving/npm-resolver/test/trustChecks.test.ts +++ b/resolving/npm-resolver/test/trustChecks.test.ts @@ -1,5 +1,5 @@ import { createPackageVersionPolicy } from '@pnpm/config.version-policy' -import type { PackageInRegistry, PackageMetaWithTime } from '@pnpm/registry.types' +import type { PackageInRegistry, PackageMetaWithTime } from '@pnpm/resolving.registry.types' import { failIfTrustDowngraded, getTrustEvidence } from '../src/trustChecks.js' diff --git a/resolving/npm-resolver/tsconfig.json b/resolving/npm-resolver/tsconfig.json index 5979c4bcbf..e15be911a1 100644 --- a/resolving/npm-resolver/tsconfig.json +++ b/resolving/npm-resolver/tsconfig.json @@ -22,7 +22,7 @@ "path": "../../crypto/hash" }, { - "path": "../../fetching/fetching-types" + "path": "../../fetching/types" }, { "path": "../../fs/graceful-fs" @@ -55,7 +55,7 @@ "path": "../../worker" }, { - "path": "../../workspace/resolve-workspace-range" + "path": "../../workspace/range-resolver" }, { "path": "../../workspace/spec-parser" diff --git a/resolving/parse-wanted-dependency/package.json b/resolving/parse-wanted-dependency/package.json index d5c16954e9..347b9c7874 100644 --- a/resolving/parse-wanted-dependency/package.json +++ b/resolving/parse-wanted-dependency/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/parse-wanted-dependency", + "name": "@pnpm/resolving.parse-wanted-dependency", "version": "1001.0.0", "description": "Parse dependency specifier", "keywords": [ @@ -33,7 +33,7 @@ "validate-npm-package-name": "catalog:" }, "devDependencies": { - "@pnpm/parse-wanted-dependency": "workspace:*", + "@pnpm/resolving.parse-wanted-dependency": "workspace:*", "@types/validate-npm-package-name": "catalog:" }, "engines": { diff --git a/resolving/registry/pkg-metadata-filter/package.json b/resolving/registry/pkg-metadata-filter/package.json index 53b3bd5453..1cb787290f 100644 --- a/resolving/registry/pkg-metadata-filter/package.json +++ b/resolving/registry/pkg-metadata-filter/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/registry.pkg-metadata-filter", + "name": "@pnpm/resolving.registry.pkg-metadata-filter", "version": "1000.1.1", "description": "Filters the package metadata from the registry", "keywords": [ @@ -33,7 +33,7 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/registry.types": "workspace:*", + "@pnpm/resolving.registry.types": "workspace:*", "semver": "catalog:" }, "peerDependencies": { @@ -41,7 +41,7 @@ }, "devDependencies": { "@pnpm/logger": "workspace:*", - "@pnpm/registry.pkg-metadata-filter": "workspace:*", + "@pnpm/resolving.registry.pkg-metadata-filter": "workspace:*", "@types/semver": "catalog:" }, "engines": { diff --git a/resolving/registry/pkg-metadata-filter/src/index.ts b/resolving/registry/pkg-metadata-filter/src/index.ts index f79843ce95..43df3c9400 100644 --- a/resolving/registry/pkg-metadata-filter/src/index.ts +++ b/resolving/registry/pkg-metadata-filter/src/index.ts @@ -1,5 +1,5 @@ import { globalWarn } from '@pnpm/logger' -import type { PackageMetadataWithTime } from '@pnpm/registry.types' +import type { PackageMetadataWithTime } from '@pnpm/resolving.registry.types' import semver from 'semver' export function filterPkgMetadataByPublishDate ( diff --git a/resolving/registry/pkg-metadata-filter/test/index.ts b/resolving/registry/pkg-metadata-filter/test/index.ts index f0a0d6496a..e7f27eda5d 100644 --- a/resolving/registry/pkg-metadata-filter/test/index.ts +++ b/resolving/registry/pkg-metadata-filter/test/index.ts @@ -1,4 +1,4 @@ -import { filterPkgMetadataByPublishDate } from '@pnpm/registry.pkg-metadata-filter' +import { filterPkgMetadataByPublishDate } from '@pnpm/resolving.registry.pkg-metadata-filter' test('filterPkgMetadataByPublishDate', () => { const cutoff = new Date('2020-04-01T00:00:00.000Z') diff --git a/resolving/registry/types/package.json b/resolving/registry/types/package.json index e03cf38b22..441e324691 100644 --- a/resolving/registry/types/package.json +++ b/resolving/registry/types/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/registry.types", + "name": "@pnpm/resolving.registry.types", "version": "1000.0.1", "description": "Types related to the npm registry", "keywords": [ @@ -34,7 +34,7 @@ "@pnpm/types": "workspace:*" }, "devDependencies": { - "@pnpm/registry.types": "workspace:*" + "@pnpm/resolving.registry.types": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/resolving/resolver-base/package.json b/resolving/resolver-base/package.json index bc0b17c950..18f2ede7b8 100644 --- a/resolving/resolver-base/package.json +++ b/resolving/resolver-base/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/resolver-base", + "name": "@pnpm/resolving.resolver-base", "version": "1005.1.0", "description": "Types for pnpm-compatible resolvers", "keywords": [ @@ -35,7 +35,7 @@ "@pnpm/types": "workspace:*" }, "devDependencies": { - "@pnpm/resolver-base": "workspace:*" + "@pnpm/resolving.resolver-base": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/resolving/tarball-resolver/example.js b/resolving/tarball-resolver/example.js index f12d2fa210..7872b8eef9 100644 --- a/resolving/tarball-resolver/example.js +++ b/resolving/tarball-resolver/example.js @@ -1,5 +1,5 @@ 'use strict' -const resolveFromTarball = require('@pnpm/tarball-resolver').default +const resolveFromTarball = require('@pnpm/resolving.tarball-resolver').default resolveFromTarball({bareSpecifier: 'http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz'}) .then(resolveResult => console.log(JSON.stringify(resolveResult, null, 2))) diff --git a/resolving/tarball-resolver/package.json b/resolving/tarball-resolver/package.json index 43cd0731da..c705d0323b 100644 --- a/resolving/tarball-resolver/package.json +++ b/resolving/tarball-resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/tarball-resolver", + "name": "@pnpm/resolving.tarball-resolver", "version": "1002.1.4", "description": "Resolver for tarball dependencies", "keywords": [ @@ -32,12 +32,12 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/fetching-types": "workspace:*", - "@pnpm/resolver-base": "workspace:*" + "@pnpm/fetching.types": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*" }, "devDependencies": { - "@pnpm/fetch": "workspace:*", - "@pnpm/tarball-resolver": "workspace:*" + "@pnpm/network.fetch": "workspace:*", + "@pnpm/resolving.tarball-resolver": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/resolving/tarball-resolver/src/index.ts b/resolving/tarball-resolver/src/index.ts index 4d385e3983..453df4977d 100644 --- a/resolving/tarball-resolver/src/index.ts +++ b/resolving/tarball-resolver/src/index.ts @@ -1,5 +1,5 @@ -import type { FetchFromRegistry } from '@pnpm/fetching-types' -import type { PkgResolutionId, ResolveResult, TarballResolution } from '@pnpm/resolver-base' +import type { FetchFromRegistry } from '@pnpm/fetching.types' +import type { PkgResolutionId, ResolveResult, TarballResolution } from '@pnpm/resolving.resolver-base' export interface TarballResolveResult extends ResolveResult { normalizedBareSpecifier: string diff --git a/resolving/tarball-resolver/test/index.ts b/resolving/tarball-resolver/test/index.ts index e5799a62a4..cffb241061 100644 --- a/resolving/tarball-resolver/test/index.ts +++ b/resolving/tarball-resolver/test/index.ts @@ -1,7 +1,7 @@ /// // cspell:ignore buildserver -import { createFetchFromRegistry } from '@pnpm/fetch' -import { resolveFromTarball as _resolveFromTarball } from '@pnpm/tarball-resolver' +import { createFetchFromRegistry } from '@pnpm/network.fetch' +import { resolveFromTarball as _resolveFromTarball } from '@pnpm/resolving.tarball-resolver' const fetch = createFetchFromRegistry({}) const resolveFromTarball = _resolveFromTarball.bind(null, fetch) diff --git a/resolving/tarball-resolver/tsconfig.json b/resolving/tarball-resolver/tsconfig.json index ef7cbfe923..83619e621a 100644 --- a/resolving/tarball-resolver/tsconfig.json +++ b/resolving/tarball-resolver/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../fetching/fetching-types" + "path": "../../fetching/types" }, { "path": "../../network/fetch" diff --git a/shell/path/package.json b/shell/path/package.json index fead5f5897..3b49d9a0b5 100644 --- a/shell/path/package.json +++ b/shell/path/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/env.path", + "name": "@pnpm/shell.path", "version": "1000.0.0", "description": "Functions for changing PATH env variable", "keywords": [ @@ -35,7 +35,7 @@ "path-name": "catalog:" }, "devDependencies": { - "@pnpm/env.path": "workspace:*" + "@pnpm/shell.path": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/shell/path/test/index.ts b/shell/path/test/index.ts index c1243b3257..c4b428bfc3 100644 --- a/shell/path/test/index.ts +++ b/shell/path/test/index.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { prependDirsToPath } from '@pnpm/env.path' +import { prependDirsToPath } from '@pnpm/shell.path' import PATH from 'path-name' test('prependDirsToPath', () => { diff --git a/store/cafs-types/package.json b/store/cafs-types/package.json index ac17577eec..ba897349a6 100644 --- a/store/cafs-types/package.json +++ b/store/cafs-types/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/cafs-types", + "name": "@pnpm/store.cafs-types", "version": "1000.0.0", "description": "Types for the cafs", "keywords": [ @@ -31,7 +31,7 @@ "lint": "eslint \"src/**/*.ts\"" }, "devDependencies": { - "@pnpm/cafs-types": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", "@pnpm/types": "workspace:*", "@types/ssri": "catalog:" }, diff --git a/store/cafs/package.json b/store/cafs/package.json index eecc9c7b5e..50cb13dd75 100644 --- a/store/cafs/package.json +++ b/store/cafs/package.json @@ -32,9 +32,9 @@ }, "dependencies": { "@pnpm/error": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", - "@pnpm/graceful-fs": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "catalog:", "is-gzip": "catalog:", @@ -45,8 +45,8 @@ "strip-bom": "catalog:" }, "devDependencies": { - "@pnpm/cafs-types": "workspace:*", "@pnpm/store.cafs": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/is-gzip": "catalog:", "@types/node": "catalog:", diff --git a/store/cafs/src/addFilesFromDir.ts b/store/cafs/src/addFilesFromDir.ts index e435a65eae..35e06040a0 100644 --- a/store/cafs/src/addFilesFromDir.ts +++ b/store/cafs/src/addFilesFromDir.ts @@ -2,12 +2,12 @@ import fs, { type Stats } from 'node:fs' import path from 'node:path' import util from 'node:util' +import gfs from '@pnpm/fs.graceful-fs' import type { AddToStoreResult, FilesIndex, FileWriteResult, -} from '@pnpm/cafs-types' -import gfs from '@pnpm/graceful-fs' +} from '@pnpm/store.cafs-types' import type { DependencyManifest } from '@pnpm/types' import { isSubdir } from 'is-subdir' diff --git a/store/cafs/src/addFilesFromTarball.ts b/store/cafs/src/addFilesFromTarball.ts index 345015e7e1..5373f87054 100644 --- a/store/cafs/src/addFilesFromTarball.ts +++ b/store/cafs/src/addFilesFromTarball.ts @@ -4,7 +4,7 @@ import type { AddToStoreResult, FilesIndex, FileWriteResult, -} from '@pnpm/cafs-types' +} from '@pnpm/store.cafs-types' import type { DependencyManifest } from '@pnpm/types' import isGzip from 'is-gzip' diff --git a/store/cafs/src/checkPkgFilesIntegrity.ts b/store/cafs/src/checkPkgFilesIntegrity.ts index aa2fd93e04..c43ce46857 100644 --- a/store/cafs/src/checkPkgFilesIntegrity.ts +++ b/store/cafs/src/checkPkgFilesIntegrity.ts @@ -2,9 +2,9 @@ import crypto from 'node:crypto' import fs from 'node:fs' import util from 'node:util' -import type { FilesMap, PackageFileInfo, PackageFiles, SideEffects } from '@pnpm/cafs-types' import { PnpmError } from '@pnpm/error' -import gfs from '@pnpm/graceful-fs' +import gfs from '@pnpm/fs.graceful-fs' +import type { FilesMap, PackageFileInfo, PackageFiles, SideEffects } from '@pnpm/store.cafs-types' import type { BundledManifest } from '@pnpm/types' import { rimrafSync } from '@zkochan/rimraf' diff --git a/store/cafs/src/index.ts b/store/cafs/src/index.ts index f0bf1f67c7..c70453bdcf 100644 --- a/store/cafs/src/index.ts +++ b/store/cafs/src/index.ts @@ -8,7 +8,7 @@ import type { PackageFiles, SideEffects, SideEffectsDiff, -} from '@pnpm/cafs-types' +} from '@pnpm/store.cafs-types' import { addFilesFromDir } from './addFilesFromDir.js' import { addFilesFromTarball } from './addFilesFromTarball.js' diff --git a/store/cafs/src/writeFile.ts b/store/cafs/src/writeFile.ts index 3e773bafeb..01eedfa759 100644 --- a/store/cafs/src/writeFile.ts +++ b/store/cafs/src/writeFile.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import fs from '@pnpm/graceful-fs' +import fs from '@pnpm/fs.graceful-fs' const dirs = new Set() diff --git a/store/cafs/tsconfig.json b/store/cafs/tsconfig.json index 6c98976975..797bfebd27 100644 --- a/store/cafs/tsconfig.json +++ b/store/cafs/tsconfig.json @@ -28,7 +28,7 @@ "path": "../cafs-types" }, { - "path": "../store-controller-types" + "path": "../controller-types" } ] } diff --git a/store/commands/package.json b/store/commands/package.json index 2f2325c47b..ffcd691dc5 100644 --- a/store/commands/package.json +++ b/store/commands/package.json @@ -32,25 +32,25 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-utils": "workspace:*", - "@pnpm/client": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.normalize-registries": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/crypto.integrity": "workspace:*", - "@pnpm/dependency-path": "workspace:*", + "@pnpm/deps.path": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/get-context": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "@pnpm/global.packages": "workspace:*", - "@pnpm/graceful-fs": "workspace:*", + "@pnpm/installing.client": "workspace:*", + "@pnpm/installing.context": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/normalize-registries": "workspace:*", "@pnpm/object.key-sorting": "workspace:*", - "@pnpm/parse-wanted-dependency": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", - "@pnpm/store-path": "workspace:*", + "@pnpm/resolving.parse-wanted-dependency": "workspace:*", "@pnpm/store.cafs": "workspace:*", + "@pnpm/store.connection-manager": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/store.index": "workspace:*", + "@pnpm/store.path": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "archy": "catalog:", @@ -67,13 +67,13 @@ "@jest/globals": "catalog:", "@pnpm/assert-store": "workspace:*", "@pnpm/constants": "workspace:*", + "@pnpm/exec.commands": "workspace:*", "@pnpm/lockfile.fs": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/package-store": "workspace:*", - "@pnpm/plugin-commands-script-runners": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/store.commands": "workspace:*", + "@pnpm/store.controller": "workspace:*", "@types/archy": "catalog:", "@types/ramda": "catalog:", "@types/ssri": "catalog:", diff --git a/store/commands/src/inspecting/catFile.ts b/store/commands/src/inspecting/catFile.ts index ff935af750..04e2041fe1 100644 --- a/store/commands/src/inspecting/catFile.ts +++ b/store/commands/src/inspecting/catFile.ts @@ -1,10 +1,10 @@ import path from 'node:path' import util from 'node:util' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' -import gfs from '@pnpm/graceful-fs' -import { getStorePath } from '@pnpm/store-path' +import gfs from '@pnpm/fs.graceful-fs' +import { getStorePath } from '@pnpm/store.path' import { renderHelp } from 'render-help' const INTEGRITY_REGEX: RegExp = /^[^-]+-([a-z0-9+/=]+)$/i diff --git a/store/commands/src/inspecting/catIndex.ts b/store/commands/src/inspecting/catIndex.ts index f0e4f7800a..4b0424e054 100644 --- a/store/commands/src/inspecting/catIndex.ts +++ b/store/commands/src/inspecting/catIndex.ts @@ -1,14 +1,14 @@ import util from 'node:util' -import { createResolver } from '@pnpm/client' -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' +import { createResolver } from '@pnpm/installing.client' import type { TarballResolution } from '@pnpm/lockfile.types' import { sortDeepKeys } from '@pnpm/object.key-sorting' -import { parseWantedDependency } from '@pnpm/parse-wanted-dependency' +import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency' import type { PackageFilesIndex } from '@pnpm/store.cafs' import { StoreIndex, storeIndexKey } from '@pnpm/store.index' -import { getStorePath } from '@pnpm/store-path' +import { getStorePath } from '@pnpm/store.path' import { lexCompare } from '@pnpm/util.lex-comparator' import { renderHelp } from 'render-help' diff --git a/store/commands/src/inspecting/findHash.ts b/store/commands/src/inspecting/findHash.ts index 225f7e569e..6f5fea6481 100644 --- a/store/commands/src/inspecting/findHash.ts +++ b/store/commands/src/inspecting/findHash.ts @@ -1,8 +1,8 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' import type { PackageFilesIndex } from '@pnpm/store.cafs' import { StoreIndex } from '@pnpm/store.index' -import { getStorePath } from '@pnpm/store-path' +import { getStorePath } from '@pnpm/store.path' import chalk from 'chalk' import { renderHelp } from 'render-help' diff --git a/store/commands/src/store/store.ts b/store/commands/src/store/store.ts index f19e42e20c..7be141538e 100644 --- a/store/commands/src/store/store.ts +++ b/store/commands/src/store/store.ts @@ -1,9 +1,9 @@ -import { docsUrl } from '@pnpm/cli-utils' -import { type Config, types as allTypes } from '@pnpm/config' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, types as allTypes } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' import { type LogBase, logger } from '@pnpm/logger' -import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager' -import { getStorePath } from '@pnpm/store-path' +import { createStoreController, type CreateStoreControllerOptions } from '@pnpm/store.connection-manager' +import { getStorePath } from '@pnpm/store.path' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/store/commands/src/store/storeAdd.ts b/store/commands/src/store/storeAdd.ts index 4432fcc83f..caee0e179a 100644 --- a/store/commands/src/store/storeAdd.ts +++ b/store/commands/src/store/storeAdd.ts @@ -1,7 +1,7 @@ import { PnpmError } from '@pnpm/error' import { globalInfo, logger, streamParser } from '@pnpm/logger' -import { parseWantedDependency } from '@pnpm/parse-wanted-dependency' -import type { StoreController } from '@pnpm/store-controller-types' +import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency' +import type { StoreController } from '@pnpm/store.controller-types' import type { SupportedArchitectures } from '@pnpm/types' import type { ReporterFunction } from './types.js' diff --git a/store/commands/src/store/storePrune.ts b/store/commands/src/store/storePrune.ts index 2d95f0c6d7..0f0c711d21 100644 --- a/store/commands/src/store/storePrune.ts +++ b/store/commands/src/store/storePrune.ts @@ -1,6 +1,6 @@ import { cleanOrphanedInstallDirs } from '@pnpm/global.packages' import { streamParser } from '@pnpm/logger' -import type { StoreController } from '@pnpm/store-controller-types' +import type { StoreController } from '@pnpm/store.controller-types' import { cleanExpiredDlxCache } from './cleanExpiredDlxCache.js' import type { ReporterFunction } from './types.js' diff --git a/store/commands/src/store/storeStatus/extendStoreStatusOptions.ts b/store/commands/src/store/storeStatus/extendStoreStatusOptions.ts index b036ae05a2..47fd8d8b10 100644 --- a/store/commands/src/store/storeStatus/extendStoreStatusOptions.ts +++ b/store/commands/src/store/storeStatus/extendStoreStatusOptions.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { DEFAULT_REGISTRIES, normalizeRegistries } from '@pnpm/normalize-registries' +import { DEFAULT_REGISTRIES, normalizeRegistries } from '@pnpm/config.normalize-registries' import type { Registries } from '@pnpm/types' import type { ReporterFunction } from '../types.js' diff --git a/store/commands/src/store/storeStatus/index.ts b/store/commands/src/store/storeStatus/index.ts index aef515f23e..378b547bbf 100644 --- a/store/commands/src/store/storeStatus/index.ts +++ b/store/commands/src/store/storeStatus/index.ts @@ -1,8 +1,8 @@ import path from 'node:path' import { formatIntegrity } from '@pnpm/crypto.integrity' -import * as dp from '@pnpm/dependency-path' -import { getContextForSingleImporter } from '@pnpm/get-context' +import * as dp from '@pnpm/deps.path' +import { getContextForSingleImporter } from '@pnpm/installing.context' import { nameVerFromPkgSnapshot, packageIdFromSnapshot, @@ -10,9 +10,9 @@ import { } from '@pnpm/lockfile.utils' import { streamParser } from '@pnpm/logger' import type { PackageFilesIndex } from '@pnpm/store.cafs' +import type { TarballResolution } from '@pnpm/store.controller-types' import { gitHostedStoreIndexKey, storeIndexKey } from '@pnpm/store.index' import { StoreIndex } from '@pnpm/store.index' -import type { TarballResolution } from '@pnpm/store-controller-types' import type { DepPath } from '@pnpm/types' import dint from 'dint' import pFilter from 'p-filter' diff --git a/store/commands/test/inspecting/catFile.ts b/store/commands/test/inspecting/catFile.ts index 25604112f0..52271f17a6 100644 --- a/store/commands/test/inspecting/catFile.ts +++ b/store/commands/test/inspecting/catFile.ts @@ -1,7 +1,7 @@ /// import path from 'node:path' -import { getConfig } from '@pnpm/config' +import { getConfig } from '@pnpm/config.reader' import type { PnpmError } from '@pnpm/error' import { prepare } from '@pnpm/prepare' import { catFile } from '@pnpm/store.commands' diff --git a/store/commands/test/inspecting/catIndex.ts b/store/commands/test/inspecting/catIndex.ts index b27c7c1983..3bf614575c 100644 --- a/store/commands/test/inspecting/catIndex.ts +++ b/store/commands/test/inspecting/catIndex.ts @@ -1,7 +1,7 @@ /// import path from 'node:path' -import { getConfig } from '@pnpm/config' +import { getConfig } from '@pnpm/config.reader' import type { PnpmError } from '@pnpm/error' import { prepare } from '@pnpm/prepare' import { catIndex } from '@pnpm/store.commands' diff --git a/store/commands/test/inspecting/findHash.ts b/store/commands/test/inspecting/findHash.ts index 57a9293d27..a53f8705e4 100644 --- a/store/commands/test/inspecting/findHash.ts +++ b/store/commands/test/inspecting/findHash.ts @@ -1,7 +1,7 @@ /// import path from 'node:path' -import { getConfig } from '@pnpm/config' +import { getConfig } from '@pnpm/config.reader' import type { PnpmError } from '@pnpm/error' import { prepare } from '@pnpm/prepare' import { findHash } from '@pnpm/store.commands' diff --git a/store/commands/test/store/cleanExpiredDlxCache.test.ts b/store/commands/test/store/cleanExpiredDlxCache.test.ts index 3258685251..8763c67c86 100644 --- a/store/commands/test/store/cleanExpiredDlxCache.test.ts +++ b/store/commands/test/store/cleanExpiredDlxCache.test.ts @@ -16,7 +16,7 @@ jest.unstable_mockModule('fs', () => ({ })) const fs = await import('node:fs') const { cleanExpiredDlxCache, cleanOrphans } = await import('../../src/store/cleanExpiredDlxCache.js') -const { dlx } = await import('@pnpm/plugin-commands-script-runners') +const { dlx } = await import('@pnpm/exec.commands') beforeEach(() => { jest.mocked(fs.readdirSync).mockClear() diff --git a/store/commands/test/store/storePrune.ts b/store/commands/test/store/storePrune.ts index ce8a929314..8560cb95e5 100644 --- a/store/commands/test/store/storePrune.ts +++ b/store/commands/test/store/storePrune.ts @@ -4,7 +4,7 @@ import path from 'node:path' import { jest } from '@jest/globals' import { assertStore } from '@pnpm/assert-store' import { STORE_VERSION } from '@pnpm/constants' -import { dlx } from '@pnpm/plugin-commands-script-runners' +import { dlx } from '@pnpm/exec.commands' import { prepare, prepareEmpty } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { store } from '@pnpm/store.commands' diff --git a/store/commands/tsconfig.json b/store/commands/tsconfig.json index d9a400aa0d..fa83fd2b1a 100644 --- a/store/commands/tsconfig.json +++ b/store/commands/tsconfig.json @@ -16,19 +16,19 @@ "path": "../../__utils__/prepare" }, { - "path": "../../cli/cli-utils" - }, - { - "path": "../../config/config" + "path": "../../cli/utils" }, { "path": "../../config/normalize-registries" }, + { + "path": "../../config/reader" + }, { "path": "../../crypto/integrity" }, { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../exec/commands" @@ -43,7 +43,7 @@ "path": "../../installing/client" }, { - "path": "../../installing/get-context" + "path": "../../installing/context" }, { "path": "../../lockfile/fs" @@ -75,20 +75,20 @@ { "path": "../cafs" }, + { + "path": "../connection-manager" + }, + { + "path": "../controller" + }, + { + "path": "../controller-types" + }, { "path": "../index" }, { - "path": "../package-store" - }, - { - "path": "../store-connection-manager" - }, - { - "path": "../store-controller-types" - }, - { - "path": "../store-path" + "path": "../path" } ] } diff --git a/store/store-connection-manager/CHANGELOG.md b/store/connection-manager/CHANGELOG.md similarity index 100% rename from store/store-connection-manager/CHANGELOG.md rename to store/connection-manager/CHANGELOG.md diff --git a/store/store-connection-manager/README.md b/store/connection-manager/README.md similarity index 100% rename from store/store-connection-manager/README.md rename to store/connection-manager/README.md diff --git a/store/store-connection-manager/package.json b/store/connection-manager/package.json similarity index 67% rename from store/store-connection-manager/package.json rename to store/connection-manager/package.json index ea73d98851..0506f15ced 100644 --- a/store/store-connection-manager/package.json +++ b/store/connection-manager/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/store-connection-manager", + "name": "@pnpm/store.connection-manager", "version": "1002.2.4", "description": "Create a pnpm store controller", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/store/store-connection-manager", - "homepage": "https://github.com/pnpm/pnpm/tree/main/store/store-connection-manager#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/store/connection-manager", + "homepage": "https://github.com/pnpm/pnpm/tree/main/store/connection-manager#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -31,12 +31,12 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-meta": "workspace:*", - "@pnpm/client": "workspace:*", - "@pnpm/config": "workspace:*", - "@pnpm/package-store": "workspace:*", - "@pnpm/store-path": "workspace:*", + "@pnpm/cli.meta": "workspace:*", + "@pnpm/config.reader": "workspace:*", + "@pnpm/installing.client": "workspace:*", + "@pnpm/store.controller": "workspace:*", "@pnpm/store.index": "workspace:*", + "@pnpm/store.path": "workspace:*", "dir-is-case-sensitive": "catalog:" }, "peerDependencies": { @@ -44,7 +44,7 @@ }, "devDependencies": { "@pnpm/logger": "workspace:*", - "@pnpm/store-connection-manager": "workspace:*" + "@pnpm/store.connection-manager": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/store/store-connection-manager/src/createNewStoreController.ts b/store/connection-manager/src/createNewStoreController.ts similarity index 95% rename from store/store-connection-manager/src/createNewStoreController.ts rename to store/connection-manager/src/createNewStoreController.ts index 4e8ca300f3..c75683cf8e 100644 --- a/store/store-connection-manager/src/createNewStoreController.ts +++ b/store/connection-manager/src/createNewStoreController.ts @@ -1,9 +1,9 @@ import { promises as fs } from 'node:fs' -import { packageManager } from '@pnpm/cli-meta' -import { type ClientOptions, createClient } from '@pnpm/client' -import type { Config } from '@pnpm/config' -import { type CafsLocker, createPackageStore, type StoreController } from '@pnpm/package-store' +import { packageManager } from '@pnpm/cli.meta' +import type { Config } from '@pnpm/config.reader' +import { type ClientOptions, createClient } from '@pnpm/installing.client' +import { type CafsLocker, createPackageStore, type StoreController } from '@pnpm/store.controller' import { StoreIndex } from '@pnpm/store.index' type CreateResolverOptions = Pick=22.13" diff --git a/store/store-controller-types/src/index.ts b/store/controller-types/src/index.ts similarity index 97% rename from store/store-controller-types/src/index.ts rename to store/controller-types/src/index.ts index 8547699dba..29aeaa34df 100644 --- a/store/store-controller-types/src/index.ts +++ b/store/controller-types/src/index.ts @@ -1,11 +1,3 @@ -import type { - FilesMap, - ImportPackageFunction, - ImportPackageFunctionAsync, - PackageFileInfo, - PackageFilesResponse, - ResolvedFrom, -} from '@pnpm/cafs-types' import type { DirectoryResolution, PkgResolutionId, @@ -13,7 +5,15 @@ import type { Resolution, WantedDependency, WorkspacePackages, -} from '@pnpm/resolver-base' +} from '@pnpm/resolving.resolver-base' +import type { + FilesMap, + ImportPackageFunction, + ImportPackageFunctionAsync, + PackageFileInfo, + PackageFilesResponse, + ResolvedFrom, +} from '@pnpm/store.cafs-types' import type { AllowBuild, BundledManifest, @@ -26,7 +26,7 @@ import type { export type { FilesMap, ImportPackageFunction, ImportPackageFunctionAsync, PackageFileInfo, PackageFilesResponse } -export * from '@pnpm/resolver-base' +export * from '@pnpm/resolving.resolver-base' export type { BundledManifest } export interface UploadPkgToStoreOpts { diff --git a/store/store-controller-types/tsconfig.json b/store/controller-types/tsconfig.json similarity index 100% rename from store/store-controller-types/tsconfig.json rename to store/controller-types/tsconfig.json diff --git a/pkg-manifest/write-project-manifest/tsconfig.lint.json b/store/controller-types/tsconfig.lint.json similarity index 100% rename from pkg-manifest/write-project-manifest/tsconfig.lint.json rename to store/controller-types/tsconfig.lint.json diff --git a/store/package-store/CHANGELOG.md b/store/controller/CHANGELOG.md similarity index 100% rename from store/package-store/CHANGELOG.md rename to store/controller/CHANGELOG.md diff --git a/store/package-store/README.md b/store/controller/README.md similarity index 100% rename from store/package-store/README.md rename to store/controller/README.md diff --git a/store/package-store/package.json b/store/controller/package.json similarity index 76% rename from store/package-store/package.json rename to store/controller/package.json index a22246b80a..3cb74eff3a 100644 --- a/store/package-store/package.json +++ b/store/controller/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/package-store", + "name": "@pnpm/store.controller", "version": "1004.0.0", "description": "A storage for packages", "keywords": [ @@ -15,8 +15,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/store/package-store", - "homepage": "https://github.com/pnpm/pnpm/tree/main/store/package-store#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/store/controller", + "homepage": "https://github.com/pnpm/pnpm/tree/main/store/controller#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -44,15 +44,15 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/create-cafs-store": "workspace:*", "@pnpm/crypto.hash": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", "@pnpm/hooks.types": "workspace:*", - "@pnpm/package-requester": "workspace:*", - "@pnpm/resolver-base": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/installing.package-requester": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/store.cafs": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", + "@pnpm/store.create-cafs-store": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "catalog:", @@ -66,10 +66,10 @@ "@pnpm/worker": "workspace:^" }, "devDependencies": { - "@pnpm/client": "workspace:*", + "@pnpm/installing.client": "workspace:*", "@pnpm/logger": "workspace:*", - "@pnpm/package-store": "workspace:*", "@pnpm/prepare": "workspace:*", + "@pnpm/store.controller": "workspace:*", "@types/ramda": "catalog:", "@types/ssri": "catalog:", "tempy": "catalog:" diff --git a/store/package-store/src/index.ts b/store/controller/src/index.ts similarity index 82% rename from store/package-store/src/index.ts rename to store/controller/src/index.ts index 7d1b4e9f2e..55d6b9f731 100644 --- a/store/package-store/src/index.ts +++ b/store/controller/src/index.ts @@ -1,3 +1,3 @@ export { type CafsLocker, createPackageStore, type CreatePackageStoreOptions } from './storeController/index.js' export { getRegisteredProjects, registerProject } from './storeController/projectRegistry.js' -export * from '@pnpm/store-controller-types' +export * from '@pnpm/store.controller-types' diff --git a/store/package-store/src/storeController/index.ts b/store/controller/src/storeController/index.ts similarity index 91% rename from store/package-store/src/storeController/index.ts rename to store/controller/src/storeController/index.ts index e69227e88f..751ed81438 100644 --- a/store/package-store/src/storeController/index.ts +++ b/store/controller/src/storeController/index.ts @@ -1,16 +1,16 @@ import fs from 'node:fs' import path from 'node:path' -import { type CafsLocker, createCafsStore, createPackageImporterAsync } from '@pnpm/create-cafs-store' -import type { Fetchers } from '@pnpm/fetcher-base' +import type { Fetchers } from '@pnpm/fetching.fetcher-base' import type { CustomFetcher } from '@pnpm/hooks.types' -import { createPackageRequester } from '@pnpm/package-requester' -import type { ResolveFunction } from '@pnpm/resolver-base' -import type { StoreIndex } from '@pnpm/store.index' +import { createPackageRequester } from '@pnpm/installing.package-requester' +import type { ResolveFunction } from '@pnpm/resolving.resolver-base' import type { ImportIndexedPackageAsync, StoreController, -} from '@pnpm/store-controller-types' +} from '@pnpm/store.controller-types' +import { type CafsLocker, createCafsStore, createPackageImporterAsync } from '@pnpm/store.create-cafs-store' +import type { StoreIndex } from '@pnpm/store.index' import { addFilesFromDir, importPackage, initStoreDir } from '@pnpm/worker' import { prune } from './prune.js' diff --git a/store/package-store/src/storeController/projectRegistry.ts b/store/controller/src/storeController/projectRegistry.ts similarity index 100% rename from store/package-store/src/storeController/projectRegistry.ts rename to store/controller/src/storeController/projectRegistry.ts diff --git a/store/package-store/src/storeController/prune.ts b/store/controller/src/storeController/prune.ts similarity index 100% rename from store/package-store/src/storeController/prune.ts rename to store/controller/src/storeController/prune.ts diff --git a/store/package-store/src/storeController/pruneGlobalVirtualStore.ts b/store/controller/src/storeController/pruneGlobalVirtualStore.ts similarity index 100% rename from store/package-store/src/storeController/pruneGlobalVirtualStore.ts rename to store/controller/src/storeController/pruneGlobalVirtualStore.ts diff --git a/store/package-store/test/index.ts b/store/controller/test/index.ts similarity index 95% rename from store/package-store/test/index.ts rename to store/controller/test/index.ts index 488abcf54b..d5b5874e9f 100644 --- a/store/package-store/test/index.ts +++ b/store/controller/test/index.ts @@ -1,10 +1,10 @@ /// import path from 'node:path' -import { createClient } from '@pnpm/client' -import { createPackageStore } from '@pnpm/package-store' +import { createClient } from '@pnpm/installing.client' +import { createPackageStore } from '@pnpm/store.controller' +import type { FetchPackageToStoreFunction } from '@pnpm/store.controller-types' import { StoreIndex } from '@pnpm/store.index' -import type { FetchPackageToStoreFunction } from '@pnpm/store-controller-types' import { temporaryDirectory } from 'tempy' describe('store.importPackage()', () => { diff --git a/store/package-store/test/projectRegistry.ts b/store/controller/test/projectRegistry.ts similarity index 98% rename from store/package-store/test/projectRegistry.ts rename to store/controller/test/projectRegistry.ts index 6c82f0536a..a80669a8aa 100644 --- a/store/package-store/test/projectRegistry.ts +++ b/store/controller/test/projectRegistry.ts @@ -2,7 +2,7 @@ import { promises as fs } from 'node:fs' import path from 'node:path' -import { getRegisteredProjects, registerProject } from '@pnpm/package-store' +import { getRegisteredProjects, registerProject } from '@pnpm/store.controller' import { temporaryDirectory } from 'tempy' describe('projectRegistry', () => { diff --git a/pkg-manifest/read-project-manifest/test/tsconfig.json b/store/controller/test/tsconfig.json similarity index 100% rename from pkg-manifest/read-project-manifest/test/tsconfig.json rename to store/controller/test/tsconfig.json diff --git a/store/package-store/tsconfig.json b/store/controller/tsconfig.json similarity index 95% rename from store/package-store/tsconfig.json rename to store/controller/tsconfig.json index 7a2f3fe881..97a35022b2 100644 --- a/store/package-store/tsconfig.json +++ b/store/controller/tsconfig.json @@ -45,14 +45,14 @@ { "path": "../cafs" }, + { + "path": "../controller-types" + }, { "path": "../create-cafs-store" }, { "path": "../index" - }, - { - "path": "../store-controller-types" } ] } diff --git a/store/package-store/tsconfig.lint.json b/store/controller/tsconfig.lint.json similarity index 100% rename from store/package-store/tsconfig.lint.json rename to store/controller/tsconfig.lint.json diff --git a/store/create-cafs-store/package.json b/store/create-cafs-store/package.json index a5eaae31fb..f7073b048d 100644 --- a/store/create-cafs-store/package.json +++ b/store/create-cafs-store/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/create-cafs-store", + "name": "@pnpm/store.create-cafs-store", "version": "1000.0.20", "description": "Create a CAFS store controller", "keywords": [ @@ -43,10 +43,10 @@ }, "dependencies": { "@pnpm/building.pkg-requires-build": "workspace:*", - "@pnpm/fetcher-base": "workspace:*", + "@pnpm/fetching.fetcher-base": "workspace:*", "@pnpm/fs.indexed-pkg-importer": "workspace:*", - "@pnpm/store-controller-types": "workspace:*", "@pnpm/store.cafs": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "memoize": "catalog:", "path-temp": "catalog:", "ramda": "catalog:" @@ -55,10 +55,10 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/cafs-types": "workspace:*", - "@pnpm/create-cafs-store": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/prepare": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", + "@pnpm/store.create-cafs-store": "workspace:*", "@types/ramda": "catalog:" }, "engines": { diff --git a/store/create-cafs-store/src/index.ts b/store/create-cafs-store/src/index.ts index 5654d35f90..bd8b587e69 100644 --- a/store/create-cafs-store/src/index.ts +++ b/store/create-cafs-store/src/index.ts @@ -1,18 +1,18 @@ import { promises as fs } from 'node:fs' import path from 'node:path' -import type { Cafs, FilesMap, PackageFilesResponse } from '@pnpm/cafs-types' import { createIndexedPkgImporter } from '@pnpm/fs.indexed-pkg-importer' import { type CafsLocker, createCafs, } from '@pnpm/store.cafs' +import type { Cafs, FilesMap, PackageFilesResponse } from '@pnpm/store.cafs-types' import type { ImportIndexedPackage, ImportIndexedPackageAsync, ImportPackageFunction, ImportPackageFunctionAsync, -} from '@pnpm/store-controller-types' +} from '@pnpm/store.controller-types' import memoize from 'memoize' import { pathTemp } from 'path-temp' diff --git a/store/create-cafs-store/tsconfig.json b/store/create-cafs-store/tsconfig.json index 636e4ee455..019222232e 100644 --- a/store/create-cafs-store/tsconfig.json +++ b/store/create-cafs-store/tsconfig.json @@ -31,7 +31,7 @@ "path": "../cafs-types" }, { - "path": "../store-controller-types" + "path": "../controller-types" } ] } diff --git a/store/store-path/CHANGELOG.md b/store/path/CHANGELOG.md similarity index 100% rename from store/store-path/CHANGELOG.md rename to store/path/CHANGELOG.md diff --git a/store/store-path/README.md b/store/path/README.md similarity index 100% rename from store/store-path/README.md rename to store/path/README.md diff --git a/store/store-path/package.json b/store/path/package.json similarity index 85% rename from store/store-path/package.json rename to store/path/package.json index a466e91bd8..cf0861905e 100644 --- a/store/store-path/package.json +++ b/store/path/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/store-path", + "name": "@pnpm/store.path", "version": "1000.0.5", "description": "Resolves the pnpm store path", "keywords": [ @@ -9,8 +9,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/store/store-path", - "homepage": "https://github.com/pnpm/pnpm/tree/main/store/store-path#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/store/path", + "homepage": "https://github.com/pnpm/pnpm/tree/main/store/path#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -42,7 +42,7 @@ }, "devDependencies": { "@jest/globals": "catalog:", - "@pnpm/store-path": "workspace:*", + "@pnpm/store.path": "workspace:*", "@types/is-windows": "catalog:", "@types/node": "catalog:", "@types/touch": "catalog:", diff --git a/store/store-path/src/index.ts b/store/path/src/index.ts similarity index 100% rename from store/store-path/src/index.ts rename to store/path/src/index.ts diff --git a/store/store-path/test/index.ts b/store/path/test/index.ts similarity index 97% rename from store/store-path/test/index.ts rename to store/path/test/index.ts index ab39d874d2..3555abf619 100644 --- a/store/store-path/test/index.ts +++ b/store/path/test/index.ts @@ -65,7 +65,7 @@ jest.unstable_mockModule('can-link', () => { } }) -const { getStorePath } = await import('@pnpm/store-path') +const { getStorePath } = await import('@pnpm/store.path') const skipOnWindows = isWindows() ? test.skip : test diff --git a/pkg-manifest/write-project-manifest/test/tsconfig.json b/store/path/test/tsconfig.json similarity index 100% rename from pkg-manifest/write-project-manifest/test/tsconfig.json rename to store/path/test/tsconfig.json diff --git a/store/store-path/tsconfig.json b/store/path/tsconfig.json similarity index 100% rename from store/store-path/tsconfig.json rename to store/path/tsconfig.json diff --git a/store/store-connection-manager/tsconfig.lint.json b/store/path/tsconfig.lint.json similarity index 100% rename from store/store-connection-manager/tsconfig.lint.json rename to store/path/tsconfig.lint.json diff --git a/store/pkg-finder/package.json b/store/pkg-finder/package.json index dfcfe72dfb..34adbe160f 100644 --- a/store/pkg-finder/package.json +++ b/store/pkg-finder/package.json @@ -30,9 +30,9 @@ "test": "pnpm run compile" }, "dependencies": { - "@pnpm/dependency-path": "workspace:*", - "@pnpm/directory-fetcher": "workspace:*", - "@pnpm/resolver-base": "workspace:*", + "@pnpm/deps.path": "workspace:*", + "@pnpm/fetching.directory-fetcher": "workspace:*", + "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/store.cafs": "workspace:*", "@pnpm/store.index": "workspace:*" }, diff --git a/store/pkg-finder/src/index.ts b/store/pkg-finder/src/index.ts index bea75934e0..920d2e082c 100644 --- a/store/pkg-finder/src/index.ts +++ b/store/pkg-finder/src/index.ts @@ -1,8 +1,8 @@ import path from 'node:path' -import { parse } from '@pnpm/dependency-path' -import { fetchFromDir } from '@pnpm/directory-fetcher' -import type { Resolution } from '@pnpm/resolver-base' +import { parse } from '@pnpm/deps.path' +import { fetchFromDir } from '@pnpm/fetching.directory-fetcher' +import type { Resolution } from '@pnpm/resolving.resolver-base' import { getFilePathByModeInCafs, type PackageFilesIndex } from '@pnpm/store.cafs' import { gitHostedStoreIndexKey, type StoreIndex, storeIndexKey } from '@pnpm/store.index' diff --git a/store/pkg-finder/tsconfig.json b/store/pkg-finder/tsconfig.json index cd98bdc8be..456209ce1f 100644 --- a/store/pkg-finder/tsconfig.json +++ b/store/pkg-finder/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../deps/dependency-path" + "path": "../../deps/path" }, { "path": "../../fetching/directory-fetcher" diff --git a/testing/temp-store/package.json b/testing/temp-store/package.json index 3781cad8f6..bcb758e80c 100644 --- a/testing/temp-store/package.json +++ b/testing/temp-store/package.json @@ -32,10 +32,10 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/client": "workspace:*", - "@pnpm/package-store": "workspace:*", + "@pnpm/installing.client": "workspace:*", "@pnpm/registry-mock": "catalog:", - "@pnpm/store-controller-types": "workspace:*", + "@pnpm/store.controller": "workspace:*", + "@pnpm/store.controller-types": "workspace:*", "@pnpm/store.index": "workspace:*" }, "devDependencies": { diff --git a/testing/temp-store/src/index.ts b/testing/temp-store/src/index.ts index 8140d2212e..e53c1eac58 100644 --- a/testing/temp-store/src/index.ts +++ b/testing/temp-store/src/index.ts @@ -1,10 +1,10 @@ import * as path from 'node:path' -import { type ClientOptions, createClient } from '@pnpm/client' -import { createPackageStore, type CreatePackageStoreOptions } from '@pnpm/package-store' +import { type ClientOptions, createClient } from '@pnpm/installing.client' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' +import { createPackageStore, type CreatePackageStoreOptions } from '@pnpm/store.controller' +import type { StoreController } from '@pnpm/store.controller-types' import { StoreIndex } from '@pnpm/store.index' -import type { StoreController } from '@pnpm/store-controller-types' const registry = `http://localhost:${REGISTRY_MOCK_PORT}/` diff --git a/testing/temp-store/tsconfig.json b/testing/temp-store/tsconfig.json index d20c089c13..da6e36a8b3 100644 --- a/testing/temp-store/tsconfig.json +++ b/testing/temp-store/tsconfig.json @@ -12,14 +12,14 @@ { "path": "../../installing/client" }, + { + "path": "../../store/controller" + }, + { + "path": "../../store/controller-types" + }, { "path": "../../store/index" - }, - { - "path": "../../store/package-store" - }, - { - "path": "../../store/store-controller-types" } ] } diff --git a/text/naming-cases/package.json b/text/naming-cases/package.json index 00bf20136e..e5b3d0d0dd 100644 --- a/text/naming-cases/package.json +++ b/text/naming-cases/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/naming-cases", + "name": "@pnpm/text.naming-cases", "version": "1100.0.0-0", "description": "manipulate and check naming cases", "keywords": [ @@ -32,7 +32,7 @@ "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest" }, "devDependencies": { - "@pnpm/naming-cases": "workspace:*" + "@pnpm/text.naming-cases": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/worker/package.json b/worker/package.json index 0e87edf514..c83e4ca694 100644 --- a/worker/package.json +++ b/worker/package.json @@ -34,15 +34,15 @@ }, "dependencies": { "@pnpm/building.pkg-requires-build": "workspace:*", - "@pnpm/cafs-types": "workspace:*", - "@pnpm/create-cafs-store": "workspace:*", "@pnpm/crypto.integrity": "workspace:*", "@pnpm/error": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", "@pnpm/fs.hard-link-dir": "workspace:*", - "@pnpm/graceful-fs": "workspace:*", + "@pnpm/fs.symlink-dependency": "workspace:*", "@pnpm/store.cafs": "workspace:*", + "@pnpm/store.cafs-types": "workspace:*", + "@pnpm/store.create-cafs-store": "workspace:*", "@pnpm/store.index": "workspace:*", - "@pnpm/symlink-dependency": "workspace:*", "@rushstack/worker-pool": "catalog:", "is-windows": "catalog:", "p-limit": "catalog:", diff --git a/worker/src/index.ts b/worker/src/index.ts index 3ca59e7d8b..ab00a09b5c 100644 --- a/worker/src/index.ts +++ b/worker/src/index.ts @@ -3,9 +3,9 @@ import { execSync } from 'node:child_process' import os from 'node:os' import path from 'node:path' -import type { FilesMap, PackageFilesResponse } from '@pnpm/cafs-types' import { PnpmError } from '@pnpm/error' import { globalWarn } from '@pnpm/logger' +import type { FilesMap, PackageFilesResponse } from '@pnpm/store.cafs-types' import type { StoreIndex } from '@pnpm/store.index' import type { BundledManifest } from '@pnpm/types' import { WorkerPool } from '@rushstack/worker-pool' diff --git a/worker/src/start.ts b/worker/src/start.ts index 05722b4804..c74ede916f 100644 --- a/worker/src/start.ts +++ b/worker/src/start.ts @@ -4,11 +4,10 @@ import path from 'node:path' import { parentPort } from 'node:worker_threads' import { pkgRequiresBuild } from '@pnpm/building.pkg-requires-build' -import type { Cafs, FilesMap, PackageFiles, SideEffectsDiff } from '@pnpm/cafs-types' -import { createCafsStore } from '@pnpm/create-cafs-store' import { formatIntegrity, parseIntegrity } from '@pnpm/crypto.integrity' import { PnpmError } from '@pnpm/error' import { hardLinkDir } from '@pnpm/fs.hard-link-dir' +import { symlinkDependencySync } from '@pnpm/fs.symlink-dependency' import { buildFileMapsFromIndex, type CafsFunctions, @@ -20,8 +19,9 @@ import { type PackageFilesIndex, type VerifyResult, } from '@pnpm/store.cafs' +import type { Cafs, FilesMap, PackageFiles, SideEffectsDiff } from '@pnpm/store.cafs-types' +import { createCafsStore } from '@pnpm/store.create-cafs-store' import { packForStorage, StoreIndex } from '@pnpm/store.index' -import { symlinkDependencySync } from '@pnpm/symlink-dependency' import type { BundledManifest, DependencyManifest } from '@pnpm/types' import { equalOrSemverEqual } from './equalOrSemverEqual.js' diff --git a/worker/src/types.ts b/worker/src/types.ts index 95ef413219..5716d60a45 100644 --- a/worker/src/types.ts +++ b/worker/src/types.ts @@ -1,4 +1,4 @@ -import type { PackageFilesResponse } from '@pnpm/cafs-types' +import type { PackageFilesResponse } from '@pnpm/store.cafs-types' import type { DependencyManifest } from '@pnpm/types' export interface PkgNameVersion { diff --git a/workspace/commands/package.json b/workspace/commands/package.json index e1dffb4ffc..b3241171a6 100644 --- a/workspace/commands/package.json +++ b/workspace/commands/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/plugin-commands-init", + "name": "@pnpm/workspace.commands", "version": "1000.2.19", "description": "Create a package.json file", "keywords": [ @@ -32,21 +32,21 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-meta": "workspace:*", - "@pnpm/cli-utils": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/cli.meta": "workspace:*", + "@pnpm/cli.utils": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/object.key-sorting": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/write-project-manifest": "workspace:*", + "@pnpm/workspace.project-manifest-writer": "workspace:*", "camelcase-keys": "catalog:", "ramda": "catalog:", "render-help": "catalog:" }, "devDependencies": { - "@pnpm/plugin-commands-init": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/test-fixtures": "workspace:*", + "@pnpm/workspace.commands": "workspace:*", "@types/ramda": "catalog:", "load-json-file": "catalog:" }, diff --git a/workspace/commands/src/init.ts b/workspace/commands/src/init.ts index 000b3c91f1..b39645ccf6 100644 --- a/workspace/commands/src/init.ts +++ b/workspace/commands/src/init.ts @@ -1,13 +1,13 @@ import fs from 'node:fs' import path from 'node:path' -import { packageManager } from '@pnpm/cli-meta' -import { docsUrl } from '@pnpm/cli-utils' -import { type Config, types as allTypes, type UniversalOptions } from '@pnpm/config' +import { packageManager } from '@pnpm/cli.meta' +import { docsUrl } from '@pnpm/cli.utils' +import { type Config, types as allTypes, type UniversalOptions } from '@pnpm/config.reader' import { PnpmError } from '@pnpm/error' import { sortKeysByPriority } from '@pnpm/object.key-sorting' import type { ProjectManifest } from '@pnpm/types' -import { writeProjectManifest } from '@pnpm/write-project-manifest' +import { writeProjectManifest } from '@pnpm/workspace.project-manifest-writer' import { pick } from 'ramda' import { renderHelp } from 'render-help' diff --git a/workspace/commands/test/init.test.ts b/workspace/commands/test/init.test.ts index 7583ce6576..9eee1a95e1 100644 --- a/workspace/commands/test/init.test.ts +++ b/workspace/commands/test/init.test.ts @@ -1,9 +1,9 @@ import fs from 'node:fs' import path from 'node:path' -import { init } from '@pnpm/plugin-commands-init' import { prepare, prepareEmpty } from '@pnpm/prepare' import type { ProjectManifest } from '@pnpm/types' +import { init } from '@pnpm/workspace.commands' import { loadJsonFileSync } from 'load-json-file' test('init a new package.json', async () => { diff --git a/workspace/commands/tsconfig.json b/workspace/commands/tsconfig.json index 08c093f1f3..b4a0a2efc3 100644 --- a/workspace/commands/tsconfig.json +++ b/workspace/commands/tsconfig.json @@ -16,13 +16,13 @@ "path": "../../__utils__/test-fixtures" }, { - "path": "../../cli/cli-meta" + "path": "../../cli/meta" }, { - "path": "../../cli/cli-utils" + "path": "../../cli/utils" }, { - "path": "../../config/config" + "path": "../../config/reader" }, { "path": "../../object/key-sorting" @@ -34,7 +34,7 @@ "path": "../../packages/types" }, { - "path": "../../pkg-manifest/write-project-manifest" + "path": "../project-manifest-writer" } ] } diff --git a/workspace/filter-packages-from-dir/CHANGELOG.md b/workspace/filter-packages-from-dir/CHANGELOG.md deleted file mode 100644 index 7214d54a40..0000000000 --- a/workspace/filter-packages-from-dir/CHANGELOG.md +++ /dev/null @@ -1,440 +0,0 @@ -# @pnpm/workspace.filter-packages-from-dir - -## 1000.0.43 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.43 -- @pnpm/workspace.find-packages@1000.0.43 - -## 1000.0.42 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.42 -- @pnpm/workspace.find-packages@1000.0.42 -- @pnpm/workspace.read-manifest@1000.2.5 - -## 1000.0.41 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.41 -- @pnpm/filter-workspace-packages@1000.0.41 - -## 1000.0.40 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.40 -- @pnpm/filter-workspace-packages@1000.0.40 - -## 1000.0.39 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.39 -- @pnpm/filter-workspace-packages@1000.0.39 - -## 1000.0.38 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.38 -- @pnpm/workspace.find-packages@1000.0.38 - -## 1000.0.37 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.37 -- @pnpm/workspace.find-packages@1000.0.37 - -## 1000.0.36 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.36 -- @pnpm/workspace.read-manifest@1000.2.4 -- @pnpm/filter-workspace-packages@1000.0.36 - -## 1000.0.35 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.35 -- @pnpm/workspace.find-packages@1000.0.35 -- @pnpm/workspace.read-manifest@1000.2.3 - -## 1000.0.34 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.34 -- @pnpm/filter-workspace-packages@1000.0.34 - -## 1000.0.33 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.33 -- @pnpm/filter-workspace-packages@1000.0.33 - -## 1000.0.32 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.32 -- @pnpm/filter-workspace-packages@1000.0.32 - -## 1000.0.31 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.31 -- @pnpm/workspace.read-manifest@1000.2.2 -- @pnpm/filter-workspace-packages@1000.0.31 - -## 1000.0.30 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.30 -- @pnpm/workspace.find-packages@1000.0.30 -- @pnpm/workspace.read-manifest@1000.2.1 - -## 1000.0.29 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.29 -- @pnpm/filter-workspace-packages@1000.0.29 - -## 1000.0.28 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.28 -- @pnpm/filter-workspace-packages@1000.0.28 - -## 1000.0.27 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.27 -- @pnpm/filter-workspace-packages@1000.0.27 - -## 1000.0.26 - -### Patch Changes - -- Updated dependencies [c8341cc] - - @pnpm/workspace.read-manifest@1000.2.0 - - @pnpm/workspace.find-packages@1000.0.26 - - @pnpm/filter-workspace-packages@1000.0.26 - -## 1000.0.25 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.25 -- @pnpm/filter-workspace-packages@1000.0.25 - -## 1000.0.24 - -### Patch Changes - -- Updated dependencies [09cf46f] -- Updated dependencies [c00360b] - - @pnpm/workspace.find-packages@1000.0.24 - - @pnpm/filter-workspace-packages@1000.0.24 - - @pnpm/workspace.read-manifest@1000.1.5 - -## 1000.0.23 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.23 -- @pnpm/filter-workspace-packages@1000.0.23 - -## 1000.0.22 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.22 -- @pnpm/workspace.find-packages@1000.0.22 -- @pnpm/workspace.read-manifest@1000.1.4 - -## 1000.0.21 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.21 -- @pnpm/workspace.find-packages@1000.0.21 - -## 1000.0.20 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.20 -- @pnpm/workspace.find-packages@1000.0.20 -- @pnpm/workspace.read-manifest@1000.1.3 - -## 1000.0.19 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.19 -- @pnpm/filter-workspace-packages@1000.0.19 - -## 1000.0.18 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.18 -- @pnpm/workspace.find-packages@1000.0.18 -- @pnpm/workspace.read-manifest@1000.1.2 - -## 1000.0.17 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.17 -- @pnpm/filter-workspace-packages@1000.0.17 - -## 1000.0.16 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.16 -- @pnpm/filter-workspace-packages@1000.0.16 - -## 1000.0.15 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.15 -- @pnpm/filter-workspace-packages@1000.0.15 - -## 1000.0.14 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.14 -- @pnpm/filter-workspace-packages@1000.0.14 - -## 1000.0.13 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.13 -- @pnpm/filter-workspace-packages@1000.0.13 -- @pnpm/workspace.read-manifest@1000.1.1 - -## 1000.0.12 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.12 -- @pnpm/filter-workspace-packages@1000.0.12 - -## 1000.0.11 - -### Patch Changes - -- Updated dependencies [8fcc221] -- Updated dependencies [8fcc221] - - @pnpm/workspace.read-manifest@1000.1.0 - - @pnpm/filter-workspace-packages@1000.0.11 - - @pnpm/workspace.find-packages@1000.0.11 - -## 1000.0.10 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.10 -- @pnpm/filter-workspace-packages@1000.0.10 - -## 1000.0.9 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.9 -- @pnpm/filter-workspace-packages@1000.0.9 - -## 1000.0.8 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.8 -- @pnpm/filter-workspace-packages@1000.0.8 - -## 1000.0.7 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.7 -- @pnpm/filter-workspace-packages@1000.0.7 - -## 1000.0.6 - -### Patch Changes - -- Updated dependencies [9a44e6c] - - @pnpm/workspace.find-packages@1000.0.6 - - @pnpm/workspace.read-manifest@1000.0.2 - - @pnpm/filter-workspace-packages@1000.0.6 - -## 1000.0.5 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.5 -- @pnpm/filter-workspace-packages@1000.0.5 - -## 1000.0.4 - -### Patch Changes - -- @pnpm/filter-workspace-packages@1000.0.4 -- @pnpm/workspace.find-packages@1000.0.4 - -## 1000.0.3 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.3 -- @pnpm/filter-workspace-packages@1000.0.3 - -## 1000.0.2 - -### Patch Changes - -- @pnpm/workspace.find-packages@1000.0.2 -- @pnpm/filter-workspace-packages@1000.0.2 - -## 1000.0.1 - -### Patch Changes - -- @pnpm/workspace.read-manifest@1000.0.1 -- @pnpm/workspace.find-packages@1000.0.1 -- @pnpm/filter-workspace-packages@1000.0.1 - -## 1.0.14 - -### Patch Changes - -- @pnpm/workspace.read-manifest@2.2.2 -- @pnpm/filter-workspace-packages@10.0.13 -- @pnpm/workspace.find-packages@4.0.13 - -## 1.0.13 - -### Patch Changes - -- @pnpm/filter-workspace-packages@10.0.12 -- @pnpm/workspace.find-packages@4.0.12 - -## 1.0.12 - -### Patch Changes - -- @pnpm/workspace.read-manifest@2.2.1 -- @pnpm/filter-workspace-packages@10.0.11 -- @pnpm/workspace.find-packages@4.0.11 - -## 1.0.11 - -### Patch Changes - -- @pnpm/filter-workspace-packages@10.0.10 -- @pnpm/workspace.find-packages@4.0.10 - -## 1.0.10 - -### Patch Changes - -- @pnpm/filter-workspace-packages@10.0.9 -- @pnpm/workspace.find-packages@4.0.9 - -## 1.0.9 - -### Patch Changes - -- @pnpm/workspace.find-packages@4.0.8 -- @pnpm/filter-workspace-packages@10.0.8 - -## 1.0.8 - -### Patch Changes - -- Updated dependencies [82f7ed2] - - @pnpm/workspace.find-packages@4.0.7 - - @pnpm/filter-workspace-packages@10.0.7 - -## 1.0.7 - -### Patch Changes - -- @pnpm/workspace.find-packages@4.0.6 -- @pnpm/filter-workspace-packages@10.0.6 - -## 1.0.6 - -### Patch Changes - -- @pnpm/workspace.find-packages@4.0.5 -- @pnpm/filter-workspace-packages@10.0.5 - -## 1.0.5 - -### Patch Changes - -- @pnpm/filter-workspace-packages@10.0.4 -- @pnpm/workspace.find-packages@4.0.4 - -## 1.0.4 - -### Patch Changes - -- @pnpm/workspace.find-packages@4.0.3 -- @pnpm/filter-workspace-packages@10.0.3 - -## 1.0.3 - -### Patch Changes - -- @pnpm/filter-workspace-packages@10.0.2 -- @pnpm/workspace.find-packages@4.0.2 - -## 1.0.2 - -### Patch Changes - -- @pnpm/filter-workspace-packages@10.0.1 -- @pnpm/workspace.find-packages@4.0.1 - -## 1.0.1 - -### Patch Changes - -- Updated dependencies [dd00eeb] -- Updated dependencies [9c63679] - - @pnpm/filter-workspace-packages@10.0.0 - - @pnpm/workspace.find-packages@4.0.0 - - @pnpm/workspace.read-manifest@2.2.0 - -## 1.0.0 - -### Major Changes - -- Initial release. - -### Patch Changes - -- Updated dependencies [5d1ed94] -- Updated dependencies - - @pnpm/workspace.read-manifest@2.1.0 - - @pnpm/filter-workspace-packages@9.0.0 - - @pnpm/workspace.find-packages@3.0.0 diff --git a/workspace/filter-packages-from-dir/README.md b/workspace/filter-packages-from-dir/README.md deleted file mode 100644 index 75d4bfa149..0000000000 --- a/workspace/filter-packages-from-dir/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# @pnpm/workspace.filter-packages-from-dir - -> Filters packages in a directory - -[![npm version](https://img.shields.io/npm/v/@pnpm/workspace.filter-packages-from-dir.svg)](https://www.npmjs.com/package/@pnpm/workspace.filter-packages-from-dir) - -## Installation - -```sh -pnpm add @pnpm/workspace.filter-packages-from-dir -``` - -## License - -MIT diff --git a/workspace/filter-packages-from-dir/package.json b/workspace/filter-packages-from-dir/package.json deleted file mode 100644 index f727851ba9..0000000000 --- a/workspace/filter-packages-from-dir/package.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "@pnpm/workspace.filter-packages-from-dir", - "version": "1000.0.43", - "description": "Filters packages in a directory", - "keywords": [ - "pnpm", - "pnpm11" - ], - "license": "MIT", - "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/filter-packages-from-dir", - "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/filter-packages-from-dir#readme", - "bugs": { - "url": "https://github.com/pnpm/pnpm/issues" - }, - "type": "module", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "exports": { - ".": "./lib/index.js" - }, - "files": [ - "lib", - "!*.map" - ], - "scripts": { - "lint": "eslint \"src/**/*.ts\"", - "test": "pnpm run compile", - "prepublishOnly": "pnpm run compile", - "compile": "tsgo --build && pnpm run lint --fix" - }, - "dependencies": { - "@pnpm/filter-workspace-packages": "workspace:*", - "@pnpm/workspace.find-packages": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*" - }, - "devDependencies": { - "@pnpm/types": "workspace:*", - "@pnpm/workspace.filter-packages-from-dir": "workspace:*" - }, - "engines": { - "node": ">=22.13" - }, - "jest": { - "preset": "@pnpm/jest-config" - } -} diff --git a/workspace/filter-packages-from-dir/tsconfig.json b/workspace/filter-packages-from-dir/tsconfig.json deleted file mode 100644 index 27dae68da0..0000000000 --- a/workspace/filter-packages-from-dir/tsconfig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "extends": "@pnpm/tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": "src" - }, - "include": [ - "src/**/*.ts", - "../../__typings__/**/*.d.ts" - ], - "references": [ - { - "path": "../../packages/types" - }, - { - "path": "../filter-workspace-packages" - }, - { - "path": "../find-packages" - }, - { - "path": "../read-manifest" - } - ] -} diff --git a/workspace/injected-deps-syncer/package.json b/workspace/injected-deps-syncer/package.json index 47f65248d1..aaccd617b5 100644 --- a/workspace/injected-deps-syncer/package.json +++ b/workspace/injected-deps-syncer/package.json @@ -31,14 +31,14 @@ "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest" }, "dependencies": { - "@pnpm/directory-fetcher": "workspace:*", + "@pnpm/bins.linker": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/link-bins": "workspace:*", - "@pnpm/modules-yaml": "workspace:*", - "@pnpm/read-package-json": "workspace:*", + "@pnpm/fetching.directory-fetcher": "workspace:*", + "@pnpm/installing.modules-yaml": "workspace:*", + "@pnpm/pkg-manifest.read-package-json": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", - "@pnpm/workspace.find-packages": "workspace:*", + "@pnpm/workspace.projects-reader": "workspace:*", "@types/normalize-path": "catalog:", "normalize-path": "catalog:" }, diff --git a/workspace/injected-deps-syncer/src/DirPatcher.ts b/workspace/injected-deps-syncer/src/DirPatcher.ts index dd9e794535..dfa93744aa 100644 --- a/workspace/injected-deps-syncer/src/DirPatcher.ts +++ b/workspace/injected-deps-syncer/src/DirPatcher.ts @@ -2,8 +2,8 @@ import fs from 'node:fs' import path from 'node:path' import util from 'node:util' -import { fetchFromDir, type FetchFromDirOptions } from '@pnpm/directory-fetcher' import { PnpmError } from '@pnpm/error' +import { fetchFromDir, type FetchFromDirOptions } from '@pnpm/fetching.directory-fetcher' export const DIR: unique symbol = Symbol('Path is a directory') diff --git a/workspace/injected-deps-syncer/src/index.ts b/workspace/injected-deps-syncer/src/index.ts index bbb3c52b91..e5235f2619 100644 --- a/workspace/injected-deps-syncer/src/index.ts +++ b/workspace/injected-deps-syncer/src/index.ts @@ -1,12 +1,12 @@ import path from 'node:path' +import { linkBins, linkBinsOfPackages } from '@pnpm/bins.linker' import { PnpmError } from '@pnpm/error' -import { linkBins, linkBinsOfPackages } from '@pnpm/link-bins' +import { readModulesManifest } from '@pnpm/installing.modules-yaml' import { logger as createLogger } from '@pnpm/logger' -import { readModulesManifest } from '@pnpm/modules-yaml' -import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' import type { DependencyManifest } from '@pnpm/types' -import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.find-packages' +import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.projects-reader' import normalizePath from 'normalize-path' import { DirPatcher } from './DirPatcher.js' diff --git a/workspace/injected-deps-syncer/test/DirPatcher.test.ts b/workspace/injected-deps-syncer/test/DirPatcher.test.ts index 2d0ab7c794..0efa617b76 100644 --- a/workspace/injected-deps-syncer/test/DirPatcher.test.ts +++ b/workspace/injected-deps-syncer/test/DirPatcher.test.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import { jest } from '@jest/globals' -import { fetchFromDir } from '@pnpm/directory-fetcher' +import { fetchFromDir } from '@pnpm/fetching.directory-fetcher' import { prepareEmpty } from '@pnpm/prepare' import { lexCompare } from '@pnpm/util.lex-comparator' diff --git a/workspace/injected-deps-syncer/test/applyPatch.test.ts b/workspace/injected-deps-syncer/test/applyPatch.test.ts index c9836510f6..571b31cd65 100644 --- a/workspace/injected-deps-syncer/test/applyPatch.test.ts +++ b/workspace/injected-deps-syncer/test/applyPatch.test.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import { jest } from '@jest/globals' -import { fetchFromDir } from '@pnpm/directory-fetcher' +import { fetchFromDir } from '@pnpm/fetching.directory-fetcher' import { prepareEmpty } from '@pnpm/prepare' import { lexCompare } from '@pnpm/util.lex-comparator' diff --git a/workspace/injected-deps-syncer/tsconfig.json b/workspace/injected-deps-syncer/tsconfig.json index bb1e252bec..3a9bdfe919 100644 --- a/workspace/injected-deps-syncer/tsconfig.json +++ b/workspace/injected-deps-syncer/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../__utils__/prepare" }, { - "path": "../../bins/link-bins" + "path": "../../bins/linker" }, { "path": "../../fetching/directory-fetcher" @@ -34,7 +34,7 @@ "path": "../../pkg-manifest/read-package-json" }, { - "path": "../find-packages" + "path": "../projects-reader" } ] } \ No newline at end of file diff --git a/workspace/manifest-writer/README.md b/workspace/manifest-writer/README.md deleted file mode 100644 index 96722cbc44..0000000000 --- a/workspace/manifest-writer/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pnpm/workspace.manifest-writer - -> Updates the workspace manifest file - -## Install - -``` -pnpm add @pnpm/workspace.manifest-writer -``` - -## LICENSE - -MIT diff --git a/workspace/pkgs-graph/package.json b/workspace/pkgs-graph/package.json index 6998a502c7..f742cabecc 100644 --- a/workspace/pkgs-graph/package.json +++ b/workspace/pkgs-graph/package.json @@ -32,9 +32,9 @@ }, "dependencies": { "@pnpm/npm-package-arg": "catalog:", - "@pnpm/npm-resolver": "workspace:*", - "@pnpm/resolve-workspace-range": "workspace:*", + "@pnpm/resolving.npm-resolver": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.range-resolver": "workspace:*", "ramda": "catalog:" }, "devDependencies": { diff --git a/workspace/pkgs-graph/src/index.ts b/workspace/pkgs-graph/src/index.ts index bed226257b..1fe9a0ee74 100644 --- a/workspace/pkgs-graph/src/index.ts +++ b/workspace/pkgs-graph/src/index.ts @@ -1,9 +1,9 @@ import path from 'node:path' import npa from '@pnpm/npm-package-arg' -import { parseBareSpecifier, workspacePrefToNpm } from '@pnpm/npm-resolver' -import { resolveWorkspaceRange } from '@pnpm/resolve-workspace-range' +import { parseBareSpecifier, workspacePrefToNpm } from '@pnpm/resolving.npm-resolver' import type { BaseManifest, ProjectRootDir } from '@pnpm/types' +import { resolveWorkspaceRange } from '@pnpm/workspace.range-resolver' import { map as mapValues } from 'ramda' export interface Package { diff --git a/workspace/pkgs-graph/tsconfig.json b/workspace/pkgs-graph/tsconfig.json index ae76346f4c..72e0633fba 100644 --- a/workspace/pkgs-graph/tsconfig.json +++ b/workspace/pkgs-graph/tsconfig.json @@ -16,7 +16,7 @@ "path": "../../resolving/npm-resolver" }, { - "path": "../resolve-workspace-range" + "path": "../range-resolver" } ] } diff --git a/pkg-manifest/read-project-manifest/CHANGELOG.md b/workspace/project-manifest-reader/CHANGELOG.md similarity index 100% rename from pkg-manifest/read-project-manifest/CHANGELOG.md rename to workspace/project-manifest-reader/CHANGELOG.md diff --git a/pkg-manifest/read-project-manifest/README.md b/workspace/project-manifest-reader/README.md similarity index 100% rename from pkg-manifest/read-project-manifest/README.md rename to workspace/project-manifest-reader/README.md diff --git a/pkg-manifest/read-project-manifest/__fixtures__/commented-package-json5/modified.json5 b/workspace/project-manifest-reader/__fixtures__/commented-package-json5/modified.json5 similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/commented-package-json5/modified.json5 rename to workspace/project-manifest-reader/__fixtures__/commented-package-json5/modified.json5 diff --git a/pkg-manifest/read-project-manifest/__fixtures__/commented-package-json5/package.json5 b/workspace/project-manifest-reader/__fixtures__/commented-package-json5/package.json5 similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/commented-package-json5/package.json5 rename to workspace/project-manifest-reader/__fixtures__/commented-package-json5/package.json5 diff --git a/pkg-manifest/read-project-manifest/__fixtures__/invalid-package-json/package.json b/workspace/project-manifest-reader/__fixtures__/invalid-package-json/package.json similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/invalid-package-json/package.json rename to workspace/project-manifest-reader/__fixtures__/invalid-package-json/package.json diff --git a/pkg-manifest/read-project-manifest/__fixtures__/invalid-package-json5/package.json5 b/workspace/project-manifest-reader/__fixtures__/invalid-package-json5/package.json5 similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/invalid-package-json5/package.json5 rename to workspace/project-manifest-reader/__fixtures__/invalid-package-json5/package.json5 diff --git a/pkg-manifest/read-project-manifest/__fixtures__/invalid-package-yaml/package.yaml b/workspace/project-manifest-reader/__fixtures__/invalid-package-yaml/package.yaml similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/invalid-package-yaml/package.yaml rename to workspace/project-manifest-reader/__fixtures__/invalid-package-yaml/package.yaml diff --git a/pkg-manifest/read-project-manifest/__fixtures__/package-json-with-dev-engines/package.json b/workspace/project-manifest-reader/__fixtures__/package-json-with-dev-engines/package.json similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/package-json-with-dev-engines/package.json rename to workspace/project-manifest-reader/__fixtures__/package-json-with-dev-engines/package.json diff --git a/pkg-manifest/read-project-manifest/__fixtures__/package-json-with-engines/package.json b/workspace/project-manifest-reader/__fixtures__/package-json-with-engines/package.json similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/package-json-with-engines/package.json rename to workspace/project-manifest-reader/__fixtures__/package-json-with-engines/package.json diff --git a/pkg-manifest/read-project-manifest/__fixtures__/package-json/package.json b/workspace/project-manifest-reader/__fixtures__/package-json/package.json similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/package-json/package.json rename to workspace/project-manifest-reader/__fixtures__/package-json/package.json diff --git a/pkg-manifest/read-project-manifest/__fixtures__/package-json5/package.json5 b/workspace/project-manifest-reader/__fixtures__/package-json5/package.json5 similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/package-json5/package.json5 rename to workspace/project-manifest-reader/__fixtures__/package-json5/package.json5 diff --git a/pkg-manifest/read-project-manifest/__fixtures__/package-yaml/package.yaml b/workspace/project-manifest-reader/__fixtures__/package-yaml/package.yaml similarity index 100% rename from pkg-manifest/read-project-manifest/__fixtures__/package-yaml/package.yaml rename to workspace/project-manifest-reader/__fixtures__/package-yaml/package.yaml diff --git a/pkg-manifest/read-project-manifest/package.json b/workspace/project-manifest-reader/package.json similarity index 75% rename from pkg-manifest/read-project-manifest/package.json rename to workspace/project-manifest-reader/package.json index b61852fa7b..494f02fe7b 100644 --- a/pkg-manifest/read-project-manifest/package.json +++ b/workspace/project-manifest-reader/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/read-project-manifest", + "name": "@pnpm/workspace.project-manifest-reader", "version": "1001.1.4", "description": "Read a project manifest (called package.json in most cases)", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/read-project-manifest", - "homepage": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/read-project-manifest#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/project-manifest-reader", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/project-manifest-reader#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -32,11 +32,11 @@ }, "dependencies": { "@pnpm/error": "workspace:*", - "@pnpm/graceful-fs": "workspace:*", - "@pnpm/manifest-utils": "workspace:*", + "@pnpm/fs.graceful-fs": "workspace:*", + "@pnpm/pkg-manifest.utils": "workspace:*", "@pnpm/text.comments-parser": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/write-project-manifest": "workspace:*", + "@pnpm/workspace.project-manifest-writer": "workspace:*", "detect-indent": "catalog:", "fast-deep-equal": "catalog:", "is-windows": "catalog:", @@ -49,8 +49,8 @@ "@pnpm/logger": "catalog:" }, "devDependencies": { - "@pnpm/read-project-manifest": "workspace:*", "@pnpm/test-fixtures": "workspace:*", + "@pnpm/workspace.project-manifest-reader": "workspace:*", "@types/is-windows": "catalog:", "@types/parse-json": "catalog:", "tempy": "catalog:" diff --git a/pkg-manifest/read-project-manifest/src/index.ts b/workspace/project-manifest-reader/src/index.ts similarity index 98% rename from pkg-manifest/read-project-manifest/src/index.ts rename to workspace/project-manifest-reader/src/index.ts index 3e6950238f..f8a61fa7e1 100644 --- a/pkg-manifest/read-project-manifest/src/index.ts +++ b/workspace/project-manifest-reader/src/index.ts @@ -2,10 +2,10 @@ import { promises as fs, type Stats } from 'node:fs' import path from 'node:path' import { PnpmError } from '@pnpm/error' -import { convertEnginesRuntimeToDependencies } from '@pnpm/manifest-utils' +import { convertEnginesRuntimeToDependencies } from '@pnpm/pkg-manifest.utils' import { type CommentSpecifier, extractComments } from '@pnpm/text.comments-parser' import type { EngineDependency, ProjectManifest } from '@pnpm/types' -import { writeProjectManifest } from '@pnpm/write-project-manifest' +import { writeProjectManifest } from '@pnpm/workspace.project-manifest-writer' import detectIndent from 'detect-indent' import equal from 'fast-deep-equal' import isWindows from 'is-windows' diff --git a/pkg-manifest/read-project-manifest/src/readFile.ts b/workspace/project-manifest-reader/src/readFile.ts similarity index 96% rename from pkg-manifest/read-project-manifest/src/readFile.ts rename to workspace/project-manifest-reader/src/readFile.ts index 51dc639d1a..e474cdac06 100644 --- a/pkg-manifest/read-project-manifest/src/readFile.ts +++ b/workspace/project-manifest-reader/src/readFile.ts @@ -1,4 +1,4 @@ -import gfs from '@pnpm/graceful-fs' +import gfs from '@pnpm/fs.graceful-fs' import type { ProjectManifest } from '@pnpm/types' import JSON5 from 'json5' import parseJson from 'parse-json' diff --git a/pkg-manifest/read-project-manifest/test/index.ts b/workspace/project-manifest-reader/test/index.ts similarity index 99% rename from pkg-manifest/read-project-manifest/test/index.ts rename to workspace/project-manifest-reader/test/index.ts index 9261d1aad5..dfa2689965 100644 --- a/pkg-manifest/read-project-manifest/test/index.ts +++ b/workspace/project-manifest-reader/test/index.ts @@ -2,9 +2,9 @@ import fs from 'node:fs' import path from 'node:path' -import { readProjectManifest, tryReadProjectManifest } from '@pnpm/read-project-manifest' import { fixtures } from '@pnpm/test-fixtures' import type { ProjectManifest } from '@pnpm/types' +import { readProjectManifest, tryReadProjectManifest } from '@pnpm/workspace.project-manifest-reader' import { temporaryDirectory } from 'tempy' const f = fixtures(import.meta.dirname) diff --git a/store/package-store/test/tsconfig.json b/workspace/project-manifest-reader/test/tsconfig.json similarity index 100% rename from store/package-store/test/tsconfig.json rename to workspace/project-manifest-reader/test/tsconfig.json diff --git a/pkg-manifest/read-project-manifest/tsconfig.json b/workspace/project-manifest-reader/tsconfig.json similarity index 85% rename from pkg-manifest/read-project-manifest/tsconfig.json rename to workspace/project-manifest-reader/tsconfig.json index 52dd3b03e1..ef69c4646d 100644 --- a/pkg-manifest/read-project-manifest/tsconfig.json +++ b/workspace/project-manifest-reader/tsconfig.json @@ -21,14 +21,14 @@ { "path": "../../packages/types" }, + { + "path": "../../pkg-manifest/utils" + }, { "path": "../../text/comments-parser" }, { - "path": "../manifest-utils" - }, - { - "path": "../write-project-manifest" + "path": "../project-manifest-writer" } ] } diff --git a/store/store-controller-types/tsconfig.lint.json b/workspace/project-manifest-reader/tsconfig.lint.json similarity index 100% rename from store/store-controller-types/tsconfig.lint.json rename to workspace/project-manifest-reader/tsconfig.lint.json diff --git a/pkg-manifest/write-project-manifest/CHANGELOG.md b/workspace/project-manifest-writer/CHANGELOG.md similarity index 100% rename from pkg-manifest/write-project-manifest/CHANGELOG.md rename to workspace/project-manifest-writer/CHANGELOG.md diff --git a/pkg-manifest/write-project-manifest/README.md b/workspace/project-manifest-writer/README.md similarity index 100% rename from pkg-manifest/write-project-manifest/README.md rename to workspace/project-manifest-writer/README.md diff --git a/pkg-manifest/write-project-manifest/package.json b/workspace/project-manifest-writer/package.json similarity index 79% rename from pkg-manifest/write-project-manifest/package.json rename to workspace/project-manifest-writer/package.json index 8f6658aed1..995c882cfe 100644 --- a/pkg-manifest/write-project-manifest/package.json +++ b/workspace/project-manifest-writer/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/write-project-manifest", + "name": "@pnpm/workspace.project-manifest-writer", "version": "1000.0.11", "description": "Write a project manifest (called package.json in most cases)", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/write-project-manifest", - "homepage": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/write-project-manifest#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/project-manifest-writer", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/project-manifest-writer#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -38,7 +38,7 @@ "write-yaml-file": "catalog:" }, "devDependencies": { - "@pnpm/write-project-manifest": "workspace:*", + "@pnpm/workspace.project-manifest-writer": "workspace:*", "@types/write-file-atomic": "catalog:", "tempy": "catalog:" }, diff --git a/pkg-manifest/write-project-manifest/src/index.ts b/workspace/project-manifest-writer/src/index.ts similarity index 100% rename from pkg-manifest/write-project-manifest/src/index.ts rename to workspace/project-manifest-writer/src/index.ts diff --git a/pkg-manifest/write-project-manifest/test/index.ts b/workspace/project-manifest-writer/test/index.ts similarity index 92% rename from pkg-manifest/write-project-manifest/test/index.ts rename to workspace/project-manifest-writer/test/index.ts index 63b54d0b54..ed52862e52 100644 --- a/pkg-manifest/write-project-manifest/test/index.ts +++ b/workspace/project-manifest-writer/test/index.ts @@ -3,7 +3,7 @@ import fs from 'node:fs' import path from 'node:path' import { promisify } from 'node:util' -import { writeProjectManifest } from '@pnpm/write-project-manifest' +import { writeProjectManifest } from '@pnpm/workspace.project-manifest-writer' import { temporaryDirectory } from 'tempy' const readFile = promisify(fs.readFile) diff --git a/store/store-path/test/tsconfig.json b/workspace/project-manifest-writer/test/tsconfig.json similarity index 100% rename from store/store-path/test/tsconfig.json rename to workspace/project-manifest-writer/test/tsconfig.json diff --git a/pkg-manifest/write-project-manifest/tsconfig.json b/workspace/project-manifest-writer/tsconfig.json similarity index 100% rename from pkg-manifest/write-project-manifest/tsconfig.json rename to workspace/project-manifest-writer/tsconfig.json diff --git a/store/store-path/tsconfig.lint.json b/workspace/project-manifest-writer/tsconfig.lint.json similarity index 100% rename from store/store-path/tsconfig.lint.json rename to workspace/project-manifest-writer/tsconfig.lint.json diff --git a/workspace/filter-workspace-packages/CHANGELOG.md b/workspace/projects-filter/CHANGELOG.md similarity index 100% rename from workspace/filter-workspace-packages/CHANGELOG.md rename to workspace/projects-filter/CHANGELOG.md diff --git a/workspace/filter-workspace-packages/README.md b/workspace/projects-filter/README.md similarity index 100% rename from workspace/filter-workspace-packages/README.md rename to workspace/projects-filter/README.md diff --git a/workspace/filter-workspace-packages/package.json b/workspace/projects-filter/package.json similarity index 83% rename from workspace/filter-workspace-packages/package.json rename to workspace/projects-filter/package.json index ebb9115bed..079a1ac9b8 100644 --- a/workspace/filter-workspace-packages/package.json +++ b/workspace/projects-filter/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/filter-workspace-packages", + "name": "@pnpm/workspace.projects-filter", "version": "1000.0.43", "description": "Filters packages in a workspace", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/filter-workspace-packages", - "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/filter-workspace-packages#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/projects-filter", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/projects-filter#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -31,10 +31,11 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { + "@pnpm/config.matcher": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/matcher": "workspace:*", - "@pnpm/workspace.find-packages": "workspace:*", "@pnpm/workspace.pkgs-graph": "workspace:*", + "@pnpm/workspace.projects-reader": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "execa": "catalog:", "find-up": "catalog:", "is-subdir": "catalog:", @@ -42,8 +43,8 @@ "ramda": "catalog:" }, "devDependencies": { - "@pnpm/filter-workspace-packages": "workspace:*", "@pnpm/types": "workspace:*", + "@pnpm/workspace.projects-filter": "workspace:*", "@types/is-windows": "catalog:", "@types/micromatch": "catalog:", "@types/ramda": "catalog:", diff --git a/workspace/filter-packages-from-dir/src/index.ts b/workspace/projects-filter/src/filterPackagesFromDir.ts similarity index 81% rename from workspace/filter-packages-from-dir/src/index.ts rename to workspace/projects-filter/src/filterPackagesFromDir.ts index 334f97cd37..c287756f88 100644 --- a/workspace/filter-packages-from-dir/src/index.ts +++ b/workspace/projects-filter/src/filterPackagesFromDir.ts @@ -1,9 +1,10 @@ -import { filterPkgsBySelectorObjects, type PackageSelector, type ReadProjectsResult } from '@pnpm/filter-workspace-packages' import type { SupportedArchitectures } from '@pnpm/types' -import { findWorkspacePackages } from '@pnpm/workspace.find-packages' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' -export async function filterPackagesFromDir ( +import { filterPkgsBySelectorObjects, type PackageSelector, type ReadProjectsResult } from './index.js' + +export async function filterPkgsBySelectorObjectsFromDir ( workspaceDir: string, pkgSelectors: PackageSelector[], opts?: { diff --git a/workspace/filter-workspace-packages/src/getChangedPackages.ts b/workspace/projects-filter/src/getChangedPackages.ts similarity index 100% rename from workspace/filter-workspace-packages/src/getChangedPackages.ts rename to workspace/projects-filter/src/getChangedPackages.ts diff --git a/workspace/filter-workspace-packages/src/index.ts b/workspace/projects-filter/src/index.ts similarity index 97% rename from workspace/filter-workspace-packages/src/index.ts rename to workspace/projects-filter/src/index.ts index 0134e58c2c..915e8b4326 100644 --- a/workspace/filter-workspace-packages/src/index.ts +++ b/workspace/projects-filter/src/index.ts @@ -1,15 +1,16 @@ -import { createMatcher } from '@pnpm/matcher' +import { createMatcher } from '@pnpm/config.matcher' import type { ProjectRootDir, SupportedArchitectures } from '@pnpm/types' -import { findWorkspacePackages, type Project } from '@pnpm/workspace.find-packages' import { createPkgGraph, type Package, type PackageNode } from '@pnpm/workspace.pkgs-graph' +import { findWorkspacePackages, type Project } from '@pnpm/workspace.projects-reader' import { isSubdir } from 'is-subdir' import * as micromatch from 'micromatch' import { difference, partition, pick } from 'ramda' +import { filterPkgsBySelectorObjectsFromDir } from './filterPackagesFromDir.js' import { getChangedPackages } from './getChangedPackages.js' import { type PackageSelector, parsePackageSelector } from './parsePackageSelector.js' -export { type PackageSelector, parsePackageSelector } +export { filterPkgsBySelectorObjectsFromDir, type PackageSelector, parsePackageSelector } export interface WorkspaceFilter { filter: string diff --git a/workspace/filter-workspace-packages/src/parsePackageSelector.ts b/workspace/projects-filter/src/parsePackageSelector.ts similarity index 100% rename from workspace/filter-workspace-packages/src/parsePackageSelector.ts rename to workspace/projects-filter/src/parsePackageSelector.ts diff --git a/workspace/filter-workspace-packages/test/index.ts b/workspace/projects-filter/test/index.ts similarity index 99% rename from workspace/filter-workspace-packages/test/index.ts rename to workspace/projects-filter/test/index.ts index 7a20cd338d..67a0c8f60e 100644 --- a/workspace/filter-workspace-packages/test/index.ts +++ b/workspace/projects-filter/test/index.ts @@ -3,9 +3,9 @@ import path from 'node:path' import { promisify } from 'node:util' import type { PnpmError } from '@pnpm/error' -import { filterWorkspacePackages, type PackageGraph } from '@pnpm/filter-workspace-packages' import type { ProjectRootDir } from '@pnpm/types' import type { Package } from '@pnpm/workspace.pkgs-graph' +import { filterWorkspacePackages, type PackageGraph } from '@pnpm/workspace.projects-filter' import { isCI } from 'ci-info' import { safeExeca as execa } from 'execa' import isWindows from 'is-windows' diff --git a/workspace/filter-workspace-packages/test/parsePackageSelector.ts b/workspace/projects-filter/test/parsePackageSelector.ts similarity index 99% rename from workspace/filter-workspace-packages/test/parsePackageSelector.ts rename to workspace/projects-filter/test/parsePackageSelector.ts index de4fe9a409..661c36366e 100644 --- a/workspace/filter-workspace-packages/test/parsePackageSelector.ts +++ b/workspace/projects-filter/test/parsePackageSelector.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { type PackageSelector, parsePackageSelector } from '@pnpm/filter-workspace-packages' +import { type PackageSelector, parsePackageSelector } from '@pnpm/workspace.projects-filter' import isWindows from 'is-windows' const fixtures: Array<[string, PackageSelector]> = [ diff --git a/workspace/filter-workspace-packages/test/tsconfig.json b/workspace/projects-filter/test/tsconfig.json similarity index 100% rename from workspace/filter-workspace-packages/test/tsconfig.json rename to workspace/projects-filter/test/tsconfig.json diff --git a/workspace/filter-workspace-packages/tsconfig.json b/workspace/projects-filter/tsconfig.json similarity index 81% rename from workspace/filter-workspace-packages/tsconfig.json rename to workspace/projects-filter/tsconfig.json index 260bddb2ad..f176e7f089 100644 --- a/workspace/filter-workspace-packages/tsconfig.json +++ b/workspace/projects-filter/tsconfig.json @@ -19,10 +19,13 @@ "path": "../../packages/types" }, { - "path": "../find-packages" + "path": "../pkgs-graph" }, { - "path": "../pkgs-graph" + "path": "../projects-reader" + }, + { + "path": "../workspace-manifest-reader" } ] } diff --git a/workspace/filter-packages-from-dir/tsconfig.lint.json b/workspace/projects-filter/tsconfig.lint.json similarity index 100% rename from workspace/filter-packages-from-dir/tsconfig.lint.json rename to workspace/projects-filter/tsconfig.lint.json diff --git a/workspace/find-packages/CHANGELOG.md b/workspace/projects-reader/CHANGELOG.md similarity index 100% rename from workspace/find-packages/CHANGELOG.md rename to workspace/projects-reader/CHANGELOG.md diff --git a/workspace/find-packages/README.md b/workspace/projects-reader/README.md similarity index 100% rename from workspace/find-packages/README.md rename to workspace/projects-reader/README.md diff --git a/workspace/find-packages/package.json b/workspace/projects-reader/package.json similarity index 84% rename from workspace/find-packages/package.json rename to workspace/projects-reader/package.json index 6f0a842b85..4e60e6c16c 100644 --- a/workspace/find-packages/package.json +++ b/workspace/projects-reader/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/workspace.find-packages", + "name": "@pnpm/workspace.projects-reader", "version": "1000.0.43", "description": "Finds packages inside a workspace", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/find-packages", - "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/find-packages#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/projects-reader", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/projects-reader#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -31,7 +31,7 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/cli-utils": "workspace:*", + "@pnpm/cli.utils": "workspace:*", "@pnpm/constants": "workspace:*", "@pnpm/fs.find-packages": "workspace:*", "@pnpm/types": "workspace:*", @@ -43,8 +43,8 @@ "devDependencies": { "@jest/globals": "catalog:", "@pnpm/logger": "workspace:*", - "@pnpm/workspace.find-packages": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*" + "@pnpm/workspace.projects-reader": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/workspace/find-packages/src/index.ts b/workspace/projects-reader/src/index.ts similarity index 97% rename from workspace/find-packages/src/index.ts rename to workspace/projects-reader/src/index.ts index aefe8cbc5a..043de78160 100644 --- a/workspace/find-packages/src/index.ts +++ b/workspace/projects-reader/src/index.ts @@ -1,4 +1,4 @@ -import { packageIsInstallable } from '@pnpm/cli-utils' +import { packageIsInstallable } from '@pnpm/cli.utils' import { findPackages } from '@pnpm/fs.find-packages' import { logger } from '@pnpm/logger' import type { Project, ProjectManifest, SupportedArchitectures } from '@pnpm/types' diff --git a/workspace/find-packages/test/__fixtures__/bad-engine/pkg/package.json b/workspace/projects-reader/test/__fixtures__/bad-engine/pkg/package.json similarity index 100% rename from workspace/find-packages/test/__fixtures__/bad-engine/pkg/package.json rename to workspace/projects-reader/test/__fixtures__/bad-engine/pkg/package.json diff --git a/workspace/find-packages/test/__fixtures__/bad-engine/pnpm-workspace.yaml b/workspace/projects-reader/test/__fixtures__/bad-engine/pnpm-workspace.yaml similarity index 100% rename from workspace/find-packages/test/__fixtures__/bad-engine/pnpm-workspace.yaml rename to workspace/projects-reader/test/__fixtures__/bad-engine/pnpm-workspace.yaml diff --git a/workspace/find-packages/test/__fixtures__/warning-for-non-root-project/package.json b/workspace/projects-reader/test/__fixtures__/warning-for-non-root-project/package.json similarity index 100% rename from workspace/find-packages/test/__fixtures__/warning-for-non-root-project/package.json rename to workspace/projects-reader/test/__fixtures__/warning-for-non-root-project/package.json diff --git a/workspace/find-packages/test/__fixtures__/warning-for-non-root-project/packages/bar/package.json b/workspace/projects-reader/test/__fixtures__/warning-for-non-root-project/packages/bar/package.json similarity index 100% rename from workspace/find-packages/test/__fixtures__/warning-for-non-root-project/packages/bar/package.json rename to workspace/projects-reader/test/__fixtures__/warning-for-non-root-project/packages/bar/package.json diff --git a/workspace/find-packages/test/__fixtures__/warning-for-non-root-project/packages/foo/package.json b/workspace/projects-reader/test/__fixtures__/warning-for-non-root-project/packages/foo/package.json similarity index 100% rename from workspace/find-packages/test/__fixtures__/warning-for-non-root-project/packages/foo/package.json rename to workspace/projects-reader/test/__fixtures__/warning-for-non-root-project/packages/foo/package.json diff --git a/workspace/find-packages/test/__fixtures__/warning-for-non-root-project/pnpm-workspace.yaml b/workspace/projects-reader/test/__fixtures__/warning-for-non-root-project/pnpm-workspace.yaml similarity index 100% rename from workspace/find-packages/test/__fixtures__/warning-for-non-root-project/pnpm-workspace.yaml rename to workspace/projects-reader/test/__fixtures__/warning-for-non-root-project/pnpm-workspace.yaml diff --git a/workspace/find-packages/test/index.ts b/workspace/projects-reader/test/index.ts similarity index 95% rename from workspace/find-packages/test/index.ts rename to workspace/projects-reader/test/index.ts index 15cd507e97..dbedbb0d8e 100644 --- a/workspace/find-packages/test/index.ts +++ b/workspace/projects-reader/test/index.ts @@ -5,8 +5,8 @@ import { logger } from '@pnpm/logger' import { findWorkspacePackages, findWorkspacePackagesNoCheck, -} from '@pnpm/workspace.find-packages' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +} from '@pnpm/workspace.projects-reader' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' beforeEach(() => { jest.spyOn(logger, 'warn') diff --git a/workspace/find-packages/test/tsconfig.json b/workspace/projects-reader/test/tsconfig.json similarity index 100% rename from workspace/find-packages/test/tsconfig.json rename to workspace/projects-reader/test/tsconfig.json diff --git a/workspace/find-packages/tsconfig.json b/workspace/projects-reader/tsconfig.json similarity index 84% rename from workspace/find-packages/tsconfig.json rename to workspace/projects-reader/tsconfig.json index b45ed34fb5..90fdb869c9 100644 --- a/workspace/find-packages/tsconfig.json +++ b/workspace/projects-reader/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../cli/cli-utils" + "path": "../../cli/utils" }, { "path": "../../fs/find-packages" @@ -25,7 +25,7 @@ "path": "../../packages/types" }, { - "path": "../read-manifest" + "path": "../workspace-manifest-reader" } ] } diff --git a/workspace/filter-workspace-packages/tsconfig.lint.json b/workspace/projects-reader/tsconfig.lint.json similarity index 100% rename from workspace/filter-workspace-packages/tsconfig.lint.json rename to workspace/projects-reader/tsconfig.lint.json diff --git a/workspace/resolve-workspace-range/CHANGELOG.md b/workspace/range-resolver/CHANGELOG.md similarity index 100% rename from workspace/resolve-workspace-range/CHANGELOG.md rename to workspace/range-resolver/CHANGELOG.md diff --git a/workspace/resolve-workspace-range/README.md b/workspace/range-resolver/README.md similarity index 100% rename from workspace/resolve-workspace-range/README.md rename to workspace/range-resolver/README.md diff --git a/workspace/resolve-workspace-range/package.json b/workspace/range-resolver/package.json similarity index 87% rename from workspace/resolve-workspace-range/package.json rename to workspace/range-resolver/package.json index 870c55981c..42c290bdd2 100644 --- a/workspace/resolve-workspace-range/package.json +++ b/workspace/range-resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/resolve-workspace-range", + "name": "@pnpm/workspace.range-resolver", "version": "1000.0.0", "description": "Resolves a range from versions that are present inside a workspace", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/resolve-workspace-range", - "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/resolve-workspace-range#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/range-resolver", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/range-resolver#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -35,7 +35,7 @@ "semver": "catalog:" }, "devDependencies": { - "@pnpm/resolve-workspace-range": "workspace:*", + "@pnpm/workspace.range-resolver": "workspace:*", "@types/semver": "catalog:" }, "engines": { diff --git a/workspace/resolve-workspace-range/src/index.ts b/workspace/range-resolver/src/index.ts similarity index 100% rename from workspace/resolve-workspace-range/src/index.ts rename to workspace/range-resolver/src/index.ts diff --git a/workspace/resolve-workspace-range/test/index.test.ts b/workspace/range-resolver/test/index.test.ts similarity index 93% rename from workspace/resolve-workspace-range/test/index.test.ts rename to workspace/range-resolver/test/index.test.ts index 1fad054776..0683704db0 100644 --- a/workspace/resolve-workspace-range/test/index.test.ts +++ b/workspace/range-resolver/test/index.test.ts @@ -1,4 +1,4 @@ -import { resolveWorkspaceRange } from '@pnpm/resolve-workspace-range' +import { resolveWorkspaceRange } from '@pnpm/workspace.range-resolver' describe('resolveWorkspaceRange', () => { const versions = ['1.0.0', '2.0.0', '3.0.0-beta.1'] diff --git a/workspace/find-workspace-dir/test/tsconfig.json b/workspace/range-resolver/test/tsconfig.json similarity index 100% rename from workspace/find-workspace-dir/test/tsconfig.json rename to workspace/range-resolver/test/tsconfig.json diff --git a/workspace/resolve-workspace-range/tsconfig.json b/workspace/range-resolver/tsconfig.json similarity index 100% rename from workspace/resolve-workspace-range/tsconfig.json rename to workspace/range-resolver/tsconfig.json diff --git a/workspace/find-packages/tsconfig.lint.json b/workspace/range-resolver/tsconfig.lint.json similarity index 100% rename from workspace/find-packages/tsconfig.lint.json rename to workspace/range-resolver/tsconfig.lint.json diff --git a/workspace/read-manifest/README.md b/workspace/read-manifest/README.md deleted file mode 100644 index 2ed2277413..0000000000 --- a/workspace/read-manifest/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pnpm/workspace.read-manifest - -> Reads a workspace manifest file - -## Install - -``` -pnpm add @pnpm/workspace.read-manifest -``` - -## LICENSE - -MIT diff --git a/workspace/resolve-workspace-range/tsconfig.lint.json b/workspace/resolve-workspace-range/tsconfig.lint.json deleted file mode 100644 index 1bbe711971..0000000000 --- a/workspace/resolve-workspace-range/tsconfig.lint.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": [ - "src/**/*.ts", - "test/**/*.ts", - "../../__typings__/**/*.d.ts" - ] -} diff --git a/workspace/find-workspace-dir/CHANGELOG.md b/workspace/root-finder/CHANGELOG.md similarity index 100% rename from workspace/find-workspace-dir/CHANGELOG.md rename to workspace/root-finder/CHANGELOG.md diff --git a/workspace/find-workspace-dir/README.md b/workspace/root-finder/README.md similarity index 100% rename from workspace/find-workspace-dir/README.md rename to workspace/root-finder/README.md diff --git a/workspace/find-workspace-dir/package.json b/workspace/root-finder/package.json similarity index 88% rename from workspace/find-workspace-dir/package.json rename to workspace/root-finder/package.json index 96b6e3b2b7..c15a59df3a 100644 --- a/workspace/find-workspace-dir/package.json +++ b/workspace/root-finder/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/find-workspace-dir", + "name": "@pnpm/workspace.root-finder", "version": "1000.1.3", "description": "Finds the root of a pnpm workspace", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/find-workspace-dir", - "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/find-workspace-dir#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/root-finder", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/root-finder#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -35,7 +35,7 @@ "find-up": "catalog:" }, "devDependencies": { - "@pnpm/find-workspace-dir": "workspace:*" + "@pnpm/workspace.root-finder": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/workspace/find-workspace-dir/src/index.ts b/workspace/root-finder/src/index.ts similarity index 100% rename from workspace/find-workspace-dir/src/index.ts rename to workspace/root-finder/src/index.ts diff --git a/workspace/find-workspace-dir/test/index.ts b/workspace/root-finder/test/index.ts similarity index 95% rename from workspace/find-workspace-dir/test/index.ts rename to workspace/root-finder/test/index.ts index 44328c5014..0761d1cf62 100644 --- a/workspace/find-workspace-dir/test/index.ts +++ b/workspace/root-finder/test/index.ts @@ -2,7 +2,7 @@ import fs from 'node:fs' import path from 'node:path' -import { findWorkspaceDir } from '@pnpm/find-workspace-dir' +import { findWorkspaceDir } from '@pnpm/workspace.root-finder' const NPM_CONFIG_WORKSPACE_DIR_ENV_VAR = 'NPM_CONFIG_WORKSPACE_DIR' const FAKE_PATH = 'FAKE_PATH' diff --git a/workspace/manifest-writer/test/tsconfig.json b/workspace/root-finder/test/tsconfig.json similarity index 100% rename from workspace/manifest-writer/test/tsconfig.json rename to workspace/root-finder/test/tsconfig.json diff --git a/workspace/find-workspace-dir/tsconfig.json b/workspace/root-finder/tsconfig.json similarity index 100% rename from workspace/find-workspace-dir/tsconfig.json rename to workspace/root-finder/tsconfig.json diff --git a/workspace/find-workspace-dir/tsconfig.lint.json b/workspace/root-finder/tsconfig.lint.json similarity index 100% rename from workspace/find-workspace-dir/tsconfig.lint.json rename to workspace/root-finder/tsconfig.lint.json diff --git a/workspace/sort-packages/package.json b/workspace/sort-packages/package.json index ce6f663065..b7666af2a1 100644 --- a/workspace/sort-packages/package.json +++ b/workspace/sort-packages/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/sort-packages", + "name": "@pnpm/workspace.sort-packages", "version": "1000.0.11", "description": "Sort packages", "keywords": [ @@ -34,7 +34,7 @@ "@pnpm/types": "workspace:*" }, "devDependencies": { - "@pnpm/sort-packages": "workspace:*" + "@pnpm/workspace.sort-packages": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/workspace/state/package.json b/workspace/state/package.json index 28c5f0b759..2c0c0693a6 100644 --- a/workspace/state/package.json +++ b/workspace/state/package.json @@ -33,7 +33,7 @@ }, "dependencies": { "@pnpm/catalogs.types": "workspace:*", - "@pnpm/config": "workspace:*", + "@pnpm/config.reader": "workspace:*", "@pnpm/types": "workspace:*", "ramda": "catalog:" }, diff --git a/workspace/state/src/types.ts b/workspace/state/src/types.ts index b924364710..4b6d08f7ae 100644 --- a/workspace/state/src/types.ts +++ b/workspace/state/src/types.ts @@ -1,4 +1,4 @@ -import type { Config } from '@pnpm/config' +import type { Config } from '@pnpm/config.reader' import type { ConfigDependencies, Project, ProjectRootDir } from '@pnpm/types' export type ProjectsList = Array> diff --git a/workspace/state/tsconfig.json b/workspace/state/tsconfig.json index 21d3302252..5823cdb09f 100644 --- a/workspace/state/tsconfig.json +++ b/workspace/state/tsconfig.json @@ -16,7 +16,7 @@ "path": "../../catalogs/types" }, { - "path": "../../config/config" + "path": "../../config/reader" }, { "path": "../../packages/logger" diff --git a/workspace/read-manifest/CHANGELOG.md b/workspace/workspace-manifest-reader/CHANGELOG.md similarity index 100% rename from workspace/read-manifest/CHANGELOG.md rename to workspace/workspace-manifest-reader/CHANGELOG.md diff --git a/workspace/workspace-manifest-reader/README.md b/workspace/workspace-manifest-reader/README.md new file mode 100644 index 0000000000..69a939fb86 --- /dev/null +++ b/workspace/workspace-manifest-reader/README.md @@ -0,0 +1,13 @@ +# @pnpm/workspace.workspace-manifest-reader + +> Reads a workspace manifest file + +## Install + +``` +pnpm add @pnpm/workspace.workspace-manifest-reader +``` + +## LICENSE + +MIT diff --git a/workspace/read-manifest/package.json b/workspace/workspace-manifest-reader/package.json similarity index 86% rename from workspace/read-manifest/package.json rename to workspace/workspace-manifest-reader/package.json index 503e47c784..3587fc347d 100644 --- a/workspace/read-manifest/package.json +++ b/workspace/workspace-manifest-reader/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/workspace.read-manifest", + "name": "@pnpm/workspace.workspace-manifest-reader", "version": "1000.2.5", "description": "Reads a workspace manifest file", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/read-manifest", - "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/read-manifest#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/workspace-manifest-reader", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/workspace-manifest-reader#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -37,7 +37,7 @@ "read-yaml-file": "catalog:" }, "devDependencies": { - "@pnpm/workspace.read-manifest": "workspace:*" + "@pnpm/workspace.workspace-manifest-reader": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/workspace/read-manifest/src/catalogs.ts b/workspace/workspace-manifest-reader/src/catalogs.ts similarity index 100% rename from workspace/read-manifest/src/catalogs.ts rename to workspace/workspace-manifest-reader/src/catalogs.ts diff --git a/workspace/read-manifest/src/errors/InvalidWorkspaceManifestError.ts b/workspace/workspace-manifest-reader/src/errors/InvalidWorkspaceManifestError.ts similarity index 100% rename from workspace/read-manifest/src/errors/InvalidWorkspaceManifestError.ts rename to workspace/workspace-manifest-reader/src/errors/InvalidWorkspaceManifestError.ts diff --git a/workspace/read-manifest/src/index.ts b/workspace/workspace-manifest-reader/src/index.ts similarity index 100% rename from workspace/read-manifest/src/index.ts rename to workspace/workspace-manifest-reader/src/index.ts diff --git a/workspace/read-manifest/test/__fixtures__/array/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/array/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/array/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/array/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalog-invalid-array/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalog-invalid-array/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalog-invalid-array/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalog-invalid-array/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalog-invalid-object/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalog-invalid-object/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalog-invalid-object/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalog-invalid-object/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalog-invalid-specifier/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalog-invalid-specifier/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalog-invalid-specifier/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalog-invalid-specifier/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalog-ok/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalog-ok/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalog-ok/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalog-ok/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalogs-conflicting-defaults/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalogs-conflicting-defaults/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalogs-conflicting-defaults/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalogs-conflicting-defaults/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalogs-invalid-array/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-array/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalogs-invalid-array/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-array/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalogs-invalid-named-catalog-array/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-named-catalog-array/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalogs-invalid-named-catalog-array/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-named-catalog-array/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalogs-invalid-named-catalog-object/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-named-catalog-object/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalogs-invalid-named-catalog-object/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-named-catalog-object/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalogs-invalid-named-catalog-specifier/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-named-catalog-specifier/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalogs-invalid-named-catalog-specifier/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-named-catalog-specifier/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalogs-invalid-object/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-object/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalogs-invalid-object/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalogs-invalid-object/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/catalogs-ok/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/catalogs-ok/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/catalogs-ok/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/catalogs-ok/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/empty/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/empty/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/empty/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/empty/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/no-workspace-file/pkg/package.json b/workspace/workspace-manifest-reader/test/__fixtures__/no-workspace-file/pkg/package.json similarity index 100% rename from workspace/read-manifest/test/__fixtures__/no-workspace-file/pkg/package.json rename to workspace/workspace-manifest-reader/test/__fixtures__/no-workspace-file/pkg/package.json diff --git a/workspace/read-manifest/test/__fixtures__/null/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/null/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/null/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/null/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/ok/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/ok/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/ok/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/ok/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/packages-contains-empty/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/packages-contains-empty/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/packages-contains-empty/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/packages-contains-empty/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/packages-contains-number/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/packages-contains-number/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/packages-contains-number/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/packages-contains-number/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/packages-empty/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/packages-empty/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/packages-empty/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/packages-empty/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/packages-string/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/packages-string/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/packages-string/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/packages-string/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/__fixtures__/string/pnpm-workspace.yaml b/workspace/workspace-manifest-reader/test/__fixtures__/string/pnpm-workspace.yaml similarity index 100% rename from workspace/read-manifest/test/__fixtures__/string/pnpm-workspace.yaml rename to workspace/workspace-manifest-reader/test/__fixtures__/string/pnpm-workspace.yaml diff --git a/workspace/read-manifest/test/index.ts b/workspace/workspace-manifest-reader/test/index.ts similarity index 98% rename from workspace/read-manifest/test/index.ts rename to workspace/workspace-manifest-reader/test/index.ts index 5b28fdeeaf..f572312047 100644 --- a/workspace/read-manifest/test/index.ts +++ b/workspace/workspace-manifest-reader/test/index.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' test('readWorkspaceManifest() works with a valid workspace file', async () => { const manifest = await readWorkspaceManifest(path.join(import.meta.dirname, '__fixtures__/ok')) diff --git a/workspace/read-manifest/test/tsconfig.json b/workspace/workspace-manifest-reader/test/tsconfig.json similarity index 100% rename from workspace/read-manifest/test/tsconfig.json rename to workspace/workspace-manifest-reader/test/tsconfig.json diff --git a/workspace/read-manifest/tsconfig.json b/workspace/workspace-manifest-reader/tsconfig.json similarity index 100% rename from workspace/read-manifest/tsconfig.json rename to workspace/workspace-manifest-reader/tsconfig.json diff --git a/workspace/manifest-writer/tsconfig.lint.json b/workspace/workspace-manifest-reader/tsconfig.lint.json similarity index 100% rename from workspace/manifest-writer/tsconfig.lint.json rename to workspace/workspace-manifest-reader/tsconfig.lint.json diff --git a/workspace/manifest-writer/CHANGELOG.md b/workspace/workspace-manifest-writer/CHANGELOG.md similarity index 100% rename from workspace/manifest-writer/CHANGELOG.md rename to workspace/workspace-manifest-writer/CHANGELOG.md diff --git a/workspace/workspace-manifest-writer/README.md b/workspace/workspace-manifest-writer/README.md new file mode 100644 index 0000000000..0129c473ca --- /dev/null +++ b/workspace/workspace-manifest-writer/README.md @@ -0,0 +1,13 @@ +# @pnpm/workspace.workspace-manifest-writer + +> Updates the workspace manifest file + +## Install + +``` +pnpm add @pnpm/workspace.workspace-manifest-writer +``` + +## LICENSE + +MIT diff --git a/workspace/manifest-writer/package.json b/workspace/workspace-manifest-writer/package.json similarity index 86% rename from workspace/manifest-writer/package.json rename to workspace/workspace-manifest-writer/package.json index 7c20177970..167f6dd723 100644 --- a/workspace/manifest-writer/package.json +++ b/workspace/workspace-manifest-writer/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/workspace.manifest-writer", + "name": "@pnpm/workspace.workspace-manifest-writer", "version": "1001.0.3", "description": "Updates the workspace manifest file", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/manifest-writer", - "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/manifest-writer#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/workspace-manifest-writer", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/workspace-manifest-writer#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -36,7 +36,7 @@ "@pnpm/lockfile.types": "workspace:*", "@pnpm/object.key-sorting": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/workspace.read-manifest": "workspace:*", + "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "@pnpm/yaml.document-sync": "workspace:*", "ramda": "catalog:", "write-file-atomic": "catalog:", @@ -46,7 +46,7 @@ "@pnpm/fs.find-packages": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/prepare-temp-dir": "workspace:*", - "@pnpm/workspace.manifest-writer": "workspace:*", + "@pnpm/workspace.workspace-manifest-writer": "workspace:*", "@types/ramda": "catalog:", "@types/write-file-atomic": "catalog:", "read-yaml-file": "catalog:", diff --git a/workspace/manifest-writer/src/index.ts b/workspace/workspace-manifest-writer/src/index.ts similarity index 99% rename from workspace/manifest-writer/src/index.ts rename to workspace/workspace-manifest-writer/src/index.ts index 818c10acb6..72389260b9 100644 --- a/workspace/manifest-writer/src/index.ts +++ b/workspace/workspace-manifest-writer/src/index.ts @@ -9,7 +9,7 @@ import { sortKeysByPriority } from '@pnpm/object.key-sorting' import type { Project, } from '@pnpm/types' -import { validateWorkspaceManifest, type WorkspaceManifest } from '@pnpm/workspace.read-manifest' +import { validateWorkspaceManifest, type WorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader' import { patchDocument } from '@pnpm/yaml.document-sync' import { equals } from 'ramda' import writeFileAtomic from 'write-file-atomic' diff --git a/workspace/manifest-writer/test/addCatalogs.test.ts b/workspace/workspace-manifest-writer/test/addCatalogs.test.ts similarity index 98% rename from workspace/manifest-writer/test/addCatalogs.test.ts rename to workspace/workspace-manifest-writer/test/addCatalogs.test.ts index e67428569a..efb6910345 100644 --- a/workspace/manifest-writer/test/addCatalogs.test.ts +++ b/workspace/workspace-manifest-writer/test/addCatalogs.test.ts @@ -3,7 +3,7 @@ import path from 'node:path' import { WORKSPACE_MANIFEST_FILENAME } from '@pnpm/constants' import { tempDir } from '@pnpm/prepare-temp-dir' -import { updateWorkspaceManifest } from '@pnpm/workspace.manifest-writer' +import { updateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-writer' import { readYamlFileSync } from 'read-yaml-file' import { writeYamlFileSync } from 'write-yaml-file' diff --git a/workspace/manifest-writer/test/removeCatalogs.test.ts b/workspace/workspace-manifest-writer/test/removeCatalogs.test.ts similarity index 99% rename from workspace/manifest-writer/test/removeCatalogs.test.ts rename to workspace/workspace-manifest-writer/test/removeCatalogs.test.ts index 8b59429231..e182e159b2 100644 --- a/workspace/manifest-writer/test/removeCatalogs.test.ts +++ b/workspace/workspace-manifest-writer/test/removeCatalogs.test.ts @@ -5,7 +5,7 @@ import { WORKSPACE_MANIFEST_FILENAME } from '@pnpm/constants' import { findPackages } from '@pnpm/fs.find-packages' import { prepare } from '@pnpm/prepare' import { tempDir } from '@pnpm/prepare-temp-dir' -import { updateWorkspaceManifest } from '@pnpm/workspace.manifest-writer' +import { updateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-writer' import { readYamlFileSync } from 'read-yaml-file' import { writeYamlFileSync } from 'write-yaml-file' diff --git a/workspace/resolve-workspace-range/test/tsconfig.json b/workspace/workspace-manifest-writer/test/tsconfig.json similarity index 100% rename from workspace/resolve-workspace-range/test/tsconfig.json rename to workspace/workspace-manifest-writer/test/tsconfig.json diff --git a/workspace/manifest-writer/test/updateWorkspaceManifest.test.ts b/workspace/workspace-manifest-writer/test/updateWorkspaceManifest.test.ts similarity index 98% rename from workspace/manifest-writer/test/updateWorkspaceManifest.test.ts rename to workspace/workspace-manifest-writer/test/updateWorkspaceManifest.test.ts index ac410ad26d..c7c4d15678 100644 --- a/workspace/manifest-writer/test/updateWorkspaceManifest.test.ts +++ b/workspace/workspace-manifest-writer/test/updateWorkspaceManifest.test.ts @@ -3,7 +3,7 @@ import path from 'node:path' import { WORKSPACE_MANIFEST_FILENAME } from '@pnpm/constants' import { tempDir } from '@pnpm/prepare-temp-dir' -import { updateWorkspaceManifest } from '@pnpm/workspace.manifest-writer' +import { updateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-writer' import { readYamlFileSync } from 'read-yaml-file' import { writeYamlFileSync } from 'write-yaml-file' diff --git a/workspace/manifest-writer/tsconfig.json b/workspace/workspace-manifest-writer/tsconfig.json similarity index 93% rename from workspace/manifest-writer/tsconfig.json rename to workspace/workspace-manifest-writer/tsconfig.json index 3b2f3e2035..f715a201d7 100644 --- a/workspace/manifest-writer/tsconfig.json +++ b/workspace/workspace-manifest-writer/tsconfig.json @@ -37,7 +37,7 @@ "path": "../../yaml/document-sync" }, { - "path": "../read-manifest" + "path": "../workspace-manifest-reader" } ] } diff --git a/workspace/read-manifest/tsconfig.lint.json b/workspace/workspace-manifest-writer/tsconfig.lint.json similarity index 100% rename from workspace/read-manifest/tsconfig.lint.json rename to workspace/workspace-manifest-writer/tsconfig.lint.json