From dba415376758fbf8316ea7d19c93a3d3ce3fa33c Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 18 Mar 2026 00:19:58 +0100 Subject: [PATCH] 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 * 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 * 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 * chore: update lockfile after removing node.fetcher Co-Authored-By: Claude Opus 4.6 * fix: sort tsconfig references and package.json deps alphabetically Co-Authored-By: Claude Opus 4.6 * fix: auto-fix import sorting Co-Authored-By: Claude Opus 4.6 * fix: update __typings__ paths in tsconfig.lint.json for moved resolvers Co-Authored-By: Claude Opus 4.6 * fix: remove deno-resolver from deps of bun-resolver --------- Co-authored-by: Claude Opus 4.6 --- .changeset/env-cross-platform-musl.md | 1 - .changeset/five-lies-travel.md | 13 +- .changeset/install-from-release-channels.md | 4 +- .changeset/node-runtime-musl-support.md | 2 +- .changeset/polite-carpets-relax.md | 13 +- .../refactor-env-use-global-bin-linker.md | 2 +- .changeset/silver-geckos-hunt.md | 2 +- .meta-updater/tsconfig.json | 12 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- __utils__/assert-project/tsconfig.json | 12 +- __utils__/assert-store/tsconfig.json | 2 +- __utils__/prepare/tsconfig.json | 2 +- bins/linker/package.json | 2 +- bins/linker/src/index.ts | 2 +- bins/linker/tsconfig.json | 26 +- bins/remover/package.json | 2 +- bins/remover/src/removeBins.ts | 2 +- bins/remover/tsconfig.json | 8 +- bins/resolver/tsconfig.json | 2 +- building/after-install/package.json | 2 +- building/after-install/src/index.ts | 2 +- building/after-install/tsconfig.json | 26 +- building/commands/package.json | 2 +- building/commands/src/build/recursive.ts | 2 +- building/commands/tsconfig.json | 26 +- building/during-install/package.json | 2 +- building/during-install/src/index.ts | 2 +- building/during-install/tsconfig.json | 26 +- building/pkg-requires-build/tsconfig.json | 2 +- building/policy/tsconfig.json | 2 +- cache/api/tsconfig.json | 4 +- cache/commands/tsconfig.json | 6 +- catalogs/config/tsconfig.json | 2 +- catalogs/resolver/tsconfig.json | 2 +- cli/commands/tsconfig.json | 4 +- cli/default-reporter/tsconfig.json | 24 +- cli/meta/tsconfig.json | 2 +- cli/parse-cli-args/tsconfig.json | 2 +- cli/utils/tsconfig.json | 18 +- config/commands/tsconfig.json | 18 +- config/deps-installer/package.json | 2 +- .../deps-installer/src/installConfigDeps.ts | 2 +- config/deps-installer/tsconfig.json | 26 +- config/normalize-registries/tsconfig.json | 2 +- config/package-is-installable/tsconfig.json | 24 +- config/parse-overrides/tsconfig.json | 2 +- .../pick-registry-for-package/tsconfig.json | 2 +- .../pkg-using-workspaces/package.json | 2 +- config/reader/tsconfig.json | 18 +- config/version-policy/tsconfig.json | 4 +- config/writer/tsconfig.json | 2 +- {packages => core}/constants/CHANGELOG.md | 0 {packages => core}/constants/README.md | 0 {packages => core}/constants/package.json | 4 +- {packages => core}/constants/src/index.ts | 0 {packages => core}/constants/tsconfig.json | 0 .../constants/tsconfig.lint.json | 0 {packages => core}/core-loggers/CHANGELOG.md | 0 {packages => core}/core-loggers/README.md | 0 {packages => core}/core-loggers/package.json | 4 +- {packages => core}/core-loggers/src/all.ts | 0 .../core-loggers/src/contextLogger.ts | 0 .../core-loggers/src/deprecationLogger.ts | 0 .../core-loggers/src/executionTimeLogger.ts | 0 .../src/fetchingProgressLogger.ts | 0 .../core-loggers/src/hookLogger.ts | 0 .../core-loggers/src/ignoredScriptsLogger.ts | 0 {packages => core}/core-loggers/src/index.ts | 0 .../core-loggers/src/installCheckLogger.ts | 0 .../core-loggers/src/installingConfigDeps.ts | 0 .../core-loggers/src/lifecycleLogger.ts | 0 .../core-loggers/src/linkLogger.ts | 0 .../src/packageImportMethodLogger.ts | 0 .../core-loggers/src/packageManifestLogger.ts | 0 .../core-loggers/src/peerDependencyIssues.ts | 0 .../core-loggers/src/progressLogger.ts | 0 .../core-loggers/src/registryLogger.ts | 0 .../core-loggers/src/removalLogger.ts | 0 .../core-loggers/src/requestRetryLogger.ts | 0 .../core-loggers/src/rootLogger.ts | 0 .../core-loggers/src/scopeLogger.ts | 0 .../src/skippedOptionalDependencyLogger.ts | 0 .../core-loggers/src/stageLogger.ts | 0 .../core-loggers/src/statsLogger.ts | 0 .../core-loggers/src/summaryLogger.ts | 0 .../core-loggers/src/updateCheckLogger.ts | 0 {packages => core}/core-loggers/tsconfig.json | 0 .../core-loggers/tsconfig.lint.json | 0 {packages => core}/error/CHANGELOG.md | 0 {packages => core}/error/README.md | 0 {packages => core}/error/package.json | 4 +- {packages => core}/error/src/index.ts | 0 {packages => core}/error/test/index.ts | 0 {packages => core}/error/test/tsconfig.json | 0 {packages => core}/error/tsconfig.json | 0 {packages => core}/error/tsconfig.lint.json | 0 {packages => core}/logger/CHANGELOG.md | 0 {packages => core}/logger/README.md | 0 {packages => core}/logger/package.json | 4 +- {packages => core}/logger/src/LogBase.ts | 0 {packages => core}/logger/src/LogLevel.ts | 0 {packages => core}/logger/src/index.ts | 0 {packages => core}/logger/src/logger.ts | 0 {packages => core}/logger/src/ndjsonParse.ts | 0 {packages => core}/logger/src/streamParser.ts | 0 .../logger/src/writeToConsole.ts | 0 {packages => core}/logger/test/index.test.ts | 0 {packages => core}/logger/test/tsconfig.json | 0 {packages => core}/logger/tsconfig.json | 0 {packages => core}/logger/tsconfig.lint.json | 0 {packages => core}/types/CHANGELOG.md | 0 {packages => core}/types/README.md | 0 {packages => core}/types/package.json | 4 +- {packages => core}/types/src/config.ts | 0 {packages => core}/types/src/index.ts | 0 {packages => core}/types/src/misc.ts | 0 {packages => core}/types/src/options.ts | 0 {packages => core}/types/src/package.ts | 0 .../types/src/peerDependencyIssues.ts | 0 {packages => core}/types/src/project.ts | 0 {packages => core}/types/tsconfig.json | 0 {packages => core}/types/tsconfig.lint.json | 0 crypto/integrity/tsconfig.json | 2 +- crypto/shasums-file/tsconfig.json | 4 +- deps/compliance/audit/tsconfig.json | 24 +- deps/compliance/commands/package.json | 2 +- deps/compliance/commands/tsconfig.json | 20 +- deps/compliance/license-scanner/package.json | 2 +- .../license-scanner/src/getPkgInfo.ts | 2 +- deps/compliance/license-scanner/tsconfig.json | 26 +- deps/compliance/sbom/package.json | 2 +- deps/compliance/sbom/src/getPkgMetadata.ts | 2 +- deps/compliance/sbom/tsconfig.json | 14 +- deps/graph-builder/tsconfig.json | 24 +- deps/graph-hasher/tsconfig.json | 12 +- deps/inspection/commands/tsconfig.json | 18 +- deps/inspection/list/package.json | 2 +- deps/inspection/list/src/readPkg.ts | 2 +- .../__fixtures__/many-deps/pnpm-lock.yaml | 18 +- deps/inspection/list/tsconfig.json | 8 +- deps/inspection/outdated/tsconfig.json | 24 +- deps/inspection/tree-builder/package.json | 2 +- .../tree-builder/src/buildDependenciesTree.ts | 2 +- .../inspection/tree-builder/src/getPkgInfo.ts | 2 +- deps/inspection/tree-builder/tsconfig.json | 14 +- deps/path/tsconfig.json | 4 +- deps/status/tsconfig.json | 18 +- engine/pm/commands/tsconfig.json | 18 +- .../runtime}/bun-resolver/CHANGELOG.md | 0 engine/runtime/bun-resolver/README.md | 17 + .../runtime}/bun-resolver/package.json | 10 +- .../runtime}/bun-resolver/src/index.ts | 0 .../tsconfig.json | 19 +- .../tsconfig.lint.json | 0 engine/runtime/commands/package.json | 2 +- engine/runtime/commands/src/env/envList.ts | 2 +- engine/runtime/commands/tsconfig.json | 14 +- .../runtime}/deno-resolver/CHANGELOG.md | 0 engine/runtime/deno-resolver/README.md | 16 + .../runtime}/deno-resolver/package.json | 9 +- .../runtime}/deno-resolver/src/index.ts | 0 engine/runtime/deno-resolver/tsconfig.json | 43 + .../tsconfig.lint.json | 0 .../CHANGELOG.md | 0 engine/runtime/node-resolver/README.md | 15 + .../package.json | 8 +- .../src/getNodeArtifactAddress.ts | 0 .../src/getNodeMirror.ts | 0 .../src/index.ts | 0 .../src/normalizeArch.ts | 0 .../src/parseNodeSpecifier.ts | 0 .../test/getNodeArtifactAddress.test.ts | 0 .../test/getNodeMirror.test.ts | 0 .../test/normalizeArch.test.ts | 0 .../test/parseNodeSpecifier.test.ts | 0 .../test/resolveNodeVersion.test.ts | 2 +- .../test/resolveNodeVersions.test.ts | 2 +- .../test/tsconfig.json | 0 .../tsconfig.json | 18 +- .../runtime/node-resolver}/tsconfig.lint.json | 2 +- engine/runtime/node.fetcher/CHANGELOG.md | 1042 --------------- engine/runtime/node.fetcher/README.md | 17 - engine/runtime/node.fetcher/package.json | 60 - engine/runtime/node.fetcher/src/index.ts | 202 --- engine/runtime/node.fetcher/test/node.test.ts | 117 -- engine/runtime/node.resolver/README.md | 15 - .../runtime/node.resolver/test/tsconfig.json | 18 - exec/commands/package.json | 4 +- exec/commands/src/dlx.ts | 2 +- exec/commands/src/exec.ts | 2 +- exec/commands/src/runRecursive.ts | 2 +- exec/commands/tsconfig.json | 28 +- exec/lifecycle/package.json | 2 +- exec/lifecycle/src/index.ts | 2 +- exec/lifecycle/tsconfig.json | 26 +- exec/prepare-package/package.json | 2 +- exec/prepare-package/src/index.ts | 2 +- exec/prepare-package/tsconfig.json | 6 +- fetching/binary-fetcher/tsconfig.json | 2 +- fetching/directory-fetcher/tsconfig.json | 12 +- fetching/fetcher-base/tsconfig.json | 2 +- fetching/git-fetcher/tsconfig.json | 18 +- fetching/pick-fetcher/tsconfig.json | 6 +- fetching/tarball-fetcher/tsconfig.json | 24 +- fs/find-packages/tsconfig.json | 2 +- fs/hard-link-dir/tsconfig.json | 2 +- fs/indexed-pkg-importer/tsconfig.json | 4 +- fs/symlink-dependency/tsconfig.json | 6 +- global/commands/package.json | 2 +- .../commands/src/checkGlobalBinConflicts.ts | 2 +- global/commands/src/globalAdd.ts | 2 +- global/commands/src/readInstalledPackages.ts | 2 +- global/commands/tsconfig.json | 14 +- global/packages/package.json | 2 +- global/packages/src/scanGlobalPackages.ts | 2 +- global/packages/tsconfig.json | 8 +- hooks/pnpmfile/tsconfig.json | 24 +- hooks/read-package-hook/tsconfig.json | 12 +- hooks/types/tsconfig.json | 6 +- installing/client/package.json | 1 - installing/client/tsconfig.json | 5 +- installing/commands/package.json | 6 +- installing/commands/src/import/index.ts | 2 +- installing/commands/src/installDeps.ts | 4 +- installing/commands/src/recursive.ts | 2 +- installing/commands/tsconfig.json | 36 +- installing/context/tsconfig.json | 24 +- installing/dedupe/check/tsconfig.json | 12 +- installing/deps-installer/package.json | 2 +- installing/deps-installer/test/lockfile.ts | 2 +- installing/deps-installer/tsconfig.json | 32 +- installing/deps-restorer/package.json | 2 +- installing/deps-restorer/src/index.ts | 2 +- .../src/lockfileToHoistedDepGraph.ts | 2 +- .../deps-restorer/test/utils/testDefaults.ts | 2 +- installing/deps-restorer/tsconfig.json | 32 +- .../linking/direct-dep-linker/tsconfig.json | 12 +- installing/linking/hoist/tsconfig.json | 8 +- .../linking/modules-cleaner/tsconfig.json | 18 +- installing/linking/real-hoist/tsconfig.json | 12 +- installing/modules-yaml/tsconfig.json | 4 +- installing/package-requester/tsconfig.json | 24 +- .../read-projects-context/tsconfig.json | 12 +- installing/render-peer-issues/tsconfig.json | 4 +- installing/resolve-dependencies/package.json | 2 +- installing/resolve-dependencies/src/index.ts | 2 +- installing/resolve-dependencies/tsconfig.json | 32 +- lockfile/detect-dep-types/tsconfig.json | 4 +- lockfile/filtering/tsconfig.json | 24 +- lockfile/fs/tsconfig.json | 24 +- .../make-dedicated-lockfile/tsconfig.json | 6 +- lockfile/merger/tsconfig.json | 2 +- lockfile/preferred-versions/tsconfig.json | 2 +- lockfile/pruner/tsconfig.json | 12 +- lockfile/to-pnp/tsconfig.json | 12 +- lockfile/types/tsconfig.json | 2 +- lockfile/utils/tsconfig.json | 12 +- lockfile/verification/package.json | 2 +- .../src/linkedPackagesAreUpToDate.ts | 2 +- lockfile/verification/tsconfig.json | 20 +- lockfile/walker/tsconfig.json | 4 +- modules-mounter/daemon/tsconfig.json | 18 +- network/auth-header/tsconfig.json | 2 +- network/fetch/tsconfig.json | 18 +- object/property-path/tsconfig.json | 2 +- patching/apply-patch/tsconfig.json | 4 +- patching/commands/package.json | 2 +- patching/commands/src/patchCommit.ts | 2 +- patching/commands/tsconfig.json | 26 +- patching/config/tsconfig.json | 4 +- .../CHANGELOG.md | 0 .../{read-package-json => reader}/README.md | 0 .../package.json | 8 +- .../src/index.ts | 0 .../test/fixtures/invalid-name/package.json | 0 .../test/index.ts | 6 +- .../test/tsconfig.json | 0 .../tsconfig.json | 4 +- .../tsconfig.lint.json | 0 pkg-manifest/utils/tsconfig.json | 24 +- pnpm-lock.yaml | 1147 ++++++++--------- pnpm-workspace.yaml | 2 +- pnpm/package.json | 4 +- pnpm/test/install/misc.ts | 2 +- pnpm/test/monorepo/index.ts | 2 +- pnpm/test/uninstall.ts | 2 +- pnpm/test/update.ts | 2 +- pnpm/tsconfig.json | 38 +- releasing/commands/package.json | 2 +- releasing/commands/src/publish/pack.ts | 2 +- .../commands/src/publish/recursivePublish.ts | 2 +- releasing/commands/tsconfig.json | 26 +- releasing/exportable-manifest/tsconfig.json | 12 +- renovate.json | 2 +- resolving/bun-resolver/README.md | 17 - resolving/bun-resolver/tsconfig.json | 49 - resolving/default-resolver/package.json | 6 +- resolving/default-resolver/src/index.ts | 6 +- resolving/default-resolver/tsconfig.json | 26 +- resolving/deno-resolver/README.md | 16 - resolving/deno-resolver/tsconfig.json | 46 - resolving/git-resolver/tsconfig.json | 4 +- resolving/jsr-specifier-parser/tsconfig.json | 2 +- resolving/local-resolver/tsconfig.json | 18 +- resolving/npm-resolver/tsconfig.json | 30 +- .../pkg-metadata-filter/tsconfig.json | 2 +- resolving/registry/types/tsconfig.json | 2 +- resolving/resolver-base/tsconfig.json | 2 +- store/cafs-types/tsconfig.json | 2 +- store/cafs/tsconfig.json | 12 +- store/commands/tsconfig.json | 24 +- store/connection-manager/tsconfig.json | 4 +- store/controller-types/tsconfig.json | 4 +- store/controller/tsconfig.json | 18 +- store/create-cafs-store/tsconfig.json | 6 +- store/path/tsconfig.json | 4 +- worker/tsconfig.json | 18 +- workspace/commands/tsconfig.json | 12 +- workspace/injected-deps-syncer/package.json | 2 +- workspace/injected-deps-syncer/src/index.ts | 2 +- workspace/injected-deps-syncer/tsconfig.json | 20 +- .../project-manifest-reader/tsconfig.json | 12 +- .../project-manifest-writer/tsconfig.json | 2 +- workspace/projects-filter/package.json | 2 +- workspace/projects-filter/src/index.ts | 2 +- workspace/projects-filter/test/index.ts | 2 +- workspace/projects-filter/tsconfig.json | 6 +- .../CHANGELOG.md | 0 .../{pkgs-graph => projects-graph}/README.md | 4 +- .../package.json | 8 +- .../src/index.ts | 0 .../test/index.ts | 2 +- .../test/tsconfig.json | 0 .../tsconfig.json | 2 +- .../projects-graph}/tsconfig.lint.json | 0 workspace/projects-reader/tsconfig.json | 18 +- .../CHANGELOG.md | 0 workspace/projects-sorter/README.md | 15 + .../package.json | 8 +- .../src/index.ts | 0 .../tsconfig.json | 4 +- .../projects-sorter}/tsconfig.lint.json | 0 workspace/root-finder/tsconfig.json | 2 +- workspace/sort-packages/README.md | 15 - workspace/sort-packages/tsconfig.lint.json | 8 - workspace/state/tsconfig.json | 4 +- .../workspace-manifest-reader/tsconfig.json | 6 +- .../workspace-manifest-writer/tsconfig.json | 12 +- 350 files changed, 1621 insertions(+), 3205 deletions(-) rename {packages => core}/constants/CHANGELOG.md (100%) rename {packages => core}/constants/README.md (100%) rename {packages => core}/constants/package.json (83%) rename {packages => core}/constants/src/index.ts (100%) rename {packages => core}/constants/tsconfig.json (100%) rename {packages => core}/constants/tsconfig.lint.json (100%) rename {packages => core}/core-loggers/CHANGELOG.md (100%) rename {packages => core}/core-loggers/README.md (100%) rename {packages => core}/core-loggers/package.json (86%) rename {packages => core}/core-loggers/src/all.ts (100%) rename {packages => core}/core-loggers/src/contextLogger.ts (100%) rename {packages => core}/core-loggers/src/deprecationLogger.ts (100%) rename {packages => core}/core-loggers/src/executionTimeLogger.ts (100%) rename {packages => core}/core-loggers/src/fetchingProgressLogger.ts (100%) rename {packages => core}/core-loggers/src/hookLogger.ts (100%) rename {packages => core}/core-loggers/src/ignoredScriptsLogger.ts (100%) rename {packages => core}/core-loggers/src/index.ts (100%) rename {packages => core}/core-loggers/src/installCheckLogger.ts (100%) rename {packages => core}/core-loggers/src/installingConfigDeps.ts (100%) rename {packages => core}/core-loggers/src/lifecycleLogger.ts (100%) rename {packages => core}/core-loggers/src/linkLogger.ts (100%) rename {packages => core}/core-loggers/src/packageImportMethodLogger.ts (100%) rename {packages => core}/core-loggers/src/packageManifestLogger.ts (100%) rename {packages => core}/core-loggers/src/peerDependencyIssues.ts (100%) rename {packages => core}/core-loggers/src/progressLogger.ts (100%) rename {packages => core}/core-loggers/src/registryLogger.ts (100%) rename {packages => core}/core-loggers/src/removalLogger.ts (100%) rename {packages => core}/core-loggers/src/requestRetryLogger.ts (100%) rename {packages => core}/core-loggers/src/rootLogger.ts (100%) rename {packages => core}/core-loggers/src/scopeLogger.ts (100%) rename {packages => core}/core-loggers/src/skippedOptionalDependencyLogger.ts (100%) rename {packages => core}/core-loggers/src/stageLogger.ts (100%) rename {packages => core}/core-loggers/src/statsLogger.ts (100%) rename {packages => core}/core-loggers/src/summaryLogger.ts (100%) rename {packages => core}/core-loggers/src/updateCheckLogger.ts (100%) rename {packages => core}/core-loggers/tsconfig.json (100%) rename {packages => core}/core-loggers/tsconfig.lint.json (100%) rename {packages => core}/error/CHANGELOG.md (100%) rename {packages => core}/error/README.md (100%) rename {packages => core}/error/package.json (86%) rename {packages => core}/error/src/index.ts (100%) rename {packages => core}/error/test/index.ts (100%) rename {packages => core}/error/test/tsconfig.json (100%) rename {packages => core}/error/tsconfig.json (100%) rename {packages => core}/error/tsconfig.lint.json (100%) rename {packages => core}/logger/CHANGELOG.md (100%) rename {packages => core}/logger/README.md (100%) rename {packages => core}/logger/package.json (86%) rename {packages => core}/logger/src/LogBase.ts (100%) rename {packages => core}/logger/src/LogLevel.ts (100%) rename {packages => core}/logger/src/index.ts (100%) rename {packages => core}/logger/src/logger.ts (100%) rename {packages => core}/logger/src/ndjsonParse.ts (100%) rename {packages => core}/logger/src/streamParser.ts (100%) rename {packages => core}/logger/src/writeToConsole.ts (100%) rename {packages => core}/logger/test/index.test.ts (100%) rename {packages => core}/logger/test/tsconfig.json (100%) rename {packages => core}/logger/tsconfig.json (100%) rename {packages => core}/logger/tsconfig.lint.json (100%) rename {packages => core}/types/CHANGELOG.md (100%) rename {packages => core}/types/README.md (100%) rename {packages => core}/types/package.json (84%) rename {packages => core}/types/src/config.ts (100%) rename {packages => core}/types/src/index.ts (100%) rename {packages => core}/types/src/misc.ts (100%) rename {packages => core}/types/src/options.ts (100%) rename {packages => core}/types/src/package.ts (100%) rename {packages => core}/types/src/peerDependencyIssues.ts (100%) rename {packages => core}/types/src/project.ts (100%) rename {packages => core}/types/tsconfig.json (100%) rename {packages => core}/types/tsconfig.lint.json (100%) rename {resolving => engine/runtime}/bun-resolver/CHANGELOG.md (100%) create mode 100644 engine/runtime/bun-resolver/README.md rename {resolving => engine/runtime}/bun-resolver/package.json (78%) rename {resolving => engine/runtime}/bun-resolver/src/index.ts (100%) rename engine/runtime/{node.fetcher => bun-resolver}/tsconfig.json (60%) rename engine/runtime/{node.fetcher => bun-resolver}/tsconfig.lint.json (100%) rename {resolving => engine/runtime}/deno-resolver/CHANGELOG.md (100%) create mode 100644 engine/runtime/deno-resolver/README.md rename {resolving => engine/runtime}/deno-resolver/package.json (80%) rename {resolving => engine/runtime}/deno-resolver/src/index.ts (100%) create mode 100644 engine/runtime/deno-resolver/tsconfig.json rename engine/runtime/{node.resolver => deno-resolver}/tsconfig.lint.json (100%) rename engine/runtime/{node.resolver => node-resolver}/CHANGELOG.md (100%) create mode 100644 engine/runtime/node-resolver/README.md rename engine/runtime/{node.resolver => node-resolver}/package.json (90%) rename engine/runtime/{node.resolver => node-resolver}/src/getNodeArtifactAddress.ts (100%) rename engine/runtime/{node.resolver => node-resolver}/src/getNodeMirror.ts (100%) rename engine/runtime/{node.resolver => node-resolver}/src/index.ts (100%) rename engine/runtime/{node.resolver => node-resolver}/src/normalizeArch.ts (100%) rename engine/runtime/{node.resolver => node-resolver}/src/parseNodeSpecifier.ts (100%) rename engine/runtime/{node.resolver => node-resolver}/test/getNodeArtifactAddress.test.ts (100%) rename engine/runtime/{node.resolver => node-resolver}/test/getNodeMirror.test.ts (100%) rename engine/runtime/{node.resolver => node-resolver}/test/normalizeArch.test.ts (100%) rename engine/runtime/{node.resolver => node-resolver}/test/parseNodeSpecifier.test.ts (100%) rename engine/runtime/{node.resolver => node-resolver}/test/resolveNodeVersion.test.ts (92%) rename engine/runtime/{node.resolver => node-resolver}/test/resolveNodeVersions.test.ts (90%) rename engine/runtime/{node.fetcher => node-resolver}/test/tsconfig.json (100%) rename engine/runtime/{node.resolver => node-resolver}/tsconfig.json (80%) rename {workspace/pkgs-graph => engine/runtime/node-resolver}/tsconfig.lint.json (71%) delete mode 100644 engine/runtime/node.fetcher/CHANGELOG.md delete mode 100644 engine/runtime/node.fetcher/README.md delete mode 100644 engine/runtime/node.fetcher/package.json delete mode 100644 engine/runtime/node.fetcher/src/index.ts delete mode 100644 engine/runtime/node.fetcher/test/node.test.ts delete mode 100644 engine/runtime/node.resolver/README.md delete mode 100644 engine/runtime/node.resolver/test/tsconfig.json rename pkg-manifest/{read-package-json => reader}/CHANGELOG.md (100%) rename pkg-manifest/{read-package-json => reader}/README.md (100%) rename pkg-manifest/{read-package-json => reader}/package.json (87%) rename pkg-manifest/{read-package-json => reader}/src/index.ts (100%) rename pkg-manifest/{read-package-json => reader}/test/fixtures/invalid-name/package.json (100%) rename pkg-manifest/{read-package-json => reader}/test/index.ts (85%) rename pkg-manifest/{read-package-json => reader}/test/tsconfig.json (100%) rename pkg-manifest/{read-package-json => reader}/tsconfig.json (75%) rename pkg-manifest/{read-package-json => reader}/tsconfig.lint.json (100%) delete mode 100644 resolving/bun-resolver/README.md delete mode 100644 resolving/bun-resolver/tsconfig.json delete mode 100644 resolving/deno-resolver/README.md delete mode 100644 resolving/deno-resolver/tsconfig.json rename workspace/{pkgs-graph => projects-graph}/CHANGELOG.md (100%) rename workspace/{pkgs-graph => projects-graph}/README.md (93%) rename workspace/{pkgs-graph => projects-graph}/package.json (90%) rename workspace/{pkgs-graph => projects-graph}/src/index.ts (100%) rename workspace/{pkgs-graph => projects-graph}/test/index.ts (99%) rename workspace/{pkgs-graph => projects-graph}/test/tsconfig.json (100%) rename workspace/{pkgs-graph => projects-graph}/tsconfig.json (89%) rename {resolving/bun-resolver => workspace/projects-graph}/tsconfig.lint.json (100%) rename workspace/{sort-packages => projects-sorter}/CHANGELOG.md (100%) create mode 100644 workspace/projects-sorter/README.md rename workspace/{sort-packages => projects-sorter}/package.json (86%) rename workspace/{sort-packages => projects-sorter}/src/index.ts (100%) rename workspace/{sort-packages => projects-sorter}/tsconfig.json (87%) rename {resolving/deno-resolver => workspace/projects-sorter}/tsconfig.lint.json (100%) delete mode 100644 workspace/sort-packages/README.md delete mode 100644 workspace/sort-packages/tsconfig.lint.json diff --git a/.changeset/env-cross-platform-musl.md b/.changeset/env-cross-platform-musl.md index 043f6cc3f7..4c22c8aba8 100644 --- a/.changeset/env-cross-platform-musl.md +++ b/.changeset/env-cross-platform-musl.md @@ -1,5 +1,4 @@ --- -"@pnpm/engine.runtime.node.fetcher": minor "@pnpm/engine.runtime.commands": minor "pnpm": minor --- diff --git a/.changeset/five-lies-travel.md b/.changeset/five-lies-travel.md index 7820f9b06b..9cacebf2b7 100644 --- a/.changeset/five-lies-travel.md +++ b/.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 diff --git a/.changeset/install-from-release-channels.md b/.changeset/install-from-release-channels.md index 0e361bdcf9..88263dbba0 100644 --- a/.changeset/install-from-release-channels.md +++ b/.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`). diff --git a/.changeset/node-runtime-musl-support.md b/.changeset/node-runtime-musl-support.md index a66ecd31e2..dd26905658 100644 --- a/.changeset/node-runtime-musl-support.md +++ b/.changeset/node-runtime-musl-support.md @@ -1,5 +1,5 @@ --- -"@pnpm/engine.runtime.node.resolver": patch +"@pnpm/engine.runtime.node-resolver": patch "pnpm": patch --- diff --git a/.changeset/polite-carpets-relax.md b/.changeset/polite-carpets-relax.md index 9a9e5bb549..de35ceaeec 100644 --- a/.changeset/polite-carpets-relax.md +++ b/.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 diff --git a/.changeset/refactor-env-use-global-bin-linker.md b/.changeset/refactor-env-use-global-bin-linker.md index 12c465895f..6f86bb18c4 100644 --- a/.changeset/refactor-env-use-global-bin-linker.md +++ b/.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 --- diff --git a/.changeset/silver-geckos-hunt.md b/.changeset/silver-geckos-hunt.md index 51014fc556..cad7eebea3 100644 --- a/.changeset/silver-geckos-hunt.md +++ b/.changeset/silver-geckos-hunt.md @@ -1,5 +1,5 @@ --- -"@pnpm/engine.runtime.node.resolver": patch +"@pnpm/engine.runtime.node-resolver": patch "pnpm": patch --- diff --git a/.meta-updater/tsconfig.json b/.meta-updater/tsconfig.json index 7571216b43..a342309271 100644 --- a/.meta-updater/tsconfig.json +++ b/.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" }, diff --git a/__fixtures__/workspace-has-shared-npm-shrinkwrap-json/package.json b/__fixtures__/workspace-has-shared-npm-shrinkwrap-json/package.json index e9dce0dff1..fc837f4183 100644 --- a/__fixtures__/workspace-has-shared-npm-shrinkwrap-json/package.json +++ b/__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/**" ] } diff --git a/__fixtures__/workspace-has-shared-package-lock-json/package.json b/__fixtures__/workspace-has-shared-package-lock-json/package.json index d8c1eea55b..68a5a13b8f 100644 --- a/__fixtures__/workspace-has-shared-package-lock-json/package.json +++ b/__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/**" ] } diff --git a/__fixtures__/workspace-has-shared-yarn-lock/package.json b/__fixtures__/workspace-has-shared-yarn-lock/package.json index b18a8bad6e..6f9a6340e4 100644 --- a/__fixtures__/workspace-has-shared-yarn-lock/package.json +++ b/__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/**" ] } diff --git a/__utils__/assert-project/tsconfig.json b/__utils__/assert-project/tsconfig.json index 56dcee6e1e..6ca0096c9c 100644 --- a/__utils__/assert-project/tsconfig.json +++ b/__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" } diff --git a/__utils__/assert-store/tsconfig.json b/__utils__/assert-store/tsconfig.json index 76c3e8ce19..94e3b145e1 100644 --- a/__utils__/assert-store/tsconfig.json +++ b/__utils__/assert-store/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/constants" + "path": "../../core/constants" }, { "path": "../../store/cafs" diff --git a/__utils__/prepare/tsconfig.json b/__utils__/prepare/tsconfig.json index 7259768768..e476d8ed7e 100644 --- a/__utils__/prepare/tsconfig.json +++ b/__utils__/prepare/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../assert-project" diff --git a/bins/linker/package.json b/bins/linker/package.json index 8ce4f15321..8e144dadc1 100644 --- a/bins/linker/package.json +++ b/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:*", diff --git a/bins/linker/src/index.ts b/bins/linker/src/index.ts index 9a48948875..6d01866d21 100644 --- a/bins/linker/src/index.ts +++ b/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' diff --git a/bins/linker/tsconfig.json b/bins/linker/tsconfig.json index d777e8ff13..692f65725a 100644 --- a/bins/linker/tsconfig.json +++ b/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" diff --git a/bins/remover/package.json b/bins/remover/package.json index 63c601cc66..4a0ee4ff3b 100644 --- a/bins/remover/package.json +++ b/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:", diff --git a/bins/remover/src/removeBins.ts b/bins/remover/src/removeBins.ts index d25b053aae..3a4503763a 100644 --- a/bins/remover/src/removeBins.ts +++ b/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' diff --git a/bins/remover/tsconfig.json b/bins/remover/tsconfig.json index 431850c676..2be0b21e8f 100644 --- a/bins/remover/tsconfig.json +++ b/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" diff --git a/bins/resolver/tsconfig.json b/bins/resolver/tsconfig.json index d37dd6eefe..9a3fb59805 100644 --- a/bins/resolver/tsconfig.json +++ b/bins/resolver/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" } ] } diff --git a/building/after-install/package.json b/building/after-install/package.json index d5e8e569ce..3321e0e1d8 100644 --- a/building/after-install/package.json +++ b/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:*", diff --git a/building/after-install/src/index.ts b/building/after-install/src/index.ts index db4f2dc9c2..69d3c4e48b 100644 --- a/building/after-install/src/index.ts +++ b/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' diff --git a/building/after-install/tsconfig.json b/building/after-install/tsconfig.json index 759ea4957f..3badc52cb6 100644 --- a/building/after-install/tsconfig.json +++ b/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" diff --git a/building/commands/package.json b/building/commands/package.json index c07e51ee7b..d0dd9ac69b 100644 --- a/building/commands/package.json +++ b/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:", diff --git a/building/commands/src/build/recursive.ts b/building/commands/src/build/recursive.ts index 84e6adf9d6..92d5a3f0b2 100755 --- a/building/commands/src/build/recursive.ts +++ b/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=18.12'} - '@pnpm/resolving.bun-resolver@1005.0.1': + '@pnpm/engine.runtime.bun-resolver@1005.0.1': resolution: {integrity: sha512-TTOz/LszDpE7bWkF/kMXZZuPaqwKbLgNZ3tZuGw7JSFB89ZOZBJwXGO+oxQVyNTFIHHKw7g1aRq0jvM5VQGxMg==} engines: {node: '>=18.12'} peerDependencies: '@pnpm/worker': ^1000.6.1 - '@pnpm/resolving.deno-resolver@1005.0.1': + '@pnpm/engine.runtime.deno-resolver@1005.0.1': resolution: {integrity: sha512-peaPJIf565PBA+SkQrUOs4PA2KdR78mcIPbkZ1mE2ib/8UniNmhdfi0i5reepRS27eBDcE3FwHwjGPqBm3arGg==} engines: {node: '>=18.12'} peerDependencies: @@ -2368,7 +2368,7 @@ packages: resolution: {integrity: sha512-BYa9COEIfnjbY8sER9HvooHdt7xW4HUsdxA4QiSB7lsX0Lmtkqe0fHmloHh2Snqm/p2/jjoyHLoSz4/wENHZCA==} engines: {node: '>=18.12'} - '@pnpm/workspace.pkgs-graph@1000.0.33': + '@pnpm/workspace.projects-graph@1000.0.33': resolution: {integrity: sha512-u5AMhn9mXY5f74VXbN4pNCqI8BelXOGKuHdPD+9/eOLkQ3Ct1LtBzOjsMMF3l7XeWKXOrN0+ICHE9HKhlivSVA==} engines: {node: '>=18.12'} @@ -21291,8 +21291,8 @@ snapshots: '@pnpm/node.resolver': 1001.0.14(@pnpm/logger@1001.0.1) '@pnpm/npm-resolver': 1005.1.0(@pnpm/logger@1001.0.1) '@pnpm/resolver-base': 1005.4.0 - '@pnpm/resolving.bun-resolver': 1005.0.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2))(typanion@3.14.0) - '@pnpm/resolving.deno-resolver': 1005.0.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2))(typanion@3.14.0) + '@pnpm/engine.runtime.bun-resolver': 1005.0.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2))(typanion@3.14.0) + '@pnpm/engine.runtime.deno-resolver': 1005.0.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2))(typanion@3.14.0) '@pnpm/tarball-resolver': 1002.1.10 transitivePeerDependencies: - '@pnpm/logger' @@ -22516,7 +22516,7 @@ snapshots: dependencies: '@pnpm/types': 1001.3.0 - '@pnpm/resolving.bun-resolver@1005.0.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2))(typanion@3.14.0)': + '@pnpm/engine.runtime.bun-resolver@1005.0.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2))(typanion@3.14.0)': dependencies: '@pnpm/constants': 1001.3.1 '@pnpm/crypto.shasums-file': 1001.0.2 @@ -22537,7 +22537,7 @@ snapshots: - supports-color - typanion - '@pnpm/resolving.deno-resolver@1005.0.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2))(typanion@3.14.0)': + '@pnpm/engine.runtime.deno-resolver@1005.0.1(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2))(typanion@3.14.0)': dependencies: '@pnpm/constants': 1001.3.1 '@pnpm/crypto.shasums-file': 1001.0.2 @@ -22754,7 +22754,7 @@ snapshots: ramda: '@pnpm/ramda@0.28.1' write-yaml-file: 5.0.0 - '@pnpm/workspace.pkgs-graph@1000.0.33(@pnpm/logger@1001.0.1)': + '@pnpm/workspace.projects-graph@1000.0.33(@pnpm/logger@1001.0.1)': dependencies: '@pnpm/npm-package-arg': 2.0.0 '@pnpm/npm-resolver': 1005.1.0(@pnpm/logger@1001.0.1) @@ -43993,7 +43993,7 @@ snapshots: '@pnpm/store-connection-manager': 1002.3.9(@pnpm/logger@1001.0.1)(@pnpm/worker@1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2))(typanion@3.14.0) '@pnpm/types': 1001.2.0 '@pnpm/worker': 1000.6.1(@pnpm/logger@1001.0.1)(@types/node@25.2.2) - '@pnpm/workspace.pkgs-graph': 1000.0.33(@pnpm/logger@1001.0.1) + '@pnpm/workspace.projects-graph': 1000.0.33(@pnpm/logger@1001.0.1) '@teambit/bit-error': 0.0.404 '@teambit/cli': 0.0.1299(@types/react@17.0.91)(encoding@0.1.13)(react@17.0.2) '@teambit/cloud': 0.0.1163(3a8a6f4f6b1aed1af363fc7ff11bf4eb) diff --git a/deps/inspection/list/tsconfig.json b/deps/inspection/list/tsconfig.json index c6e7bbd2fe..1aaff4716d 100644 --- a/deps/inspection/list/tsconfig.json +++ b/deps/inspection/list/tsconfig.json @@ -12,14 +12,14 @@ { "path": "../../../__utils__/test-fixtures" }, + { + "path": "../../../core/types" + }, { "path": "../../../lockfile/fs" }, { - "path": "../../../packages/types" - }, - { - "path": "../../../pkg-manifest/read-package-json" + "path": "../../../pkg-manifest/reader" }, { "path": "../../../text/tree-renderer" diff --git a/deps/inspection/outdated/tsconfig.json b/deps/inspection/outdated/tsconfig.json index 00cfaae9f9..62327557cc 100644 --- a/deps/inspection/outdated/tsconfig.json +++ b/deps/inspection/outdated/tsconfig.json @@ -27,6 +27,18 @@ { "path": "../../../config/version-policy" }, + { + "path": "../../../core/constants" + }, + { + "path": "../../../core/error" + }, + { + "path": "../../../core/logger" + }, + { + "path": "../../../core/types" + }, { "path": "../../../hooks/read-package-hook" }, @@ -39,18 +51,6 @@ { "path": "../../../lockfile/utils" }, - { - "path": "../../../packages/constants" - }, - { - "path": "../../../packages/error" - }, - { - "path": "../../../packages/logger" - }, - { - "path": "../../../packages/types" - }, { "path": "../../../pkg-manifest/utils" }, diff --git a/deps/inspection/tree-builder/package.json b/deps/inspection/tree-builder/package.json index cff4f2f6a7..ba85718e93 100644 --- a/deps/inspection/tree-builder/package.json +++ b/deps/inspection/tree-builder/package.json @@ -43,7 +43,7 @@ "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/npm-package-arg": "catalog:", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/store.cafs": "workspace:*", "@pnpm/store.index": "workspace:*", "@pnpm/types": "workspace:*", diff --git a/deps/inspection/tree-builder/src/buildDependenciesTree.ts b/deps/inspection/tree-builder/src/buildDependenciesTree.ts index b7b5d56792..9c2966cd77 100644 --- a/deps/inspection/tree-builder/src/buildDependenciesTree.ts +++ b/deps/inspection/tree-builder/src/buildDependenciesTree.ts @@ -12,7 +12,7 @@ import { readWantedLockfile, type ResolvedDependencies, } from '@pnpm/lockfile.fs' -import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' 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/tree-builder/src/getPkgInfo.ts b/deps/inspection/tree-builder/src/getPkgInfo.ts index c6ff5f1eaf..e07797922e 100644 --- a/deps/inspection/tree-builder/src/getPkgInfo.ts +++ b/deps/inspection/tree-builder/src/getPkgInfo.ts @@ -11,7 +11,7 @@ import { nameVerFromPkgSnapshot, pkgSnapshotToResolution, } from '@pnpm/lockfile.utils' -import { readPackageJsonFromDirSync } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJsonFromDirSync } from '@pnpm/pkg-manifest.reader' import type { StoreIndex } from '@pnpm/store.index' import type { DependencyManifest, Registries } from '@pnpm/types' import normalizePath from 'normalize-path' diff --git a/deps/inspection/tree-builder/tsconfig.json b/deps/inspection/tree-builder/tsconfig.json index 2ff5a99c69..fa3e3fb447 100644 --- a/deps/inspection/tree-builder/tsconfig.json +++ b/deps/inspection/tree-builder/tsconfig.json @@ -18,6 +18,12 @@ { "path": "../../../config/normalize-registries" }, + { + "path": "../../../core/constants" + }, + { + "path": "../../../core/types" + }, { "path": "../../../fs/read-modules-dir" }, @@ -34,13 +40,7 @@ "path": "../../../lockfile/utils" }, { - "path": "../../../packages/constants" - }, - { - "path": "../../../packages/types" - }, - { - "path": "../../../pkg-manifest/read-package-json" + "path": "../../../pkg-manifest/reader" }, { "path": "../../../store/cafs" diff --git a/deps/path/tsconfig.json b/deps/path/tsconfig.json index 2fd26e7dde..fc53d4427e 100644 --- a/deps/path/tsconfig.json +++ b/deps/path/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../crypto/hash" + "path": "../../core/types" }, { - "path": "../../packages/types" + "path": "../../crypto/hash" } ] } diff --git a/deps/status/tsconfig.json b/deps/status/tsconfig.json index 0782260e98..899aa8d7a1 100644 --- a/deps/status/tsconfig.json +++ b/deps/status/tsconfig.json @@ -18,6 +18,15 @@ { "path": "../../config/reader" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/object-hasher" }, @@ -33,15 +42,6 @@ { "path": "../../lockfile/verification" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/resolver-base" }, diff --git a/engine/pm/commands/tsconfig.json b/engine/pm/commands/tsconfig.json index 1e8d0af489..46f3a56455 100644 --- a/engine/pm/commands/tsconfig.json +++ b/engine/pm/commands/tsconfig.json @@ -28,6 +28,15 @@ { "path": "../../../config/reader" }, + { + "path": "../../../core/error" + }, + { + "path": "../../../core/logger" + }, + { + "path": "../../../core/types" + }, { "path": "../../../deps/graph-hasher" }, @@ -46,15 +55,6 @@ { "path": "../../../lockfile/types" }, - { - "path": "../../../packages/error" - }, - { - "path": "../../../packages/logger" - }, - { - "path": "../../../packages/types" - }, { "path": "../../../resolving/npm-resolver" }, diff --git a/resolving/bun-resolver/CHANGELOG.md b/engine/runtime/bun-resolver/CHANGELOG.md similarity index 100% rename from resolving/bun-resolver/CHANGELOG.md rename to engine/runtime/bun-resolver/CHANGELOG.md diff --git a/engine/runtime/bun-resolver/README.md b/engine/runtime/bun-resolver/README.md new file mode 100644 index 0000000000..1f36f35154 --- /dev/null +++ b/engine/runtime/bun-resolver/README.md @@ -0,0 +1,17 @@ +# @pnpm/engine.runtime.bun-resolver + +> Resolves the Bun runtime + +[![npm version](https://img.shields.io/npm/v/@pnpm/engine.runtime.bun-resolver.svg)](https://www.npmjs.com/package/@pnpm/engine.runtime.bun-resolver) + +## Installation + +```sh +pnpm add @pnpm/engine.runtime.bun-resolver +``` + +## License + +MIT + + diff --git a/resolving/bun-resolver/package.json b/engine/runtime/bun-resolver/package.json similarity index 78% rename from resolving/bun-resolver/package.json rename to engine/runtime/bun-resolver/package.json index 5f40f8afff..7d04ceb7fe 100644 --- a/resolving/bun-resolver/package.json +++ b/engine/runtime/bun-resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/resolving.bun-resolver", + "name": "@pnpm/engine.runtime.bun-resolver", "version": "1002.0.1", "description": "Resolves the Bun runtime", "keywords": [ @@ -10,8 +10,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/resolving/bun-resolver", - "homepage": "https://github.com/pnpm/pnpm/tree/main/resolving/bun-resolver#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/bun-resolver", + "homepage": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/bun-resolver#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -34,7 +34,6 @@ "dependencies": { "@pnpm/constants": "workspace:*", "@pnpm/crypto.shasums-file": "workspace:*", - "@pnpm/engine.runtime.node.fetcher": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/fetching.binary-fetcher": "workspace:*", "@pnpm/fetching.fetcher-base": "workspace:*", @@ -49,8 +48,7 @@ "@pnpm/worker": "workspace:^" }, "devDependencies": { - "@pnpm/resolving.bun-resolver": "workspace:*", - "@pnpm/resolving.deno-resolver": "workspace:*", + "@pnpm/engine.runtime.bun-resolver": "workspace:*", "@types/semver": "catalog:" }, "engines": { diff --git a/resolving/bun-resolver/src/index.ts b/engine/runtime/bun-resolver/src/index.ts similarity index 100% rename from resolving/bun-resolver/src/index.ts rename to engine/runtime/bun-resolver/src/index.ts diff --git a/engine/runtime/node.fetcher/tsconfig.json b/engine/runtime/bun-resolver/tsconfig.json similarity index 60% rename from engine/runtime/node.fetcher/tsconfig.json rename to engine/runtime/bun-resolver/tsconfig.json index ba54120621..8f5ceeb045 100644 --- a/engine/runtime/node.fetcher/tsconfig.json +++ b/engine/runtime/bun-resolver/tsconfig.json @@ -10,7 +10,13 @@ ], "references": [ { - "path": "../../../__utils__/prepare" + "path": "../../../core/constants" + }, + { + "path": "../../../core/error" + }, + { + "path": "../../../core/types" }, { "path": "../../../crypto/shasums-file" @@ -19,22 +25,19 @@ "path": "../../../fetching/binary-fetcher" }, { - "path": "../../../fetching/tarball-fetcher" + "path": "../../../fetching/fetcher-base" }, { "path": "../../../fetching/types" }, { - "path": "../../../store/cafs-types" + "path": "../../../resolving/npm-resolver" }, { - "path": "../../../store/create-cafs-store" + "path": "../../../resolving/resolver-base" }, { - "path": "../../../store/index" - }, - { - "path": "../node.resolver" + "path": "../../../worker" } ] } diff --git a/engine/runtime/node.fetcher/tsconfig.lint.json b/engine/runtime/bun-resolver/tsconfig.lint.json similarity index 100% rename from engine/runtime/node.fetcher/tsconfig.lint.json rename to engine/runtime/bun-resolver/tsconfig.lint.json diff --git a/engine/runtime/commands/package.json b/engine/runtime/commands/package.json index e70ae6fd7e..2ec3bd0555 100644 --- a/engine/runtime/commands/package.json +++ b/engine/runtime/commands/package.json @@ -34,7 +34,7 @@ "dependencies": { "@pnpm/cli.utils": "workspace:*", "@pnpm/config.reader": "workspace:*", - "@pnpm/engine.runtime.node.resolver": "workspace:*", + "@pnpm/engine.runtime.node-resolver": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/exec.pnpm-cli-runner": "workspace:*", "@pnpm/network.fetch": "workspace:*", diff --git a/engine/runtime/commands/src/env/envList.ts b/engine/runtime/commands/src/env/envList.ts index a02549f982..cc92d4e034 100644 --- a/engine/runtime/commands/src/env/envList.ts +++ b/engine/runtime/commands/src/env/envList.ts @@ -1,4 +1,4 @@ -import { getNodeMirror, parseNodeSpecifier, resolveNodeVersions } from '@pnpm/engine.runtime.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/tsconfig.json b/engine/runtime/commands/tsconfig.json index 3084ef64ce..8509e2f5b7 100644 --- a/engine/runtime/commands/tsconfig.json +++ b/engine/runtime/commands/tsconfig.json @@ -15,6 +15,12 @@ { "path": "../../../config/reader" }, + { + "path": "../../../core/error" + }, + { + "path": "../../../core/logger" + }, { "path": "../../../exec/pnpm-cli-runner" }, @@ -22,13 +28,7 @@ "path": "../../../network/fetch" }, { - "path": "../../../packages/error" - }, - { - "path": "../../../packages/logger" - }, - { - "path": "../node.resolver" + "path": "../node-resolver" } ] } diff --git a/resolving/deno-resolver/CHANGELOG.md b/engine/runtime/deno-resolver/CHANGELOG.md similarity index 100% rename from resolving/deno-resolver/CHANGELOG.md rename to engine/runtime/deno-resolver/CHANGELOG.md diff --git a/engine/runtime/deno-resolver/README.md b/engine/runtime/deno-resolver/README.md new file mode 100644 index 0000000000..553ea7e85e --- /dev/null +++ b/engine/runtime/deno-resolver/README.md @@ -0,0 +1,16 @@ +# @pnpm/engine.runtime.deno-resolver + +> Resolves the Deno runtime + +[![npm version](https://img.shields.io/npm/v/@pnpm/engine.runtime.deno-resolver.svg)](https://www.npmjs.com/package/@pnpm/engine.runtime.deno-resolver) + +## Installation + +```sh +pnpm add @pnpm/engine.runtime.deno-resolver +``` + +## License + +MIT + diff --git a/resolving/deno-resolver/package.json b/engine/runtime/deno-resolver/package.json similarity index 80% rename from resolving/deno-resolver/package.json rename to engine/runtime/deno-resolver/package.json index 15dae9d556..5a60ad2c18 100644 --- a/resolving/deno-resolver/package.json +++ b/engine/runtime/deno-resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/resolving.deno-resolver", + "name": "@pnpm/engine.runtime.deno-resolver", "version": "1002.0.1", "description": "Resolves the Deno runtime", "keywords": [ @@ -10,8 +10,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/resolving/deno-resolver", - "homepage": "https://github.com/pnpm/pnpm/tree/main/resolving/deno-resolver#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/deno-resolver", + "homepage": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/deno-resolver#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -34,7 +34,6 @@ "dependencies": { "@pnpm/constants": "workspace:*", "@pnpm/crypto.shasums-file": "workspace:*", - "@pnpm/engine.runtime.node.fetcher": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/fetching.binary-fetcher": "workspace:*", "@pnpm/fetching.fetcher-base": "workspace:*", @@ -49,7 +48,7 @@ "@pnpm/worker": "workspace:^" }, "devDependencies": { - "@pnpm/resolving.deno-resolver": "workspace:*", + "@pnpm/engine.runtime.deno-resolver": "workspace:*", "@types/semver": "catalog:" }, "engines": { diff --git a/resolving/deno-resolver/src/index.ts b/engine/runtime/deno-resolver/src/index.ts similarity index 100% rename from resolving/deno-resolver/src/index.ts rename to engine/runtime/deno-resolver/src/index.ts diff --git a/engine/runtime/deno-resolver/tsconfig.json b/engine/runtime/deno-resolver/tsconfig.json new file mode 100644 index 0000000000..8f5ceeb045 --- /dev/null +++ b/engine/runtime/deno-resolver/tsconfig.json @@ -0,0 +1,43 @@ +{ + "extends": "@pnpm/tsconfig", + "compilerOptions": { + "outDir": "lib", + "rootDir": "src" + }, + "include": [ + "src/**/*.ts", + "../../../__typings__/**/*.d.ts" + ], + "references": [ + { + "path": "../../../core/constants" + }, + { + "path": "../../../core/error" + }, + { + "path": "../../../core/types" + }, + { + "path": "../../../crypto/shasums-file" + }, + { + "path": "../../../fetching/binary-fetcher" + }, + { + "path": "../../../fetching/fetcher-base" + }, + { + "path": "../../../fetching/types" + }, + { + "path": "../../../resolving/npm-resolver" + }, + { + "path": "../../../resolving/resolver-base" + }, + { + "path": "../../../worker" + } + ] +} diff --git a/engine/runtime/node.resolver/tsconfig.lint.json b/engine/runtime/deno-resolver/tsconfig.lint.json similarity index 100% rename from engine/runtime/node.resolver/tsconfig.lint.json rename to engine/runtime/deno-resolver/tsconfig.lint.json diff --git a/engine/runtime/node.resolver/CHANGELOG.md b/engine/runtime/node-resolver/CHANGELOG.md similarity index 100% rename from engine/runtime/node.resolver/CHANGELOG.md rename to engine/runtime/node-resolver/CHANGELOG.md diff --git a/engine/runtime/node-resolver/README.md b/engine/runtime/node-resolver/README.md new file mode 100644 index 0000000000..d1cd87dddf --- /dev/null +++ b/engine/runtime/node-resolver/README.md @@ -0,0 +1,15 @@ +# @pnpm/engine.runtime.node-resolver + +> Resolves a Node.js version specifier to an exact Node.js version + +[![npm version](https://img.shields.io/npm/v/@pnpm/engine.runtime.node-resolver.svg)](https://www.npmjs.com/package/@pnpm/engine.runtime.node-resolver) + +## Installation + +```sh +pnpm add @pnpm/engine.runtime.node-resolver +``` + +## License + +MIT diff --git a/engine/runtime/node.resolver/package.json b/engine/runtime/node-resolver/package.json similarity index 90% rename from engine/runtime/node.resolver/package.json rename to engine/runtime/node-resolver/package.json index b1d89567fb..bdb7992789 100644 --- a/engine/runtime/node.resolver/package.json +++ b/engine/runtime/node-resolver/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/engine.runtime.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": [ @@ -10,8 +10,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/node.resolver", - "homepage": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/node.resolver#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/node-resolver", + "homepage": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/node-resolver#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -44,7 +44,7 @@ "version-selector-type": "catalog:" }, "devDependencies": { - "@pnpm/engine.runtime.node.resolver": "workspace:*", + "@pnpm/engine.runtime.node-resolver": "workspace:*", "@pnpm/network.fetch": "workspace:*", "@types/semver": "catalog:" }, diff --git a/engine/runtime/node.resolver/src/getNodeArtifactAddress.ts b/engine/runtime/node-resolver/src/getNodeArtifactAddress.ts similarity index 100% rename from engine/runtime/node.resolver/src/getNodeArtifactAddress.ts rename to engine/runtime/node-resolver/src/getNodeArtifactAddress.ts diff --git a/engine/runtime/node.resolver/src/getNodeMirror.ts b/engine/runtime/node-resolver/src/getNodeMirror.ts similarity index 100% rename from engine/runtime/node.resolver/src/getNodeMirror.ts rename to engine/runtime/node-resolver/src/getNodeMirror.ts diff --git a/engine/runtime/node.resolver/src/index.ts b/engine/runtime/node-resolver/src/index.ts similarity index 100% rename from engine/runtime/node.resolver/src/index.ts rename to engine/runtime/node-resolver/src/index.ts diff --git a/engine/runtime/node.resolver/src/normalizeArch.ts b/engine/runtime/node-resolver/src/normalizeArch.ts similarity index 100% rename from engine/runtime/node.resolver/src/normalizeArch.ts rename to engine/runtime/node-resolver/src/normalizeArch.ts diff --git a/engine/runtime/node.resolver/src/parseNodeSpecifier.ts b/engine/runtime/node-resolver/src/parseNodeSpecifier.ts similarity index 100% rename from engine/runtime/node.resolver/src/parseNodeSpecifier.ts rename to engine/runtime/node-resolver/src/parseNodeSpecifier.ts diff --git a/engine/runtime/node.resolver/test/getNodeArtifactAddress.test.ts b/engine/runtime/node-resolver/test/getNodeArtifactAddress.test.ts similarity index 100% rename from engine/runtime/node.resolver/test/getNodeArtifactAddress.test.ts rename to engine/runtime/node-resolver/test/getNodeArtifactAddress.test.ts diff --git a/engine/runtime/node.resolver/test/getNodeMirror.test.ts b/engine/runtime/node-resolver/test/getNodeMirror.test.ts similarity index 100% rename from engine/runtime/node.resolver/test/getNodeMirror.test.ts rename to engine/runtime/node-resolver/test/getNodeMirror.test.ts diff --git a/engine/runtime/node.resolver/test/normalizeArch.test.ts b/engine/runtime/node-resolver/test/normalizeArch.test.ts similarity index 100% rename from engine/runtime/node.resolver/test/normalizeArch.test.ts rename to engine/runtime/node-resolver/test/normalizeArch.test.ts diff --git a/engine/runtime/node.resolver/test/parseNodeSpecifier.test.ts b/engine/runtime/node-resolver/test/parseNodeSpecifier.test.ts similarity index 100% rename from engine/runtime/node.resolver/test/parseNodeSpecifier.test.ts rename to engine/runtime/node-resolver/test/parseNodeSpecifier.test.ts diff --git a/engine/runtime/node.resolver/test/resolveNodeVersion.test.ts b/engine/runtime/node-resolver/test/resolveNodeVersion.test.ts similarity index 92% rename from engine/runtime/node.resolver/test/resolveNodeVersion.test.ts rename to engine/runtime/node-resolver/test/resolveNodeVersion.test.ts index da1302ef4d..7f22657bdf 100644 --- a/engine/runtime/node.resolver/test/resolveNodeVersion.test.ts +++ b/engine/runtime/node-resolver/test/resolveNodeVersion.test.ts @@ -1,4 +1,4 @@ -import { resolveNodeVersion } from '@pnpm/engine.runtime.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 similarity index 90% rename from engine/runtime/node.resolver/test/resolveNodeVersions.test.ts rename to engine/runtime/node-resolver/test/resolveNodeVersions.test.ts index 8bcaca28b5..b3aa673345 100644 --- a/engine/runtime/node.resolver/test/resolveNodeVersions.test.ts +++ b/engine/runtime/node-resolver/test/resolveNodeVersions.test.ts @@ -1,4 +1,4 @@ -import { resolveNodeVersions } from '@pnpm/engine.runtime.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.fetcher/test/tsconfig.json b/engine/runtime/node-resolver/test/tsconfig.json similarity index 100% rename from engine/runtime/node.fetcher/test/tsconfig.json rename to engine/runtime/node-resolver/test/tsconfig.json diff --git a/engine/runtime/node.resolver/tsconfig.json b/engine/runtime/node-resolver/tsconfig.json similarity index 80% rename from engine/runtime/node.resolver/tsconfig.json rename to engine/runtime/node-resolver/tsconfig.json index 3cbe6e5a78..16dab39083 100644 --- a/engine/runtime/node.resolver/tsconfig.json +++ b/engine/runtime/node-resolver/tsconfig.json @@ -12,6 +12,15 @@ { "path": "../../../config/reader" }, + { + "path": "../../../core/constants" + }, + { + "path": "../../../core/error" + }, + { + "path": "../../../core/types" + }, { "path": "../../../crypto/shasums-file" }, @@ -21,15 +30,6 @@ { "path": "../../../network/fetch" }, - { - "path": "../../../packages/constants" - }, - { - "path": "../../../packages/error" - }, - { - "path": "../../../packages/types" - }, { "path": "../../../resolving/resolver-base" } diff --git a/workspace/pkgs-graph/tsconfig.lint.json b/engine/runtime/node-resolver/tsconfig.lint.json similarity index 71% rename from workspace/pkgs-graph/tsconfig.lint.json rename to engine/runtime/node-resolver/tsconfig.lint.json index 1bbe711971..5ea6d52203 100644 --- a/workspace/pkgs-graph/tsconfig.lint.json +++ b/engine/runtime/node-resolver/tsconfig.lint.json @@ -3,6 +3,6 @@ "include": [ "src/**/*.ts", "test/**/*.ts", - "../../__typings__/**/*.d.ts" + "../../../__typings__/**/*.d.ts" ] } diff --git a/engine/runtime/node.fetcher/CHANGELOG.md b/engine/runtime/node.fetcher/CHANGELOG.md deleted file mode 100644 index f6ae4b16da..0000000000 --- a/engine/runtime/node.fetcher/CHANGELOG.md +++ /dev/null @@ -1,1042 +0,0 @@ -# @pnpm/node.fetcher - -## 1001.0.8 - -### Patch Changes - -- @pnpm/fetching.binary-fetcher@1002.0.0 -- @pnpm/tarball-fetcher@1003.0.0 -- @pnpm/node.resolver@1001.0.5 -- @pnpm/create-cafs-store@1000.0.20 - -## 1001.0.7 - -### Patch Changes - -- @pnpm/node.resolver@1001.0.4 -- @pnpm/tarball-fetcher@1002.0.1 - -## 1001.0.6 - -### Patch Changes - -- @pnpm/fetching.binary-fetcher@1001.0.0 -- @pnpm/tarball-fetcher@1002.0.0 - -## 1001.0.5 - -### Patch Changes - -- Updated dependencies [fb4da0c] - - @pnpm/tarball-fetcher@1001.1.0 - - @pnpm/create-cafs-store@1000.0.19 - - @pnpm/node.resolver@1001.0.3 - - @pnpm/crypto.shasums-file@1001.0.2 - -## 1001.0.4 - -### Patch Changes - -- @pnpm/node.resolver@1001.0.2 -- @pnpm/error@1000.0.5 -- @pnpm/crypto.shasums-file@1001.0.1 -- @pnpm/fetching.binary-fetcher@1000.0.3 -- @pnpm/tarball-fetcher@1001.0.15 -- @pnpm/create-cafs-store@1000.0.18 - -## 1001.0.3 - -### Patch Changes - -- @pnpm/node.resolver@1001.0.1 -- @pnpm/tarball-fetcher@1001.0.14 -- @pnpm/create-cafs-store@1000.0.18 -- @pnpm/fetching.binary-fetcher@1000.0.2 - -## 1001.0.2 - -### Patch Changes - -- @pnpm/tarball-fetcher@1001.0.13 - -## 1001.0.1 - -### Patch Changes - -- Updated dependencies [2b0d35f] - - @pnpm/fetching.binary-fetcher@1000.0.1 - -## 1001.0.0 - -### Major Changes - -- d1edf73: Removed node fetcher. The binary fetcher should be used for downloading node assets. -- f91922c: Changed how the integrity of the node.js artifact is stored in the lockfile. - -### Patch Changes - -- Updated dependencies [d1edf73] -- Updated dependencies [d1edf73] -- Updated dependencies [86b33e9] -- Updated dependencies [f91922c] - - @pnpm/node.resolver@1001.0.0 - - @pnpm/fetching.binary-fetcher@1000.0.0 - - @pnpm/crypto.shasums-file@1001.0.0 - - @pnpm/error@1000.0.4 - - @pnpm/tarball-fetcher@1001.0.12 - - @pnpm/create-cafs-store@1000.0.17 - -## 1000.1.0 - -### Minor Changes - -- 1a07b8f: Added support for resolving and downloading the Node.js runtime specified in the [devEngines](https://github.com/openjs-foundation/package-metadata-interoperability-collab-space/issues/15) field of `package.json`. - - Usage example: - - ```json - { - "devEngines": { - "runtime": { - "name": "node", - "version": "^24.4.0", - "onFail": "download" - } - } - } - ``` - - When running `pnpm install`, pnpm will resolve Node.js to the latest version that satisfies the specified range and install it as a dependency of the project. As a result, when running scripts, the locally installed Node.js version will be used. - - Unlike the existing options, `useNodeVersion` and `executionEnv.nodeVersion`, this new field supports version ranges, which are locked to exact versions during installation. The resolved version is stored in the pnpm lockfile, along with an integrity checksum for future validation of the Node.js content's validity. - - Related PR: [#9755](https://github.com/pnpm/pnpm/pull/9755). - -### Patch Changes - -- 1ba2e15: The integrities of the downloaded Node.js artifacts are verified [#9750](https://github.com/pnpm/pnpm/pull/9750). -- Updated dependencies [1ba2e15] -- Updated dependencies [1a07b8f] -- Updated dependencies [1a07b8f] -- Updated dependencies [1a07b8f] - - @pnpm/fetching-types@1000.2.0 - - @pnpm/crypto.shasums-file@1000.0.0 - - @pnpm/fetcher-base@1000.1.0 - - @pnpm/node.resolver@1000.1.0 - - @pnpm/constants@1001.2.0 - - @pnpm/tarball-fetcher@1001.0.11 - - @pnpm/worker@1000.1.10 - - @pnpm/create-cafs-store@1000.0.16 - - @pnpm/error@1000.0.3 - -## 1000.0.20 - -### Patch Changes - -- @pnpm/tarball-fetcher@1001.0.10 - -## 1000.0.19 - -### Patch Changes - -- Updated dependencies [6acf819] - - @pnpm/pick-fetcher@1000.0.1 - - @pnpm/fetcher-base@1000.0.12 - - @pnpm/tarball-fetcher@1001.0.9 - - @pnpm/create-cafs-store@1000.0.15 - -## 1000.0.18 - -### Patch Changes - -- @pnpm/create-cafs-store@1000.0.14 -- @pnpm/tarball-fetcher@1001.0.8 - -## 1000.0.17 - -### Patch Changes - -- Updated dependencies [09cf46f] - - @pnpm/tarball-fetcher@1001.0.7 - - @pnpm/create-cafs-store@1000.0.13 - - @pnpm/fetcher-base@1000.0.11 - - @pnpm/pick-fetcher@1000.0.0 - -## 1000.0.16 - -### Patch Changes - -- @pnpm/tarball-fetcher@1001.0.6 - -## 1000.0.15 - -### Patch Changes - -- @pnpm/create-cafs-store@1000.0.12 -- @pnpm/fetcher-base@1000.0.10 -- @pnpm/pick-fetcher@1000.0.0 -- @pnpm/tarball-fetcher@1001.0.5 - -## 1000.0.14 - -### Patch Changes - -- @pnpm/fetcher-base@1000.0.9 -- @pnpm/pick-fetcher@1000.0.0 -- @pnpm/create-cafs-store@1000.0.11 -- @pnpm/tarball-fetcher@1001.0.4 - -## 1000.0.13 - -### Patch Changes - -- @pnpm/fetcher-base@1000.0.8 -- @pnpm/tarball-fetcher@1001.0.3 -- @pnpm/create-cafs-store@1000.0.10 -- @pnpm/pick-fetcher@1000.0.0 - -## 1000.0.12 - -### Patch Changes - -- @pnpm/fetcher-base@1000.0.7 -- @pnpm/tarball-fetcher@1001.0.2 -- @pnpm/create-cafs-store@1000.0.9 -- @pnpm/pick-fetcher@1000.0.0 - -## 1000.0.11 - -### Patch Changes - -- @pnpm/fetcher-base@1000.0.6 -- @pnpm/pick-fetcher@1000.0.0 -- @pnpm/tarball-fetcher@1001.0.1 -- @pnpm/create-cafs-store@1000.0.8 - -## 1000.0.10 - -### Patch Changes - -- @pnpm/tarball-fetcher@1001.0.0 - -## 1000.0.9 - -### Patch Changes - -- @pnpm/tarball-fetcher@1000.0.9 - -## 1000.0.8 - -### Patch Changes - -- @pnpm/fetcher-base@1000.0.5 -- @pnpm/tarball-fetcher@1000.0.8 -- @pnpm/create-cafs-store@1000.0.7 -- @pnpm/pick-fetcher@1000.0.0 - -## 1000.0.7 - -### Patch Changes - -- @pnpm/create-cafs-store@1000.0.6 -- @pnpm/fetcher-base@1000.0.4 -- @pnpm/tarball-fetcher@1000.0.7 -- @pnpm/pick-fetcher@1000.0.0 - -## 1000.0.6 - -### Patch Changes - -- @pnpm/tarball-fetcher@1000.0.6 - -## 1000.0.5 - -### Patch Changes - -- @pnpm/error@1000.0.2 -- @pnpm/fetcher-base@1000.0.3 -- @pnpm/tarball-fetcher@1000.0.5 -- @pnpm/create-cafs-store@1000.0.5 -- @pnpm/pick-fetcher@1000.0.0 - -## 1000.0.4 - -### Patch Changes - -- @pnpm/create-cafs-store@1000.0.4 -- @pnpm/tarball-fetcher@1000.0.4 - -## 1000.0.3 - -### Patch Changes - -- @pnpm/fetcher-base@1000.0.2 -- @pnpm/tarball-fetcher@1000.0.3 -- @pnpm/create-cafs-store@1000.0.3 -- @pnpm/pick-fetcher@1000.0.0 - -## 1000.0.2 - -### Patch Changes - -- @pnpm/tarball-fetcher@1000.0.2 -- @pnpm/create-cafs-store@1000.0.2 - -## 1000.0.1 - -### Patch Changes - -- Updated dependencies [b0f3c71] - - @pnpm/fetching-types@1000.1.0 - - @pnpm/error@1000.0.1 - - @pnpm/create-cafs-store@1000.0.1 - - @pnpm/fetcher-base@1000.0.1 - - @pnpm/pick-fetcher@1000.0.0 - - @pnpm/tarball-fetcher@1000.0.1 - -## 4.0.17 - -### Patch Changes - -- @pnpm/error@6.0.3 -- @pnpm/create-cafs-store@7.0.12 -- @pnpm/fetcher-base@16.0.7 -- @pnpm/tarball-fetcher@20.0.0 - -## 4.0.16 - -### Patch Changes - -- @pnpm/tarball-fetcher@19.0.16 -- @pnpm/create-cafs-store@7.0.11 - -## 4.0.15 - -### Patch Changes - -- @pnpm/create-cafs-store@7.0.10 -- @pnpm/tarball-fetcher@19.0.15 - -## 4.0.14 - -### Patch Changes - -- @pnpm/error@6.0.2 -- @pnpm/tarball-fetcher@19.0.14 -- @pnpm/create-cafs-store@7.0.9 - -## 4.0.13 - -### Patch Changes - -- @pnpm/fetcher-base@16.0.7 -- @pnpm/tarball-fetcher@19.0.13 -- @pnpm/create-cafs-store@7.0.9 -- @pnpm/pick-fetcher@3.0.0 - -## 4.0.12 - -### Patch Changes - -- @pnpm/fetcher-base@16.0.6 -- @pnpm/tarball-fetcher@19.0.12 -- @pnpm/create-cafs-store@7.0.8 -- @pnpm/pick-fetcher@3.0.0 - -## 4.0.11 - -### Patch Changes - -- @pnpm/fetcher-base@16.0.5 -- @pnpm/tarball-fetcher@19.0.11 -- @pnpm/create-cafs-store@7.0.7 -- @pnpm/pick-fetcher@3.0.0 - -## 4.0.10 - -### Patch Changes - -- @pnpm/tarball-fetcher@19.0.10 -- @pnpm/create-cafs-store@7.0.6 - -## 4.0.9 - -### Patch Changes - -- @pnpm/fetcher-base@16.0.4 -- @pnpm/tarball-fetcher@19.0.9 -- @pnpm/create-cafs-store@7.0.6 -- @pnpm/pick-fetcher@3.0.0 - -## 4.0.8 - -### Patch Changes - -- afe520d: Update rename-overwrite to v6. -- Updated dependencies [afe520d] - - @pnpm/tarball-fetcher@19.0.8 - - @pnpm/create-cafs-store@7.0.5 - -## 4.0.7 - -### Patch Changes - -- @pnpm/fetcher-base@16.0.3 -- @pnpm/pick-fetcher@3.0.0 -- @pnpm/tarball-fetcher@19.0.7 -- @pnpm/create-cafs-store@7.0.4 - -## 4.0.6 - -### Patch Changes - -- @pnpm/fetcher-base@16.0.2 -- @pnpm/tarball-fetcher@19.0.6 -- @pnpm/create-cafs-store@7.0.3 -- @pnpm/pick-fetcher@3.0.0 - -## 4.0.5 - -### Patch Changes - -- @pnpm/tarball-fetcher@19.0.5 - -## 4.0.4 - -### Patch Changes - -- @pnpm/create-cafs-store@7.0.2 -- @pnpm/tarball-fetcher@19.0.4 - -## 4.0.3 - -### Patch Changes - -- @pnpm/fetcher-base@16.0.1 -- @pnpm/tarball-fetcher@19.0.3 -- @pnpm/create-cafs-store@7.0.1 -- @pnpm/pick-fetcher@3.0.0 - -## 4.0.2 - -### Patch Changes - -- Updated dependencies [a7aef51] - - @pnpm/error@6.0.1 - - @pnpm/tarball-fetcher@19.0.2 - -## 4.0.1 - -### Patch Changes - -- @pnpm/tarball-fetcher@19.0.1 - -## 4.0.0 - -### Major Changes - -- 43cdd87: Node.js v16 support dropped. Use at least Node.js v18.12. - -### Minor Changes - -- 730929e: Add a field named `ignoredOptionalDependencies`. This is an array of strings. If an optional dependency has its name included in this array, it will be skipped. - -### Patch Changes - -- Updated dependencies [3ded840] -- Updated dependencies [43cdd87] -- Updated dependencies [36dcaa0] -- Updated dependencies [b13d2dc] -- Updated dependencies [730929e] - - @pnpm/tarball-fetcher@19.0.0 - - @pnpm/error@6.0.0 - - @pnpm/create-cafs-store@7.0.0 - - @pnpm/fetching-types@6.0.0 - - @pnpm/fetcher-base@16.0.0 - - @pnpm/pick-fetcher@3.0.0 - -## 3.0.39 - -### Patch Changes - -- @pnpm/create-cafs-store@6.0.13 -- @pnpm/fetcher-base@15.0.7 -- @pnpm/pick-fetcher@2.0.1 -- @pnpm/tarball-fetcher@18.0.19 - -## 3.0.38 - -### Patch Changes - -- Updated dependencies [342222d20] - - @pnpm/tarball-fetcher@18.0.18 - -## 3.0.37 - -### Patch Changes - -- @pnpm/create-cafs-store@6.0.12 -- @pnpm/tarball-fetcher@18.0.17 - -## 3.0.36 - -### Patch Changes - -- 33313d2fd: Update rename-overwrite to v5. - - @pnpm/create-cafs-store@6.0.11 - - @pnpm/fetcher-base@15.0.6 - - @pnpm/tarball-fetcher@18.0.16 - - @pnpm/pick-fetcher@2.0.1 - -## 3.0.35 - -### Patch Changes - -- @pnpm/fetcher-base@15.0.5 -- @pnpm/tarball-fetcher@18.0.15 -- @pnpm/create-cafs-store@6.0.10 -- @pnpm/pick-fetcher@2.0.1 - -## 3.0.34 - -### Patch Changes - -- @pnpm/create-cafs-store@6.0.9 -- @pnpm/tarball-fetcher@18.0.14 - -## 3.0.33 - -### Patch Changes - -- @pnpm/tarball-fetcher@18.0.13 - -## 3.0.32 - -### Patch Changes - -- Updated dependencies [abdf1f2b6] - - @pnpm/tarball-fetcher@18.0.12 - - @pnpm/create-cafs-store@6.0.8 - -## 3.0.31 - -### Patch Changes - -- @pnpm/tarball-fetcher@18.0.11 - -## 3.0.30 - -### Patch Changes - -- Updated dependencies [cfc017ee3] - - @pnpm/create-cafs-store@6.0.7 - - @pnpm/fetcher-base@15.0.4 - - @pnpm/pick-fetcher@2.0.1 - - @pnpm/tarball-fetcher@18.0.10 - -## 3.0.29 - -### Patch Changes - -- @pnpm/tarball-fetcher@18.0.9 - -## 3.0.28 - -### Patch Changes - -- @pnpm/create-cafs-store@6.0.6 -- @pnpm/fetcher-base@15.0.3 -- @pnpm/tarball-fetcher@18.0.8 -- @pnpm/pick-fetcher@2.0.1 - -## 3.0.27 - -### Patch Changes - -- @pnpm/tarball-fetcher@18.0.7 - -## 3.0.26 - -### Patch Changes - -- @pnpm/create-cafs-store@6.0.5 -- @pnpm/tarball-fetcher@18.0.6 - -## 3.0.25 - -### Patch Changes - -- @pnpm/create-cafs-store@6.0.4 -- @pnpm/tarball-fetcher@18.0.5 - -## 3.0.24 - -### Patch Changes - -- @pnpm/create-cafs-store@6.0.3 -- @pnpm/tarball-fetcher@18.0.4 - -## 3.0.23 - -### Patch Changes - -- @pnpm/create-cafs-store@6.0.2 -- @pnpm/tarball-fetcher@18.0.3 - -## 3.0.22 - -### Patch Changes - -- @pnpm/create-cafs-store@6.0.1 -- @pnpm/fetcher-base@15.0.2 -- @pnpm/tarball-fetcher@18.0.2 -- @pnpm/pick-fetcher@2.0.1 - -## 3.0.21 - -### Patch Changes - -- Updated dependencies [f394cfccd] - - @pnpm/pick-fetcher@2.0.1 - -## 3.0.20 - -### Patch Changes - -- @pnpm/tarball-fetcher@18.0.1 - -## 3.0.19 - -### Major Changes - -- 9caa33d53: `fromStore` replaced with `resolvedFrom`. - -### Patch Changes - -- Updated dependencies [9caa33d53] - - @pnpm/create-cafs-store@6.0.0 - - @pnpm/tarball-fetcher@18.0.0 - - @pnpm/fetcher-base@15.0.1 - -## 3.0.18 - -### Patch Changes - -- @pnpm/create-cafs-store@5.1.1 -- @pnpm/tarball-fetcher@17.0.1 - -## 3.0.17 - -### Patch Changes - -- Updated dependencies [03cdccc6e] - - @pnpm/create-cafs-store@5.1.0 - - @pnpm/tarball-fetcher@17.0.0 - - @pnpm/fetcher-base@15.0.1 - -## 3.0.16 - -### Patch Changes - -- @pnpm/create-cafs-store@5.0.2 -- @pnpm/tarball-fetcher@16.0.2 - -## 3.0.15 - -### Patch Changes - -- Updated dependencies [4a1a9431d] - - @pnpm/fetcher-base@15.0.1 - - @pnpm/create-cafs-store@5.0.1 - - @pnpm/pick-fetcher@2.0.0 - - @pnpm/tarball-fetcher@16.0.1 - -## 3.0.14 - -### Patch Changes - -- 66423df83: Emit a clear error message when users attempt to specify an undownloadable node version [#6916](https://github.com/pnpm/pnpm/pull/6916). -- Updated dependencies [f2009d175] -- Updated dependencies [083bbf590] -- Updated dependencies [70b2830ac] -- Updated dependencies [083bbf590] -- Updated dependencies [96e165c7f] -- Updated dependencies [083bbf590] - - @pnpm/create-cafs-store@5.0.0 - - @pnpm/tarball-fetcher@16.0.0 - - @pnpm/fetcher-base@15.0.0 - - @pnpm/pick-fetcher@2.0.0 - -## 3.0.13 - -### Patch Changes - -- Updated dependencies [840b65bda] - - @pnpm/tarball-fetcher@15.0.9 - -## 3.0.12 - -### Patch Changes - -- @pnpm/tarball-fetcher@15.0.8 - -## 3.0.11 - -### Patch Changes - -- @pnpm/tarball-fetcher@15.0.7 -- @pnpm/create-cafs-store@4.0.8 - -## 3.0.10 - -### Patch Changes - -- @pnpm/tarball-fetcher@15.0.7 -- @pnpm/create-cafs-store@4.0.7 - -## 3.0.9 - -### Patch Changes - -- @pnpm/tarball-fetcher@15.0.6 -- @pnpm/create-cafs-store@4.0.6 - -## 3.0.8 - -### Patch Changes - -- @pnpm/fetcher-base@14.0.2 -- @pnpm/tarball-fetcher@15.0.6 -- @pnpm/create-cafs-store@4.0.5 -- @pnpm/pick-fetcher@2.0.0 - -## 3.0.7 - -### Patch Changes - -- @pnpm/tarball-fetcher@15.0.5 - -## 3.0.6 - -### Patch Changes - -- @pnpm/create-cafs-store@4.0.4 -- @pnpm/tarball-fetcher@15.0.4 - -## 3.0.5 - -### Patch Changes - -- @pnpm/create-cafs-store@4.0.3 -- @pnpm/tarball-fetcher@15.0.3 - -## 3.0.4 - -### Patch Changes - -- @pnpm/error@5.0.2 -- @pnpm/tarball-fetcher@15.0.3 -- @pnpm/create-cafs-store@4.0.2 - -## 3.0.3 - -### Patch Changes - -- Updated dependencies [d55b41a8b] - - @pnpm/tarball-fetcher@15.0.2 - - @pnpm/create-cafs-store@4.0.2 - -## 3.0.2 - -### Patch Changes - -- @pnpm/fetcher-base@14.0.1 -- @pnpm/error@5.0.1 -- @pnpm/create-cafs-store@4.0.1 -- @pnpm/tarball-fetcher@15.0.1 -- @pnpm/pick-fetcher@2.0.0 - -## 3.0.1 - -### Patch Changes - -- 8228c2cb1: Patch node-fetch to fix an error that happens on Node.js 20 [#6424](https://github.com/pnpm/pnpm/issues/6424). - - @pnpm/tarball-fetcher@15.0.0 - -## 3.0.0 - -### Major Changes - -- eceaa8b8b: Node.js 14 support dropped. - -### Patch Changes - -- Updated dependencies [eceaa8b8b] - - @pnpm/tarball-fetcher@15.0.0 - - @pnpm/create-cafs-store@4.0.0 - - @pnpm/fetching-types@5.0.0 - - @pnpm/fetcher-base@14.0.0 - - @pnpm/pick-fetcher@2.0.0 - - @pnpm/error@5.0.0 - -## 2.0.14 - -### Patch Changes - -- @pnpm/tarball-fetcher@14.1.4 -- @pnpm/create-cafs-store@3.1.6 - -## 2.0.13 - -### Patch Changes - -- Updated dependencies [2241f77ad] - - @pnpm/tarball-fetcher@14.1.3 - -## 2.0.12 - -### Patch Changes - -- @pnpm/fetcher-base@13.1.6 -- @pnpm/pick-fetcher@1.0.0 -- @pnpm/create-cafs-store@3.1.5 -- @pnpm/tarball-fetcher@14.1.2 - -## 2.0.11 - -### Patch Changes - -- @pnpm/create-cafs-store@3.1.4 -- @pnpm/tarball-fetcher@14.1.1 - -## 2.0.10 - -### Patch Changes - -- @pnpm/create-cafs-store@3.1.3 -- @pnpm/tarball-fetcher@14.1.1 - -## 2.0.9 - -### Patch Changes - -- Updated dependencies [1e6de89b6] - - @pnpm/tarball-fetcher@14.1.1 - - @pnpm/create-cafs-store@3.1.2 - -## 2.0.8 - -### Patch Changes - -- Updated dependencies [c7b05cd9a] - - @pnpm/tarball-fetcher@14.1.0 - - @pnpm/create-cafs-store@3.1.1 - - @pnpm/error@4.0.1 - -## 2.0.7 - -### Patch Changes - -- ec97a3105: Report to the console when a git-hosted dependency is built [#5847](https://github.com/pnpm/pnpm/pull/5847). -- Updated dependencies [ec97a3105] - - @pnpm/tarball-fetcher@14.0.1 - -## 2.0.6 - -### Patch Changes - -- Updated dependencies [339c0a704] - - @pnpm/tarball-fetcher@14.0.0 - -## 2.0.5 - -### Patch Changes - -- Updated dependencies [2458741fa] - - @pnpm/create-cafs-store@3.1.0 - - @pnpm/fetcher-base@13.1.5 - - @pnpm/tarball-fetcher@13.0.3 - - @pnpm/pick-fetcher@1.0.0 - -## 2.0.4 - -### Patch Changes - -- Updated dependencies [a9d59d8bc] - - @pnpm/tarball-fetcher@13.0.2 - - @pnpm/create-cafs-store@3.0.3 - -## 2.0.3 - -### Patch Changes - -- @pnpm/fetcher-base@13.1.4 -- @pnpm/tarball-fetcher@13.0.1 -- @pnpm/create-cafs-store@3.0.2 -- @pnpm/pick-fetcher@1.0.0 - -## 2.0.2 - -### Patch Changes - -- Updated dependencies [804de211e] - - @pnpm/fetching-types@4.0.0 - - @pnpm/tarball-fetcher@13.0.0 - -## 2.0.1 - -### Patch Changes - -- @pnpm/fetcher-base@13.1.3 -- @pnpm/tarball-fetcher@12.0.1 -- @pnpm/create-cafs-store@3.0.1 -- @pnpm/pick-fetcher@1.0.0 - -## 2.0.0 - -### Major Changes - -- f884689e0: Require `@pnpm/logger` v5. - -### Patch Changes - -- Updated dependencies [043d988fc] -- Updated dependencies [f884689e0] - - @pnpm/create-cafs-store@3.0.0 - - @pnpm/error@4.0.0 - - @pnpm/tarball-fetcher@12.0.0 - -## 1.0.15 - -### Patch Changes - -- @pnpm/tarball-fetcher@11.0.5 -- @pnpm/create-cafs-store@2.2.5 - -## 1.0.14 - -### Patch Changes - -- Updated dependencies [e8a631bf0] - - @pnpm/error@3.1.0 - - @pnpm/tarball-fetcher@11.0.4 - -## 1.0.13 - -### Patch Changes - -- @pnpm/fetcher-base@13.1.2 -- @pnpm/tarball-fetcher@11.0.3 -- @pnpm/create-cafs-store@2.2.4 -- @pnpm/pick-fetcher@1.0.0 - -## 1.0.12 - -### Patch Changes - -- @pnpm/fetcher-base@13.1.1 -- @pnpm/tarball-fetcher@11.0.2 -- @pnpm/create-cafs-store@2.2.3 -- @pnpm/pick-fetcher@1.0.0 - -## 1.0.11 - -### Patch Changes - -- 1c7b439bb: For node version < 16, install x64 build on darwin arm as arm build is not available. - -## 1.0.10 - -### Patch Changes - -- @pnpm/create-cafs-store@2.2.2 -- @pnpm/fetcher-base@13.1.0 -- @pnpm/tarball-fetcher@11.0.1 - -## 1.0.9 - -### Patch Changes - -- Updated dependencies [dbac0ca01] - - @pnpm/tarball-fetcher@11.0.1 - - @pnpm/create-cafs-store@2.2.1 - -## 1.0.8 - -### Patch Changes - -- 32915f0e4: Refactor cafs types into separate package and add additional properties including `cafsDir` and `getFilePathInCafs`. -- 7a17f99ab: Refactor `tarball-fetcher` and separate it into more specific fetchers, such as `localTarball`, `remoteTarball` and `gitHostedTarball`. -- Updated dependencies [32915f0e4] -- Updated dependencies [23984abd1] -- Updated dependencies [7a17f99ab] - - @pnpm/create-cafs-store@2.2.0 - - @pnpm/fetcher-base@13.1.0 - - @pnpm/tarball-fetcher@11.0.0 - - @pnpm/pick-fetcher@1.0.0 - -## 1.0.7 - -### Patch Changes - -- @pnpm/create-cafs-store@2.1.1 -- @pnpm/tarball-fetcher@10.0.10 - -## 1.0.6 - -### Patch Changes - -- Updated dependencies [8103f92bd] -- Updated dependencies [65c4260de] - - @pnpm/tarball-fetcher@10.0.10 - - @pnpm/create-cafs-store@2.1.0 - -## 1.0.5 - -### Patch Changes - -- @pnpm/fetcher-base@13.0.2 -- @pnpm/tarball-fetcher@10.0.9 -- @pnpm/create-cafs-store@2.0.3 - -## 1.0.4 - -### Patch Changes - -- 2105735a0: `pnpm env use` should throw an error on a system that use the MUSL libc. - -## 1.0.3 - -### Patch Changes - -- Updated dependencies [5f643f23b] - - @pnpm/tarball-fetcher@10.0.8 - -## 1.0.2 - -### Patch Changes - -- @pnpm/create-cafs-store@2.0.2 -- @pnpm/tarball-fetcher@10.0.7 - -## 1.0.1 - -### Patch Changes - -- @pnpm/fetcher-base@13.0.1 -- @pnpm/create-cafs-store@2.0.1 -- @pnpm/tarball-fetcher@10.0.7 - -## 1.0.0 - -### Major Changes - -- 228dcc3c9: Initial release. - -### Patch Changes - -- Updated dependencies [2a34b21ce] -- Updated dependencies [47b5e45dd] - - @pnpm/create-cafs-store@2.0.0 - - @pnpm/fetcher-base@13.0.0 - - @pnpm/tarball-fetcher@10.0.6 diff --git a/engine/runtime/node.fetcher/README.md b/engine/runtime/node.fetcher/README.md deleted file mode 100644 index a20e12d2a1..0000000000 --- a/engine/runtime/node.fetcher/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# @pnpm/node.fetcher - -> Node.js artifacts fetcher - -Downloads and extracts the right Node.js artifact for the active platform and architecture. - -[![npm version](https://img.shields.io/npm/v/@pnpm/node.fetcher.svg)](https://www.npmjs.com/package/@pnpm/node.fetcher) - -## Installation - -```sh -pnpm add @pnpm/node.fetcher -``` - -## License - -MIT diff --git a/engine/runtime/node.fetcher/package.json b/engine/runtime/node.fetcher/package.json deleted file mode 100644 index d2119f132a..0000000000 --- a/engine/runtime/node.fetcher/package.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "name": "@pnpm/engine.runtime.node.fetcher", - "version": "1001.0.8", - "description": "Node.js artifacts fetcher", - "keywords": [ - "pnpm", - "pnpm11", - "env", - "node.js" - ], - "license": "MIT", - "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/node.fetcher", - "homepage": "https://github.com/pnpm/pnpm/tree/main/engine/runtime/node.fetcher#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/**/*.ts\"", - "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest", - "test": "pnpm run compile && pnpm run _test", - "prepublishOnly": "pnpm run compile", - "compile": "tsgo --build && pnpm run lint --fix" - }, - "dependencies": { - "@pnpm/crypto.shasums-file": "workspace:*", - "@pnpm/engine.runtime.node.resolver": "workspace:*", - "@pnpm/fetching.binary-fetcher": "workspace:*", - "@pnpm/fetching.tarball-fetcher": "workspace:*", - "@pnpm/fetching.types": "workspace:*", - "@pnpm/store.create-cafs-store": "workspace:*", - "@pnpm/store.index": "workspace:*", - "detect-libc": "catalog:" - }, - "devDependencies": { - "@jest/globals": "catalog:", - "@pnpm/engine.runtime.node.fetcher": "workspace:*", - "@pnpm/prepare": "workspace:*", - "@pnpm/store.cafs-types": "workspace:*", - "@types/adm-zip": "catalog:", - "adm-zip": "catalog:", - "node-fetch": "catalog:" - }, - "engines": { - "node": ">=22.13" - }, - "jest": { - "preset": "@pnpm/jest-config" - } -} diff --git a/engine/runtime/node.fetcher/src/index.ts b/engine/runtime/node.fetcher/src/index.ts deleted file mode 100644 index 23635514b2..0000000000 --- a/engine/runtime/node.fetcher/src/index.ts +++ /dev/null @@ -1,202 +0,0 @@ -import path from 'node:path' - -import { fetchShasumsFileRaw, pickFileChecksumFromShasumsFile } from '@pnpm/crypto.shasums-file' -import { - DEFAULT_NODE_MIRROR_BASE_URL, - getNodeArtifactAddress, - UNOFFICIAL_NODE_MIRROR_BASE_URL, -} 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 { isNonGlibcLinux } from 'detect-libc' - -export interface FetchNodeOptionsToDir { - storeDir: string - storeIndex: StoreIndex - fetchTimeout?: number - nodeMirrorBaseUrl?: string - retry?: RetryTimeoutOptions - // Overrides for testing - platform?: string - arch?: string -} - -export interface FetchNodeOptions { - cafs: Cafs - filesIndexFile: string - fetchTimeout?: number - nodeMirrorBaseUrl?: string - retry?: RetryTimeoutOptions -} - -interface NodeArtifactInfo { - url: string - integrity: string - isZip: boolean - basename: string -} - -/** - * Fetches and installs a Node.js version to the specified target directory. - * - * @param fetch - Function to fetch resources from registry - * @param version - Node.js version to install - * @param targetDir - Directory where Node.js should be installed - * @param opts - Configuration options for the fetch operation - * @throws {PnpmError} When integrity verification fails or download fails - */ -export async function fetchNode ( - fetch: FetchFromRegistry, - version: string, - targetDir: string, - opts: FetchNodeOptionsToDir -): Promise { - const platform = opts.platform ?? process.platform - const arch = opts.arch ?? process.arch - // On a native musl Linux system, automatically use the musl variant so that - // pnpm env works out of the box on Alpine Linux and similar distributions. - let libc: string | undefined - if (platform === 'linux' && await isNonGlibcLinux()) { - libc = 'musl' - } - - const isMusl = libc === 'musl' - const nodeMirrorBaseUrl = opts.nodeMirrorBaseUrl ?? (isMusl - ? UNOFFICIAL_NODE_MIRROR_BASE_URL - : DEFAULT_NODE_MIRROR_BASE_URL) - - const artifactInfo = await getNodeArtifactInfo(fetch, version, { - nodeMirrorBaseUrl, - platform, - arch, - libc, - }) - - if (artifactInfo.isZip) { - await downloadAndUnpackZip(fetch, artifactInfo, targetDir) - return - } - - await downloadAndUnpackTarballToDir(fetch, artifactInfo, targetDir, opts) -} - -/** - * Gets Node.js artifact information including URL, integrity, and file type. - * - * @param fetch - Function to fetch resources from registry - * @param version - Node.js version - * @param opts - Options including nodeMirrorBaseUrl, platform, arch, and libc - * @returns Promise resolving to artifact information - * @throws {PnpmError} When integrity file cannot be fetched or parsed - */ -async function getNodeArtifactInfo ( - fetch: FetchFromRegistry, - version: string, - opts: { - nodeMirrorBaseUrl: string - integrities?: Record - platform: string - arch: string - libc?: string - } -): Promise { - const isMusl = opts.libc === 'musl' - - const tarball = getNodeArtifactAddress({ - version, - baseUrl: opts.nodeMirrorBaseUrl, - platform: opts.platform, - arch: opts.arch, - libc: opts.libc, - }) - - const tarballFileName = `${tarball.basename}${tarball.extname}` - const shasumsFileUrl = `${tarball.dirname}/SHASUMS256.txt` - const url = `${tarball.dirname}/${tarballFileName}` - - const integrityKey = isMusl ? `${opts.platform}-${opts.arch}-musl` : `${opts.platform}-${opts.arch}` - const integrity = opts.integrities - ? opts.integrities[integrityKey] - : await loadArtifactIntegrity(fetch, tarballFileName, shasumsFileUrl) - - return { - url, - integrity, - isZip: tarball.extname === '.zip', - basename: tarball.basename, - } -} - -/** - * Loads and extracts the integrity hash for a specific Node.js artifact. - * - * @param fetch - Function to fetch resources from registry - * @param fileName - Name of the file to find integrity for - * @param shasumsUrl - URL of the SHASUMS256.txt file - * @returns Promise resolving to the integrity hash in base64 format - * @throws {PnpmError} When integrity file cannot be fetched or parsed - */ -async function loadArtifactIntegrity ( - fetch: FetchFromRegistry, - fileName: string, - shasumsUrl: string -): Promise { - const body = await fetchShasumsFileRaw(fetch, shasumsUrl) - return pickFileChecksumFromShasumsFile(body, fileName) -} - -/** - * Downloads and unpacks a tarball using the tarball fetcher. - * - * @param fetch - Function to fetch resources from registry - * @param artifactInfo - Information about the Node.js artifact - * @param targetDir - Directory where Node.js should be installed - * @param opts - Configuration options for the fetch operation - */ -async function downloadAndUnpackTarballToDir ( - fetch: FetchFromRegistry, - artifactInfo: NodeArtifactInfo, - targetDir: string, - opts: FetchNodeOptionsToDir -): Promise { - const getAuthHeader = () => undefined - const fetchers = createTarballFetcher(fetch, getAuthHeader, { - retry: opts.retry, - timeout: opts.fetchTimeout, - storeIndex: opts.storeIndex, - // These are not needed for fetching Node.js - rawConfig: {}, - unsafePerm: false, - }) - - const cafs = createCafsStore(opts.storeDir) - - // Create a unique index file name for Node.js tarballs - const indexFileName = `node-${encodeURIComponent(artifactInfo.url)}` - const filesIndexFile = path.join(opts.storeDir, indexFileName) - - const { filesMap } = await fetchers.remoteTarball(cafs, { - tarball: artifactInfo.url, - integrity: artifactInfo.integrity, - }, { - filesIndexFile, - lockfileDir: process.cwd(), - pkg: {}, - }) - - cafs.importPackage(targetDir, { - filesResponse: { - filesMap, - resolvedFrom: 'remote', - requiresBuild: false, - }, - force: true, - }) -} diff --git a/engine/runtime/node.fetcher/test/node.test.ts b/engine/runtime/node.fetcher/test/node.test.ts deleted file mode 100644 index efa0544ac9..0000000000 --- a/engine/runtime/node.fetcher/test/node.test.ts +++ /dev/null @@ -1,117 +0,0 @@ -import path from 'node:path' -import { Readable } from 'node:stream' - -import { jest } from '@jest/globals' -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' -import { Response } from 'node-fetch' - -jest.unstable_mockModule('detect-libc', () => ({ - isNonGlibcLinux: jest.fn(), -})) - -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. -// Any non-zero value works; the tarball content won't match, so integrity will -// fail — but all URL assertions run before that happens. -const FAKE_SHA256 = '5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef' - -const fetchMock = jest.fn(async (url: string) => { - if (url.endsWith('SHASUMS256.txt')) { - // Return a minimal SHASUMS file covering the artifacts used in tests. - return new Response( - `${FAKE_SHA256} node-v22.0.0-linux-x64-musl.tar.gz\n` - ) - } - if (url.endsWith('.zip')) { - // The Windows code path for pnpm's node bootstrapping expects a subdir - // within the .zip file. - const pkgName = path.basename(url, '.zip') - const zip = new AdmZip() - zip.addFile(`${pkgName}/dummy-file`, Buffer.from('test')) - - return new Response(Readable.from(zip.toBuffer())) - } - - return new Response(Readable.from(Buffer.alloc(0))) -}) - -const storeIndexes: StoreIndex[] = [] -afterAll(() => { - for (const si of storeIndexes) si.close() -}) - -beforeEach(() => { - jest.mocked(isNonGlibcLinux).mockReturnValue(Promise.resolve(false)) - fetchMock.mockClear() -}) - -test.skip('install Node using a custom node mirror', async () => { - tempDir() - - const nodeMirrorBaseUrl = 'https://pnpm-node-mirror-test.localhost/download/release/' - const storeDir = path.resolve('store') - const storeIndex = new StoreIndex(storeDir) - storeIndexes.push(storeIndex) - const opts: FetchNodeOptions = { - nodeMirrorBaseUrl, - storeDir, - storeIndex, - } - - await fetchNode(fetchMock, '16.4.0', path.resolve('node'), opts) - - for (const call of fetchMock.mock.calls) { - expect(call[0]).toMatch(nodeMirrorBaseUrl) - } -}) - -test.skip('install Node using the default node mirror', async () => { - tempDir() - - const storeDir = path.resolve('store') - const storeIndex = new StoreIndex(storeDir) - storeIndexes.push(storeIndex) - const opts: FetchNodeOptions = { - storeDir, - storeIndex, - } - - await fetchNode(fetchMock, '16.4.0', path.resolve('node'), opts) - - for (const call of fetchMock.mock.calls) { - expect(call[0]).toMatch('https://nodejs.org/download/release/') - } -}) - - -test('auto-detects musl on non-glibc Linux and uses unofficial-builds mirror', async () => { - jest.mocked(isNonGlibcLinux).mockReturnValue(Promise.resolve(true)) - tempDir() - - // The function will throw because the downloaded tarball content won't match - // the fake sha256 we put in the SHASUMS256.txt mock, but all fetch calls are - // recorded before the integrity check, so we can assert the correct URLs. - const storeIndex = new StoreIndex(path.resolve('store')) - storeIndexes.push(storeIndex) - await expect( - fetchNode(fetchMock, '22.0.0', path.resolve('node'), { - storeDir: path.resolve('store'), - storeIndex, - platform: 'linux', - arch: 'x64', - retry: { retries: 0 }, - }) - ).rejects.toThrow() - - const shasumsUrl = fetchMock.mock.calls[0][0] as string - expect(shasumsUrl).toContain('unofficial-builds.nodejs.org') - - const tarballUrl = fetchMock.mock.calls[1][0] as string - expect(tarballUrl).toContain('unofficial-builds.nodejs.org') - expect(tarballUrl).toContain('node-v22.0.0-linux-x64-musl.tar.gz') -}) \ No newline at end of file diff --git a/engine/runtime/node.resolver/README.md b/engine/runtime/node.resolver/README.md deleted file mode 100644 index ce6bb82ef1..0000000000 --- a/engine/runtime/node.resolver/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# @pnpm/node.resolver - -> Resolves a Node.js version specifier to an exact Node.js version - -[![npm version](https://img.shields.io/npm/v/@pnpm/node.resolver.svg)](https://www.npmjs.com/package/@pnpm/node.resolver) - -## Installation - -```sh -pnpm add @pnpm/node.resolver -``` - -## License - -MIT diff --git a/engine/runtime/node.resolver/test/tsconfig.json b/engine/runtime/node.resolver/test/tsconfig.json deleted file mode 100644 index 78f62072ca..0000000000 --- a/engine/runtime/node.resolver/test/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "noEmit": false, - "outDir": "../node_modules/.test.lib", - "rootDir": "..", - "isolatedModules": true - }, - "include": [ - "**/*.ts", - "../../../../__typings__/**/*.d.ts" - ], - "references": [ - { - "path": ".." - } - ] -} diff --git a/exec/commands/package.json b/exec/commands/package.json index 446ee79fc9..a3dca1bb91 100644 --- a/exec/commands/package.json +++ b/exec/commands/package.json @@ -50,7 +50,7 @@ "@pnpm/installing.client": "workspace:*", "@pnpm/installing.commands": "workspace:*", "@pnpm/log.group": "catalog:", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/resolving.parse-wanted-dependency": "workspace:*", "@pnpm/shell.path": "workspace:*", "@pnpm/store.path": "workspace:*", @@ -58,7 +58,7 @@ "@pnpm/util.lex-comparator": "catalog:", "@pnpm/workspace.injected-deps-syncer": "workspace:*", "@pnpm/workspace.project-manifest-reader": "workspace:*", - "@pnpm/workspace.sort-packages": "workspace:*", + "@pnpm/workspace.projects-sorter": "workspace:*", "@zkochan/rimraf": "catalog:", "didyoumean2": "catalog:", "enquirer": "catalog:", diff --git a/exec/commands/src/dlx.ts b/exec/commands/src/dlx.ts index 72dfef4b3d..def1d1764b 100644 --- a/exec/commands/src/dlx.ts +++ b/exec/commands/src/dlx.ts @@ -15,7 +15,7 @@ import { createHexHash } from '@pnpm/crypto.hash' import { PnpmError } from '@pnpm/error' import { createResolver } from '@pnpm/installing.client' import { add } from '@pnpm/installing.commands' -import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency' import type { PackageManifest, PnpmSettings, SupportedArchitectures } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' diff --git a/exec/commands/src/exec.ts b/exec/commands/src/exec.ts index 65a2d2f25d..c5ce9e16e9 100644 --- a/exec/commands/src/exec.ts +++ b/exec/commands/src/exec.ts @@ -11,7 +11,7 @@ import { logger } from '@pnpm/logger' 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 { sortPackages } from '@pnpm/workspace.projects-sorter' import { safeExeca as execa } from 'execa' import pLimit from 'p-limit' import { pick } from 'ramda' diff --git a/exec/commands/src/runRecursive.ts b/exec/commands/src/runRecursive.ts index a5b3d07537..5d3246ed1a 100644 --- a/exec/commands/src/runRecursive.ts +++ b/exec/commands/src/runRecursive.ts @@ -11,7 +11,7 @@ import { } from '@pnpm/exec.lifecycle' import { groupStart } from '@pnpm/log.group' import type { PackageScripts, ProjectRootDir } from '@pnpm/types' -import { sortPackages } from '@pnpm/workspace.sort-packages' +import { sortPackages } from '@pnpm/workspace.projects-sorter' import pLimit from 'p-limit' import { realpathMissing } from 'realpath-missing' diff --git a/exec/commands/tsconfig.json b/exec/commands/tsconfig.json index a53d526b11..9f7b1d9546 100644 --- a/exec/commands/tsconfig.json +++ b/exec/commands/tsconfig.json @@ -36,6 +36,18 @@ { "path": "../../config/version-policy" }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/hash" }, @@ -55,19 +67,7 @@ "path": "../../installing/commands" }, { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, - { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../../resolving/parse-wanted-dependency" @@ -88,7 +88,7 @@ "path": "../../workspace/projects-filter" }, { - "path": "../../workspace/sort-packages" + "path": "../../workspace/projects-sorter" }, { "path": "../lifecycle" diff --git a/exec/lifecycle/package.json b/exec/lifecycle/package.json index bed16e1c8a..23aa8d9fa5 100644 --- a/exec/lifecycle/package.json +++ b/exec/lifecycle/package.json @@ -39,7 +39,7 @@ "@pnpm/error": "workspace:*", "@pnpm/fetching.directory-fetcher": "workspace:*", "@pnpm/npm-lifecycle": "catalog:", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/store.cafs-types": "workspace:*", "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", diff --git a/exec/lifecycle/src/index.ts b/exec/lifecycle/src/index.ts index 36cc80a612..824c4d2c0e 100644 --- a/exec/lifecycle/src/index.ts +++ b/exec/lifecycle/src/index.ts @@ -1,4 +1,4 @@ -import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { runLifecycleHook, type RunLifecycleHookOptions } from './runLifecycleHook.js' import { runLifecycleHooksConcurrently, type RunLifecycleHooksConcurrentlyOptions } from './runLifecycleHooksConcurrently.js' diff --git a/exec/lifecycle/tsconfig.json b/exec/lifecycle/tsconfig.json index 5536330e3c..273970b1f7 100644 --- a/exec/lifecycle/tsconfig.json +++ b/exec/lifecycle/tsconfig.json @@ -21,23 +21,23 @@ { "path": "../../bins/linker" }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../fetching/directory-fetcher" }, { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, - { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../../store/cafs-types" diff --git a/exec/prepare-package/package.json b/exec/prepare-package/package.json index 0f85134b85..1db3b987f2 100644 --- a/exec/prepare-package/package.json +++ b/exec/prepare-package/package.json @@ -33,7 +33,7 @@ "dependencies": { "@pnpm/error": "workspace:*", "@pnpm/exec.lifecycle": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "catalog:", "execa": "catalog:", diff --git a/exec/prepare-package/src/index.ts b/exec/prepare-package/src/index.ts index ec43641b84..6bf591d0c5 100644 --- a/exec/prepare-package/src/index.ts +++ b/exec/prepare-package/src/index.ts @@ -5,7 +5,7 @@ import util from 'node:util' import { PnpmError } from '@pnpm/error' import { runLifecycleHook, type RunLifecycleHookOptions } from '@pnpm/exec.lifecycle' -import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import type { AllowBuild, PackageManifest } from '@pnpm/types' import { rimraf } from '@zkochan/rimraf' import { preferredPM } from 'preferred-pm' diff --git a/exec/prepare-package/tsconfig.json b/exec/prepare-package/tsconfig.json index 2df8ebdd0f..b8b2dea8e8 100644 --- a/exec/prepare-package/tsconfig.json +++ b/exec/prepare-package/tsconfig.json @@ -19,13 +19,13 @@ "path": "../../__utils__/test-ipc-server" }, { - "path": "../../packages/error" + "path": "../../core/error" }, { - "path": "../../packages/types" + "path": "../../core/types" }, { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../lifecycle" diff --git a/fetching/binary-fetcher/tsconfig.json b/fetching/binary-fetcher/tsconfig.json index e13f2f63cb..894945b552 100644 --- a/fetching/binary-fetcher/tsconfig.json +++ b/fetching/binary-fetcher/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/error" + "path": "../../core/error" }, { "path": "../../store/index" diff --git a/fetching/directory-fetcher/tsconfig.json b/fetching/directory-fetcher/tsconfig.json index 736e329b72..fa1fa79c9e 100644 --- a/fetching/directory-fetcher/tsconfig.json +++ b/fetching/directory-fetcher/tsconfig.json @@ -15,15 +15,15 @@ { "path": "../../building/pkg-requires-build" }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../fs/packlist" }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/resolver-base" }, diff --git a/fetching/fetcher-base/tsconfig.json b/fetching/fetcher-base/tsconfig.json index 2d93b9bf18..d9a05b6eb3 100644 --- a/fetching/fetcher-base/tsconfig.json +++ b/fetching/fetcher-base/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../../resolving/resolver-base" diff --git a/fetching/git-fetcher/tsconfig.json b/fetching/git-fetcher/tsconfig.json index 66b09274af..6b7c1a567f 100644 --- a/fetching/git-fetcher/tsconfig.json +++ b/fetching/git-fetcher/tsconfig.json @@ -9,21 +9,21 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../exec/prepare-package" }, { "path": "../../fs/packlist" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../store/cafs" }, diff --git a/fetching/pick-fetcher/tsconfig.json b/fetching/pick-fetcher/tsconfig.json index f6199da7ca..7c4f8d05ae 100644 --- a/fetching/pick-fetcher/tsconfig.json +++ b/fetching/pick-fetcher/tsconfig.json @@ -12,15 +12,15 @@ { "path": "../../__utils__/test-fixtures" }, + { + "path": "../../core/error" + }, { "path": "../../hooks/types" }, { "path": "../../network/fetch" }, - { - "path": "../../packages/error" - }, { "path": "../../resolving/resolver-base" }, diff --git a/fetching/tarball-fetcher/tsconfig.json b/fetching/tarball-fetcher/tsconfig.json index d95c36102b..1fc527ca14 100644 --- a/fetching/tarball-fetcher/tsconfig.json +++ b/fetching/tarball-fetcher/tsconfig.json @@ -12,6 +12,18 @@ { "path": "../../__utils__/test-fixtures" }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../exec/prepare-package" }, @@ -24,18 +36,6 @@ { "path": "../../network/fetch" }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../store/cafs-types" }, diff --git a/fs/find-packages/tsconfig.json b/fs/find-packages/tsconfig.json index 161fc50269..5d0164ce3c 100644 --- a/fs/find-packages/tsconfig.json +++ b/fs/find-packages/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../../workspace/project-manifest-reader" diff --git a/fs/hard-link-dir/tsconfig.json b/fs/hard-link-dir/tsconfig.json index 35bf0596f0..34fc276c34 100644 --- a/fs/hard-link-dir/tsconfig.json +++ b/fs/hard-link-dir/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../__utils__/prepare" }, { - "path": "../../packages/logger" + "path": "../../core/logger" }, { "path": "../graceful-fs" diff --git a/fs/indexed-pkg-importer/tsconfig.json b/fs/indexed-pkg-importer/tsconfig.json index 66370cd81d..acbb65baa7 100644 --- a/fs/indexed-pkg-importer/tsconfig.json +++ b/fs/indexed-pkg-importer/tsconfig.json @@ -13,10 +13,10 @@ "path": "../../__utils__/prepare" }, { - "path": "../../packages/core-loggers" + "path": "../../core/core-loggers" }, { - "path": "../../packages/logger" + "path": "../../core/logger" }, { "path": "../../store/controller-types" diff --git a/fs/symlink-dependency/tsconfig.json b/fs/symlink-dependency/tsconfig.json index 915c2cd81d..f8603591a3 100644 --- a/fs/symlink-dependency/tsconfig.json +++ b/fs/symlink-dependency/tsconfig.json @@ -13,13 +13,13 @@ "path": "../../__utils__/prepare" }, { - "path": "../../packages/core-loggers" + "path": "../../core/core-loggers" }, { - "path": "../../packages/logger" + "path": "../../core/logger" }, { - "path": "../../packages/types" + "path": "../../core/types" } ] } diff --git a/global/commands/package.json b/global/commands/package.json index 3aa226d10e..bf7afb3415 100644 --- a/global/commands/package.json +++ b/global/commands/package.json @@ -42,7 +42,7 @@ "@pnpm/error": "workspace:*", "@pnpm/global.packages": "workspace:*", "@pnpm/installing.deps-installer": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/store.connection-manager": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", diff --git a/global/commands/src/checkGlobalBinConflicts.ts b/global/commands/src/checkGlobalBinConflicts.ts index 57a5c7e6a2..2dbb75c8e5 100644 --- a/global/commands/src/checkGlobalBinConflicts.ts +++ b/global/commands/src/checkGlobalBinConflicts.ts @@ -7,7 +7,7 @@ import { type GlobalPackageInfo, scanGlobalPackages, } from '@pnpm/global.packages' -import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' 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 a2f562c10f..d43924fc36 100644 --- a/global/commands/src/globalAdd.ts +++ b/global/commands/src/globalAdd.ts @@ -12,7 +12,7 @@ import { getHashLink, getInstalledBinNames, } from '@pnpm/global.packages' -import { readPackageJsonFromDirRawSync } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJsonFromDirRawSync } from '@pnpm/pkg-manifest.reader' import type { CreateStoreControllerOptions } from '@pnpm/store.connection-manager' import { isSubdir } from 'is-subdir' import symlinkDir from 'symlink-dir' diff --git a/global/commands/src/readInstalledPackages.ts b/global/commands/src/readInstalledPackages.ts index 163a29c2dd..513621c879 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/pkg-manifest.read-package-json' +import { readPackageJsonFromDir, readPackageJsonFromDirRawSync } from '@pnpm/pkg-manifest.reader' 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 8121b663e9..5e7a0cd1ab 100644 --- a/global/commands/tsconfig.json +++ b/global/commands/tsconfig.json @@ -30,17 +30,17 @@ { "path": "../../config/reader" }, + { + "path": "../../core/error" + }, + { + "path": "../../core/types" + }, { "path": "../../installing/deps-installer" }, { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, - { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../../store/connection-manager" diff --git a/global/packages/package.json b/global/packages/package.json index ddfb5ad5e0..d496e7aaff 100644 --- a/global/packages/package.json +++ b/global/packages/package.json @@ -33,7 +33,7 @@ "dependencies": { "@pnpm/bins.resolver": "workspace:*", "@pnpm/crypto.hash": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:" }, diff --git a/global/packages/src/scanGlobalPackages.ts b/global/packages/src/scanGlobalPackages.ts index 01c4b5f6bb..d6bca3ef7b 100644 --- a/global/packages/src/scanGlobalPackages.ts +++ b/global/packages/src/scanGlobalPackages.ts @@ -3,7 +3,7 @@ import path from 'node:path' import util from 'node:util' import { getBinsFromPackageManifest } from '@pnpm/bins.resolver' -import { readPackageJsonFromDirRawSync, safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJsonFromDirRawSync, safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import type { PackageManifest } from '@pnpm/types' export interface GlobalPackageInfo { diff --git a/global/packages/tsconfig.json b/global/packages/tsconfig.json index 06cc063117..8d633fb053 100644 --- a/global/packages/tsconfig.json +++ b/global/packages/tsconfig.json @@ -12,14 +12,14 @@ { "path": "../../bins/resolver" }, + { + "path": "../../core/types" + }, { "path": "../../crypto/hash" }, { - "path": "../../packages/types" - }, - { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" } ] } diff --git a/hooks/pnpmfile/tsconfig.json b/hooks/pnpmfile/tsconfig.json index 4dec0a3f3b..0838640bcd 100644 --- a/hooks/pnpmfile/tsconfig.json +++ b/hooks/pnpmfile/tsconfig.json @@ -12,6 +12,18 @@ { "path": "../../__utils__/test-fixtures" }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/hash" }, @@ -21,18 +33,6 @@ { "path": "../../lockfile/types" }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../store/controller-types" }, diff --git a/hooks/read-package-hook/tsconfig.json b/hooks/read-package-hook/tsconfig.json index 36c988f224..4b1b3bd13e 100644 --- a/hooks/read-package-hook/tsconfig.json +++ b/hooks/read-package-hook/tsconfig.json @@ -15,15 +15,15 @@ { "path": "../../config/parse-overrides" }, + { + "path": "../../core/error" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/peer-range" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/parse-wanted-dependency" } diff --git a/hooks/types/tsconfig.json b/hooks/types/tsconfig.json index aabb2927cc..79700f3fb3 100644 --- a/hooks/types/tsconfig.json +++ b/hooks/types/tsconfig.json @@ -9,15 +9,15 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/types" + }, { "path": "../../fetching/fetcher-base" }, { "path": "../../lockfile/types" }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/resolver-base" }, diff --git a/installing/client/package.json b/installing/client/package.json index f46788657b..6e5e601090 100644 --- a/installing/client/package.json +++ b/installing/client/package.json @@ -33,7 +33,6 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/engine.runtime.node.fetcher": "workspace:*", "@pnpm/fetching.binary-fetcher": "workspace:*", "@pnpm/fetching.directory-fetcher": "workspace:*", "@pnpm/fetching.git-fetcher": "workspace:*", diff --git a/installing/client/tsconfig.json b/installing/client/tsconfig.json index 14990cfa17..0a68198428 100644 --- a/installing/client/tsconfig.json +++ b/installing/client/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../engine/runtime/node.fetcher" + "path": "../../core/types" }, { "path": "../../fetching/binary-fetcher" @@ -39,9 +39,6 @@ { "path": "../../network/fetch" }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/default-resolver" }, diff --git a/installing/commands/package.json b/installing/commands/package.json index 6bfea42fab..c1e956de35 100644 --- a/installing/commands/package.json +++ b/installing/commands/package.json @@ -56,7 +56,7 @@ "@pnpm/installing.dedupe.check": "workspace:*", "@pnpm/installing.deps-installer": "workspace:*", "@pnpm/lockfile.types": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/pkg-manifest.utils": "workspace:*", "@pnpm/resolving.parse-wanted-dependency": "workspace:*", "@pnpm/resolving.resolver-base": "workspace:*", @@ -64,13 +64,13 @@ "@pnpm/store.connection-manager": "workspace:*", "@pnpm/store.controller": "workspace:*", "@pnpm/types": "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-graph": "workspace:*", "@pnpm/workspace.projects-reader": "workspace:*", + "@pnpm/workspace.projects-sorter": "workspace:*", "@pnpm/workspace.root-finder": "workspace:*", - "@pnpm/workspace.sort-packages": "workspace:*", "@pnpm/workspace.state": "workspace:*", "@pnpm/workspace.workspace-manifest-writer": "workspace:*", "@yarnpkg/core": "catalog:", diff --git a/installing/commands/src/import/index.ts b/installing/commands/src/import/index.ts index a818f177f3..97fb74c977 100644 --- a/installing/commands/src/import/index.ts +++ b/installing/commands/src/import/index.ts @@ -15,7 +15,7 @@ import { import type { Project, ProjectsGraph } from '@pnpm/types' import { readProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader' import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' -import { sequenceGraph } from '@pnpm/workspace.sort-packages' +import { sequenceGraph } from '@pnpm/workspace.projects-sorter' import * as structUtils from '@yarnpkg/core/structUtils' import type { LockFileObject } from '@yarnpkg/lockfile' import yarnLockfileLib from '@yarnpkg/lockfile' diff --git a/installing/commands/src/installDeps.ts b/installing/commands/src/installDeps.ts index ad341eaedc..08051adf6e 100644 --- a/installing/commands/src/installDeps.ts +++ b/installing/commands/src/installDeps.ts @@ -30,10 +30,10 @@ import type { ProjectsGraph, VulnerabilitySeverity, } from '@pnpm/types' -import { createPkgGraph } from '@pnpm/workspace.pkgs-graph' import { filterPkgsBySelectorObjects } from '@pnpm/workspace.projects-filter' +import { createPkgGraph } from '@pnpm/workspace.projects-graph' import { findWorkspacePackages } from '@pnpm/workspace.projects-reader' -import { sequenceGraph } from '@pnpm/workspace.sort-packages' +import { sequenceGraph } from '@pnpm/workspace.projects-sorter' import { updateWorkspaceState, type WorkspaceStateSettings } from '@pnpm/workspace.state' import { updateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-writer' diff --git a/installing/commands/src/recursive.ts b/installing/commands/src/recursive.ts index e350930571..f4c5029384 100755 --- a/installing/commands/src/recursive.ts +++ b/installing/commands/src/recursive.ts @@ -45,7 +45,7 @@ import type { ProjectRootDirRealPath, ProjectsGraph, } from '@pnpm/types' -import { sortPackages } from '@pnpm/workspace.sort-packages' +import { sortPackages } from '@pnpm/workspace.projects-sorter' import { updateWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-writer' import { isSubdir } from 'is-subdir' import pFilter from 'p-filter' diff --git a/installing/commands/tsconfig.json b/installing/commands/tsconfig.json index 4e2ea60eca..c35f89186f 100644 --- a/installing/commands/tsconfig.json +++ b/installing/commands/tsconfig.json @@ -54,6 +54,18 @@ { "path": "../../config/writer" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/inspection/outdated" }, @@ -76,19 +88,7 @@ "path": "../../lockfile/types" }, { - "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" @@ -111,9 +111,6 @@ { "path": "../../worker" }, - { - "path": "../../workspace/pkgs-graph" - }, { "path": "../../workspace/project-manifest-reader" }, @@ -123,14 +120,17 @@ { "path": "../../workspace/projects-filter" }, + { + "path": "../../workspace/projects-graph" + }, { "path": "../../workspace/projects-reader" }, { - "path": "../../workspace/root-finder" + "path": "../../workspace/projects-sorter" }, { - "path": "../../workspace/sort-packages" + "path": "../../workspace/root-finder" }, { "path": "../../workspace/state" diff --git a/installing/context/tsconfig.json b/installing/context/tsconfig.json index 11b9f8a2d4..0ca5249acb 100644 --- a/installing/context/tsconfig.json +++ b/installing/context/tsconfig.json @@ -9,21 +9,21 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/constants" + }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../lockfile/fs" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/resolver-base" }, diff --git a/installing/dedupe/check/tsconfig.json b/installing/dedupe/check/tsconfig.json index 2e63c374a4..0bd3483c88 100644 --- a/installing/dedupe/check/tsconfig.json +++ b/installing/dedupe/check/tsconfig.json @@ -9,15 +9,15 @@ "../../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../../core/error" + }, + { + "path": "../../../core/types" + }, { "path": "../../../lockfile/types" }, - { - "path": "../../../packages/error" - }, - { - "path": "../../../packages/types" - }, { "path": "../types" } diff --git a/installing/deps-installer/package.json b/installing/deps-installer/package.json index 57bf42d6df..86f2136207 100644 --- a/installing/deps-installer/package.json +++ b/installing/deps-installer/package.json @@ -132,7 +132,7 @@ "@pnpm/lockfile.types": "workspace:*", "@pnpm/logger": "workspace:*", "@pnpm/network.git-utils": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/store.cafs": "workspace:*", diff --git a/installing/deps-installer/test/lockfile.ts b/installing/deps-installer/test/lockfile.ts index 181e02d1bf..14390e49e1 100644 --- a/installing/deps-installer/test/lockfile.ts +++ b/installing/deps-installer/test/lockfile.ts @@ -15,7 +15,7 @@ import { } 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 { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { prepareEmpty, preparePackages, tempDir } from '@pnpm/prepare' import { addDistTag, getIntegrity, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' diff --git a/installing/deps-installer/tsconfig.json b/installing/deps-installer/tsconfig.json index 594191e48b..8e828d1958 100644 --- a/installing/deps-installer/tsconfig.json +++ b/installing/deps-installer/tsconfig.json @@ -57,6 +57,21 @@ { "path": "../../config/parse-overrides" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/hash" }, @@ -123,26 +138,11 @@ { "path": "../../network/git-utils" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../patching/config" }, { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../../pkg-manifest/utils" diff --git a/installing/deps-restorer/package.json b/installing/deps-restorer/package.json index 5b7582bcd1..173edb9ea0 100644 --- a/installing/deps-restorer/package.json +++ b/installing/deps-restorer/package.json @@ -62,7 +62,7 @@ "@pnpm/lockfile.to-pnp": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/patching.config": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/store.controller-types": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/workspace.project-manifest-reader": "workspace:*", diff --git a/installing/deps-restorer/src/index.ts b/installing/deps-restorer/src/index.ts index c1d5f23174..060af82074 100644 --- a/installing/deps-restorer/src/index.ts +++ b/installing/deps-restorer/src/index.ts @@ -61,7 +61,7 @@ import { streamParser, } from '@pnpm/logger' import type { PatchGroupRecord } from '@pnpm/patching.config' -import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import type { PackageFilesResponse, StoreController, diff --git a/installing/deps-restorer/src/lockfileToHoistedDepGraph.ts b/installing/deps-restorer/src/lockfileToHoistedDepGraph.ts index 4891306490..a6cfa9951c 100644 --- a/installing/deps-restorer/src/lockfileToHoistedDepGraph.ts +++ b/installing/deps-restorer/src/lockfileToHoistedDepGraph.ts @@ -22,7 +22,7 @@ import { } from '@pnpm/lockfile.utils' import { logger } from '@pnpm/logger' import { getPatchInfo, type PatchGroupRecord } from '@pnpm/patching.config' -import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import type { FetchPackageToStoreFunction, StoreController, diff --git a/installing/deps-restorer/test/utils/testDefaults.ts b/installing/deps-restorer/test/utils/testDefaults.ts index 096f2a05fa..eb38bd829f 100644 --- a/installing/deps-restorer/test/utils/testDefaults.ts +++ b/installing/deps-restorer/test/utils/testDefaults.ts @@ -2,7 +2,7 @@ import path from 'node:path' 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 { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { getStorePath } from '@pnpm/store.path' import { createTempStore } from '@pnpm/testing.temp-store' diff --git a/installing/deps-restorer/tsconfig.json b/installing/deps-restorer/tsconfig.json index b714c3e41d..b9d2042f22 100644 --- a/installing/deps-restorer/tsconfig.json +++ b/installing/deps-restorer/tsconfig.json @@ -33,6 +33,21 @@ { "path": "../../config/package-is-installable" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/object-hasher" }, @@ -63,26 +78,11 @@ { "path": "../../lockfile/utils" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../patching/config" }, { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../../store/cafs" diff --git a/installing/linking/direct-dep-linker/tsconfig.json b/installing/linking/direct-dep-linker/tsconfig.json index 26b9b710f8..2f18031b04 100644 --- a/installing/linking/direct-dep-linker/tsconfig.json +++ b/installing/linking/direct-dep-linker/tsconfig.json @@ -9,17 +9,17 @@ "../../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../../core/core-loggers" + }, + { + "path": "../../../core/logger" + }, { "path": "../../../fs/read-modules-dir" }, { "path": "../../../fs/symlink-dependency" - }, - { - "path": "../../../packages/core-loggers" - }, - { - "path": "../../../packages/logger" } ] } diff --git a/installing/linking/hoist/tsconfig.json b/installing/linking/hoist/tsconfig.json index dc6ec4b4b7..7d5a3925e0 100644 --- a/installing/linking/hoist/tsconfig.json +++ b/installing/linking/hoist/tsconfig.json @@ -16,16 +16,16 @@ "path": "../../../config/matcher" }, { - "path": "../../../packages/constants" + "path": "../../../core/constants" }, { - "path": "../../../packages/core-loggers" + "path": "../../../core/core-loggers" }, { - "path": "../../../packages/logger" + "path": "../../../core/logger" }, { - "path": "../../../packages/types" + "path": "../../../core/types" } ] } diff --git a/installing/linking/modules-cleaner/tsconfig.json b/installing/linking/modules-cleaner/tsconfig.json index 3e5efecdb3..a70365ac05 100644 --- a/installing/linking/modules-cleaner/tsconfig.json +++ b/installing/linking/modules-cleaner/tsconfig.json @@ -12,6 +12,15 @@ { "path": "../../../bins/remover" }, + { + "path": "../../../core/core-loggers" + }, + { + "path": "../../../core/logger" + }, + { + "path": "../../../core/types" + }, { "path": "../../../deps/path" }, @@ -27,15 +36,6 @@ { "path": "../../../lockfile/utils" }, - { - "path": "../../../packages/core-loggers" - }, - { - "path": "../../../packages/logger" - }, - { - "path": "../../../packages/types" - }, { "path": "../../../store/controller-types" } diff --git a/installing/linking/real-hoist/tsconfig.json b/installing/linking/real-hoist/tsconfig.json index 90a3325dcb..26a9851203 100644 --- a/installing/linking/real-hoist/tsconfig.json +++ b/installing/linking/real-hoist/tsconfig.json @@ -14,6 +14,12 @@ { "path": "../../../__utils__/test-fixtures" }, + { + "path": "../../../core/error" + }, + { + "path": "../../../core/types" + }, { "path": "../../../deps/path" }, @@ -22,12 +28,6 @@ }, { "path": "../../../lockfile/utils" - }, - { - "path": "../../../packages/error" - }, - { - "path": "../../../packages/types" } ] } diff --git a/installing/modules-yaml/tsconfig.json b/installing/modules-yaml/tsconfig.json index b998d9e2d4..11d5762e21 100644 --- a/installing/modules-yaml/tsconfig.json +++ b/installing/modules-yaml/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../fs/graceful-fs" + "path": "../../core/types" }, { - "path": "../../packages/types" + "path": "../../fs/graceful-fs" } ] } diff --git a/installing/package-requester/tsconfig.json b/installing/package-requester/tsconfig.json index a3adde09ef..9dfe23e299 100644 --- a/installing/package-requester/tsconfig.json +++ b/installing/package-requester/tsconfig.json @@ -15,6 +15,18 @@ { "path": "../../config/package-is-installable" }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/path" }, @@ -33,18 +45,6 @@ { "path": "../../hooks/types" }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/resolver-base" }, diff --git a/installing/read-projects-context/tsconfig.json b/installing/read-projects-context/tsconfig.json index 343633dded..b17155ed81 100644 --- a/installing/read-projects-context/tsconfig.json +++ b/installing/read-projects-context/tsconfig.json @@ -12,15 +12,15 @@ { "path": "../../config/normalize-registries" }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../lockfile/fs" }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../modules-yaml" } diff --git a/installing/render-peer-issues/tsconfig.json b/installing/render-peer-issues/tsconfig.json index ae648d4d1c..b01518c1c8 100644 --- a/installing/render-peer-issues/tsconfig.json +++ b/installing/render-peer-issues/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../packages/error" + "path": "../../core/error" }, { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../../text/tree-renderer" diff --git a/installing/resolve-dependencies/package.json b/installing/resolve-dependencies/package.json index 5fabf1a563..b5c8dfe50d 100644 --- a/installing/resolve-dependencies/package.json +++ b/installing/resolve-dependencies/package.json @@ -49,7 +49,7 @@ "@pnpm/lockfile.utils": "workspace:*", "@pnpm/patching.config": "workspace:*", "@pnpm/patching.types": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/pkg-manifest.utils": "workspace:*", "@pnpm/resolving.npm-resolver": "workspace:*", "@pnpm/resolving.resolver-base": "workspace:*", diff --git a/installing/resolve-dependencies/src/index.ts b/installing/resolve-dependencies/src/index.ts index 1e83cb1f72..739aaef3e3 100644 --- a/installing/resolve-dependencies/src/index.ts +++ b/installing/resolve-dependencies/src/index.ts @@ -11,7 +11,7 @@ import type { ProjectSnapshot, } from '@pnpm/lockfile.types' import { verifyPatches } from '@pnpm/patching.config' -import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { getAllDependenciesFromManifest, getSpecFromPackageManifest, diff --git a/installing/resolve-dependencies/tsconfig.json b/installing/resolve-dependencies/tsconfig.json index 87626c8ab2..0d5b77c4b1 100644 --- a/installing/resolve-dependencies/tsconfig.json +++ b/installing/resolve-dependencies/tsconfig.json @@ -18,6 +18,21 @@ { "path": "../../config/version-policy" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/graph-hasher" }, @@ -45,21 +60,6 @@ { "path": "../../lockfile/utils" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../patching/config" }, @@ -67,7 +67,7 @@ "path": "../../patching/types" }, { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../../pkg-manifest/utils" diff --git a/lockfile/detect-dep-types/tsconfig.json b/lockfile/detect-dep-types/tsconfig.json index 7bd3ad681b..a8e9f590f1 100644 --- a/lockfile/detect-dep-types/tsconfig.json +++ b/lockfile/detect-dep-types/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../deps/path" + "path": "../../core/types" }, { - "path": "../../packages/types" + "path": "../../deps/path" }, { "path": "../types" diff --git a/lockfile/filtering/tsconfig.json b/lockfile/filtering/tsconfig.json index 342636b44b..cb4e084613 100644 --- a/lockfile/filtering/tsconfig.json +++ b/lockfile/filtering/tsconfig.json @@ -12,21 +12,21 @@ { "path": "../../config/package-is-installable" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/path" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../types" }, diff --git a/lockfile/fs/tsconfig.json b/lockfile/fs/tsconfig.json index 083bc57290..ef27d4f5a5 100644 --- a/lockfile/fs/tsconfig.json +++ b/lockfile/fs/tsconfig.json @@ -9,6 +9,18 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/constants" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/path" }, @@ -18,18 +30,6 @@ { "path": "../../object/key-sorting" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../merger" }, diff --git a/lockfile/make-dedicated-lockfile/tsconfig.json b/lockfile/make-dedicated-lockfile/tsconfig.json index c7c0f63477..425ac81e6e 100644 --- a/lockfile/make-dedicated-lockfile/tsconfig.json +++ b/lockfile/make-dedicated-lockfile/tsconfig.json @@ -13,13 +13,13 @@ "path": "../../__utils__/test-fixtures" }, { - "path": "../../packages/error" + "path": "../../core/error" }, { - "path": "../../packages/logger" + "path": "../../core/logger" }, { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../../releasing/exportable-manifest" diff --git a/lockfile/merger/tsconfig.json b/lockfile/merger/tsconfig.json index 6dcbdb5ae6..501dfeb36b 100644 --- a/lockfile/merger/tsconfig.json +++ b/lockfile/merger/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../types" diff --git a/lockfile/preferred-versions/tsconfig.json b/lockfile/preferred-versions/tsconfig.json index e0b2998d24..3a5f51d672 100644 --- a/lockfile/preferred-versions/tsconfig.json +++ b/lockfile/preferred-versions/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../../pkg-manifest/utils" diff --git a/lockfile/pruner/tsconfig.json b/lockfile/pruner/tsconfig.json index dcbe541f47..ecabb37a06 100644 --- a/lockfile/pruner/tsconfig.json +++ b/lockfile/pruner/tsconfig.json @@ -9,15 +9,15 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/constants" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/path" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/types" - }, { "path": "../types" } diff --git a/lockfile/to-pnp/tsconfig.json b/lockfile/to-pnp/tsconfig.json index 1729923945..1646b863b3 100644 --- a/lockfile/to-pnp/tsconfig.json +++ b/lockfile/to-pnp/tsconfig.json @@ -9,15 +9,15 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/path" }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../fs" }, diff --git a/lockfile/types/tsconfig.json b/lockfile/types/tsconfig.json index 15edbc6506..9f7e963569 100644 --- a/lockfile/types/tsconfig.json +++ b/lockfile/types/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../../patching/types" diff --git a/lockfile/utils/tsconfig.json b/lockfile/utils/tsconfig.json index 409e3a92b9..b362516053 100644 --- a/lockfile/utils/tsconfig.json +++ b/lockfile/utils/tsconfig.json @@ -9,6 +9,12 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/error" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/path" }, @@ -18,12 +24,6 @@ { "path": "../../hooks/types" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/resolver-base" }, diff --git a/lockfile/verification/package.json b/lockfile/verification/package.json index c9ea9be0bc..784614a4c3 100644 --- a/lockfile/verification/package.json +++ b/lockfile/verification/package.json @@ -38,7 +38,7 @@ "@pnpm/installing.context": "workspace:*", "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", "p-every": "catalog:", diff --git a/lockfile/verification/src/linkedPackagesAreUpToDate.ts b/lockfile/verification/src/linkedPackagesAreUpToDate.ts index b0172c2a69..c2a68f413d 100644 --- a/lockfile/verification/src/linkedPackagesAreUpToDate.ts +++ b/lockfile/verification/src/linkedPackagesAreUpToDate.ts @@ -7,7 +7,7 @@ import type { ProjectSnapshot, } from '@pnpm/lockfile.types' import { refIsLocalDirectory } from '@pnpm/lockfile.utils' -import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import type { DirectoryResolution, WorkspacePackages } from '@pnpm/resolving.resolver-base' import { DEPENDENCIES_FIELDS, diff --git a/lockfile/verification/tsconfig.json b/lockfile/verification/tsconfig.json index 0e42e7f9ce..c0b91beb29 100644 --- a/lockfile/verification/tsconfig.json +++ b/lockfile/verification/tsconfig.json @@ -15,6 +15,15 @@ { "path": "../../catalogs/types" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/hash" }, @@ -25,16 +34,7 @@ "path": "../../installing/context" }, { - "path": "../../packages/constants" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, - { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../../resolving/resolver-base" diff --git a/lockfile/walker/tsconfig.json b/lockfile/walker/tsconfig.json index 7bd3ad681b..a8e9f590f1 100644 --- a/lockfile/walker/tsconfig.json +++ b/lockfile/walker/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../deps/path" + "path": "../../core/types" }, { - "path": "../../packages/types" + "path": "../../deps/path" }, { "path": "../types" diff --git a/modules-mounter/daemon/tsconfig.json b/modules-mounter/daemon/tsconfig.json index 7a2dca1e24..f5466c071f 100644 --- a/modules-mounter/daemon/tsconfig.json +++ b/modules-mounter/daemon/tsconfig.json @@ -12,6 +12,15 @@ { "path": "../../config/reader" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/path" }, @@ -21,15 +30,6 @@ { "path": "../../lockfile/utils" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../store/cafs" }, diff --git a/network/auth-header/tsconfig.json b/network/auth-header/tsconfig.json index 019cba19e7..5e5ef544a0 100644 --- a/network/auth-header/tsconfig.json +++ b/network/auth-header/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/error" + "path": "../../core/error" } ] } diff --git a/network/fetch/tsconfig.json b/network/fetch/tsconfig.json index f2bdfa3dd0..d71b5409ac 100644 --- a/network/fetch/tsconfig.json +++ b/network/fetch/tsconfig.json @@ -9,17 +9,17 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../fetching/types" - }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" } ] } diff --git a/object/property-path/tsconfig.json b/object/property-path/tsconfig.json index 019cba19e7..5e5ef544a0 100644 --- a/object/property-path/tsconfig.json +++ b/object/property-path/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/error" + "path": "../../core/error" } ] } diff --git a/patching/apply-patch/tsconfig.json b/patching/apply-patch/tsconfig.json index 054730352d..49a2bdaaad 100644 --- a/patching/apply-patch/tsconfig.json +++ b/patching/apply-patch/tsconfig.json @@ -16,10 +16,10 @@ "path": "../../__utils__/test-fixtures" }, { - "path": "../../packages/error" + "path": "../../core/error" }, { - "path": "../../packages/logger" + "path": "../../core/logger" } ] } diff --git a/patching/commands/package.json b/patching/commands/package.json index 1b512b457a..8f4e58a73f 100644 --- a/patching/commands/package.json +++ b/patching/commands/package.json @@ -46,7 +46,7 @@ "@pnpm/lockfile.fs": "workspace:*", "@pnpm/lockfile.utils": "workspace:*", "@pnpm/patching.apply-patch": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/resolving.parse-wanted-dependency": "workspace:*", "@pnpm/store.connection-manager": "workspace:*", "@pnpm/store.path": "workspace:*", diff --git a/patching/commands/src/patchCommit.ts b/patching/commands/src/patchCommit.ts index aa26919758..27f47c4f56 100644 --- a/patching/commands/src/patchCommit.ts +++ b/patching/commands/src/patchCommit.ts @@ -8,7 +8,7 @@ import { PnpmError } from '@pnpm/error' import { packlist } from '@pnpm/fs.packlist' import { install } from '@pnpm/installing.commands' import { globalWarn } from '@pnpm/logger' -import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { parseWantedDependency, type ParseWantedDependencyResult } from '@pnpm/resolving.parse-wanted-dependency' import { getStorePath } from '@pnpm/store.path' import type { ProjectRootDir } from '@pnpm/types' diff --git a/patching/commands/tsconfig.json b/patching/commands/tsconfig.json index cecf8d586a..3e72e09b73 100644 --- a/patching/commands/tsconfig.json +++ b/patching/commands/tsconfig.json @@ -24,6 +24,18 @@ { "path": "../../config/writer" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/hash" }, @@ -46,19 +58,7 @@ "path": "../../lockfile/utils" }, { - "path": "../../packages/constants" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, - { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../../resolving/parse-wanted-dependency" diff --git a/patching/config/tsconfig.json b/patching/config/tsconfig.json index 0f13cebc2b..4dad83a6a6 100644 --- a/patching/config/tsconfig.json +++ b/patching/config/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../deps/path" + "path": "../../core/error" }, { - "path": "../../packages/error" + "path": "../../deps/path" }, { "path": "../types" diff --git a/pkg-manifest/read-package-json/CHANGELOG.md b/pkg-manifest/reader/CHANGELOG.md similarity index 100% rename from pkg-manifest/read-package-json/CHANGELOG.md rename to pkg-manifest/reader/CHANGELOG.md diff --git a/pkg-manifest/read-package-json/README.md b/pkg-manifest/reader/README.md similarity index 100% rename from pkg-manifest/read-package-json/README.md rename to pkg-manifest/reader/README.md diff --git a/pkg-manifest/read-package-json/package.json b/pkg-manifest/reader/package.json similarity index 87% rename from pkg-manifest/read-package-json/package.json rename to pkg-manifest/reader/package.json index caf29dc57c..a9e82645a2 100644 --- a/pkg-manifest/read-package-json/package.json +++ b/pkg-manifest/reader/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/pkg-manifest.read-package-json", + "name": "@pnpm/pkg-manifest.reader", "version": "1000.1.2", "description": "Read a package.json", "keywords": [ @@ -9,8 +9,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/read-package-json", - "homepage": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/read-package-json#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/reader", + "homepage": "https://github.com/pnpm/pnpm/tree/main/pkg-manifest/reader#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -38,7 +38,7 @@ "normalize-package-data": "catalog:" }, "devDependencies": { - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@types/normalize-package-data": "catalog:" }, "engines": { diff --git a/pkg-manifest/read-package-json/src/index.ts b/pkg-manifest/reader/src/index.ts similarity index 100% rename from pkg-manifest/read-package-json/src/index.ts rename to pkg-manifest/reader/src/index.ts diff --git a/pkg-manifest/read-package-json/test/fixtures/invalid-name/package.json b/pkg-manifest/reader/test/fixtures/invalid-name/package.json similarity index 100% rename from pkg-manifest/read-package-json/test/fixtures/invalid-name/package.json rename to pkg-manifest/reader/test/fixtures/invalid-name/package.json diff --git a/pkg-manifest/read-package-json/test/index.ts b/pkg-manifest/reader/test/index.ts similarity index 85% rename from pkg-manifest/read-package-json/test/index.ts rename to pkg-manifest/reader/test/index.ts index cef71e8569..e77ec1f45e 100644 --- a/pkg-manifest/read-package-json/test/index.ts +++ b/pkg-manifest/reader/test/index.ts @@ -1,16 +1,16 @@ /// import path from 'node:path' -import { readPackageJson, readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJson, readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' const fixtures = path.join(import.meta.dirname, 'fixtures') test('readPackageJson()', async () => { - expect((await readPackageJson(path.join(import.meta.dirname, '..', 'package.json'))).name).toBe('@pnpm/pkg-manifest.read-package-json') + expect((await readPackageJson(path.join(import.meta.dirname, '..', 'package.json'))).name).toBe('@pnpm/pkg-manifest.reader') }) test('fromDir()', async () => { - expect((await readPackageJsonFromDir(path.join(import.meta.dirname, '..'))).name).toBe('@pnpm/pkg-manifest.read-package-json') + expect((await readPackageJsonFromDir(path.join(import.meta.dirname, '..'))).name).toBe('@pnpm/pkg-manifest.reader') }) test('readPackageJson() throw error when name is invalid', async () => { diff --git a/pkg-manifest/read-package-json/test/tsconfig.json b/pkg-manifest/reader/test/tsconfig.json similarity index 100% rename from pkg-manifest/read-package-json/test/tsconfig.json rename to pkg-manifest/reader/test/tsconfig.json diff --git a/pkg-manifest/read-package-json/tsconfig.json b/pkg-manifest/reader/tsconfig.json similarity index 75% rename from pkg-manifest/read-package-json/tsconfig.json rename to pkg-manifest/reader/tsconfig.json index 2df79e0976..dbf37d88ad 100644 --- a/pkg-manifest/read-package-json/tsconfig.json +++ b/pkg-manifest/reader/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../packages/error" + "path": "../../core/error" }, { - "path": "../../packages/types" + "path": "../../core/types" } ] } diff --git a/pkg-manifest/read-package-json/tsconfig.lint.json b/pkg-manifest/reader/tsconfig.lint.json similarity index 100% rename from pkg-manifest/read-package-json/tsconfig.lint.json rename to pkg-manifest/reader/tsconfig.lint.json diff --git a/pkg-manifest/utils/tsconfig.json b/pkg-manifest/utils/tsconfig.json index d55f26dd28..3c5d0a0f5a 100644 --- a/pkg-manifest/utils/tsconfig.json +++ b/pkg-manifest/utils/tsconfig.json @@ -9,20 +9,20 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/peer-range" - }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" } ] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c2857fa829..357e4290e8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1065,7 +1065,7 @@ importers: version: link:../lockfile/fs '@pnpm/logger': specifier: workspace:* - version: link:../packages/logger + version: link:../core/logger '@pnpm/meta-updater': specifier: 'catalog:' version: 2.0.6(@types/node@22.19.15)(typanion@3.14.0) @@ -1074,7 +1074,7 @@ importers: version: link:../object/key-sorting '@pnpm/types': specifier: workspace:* - version: link:../packages/types + version: link:../core/types '@pnpm/workspace.projects-reader': specifier: workspace:* version: link:../workspace/projects-reader @@ -1129,7 +1129,7 @@ importers: version: link:../assert-store '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/installing.modules-yaml': specifier: workspace:* version: link:../../installing/modules-yaml @@ -1141,7 +1141,7 @@ importers: version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types is-windows: specifier: 'catalog:' version: 1.0.2 @@ -1191,7 +1191,7 @@ importers: version: 'link:' '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants __utils__/eslint-config: dependencies: @@ -1293,7 +1293,7 @@ importers: version: link:../prepare-temp-dir '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types write-json5-file: specifier: 'catalog:' version: 4.0.0 @@ -1404,22 +1404,22 @@ importers: version: link:../resolver '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fs.read-modules-dir': specifier: workspace:* version: link:../../fs/read-modules-dir - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/pkg-manifest.utils': specifier: workspace:* version: link:../../pkg-manifest/utils '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader @@ -1459,7 +1459,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -1492,13 +1492,13 @@ importers: version: link:../resolver '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers - '@pnpm/pkg-manifest.read-package-json': + version: link:../../core/core-loggers + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -1514,7 +1514,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/is-windows': specifier: 'catalog:' version: 1.0.2 @@ -1526,7 +1526,7 @@ importers: dependencies: '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types is-subdir: specifier: 'catalog:' version: 2.0.0 @@ -1563,10 +1563,10 @@ importers: version: link:../../config/reader '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/deps.graph-hasher': specifier: workspace:* version: link:../../deps/graph-hasher @@ -1578,7 +1578,7 @@ importers: version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../../exec/lifecycle @@ -1603,9 +1603,9 @@ importers: '@pnpm/npm-package-arg': specifier: 'catalog:' version: 2.0.0 - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs @@ -1620,7 +1620,7 @@ importers: version: link:../../store/index '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/worker': specifier: workspace:^ version: link:../../worker @@ -1666,7 +1666,7 @@ importers: version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/installing.modules-yaml': specifier: workspace:* version: link:../../installing/modules-yaml @@ -1678,13 +1678,13 @@ importers: version: link:../../store/connection-manager '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 - '@pnpm/workspace.sort-packages': + '@pnpm/workspace.projects-sorter': specifier: workspace:* - version: link:../../workspace/sort-packages + version: link:../../workspace/projects-sorter chalk: specifier: 'catalog:' version: 5.6.2 @@ -1712,13 +1712,13 @@ importers: version: 'link:' '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/crypto.object-hasher': specifier: workspace:* version: link:../../crypto/object-hasher '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -1769,7 +1769,7 @@ importers: version: link:../../config/reader '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/deps.graph-hasher': specifier: workspace:* version: link:../../deps/graph-hasher @@ -1781,7 +1781,7 @@ importers: version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../../exec/lifecycle @@ -1794,15 +1794,15 @@ importers: '@pnpm/patching.types': specifier: workspace:* version: link:../../patching/types - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/store.controller-types': specifier: workspace:* version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/worker': specifier: workspace:^ version: link:../../worker @@ -1821,7 +1821,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -1830,7 +1830,7 @@ importers: dependencies: '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@pnpm/building.pkg-requires-build': specifier: workspace:* @@ -1843,7 +1843,7 @@ importers: version: link:../../config/version-policy '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@pnpm/building.policy': specifier: workspace:* @@ -1856,7 +1856,7 @@ importers: version: link:../../config/reader '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/resolving.npm-resolver': specifier: workspace:* version: link:../../resolving/npm-resolver @@ -1878,7 +1878,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger cache/commands: dependencies: @@ -1893,10 +1893,10 @@ importers: version: link:../../config/reader '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/store.path': specifier: workspace:* version: link:../../store/path @@ -1912,7 +1912,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -1933,7 +1933,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error devDependencies: '@pnpm/catalogs.config': specifier: workspace:* @@ -1958,7 +1958,7 @@ importers: version: link:../protocol-parser '@pnpm/error': specifier: workspace:^ - version: link:../../packages/error + version: link:../../core/error devDependencies: '@jest/globals': specifier: 'catalog:' @@ -2002,7 +2002,7 @@ importers: version: link:../../config/reader '@pnpm/error': specifier: workspace:^ - version: link:../../packages/error + version: link:../../core/error '@pnpm/nopt': specifier: 'catalog:' version: 0.3.1 @@ -2036,7 +2036,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -2057,10 +2057,10 @@ importers: version: link:../../config/reader '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/installing.dedupe.issues-renderer': specifier: workspace:* version: link:../../installing/dedupe/issues-renderer @@ -2072,7 +2072,7 @@ importers: version: link:../../installing/render-peer-issues '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -2118,7 +2118,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/normalize-path': specifier: 'catalog:' version: 3.0.2 @@ -2142,7 +2142,7 @@ importers: dependencies: '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types load-json-file: specifier: 'catalog:' version: 7.0.1 @@ -2155,7 +2155,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/nopt': specifier: 'catalog:' version: 0.3.1 @@ -2192,7 +2192,7 @@ importers: version: link:../../config/reader '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/hooks.pnpmfile': specifier: workspace:* version: link:../../hooks/pnpmfile @@ -2204,7 +2204,7 @@ importers: version: link:../../store/connection-manager '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -2226,7 +2226,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -2244,10 +2244,10 @@ importers: version: link:../reader '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.run-npm': specifier: workspace:* version: link:../../exec/run-npm @@ -2293,7 +2293,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -2317,16 +2317,16 @@ importers: version: link:../writer '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/deps.graph-hasher': specifier: workspace:* version: link:../../deps/graph-hasher '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fs.read-modules-dir': specifier: workspace:* version: link:../../fs/read-modules-dir @@ -2354,9 +2354,9 @@ importers: '@pnpm/network.fetch': specifier: workspace:* version: link:../../network/fetch - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/resolving.npm-resolver': specifier: workspace:* version: link:../../resolving/npm-resolver @@ -2371,7 +2371,7 @@ importers: version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/worker': specifier: workspace:^ version: link:../../worker @@ -2418,7 +2418,7 @@ importers: dependencies: '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types normalize-registry-url: specifier: 'catalog:' version: 2.0.1 @@ -2440,16 +2440,16 @@ importers: version: link:../../cli/meta '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/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 + version: link:../../core/error '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types detect-libc: specifier: 'catalog:' version: 2.1.2 @@ -2471,7 +2471,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/semver': specifier: 'catalog:' version: 7.7.1 @@ -2486,7 +2486,7 @@ importers: version: link:../../catalogs/types '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* version: link:../../resolving/parse-wanted-dependency @@ -2499,7 +2499,7 @@ importers: dependencies: '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@pnpm/config.pick-registry-for-package': specifier: workspace:* @@ -2521,10 +2521,10 @@ importers: version: link:../matcher '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/hooks.pnpmfile': specifier: workspace:* version: link:../../hooks/pnpmfile @@ -2542,7 +2542,7 @@ importers: version: link:../../text/naming-cases '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader @@ -2639,10 +2639,10 @@ importers: version: link:../matcher '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types semver: specifier: 'catalog:' version: 7.7.4 @@ -2658,7 +2658,7 @@ importers: dependencies: '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader @@ -2676,6 +2676,54 @@ importers: specifier: 'catalog:' version: 0.29.12 + core/constants: + devDependencies: + '@pnpm/constants': + specifier: workspace:* + version: 'link:' + + core/core-loggers: + dependencies: + '@pnpm/types': + specifier: workspace:* + version: link:../types + devDependencies: + '@pnpm/core-loggers': + specifier: workspace:* + version: 'link:' + '@pnpm/logger': + specifier: workspace:* + version: link:../logger + + core/error: + dependencies: + '@pnpm/constants': + specifier: workspace:* + version: link:../constants + devDependencies: + '@pnpm/error': + specifier: workspace:* + version: 'link:' + + core/logger: + dependencies: + bole: + specifier: 'catalog:' + version: 5.0.28 + split2: + specifier: 'catalog:' + version: 4.2.0 + devDependencies: + '@pnpm/logger': + specifier: workspace:* + version: 'link:' + + core/types: + devDependencies: + '@pnpm/types': + specifier: workspace:* + version: 'link:' + crypto/hash: dependencies: '@pnpm/fs.graceful-fs': @@ -2705,7 +2753,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error devDependencies: '@pnpm/crypto.integrity': specifier: workspace:* @@ -2737,7 +2785,7 @@ importers: version: link:../hash '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.types': specifier: workspace:* version: link:../../fetching/types @@ -2750,7 +2798,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/fetching.types': specifier: workspace:* version: link:../../../fetching/types @@ -2774,7 +2822,7 @@ importers: version: link:../../../network/fetch '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../../workspace/project-manifest-reader @@ -2784,13 +2832,13 @@ importers: devDependencies: '@pnpm/constants': specifier: workspace:* - version: link:../../../packages/constants + version: link:../../../core/constants '@pnpm/deps.compliance.audit': specifier: workspace:* version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger '@pnpm/test-fixtures': specifier: workspace:* version: link:../../../__utils__/test-fixtures @@ -2823,7 +2871,7 @@ importers: version: link:../../../config/writer '@pnpm/constants': specifier: workspace:* - version: link:../../../packages/constants + version: link:../../../core/constants '@pnpm/deps.compliance.audit': specifier: workspace:* version: link:../audit @@ -2835,7 +2883,7 @@ importers: version: link:../sbom '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/installing.commands': specifier: workspace:* version: link:../../../installing/commands @@ -2859,7 +2907,7 @@ importers: version: link:../../../store/path '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../../workspace/project-manifest-reader @@ -2885,9 +2933,9 @@ importers: '@pnpm/deps.compliance.commands': specifier: workspace:* version: 'link:' - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../../pkg-manifest/read-package-json + version: link:../../../pkg-manifest/reader '@pnpm/prepare': specifier: workspace:* version: link:../../../__utils__/prepare @@ -2932,7 +2980,7 @@ importers: version: link:../../path '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/lockfile.detect-dep-types': specifier: workspace:* version: link:../../../lockfile/detect-dep-types @@ -2948,9 +2996,9 @@ importers: '@pnpm/lockfile.walker': specifier: workspace:* version: link:../../../lockfile/walker - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../../pkg-manifest/read-package-json + version: link:../../../pkg-manifest/reader '@pnpm/store.index': specifier: workspace:* version: link:../../../store/index @@ -2959,7 +3007,7 @@ importers: version: link:../../../store/pkg-finder '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types p-limit: specifier: 'catalog:' version: 7.3.0 @@ -2978,13 +3026,13 @@ importers: version: 30.0.5 '@pnpm/constants': specifier: workspace:* - version: link:../../../packages/constants + version: link:../../../core/constants '@pnpm/deps.compliance.license-scanner': specifier: workspace:* version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -3009,9 +3057,9 @@ importers: '@pnpm/lockfile.walker': specifier: workspace:* version: link:../../../lockfile/walker - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../../pkg-manifest/read-package-json + version: link:../../../pkg-manifest/reader '@pnpm/store.index': specifier: workspace:* version: link:../../../store/index @@ -3020,7 +3068,7 @@ importers: version: link:../../../store/pkg-finder '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types p-limit: specifier: 'catalog:' version: 7.3.0 @@ -3036,7 +3084,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger '@types/ssri': specifier: 'catalog:' version: 7.1.5 @@ -3048,10 +3096,10 @@ importers: version: link:../../config/package-is-installable '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/deps.graph-hasher': specifier: workspace:* version: link:../graph-hasher @@ -3081,7 +3129,7 @@ importers: version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types path-exists: specifier: 'catalog:' version: 5.0.0 @@ -3094,7 +3142,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -3103,7 +3151,7 @@ importers: dependencies: '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/crypto.object-hasher': specifier: workspace:* version: link:../../crypto/object-hasher @@ -3118,7 +3166,7 @@ importers: version: link:../../lockfile/utils '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@pnpm/deps.graph-hasher': specifier: workspace:* @@ -3158,7 +3206,7 @@ importers: version: link:../outdated '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/global.commands': specifier: workspace:* version: link:../../../global/commands @@ -3185,7 +3233,7 @@ importers: version: link:../../../store/path '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types '@zkochan/table': specifier: 'catalog:' version: 2.0.1 @@ -3204,7 +3252,7 @@ importers: version: 30.0.5 '@pnpm/constants': specifier: workspace:* - version: link:../../../packages/constants + version: link:../../../core/constants '@pnpm/deps.inspection.commands': specifier: workspace:* version: 'link:' @@ -3247,15 +3295,15 @@ importers: '@pnpm/lockfile.fs': specifier: workspace:* version: link:../../../lockfile/fs - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../../pkg-manifest/read-package-json + version: link:../../../pkg-manifest/reader '@pnpm/text.tree-renderer': specifier: workspace:* version: link:../../../text/tree-renderer '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -3304,13 +3352,13 @@ importers: version: link:../../../config/version-policy '@pnpm/constants': specifier: workspace:* - version: link:../../../packages/constants + version: link:../../../core/constants '@pnpm/deps.path': specifier: workspace:* version: link:../../path '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/hooks.read-package-hook': specifier: workspace:* version: link:../../../hooks/read-package-hook @@ -3331,7 +3379,7 @@ importers: version: link:../../../resolving/npm-resolver '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -3347,7 +3395,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../../resolving/resolver-base @@ -3387,9 +3435,9 @@ importers: '@pnpm/npm-package-arg': specifier: 'catalog:' version: 2.0.0 - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../../pkg-manifest/read-package-json + version: link:../../../pkg-manifest/reader '@pnpm/store.cafs': specifier: workspace:* version: link:../../../store/cafs @@ -3398,7 +3446,7 @@ importers: version: link:../../../store/index '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -3420,7 +3468,7 @@ importers: devDependencies: '@pnpm/constants': specifier: workspace:* - version: link:../../../packages/constants + version: link:../../../core/constants '@pnpm/deps.inspection.tree-builder': specifier: workspace:* version: 'link:' @@ -3441,7 +3489,7 @@ importers: version: link:../../crypto/hash '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types semver: specifier: 'catalog:' version: 7.7.4 @@ -3476,13 +3524,13 @@ importers: version: link:../../config/reader '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/crypto.object-hasher': specifier: workspace:* version: link:../../crypto/object-hasher '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/installing.context': specifier: workspace:* version: link:../../installing/context @@ -3503,7 +3551,7 @@ importers: version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.projects-reader': specifier: workspace:* version: link:../../workspace/projects-reader @@ -3555,7 +3603,7 @@ importers: version: link:../../../deps/graph-hasher '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/global.commands': specifier: workspace:* version: link:../../../global/commands @@ -3585,7 +3633,7 @@ importers: version: link:../../../store/controller '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../../workspace/project-manifest-reader @@ -3610,7 +3658,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../../__utils__/prepare @@ -3633,6 +3681,52 @@ importers: specifier: 'catalog:' version: 13.3.4 + engine/runtime/bun-resolver: + dependencies: + '@pnpm/constants': + specifier: workspace:* + version: link:../../../core/constants + '@pnpm/crypto.shasums-file': + specifier: workspace:* + version: link:../../../crypto/shasums-file + '@pnpm/error': + specifier: workspace:* + version: link:../../../core/error + '@pnpm/fetching.binary-fetcher': + specifier: workspace:* + version: link:../../../fetching/binary-fetcher + '@pnpm/fetching.fetcher-base': + specifier: workspace:* + version: link:../../../fetching/fetcher-base + '@pnpm/fetching.types': + specifier: workspace:* + version: link:../../../fetching/types + '@pnpm/resolving.npm-resolver': + specifier: workspace:* + version: link:../../../resolving/npm-resolver + '@pnpm/resolving.resolver-base': + specifier: workspace:* + version: link:../../../resolving/resolver-base + '@pnpm/types': + specifier: workspace:* + version: link:../../../core/types + '@pnpm/util.lex-comparator': + specifier: 'catalog:' + version: 3.0.2 + '@pnpm/worker': + specifier: workspace:^ + version: link:../../../worker + semver: + specifier: 'catalog:' + version: 7.7.4 + devDependencies: + '@pnpm/engine.runtime.bun-resolver': + specifier: workspace:* + version: 'link:' + '@types/semver': + specifier: 'catalog:' + version: 7.7.1 + engine/runtime/commands: dependencies: '@pnpm/cli.utils': @@ -3641,12 +3735,12 @@ importers: '@pnpm/config.reader': specifier: workspace:* version: link:../../../config/reader - '@pnpm/engine.runtime.node.resolver': + '@pnpm/engine.runtime.node-resolver': specifier: workspace:* - version: link:../node.resolver + version: link:../node-resolver '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/exec.pnpm-cli-runner': specifier: workspace:* version: link:../../../exec/pnpm-cli-runner @@ -3665,74 +3759,71 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger cross-env: specifier: 'catalog:' version: 10.1.0 - engine/runtime/node.fetcher: + engine/runtime/deno-resolver: dependencies: + '@pnpm/constants': + specifier: workspace:* + version: link:../../../core/constants '@pnpm/crypto.shasums-file': specifier: workspace:* version: link:../../../crypto/shasums-file - '@pnpm/engine.runtime.node.resolver': + '@pnpm/error': specifier: workspace:* - version: link:../node.resolver + version: link:../../../core/error '@pnpm/fetching.binary-fetcher': specifier: workspace:* version: link:../../../fetching/binary-fetcher - '@pnpm/fetching.tarball-fetcher': + '@pnpm/fetching.fetcher-base': specifier: workspace:* - version: link:../../../fetching/tarball-fetcher + version: link:../../../fetching/fetcher-base '@pnpm/fetching.types': specifier: workspace:* version: link:../../../fetching/types - '@pnpm/store.create-cafs-store': + '@pnpm/resolving.npm-resolver': specifier: workspace:* - version: link:../../../store/create-cafs-store - '@pnpm/store.index': + version: link:../../../resolving/npm-resolver + '@pnpm/resolving.resolver-base': specifier: workspace:* - version: link:../../../store/index - detect-libc: + version: link:../../../resolving/resolver-base + '@pnpm/types': + specifier: workspace:* + version: link:../../../core/types + '@pnpm/util.lex-comparator': specifier: 'catalog:' - version: 2.1.2 + version: 3.0.2 + '@pnpm/worker': + specifier: workspace:^ + version: link:../../../worker + semver: + specifier: 'catalog:' + version: 7.7.4 devDependencies: - '@jest/globals': - specifier: 'catalog:' - version: 30.0.5 - '@pnpm/engine.runtime.node.fetcher': + '@pnpm/engine.runtime.deno-resolver': 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': + '@types/semver': specifier: 'catalog:' - version: 0.5.7 - adm-zip: - specifier: 'catalog:' - version: 0.5.16 - node-fetch: - specifier: 'catalog:' - version: 3.3.2 + version: 7.7.1 - engine/runtime/node.resolver: + engine/runtime/node-resolver: dependencies: '@pnpm/config.reader': specifier: workspace:* version: link:../../../config/reader '@pnpm/constants': specifier: workspace:* - version: link:../../../packages/constants + version: link:../../../core/constants '@pnpm/crypto.shasums-file': specifier: workspace:* version: link:../../../crypto/shasums-file '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/fetching.types': specifier: workspace:* version: link:../../../fetching/types @@ -3741,7 +3832,7 @@ importers: version: link:../../../resolving/resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types semver: specifier: 'catalog:' version: 7.7.4 @@ -3749,7 +3840,7 @@ importers: specifier: 'catalog:' version: 3.0.0 devDependencies: - '@pnpm/engine.runtime.node.resolver': + '@pnpm/engine.runtime.node-resolver': specifier: workspace:* version: 'link:' '@pnpm/network.fetch': @@ -3803,7 +3894,7 @@ importers: version: link:../../config/version-policy '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash @@ -3815,7 +3906,7 @@ importers: version: link:../../engine/runtime/commands '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../lifecycle @@ -3831,9 +3922,9 @@ importers: '@pnpm/log.group': specifier: 'catalog:' version: 3.0.1 - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* version: link:../../resolving/parse-wanted-dependency @@ -3845,7 +3936,7 @@ importers: version: link:../../store/path '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -3855,9 +3946,9 @@ importers: '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader - '@pnpm/workspace.sort-packages': + '@pnpm/workspace.projects-sorter': specifier: workspace:* - version: link:../../workspace/sort-packages + version: link:../../workspace/projects-sorter '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -3903,7 +3994,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -3939,19 +4030,19 @@ importers: version: link:../../bins/linker '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.directory-fetcher': specifier: workspace:* version: link:../../fetching/directory-fetcher '@pnpm/npm-lifecycle': specifier: 'catalog:' version: 1001.0.0(patch_hash=9ca23edf604c5e8ff290e3c0a5443646b5f9865624042a5c41d9b2beb8f98972)(typanion@3.14.0) - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/store.cafs-types': specifier: workspace:* version: link:../../store/cafs-types @@ -3960,7 +4051,7 @@ importers: version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types is-windows: specifier: 'catalog:' version: 1.0.2 @@ -3979,7 +4070,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -4013,16 +4104,16 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../lifecycle - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -4075,7 +4166,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../fetcher-base @@ -4136,7 +4227,7 @@ importers: version: link:../../store/cafs-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader @@ -4149,7 +4240,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -4167,7 +4258,7 @@ importers: version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@types/ssri': specifier: 'catalog:' version: 7.1.5 @@ -4183,7 +4274,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.prepare-package': specifier: workspace:* version: link:../../exec/prepare-package @@ -4214,7 +4305,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs @@ -4223,7 +4314,7 @@ importers: version: link:../../store/create-cafs-store '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -4235,7 +4326,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../fetcher-base @@ -4281,10 +4372,10 @@ importers: dependencies: '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.prepare-package': specifier: workspace:* version: link:../../exec/prepare-package @@ -4305,7 +4396,7 @@ importers: version: link:../../store/index '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/worker': specifier: workspace:^ version: link:../../worker @@ -4330,7 +4421,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/network.fetch': specifier: workspace:* version: link:../../network/fetch @@ -4385,7 +4476,7 @@ importers: dependencies: '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -4436,7 +4527,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -4445,7 +4536,7 @@ importers: dependencies: '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../graceful-fs @@ -4485,7 +4576,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -4542,10 +4633,10 @@ importers: dependencies: '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types symlink-dir: specifier: 'catalog:' version: 7.1.0 @@ -4555,7 +4646,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -4585,22 +4676,22 @@ importers: version: link:../../config/reader '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/global.packages': specifier: workspace:* version: link:../packages '@pnpm/installing.deps-installer': specifier: workspace:* version: link:../../installing/deps-installer - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/store.connection-manager': specifier: workspace:* version: link:../../store/connection-manager '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -4623,12 +4714,12 @@ importers: '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -4641,13 +4732,13 @@ importers: dependencies: '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/hooks.types': specifier: workspace:* version: link:../types @@ -4659,7 +4750,7 @@ importers: version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types chalk: specifier: 'catalog:' version: 5.6.2 @@ -4675,7 +4766,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures @@ -4693,13 +4784,13 @@ importers: version: link:../../deps/peer-range '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* version: link:../../resolving/parse-wanted-dependency '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@yarnpkg/extensions': specifier: 'catalog:' version: 2.0.3(@yarnpkg/core@4.2.0(typanion@3.14.0)) @@ -4748,7 +4839,7 @@ importers: version: link:../../store/cafs-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@jest/globals': specifier: 'catalog:' @@ -4759,9 +4850,6 @@ importers: installing/client: dependencies: - '@pnpm/engine.runtime.node.fetcher': - specifier: workspace:* - version: link:../../engine/runtime/node.fetcher '@pnpm/fetching.binary-fetcher': specifier: workspace:* version: link:../../fetching/binary-fetcher @@ -4797,7 +4885,7 @@ importers: version: link:../../store/index '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -4852,7 +4940,7 @@ importers: version: link:../../config/writer '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/deps.inspection.outdated': specifier: workspace:* version: link:../../deps/inspection/outdated @@ -4861,7 +4949,7 @@ importers: version: link:../../deps/status '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs @@ -4886,9 +4974,9 @@ importers: '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/pkg-manifest.utils': specifier: workspace:* version: link:../../pkg-manifest/utils @@ -4909,10 +4997,7 @@ importers: version: link:../../store/controller '@pnpm/types': specifier: workspace:* - version: link:../../packages/types - '@pnpm/workspace.pkgs-graph': - specifier: workspace:* - version: link:../../workspace/pkgs-graph + version: link:../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader @@ -4922,15 +5007,18 @@ importers: '@pnpm/workspace.projects-filter': specifier: workspace:* version: link:../../workspace/projects-filter + '@pnpm/workspace.projects-graph': + specifier: workspace:* + version: link:../../workspace/projects-graph '@pnpm/workspace.projects-reader': specifier: workspace:* version: link:../../workspace/projects-reader + '@pnpm/workspace.projects-sorter': + specifier: workspace:* + version: link:../../workspace/projects-sorter '@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 @@ -5003,7 +5091,7 @@ importers: version: link:../modules-yaml '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -5081,10 +5169,10 @@ importers: dependencies: '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/installing.modules-yaml': specifier: workspace:* version: link:../modules-yaml @@ -5102,7 +5190,7 @@ importers: version: link:../../store/controller '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types path-absolute: specifier: 'catalog:' version: 2.0.0 @@ -5115,7 +5203,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -5124,7 +5212,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/installing.dedupe.types': specifier: workspace:* version: link:../types @@ -5133,7 +5221,7 @@ importers: version: link:../../../lockfile/types '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types devDependencies: '@pnpm/installing.dedupe.check': specifier: workspace:* @@ -5198,10 +5286,10 @@ importers: version: link:../../config/parse-overrides '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash @@ -5219,7 +5307,7 @@ importers: version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../../exec/lifecycle @@ -5306,7 +5394,7 @@ importers: version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -5373,13 +5461,13 @@ importers: version: link:../../lockfile/types '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/network.git-utils': specifier: workspace:* version: link:../../network/git-utils - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -5475,10 +5563,10 @@ importers: version: link:../../config/package-is-installable '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/deps.graph-builder': specifier: workspace:* version: link:../../deps/graph-builder @@ -5490,7 +5578,7 @@ importers: version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../../exec/lifecycle @@ -5530,15 +5618,15 @@ importers: '@pnpm/patching.config': specifier: workspace:* version: link:../../patching/config - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/store.controller-types': specifier: workspace:* version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/worker': specifier: workspace:^ version: link:../../worker @@ -5581,7 +5669,7 @@ importers: version: link:../read-projects-context '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -5632,7 +5720,7 @@ importers: dependencies: '@pnpm/core-loggers': specifier: workspace:* - version: link:../../../packages/core-loggers + version: link:../../../core/core-loggers '@pnpm/fs.read-modules-dir': specifier: workspace:* version: link:../../../fs/read-modules-dir @@ -5654,7 +5742,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -5669,13 +5757,13 @@ importers: version: link:../../../config/matcher '@pnpm/constants': specifier: workspace:* - version: link:../../../packages/constants + version: link:../../../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../../../packages/core-loggers + version: link:../../../core/core-loggers '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -5697,7 +5785,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -5709,7 +5797,7 @@ importers: version: link:../../../bins/remover '@pnpm/core-loggers': specifier: workspace:* - version: link:../../../packages/core-loggers + version: link:../../../core/core-loggers '@pnpm/deps.path': specifier: workspace:* version: link:../../../deps/path @@ -5730,7 +5818,7 @@ importers: version: link:../../../store/controller-types '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -5743,7 +5831,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -5755,7 +5843,7 @@ importers: version: link:../../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../../packages/error + version: link:../../../core/error '@pnpm/lockfile.utils': specifier: workspace:* version: link:../../../lockfile/utils @@ -5774,7 +5862,7 @@ importers: version: link:../../../__utils__/test-fixtures '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types installing/modules-yaml: dependencies: @@ -5783,7 +5871,7 @@ importers: version: link:../../fs/graceful-fs '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types is-windows: specifier: 'catalog:' version: 1.0.2 @@ -5814,13 +5902,13 @@ importers: version: link:../../config/package-is-installable '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/deps.path': specifier: workspace:* version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base @@ -5847,7 +5935,7 @@ importers: version: link:../../store/index '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/worker': specifier: workspace:^ version: link:../../worker @@ -5893,7 +5981,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/registry-mock': specifier: 'catalog:' version: 5.2.2(verdaccio@6.2.7(encoding@0.1.13)(typanion@3.14.0)) @@ -5944,7 +6032,7 @@ importers: version: link:../../lockfile/fs '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types realpath-missing: specifier: 'catalog:' version: 2.0.0 @@ -5954,19 +6042,19 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger installing/render-peer-issues: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/text.tree-renderer': specifier: workspace:* version: link:../../text/tree-renderer '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types chalk: specifier: 'catalog:' version: 5.6.2 @@ -5991,10 +6079,10 @@ importers: version: link:../../config/version-policy '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/deps.graph-hasher': specifier: workspace:* version: link:../../deps/graph-hasher @@ -6006,7 +6094,7 @@ importers: version: link:../../deps/peer-range '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.pick-fetcher': specifier: workspace:* version: link:../../fetching/pick-fetcher @@ -6031,9 +6119,9 @@ importers: '@pnpm/patching.types': specifier: workspace:* version: link:../../patching/types - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/pkg-manifest.utils': specifier: workspace:* version: link:../../pkg-manifest/utils @@ -6048,7 +6136,7 @@ importers: version: link:../../store/controller-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -6106,7 +6194,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/normalize-path': specifier: 'catalog:' version: 3.0.2 @@ -6127,7 +6215,7 @@ importers: version: link:../types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@pnpm/lockfile.detect-dep-types': specifier: workspace:* @@ -6143,13 +6231,13 @@ importers: version: link:../../config/package-is-installable '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/deps.path': specifier: workspace:* version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/lockfile.types': specifier: workspace:* version: link:../types @@ -6161,7 +6249,7 @@ importers: version: link:../walker '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -6174,7 +6262,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/ramda': specifier: 'catalog:' version: 0.29.12 @@ -6195,13 +6283,13 @@ importers: dependencies: '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/deps.path': specifier: workspace:* version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/lockfile.merger': specifier: workspace:* version: link:../merger @@ -6219,7 +6307,7 @@ importers: version: link:../../object/key-sorting '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -6253,7 +6341,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/js-yaml': specifier: 'catalog:' version: 4.0.9 @@ -6283,7 +6371,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec': specifier: 'catalog:' version: 2.0.0 @@ -6295,13 +6383,13 @@ importers: version: link:../pruner '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/releasing.exportable-manifest': specifier: workspace:* version: link:../../releasing/exportable-manifest '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader @@ -6335,7 +6423,7 @@ importers: version: link:../types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types comver-to-semver: specifier: 'catalog:' version: 2.0.0 @@ -6369,7 +6457,7 @@ importers: version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types version-selector-type: specifier: 'catalog:' version: 3.0.0 @@ -6382,7 +6470,7 @@ importers: dependencies: '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/deps.path': specifier: workspace:* version: link:../../deps/path @@ -6391,7 +6479,7 @@ importers: version: link:../types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -6453,7 +6541,7 @@ importers: version: link:../utils '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@yarnpkg/pnp': specifier: 'catalog:' version: 4.1.3 @@ -6469,7 +6557,7 @@ importers: version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@types/normalize-path': specifier: 'catalog:' version: 3.0.2 @@ -6487,7 +6575,7 @@ importers: version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@pnpm/lockfile.types': specifier: workspace:* @@ -6500,7 +6588,7 @@ importers: version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.pick-fetcher': specifier: workspace:* version: link:../../fetching/pick-fetcher @@ -6515,7 +6603,7 @@ importers: version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types get-npm-tarball-url: specifier: 'catalog:' version: 2.1.0 @@ -6559,15 +6647,15 @@ importers: '@pnpm/lockfile.utils': specifier: workspace:* version: link:../utils - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types p-every: specifier: 'catalog:' version: 2.0.0 @@ -6583,13 +6671,13 @@ importers: devDependencies: '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/lockfile.verification': specifier: workspace:* version: 'link:' '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -6616,7 +6704,7 @@ importers: version: link:../types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@pnpm/lockfile.walker': specifier: workspace:* @@ -6641,7 +6729,7 @@ importers: version: link:../../lockfile/utils '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/store.cafs': specifier: workspace:* version: link:../../store/cafs @@ -6653,7 +6741,7 @@ importers: version: link:../../store/path '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types hyperdrive-schemas: specifier: 'catalog:' version: 2.0.0 @@ -6666,7 +6754,7 @@ importers: version: 30.0.5 '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/modules-mounter.daemon': specifier: workspace:* version: 'link:' @@ -6688,7 +6776,7 @@ importers: version: 1.0.1 '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error devDependencies: '@pnpm/network.auth-header': specifier: workspace:* @@ -6701,7 +6789,7 @@ importers: dependencies: '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/fetching.types': specifier: workspace:* version: link:../../fetching/types @@ -6710,7 +6798,7 @@ importers: version: 2.0.3 '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@zkochan/retry': specifier: 'catalog:' version: 0.2.0 @@ -6720,7 +6808,7 @@ importers: devDependencies: '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/network.fetch': specifier: workspace:* version: 'link:' @@ -6761,65 +6849,17 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error devDependencies: '@pnpm/object.property-path': specifier: workspace:* version: 'link:' - packages/constants: - devDependencies: - '@pnpm/constants': - specifier: workspace:* - version: 'link:' - - packages/core-loggers: - dependencies: - '@pnpm/types': - specifier: workspace:* - version: link:../types - devDependencies: - '@pnpm/core-loggers': - specifier: workspace:* - version: 'link:' - '@pnpm/logger': - specifier: workspace:* - version: link:../logger - - packages/error: - dependencies: - '@pnpm/constants': - specifier: workspace:* - version: link:../constants - devDependencies: - '@pnpm/error': - specifier: workspace:* - version: 'link:' - - packages/logger: - dependencies: - bole: - specifier: 'catalog:' - version: 5.0.28 - split2: - specifier: 'catalog:' - version: 4.2.0 - devDependencies: - '@pnpm/logger': - specifier: workspace:* - version: 'link:' - - packages/types: - devDependencies: - '@pnpm/types': - specifier: workspace:* - version: 'link:' - patching/apply-patch: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/patch-package': specifier: 'catalog:' version: 0.0.1 @@ -6829,7 +6869,7 @@ importers: version: 30.0.5 '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/patching.apply-patch': specifier: workspace:* version: 'link:' @@ -6853,13 +6893,13 @@ importers: version: link:../../config/writer '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.pick-fetcher': specifier: workspace:* version: link:../../fetching/pick-fetcher @@ -6881,9 +6921,9 @@ importers: '@pnpm/patching.apply-patch': specifier: workspace:* version: link:../apply-patch - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/resolving.parse-wanted-dependency': specifier: workspace:* version: link:../../resolving/parse-wanted-dependency @@ -6895,7 +6935,7 @@ importers: version: link:../../store/path '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader @@ -6947,7 +6987,7 @@ importers: version: 30.0.5 '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/patching.commands': specifier: workspace:* version: 'link:' @@ -6989,7 +7029,7 @@ importers: version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/logger': specifier: 'catalog:' version: 1001.0.1 @@ -7013,14 +7053,14 @@ importers: specifier: workspace:* version: 'link:' - pkg-manifest/read-package-json: + pkg-manifest/reader: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types load-json-file: specifier: 'catalog:' version: 7.0.1 @@ -7028,7 +7068,7 @@ importers: specifier: 'catalog:' version: 8.0.0 devDependencies: - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* version: 'link:' '@types/normalize-package-data': @@ -7039,23 +7079,23 @@ importers: dependencies: '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/deps.peer-range': specifier: workspace:* version: link:../../deps/peer-range '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types semver: specifier: 'catalog:' version: 7.7.4 devDependencies: '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/pkg-manifest.utils': specifier: workspace:* version: 'link:' @@ -7125,10 +7165,10 @@ importers: version: link:../config/version-policy '@pnpm/constants': specifier: workspace:* - version: link:../packages/constants + version: link:../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../packages/core-loggers + version: link:../core/core-loggers '@pnpm/crypto.hash': specifier: workspace:* version: link:../crypto/hash @@ -7149,7 +7189,7 @@ importers: version: link:../engine/runtime/commands '@pnpm/error': specifier: workspace:* - version: link:../packages/error + version: link:../core/error '@pnpm/exec.commands': specifier: workspace:* version: link:../exec/commands @@ -7176,16 +7216,16 @@ importers: version: link:../lockfile/types '@pnpm/logger': specifier: workspace:* - version: link:../packages/logger + version: link:../core/logger '@pnpm/nopt': specifier: 'catalog:' version: 0.3.1 '@pnpm/patching.commands': specifier: workspace:* version: link:../patching/commands - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../pkg-manifest/read-package-json + version: link:../pkg-manifest/reader '@pnpm/prepare': specifier: workspace:* version: link:../__utils__/prepare @@ -7221,7 +7261,7 @@ importers: version: link:../__utils__/test-ipc-server '@pnpm/types': specifier: workspace:* - version: link:../packages/types + version: link:../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -7231,9 +7271,6 @@ importers: '@pnpm/workspace.commands': specifier: workspace:* version: link:../workspace/commands - '@pnpm/workspace.pkgs-graph': - specifier: workspace:* - version: link:../workspace/pkgs-graph '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../workspace/project-manifest-reader @@ -7243,6 +7280,9 @@ importers: '@pnpm/workspace.projects-filter': specifier: workspace:* version: link:../workspace/projects-filter + '@pnpm/workspace.projects-graph': + specifier: workspace:* + version: link:../workspace/projects-graph '@pnpm/workspace.projects-reader': specifier: workspace:* version: link:../workspace/projects-reader @@ -7491,7 +7531,7 @@ importers: version: link:../../config/reader '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/deps.path': specifier: workspace:* version: link:../../deps/path @@ -7500,7 +7540,7 @@ importers: version: link:../../engine/runtime/commands '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/exec.lifecycle': specifier: workspace:* version: link:../../exec/lifecycle @@ -7542,10 +7582,10 @@ importers: version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../packages/types - '@pnpm/workspace.sort-packages': + version: link:../../core/types + '@pnpm/workspace.projects-sorter': specifier: workspace:* - version: link:../../workspace/sort-packages + version: link:../../workspace/projects-sorter '@types/normalize-path': specifier: 'catalog:' version: 3.0.2 @@ -7621,7 +7661,7 @@ importers: version: link:../../hooks/pnpmfile '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -7690,13 +7730,13 @@ importers: version: link:../../catalogs/resolver '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/resolving.jsr-specifier-parser': specifier: workspace:* version: link:../../resolving/jsr-specifier-parser '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader @@ -7735,78 +7775,26 @@ importers: specifier: 'catalog:' version: 6.0.0 - resolving/bun-resolver: - dependencies: - '@pnpm/constants': - specifier: workspace:* - version: link:../../packages/constants - '@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/fetching.binary-fetcher': - specifier: workspace:* - version: link:../../fetching/binary-fetcher - '@pnpm/fetching.fetcher-base': - specifier: workspace:* - 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/resolving.resolver-base': - specifier: workspace:* - version: link:../resolver-base - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - '@pnpm/util.lex-comparator': - specifier: 'catalog:' - version: 3.0.2 - '@pnpm/worker': - specifier: workspace:^ - version: link:../../worker - semver: - specifier: 'catalog:' - version: 7.7.4 - devDependencies: - '@pnpm/resolving.bun-resolver': - specifier: workspace:* - version: 'link:' - '@pnpm/resolving.deno-resolver': - specifier: workspace:* - version: link:../deno-resolver - '@types/semver': - specifier: 'catalog:' - version: 7.7.1 - resolving/default-resolver: dependencies: - '@pnpm/engine.runtime.node.resolver': + '@pnpm/engine.runtime.bun-resolver': specifier: workspace:* - version: link:../../engine/runtime/node.resolver + version: link:../../engine/runtime/bun-resolver + '@pnpm/engine.runtime.deno-resolver': + specifier: workspace:* + version: link:../../engine/runtime/deno-resolver + '@pnpm/engine.runtime.node-resolver': + specifier: workspace:* + version: link:../../engine/runtime/node-resolver '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.types': specifier: workspace:* version: link:../../fetching/types '@pnpm/hooks.types': specifier: workspace:* version: link:../../hooks/types - '@pnpm/resolving.bun-resolver': - specifier: workspace:* - version: link:../bun-resolver - '@pnpm/resolving.deno-resolver': - specifier: workspace:* - version: link:../deno-resolver '@pnpm/resolving.git-resolver': specifier: workspace:* version: link:../git-resolver @@ -7824,7 +7812,7 @@ importers: version: link:../tarball-resolver '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@jest/globals': specifier: 'catalog:' @@ -7848,60 +7836,11 @@ importers: specifier: 'catalog:' version: 3.3.2 - resolving/deno-resolver: - dependencies: - '@pnpm/constants': - specifier: workspace:* - version: link:../../packages/constants - '@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/fetching.binary-fetcher': - specifier: workspace:* - version: link:../../fetching/binary-fetcher - '@pnpm/fetching.fetcher-base': - specifier: workspace:* - 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/resolving.resolver-base': - specifier: workspace:* - version: link:../resolver-base - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - '@pnpm/util.lex-comparator': - specifier: 'catalog:' - version: 3.0.2 - '@pnpm/worker': - specifier: workspace:^ - version: link:../../worker - semver: - specifier: 'catalog:' - version: 7.7.4 - devDependencies: - '@pnpm/resolving.deno-resolver': - specifier: workspace:* - version: 'link:' - '@types/semver': - specifier: 'catalog:' - version: 7.7.1 - resolving/git-resolver: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/network.fetch': specifier: workspace:* version: link:../../network/fetch @@ -7944,7 +7883,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error devDependencies: '@pnpm/resolving.jsr-specifier-parser': specifier: workspace:* @@ -7957,13 +7896,13 @@ importers: version: link:../../crypto/hash '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/resolving.resolver-base': specifier: workspace:* version: link:../resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-reader': specifier: workspace:* version: link:../../workspace/project-manifest-reader @@ -7976,7 +7915,7 @@ importers: version: 30.0.5 '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/resolving.local-resolver': specifier: workspace:* version: 'link:' @@ -7991,16 +7930,16 @@ importers: version: link:../../config/pick-registry-for-package '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/core-loggers': specifier: workspace:* - version: link:../../packages/core-loggers + version: link:../../core/core-loggers '@pnpm/crypto.hash': specifier: workspace:* version: link:../../crypto/hash '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.types': specifier: workspace:* version: link:../../fetching/types @@ -8027,7 +7966,7 @@ importers: version: link:../../store/index '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/worker': specifier: workspace:^ version: link:../../worker @@ -8085,7 +8024,7 @@ importers: version: link:../../config/version-policy '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/network.fetch': specifier: workspace:* version: link:../../network/fetch @@ -8141,7 +8080,7 @@ importers: devDependencies: '@pnpm/logger': specifier: workspace:* - version: link:../../../packages/logger + version: link:../../../core/logger '@pnpm/resolving.registry.pkg-metadata-filter': specifier: workspace:* version: 'link:' @@ -8153,7 +8092,7 @@ importers: dependencies: '@pnpm/types': specifier: workspace:* - version: link:../../../packages/types + version: link:../../../core/types devDependencies: '@pnpm/resolving.registry.types': specifier: workspace:* @@ -8163,7 +8102,7 @@ importers: dependencies: '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@pnpm/resolving.resolver-base': specifier: workspace:* @@ -8199,7 +8138,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base @@ -8211,7 +8150,7 @@ importers: version: link:../controller-types '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -8266,7 +8205,7 @@ importers: version: 'link:' '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@types/ssri': specifier: 'catalog:' version: 7.1.5 @@ -8290,7 +8229,7 @@ importers: version: link:../../deps/path '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs @@ -8332,7 +8271,7 @@ importers: version: link:../path '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -8363,7 +8302,7 @@ importers: version: link:../../__utils__/assert-store '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/exec.commands': specifier: workspace:* version: link:../../exec/commands @@ -8372,7 +8311,7 @@ importers: version: link:../../lockfile/fs '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -8436,7 +8375,7 @@ importers: devDependencies: '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/store.connection-manager': specifier: workspace:* version: 'link:' @@ -8448,7 +8387,7 @@ importers: version: link:../../crypto/hash '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.fetcher-base': specifier: workspace:* version: link:../../fetching/fetcher-base @@ -8475,7 +8414,7 @@ importers: version: link:../index '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/worker': specifier: workspace:^ version: link:../../worker @@ -8500,7 +8439,7 @@ importers: version: link:../../installing/client '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -8527,7 +8466,7 @@ importers: version: link:../../resolving/resolver-base '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types devDependencies: '@pnpm/store.cafs-types': specifier: workspace:* @@ -8565,7 +8504,7 @@ importers: devDependencies: '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -8599,10 +8538,10 @@ importers: dependencies: '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@zkochan/rimraf': specifier: 'catalog:' version: 4.0.0 @@ -8720,7 +8659,7 @@ importers: version: link:../crypto/integrity '@pnpm/error': specifier: workspace:* - version: link:../packages/error + version: link:../core/error '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../fs/graceful-fs @@ -8757,10 +8696,10 @@ importers: devDependencies: '@pnpm/logger': specifier: workspace:* - version: link:../packages/logger + version: link:../core/logger '@pnpm/types': specifier: workspace:* - version: link:../packages/types + version: link:../core/types '@pnpm/worker': specifier: workspace:* version: 'link:' @@ -8784,13 +8723,13 @@ importers: version: link:../../config/reader '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/object.key-sorting': specifier: workspace:* version: link:../../object/key-sorting '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-writer': specifier: workspace:* version: link:../project-manifest-writer @@ -8827,19 +8766,19 @@ importers: version: link:../../bins/linker '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/fetching.directory-fetcher': specifier: workspace:* version: link:../../fetching/directory-fetcher '@pnpm/installing.modules-yaml': specifier: workspace:* version: link:../../installing/modules-yaml - '@pnpm/pkg-manifest.read-package-json': + '@pnpm/pkg-manifest.reader': specifier: workspace:* - version: link:../../pkg-manifest/read-package-json + version: link:../../pkg-manifest/reader '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -8858,7 +8797,7 @@ importers: version: 30.0.5 '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -8866,39 +8805,11 @@ importers: specifier: workspace:* version: 'link:' - 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 + version: link:../../core/error '@pnpm/fs.graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs @@ -8913,7 +8824,7 @@ importers: version: link:../../text/comments-parser '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.project-manifest-writer': specifier: workspace:* version: link:../project-manifest-writer @@ -8962,7 +8873,7 @@ importers: version: link:../../text/comments-parser '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types json5: specifier: 'catalog:' version: 2.2.3 @@ -8990,10 +8901,10 @@ importers: version: link:../../config/matcher '@pnpm/error': specifier: workspace:* - version: link:../../packages/error - '@pnpm/workspace.pkgs-graph': + version: link:../../core/error + '@pnpm/workspace.projects-graph': specifier: workspace:* - version: link:../pkgs-graph + version: link:../projects-graph '@pnpm/workspace.projects-reader': specifier: workspace:* version: link:../projects-reader @@ -9018,7 +8929,7 @@ importers: devDependencies: '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.projects-filter': specifier: workspace:* version: 'link:' @@ -9047,6 +8958,34 @@ importers: specifier: 'catalog:' version: 3.1.0 + workspace/projects-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:../../core/types + '@pnpm/workspace.range-resolver': + specifier: workspace:* + version: link:../range-resolver + ramda: + specifier: 'catalog:' + version: '@pnpm/ramda@0.28.1' + devDependencies: + '@pnpm/workspace.projects-graph': + specifier: workspace:* + version: 'link:' + '@types/ramda': + specifier: 'catalog:' + version: 0.29.12 + better-path-resolve: + specifier: 'catalog:' + version: 2.0.0 + workspace/projects-reader: dependencies: '@pnpm/cli.utils': @@ -9054,13 +8993,13 @@ importers: version: link:../../cli/utils '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/fs.find-packages': specifier: workspace:* version: link:../../fs/find-packages '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/util.lex-comparator': specifier: 'catalog:' version: 3.0.2 @@ -9070,7 +9009,7 @@ importers: version: 30.0.5 '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/workspace.projects-reader': specifier: workspace:* version: 'link:' @@ -9078,6 +9017,19 @@ importers: specifier: workspace:* version: link:../workspace-manifest-reader + workspace/projects-sorter: + dependencies: + '@pnpm/deps.graph-sequencer': + specifier: workspace:* + version: link:../../deps/graph-sequencer + '@pnpm/types': + specifier: workspace:* + version: link:../../core/types + devDependencies: + '@pnpm/workspace.projects-sorter': + specifier: workspace:* + version: 'link:' + workspace/range-resolver: dependencies: semver: @@ -9095,7 +9047,7 @@ importers: dependencies: '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error find-up: specifier: 'catalog:' version: 7.0.0 @@ -9104,19 +9056,6 @@ importers: specifier: workspace:* version: 'link:' - workspace/sort-packages: - dependencies: - '@pnpm/deps.graph-sequencer': - specifier: workspace:* - version: link:../../deps/graph-sequencer - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - devDependencies: - '@pnpm/workspace.sort-packages': - specifier: workspace:* - version: 'link:' - workspace/spec-parser: devDependencies: '@pnpm/workspace.spec-parser': @@ -9133,7 +9072,7 @@ importers: version: link:../../config/reader '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types ramda: specifier: 'catalog:' version: '@pnpm/ramda@0.28.1' @@ -9143,7 +9082,7 @@ importers: version: 30.0.5 '@pnpm/logger': specifier: workspace:* - version: link:../../packages/logger + version: link:../../core/logger '@pnpm/prepare': specifier: workspace:* version: link:../../__utils__/prepare @@ -9158,13 +9097,13 @@ importers: dependencies: '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/error': specifier: workspace:* - version: link:../../packages/error + version: link:../../core/error '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types read-yaml-file: specifier: 'catalog:' version: 3.0.0 @@ -9180,7 +9119,7 @@ importers: version: link:../../catalogs/types '@pnpm/constants': specifier: workspace:* - version: link:../../packages/constants + version: link:../../core/constants '@pnpm/lockfile.types': specifier: workspace:* version: link:../../lockfile/types @@ -9189,7 +9128,7 @@ importers: version: link:../../object/key-sorting '@pnpm/types': specifier: workspace:* - version: link:../../packages/types + version: link:../../core/types '@pnpm/workspace.workspace-manifest-reader': specifier: workspace:* version: link:../workspace-manifest-reader diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 728beac55a..9b7796b38c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -26,7 +26,7 @@ packages: - network/* - modules-mounter/* - object/* - - packages/* + - core/* - bins/* - installing/* - installing/linking/* diff --git a/pnpm/package.json b/pnpm/package.json index 1139f8f698..5a4fddc91d 100644 --- a/pnpm/package.json +++ b/pnpm/package.json @@ -114,7 +114,7 @@ "@pnpm/engine.pm.commands": "workspace:*", "@pnpm/store.commands": "workspace:*", "@pnpm/prepare": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/engine.runtime.commands": "workspace:*", "@pnpm/workspace.project-manifest-reader": "workspace:*", "@pnpm/registry-mock": "catalog:", @@ -129,7 +129,7 @@ "@pnpm/util.lex-comparator": "catalog:", "@pnpm/worker": "workspace:*", "@pnpm/workspace.projects-reader": "workspace:*", - "@pnpm/workspace.pkgs-graph": "workspace:*", + "@pnpm/workspace.projects-graph": "workspace:*", "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "@pnpm/workspace.state": "workspace:*", "@pnpm/workspace.project-manifest-writer": "workspace:*", diff --git a/pnpm/test/install/misc.ts b/pnpm/test/install/misc.ts index 2166f7d1f9..ae7ddb9500 100644 --- a/pnpm/test/install/misc.ts +++ b/pnpm/test/install/misc.ts @@ -3,7 +3,7 @@ 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 { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { prepare, prepareEmpty, preparePackages } from '@pnpm/prepare' import { getIntegrity } from '@pnpm/registry-mock' import type { PackageFilesIndex } from '@pnpm/store.cafs' diff --git a/pnpm/test/monorepo/index.ts b/pnpm/test/monorepo/index.ts index 9bc77d482b..48fbe8be55 100644 --- a/pnpm/test/monorepo/index.ts +++ b/pnpm/test/monorepo/index.ts @@ -6,7 +6,7 @@ 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 { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { prepare, prepareEmpty, diff --git a/pnpm/test/uninstall.ts b/pnpm/test/uninstall.ts index 48137e2684..b31ec0143f 100644 --- a/pnpm/test/uninstall.ts +++ b/pnpm/test/uninstall.ts @@ -1,7 +1,7 @@ import fs from 'node:fs' import path from 'node:path' -import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { prepare } from '@pnpm/prepare' import PATH from 'path-name' diff --git a/pnpm/test/update.ts b/pnpm/test/update.ts index 09017c81a2..d26f6eb4d5 100644 --- a/pnpm/test/update.ts +++ b/pnpm/test/update.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { readPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import { prepare, preparePackages } from '@pnpm/prepare' import { readYamlFileSync } from 'read-yaml-file' import { writeYamlFileSync } from 'write-yaml-file' diff --git a/pnpm/tsconfig.json b/pnpm/tsconfig.json index 6a27bb473e..ee2eaa2787 100644 --- a/pnpm/tsconfig.json +++ b/pnpm/tsconfig.json @@ -62,6 +62,21 @@ { "path": "../config/version-policy" }, + { + "path": "../core/constants" + }, + { + "path": "../core/core-loggers" + }, + { + "path": "../core/error" + }, + { + "path": "../core/logger" + }, + { + "path": "../core/types" + }, { "path": "../crypto/hash" }, @@ -104,26 +119,11 @@ { "path": "../lockfile/types" }, - { - "path": "../packages/constants" - }, - { - "path": "../packages/core-loggers" - }, - { - "path": "../packages/error" - }, - { - "path": "../packages/logger" - }, - { - "path": "../packages/types" - }, { "path": "../patching/commands" }, { - "path": "../pkg-manifest/read-package-json" + "path": "../pkg-manifest/reader" }, { "path": "../releasing/commands" @@ -149,9 +149,6 @@ { "path": "../workspace/commands" }, - { - "path": "../workspace/pkgs-graph" - }, { "path": "../workspace/project-manifest-reader" }, @@ -161,6 +158,9 @@ { "path": "../workspace/projects-filter" }, + { + "path": "../workspace/projects-graph" + }, { "path": "../workspace/projects-reader" }, diff --git a/releasing/commands/package.json b/releasing/commands/package.json index 6ae2145141..141d1b5728 100644 --- a/releasing/commands/package.json +++ b/releasing/commands/package.json @@ -56,7 +56,7 @@ "@pnpm/releasing.exportable-manifest": "workspace:*", "@pnpm/resolving.resolver-base": "workspace:*", "@pnpm/types": "workspace:*", - "@pnpm/workspace.sort-packages": "workspace:*", + "@pnpm/workspace.projects-sorter": "workspace:*", "@types/normalize-path": "catalog:", "@zkochan/rimraf": "catalog:", "chalk": "catalog:", diff --git a/releasing/commands/src/publish/pack.ts b/releasing/commands/src/publish/pack.ts index 5cbe1015c6..bbde2c99f0 100644 --- a/releasing/commands/src/publish/pack.ts +++ b/releasing/commands/src/publish/pack.ts @@ -13,7 +13,7 @@ import type { Hooks } from '@pnpm/hooks.pnpmfile' import { logger } from '@pnpm/logger' 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 { sortPackages } from '@pnpm/workspace.projects-sorter' import chalk from 'chalk' import pLimit from 'p-limit' import { pick } from 'ramda' diff --git a/releasing/commands/src/publish/recursivePublish.ts b/releasing/commands/src/publish/recursivePublish.ts index 31f1eeeb3a..27c010c8c0 100644 --- a/releasing/commands/src/publish/recursivePublish.ts +++ b/releasing/commands/src/publish/recursivePublish.ts @@ -6,7 +6,7 @@ import { createResolver } from '@pnpm/installing.client' import { logger } from '@pnpm/logger' import type { ResolveFunction } from '@pnpm/resolving.resolver-base' import type { ProjectRootDir, Registries } from '@pnpm/types' -import { sortPackages } from '@pnpm/workspace.sort-packages' +import { sortPackages } from '@pnpm/workspace.projects-sorter' import pFilter from 'p-filter' import { pick } from 'ramda' import { writeJsonFile } from 'write-json-file' diff --git a/releasing/commands/tsconfig.json b/releasing/commands/tsconfig.json index 11f4ab871e..90927814fd 100644 --- a/releasing/commands/tsconfig.json +++ b/releasing/commands/tsconfig.json @@ -42,6 +42,18 @@ { "path": "../../config/reader" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../deps/path" }, @@ -84,18 +96,6 @@ { "path": "../../network/git-utils" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/resolver-base" }, @@ -103,7 +103,7 @@ "path": "../../workspace/projects-filter" }, { - "path": "../../workspace/sort-packages" + "path": "../../workspace/projects-sorter" }, { "path": "../exportable-manifest" diff --git a/releasing/exportable-manifest/tsconfig.json b/releasing/exportable-manifest/tsconfig.json index e6f8e309b8..5838ad0900 100644 --- a/releasing/exportable-manifest/tsconfig.json +++ b/releasing/exportable-manifest/tsconfig.json @@ -24,15 +24,15 @@ { "path": "../../catalogs/types" }, + { + "path": "../../core/error" + }, + { + "path": "../../core/types" + }, { "path": "../../hooks/pnpmfile" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/jsr-specifier-parser" }, diff --git a/renovate.json b/renovate.json index 1aa9ce4ba0..8962183189 100644 --- a/renovate.json +++ b/renovate.json @@ -38,7 +38,7 @@ "@pnpm/installing.read-projects-context", "@pnpm/workspace.project-manifest-reader", "@pnpm/fs.read-modules-dir", - "@pnpm/pkg-manifest.read-package-json", + "@pnpm/pkg-manifest.reader", "@pnpm/registry-mock", "@pnpm/installing.resolve-dependencies", "@pnpm/resolving.resolver-base", diff --git a/resolving/bun-resolver/README.md b/resolving/bun-resolver/README.md deleted file mode 100644 index 4d54d533fe..0000000000 --- a/resolving/bun-resolver/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# @pnpm/resolving.bun-resolver - -> Resolves the Bun runtime - -[![npm version](https://img.shields.io/npm/v/@pnpm/resolving.bun-resolver.svg)](https://www.npmjs.com/package/@pnpm/resolving.bun-resolver) - -## Installation - -```sh -pnpm add @pnpm/resolving.bun-resolver -``` - -## License - -MIT - - diff --git a/resolving/bun-resolver/tsconfig.json b/resolving/bun-resolver/tsconfig.json deleted file mode 100644 index 83a70e91f4..0000000000 --- a/resolving/bun-resolver/tsconfig.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "extends": "@pnpm/tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": "src" - }, - "include": [ - "src/**/*.ts", - "../../__typings__/**/*.d.ts" - ], - "references": [ - { - "path": "../../crypto/shasums-file" - }, - { - "path": "../../engine/runtime/node.fetcher" - }, - { - "path": "../../fetching/binary-fetcher" - }, - { - "path": "../../fetching/fetcher-base" - }, - { - "path": "../../fetching/types" - }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, - { - "path": "../../worker" - }, - { - "path": "../deno-resolver" - }, - { - "path": "../npm-resolver" - }, - { - "path": "../resolver-base" - } - ] -} diff --git a/resolving/default-resolver/package.json b/resolving/default-resolver/package.json index 94a1ff0011..e23a410464 100644 --- a/resolving/default-resolver/package.json +++ b/resolving/default-resolver/package.json @@ -33,12 +33,12 @@ "compile": "tsgo --build && pnpm run lint --fix" }, "dependencies": { - "@pnpm/engine.runtime.node.resolver": "workspace:*", + "@pnpm/engine.runtime.bun-resolver": "workspace:*", + "@pnpm/engine.runtime.deno-resolver": "workspace:*", + "@pnpm/engine.runtime.node-resolver": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/fetching.types": "workspace:*", "@pnpm/hooks.types": "workspace:*", - "@pnpm/resolving.bun-resolver": "workspace:*", - "@pnpm/resolving.deno-resolver": "workspace:*", "@pnpm/resolving.git-resolver": "workspace:*", "@pnpm/resolving.local-resolver": "workspace:*", "@pnpm/resolving.npm-resolver": "workspace:*", diff --git a/resolving/default-resolver/src/index.ts b/resolving/default-resolver/src/index.ts index c329800edb..e0f04c3965 100644 --- a/resolving/default-resolver/src/index.ts +++ b/resolving/default-resolver/src/index.ts @@ -1,9 +1,9 @@ -import { type NodeRuntimeResolveResult, resolveNodeRuntime } from '@pnpm/engine.runtime.node.resolver' +import { type BunRuntimeResolveResult, resolveBunRuntime } from '@pnpm/engine.runtime.bun-resolver' +import { type DenoRuntimeResolveResult, resolveDenoRuntime } from '@pnpm/engine.runtime.deno-resolver' +import { type NodeRuntimeResolveResult, resolveNodeRuntime } from '@pnpm/engine.runtime.node-resolver' import { PnpmError } from '@pnpm/error' import type { FetchFromRegistry, GetAuthHeader } from '@pnpm/fetching.types' import { checkCustomResolverCanResolve, type CustomResolver } from '@pnpm/hooks.types' -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 { diff --git a/resolving/default-resolver/tsconfig.json b/resolving/default-resolver/tsconfig.json index 06f95f0b25..6113ad5c00 100644 --- a/resolving/default-resolver/tsconfig.json +++ b/resolving/default-resolver/tsconfig.json @@ -10,7 +10,19 @@ ], "references": [ { - "path": "../../engine/runtime/node.resolver" + "path": "../../core/error" + }, + { + "path": "../../core/types" + }, + { + "path": "../../engine/runtime/bun-resolver" + }, + { + "path": "../../engine/runtime/deno-resolver" + }, + { + "path": "../../engine/runtime/node-resolver" }, { "path": "../../fetching/fetcher-base" @@ -27,21 +39,9 @@ { "path": "../../network/fetch" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, { "path": "../../store/cafs-types" }, - { - "path": "../bun-resolver" - }, - { - "path": "../deno-resolver" - }, { "path": "../git-resolver" }, diff --git a/resolving/deno-resolver/README.md b/resolving/deno-resolver/README.md deleted file mode 100644 index 2519809766..0000000000 --- a/resolving/deno-resolver/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# @pnpm/resolving.deno-resolver - -> Resolves the Deno runtime - -[![npm version](https://img.shields.io/npm/v/@pnpm/resolving.deno-resolver.svg)](https://www.npmjs.com/package/@pnpm/resolving.deno-resolver) - -## Installation - -```sh -pnpm add @pnpm/resolving.deno-resolver -``` - -## License - -MIT - diff --git a/resolving/deno-resolver/tsconfig.json b/resolving/deno-resolver/tsconfig.json deleted file mode 100644 index 239fed66e3..0000000000 --- a/resolving/deno-resolver/tsconfig.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "extends": "@pnpm/tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": "src" - }, - "include": [ - "src/**/*.ts", - "../../__typings__/**/*.d.ts" - ], - "references": [ - { - "path": "../../crypto/shasums-file" - }, - { - "path": "../../engine/runtime/node.fetcher" - }, - { - "path": "../../fetching/binary-fetcher" - }, - { - "path": "../../fetching/fetcher-base" - }, - { - "path": "../../fetching/types" - }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, - { - "path": "../../worker" - }, - { - "path": "../npm-resolver" - }, - { - "path": "../resolver-base" - } - ] -} diff --git a/resolving/git-resolver/tsconfig.json b/resolving/git-resolver/tsconfig.json index 6d7d381a6b..c71a3895d0 100644 --- a/resolving/git-resolver/tsconfig.json +++ b/resolving/git-resolver/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../network/fetch" + "path": "../../core/error" }, { - "path": "../../packages/error" + "path": "../../network/fetch" }, { "path": "../resolver-base" diff --git a/resolving/jsr-specifier-parser/tsconfig.json b/resolving/jsr-specifier-parser/tsconfig.json index 019cba19e7..5e5ef544a0 100644 --- a/resolving/jsr-specifier-parser/tsconfig.json +++ b/resolving/jsr-specifier-parser/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/error" + "path": "../../core/error" } ] } diff --git a/resolving/local-resolver/tsconfig.json b/resolving/local-resolver/tsconfig.json index f0e795386e..32e063abda 100644 --- a/resolving/local-resolver/tsconfig.json +++ b/resolving/local-resolver/tsconfig.json @@ -9,18 +9,18 @@ "../../__typings__/**/*.d.ts" ], "references": [ + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/hash" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../workspace/project-manifest-reader" }, diff --git a/resolving/npm-resolver/tsconfig.json b/resolving/npm-resolver/tsconfig.json index e15be911a1..0de5f3eb0a 100644 --- a/resolving/npm-resolver/tsconfig.json +++ b/resolving/npm-resolver/tsconfig.json @@ -18,6 +18,21 @@ { "path": "../../config/version-policy" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/core-loggers" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/hash" }, @@ -30,21 +45,6 @@ { "path": "../../network/fetch" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/core-loggers" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../store/cafs" }, diff --git a/resolving/registry/pkg-metadata-filter/tsconfig.json b/resolving/registry/pkg-metadata-filter/tsconfig.json index e4a2273f24..0e36e1e775 100644 --- a/resolving/registry/pkg-metadata-filter/tsconfig.json +++ b/resolving/registry/pkg-metadata-filter/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../../packages/logger" + "path": "../../../core/logger" }, { "path": "../types" diff --git a/resolving/registry/types/tsconfig.json b/resolving/registry/types/tsconfig.json index 05cf46edf9..baaf326910 100644 --- a/resolving/registry/types/tsconfig.json +++ b/resolving/registry/types/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../../packages/types" + "path": "../../../core/types" } ] } diff --git a/resolving/resolver-base/tsconfig.json b/resolving/resolver-base/tsconfig.json index d37dd6eefe..9a3fb59805 100644 --- a/resolving/resolver-base/tsconfig.json +++ b/resolving/resolver-base/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" } ] } diff --git a/store/cafs-types/tsconfig.json b/store/cafs-types/tsconfig.json index d37dd6eefe..9a3fb59805 100644 --- a/store/cafs-types/tsconfig.json +++ b/store/cafs-types/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" } ] } diff --git a/store/cafs/tsconfig.json b/store/cafs/tsconfig.json index 797bfebd27..65505fb174 100644 --- a/store/cafs/tsconfig.json +++ b/store/cafs/tsconfig.json @@ -12,18 +12,18 @@ { "path": "../../__utils__/test-fixtures" }, + { + "path": "../../core/error" + }, + { + "path": "../../core/types" + }, { "path": "../../fetching/fetcher-base" }, { "path": "../../fs/graceful-fs" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, { "path": "../cafs-types" }, diff --git a/store/commands/tsconfig.json b/store/commands/tsconfig.json index fa83fd2b1a..feffed23d8 100644 --- a/store/commands/tsconfig.json +++ b/store/commands/tsconfig.json @@ -24,6 +24,18 @@ { "path": "../../config/reader" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/integrity" }, @@ -57,18 +69,6 @@ { "path": "../../object/key-sorting" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/parse-wanted-dependency" }, diff --git a/store/connection-manager/tsconfig.json b/store/connection-manager/tsconfig.json index cf59359b19..03830d2cc9 100644 --- a/store/connection-manager/tsconfig.json +++ b/store/connection-manager/tsconfig.json @@ -16,10 +16,10 @@ "path": "../../config/reader" }, { - "path": "../../installing/client" + "path": "../../core/logger" }, { - "path": "../../packages/logger" + "path": "../../installing/client" }, { "path": "../controller" diff --git a/store/controller-types/tsconfig.json b/store/controller-types/tsconfig.json index f4837c7312..c271d55534 100644 --- a/store/controller-types/tsconfig.json +++ b/store/controller-types/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../fetching/fetcher-base" + "path": "../../core/types" }, { - "path": "../../packages/types" + "path": "../../fetching/fetcher-base" }, { "path": "../../resolving/resolver-base" diff --git a/store/controller/tsconfig.json b/store/controller/tsconfig.json index 97a35022b2..aae4f656fd 100644 --- a/store/controller/tsconfig.json +++ b/store/controller/tsconfig.json @@ -12,6 +12,15 @@ { "path": "../../__utils__/prepare" }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../crypto/hash" }, @@ -27,15 +36,6 @@ { "path": "../../installing/package-requester" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../../resolving/resolver-base" }, diff --git a/store/create-cafs-store/tsconfig.json b/store/create-cafs-store/tsconfig.json index 019222232e..f0bacb22b7 100644 --- a/store/create-cafs-store/tsconfig.json +++ b/store/create-cafs-store/tsconfig.json @@ -15,15 +15,15 @@ { "path": "../../building/pkg-requires-build" }, + { + "path": "../../core/logger" + }, { "path": "../../fetching/fetcher-base" }, { "path": "../../fs/indexed-pkg-importer" }, - { - "path": "../../packages/logger" - }, { "path": "../cafs" }, diff --git a/store/path/tsconfig.json b/store/path/tsconfig.json index 5eeb7b4a57..1f5f7d69b2 100644 --- a/store/path/tsconfig.json +++ b/store/path/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../packages/constants" + "path": "../../core/constants" }, { - "path": "../../packages/error" + "path": "../../core/error" } ] } diff --git a/worker/tsconfig.json b/worker/tsconfig.json index b9f16f3c3e..ef44d22abf 100644 --- a/worker/tsconfig.json +++ b/worker/tsconfig.json @@ -12,6 +12,15 @@ { "path": "../building/pkg-requires-build" }, + { + "path": "../core/error" + }, + { + "path": "../core/logger" + }, + { + "path": "../core/types" + }, { "path": "../crypto/integrity" }, @@ -24,15 +33,6 @@ { "path": "../fs/symlink-dependency" }, - { - "path": "../packages/error" - }, - { - "path": "../packages/logger" - }, - { - "path": "../packages/types" - }, { "path": "../store/cafs" }, diff --git a/workspace/commands/tsconfig.json b/workspace/commands/tsconfig.json index b4a0a2efc3..1a5095d42a 100644 --- a/workspace/commands/tsconfig.json +++ b/workspace/commands/tsconfig.json @@ -24,15 +24,15 @@ { "path": "../../config/reader" }, + { + "path": "../../core/error" + }, + { + "path": "../../core/types" + }, { "path": "../../object/key-sorting" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, { "path": "../project-manifest-writer" } diff --git a/workspace/injected-deps-syncer/package.json b/workspace/injected-deps-syncer/package.json index aaccd617b5..ac66e46a50 100644 --- a/workspace/injected-deps-syncer/package.json +++ b/workspace/injected-deps-syncer/package.json @@ -35,7 +35,7 @@ "@pnpm/error": "workspace:*", "@pnpm/fetching.directory-fetcher": "workspace:*", "@pnpm/installing.modules-yaml": "workspace:*", - "@pnpm/pkg-manifest.read-package-json": "workspace:*", + "@pnpm/pkg-manifest.reader": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "catalog:", "@pnpm/workspace.projects-reader": "workspace:*", diff --git a/workspace/injected-deps-syncer/src/index.ts b/workspace/injected-deps-syncer/src/index.ts index e5235f2619..9a048bee29 100644 --- a/workspace/injected-deps-syncer/src/index.ts +++ b/workspace/injected-deps-syncer/src/index.ts @@ -4,7 +4,7 @@ import { linkBins, linkBinsOfPackages } from '@pnpm/bins.linker' import { PnpmError } from '@pnpm/error' import { readModulesManifest } from '@pnpm/installing.modules-yaml' import { logger as createLogger } from '@pnpm/logger' -import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.read-package-json' +import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader' import type { DependencyManifest } from '@pnpm/types' import { findWorkspacePackagesNoCheck } from '@pnpm/workspace.projects-reader' import normalizePath from 'normalize-path' diff --git a/workspace/injected-deps-syncer/tsconfig.json b/workspace/injected-deps-syncer/tsconfig.json index 3a9bdfe919..f9081783fc 100644 --- a/workspace/injected-deps-syncer/tsconfig.json +++ b/workspace/injected-deps-syncer/tsconfig.json @@ -15,6 +15,15 @@ { "path": "../../bins/linker" }, + { + "path": "../../core/error" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../fetching/directory-fetcher" }, @@ -22,16 +31,7 @@ "path": "../../installing/modules-yaml" }, { - "path": "../../packages/error" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, - { - "path": "../../pkg-manifest/read-package-json" + "path": "../../pkg-manifest/reader" }, { "path": "../projects-reader" diff --git a/workspace/project-manifest-reader/tsconfig.json b/workspace/project-manifest-reader/tsconfig.json index ef69c4646d..b51b6b8210 100644 --- a/workspace/project-manifest-reader/tsconfig.json +++ b/workspace/project-manifest-reader/tsconfig.json @@ -12,15 +12,15 @@ { "path": "../../__utils__/test-fixtures" }, + { + "path": "../../core/error" + }, + { + "path": "../../core/types" + }, { "path": "../../fs/graceful-fs" }, - { - "path": "../../packages/error" - }, - { - "path": "../../packages/types" - }, { "path": "../../pkg-manifest/utils" }, diff --git a/workspace/project-manifest-writer/tsconfig.json b/workspace/project-manifest-writer/tsconfig.json index 2692318a47..88c76c5185 100644 --- a/workspace/project-manifest-writer/tsconfig.json +++ b/workspace/project-manifest-writer/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../../text/comments-parser" diff --git a/workspace/projects-filter/package.json b/workspace/projects-filter/package.json index 079a1ac9b8..37ce0c3b13 100644 --- a/workspace/projects-filter/package.json +++ b/workspace/projects-filter/package.json @@ -33,7 +33,7 @@ "dependencies": { "@pnpm/config.matcher": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/workspace.pkgs-graph": "workspace:*", + "@pnpm/workspace.projects-graph": "workspace:*", "@pnpm/workspace.projects-reader": "workspace:*", "@pnpm/workspace.workspace-manifest-reader": "workspace:*", "execa": "catalog:", diff --git a/workspace/projects-filter/src/index.ts b/workspace/projects-filter/src/index.ts index 915e8b4326..b63b6d4e0d 100644 --- a/workspace/projects-filter/src/index.ts +++ b/workspace/projects-filter/src/index.ts @@ -1,6 +1,6 @@ import { createMatcher } from '@pnpm/config.matcher' import type { ProjectRootDir, SupportedArchitectures } from '@pnpm/types' -import { createPkgGraph, type Package, type PackageNode } from '@pnpm/workspace.pkgs-graph' +import { createPkgGraph, type Package, type PackageNode } from '@pnpm/workspace.projects-graph' import { findWorkspacePackages, type Project } from '@pnpm/workspace.projects-reader' import { isSubdir } from 'is-subdir' import * as micromatch from 'micromatch' diff --git a/workspace/projects-filter/test/index.ts b/workspace/projects-filter/test/index.ts index 67a0c8f60e..df33dfa347 100644 --- a/workspace/projects-filter/test/index.ts +++ b/workspace/projects-filter/test/index.ts @@ -4,8 +4,8 @@ import { promisify } from 'node:util' import type { PnpmError } from '@pnpm/error' import type { ProjectRootDir } from '@pnpm/types' -import type { Package } from '@pnpm/workspace.pkgs-graph' import { filterWorkspacePackages, type PackageGraph } from '@pnpm/workspace.projects-filter' +import type { Package } from '@pnpm/workspace.projects-graph' import { isCI } from 'ci-info' import { safeExeca as execa } from 'execa' import isWindows from 'is-windows' diff --git a/workspace/projects-filter/tsconfig.json b/workspace/projects-filter/tsconfig.json index f176e7f089..348fd6301f 100644 --- a/workspace/projects-filter/tsconfig.json +++ b/workspace/projects-filter/tsconfig.json @@ -13,13 +13,13 @@ "path": "../../config/matcher" }, { - "path": "../../packages/error" + "path": "../../core/error" }, { - "path": "../../packages/types" + "path": "../../core/types" }, { - "path": "../pkgs-graph" + "path": "../projects-graph" }, { "path": "../projects-reader" diff --git a/workspace/pkgs-graph/CHANGELOG.md b/workspace/projects-graph/CHANGELOG.md similarity index 100% rename from workspace/pkgs-graph/CHANGELOG.md rename to workspace/projects-graph/CHANGELOG.md diff --git a/workspace/pkgs-graph/README.md b/workspace/projects-graph/README.md similarity index 93% rename from workspace/pkgs-graph/README.md rename to workspace/projects-graph/README.md index 74056beb62..76fc1cf70c 100644 --- a/workspace/pkgs-graph/README.md +++ b/workspace/projects-graph/README.md @@ -1,4 +1,4 @@ -# @pnpm/workspace.pkgs-graph +# @pnpm/workspace.projects-graph > Create a graph from an array of packages @@ -7,7 +7,7 @@ ## Installation ``` -pnpm add @pnpm/workspace.pkgs-graph +pnpm add @pnpm/workspace.projects-graph ``` ## Usage diff --git a/workspace/pkgs-graph/package.json b/workspace/projects-graph/package.json similarity index 90% rename from workspace/pkgs-graph/package.json rename to workspace/projects-graph/package.json index f742cabecc..db49be7ae2 100644 --- a/workspace/pkgs-graph/package.json +++ b/workspace/projects-graph/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/workspace.pkgs-graph", + "name": "@pnpm/workspace.projects-graph", "version": "1000.0.25", "description": "Create a graph from an array of packages", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/pkgs-graph", - "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/pkgs-graph#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/projects-graph", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/projects-graph#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -38,7 +38,7 @@ "ramda": "catalog:" }, "devDependencies": { - "@pnpm/workspace.pkgs-graph": "workspace:*", + "@pnpm/workspace.projects-graph": "workspace:*", "@types/ramda": "catalog:", "better-path-resolve": "catalog:" }, diff --git a/workspace/pkgs-graph/src/index.ts b/workspace/projects-graph/src/index.ts similarity index 100% rename from workspace/pkgs-graph/src/index.ts rename to workspace/projects-graph/src/index.ts diff --git a/workspace/pkgs-graph/test/index.ts b/workspace/projects-graph/test/index.ts similarity index 99% rename from workspace/pkgs-graph/test/index.ts rename to workspace/projects-graph/test/index.ts index aa325ef2a1..c3e593cbc3 100644 --- a/workspace/pkgs-graph/test/index.ts +++ b/workspace/projects-graph/test/index.ts @@ -1,5 +1,5 @@ /// -import { createPkgGraph } from '@pnpm/workspace.pkgs-graph' +import { createPkgGraph } from '@pnpm/workspace.projects-graph' import { betterPathResolve as pathResolve } from 'better-path-resolve' const BAR1_PATH = pathResolve('/zkochan/src/bar') diff --git a/workspace/pkgs-graph/test/tsconfig.json b/workspace/projects-graph/test/tsconfig.json similarity index 100% rename from workspace/pkgs-graph/test/tsconfig.json rename to workspace/projects-graph/test/tsconfig.json diff --git a/workspace/pkgs-graph/tsconfig.json b/workspace/projects-graph/tsconfig.json similarity index 89% rename from workspace/pkgs-graph/tsconfig.json rename to workspace/projects-graph/tsconfig.json index 72e0633fba..ec4861310a 100644 --- a/workspace/pkgs-graph/tsconfig.json +++ b/workspace/projects-graph/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/types" + "path": "../../core/types" }, { "path": "../../resolving/npm-resolver" diff --git a/resolving/bun-resolver/tsconfig.lint.json b/workspace/projects-graph/tsconfig.lint.json similarity index 100% rename from resolving/bun-resolver/tsconfig.lint.json rename to workspace/projects-graph/tsconfig.lint.json diff --git a/workspace/projects-reader/tsconfig.json b/workspace/projects-reader/tsconfig.json index 90fdb869c9..4af4307097 100644 --- a/workspace/projects-reader/tsconfig.json +++ b/workspace/projects-reader/tsconfig.json @@ -12,18 +12,18 @@ { "path": "../../cli/utils" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/logger" + }, + { + "path": "../../core/types" + }, { "path": "../../fs/find-packages" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/logger" - }, - { - "path": "../../packages/types" - }, { "path": "../workspace-manifest-reader" } diff --git a/workspace/sort-packages/CHANGELOG.md b/workspace/projects-sorter/CHANGELOG.md similarity index 100% rename from workspace/sort-packages/CHANGELOG.md rename to workspace/projects-sorter/CHANGELOG.md diff --git a/workspace/projects-sorter/README.md b/workspace/projects-sorter/README.md new file mode 100644 index 0000000000..012e8765ca --- /dev/null +++ b/workspace/projects-sorter/README.md @@ -0,0 +1,15 @@ +# @pnpm/workspace.projects-sorter + +> Sort packages + +[![npm version](https://img.shields.io/npm/v/@pnpm/workspace.projects-sorter.svg)](https://www.npmjs.com/package/@pnpm/plugin-commands-recursive) + +## Installation + +```sh +pnpm add @pnpm/workspace.projects-sorter +``` + +## License + +MIT diff --git a/workspace/sort-packages/package.json b/workspace/projects-sorter/package.json similarity index 86% rename from workspace/sort-packages/package.json rename to workspace/projects-sorter/package.json index b7666af2a1..4ac7c07b82 100644 --- a/workspace/sort-packages/package.json +++ b/workspace/projects-sorter/package.json @@ -1,5 +1,5 @@ { - "name": "@pnpm/workspace.sort-packages", + "name": "@pnpm/workspace.projects-sorter", "version": "1000.0.11", "description": "Sort packages", "keywords": [ @@ -8,8 +8,8 @@ ], "license": "MIT", "funding": "https://opencollective.com/pnpm", - "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/sort-packages", - "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/sort-packages#readme", + "repository": "https://github.com/pnpm/pnpm/tree/main/workspace/projects-sorter", + "homepage": "https://github.com/pnpm/pnpm/tree/main/workspace/projects-sorter#readme", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, @@ -34,7 +34,7 @@ "@pnpm/types": "workspace:*" }, "devDependencies": { - "@pnpm/workspace.sort-packages": "workspace:*" + "@pnpm/workspace.projects-sorter": "workspace:*" }, "engines": { "node": ">=22.13" diff --git a/workspace/sort-packages/src/index.ts b/workspace/projects-sorter/src/index.ts similarity index 100% rename from workspace/sort-packages/src/index.ts rename to workspace/projects-sorter/src/index.ts diff --git a/workspace/sort-packages/tsconfig.json b/workspace/projects-sorter/tsconfig.json similarity index 87% rename from workspace/sort-packages/tsconfig.json rename to workspace/projects-sorter/tsconfig.json index 6d76dce278..ef2de6dab9 100644 --- a/workspace/sort-packages/tsconfig.json +++ b/workspace/projects-sorter/tsconfig.json @@ -10,10 +10,10 @@ ], "references": [ { - "path": "../../deps/graph-sequencer" + "path": "../../core/types" }, { - "path": "../../packages/types" + "path": "../../deps/graph-sequencer" } ] } \ No newline at end of file diff --git a/resolving/deno-resolver/tsconfig.lint.json b/workspace/projects-sorter/tsconfig.lint.json similarity index 100% rename from resolving/deno-resolver/tsconfig.lint.json rename to workspace/projects-sorter/tsconfig.lint.json diff --git a/workspace/root-finder/tsconfig.json b/workspace/root-finder/tsconfig.json index 019cba19e7..5e5ef544a0 100644 --- a/workspace/root-finder/tsconfig.json +++ b/workspace/root-finder/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../packages/error" + "path": "../../core/error" } ] } diff --git a/workspace/sort-packages/README.md b/workspace/sort-packages/README.md deleted file mode 100644 index 5ec34ece35..0000000000 --- a/workspace/sort-packages/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# @pnpm/sort-packages - -> Sort packages - -[![npm version](https://img.shields.io/npm/v/@pnpm/sort-packages.svg)](https://www.npmjs.com/package/@pnpm/plugin-commands-recursive) - -## Installation - -```sh -pnpm add @pnpm/sort-packages -``` - -## License - -MIT diff --git a/workspace/sort-packages/tsconfig.lint.json b/workspace/sort-packages/tsconfig.lint.json deleted file mode 100644 index 1bbe711971..0000000000 --- a/workspace/sort-packages/tsconfig.lint.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": [ - "src/**/*.ts", - "test/**/*.ts", - "../../__typings__/**/*.d.ts" - ] -} diff --git a/workspace/state/tsconfig.json b/workspace/state/tsconfig.json index 5823cdb09f..6f8ab43287 100644 --- a/workspace/state/tsconfig.json +++ b/workspace/state/tsconfig.json @@ -19,10 +19,10 @@ "path": "../../config/reader" }, { - "path": "../../packages/logger" + "path": "../../core/logger" }, { - "path": "../../packages/types" + "path": "../../core/types" } ] } diff --git a/workspace/workspace-manifest-reader/tsconfig.json b/workspace/workspace-manifest-reader/tsconfig.json index 21b6293ed2..09629e7772 100644 --- a/workspace/workspace-manifest-reader/tsconfig.json +++ b/workspace/workspace-manifest-reader/tsconfig.json @@ -10,13 +10,13 @@ ], "references": [ { - "path": "../../packages/constants" + "path": "../../core/constants" }, { - "path": "../../packages/error" + "path": "../../core/error" }, { - "path": "../../packages/types" + "path": "../../core/types" } ] } diff --git a/workspace/workspace-manifest-writer/tsconfig.json b/workspace/workspace-manifest-writer/tsconfig.json index f715a201d7..039ba421b2 100644 --- a/workspace/workspace-manifest-writer/tsconfig.json +++ b/workspace/workspace-manifest-writer/tsconfig.json @@ -18,6 +18,12 @@ { "path": "../../catalogs/types" }, + { + "path": "../../core/constants" + }, + { + "path": "../../core/types" + }, { "path": "../../fs/find-packages" }, @@ -27,12 +33,6 @@ { "path": "../../object/key-sorting" }, - { - "path": "../../packages/constants" - }, - { - "path": "../../packages/types" - }, { "path": "../../yaml/document-sync" },