refactor: rename packages and consolidate runtime resolvers (#10999)

* refactor: rename workspace.sort-packages and workspace.pkgs-graph

- workspace.sort-packages -> workspace.projects-sorter
- workspace.pkgs-graph -> workspace.projects-graph

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* refactor: rename packages/ to core/ and pkg-manifest.read-package-json to reader

- Rename packages/ directory to core/ for clarity
- Rename pkg-manifest/read-package-json to pkg-manifest/reader (@pnpm/pkg-manifest.reader)
- Update all tsconfig, package.json, and lockfile references

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* refactor: consolidate runtime resolvers under engine/runtime domain

- Remove unused @pnpm/engine.runtime.node.fetcher package
- Rename engine/runtime/node.resolver to node-resolver (dash convention)
- Move resolving/bun-resolver to engine/runtime/bun-resolver
- Move resolving/deno-resolver to engine/runtime/deno-resolver
- Update all package names, tsconfig paths, and lockfile references

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* chore: update lockfile after removing node.fetcher

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: sort tsconfig references and package.json deps alphabetically

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: auto-fix import sorting

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: update __typings__ paths in tsconfig.lint.json for moved resolvers

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: remove deno-resolver from deps of bun-resolver

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

.changeset/env-cross-platform-musl.md

@@ -1,5 +1,4 @@
 ---
-"@pnpm/engine.runtime.node.fetcher": minor
 "@pnpm/engine.runtime.commands": minor
 "pnpm": minor
 ---

.changeset/five-lies-travel.md

@@ -20,7 +20,7 @@
 "@pnpm/installing.resolve-dependencies": major
 "@pnpm/releasing.exportable-manifest": major
 "@pnpm/deps.inspection.tree-builder": major
-"@pnpm/pkg-manifest.read-package-json": major
+"@pnpm/pkg-manifest.reader": major
 "@pnpm/resolving.jsr-specifier-parser": major
 "@pnpm/store.connection-manager": major
 "@pnpm/workspace.injected-deps-syncer": major
@@ -68,19 +68,19 @@
 "@pnpm/deps.graph-hasher": major
 "@pnpm/installing.context": major
 "@pnpm/bins.remover": major
-"@pnpm/resolving.deno-resolver": major
+"@pnpm/engine.runtime.deno-resolver": 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/workspace.projects-sorter": major
 "@pnpm/assert-store": 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/engine.runtime.bun-resolver": major
 "@pnpm/resolving.git-resolver": major
 "@pnpm/resolving.npm-resolver": major
 "@pnpm/jest-config": major
@@ -103,7 +103,7 @@
 "@pnpm/patching.apply-patch": major
 "@pnpm/installing.deps-restorer": major
 "@pnpm/text.comments-parser": major
-"@pnpm/workspace.pkgs-graph": major
+"@pnpm/workspace.projects-graph": major
 "@pnpm/crypto.shasums-file": major
 "@pnpm/fs.read-modules-dir": major
 "@pnpm/network.auth-header": major
@@ -123,10 +123,9 @@
 "@pnpm/prepare": major
 "@pnpm/scripts": major
 "@pnpm/catalogs.resolver": major
-"@pnpm/engine.runtime.node.resolver": 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/installing.deps-installer": major

.changeset/install-from-release-channels.md

@@ -1,6 +1,6 @@
 ---
-"@pnpm/engine.runtime.node.resolver": patch
+"@pnpm/engine.runtime.node-resolver": patch
 "@pnpm/engine.runtime.commands": patch
 ---
 
-`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`).
+`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`).

.changeset/node-runtime-musl-support.md

@@ -1,5 +1,5 @@
 ---
-"@pnpm/engine.runtime.node.resolver": patch
+"@pnpm/engine.runtime.node-resolver": patch
 "pnpm": patch
 ---
 

.changeset/polite-carpets-relax.md

@@ -19,7 +19,7 @@
 "@pnpm/installing.resolve-dependencies": major
 "@pnpm/releasing.exportable-manifest": major
 "@pnpm/deps.inspection.tree-builder": major
-"@pnpm/pkg-manifest.read-package-json": major
+"@pnpm/pkg-manifest.reader": major
 "@pnpm/resolving.jsr-specifier-parser": major
 "@pnpm/store.connection-manager": major
 "@pnpm/workspace.injected-deps-syncer": major
@@ -61,18 +61,18 @@
 "@pnpm/deps.graph-hasher": major
 "@pnpm/installing.context": major
 "@pnpm/bins.remover": major
-"@pnpm/resolving.deno-resolver": major
+"@pnpm/engine.runtime.deno-resolver": 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/workspace.projects-sorter": 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/engine.runtime.bun-resolver": major
 "@pnpm/resolving.git-resolver": major
 "@pnpm/resolving.npm-resolver": major
 "@pnpm/config.deps-installer": major
@@ -94,7 +94,7 @@
 "@pnpm/patching.apply-patch": major
 "@pnpm/installing.deps-restorer": major
 "@pnpm/text.comments-parser": major
-"@pnpm/workspace.pkgs-graph": major
+"@pnpm/workspace.projects-graph": major
 "@pnpm/crypto.shasums-file": major
 "@pnpm/fs.read-modules-dir": major
 "@pnpm/network.auth-header": major
@@ -110,10 +110,9 @@
 "@pnpm/deps.inspection.outdated": major
 "@pnpm/testing.temp-store": major
 "@pnpm/catalogs.resolver": major
-"@pnpm/engine.runtime.node.resolver": 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/installing.deps-installer": major

.changeset/refactor-env-use-global-bin-linker.md

@@ -2,7 +2,7 @@
 "@pnpm/constants": patch
 "@pnpm/resolving.resolver-base": patch
 "@pnpm/lockfile.types": patch
-"@pnpm/engine.runtime.node.resolver": patch
+"@pnpm/engine.runtime.node-resolver": patch
 "@pnpm/engine.runtime.commands": patch
 ---
 

.changeset/silver-geckos-hunt.md

@@ -1,5 +1,5 @@
 ---
-"@pnpm/engine.runtime.node.resolver": patch
+"@pnpm/engine.runtime.node-resolver": patch
 "pnpm": patch
 ---
 

.meta-updater/tsconfig.json

@@ -10,18 +10,18 @@
     "../typings/**/*.d.ts"
   ],
   "references": [
+    {
+      "path": "../core/logger"
+    },
+    {
+      "path": "../core/types"
+    },
     {
       "path": "../lockfile/fs"
     },
     {
       "path": "../object/key-sorting"
     },
-    {
-      "path": "../packages/logger"
-    },
-    {
-      "path": "../packages/types"
-    },
     {
       "path": "../workspace/projects-reader"
     },

__fixtures__/workspace-has-shared-npm-shrinkwrap-json/package.json

@@ -3,6 +3,6 @@
   "name": "workspace-has-shared-npm-shrinkwrap-json",
   "version": "1.0.0",
   "workspaces": [
-    "packages/**"
+    "core/**"
   ]
 }

__fixtures__/workspace-has-shared-package-lock-json/package.json

@@ -3,6 +3,6 @@
   "name": "workspace-has-shared-package-lock-json",
   "version": "1.0.0",
   "workspaces": [
-    "packages/**"
+    "core/**"
   ]
 }

__fixtures__/workspace-has-shared-yarn-lock/package.json

@@ -3,6 +3,6 @@
   "name": "workspace-has-shared-yarn-lock",
   "version": "1.0.0",
   "workspaces": [
-    "packages/**"
+    "core/**"
   ]
 }

__utils__/assert-project/tsconfig.json

@@ -9,18 +9,18 @@
     "../../__typings__/**/*.d.ts"
   ],
   "references": [
+    {
+      "path": "../../core/constants"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../installing/modules-yaml"
     },
     {
       "path": "../../lockfile/types"
     },
-    {
-      "path": "../../packages/constants"
-    },
-    {
-      "path": "../../packages/types"
-    },
     {
       "path": "../assert-store"
     }

__utils__/assert-store/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/constants"
+      "path": "../../core/constants"
     },
     {
       "path": "../../store/cafs"

__utils__/prepare/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     },
     {
       "path": "../assert-project"

bins/linker/package.json

@@ -37,7 +37,7 @@
     "@pnpm/constants": "workspace:*",
     "@pnpm/error": "workspace:*",
     "@pnpm/fs.read-modules-dir": "workspace:*",
-    "@pnpm/pkg-manifest.read-package-json": "workspace:*",
+    "@pnpm/pkg-manifest.reader": "workspace:*",
     "@pnpm/pkg-manifest.utils": "workspace:*",
     "@pnpm/types": "workspace:*",
     "@pnpm/workspace.project-manifest-reader": "workspace:*",

bins/linker/src/index.ts

@@ -7,7 +7,7 @@ import { getBunBinLocationForCurrentOS, getDenoBinLocationForCurrentOS, getNodeB
 import { PnpmError } from '@pnpm/error'
 import { readModulesDir } from '@pnpm/fs.read-modules-dir'
 import { globalWarn, logger } from '@pnpm/logger'
-import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json'
+import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader'
 import { getAllDependenciesFromManifest } from '@pnpm/pkg-manifest.utils'
 import type { DependencyManifest, EngineDependency, ProjectManifest } from '@pnpm/types'
 import { safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader'

bins/linker/tsconfig.json

@@ -12,23 +12,23 @@
     {
       "path": "../../__utils__/test-fixtures"
     },
+    {
+      "path": "../../core/constants"
+    },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/logger"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../fs/read-modules-dir"
     },
     {
-      "path": "../../packages/constants"
-    },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/logger"
-    },
-    {
-      "path": "../../packages/types"
-    },
-    {
-      "path": "../../pkg-manifest/read-package-json"
+      "path": "../../pkg-manifest/reader"
     },
     {
       "path": "../../pkg-manifest/utils"

bins/remover/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@pnpm/bins.resolver": "workspace:*",
     "@pnpm/core-loggers": "workspace:*",
-    "@pnpm/pkg-manifest.read-package-json": "workspace:*",
+    "@pnpm/pkg-manifest.reader": "workspace:*",
     "@pnpm/types": "workspace:*",
     "@zkochan/rimraf": "catalog:",
     "cmd-extension": "catalog:",

bins/remover/src/removeBins.ts

@@ -4,7 +4,7 @@ import { getBinsFromPackageManifest } from '@pnpm/bins.resolver'
 import {
   removalLogger,
 } from '@pnpm/core-loggers'
-import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json'
+import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader'
 import type { DependencyManifest } from '@pnpm/types'
 import { rimraf } from '@zkochan/rimraf'
 import { cmdExtension as CMD_EXTENSION } from 'cmd-extension'

bins/remover/tsconfig.json

@@ -10,16 +10,16 @@
   ],
   "references": [
     {
-      "path": "../../packages/core-loggers"
+      "path": "../../core/core-loggers"
     },
     {
-      "path": "../../packages/logger"
+      "path": "../../core/logger"
     },
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     },
     {
-      "path": "../../pkg-manifest/read-package-json"
+      "path": "../../pkg-manifest/reader"
     },
     {
       "path": "../resolver"

bins/resolver/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     }
   ]
 }

building/after-install/package.json

@@ -49,7 +49,7 @@
     "@pnpm/lockfile.utils": "workspace:*",
     "@pnpm/lockfile.walker": "workspace:*",
     "@pnpm/npm-package-arg": "catalog:",
-    "@pnpm/pkg-manifest.read-package-json": "workspace:*",
+    "@pnpm/pkg-manifest.reader": "workspace:*",
     "@pnpm/store.cafs": "workspace:*",
     "@pnpm/store.connection-manager": "workspace:*",
     "@pnpm/store.controller-types": "workspace:*",

building/after-install/src/index.ts

@@ -30,7 +30,7 @@ import {
 import { lockfileWalker, type LockfileWalkerStep } from '@pnpm/lockfile.walker'
 import { logger, streamParser } from '@pnpm/logger'
 import npa from '@pnpm/npm-package-arg'
-import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json'
+import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader'
 import type { PackageFilesIndex } from '@pnpm/store.cafs'
 import { createStoreController } from '@pnpm/store.connection-manager'
 import { StoreIndex, storeIndexKey } from '@pnpm/store.index'

building/after-install/tsconfig.json

@@ -18,6 +18,18 @@
     {
       "path": "../../config/reader"
     },
+    {
+      "path": "../../core/constants"
+    },
+    {
+      "path": "../../core/core-loggers"
+    },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../deps/graph-hasher"
     },
@@ -46,19 +58,7 @@
       "path": "../../lockfile/walker"
     },
     {
-      "path": "../../packages/constants"
-    },
-    {
-      "path": "../../packages/core-loggers"
-    },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/types"
-    },
-    {
-      "path": "../../pkg-manifest/read-package-json"
+      "path": "../../pkg-manifest/reader"
     },
     {
       "path": "../../store/cafs"

building/commands/package.json

@@ -44,7 +44,7 @@
     "@pnpm/store.connection-manager": "workspace:*",
     "@pnpm/types": "workspace:*",
     "@pnpm/util.lex-comparator": "catalog:",
-    "@pnpm/workspace.sort-packages": "workspace:*",
+    "@pnpm/workspace.projects-sorter": "workspace:*",
     "chalk": "catalog:",
     "enquirer": "catalog:",
     "p-limit": "catalog:",

building/commands/src/build/recursive.ts

@@ -14,7 +14,7 @@ import {
 import { logger } from '@pnpm/logger'
 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 { sortPackages } from '@pnpm/workspace.projects-sorter'
 import pLimit from 'p-limit'
 
 type RecursiveRebuildOpts = CreateStoreControllerOptions & Pick<Config,

building/commands/tsconfig.json

@@ -36,6 +36,18 @@
     {
       "path": "../../config/writer"
     },
+    {
+      "path": "../../core/constants"
+    },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/logger"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../crypto/object-hasher"
     },
@@ -45,18 +57,6 @@
     {
       "path": "../../installing/modules-yaml"
     },
-    {
-      "path": "../../packages/constants"
-    },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/logger"
-    },
-    {
-      "path": "../../packages/types"
-    },
     {
       "path": "../../store/cafs"
     },
@@ -70,7 +70,7 @@
       "path": "../../workspace/projects-filter"
     },
     {
-      "path": "../../workspace/sort-packages"
+      "path": "../../workspace/projects-sorter"
     },
     {
       "path": "../after-install"

building/during-install/package.json

@@ -44,7 +44,7 @@
     "@pnpm/fs.hard-link-dir": "workspace:*",
     "@pnpm/patching.apply-patch": "workspace:*",
     "@pnpm/patching.types": "workspace:*",
-    "@pnpm/pkg-manifest.read-package-json": "workspace:*",
+    "@pnpm/pkg-manifest.reader": "workspace:*",
     "@pnpm/store.controller-types": "workspace:*",
     "@pnpm/types": "workspace:*",
     "p-defer": "catalog:",

building/during-install/src/index.ts

@@ -11,7 +11,7 @@ import { PnpmError } from '@pnpm/error'
 import { runPostinstallHooks } from '@pnpm/exec.lifecycle'
 import { logger } from '@pnpm/logger'
 import { applyPatchToDir } from '@pnpm/patching.apply-patch'
-import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json'
+import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader'
 import type { StoreController } from '@pnpm/store.controller-types'
 import type {
   AllowBuild,

building/during-install/tsconfig.json

@@ -15,6 +15,18 @@
     {
       "path": "../../config/reader"
     },
+    {
+      "path": "../../core/core-loggers"
+    },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/logger"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../deps/graph-hasher"
     },
@@ -30,18 +42,6 @@
     {
       "path": "../../fs/hard-link-dir"
     },
-    {
-      "path": "../../packages/core-loggers"
-    },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/logger"
-    },
-    {
-      "path": "../../packages/types"
-    },
     {
       "path": "../../patching/apply-patch"
     },
@@ -49,7 +49,7 @@
       "path": "../../patching/types"
     },
     {
-      "path": "../../pkg-manifest/read-package-json"
+      "path": "../../pkg-manifest/reader"
     },
     {
       "path": "../../store/controller-types"

building/pkg-requires-build/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     }
   ]
 }

building/policy/tsconfig.json

@@ -13,7 +13,7 @@
       "path": "../../config/version-policy"
     },
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     }
   ]
 }

cache/api/tsconfig.json

@@ -13,10 +13,10 @@
       "path": "../../config/reader"
     },
     {
-      "path": "../../packages/constants"
+      "path": "../../core/constants"
     },
     {
-      "path": "../../packages/logger"
+      "path": "../../core/logger"
     },
     {
       "path": "../../resolving/npm-resolver"

cache/commands/tsconfig.json

@@ -19,13 +19,13 @@
       "path": "../../config/reader"
     },
     {
-      "path": "../../packages/constants"
+      "path": "../../core/constants"
     },
     {
-      "path": "../../packages/error"
+      "path": "../../core/error"
     },
     {
-      "path": "../../packages/logger"
+      "path": "../../core/logger"
     },
     {
       "path": "../../store/path"

catalogs/config/tsconfig.json

@@ -11,7 +11,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/error"
+      "path": "../../core/error"
     },
     {
       "path": "../../workspace/workspace-manifest-reader"

catalogs/resolver/tsconfig.json

@@ -11,7 +11,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/error"
+      "path": "../../core/error"
     },
     {
       "path": "../protocol-parser"

cli/commands/tsconfig.json

@@ -13,10 +13,10 @@
       "path": "../../config/reader"
     },
     {
-      "path": "../../packages/error"
+      "path": "../../core/error"
     },
     {
-      "path": "../../packages/logger"
+      "path": "../../core/logger"
     },
     {
       "path": "../../workspace/projects-reader"

cli/default-reporter/tsconfig.json

@@ -13,6 +13,18 @@
     {
       "path": "../../config/reader"
     },
+    {
+      "path": "../../core/core-loggers"
+    },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/logger"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../installing/dedupe/issues-renderer"
     },
@@ -22,18 +34,6 @@
     {
       "path": "../../installing/render-peer-issues"
     },
-    {
-      "path": "../../packages/core-loggers"
-    },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/logger"
-    },
-    {
-      "path": "../../packages/types"
-    },
     {
       "path": "../meta"
     }

cli/meta/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     }
   ]
 }

cli/parse-cli-args/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/error"
+      "path": "../../core/error"
     },
     {
       "path": "../../workspace/root-finder"

cli/utils/tsconfig.json

@@ -21,18 +21,18 @@
     {
       "path": "../../config/reader"
     },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/logger"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../hooks/pnpmfile"
     },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/logger"
-    },
-    {
-      "path": "../../packages/types"
-    },
     {
       "path": "../../pkg-manifest/utils"
     },

config/commands/tsconfig.json

@@ -15,6 +15,15 @@
     {
       "path": "../../cli/utils"
     },
+    {
+      "path": "../../core/constants"
+    },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/logger"
+    },
     {
       "path": "../../exec/run-npm"
     },
@@ -24,15 +33,6 @@
     {
       "path": "../../object/property-path"
     },
-    {
-      "path": "../../packages/constants"
-    },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/logger"
-    },
     {
       "path": "../../text/naming-cases"
     },

config/deps-installer/package.json

@@ -47,7 +47,7 @@
     "@pnpm/lockfile.utils": "workspace:*",
     "@pnpm/network.auth-header": "workspace:*",
     "@pnpm/network.fetch": "workspace:*",
-    "@pnpm/pkg-manifest.read-package-json": "workspace:*",
+    "@pnpm/pkg-manifest.reader": "workspace:*",
     "@pnpm/resolving.npm-resolver": "workspace:*",
     "@pnpm/resolving.parse-wanted-dependency": "workspace:*",
     "@pnpm/store.controller": "workspace:*",

config/deps-installer/src/installConfigDeps.ts

@@ -7,7 +7,7 @@ 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 { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json'
+import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader'
 import type { StoreController } from '@pnpm/store.controller'
 import type { ConfigDependencies, Registries } from '@pnpm/types'
 import { rimraf } from '@zkochan/rimraf'

config/deps-installer/tsconfig.json

@@ -12,6 +12,18 @@
     {
       "path": "../../__utils__/prepare"
     },
+    {
+      "path": "../../core/constants"
+    },
+    {
+      "path": "../../core/core-loggers"
+    },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../deps/graph-hasher"
     },
@@ -40,19 +52,7 @@
       "path": "../../network/fetch"
     },
     {
-      "path": "../../packages/constants"
-    },
-    {
-      "path": "../../packages/core-loggers"
-    },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/types"
-    },
-    {
-      "path": "../../pkg-manifest/read-package-json"
+      "path": "../../pkg-manifest/reader"
     },
     {
       "path": "../../resolving/npm-resolver"

config/normalize-registries/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     }
   ]
 }

config/package-is-installable/tsconfig.json

@@ -12,20 +12,20 @@
     {
       "path": "../../cli/meta"
     },
+    {
+      "path": "../../core/core-loggers"
+    },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/logger"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../engine/runtime/system-node-version"
-    },
-    {
-      "path": "../../packages/core-loggers"
-    },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/logger"
-    },
-    {
-      "path": "../../packages/types"
     }
   ]
 }

config/parse-overrides/tsconfig.json

@@ -16,7 +16,7 @@
       "path": "../../catalogs/types"
     },
     {
-      "path": "../../packages/error"
+      "path": "../../core/error"
     },
     {
       "path": "../../resolving/parse-wanted-dependency"

config/pick-registry-for-package/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     }
   ]
 }

config/reader/test/fixtures/pkg-using-workspaces/package.json

@@ -1,3 +1,3 @@
 {
-  "workspaces": ["packages/*"]
+  "workspaces": ["core/*"]
 }

config/reader/tsconfig.json

@@ -21,21 +21,21 @@
     {
       "path": "../../catalogs/types"
     },
+    {
+      "path": "../../core/constants"
+    },
+    {
+      "path": "../../core/error"
+    },
+    {
+      "path": "../../core/types"
+    },
     {
       "path": "../../hooks/pnpmfile"
     },
     {
       "path": "../../network/git-utils"
     },
-    {
-      "path": "../../packages/constants"
-    },
-    {
-      "path": "../../packages/error"
-    },
-    {
-      "path": "../../packages/types"
-    },
     {
       "path": "../../text/naming-cases"
     },

config/version-policy/tsconfig.json

@@ -10,10 +10,10 @@
   ],
   "references": [
     {
-      "path": "../../packages/error"
+      "path": "../../core/error"
     },
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     },
     {
       "path": "../matcher"

config/writer/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../packages/types"
+      "path": "../../core/types"
     },
     {
       "path": "../../workspace/project-manifest-reader"

core/constants/package.json

@@ -9,8 +9,8 @@
   ],
   "license": "MIT",
   "funding": "https://opencollective.com/pnpm",
-  "repository": "https://github.com/pnpm/pnpm/tree/main/packages/constants",
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/packages/constants#readme",
+  "repository": "https://github.com/pnpm/pnpm/tree/main/core/constants",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/core/constants#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },

core/core-loggers/package.json

@@ -8,8 +8,8 @@
   ],
   "license": "MIT",
   "funding": "https://opencollective.com/pnpm",
-  "repository": "https://github.com/pnpm/pnpm/tree/main/packages/core-loggers",
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/packages/core-loggers#readme",
+  "repository": "https://github.com/pnpm/pnpm/tree/main/core/core-loggers",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/core/core-loggers#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },

core/error/package.json

@@ -9,8 +9,8 @@
   ],
   "license": "MIT",
   "funding": "https://opencollective.com/pnpm",
-  "repository": "https://github.com/pnpm/pnpm/tree/main/packages/error",
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/packages/error#readme",
+  "repository": "https://github.com/pnpm/pnpm/tree/main/core/error",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/core/error#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },