From 06e679f80f46da5fc87c549160c6594d0de131ed Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 15 Mar 2022 23:42:48 +0200 Subject: [PATCH] feat: prevent deep imports using exports (#4440) --- .meta-updater/src/index.ts | 3 +++ packages/audit/package.json | 5 ++++- packages/build-modules/package.json | 5 ++++- packages/cafs/package.json | 5 ++++- packages/calc-dep-state/package.json | 5 ++++- packages/cli-meta/package.json | 5 ++++- packages/cli-utils/package.json | 5 ++++- packages/client/package.json | 5 ++++- packages/command/package.json | 3 +++ packages/common-cli-options-help/package.json | 3 +++ packages/config/package.json | 5 ++++- packages/constants/package.json | 3 +++ packages/core-loggers/package.json | 5 ++++- packages/core/package.json | 5 ++++- packages/core/src/getPeerDependencyIssues.ts | 3 +-- packages/core/src/install/index.ts | 5 ++--- packages/default-reporter/package.json | 5 ++++- packages/default-resolver/package.json | 5 ++++- packages/dependencies-hierarchy/package.json | 5 ++++- packages/dependency-path/package.json | 5 ++++- packages/directory-fetcher/package.json | 3 +++ packages/error/package.json | 3 +++ packages/exportable-manifest/package.json | 5 ++++- packages/fetch/package.json | 5 ++++- packages/fetcher-base/package.json | 3 +++ packages/fetching-types/package.json | 3 +++ packages/file-reporter/package.json | 5 ++++- packages/filter-lockfile/package.json | 5 ++++- packages/filter-workspace-packages/package.json | 5 ++++- packages/find-packages/package.json | 3 +++ packages/find-workspace-dir/package.json | 3 +++ packages/find-workspace-packages/package.json | 3 +++ packages/get-context/package.json | 5 ++++- packages/git-fetcher/package.json | 5 ++++- packages/git-resolver/package.json | 5 ++++- packages/graceful-fs/package.json | 3 +++ packages/headless/package.json | 5 ++++- packages/hoist/package.json | 5 ++++- packages/lifecycle/package.json | 5 ++++- packages/link-bins/package.json | 3 +++ packages/list/package.json | 5 ++++- packages/local-resolver/package.json | 5 ++++- packages/lockfile-file/package.json | 5 ++++- packages/lockfile-to-pnp/package.json | 5 ++++- packages/lockfile-types/package.json | 3 +++ packages/lockfile-utils/package.json | 5 ++++- packages/lockfile-walker/package.json | 5 ++++- packages/make-dedicated-lockfile/package.json | 3 +++ packages/manifest-utils/package.json | 3 +++ packages/matcher/package.json | 3 +++ packages/merge-lockfile-changes/package.json | 3 +++ packages/modules-cleaner/package.json | 5 ++++- packages/modules-yaml/package.json | 5 ++++- packages/mount-modules/package.json | 3 +++ packages/normalize-registries/package.json | 3 +++ packages/npm-registry-agent/package.json | 5 ++++- packages/npm-resolver/package.json | 5 ++++- packages/npm-resolver/src/index.ts | 2 ++ packages/outdated/package.json | 5 ++++- packages/package-bins/package.json | 5 ++++- packages/package-is-installable/package.json | 5 ++++- packages/package-requester/package.json | 5 ++++- packages/package-store/package.json | 5 ++++- packages/parse-cli-args/package.json | 5 ++++- packages/parse-overrides/package.json | 3 +++ packages/parse-wanted-dependency/package.json | 5 ++++- packages/pick-registry-for-package/package.json | 3 +++ packages/pkgs-graph/package.json | 5 ++++- packages/plugin-commands-audit/package.json | 5 ++++- packages/plugin-commands-env/package.json | 3 +++ packages/plugin-commands-init/package.json | 5 ++++- packages/plugin-commands-installation/package.json | 5 ++++- packages/plugin-commands-installation/src/installDeps.ts | 4 ++-- packages/plugin-commands-listing/package.json | 5 ++++- packages/plugin-commands-outdated/package.json | 5 ++++- packages/plugin-commands-publishing/package.json | 5 ++++- packages/plugin-commands-rebuild/package.json | 5 ++++- .../plugin-commands-rebuild/src/implementation/index.ts | 4 ++-- packages/plugin-commands-rebuild/src/index.ts | 2 ++ packages/plugin-commands-rebuild/src/rebuild.ts | 8 ++++---- packages/plugin-commands-rebuild/src/recursive.ts | 4 ++-- packages/plugin-commands-script-runners/package.json | 5 ++++- packages/plugin-commands-server/package.json | 5 ++++- packages/plugin-commands-setup/package.json | 3 +++ packages/plugin-commands-store/package.json | 5 ++++- packages/pnpm/package.json | 5 ++++- packages/pnpmfile/package.json | 5 ++++- packages/prepare-package/package.json | 3 +++ packages/prune-lockfile/package.json | 5 ++++- packages/read-modules-dir/package.json | 3 +++ packages/read-package-json/package.json | 3 +++ packages/read-project-manifest/package.json | 5 ++++- packages/read-projects-context/package.json | 5 ++++- packages/real-hoist/package.json | 3 +++ packages/remove-bins/package.json | 5 ++++- packages/render-peer-issues/package.json | 3 +++ packages/resolve-dependencies/package.json | 5 ++++- packages/resolve-dependencies/src/index.ts | 4 ++++ .../src/wantedDepIsLocallyAvailable.ts | 2 +- packages/resolve-workspace-range/package.json | 5 ++++- packages/resolver-base/package.json | 3 +++ packages/run-npm/package.json | 5 ++++- packages/server/package.json | 5 ++++- packages/sort-packages/package.json | 3 +++ packages/store-connection-manager/package.json | 5 ++++- packages/store-controller-types/package.json | 3 +++ packages/symlink-dependency/package.json | 5 ++++- packages/tarball-fetcher/package.json | 5 ++++- packages/tarball-resolver/package.json | 3 +++ packages/types/package.json | 3 +++ packages/which-version-is-pinned/package.json | 3 +++ packages/write-project-manifest/package.json | 5 ++++- 112 files changed, 395 insertions(+), 83 deletions(-) diff --git a/.meta-updater/src/index.ts b/.meta-updater/src/index.ts index 3c70fb824f..d3003611a7 100644 --- a/.meta-updater/src/index.ts +++ b/.meta-updater/src/index.ts @@ -233,5 +233,8 @@ async function updateManifest (workspaceDir: string, manifest: ProjectManifest, license: 'MIT', repository, scripts, + exports: { + '.': manifest.name === 'pnpm' ? './package.json' : './lib/index.js', + }, } } diff --git a/packages/audit/package.json b/packages/audit/package.json index df320374d8..844036fd82 100644 --- a/packages/audit/package.json +++ b/packages/audit/package.json @@ -43,5 +43,8 @@ "@pnpm/lockfile-walker": "workspace:4.0.15", "@pnpm/types": "workspace:7.10.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/build-modules/package.json b/packages/build-modules/package.json index 547f0b0166..abd0f9ddad 100644 --- a/packages/build-modules/package.json +++ b/packages/build-modules/package.json @@ -49,5 +49,8 @@ "@pnpm/logger": "^4.0.0", "@types/ramda": "0.27.39" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/cafs/package.json b/packages/cafs/package.json index bd0f263c33..dee214629d 100644 --- a/packages/cafs/package.json +++ b/packages/cafs/package.json @@ -50,5 +50,8 @@ ], "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/cafs#readme", "repository": "https://github.com/pnpm/pnpm/blob/main/packages/cafs", - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/calc-dep-state/package.json b/packages/calc-dep-state/package.json index 43a8c194e9..ee5686cfa2 100644 --- a/packages/calc-dep-state/package.json +++ b/packages/calc-dep-state/package.json @@ -35,5 +35,8 @@ "devDependencies": { "@pnpm/calc-dep-state": "workspace:1.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/cli-meta/package.json b/packages/cli-meta/package.json index 78ff8b3dbb..224a20e695 100644 --- a/packages/cli-meta/package.json +++ b/packages/cli-meta/package.json @@ -34,5 +34,8 @@ "@pnpm/types": "workspace:7.10.0", "load-json-file": "^6.2.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/cli-utils/package.json b/packages/cli-utils/package.json index 4ea6fa5828..b7cad59fef 100644 --- a/packages/cli-utils/package.json +++ b/packages/cli-utils/package.json @@ -47,5 +47,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/client/package.json b/packages/client/package.json index 1c5e90f773..da493c45d6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -45,5 +45,8 @@ "@pnpm/client": "workspace:6.1.3", "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/command/package.json b/packages/command/package.json index 617cb0d61d..3b15da3407 100644 --- a/packages/command/package.json +++ b/packages/command/package.json @@ -30,5 +30,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/command": "workspace:2.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/common-cli-options-help/package.json b/packages/common-cli-options-help/package.json index 7ebfab07c1..4a1e38dcf0 100644 --- a/packages/common-cli-options-help/package.json +++ b/packages/common-cli-options-help/package.json @@ -30,5 +30,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/common-cli-options-help": "workspace:0.8.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/config/package.json b/packages/config/package.json index 47b5ecc068..38e4b201f1 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -54,5 +54,8 @@ "@types/which": "^2.0.0", "symlink-dir": "^5.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/constants/package.json b/packages/constants/package.json index 4375b7ff35..c78e453d73 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -31,5 +31,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/constants": "workspace:5.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/core-loggers/package.json b/packages/core-loggers/package.json index 8a9249745a..419ad0a86f 100644 --- a/packages/core-loggers/package.json +++ b/packages/core-loggers/package.json @@ -40,5 +40,8 @@ "@pnpm/types": "workspace:7.10.0" }, "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/core-loggers#readme", - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/core/package.json b/packages/core/package.json index 463fcf204e..53fe898dae 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -145,5 +145,8 @@ "prepublishOnly": "pnpm run compile", "compile": "tsc --build && pnpm run lint --fix" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/core/src/getPeerDependencyIssues.ts b/packages/core/src/getPeerDependencyIssues.ts index f85a6626d1..901729683c 100644 --- a/packages/core/src/getPeerDependencyIssues.ts +++ b/packages/core/src/getPeerDependencyIssues.ts @@ -1,5 +1,4 @@ -import resolveDependencies from '@pnpm/resolve-dependencies' -import getWantedDependencies from '@pnpm/resolve-dependencies/lib/getWantedDependencies' +import resolveDependencies, { getWantedDependencies } from '@pnpm/resolve-dependencies' import { PeerDependencyIssuesByProjects } from '@pnpm/types' import getContext, { GetContextOptions, ProjectOptions } from '@pnpm/get-context' import { createReadPackageHook } from './install' diff --git a/packages/core/src/install/index.ts b/packages/core/src/install/index.ts index 6259b9591e..4ac4c20747 100644 --- a/packages/core/src/install/index.ts +++ b/packages/core/src/install/index.ts @@ -35,13 +35,12 @@ import readModulesDirs from '@pnpm/read-modules-dir' import { safeReadProjectManifestOnly } from '@pnpm/read-project-manifest' import { removeBin } from '@pnpm/remove-bins' import resolveDependencies, { + getWantedDependencies, DependenciesGraph, DependenciesGraphNode, -} from '@pnpm/resolve-dependencies' -import getWantedDependencies, { PinnedVersion, WantedDependency, -} from '@pnpm/resolve-dependencies/lib/getWantedDependencies' +} from '@pnpm/resolve-dependencies' import { PreferredVersions, } from '@pnpm/resolver-base' diff --git a/packages/default-reporter/package.json b/packages/default-reporter/package.json index af2c42560d..3a97151f7c 100644 --- a/packages/default-reporter/package.json +++ b/packages/default-reporter/package.json @@ -64,5 +64,8 @@ "normalize-newline": "3.0.0" }, "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/default-reporter#readme", - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/default-resolver/package.json b/packages/default-resolver/package.json index 6502c23ad3..6eba0093ff 100644 --- a/packages/default-resolver/package.json +++ b/packages/default-resolver/package.json @@ -44,5 +44,8 @@ "@pnpm/fetch": "workspace:4.2.5", "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/dependencies-hierarchy/package.json b/packages/dependencies-hierarchy/package.json index f3637ea0e8..0e2b3f57cc 100644 --- a/packages/dependencies-hierarchy/package.json +++ b/packages/dependencies-hierarchy/package.json @@ -50,5 +50,8 @@ "@types/normalize-path": "^3.0.0", "dependencies-hierarchy": "workspace:10.0.25" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/dependency-path/package.json b/packages/dependency-path/package.json index cc07eaa75f..4f40ee121f 100644 --- a/packages/dependency-path/package.json +++ b/packages/dependency-path/package.json @@ -40,5 +40,8 @@ "@types/semver": "^7.3.4", "dependency-path": "workspace:8.0.11" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/directory-fetcher/package.json b/packages/directory-fetcher/package.json index 7e469017a5..04ab202ca4 100644 --- a/packages/directory-fetcher/package.json +++ b/packages/directory-fetcher/package.json @@ -40,5 +40,8 @@ "devDependencies": { "@pnpm/directory-fetcher": "workspace:1.0.7", "@pnpm/test-fixtures": "workspace:*" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/error/package.json b/packages/error/package.json index d237f79cbf..f056d41cb8 100644 --- a/packages/error/package.json +++ b/packages/error/package.json @@ -34,5 +34,8 @@ }, "dependencies": { "@pnpm/constants": "workspace:5.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/exportable-manifest/package.json b/packages/exportable-manifest/package.json index 282d4b169a..2043348b32 100644 --- a/packages/exportable-manifest/package.json +++ b/packages/exportable-manifest/package.json @@ -38,5 +38,8 @@ "@pnpm/types": "workspace:7.10.0", "ramda": "^0.27.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/fetch/package.json b/packages/fetch/package.json index c7ce70cdfa..5f929810c4 100644 --- a/packages/fetch/package.json +++ b/packages/fetch/package.json @@ -45,5 +45,8 @@ "cpy-cli": "^3.1.1", "nock": "12.0.3" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/fetcher-base/package.json b/packages/fetcher-base/package.json index b771976761..621c876192 100644 --- a/packages/fetcher-base/package.json +++ b/packages/fetcher-base/package.json @@ -37,5 +37,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/fetcher-base": "workspace:11.1.6" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/fetching-types/package.json b/packages/fetching-types/package.json index 323201bdae..c0627b5e1c 100644 --- a/packages/fetching-types/package.json +++ b/packages/fetching-types/package.json @@ -35,5 +35,8 @@ }, "devDependencies": { "@pnpm/fetching-types": "workspace:2.2.1" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/file-reporter/package.json b/packages/file-reporter/package.json index 8ede9cb63d..5385644a6e 100644 --- a/packages/file-reporter/package.json +++ b/packages/file-reporter/package.json @@ -37,5 +37,8 @@ "exists-file": "^3.0.2", "ndjson": "^2.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/filter-lockfile/package.json b/packages/filter-lockfile/package.json index 97ecd76be1..bb94c36354 100644 --- a/packages/filter-lockfile/package.json +++ b/packages/filter-lockfile/package.json @@ -52,5 +52,8 @@ "dependency-path": "workspace:8.0.11", "ramda": "^0.27.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/filter-workspace-packages/package.json b/packages/filter-workspace-packages/package.json index bc4a269ee1..01fc889ca5 100644 --- a/packages/filter-workspace-packages/package.json +++ b/packages/filter-workspace-packages/package.json @@ -51,5 +51,8 @@ "tempy": "^1.0.0", "touch": "3.1.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/find-packages/package.json b/packages/find-packages/package.json index 72a64c9c8b..dd25a183bb 100644 --- a/packages/find-packages/package.json +++ b/packages/find-packages/package.json @@ -38,5 +38,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "find-packages": "workspace:8.0.13" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/find-workspace-dir/package.json b/packages/find-workspace-dir/package.json index 9a7a8e3b4c..52ad766c01 100644 --- a/packages/find-workspace-dir/package.json +++ b/packages/find-workspace-dir/package.json @@ -35,5 +35,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/find-workspace-dir": "workspace:3.0.2" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/find-workspace-packages/package.json b/packages/find-workspace-packages/package.json index f33fdebbe0..2cbd229e91 100644 --- a/packages/find-workspace-packages/package.json +++ b/packages/find-workspace-packages/package.json @@ -38,5 +38,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/find-workspace-packages": "workspace:3.1.42" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/get-context/package.json b/packages/get-context/package.json index 0a50ddc416..f901b0df8b 100644 --- a/packages/get-context/package.json +++ b/packages/get-context/package.json @@ -50,5 +50,8 @@ "path-absolute": "^1.0.1", "ramda": "^0.27.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/git-fetcher/package.json b/packages/git-fetcher/package.json index 5e0452c0da..80dc2024e2 100644 --- a/packages/git-fetcher/package.json +++ b/packages/git-fetcher/package.json @@ -43,5 +43,8 @@ "p-defer": "^3.0.0", "tempy": "^1.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/git-resolver/package.json b/packages/git-resolver/package.json index 23f477666b..be899e9ee9 100644 --- a/packages/git-resolver/package.json +++ b/packages/git-resolver/package.json @@ -45,5 +45,8 @@ "@types/semver": "^7.3.4", "is-windows": "^1.0.2" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/graceful-fs/package.json b/packages/graceful-fs/package.json index 6af1f9a878..d6c5cad84a 100644 --- a/packages/graceful-fs/package.json +++ b/packages/graceful-fs/package.json @@ -33,5 +33,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/graceful-fs": "workspace:1.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/headless/package.json b/packages/headless/package.json index fe5939953c..8960af83fb 100644 --- a/packages/headless/package.json +++ b/packages/headless/package.json @@ -97,5 +97,8 @@ "ramda": "^0.27.1", "realpath-missing": "^1.1.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/hoist/package.json b/packages/hoist/package.json index 60cb97e5db..eeedbfeeb2 100644 --- a/packages/hoist/package.json +++ b/packages/hoist/package.json @@ -51,5 +51,8 @@ "dependency-path": "workspace:8.0.11", "ramda": "^0.27.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/lifecycle/package.json b/packages/lifecycle/package.json index 59bf019727..cd6fa0bdf4 100644 --- a/packages/lifecycle/package.json +++ b/packages/lifecycle/package.json @@ -52,5 +52,8 @@ "json-append": "1.1.1", "load-json-file": "^6.2.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/link-bins/package.json b/packages/link-bins/package.json index 0ec25dd137..d2612328ce 100644 --- a/packages/link-bins/package.json +++ b/packages/link-bins/package.json @@ -61,5 +61,8 @@ "funding": "https://opencollective.com/pnpm", "peerDependencies": { "@pnpm/logger": "^4.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/list/package.json b/packages/list/package.json index 19062b5964..bb29f37cf6 100644 --- a/packages/list/package.json +++ b/packages/list/package.json @@ -54,5 +54,8 @@ "@types/ramda": "0.27.39", "@types/semver": "^7.3.4" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/local-resolver/package.json b/packages/local-resolver/package.json index 61cebda0b5..a2e81de3d5 100644 --- a/packages/local-resolver/package.json +++ b/packages/local-resolver/package.json @@ -45,5 +45,8 @@ "@types/normalize-path": "^3.0.0", "@types/ssri": "^7.1.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/lockfile-file/package.json b/packages/lockfile-file/package.json index 6739890f36..f2a5f08b57 100644 --- a/packages/lockfile-file/package.json +++ b/packages/lockfile-file/package.json @@ -60,5 +60,8 @@ "strip-bom": "^4.0.0", "write-file-atomic": "^3.0.3" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/lockfile-to-pnp/package.json b/packages/lockfile-to-pnp/package.json index d2745d1473..f18cc59b39 100644 --- a/packages/lockfile-to-pnp/package.json +++ b/packages/lockfile-to-pnp/package.json @@ -51,5 +51,8 @@ "normalize-path": "^3.0.0", "ramda": "^0.27.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/lockfile-types/package.json b/packages/lockfile-types/package.json index 6326e83a95..525f0ef11e 100644 --- a/packages/lockfile-types/package.json +++ b/packages/lockfile-types/package.json @@ -33,5 +33,8 @@ }, "devDependencies": { "@pnpm/lockfile-types": "workspace:3.2.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/lockfile-utils/package.json b/packages/lockfile-utils/package.json index 9dff79b93b..b6125fd1df 100644 --- a/packages/lockfile-utils/package.json +++ b/packages/lockfile-utils/package.json @@ -46,5 +46,8 @@ "get-npm-tarball-url": "^2.0.3", "ramda": "^0.27.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/lockfile-walker/package.json b/packages/lockfile-walker/package.json index cd6dc51c82..e956387696 100644 --- a/packages/lockfile-walker/package.json +++ b/packages/lockfile-walker/package.json @@ -40,5 +40,8 @@ "dependency-path": "workspace:8.0.11", "ramda": "^0.27.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/make-dedicated-lockfile/package.json b/packages/make-dedicated-lockfile/package.json index fde873507d..637ac75690 100644 --- a/packages/make-dedicated-lockfile/package.json +++ b/packages/make-dedicated-lockfile/package.json @@ -49,5 +49,8 @@ "@pnpm/make-dedicated-lockfile": "workspace:0.2.25", "@pnpm/test-fixtures": "workspace:*", "@types/ramda": "0.27.39" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/manifest-utils/package.json b/packages/manifest-utils/package.json index 92b577243b..2d7eb8c4b3 100644 --- a/packages/manifest-utils/package.json +++ b/packages/manifest-utils/package.json @@ -36,5 +36,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/manifest-utils": "workspace:2.1.9" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/matcher/package.json b/packages/matcher/package.json index 901e31822a..1f30338450 100644 --- a/packages/matcher/package.json +++ b/packages/matcher/package.json @@ -37,5 +37,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/matcher": "workspace:2.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/merge-lockfile-changes/package.json b/packages/merge-lockfile-changes/package.json index f6bee99ca7..06b3da8a54 100644 --- a/packages/merge-lockfile-changes/package.json +++ b/packages/merge-lockfile-changes/package.json @@ -41,5 +41,8 @@ "@pnpm/merge-lockfile-changes": "workspace:2.0.8", "@types/ramda": "0.27.39", "@types/semver": "^7.3.4" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/modules-cleaner/package.json b/packages/modules-cleaner/package.json index a0c47d05c2..c41424955b 100644 --- a/packages/modules-cleaner/package.json +++ b/packages/modules-cleaner/package.json @@ -48,5 +48,8 @@ "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/modules-yaml/package.json b/packages/modules-yaml/package.json index afcb425708..1099e378bb 100644 --- a/packages/modules-yaml/package.json +++ b/packages/modules-yaml/package.json @@ -41,5 +41,8 @@ "@types/is-windows": "^1.0.0", "tempy": "^1.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/mount-modules/package.json b/packages/mount-modules/package.json index eb12bf5635..6a4641d853 100644 --- a/packages/mount-modules/package.json +++ b/packages/mount-modules/package.json @@ -55,5 +55,8 @@ "funding": "https://opencollective.com/pnpm", "optionalDependencies": { "fuse-native": "^2.2.6" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/normalize-registries/package.json b/packages/normalize-registries/package.json index c79734d1b2..0076fb5b0a 100644 --- a/packages/normalize-registries/package.json +++ b/packages/normalize-registries/package.json @@ -33,5 +33,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/normalize-registries": "workspace:2.0.13" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/npm-registry-agent/package.json b/packages/npm-registry-agent/package.json index 4008f3aff8..a1f35975f5 100644 --- a/packages/npm-registry-agent/package.json +++ b/packages/npm-registry-agent/package.json @@ -43,5 +43,8 @@ "funding": "https://opencollective.com/pnpm", "keywords": [ "pnpm7" - ] + ], + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/npm-resolver/package.json b/packages/npm-resolver/package.json index 7c5905124b..66895ddffd 100644 --- a/packages/npm-resolver/package.json +++ b/packages/npm-resolver/package.json @@ -68,5 +68,8 @@ "path-exists": "^4.0.0", "tempy": "^1.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/npm-resolver/src/index.ts b/packages/npm-resolver/src/index.ts index 86c70296fe..b1e1711e8c 100644 --- a/packages/npm-resolver/src/index.ts +++ b/packages/npm-resolver/src/index.ts @@ -43,8 +43,10 @@ export class NoMatchingVersionError extends PnpmError { } export { + parsePref, PackageMeta, PackageMetaCache, + RegistryPackageSpec, RegistryResponseError, } diff --git a/packages/outdated/package.json b/packages/outdated/package.json index 85ce050df7..80f6c3fe1f 100644 --- a/packages/outdated/package.json +++ b/packages/outdated/package.json @@ -57,5 +57,8 @@ "@types/semver": "^7.3.4", "npm-run-all": "^4.1.5" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/package-bins/package.json b/packages/package-bins/package.json index 5089dc5738..5f08907e23 100644 --- a/packages/package-bins/package.json +++ b/packages/package-bins/package.json @@ -39,5 +39,8 @@ "@pnpm/package-bins": "workspace:5.0.12", "@types/node": "^14.17.32" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/package-is-installable/package.json b/packages/package-is-installable/package.json index 2c0095d0b5..fa587237d3 100644 --- a/packages/package-is-installable/package.json +++ b/packages/package-is-installable/package.json @@ -44,5 +44,8 @@ "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/package-requester/package.json b/packages/package-requester/package.json index c903ab4e6d..a509ecf3d2 100644 --- a/packages/package-requester/package.json +++ b/packages/package-requester/package.json @@ -75,5 +75,8 @@ "normalize-path": "^3.0.0", "tempy": "^1.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/package-store/package.json b/packages/package-store/package.json index ce7d96ba77..3817cca1d6 100644 --- a/packages/package-store/package.json +++ b/packages/package-store/package.json @@ -73,5 +73,8 @@ "prepublishOnly": "pnpm run compile", "compile": "tsc --build && pnpm run lint --fix" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/parse-cli-args/package.json b/packages/parse-cli-args/package.json index 8a7146fb60..a04ded97ab 100644 --- a/packages/parse-cli-args/package.json +++ b/packages/parse-cli-args/package.json @@ -39,5 +39,8 @@ "@pnpm/nopt": "^0.2.1", "didyoumean2": "^5.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/parse-overrides/package.json b/packages/parse-overrides/package.json index ceda0c52c6..11a095eaac 100644 --- a/packages/parse-overrides/package.json +++ b/packages/parse-overrides/package.json @@ -34,5 +34,8 @@ }, "devDependencies": { "@pnpm/parse-overrides": "workspace:1.0.1" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/parse-wanted-dependency/package.json b/packages/parse-wanted-dependency/package.json index 4835ad5180..c43755ff3f 100644 --- a/packages/parse-wanted-dependency/package.json +++ b/packages/parse-wanted-dependency/package.json @@ -33,5 +33,8 @@ "validate-npm-package-name": "3.0.0" }, "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/parse-wanted-dependency#readme", - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/pick-registry-for-package/package.json b/packages/pick-registry-for-package/package.json index a2a67c4f97..b1a7b877d7 100644 --- a/packages/pick-registry-for-package/package.json +++ b/packages/pick-registry-for-package/package.json @@ -33,5 +33,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/pick-registry-for-package": "workspace:2.0.11" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/pkgs-graph/package.json b/packages/pkgs-graph/package.json index a60aeeb688..89c51e7896 100644 --- a/packages/pkgs-graph/package.json +++ b/packages/pkgs-graph/package.json @@ -37,5 +37,8 @@ "funding": "https://opencollective.com/pnpm", "keywords": [ "pnpm7" - ] + ], + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-audit/package.json b/packages/plugin-commands-audit/package.json index 09b3c6cb67..f17286438f 100644 --- a/packages/plugin-commands-audit/package.json +++ b/packages/plugin-commands-audit/package.json @@ -54,5 +54,8 @@ "ramda": "^0.27.1", "render-help": "^1.0.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-env/package.json b/packages/plugin-commands-env/package.json index e49e8344bd..de4e32011f 100644 --- a/packages/plugin-commands-env/package.json +++ b/packages/plugin-commands-env/package.json @@ -57,5 +57,8 @@ "nock": "12.0.3", "node-fetch": "3.0.0-beta.9", "path-name": "^1.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/plugin-commands-init/package.json b/packages/plugin-commands-init/package.json index 5e4c4322c8..68feeda9a2 100644 --- a/packages/plugin-commands-init/package.json +++ b/packages/plugin-commands-init/package.json @@ -44,5 +44,8 @@ "camelcase-keys": "^6.2.2", "render-help": "^1.0.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-installation/package.json b/packages/plugin-commands-installation/package.json index cec8e53eb5..2f710d1b3a 100644 --- a/packages/plugin-commands-installation/package.json +++ b/packages/plugin-commands-installation/package.json @@ -108,5 +108,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-installation/src/installDeps.ts b/packages/plugin-commands-installation/src/installDeps.ts index b750d2101b..f11f103bac 100644 --- a/packages/plugin-commands-installation/src/installDeps.ts +++ b/packages/plugin-commands-installation/src/installDeps.ts @@ -7,7 +7,7 @@ import { Config } from '@pnpm/config' import PnpmError from '@pnpm/error' import { filterPkgsBySelectorObjects } from '@pnpm/filter-workspace-packages' import findWorkspacePackages, { arrayOfWorkspacePackagesToMap } from '@pnpm/find-workspace-packages' -import { rebuild } from '@pnpm/plugin-commands-rebuild/lib/implementation' +import { rebuildProjects } from '@pnpm/plugin-commands-rebuild' import { createOrConnectStoreController, CreateStoreControllerOptions } from '@pnpm/store-connection-manager' import { IncludedDependencies, Project } from '@pnpm/types' import { @@ -285,7 +285,7 @@ when running add/update with the --workspace option') if (opts.ignoreScripts) return - await rebuild( + await rebuildProjects( [ { buildIndex: 0, diff --git a/packages/plugin-commands-listing/package.json b/packages/plugin-commands-listing/package.json index 9508be83f0..6086ef203f 100644 --- a/packages/plugin-commands-listing/package.json +++ b/packages/plugin-commands-listing/package.json @@ -57,5 +57,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-outdated/package.json b/packages/plugin-commands-outdated/package.json index ccf355b5ba..50d1871fb2 100644 --- a/packages/plugin-commands-outdated/package.json +++ b/packages/plugin-commands-outdated/package.json @@ -67,5 +67,8 @@ "strip-ansi": "^6.0.0", "wrap-ansi": "^7.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-publishing/package.json b/packages/plugin-commands-publishing/package.json index d41752cf0d..9aed5eabe9 100644 --- a/packages/plugin-commands-publishing/package.json +++ b/packages/plugin-commands-publishing/package.json @@ -83,5 +83,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-rebuild/package.json b/packages/plugin-commands-rebuild/package.json index 05ecebc162..5b050f0d84 100644 --- a/packages/plugin-commands-rebuild/package.json +++ b/packages/plugin-commands-rebuild/package.json @@ -81,5 +81,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-rebuild/src/implementation/index.ts b/packages/plugin-commands-rebuild/src/implementation/index.ts index ea92b0c07f..e375705f4f 100644 --- a/packages/plugin-commands-rebuild/src/implementation/index.ts +++ b/packages/plugin-commands-rebuild/src/implementation/index.ts @@ -76,7 +76,7 @@ type PackageSelector = string | { range: string } -export async function rebuildPkgs ( +export async function rebuildSelectedPkgs ( projects: Array<{ manifest: ProjectManifest, rootDir: string }>, pkgSpecs: string[], maybeOpts: RebuildOptions @@ -122,7 +122,7 @@ export async function rebuildPkgs ( ) } -export async function rebuild ( +export async function rebuildProjects ( projects: Array<{ buildIndex: number, manifest: ProjectManifest, rootDir: string }>, maybeOpts: RebuildOptions ) { diff --git a/packages/plugin-commands-rebuild/src/index.ts b/packages/plugin-commands-rebuild/src/index.ts index c0ca0f9f9d..18581a0f66 100644 --- a/packages/plugin-commands-rebuild/src/index.ts +++ b/packages/plugin-commands-rebuild/src/index.ts @@ -1,3 +1,5 @@ import * as rebuild from './rebuild' export { rebuild } + +export { rebuildProjects, rebuildSelectedPkgs } from './implementation' diff --git a/packages/plugin-commands-rebuild/src/rebuild.ts b/packages/plugin-commands-rebuild/src/rebuild.ts index c51aee76e5..4dd051e654 100644 --- a/packages/plugin-commands-rebuild/src/rebuild.ts +++ b/packages/plugin-commands-rebuild/src/rebuild.ts @@ -9,8 +9,8 @@ import { import pick from 'ramda/src/pick' import renderHelp from 'render-help' import { - rebuild, - rebuildPkgs, + rebuildProjects, + rebuildSelectedPkgs, } from './implementation' import recursive from './recursive' @@ -102,7 +102,7 @@ export async function handler ( }) if (params.length === 0) { - await rebuild( + await rebuildProjects( [ { buildIndex: 0, @@ -113,7 +113,7 @@ export async function handler ( rebuildOpts ) } - await rebuildPkgs( + await rebuildSelectedPkgs( [ { manifest: await readProjectManifestOnly(rebuildOpts.dir, opts), diff --git a/packages/plugin-commands-rebuild/src/recursive.ts b/packages/plugin-commands-rebuild/src/recursive.ts index ab251c01e7..277220c2b5 100755 --- a/packages/plugin-commands-rebuild/src/recursive.ts +++ b/packages/plugin-commands-rebuild/src/recursive.ts @@ -15,7 +15,7 @@ import camelcaseKeys from 'camelcase-keys' import mem from 'mem' import pLimit from 'p-limit' import readIniFile from 'read-ini-file' -import { rebuild as rebuildAll, RebuildOptions, rebuildPkgs } from './implementation' +import { rebuildProjects as rebuildAll, RebuildOptions, rebuildSelectedPkgs } from './implementation' type RecursiveRebuildOpts = CreateStoreControllerOptions & Pick rebuildPkgs(importers, params, opts) // eslint-disable-line + : (importers: any, opts: any) => rebuildSelectedPkgs(importers, params, opts) // eslint-disable-line ) if (opts.lockfileDir) { const importers = await getImporters() diff --git a/packages/plugin-commands-script-runners/package.json b/packages/plugin-commands-script-runners/package.json index 4b3d7b3cb1..cf3eedb1d1 100644 --- a/packages/plugin-commands-script-runners/package.json +++ b/packages/plugin-commands-script-runners/package.json @@ -66,5 +66,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-server/package.json b/packages/plugin-commands-server/package.json index f12ba8ade8..963fa0c537 100644 --- a/packages/plugin-commands-server/package.json +++ b/packages/plugin-commands-server/package.json @@ -57,5 +57,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/plugin-commands-setup/package.json b/packages/plugin-commands-setup/package.json index ae2b0230ba..9b3373f408 100644 --- a/packages/plugin-commands-setup/package.json +++ b/packages/plugin-commands-setup/package.json @@ -42,5 +42,8 @@ "@pnpm/logger": "^4.0.0", "@pnpm/plugin-commands-setup": "workspace:1.1.35", "@pnpm/prepare": "workspace:*" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/plugin-commands-store/package.json b/packages/plugin-commands-store/package.json index 5af992de4f..6280e07ca3 100644 --- a/packages/plugin-commands-store/package.json +++ b/packages/plugin-commands-store/package.json @@ -73,5 +73,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/pnpm/package.json b/packages/pnpm/package.json index 3083290256..5c3a56874f 100644 --- a/packages/pnpm/package.json +++ b/packages/pnpm/package.json @@ -168,5 +168,8 @@ "./dist/node_modules/node-gyp/bin/node-gyp.js" ] }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./package.json" + } } diff --git a/packages/pnpmfile/package.json b/packages/pnpmfile/package.json index 714c3a11d7..6a40027eb4 100644 --- a/packages/pnpmfile/package.json +++ b/packages/pnpmfile/package.json @@ -43,5 +43,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/prepare-package/package.json b/packages/prepare-package/package.json index 40214af69e..b67fdfa828 100644 --- a/packages/prepare-package/package.json +++ b/packages/prepare-package/package.json @@ -37,5 +37,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/prepare-package": "workspace:1.0.13" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/prune-lockfile/package.json b/packages/prune-lockfile/package.json index 70952435f7..5fef1f1579 100644 --- a/packages/prune-lockfile/package.json +++ b/packages/prune-lockfile/package.json @@ -42,5 +42,8 @@ "dependency-path": "workspace:8.0.11", "ramda": "^0.27.1" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/read-modules-dir/package.json b/packages/read-modules-dir/package.json index f25bde12ab..ce12a6d7a8 100644 --- a/packages/read-modules-dir/package.json +++ b/packages/read-modules-dir/package.json @@ -33,5 +33,8 @@ }, "devDependencies": { "@pnpm/read-modules-dir": "workspace:3.0.1" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/read-package-json/package.json b/packages/read-package-json/package.json index a2deb67c2a..1929bd92d8 100644 --- a/packages/read-package-json/package.json +++ b/packages/read-package-json/package.json @@ -38,5 +38,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/read-package-json": "workspace:5.0.12" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/read-project-manifest/package.json b/packages/read-project-manifest/package.json index b2bcb461e0..ae9521a2f0 100644 --- a/packages/read-project-manifest/package.json +++ b/packages/read-project-manifest/package.json @@ -49,5 +49,8 @@ "@types/parse-json": "^4.0.0", "tempy": "^1.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/read-projects-context/package.json b/packages/read-projects-context/package.json index a4704c14d4..45f44602bc 100644 --- a/packages/read-projects-context/package.json +++ b/packages/read-projects-context/package.json @@ -41,5 +41,8 @@ "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/real-hoist/package.json b/packages/real-hoist/package.json index 597c2694e0..cecde1d6f8 100644 --- a/packages/real-hoist/package.json +++ b/packages/real-hoist/package.json @@ -40,5 +40,8 @@ "@pnpm/lockfile-file": "workspace:4.3.1", "@pnpm/logger": "^4.0.0", "@pnpm/real-hoist": "workspace:0.1.8" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/remove-bins/package.json b/packages/remove-bins/package.json index 4270d97511..dbf2d1e537 100644 --- a/packages/remove-bins/package.json +++ b/packages/remove-bins/package.json @@ -45,5 +45,8 @@ "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/render-peer-issues/package.json b/packages/render-peer-issues/package.json index ec7e0fd07a..b9ae8d0264 100644 --- a/packages/render-peer-issues/package.json +++ b/packages/render-peer-issues/package.json @@ -38,5 +38,8 @@ "@pnpm/render-peer-issues": "workspace:1.1.2", "@types/archy": "0.0.31", "strip-ansi": "^6.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/resolve-dependencies/package.json b/packages/resolve-dependencies/package.json index 262ce782cc..8f42b93bc7 100644 --- a/packages/resolve-dependencies/package.json +++ b/packages/resolve-dependencies/package.json @@ -65,5 +65,8 @@ "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/resolve-dependencies/src/index.ts b/packages/resolve-dependencies/src/index.ts index d56e5add37..8dcd2c39fe 100644 --- a/packages/resolve-dependencies/src/index.ts +++ b/packages/resolve-dependencies/src/index.ts @@ -20,6 +20,7 @@ import { Registries, } from '@pnpm/types' import difference from 'ramda/src/difference' +import getWantedDependencies, { WantedDependency } from './getWantedDependencies' import depPathToRef from './depPathToRef' import resolveDependencyTree, { Importer, @@ -41,8 +42,11 @@ export type DependenciesGraph = GenericDependenciesGraph export type DependenciesGraphNode = GenericDependenciesGraphNode & ResolvedPackage export { + getWantedDependencies, LinkedDependency, ResolvedPackage, + PinnedVersion, + WantedDependency, } interface ProjectToLink { diff --git a/packages/resolve-dependencies/src/wantedDepIsLocallyAvailable.ts b/packages/resolve-dependencies/src/wantedDepIsLocallyAvailable.ts index ee6e46c0c2..3e026ec3ce 100644 --- a/packages/resolve-dependencies/src/wantedDepIsLocallyAvailable.ts +++ b/packages/resolve-dependencies/src/wantedDepIsLocallyAvailable.ts @@ -1,4 +1,4 @@ -import parsePref, { RegistryPackageSpec } from '@pnpm/npm-resolver/lib/parsePref' +import { parsePref, RegistryPackageSpec } from '@pnpm/npm-resolver' import { WorkspacePackages } from '@pnpm/resolver-base' import { PackageManifest } from '@pnpm/types' import semver from 'semver' diff --git a/packages/resolve-workspace-range/package.json b/packages/resolve-workspace-range/package.json index 320be2c5a3..a3906d5b6a 100644 --- a/packages/resolve-workspace-range/package.json +++ b/packages/resolve-workspace-range/package.json @@ -34,5 +34,8 @@ "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/resolver-base/package.json b/packages/resolver-base/package.json index 81e0e39d83..cd1c73546e 100644 --- a/packages/resolver-base/package.json +++ b/packages/resolver-base/package.json @@ -35,5 +35,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/resolver-base": "workspace:8.1.6" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/run-npm/package.json b/packages/run-npm/package.json index c27422d708..d98ec71ad7 100644 --- a/packages/run-npm/package.json +++ b/packages/run-npm/package.json @@ -34,5 +34,8 @@ "cross-spawn": "^7.0.3", "path-name": "^1.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/server/package.json b/packages/server/package.json index fa2e49ca7c..d6b0569fc1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -55,5 +55,8 @@ "promise-share": "^1.0.0", "uuid": "^3.4.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/sort-packages/package.json b/packages/sort-packages/package.json index 8202f3193f..d7dc05c7af 100644 --- a/packages/sort-packages/package.json +++ b/packages/sort-packages/package.json @@ -34,5 +34,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/sort-packages": "workspace:2.1.8" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/store-connection-manager/package.json b/packages/store-connection-manager/package.json index 534e783ce7..1ce6683783 100644 --- a/packages/store-connection-manager/package.json +++ b/packages/store-connection-manager/package.json @@ -47,5 +47,8 @@ "peerDependencies": { "@pnpm/logger": "^4.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/store-controller-types/package.json b/packages/store-controller-types/package.json index a34cf0214a..9939a4f44a 100644 --- a/packages/store-controller-types/package.json +++ b/packages/store-controller-types/package.json @@ -36,5 +36,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/store-controller-types": "workspace:12.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/symlink-dependency/package.json b/packages/symlink-dependency/package.json index 475360b13d..95ef075c76 100644 --- a/packages/symlink-dependency/package.json +++ b/packages/symlink-dependency/package.json @@ -43,5 +43,8 @@ "@pnpm/types": "workspace:7.10.0", "symlink-dir": "^5.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/tarball-fetcher/package.json b/packages/tarball-fetcher/package.json index 9932883529..0ae9db69cd 100644 --- a/packages/tarball-fetcher/package.json +++ b/packages/tarball-fetcher/package.json @@ -55,5 +55,8 @@ "nock": "12.0.3", "tempy": "^1.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } } diff --git a/packages/tarball-resolver/package.json b/packages/tarball-resolver/package.json index 9517621f73..87792d1897 100644 --- a/packages/tarball-resolver/package.json +++ b/packages/tarball-resolver/package.json @@ -34,5 +34,8 @@ ], "devDependencies": { "@pnpm/tarball-resolver": "workspace:5.0.11" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/types/package.json b/packages/types/package.json index 6446ceb47b..a674dc092f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -31,5 +31,8 @@ "funding": "https://opencollective.com/pnpm", "devDependencies": { "@pnpm/types": "workspace:7.10.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/which-version-is-pinned/package.json b/packages/which-version-is-pinned/package.json index 42fc868bc6..166240662a 100644 --- a/packages/which-version-is-pinned/package.json +++ b/packages/which-version-is-pinned/package.json @@ -33,5 +33,8 @@ }, "devDependencies": { "@pnpm/which-version-is-pinned": "workspace:1.0.0" + }, + "exports": { + ".": "./lib/index.js" } } diff --git a/packages/write-project-manifest/package.json b/packages/write-project-manifest/package.json index 1087e5278f..c3a51589e1 100644 --- a/packages/write-project-manifest/package.json +++ b/packages/write-project-manifest/package.json @@ -40,5 +40,8 @@ "@types/write-file-atomic": "^3.0.1", "tempy": "^1.0.0" }, - "funding": "https://opencollective.com/pnpm" + "funding": "https://opencollective.com/pnpm", + "exports": { + ".": "./lib/index.js" + } }