feat: prevent deep imports using exports (#4440)

.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',
+    },
   }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

packages/command/package.json

@@ -30,5 +30,8 @@
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
     "@pnpm/command": "workspace:2.0.0"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
   }
 }

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"
+  }
 }

packages/constants/package.json

@@ -31,5 +31,8 @@
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
     "@pnpm/constants": "workspace:5.0.0"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
+  }
 }

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"
+  }
 }

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'

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'

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
   }
 }

packages/error/package.json

@@ -34,5 +34,8 @@
   },
   "dependencies": {
     "@pnpm/constants": "workspace:5.0.0"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
+  }
 }

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"
+  }
 }

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"
   }
 }

packages/fetching-types/package.json

@@ -35,5 +35,8 @@
   },
   "devDependencies": {
     "@pnpm/fetching-types": "workspace:2.2.1"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
   }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

packages/link-bins/package.json

@@ -61,5 +61,8 @@
   "funding": "https://opencollective.com/pnpm",
   "peerDependencies": {
     "@pnpm/logger": "^4.0.0"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

packages/lockfile-types/package.json

@@ -33,5 +33,8 @@
   },
   "devDependencies": {
     "@pnpm/lockfile-types": "workspace:3.2.0"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
+  }
 }

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"
+  }
 }

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"
   }
 }

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"
   }
 }

packages/matcher/package.json

@@ -37,5 +37,8 @@
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
     "@pnpm/matcher": "workspace:2.0.0"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
   }
 }

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"
+  }
 }

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"
+  }
 }

packages/mount-modules/package.json

@@ -55,5 +55,8 @@
   "funding": "https://opencollective.com/pnpm",
   "optionalDependencies": {
     "fuse-native": "^2.2.6"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
   }
 }

packages/npm-registry-agent/package.json

@@ -43,5 +43,8 @@
   "funding": "https://opencollective.com/pnpm",
   "keywords": [
     "pnpm7"
-  ]
+  ],
+  "exports": {
+    ".": "./lib/index.js"
+  }
 }

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"
+  }
 }

packages/npm-resolver/src/index.ts

@@ -43,8 +43,10 @@ export class NoMatchingVersionError extends PnpmError {
 }
 
 export {
+  parsePref,
   PackageMeta,
   PackageMetaCache,
+  RegistryPackageSpec,
   RegistryResponseError,
 }
 

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

packages/parse-overrides/package.json

@@ -34,5 +34,8 @@
   },
   "devDependencies": {
     "@pnpm/parse-overrides": "workspace:1.0.1"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
+  }
 }

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"
   }
 }

packages/pkgs-graph/package.json

@@ -37,5 +37,8 @@
   "funding": "https://opencollective.com/pnpm",
   "keywords": [
     "pnpm7"
-  ]
+  ],
+  "exports": {
+    ".": "./lib/index.js"
+  }
 }

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"
+  }
 }

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"
   }
 }

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"
+  }
 }

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"
+  }
 }

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,

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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
 ) {

packages/plugin-commands-rebuild/src/index.ts

@@ -1,3 +1,5 @@
 import * as rebuild from './rebuild'
 
 export { rebuild }
+
+export { rebuildProjects, rebuildSelectedPkgs } from './implementation'

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),

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<Config,
 | 'hoistPattern'
@@ -100,7 +100,7 @@ export default async function recursive (
   const rebuild = (
     params.length === 0
       ? rebuildAll
-    : (importers: any, opts: any) => 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()

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"
+  }
 }

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"
+  }
 }

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"
   }
 }

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"
+  }
 }

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"
+  }
 }

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"
+  }
 }

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"
   }
 }

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"
+  }
 }

packages/read-modules-dir/package.json

@@ -33,5 +33,8 @@
   },
   "devDependencies": {
     "@pnpm/read-modules-dir": "workspace:3.0.1"
+  },
+  "exports": {
+    ".": "./lib/index.js"
   }
 }

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"
   }
 }

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"
+  }
 }

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"
+  }
 }

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"
   }
 }

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"
+  }
 }

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"
   }
 }

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"
+  }
 }

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<ResolvedPackage>
 export type DependenciesGraphNode = GenericDependenciesGraphNode & ResolvedPackage
 
 export {
+  getWantedDependencies,
   LinkedDependency,
   ResolvedPackage,
+  PinnedVersion,
+  WantedDependency,
 }
 
 interface ProjectToLink {

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'

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"
+  }
 }