diff --git a/.changeset/fifty-olives-travel.md b/.changeset/fifty-olives-travel.md new file mode 100644 index 0000000000..ef5236b4bb --- /dev/null +++ b/.changeset/fifty-olives-travel.md @@ -0,0 +1,5 @@ +--- +"@pnpm/workspace.pkgs-graph": major +--- + +Project renamed from `pkgs-graph` to `@pnpm/workspace.pkgs-graph`. diff --git a/.changeset/heavy-hairs-shop.md b/.changeset/heavy-hairs-shop.md new file mode 100644 index 0000000000..3cb5082331 --- /dev/null +++ b/.changeset/heavy-hairs-shop.md @@ -0,0 +1,5 @@ +--- +"@pnpm/dependency-path": major +--- + +Project renamed from `dependency-path` to `@pnpm/dependency-path`. diff --git a/.changeset/little-pugs-decide.md b/.changeset/little-pugs-decide.md new file mode 100644 index 0000000000..3602d0ece5 --- /dev/null +++ b/.changeset/little-pugs-decide.md @@ -0,0 +1,5 @@ +--- +"@pnpm/reviewing.dependencies-hierarchy": major +--- + +Project renamed from `dependencies-hierarchy` to `@pnpm/reviewing.dependencies-hierarchy`. diff --git a/.changeset/silly-walls-nail.md b/.changeset/silly-walls-nail.md new file mode 100644 index 0000000000..63050e13ee --- /dev/null +++ b/.changeset/silly-walls-nail.md @@ -0,0 +1,5 @@ +--- +"@pnpm/fs.find-packages": major +--- + +Project renamed from `find-packages` to `@pnpm/fs.find-packages`. diff --git a/exec/plugin-commands-rebuild/package.json b/exec/plugin-commands-rebuild/package.json index 48cd8b35d0..2e0b01dbae 100644 --- a/exec/plugin-commands-rebuild/package.json +++ b/exec/plugin-commands-rebuild/package.json @@ -66,7 +66,7 @@ "@pnpm/store-connection-manager": "workspace:*", "@pnpm/store-controller-types": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "load-json-file": "^6.2.0", "mem": "^8.1.1", "p-limit": "^3.1.0", diff --git a/exec/plugin-commands-rebuild/src/implementation/index.ts b/exec/plugin-commands-rebuild/src/implementation/index.ts index 817760f143..ffd0a67ea5 100644 --- a/exec/plugin-commands-rebuild/src/implementation/index.ts +++ b/exec/plugin-commands-rebuild/src/implementation/index.ts @@ -21,7 +21,7 @@ import { logger, streamParser } from '@pnpm/logger' import { writeModulesManifest } from '@pnpm/modules-yaml' import { createOrConnectStoreController } from '@pnpm/store-connection-manager' import { ProjectManifest } from '@pnpm/types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import runGroups from 'run-groups' import graphSequencer from '@pnpm/graph-sequencer' import npa from '@pnpm/npm-package-arg' diff --git a/fs/find-packages/CHANGELOG.md b/fs/find-packages/CHANGELOG.md deleted file mode 100644 index 5622fe55c7..0000000000 --- a/fs/find-packages/CHANGELOG.md +++ /dev/null @@ -1,398 +0,0 @@ -# find-packages - -## 10.0.4 - -### Patch Changes - -- @pnpm/read-project-manifest@4.1.1 - -## 10.0.3 - -### Patch Changes - -- Updated dependencies [fec9e3149] -- Updated dependencies [0d12d38fd] - - @pnpm/read-project-manifest@4.1.0 - -## 10.0.2 - -### Patch Changes - -- 2e9790722: Use deterministic sorting. -- Updated dependencies [702e847c1] - - @pnpm/types@8.9.0 - - @pnpm/read-project-manifest@4.0.2 - -## 10.0.1 - -### Patch Changes - -- Updated dependencies [844e82f3a] - - @pnpm/types@8.8.0 - - @pnpm/read-project-manifest@4.0.1 - -## 10.0.0 - -### Major Changes - -- 043d988fc: Breaking change to the API. Defaul export is not used. -- f884689e0: Require `@pnpm/logger` v5. - -### Patch Changes - -- Updated dependencies [f884689e0] - - @pnpm/read-project-manifest@4.0.0 - -## 9.0.13 - -### Patch Changes - -- @pnpm/read-project-manifest@3.0.13 - -## 9.0.12 - -### Patch Changes - -- @pnpm/read-project-manifest@3.0.12 - -## 9.0.11 - -### Patch Changes - -- Updated dependencies [d665f3ff7] - - @pnpm/types@8.7.0 - - @pnpm/read-project-manifest@3.0.11 - -## 9.0.10 - -### Patch Changes - -- Updated dependencies [156cc1ef6] - - @pnpm/types@8.6.0 - - @pnpm/read-project-manifest@3.0.10 - -## 9.0.9 - -### Patch Changes - -- Updated dependencies [39c040127] - - @pnpm/read-project-manifest@3.0.9 - -## 9.0.8 - -### Patch Changes - -- Updated dependencies [c90798461] - - @pnpm/types@8.5.0 - - @pnpm/read-project-manifest@3.0.8 - -## 9.0.7 - -### Patch Changes - -- Updated dependencies [01c5834bf] - - @pnpm/read-project-manifest@3.0.7 - -## 9.0.6 - -### Patch Changes - -- Updated dependencies [8e5b77ef6] - - @pnpm/types@8.4.0 - - @pnpm/read-project-manifest@3.0.6 - -## 9.0.5 - -### Patch Changes - -- Updated dependencies [2a34b21ce] - - @pnpm/types@8.3.0 - - @pnpm/read-project-manifest@3.0.5 - -## 9.0.4 - -### Patch Changes - -- Updated dependencies [fb5bbfd7a] - - @pnpm/types@8.2.0 - - @pnpm/read-project-manifest@3.0.4 - -## 9.0.3 - -### Patch Changes - -- Updated dependencies [4d39e4a0c] - - @pnpm/types@8.1.0 - - @pnpm/read-project-manifest@3.0.3 - -## 9.0.2 - -### Patch Changes - -- Updated dependencies [18ba5e2c0] - - @pnpm/types@8.0.1 - - @pnpm/read-project-manifest@3.0.2 - -## 9.0.1 - -### Patch Changes - -- @pnpm/read-project-manifest@3.0.1 - -## 9.0.0 - -### Major Changes - -- 542014839: Node.js 12 is not supported. - -### Patch Changes - -- Updated dependencies [d504dc380] -- Updated dependencies [542014839] - - @pnpm/types@8.0.0 - - @pnpm/read-project-manifest@3.0.0 - -## 8.0.13 - -### Patch Changes - -- @pnpm/read-project-manifest@2.0.13 - -## 8.0.12 - -### Patch Changes - -- Updated dependencies [b138d048c] - - @pnpm/types@7.10.0 - - @pnpm/read-project-manifest@2.0.12 - -## 8.0.11 - -### Patch Changes - -- Updated dependencies [26cd01b88] - - @pnpm/types@7.9.0 - - @pnpm/read-project-manifest@2.0.11 - -## 8.0.10 - -### Patch Changes - -- Updated dependencies [b5734a4a7] - - @pnpm/types@7.8.0 - - @pnpm/read-project-manifest@2.0.10 - -## 8.0.9 - -### Patch Changes - -- Updated dependencies [6493e0c93] - - @pnpm/types@7.7.1 - - @pnpm/read-project-manifest@2.0.9 - -## 8.0.8 - -### Patch Changes - -- Updated dependencies [ba9b2eba1] - - @pnpm/types@7.7.0 - - @pnpm/read-project-manifest@2.0.8 - -## 8.0.7 - -### Patch Changes - -- Updated dependencies [302ae4f6f] - - @pnpm/types@7.6.0 - - @pnpm/read-project-manifest@2.0.7 - -## 8.0.6 - -### Patch Changes - -- Updated dependencies [4ab87844a] - - @pnpm/types@7.5.0 - - @pnpm/read-project-manifest@2.0.6 - -## 8.0.5 - -### Patch Changes - -- Updated dependencies [b734b45ea] - - @pnpm/types@7.4.0 - - @pnpm/read-project-manifest@2.0.5 - -## 8.0.4 - -### Patch Changes - -- Updated dependencies [8e76690f4] - - @pnpm/types@7.3.0 - - @pnpm/read-project-manifest@2.0.4 - -## 8.0.3 - -### Patch Changes - -- Updated dependencies [724c5abd8] - - @pnpm/types@7.2.0 - - @pnpm/read-project-manifest@2.0.3 - -## 8.0.2 - -### Patch Changes - -- @pnpm/read-project-manifest@2.0.2 - -## 8.0.1 - -### Patch Changes - -- Updated dependencies [6e9c112af] -- Updated dependencies [97c64bae4] - - @pnpm/read-project-manifest@2.0.1 - - @pnpm/types@7.1.0 - -## 8.0.0 - -### Major Changes - -- 97b986fbc: Node.js 10 support is dropped. At least Node.js 12.17 is required for the package to work. - -### Patch Changes - -- Updated dependencies [97b986fbc] - - @pnpm/read-project-manifest@2.0.0 - - @pnpm/types@7.0.0 - -## 7.0.24 - -### Patch Changes - -- Updated dependencies [ad113645b] - - @pnpm/read-project-manifest@1.1.7 - -## 7.0.23 - -### Patch Changes - -- Updated dependencies [9ad8c27bf] - - @pnpm/types@6.4.0 - - @pnpm/read-project-manifest@1.1.6 - -## 7.0.22 - -### Patch Changes - -- @pnpm/read-project-manifest@1.1.5 - -## 7.0.21 - -### Patch Changes - -- @pnpm/read-project-manifest@1.1.4 - -## 7.0.20 - -### Patch Changes - -- @pnpm/read-project-manifest@1.1.3 - -## 7.0.19 - -### Patch Changes - -- Updated dependencies [b5d694e7f] - - @pnpm/types@6.3.1 - - @pnpm/read-project-manifest@1.1.2 - -## 7.0.18 - -### Patch Changes - -- Updated dependencies [d54043ee4] - - @pnpm/types@6.3.0 - - @pnpm/read-project-manifest@1.1.1 - -## 7.0.17 - -### Patch Changes - -- Updated dependencies [2762781cc] - - @pnpm/read-project-manifest@1.1.0 - -## 7.0.16 - -### Patch Changes - -- @pnpm/read-project-manifest@1.0.13 - -## 7.0.15 - -### Patch Changes - -- @pnpm/read-project-manifest@1.0.12 - -## 7.0.14 - -### Patch Changes - -- @pnpm/read-project-manifest@1.0.11 - -## 7.0.13 - -### Patch Changes - -- Updated dependencies [3bd3253e3] - - @pnpm/read-project-manifest@1.0.10 - -## 7.0.12 - -### Patch Changes - -- Updated dependencies [db17f6f7b] - - @pnpm/types@6.2.0 - - @pnpm/read-project-manifest@1.0.9 - -## 7.0.11 - -### Patch Changes - -- 1520e3d6f: Update fast-glob to v3.2.4 - -## 7.0.10 - -### Patch Changes - -- Updated dependencies [71a8c8ce3] - - @pnpm/types@6.1.0 - - @pnpm/read-project-manifest@1.0.8 - -## 7.0.9 - -### Patch Changes - -- Updated dependencies [57c510f00] - - @pnpm/read-project-manifest@1.0.7 - -## 7.0.8 - -### Patch Changes - -- Updated dependencies [da091c711] - - @pnpm/types@6.0.0 - - @pnpm/read-project-manifest@1.0.6 - -## 7.0.8-alpha.0 - -### Patch Changes - -- Updated dependencies [da091c71] - - @pnpm/types@6.0.0-alpha.0 - - @pnpm/read-project-manifest@1.0.6-alpha.0 - -## 7.0.7 - -### Patch Changes - -- @pnpm/read-project-manifest@1.0.5 diff --git a/fs/find-packages/README.md b/fs/find-packages/README.md index 880e9d5120..e7ed7c6097 100644 --- a/fs/find-packages/README.md +++ b/fs/find-packages/README.md @@ -1,22 +1,22 @@ -# find-packages +# @pnpm/fs.find-packages > Find all packages inside a directory -[![npm version](https://img.shields.io/npm/v/find-packages.svg)](https://www.npmjs.com/package/find-packages) +[![npm version](https://img.shields.io/npm/v/find-packages.svg)](https://www.npmjs.com/package/@pnpm/fs.find-packages) ## Installation ```sh -pnpm add find-packages +pnpm add @pnpm/fs.find-packages ``` ## Usage ```js const path = require('path') -const findPkgs = require('find-packages') +const findPkgs = require('@pnpm/fs.find-packages') findPkgs(path.join(__dirname, 'test', 'fixture')) .then(pkgs => console.log(pkgs)) diff --git a/fs/find-packages/example.js b/fs/find-packages/example.js index 1214141ccb..560c80015f 100644 --- a/fs/find-packages/example.js +++ b/fs/find-packages/example.js @@ -1,5 +1,5 @@ const path = require('path') -const findPkgs = require('find-packages') +const findPkgs = require('@pnpm/fs.find-packages') findPkgs(path.join(__dirname, 'test/fixtures/one-pkg')) .then(pkgs => console.log(pkgs)) diff --git a/fs/find-packages/package.json b/fs/find-packages/package.json index e358ade792..ffd843e07c 100644 --- a/fs/find-packages/package.json +++ b/fs/find-packages/package.json @@ -1,6 +1,6 @@ { - "name": "find-packages", - "version": "10.0.4", + "name": "@pnpm/fs.find-packages", + "version": "0.0.0", "description": "Find all packages inside a directory", "main": "lib/index.js", "files": [ @@ -38,7 +38,7 @@ }, "funding": "https://opencollective.com/pnpm", "devDependencies": { - "find-packages": "workspace:*" + "@pnpm/fs.find-packages": "workspace:*" }, "exports": { ".": "./lib/index.js" diff --git a/fs/find-packages/test/index.ts b/fs/find-packages/test/index.ts index c7ae81904d..4c59411232 100644 --- a/fs/find-packages/test/index.ts +++ b/fs/find-packages/test/index.ts @@ -1,6 +1,6 @@ /// import path from 'path' -import { findPackages } from 'find-packages' +import { findPackages } from '@pnpm/fs.find-packages' const fixtures = path.join(__dirname, 'fixtures') diff --git a/lockfile/filter-lockfile/package.json b/lockfile/filter-lockfile/package.json index 9322321379..627b24bee5 100644 --- a/lockfile/filter-lockfile/package.json +++ b/lockfile/filter-lockfile/package.json @@ -49,7 +49,7 @@ "@pnpm/lockfile-walker": "workspace:*", "@pnpm/package-is-installable": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "ramda": "npm:@pnpm/ramda@0.28.1" }, "funding": "https://opencollective.com/pnpm", diff --git a/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts b/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts index eeee19e113..adf6324e4a 100644 --- a/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts +++ b/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts @@ -8,7 +8,7 @@ import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils' import { logger } from '@pnpm/logger' import { packageIsInstallable } from '@pnpm/package-is-installable' import { DependenciesField } from '@pnpm/types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import mapValues from 'ramda/src/map' import pickBy from 'ramda/src/pickBy' import unnest from 'ramda/src/unnest' diff --git a/lockfile/lockfile-file/package.json b/lockfile/lockfile-file/package.json index 5780765ab1..bb76078b88 100644 --- a/lockfile/lockfile-file/package.json +++ b/lockfile/lockfile-file/package.json @@ -55,7 +55,7 @@ "@pnpm/util.lex-comparator": "1.0.0", "@zkochan/rimraf": "^2.1.2", "comver-to-semver": "^1.0.0", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "js-yaml": "npm:@zkochan/js-yaml@^0.0.6", "normalize-path": "^3.0.0", "ramda": "npm:@pnpm/ramda@0.28.1", diff --git a/lockfile/lockfile-file/src/write.ts b/lockfile/lockfile-file/src/write.ts index 3ffebe189c..5b013136fc 100644 --- a/lockfile/lockfile-file/src/write.ts +++ b/lockfile/lockfile-file/src/write.ts @@ -4,7 +4,7 @@ import { DEPENDENCIES_FIELDS } from '@pnpm/types' import { Lockfile, ProjectSnapshot } from '@pnpm/lockfile-types' import { WANTED_LOCKFILE } from '@pnpm/constants' import rimraf from '@zkochan/rimraf' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import yaml from 'js-yaml' import equals from 'ramda/src/equals' import pickBy from 'ramda/src/pickBy' diff --git a/lockfile/lockfile-to-pnp/package.json b/lockfile/lockfile-to-pnp/package.json index e1282cb4b1..1caf194d84 100644 --- a/lockfile/lockfile-to-pnp/package.json +++ b/lockfile/lockfile-to-pnp/package.json @@ -44,7 +44,7 @@ "@pnpm/lockfile-utils": "workspace:*", "@pnpm/types": "workspace:*", "@yarnpkg/pnp": "^2.3.2", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "normalize-path": "^3.0.0", "ramda": "npm:@pnpm/ramda@0.28.1" }, diff --git a/lockfile/lockfile-to-pnp/src/index.ts b/lockfile/lockfile-to-pnp/src/index.ts index 0012ca46dd..083a2bd367 100644 --- a/lockfile/lockfile-to-pnp/src/index.ts +++ b/lockfile/lockfile-to-pnp/src/index.ts @@ -5,7 +5,7 @@ import { nameVerFromPkgSnapshot, } from '@pnpm/lockfile-utils' import { Registries } from '@pnpm/types' -import { depPathToFilename, refToRelative } from 'dependency-path' +import { depPathToFilename, refToRelative } from '@pnpm/dependency-path' import { generateInlinedScript, PackageRegistry } from '@yarnpkg/pnp' import normalizePath from 'normalize-path' diff --git a/lockfile/lockfile-utils/package.json b/lockfile/lockfile-utils/package.json index b24cd8d699..cbb40db494 100644 --- a/lockfile/lockfile-utils/package.json +++ b/lockfile/lockfile-utils/package.json @@ -42,7 +42,7 @@ "@pnpm/lockfile-types": "workspace:*", "@pnpm/resolver-base": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "get-npm-tarball-url": "^2.0.3", "ramda": "npm:@pnpm/ramda@0.28.1" }, diff --git a/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts b/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts index 9015dea7e3..09e086497e 100644 --- a/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts +++ b/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts @@ -1,6 +1,6 @@ import path from 'path' import { Lockfile } from '@pnpm/lockfile-types' -import { depPathToFilename } from 'dependency-path' +import { depPathToFilename } from '@pnpm/dependency-path' import fromPairs from 'ramda/src/fromPairs' type GetLocalLocations = (depPath: string, pkgName: string) => string[] diff --git a/lockfile/lockfile-utils/src/index.ts b/lockfile/lockfile-utils/src/index.ts index ee743e551a..2263e8a042 100644 --- a/lockfile/lockfile-utils/src/index.ts +++ b/lockfile/lockfile-utils/src/index.ts @@ -1,4 +1,4 @@ -import { refToRelative } from 'dependency-path' +import { refToRelative } from '@pnpm/dependency-path' export { extendProjectsWithTargetDirs } from './extendProjectsWithTargetDirs' export { nameVerFromPkgSnapshot } from './nameVerFromPkgSnapshot' diff --git a/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts b/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts index 651a6219b1..2698758ec8 100644 --- a/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts +++ b/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts @@ -1,5 +1,5 @@ import { PackageSnapshot } from '@pnpm/lockfile-types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' export function nameVerFromPkgSnapshot ( depPath: string, diff --git a/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts b/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts index f26f07f9a5..70eb4dd674 100644 --- a/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts +++ b/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts @@ -1,6 +1,6 @@ import { PackageSnapshot } from '@pnpm/lockfile-types' import { Registries } from '@pnpm/types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' export function packageIdFromSnapshot ( depPath: string, diff --git a/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts b/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts index 4f53722c5c..625207267e 100644 --- a/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts +++ b/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts @@ -2,7 +2,7 @@ import url from 'url' import { PackageSnapshot } from '@pnpm/lockfile-types' import { Resolution } from '@pnpm/resolver-base' import { Registries } from '@pnpm/types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import getNpmTarballUrl from 'get-npm-tarball-url' import { nameVerFromPkgSnapshot } from './nameVerFromPkgSnapshot' diff --git a/lockfile/lockfile-walker/package.json b/lockfile/lockfile-walker/package.json index 3c2c34009f..9b87ad871b 100644 --- a/lockfile/lockfile-walker/package.json +++ b/lockfile/lockfile-walker/package.json @@ -37,7 +37,7 @@ "dependencies": { "@pnpm/lockfile-types": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "ramda": "npm:@pnpm/ramda@0.28.1" }, "funding": "https://opencollective.com/pnpm", diff --git a/lockfile/lockfile-walker/src/index.ts b/lockfile/lockfile-walker/src/index.ts index da9ffeea39..b2bc95b445 100644 --- a/lockfile/lockfile-walker/src/index.ts +++ b/lockfile/lockfile-walker/src/index.ts @@ -1,6 +1,6 @@ import { Lockfile, PackageSnapshot } from '@pnpm/lockfile-types' import { DependenciesField } from '@pnpm/types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' export interface LockedDependency { depPath: string diff --git a/lockfile/prune-lockfile/package.json b/lockfile/prune-lockfile/package.json index adc470d04d..9b6e586a9e 100644 --- a/lockfile/prune-lockfile/package.json +++ b/lockfile/prune-lockfile/package.json @@ -39,7 +39,7 @@ "@pnpm/constants": "workspace:*", "@pnpm/lockfile-types": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "ramda": "npm:@pnpm/ramda@0.28.1" }, "funding": "https://opencollective.com/pnpm", diff --git a/lockfile/prune-lockfile/src/index.ts b/lockfile/prune-lockfile/src/index.ts index 59934216ec..8d4eebee61 100644 --- a/lockfile/prune-lockfile/src/index.ts +++ b/lockfile/prune-lockfile/src/index.ts @@ -6,7 +6,7 @@ import { ResolvedDependencies, } from '@pnpm/lockfile-types' import { PackageManifest } from '@pnpm/types' -import { refToRelative } from 'dependency-path' +import { refToRelative } from '@pnpm/dependency-path' import difference from 'ramda/src/difference' import isEmpty from 'ramda/src/isEmpty' import unnest from 'ramda/src/unnest' diff --git a/packages/dependency-path/CHANGELOG.md b/packages/dependency-path/CHANGELOG.md deleted file mode 100644 index 349a11936d..0000000000 --- a/packages/dependency-path/CHANGELOG.md +++ /dev/null @@ -1,302 +0,0 @@ -# dependency-path - -## 9.2.8 - -### Patch Changes - -- Updated dependencies [702e847c1] - - @pnpm/types@8.9.0 - - @pnpm/crypto.base32-hash@1.0.1 - -## 9.2.7 - -### Patch Changes - -- Updated dependencies [844e82f3a] - - @pnpm/types@8.8.0 - - @pnpm/crypto.base32-hash@1.0.1 - -## 9.2.6 - -### Patch Changes - -- Updated dependencies [d665f3ff7] - - @pnpm/types@8.7.0 - - @pnpm/crypto.base32-hash@1.0.1 - -## 9.2.5 - -### Patch Changes - -- Updated dependencies [156cc1ef6] - - @pnpm/types@8.6.0 - - @pnpm/crypto.base32-hash@1.0.1 - -## 9.2.4 - -### Patch Changes - -- Updated dependencies [c90798461] - - @pnpm/types@8.5.0 - - @pnpm/crypto.base32-hash@1.0.1 - -## 9.2.3 - -### Patch Changes - -- Updated dependencies [2bca856e0] - - @pnpm/crypto.base32-hash@1.0.1 - -## 9.2.2 - -### Patch Changes - -- fc581d371: Remove patchFileHash from createPeersFolderSuffix(). - -## 9.2.1 - -### Patch Changes - -- Updated dependencies [8e5b77ef6] - - @pnpm/types@8.4.0 - -## 9.2.0 - -### Minor Changes - -- c635f9fc1: Add patchFileHash as an optional argument to createPeersFolderSuffix(). - -### Patch Changes - -- Updated dependencies [2a34b21ce] - - @pnpm/types@8.3.0 - -## 9.1.4 - -### Patch Changes - -- 725636a90: Use @pnpm/crypto.base32-hash. -- Updated dependencies [fb5bbfd7a] -- Updated dependencies [725636a90] - - @pnpm/types@8.2.0 - - @pnpm/crypto.base32-hash@1.0.0 - -## 9.1.3 - -### Patch Changes - -- Updated dependencies [4d39e4a0c] - - @pnpm/types@8.1.0 - -## 9.1.2 - -### Patch Changes - -- c57695550: Sanitize the directory names created inside `node_modules/.pnpm` and inside the global store [#4716](https://github.com/pnpm/pnpm/issues/4716) - -## 9.1.1 - -### Patch Changes - -- Updated dependencies [18ba5e2c0] - - @pnpm/types@8.0.1 - -## 9.1.0 - -### Minor Changes - -- 0a70aedb1: Export new function: createPeersFolderSuffix(). - -## 9.0.0 - -### Major Changes - -- faf830b8f: Use a nicer path for saving local dependencies in the virtual store. -- 542014839: Node.js 12 is not supported. - -### Patch Changes - -- Updated dependencies [d504dc380] -- Updated dependencies [542014839] - - @pnpm/types@8.0.0 - -## 8.0.11 - -### Patch Changes - -- Updated dependencies [b138d048c] - - @pnpm/types@7.10.0 - -## 8.0.10 - -### Patch Changes - -- Updated dependencies [26cd01b88] - - @pnpm/types@7.9.0 - -## 8.0.9 - -### Patch Changes - -- Updated dependencies [b5734a4a7] - - @pnpm/types@7.8.0 - -## 8.0.8 - -### Patch Changes - -- Updated dependencies [6493e0c93] - - @pnpm/types@7.7.1 - -## 8.0.7 - -### Patch Changes - -- Updated dependencies [ba9b2eba1] - - @pnpm/types@7.7.0 - -## 8.0.6 - -### Patch Changes - -- Updated dependencies [302ae4f6f] - - @pnpm/types@7.6.0 - -## 8.0.5 - -### Patch Changes - -- Updated dependencies [4ab87844a] - - @pnpm/types@7.5.0 - -## 8.0.4 - -### Patch Changes - -- Updated dependencies [b734b45ea] - - @pnpm/types@7.4.0 - -## 8.0.3 - -### Patch Changes - -- Updated dependencies [8e76690f4] - - @pnpm/types@7.3.0 - -## 8.0.2 - -### Patch Changes - -- 6c418943c: Fix `tryGetPackageId()`, it should parse correctly a dependency path that has peer dependency names with underscores. - -## 8.0.1 - -### Patch Changes - -- Updated dependencies [724c5abd8] - - @pnpm/types@7.2.0 - -## 8.0.0 - -### Major Changes - -- 20e2f235d: Add a unique prefix to any directory name inside the virtual store that has non-lowercase characters. This is important to avoid conflicts in case insensitive filesystems. - -## 7.0.1 - -### Patch Changes - -- Updated dependencies [97c64bae4] - - @pnpm/types@7.1.0 - -## 7.0.0 - -### Major Changes - -- 9ceab68f0: Use + instead of # to escape / in paths. - -## 6.0.0 - -### Major Changes - -- 97b986fbc: Node.js 10 support is dropped. At least Node.js 12.17 is required for the package to work. -- f2bb5cbeb: All packages inside the virtual store directory should be on the same depth. Instead of subdirectories, one directory is used with # instead of slashes. - -### Patch Changes - -- e4efddbd2: Don't use ":" in path to dependency. -- Updated dependencies [97b986fbc] - - @pnpm/types@7.0.0 - -## 5.1.1 - -### Patch Changes - -- Updated dependencies [9ad8c27bf] - - @pnpm/types@6.4.0 - -## 5.1.0 - -### Minor Changes - -- e27dcf0dc: Add depPathToFilename(). - -## 5.0.6 - -### Patch Changes - -- 39142e2ad: Update encode-registry to v3. - -## 5.0.5 - -### Patch Changes - -- Updated dependencies [b5d694e7f] - - @pnpm/types@6.3.1 - -## 5.0.4 - -### Patch Changes - -- Updated dependencies [d54043ee4] - - @pnpm/types@6.3.0 - -## 5.0.3 - -### Patch Changes - -- a2ef8084f: Use the same versions of dependencies across the pnpm monorepo. - -## 5.0.2 - -### Patch Changes - -- Updated dependencies [db17f6f7b] - - @pnpm/types@6.2.0 - -## 5.0.1 - -### Patch Changes - -- Updated dependencies [71a8c8ce3] - - @pnpm/types@6.1.0 - -## 5.0.0 - -### Major Changes - -- 41d92948b: relative() should always remove the registry from the IDs start. - -## 4.0.7 - -### Patch Changes - -- Updated dependencies [da091c711] - - @pnpm/types@6.0.0 - -## 4.0.7-alpha.0 - -### Patch Changes - -- Updated dependencies [da091c71] - - @pnpm/types@6.0.0-alpha.0 diff --git a/packages/dependency-path/package.json b/packages/dependency-path/package.json index dddc23dbce..acb395b2b7 100644 --- a/packages/dependency-path/package.json +++ b/packages/dependency-path/package.json @@ -1,6 +1,6 @@ { - "name": "dependency-path", - "version": "9.2.8", + "name": "@pnpm/dependency-path", + "version": "0.0.0", "description": "Utilities for working with symlinked node_modules", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/semver": "7.3.13", - "dependency-path": "workspace:*" + "@pnpm/dependency-path": "workspace:*" }, "funding": "https://opencollective.com/pnpm", "exports": { diff --git a/packages/dependency-path/test/index.ts b/packages/dependency-path/test/index.ts index 8a2ba402ce..fda55f180b 100644 --- a/packages/dependency-path/test/index.ts +++ b/packages/dependency-path/test/index.ts @@ -8,7 +8,7 @@ import { relative, resolve, tryGetPackageId, -} from 'dependency-path' +} from '@pnpm/dependency-path' test('isAbsolute()', () => { expect(isAbsolute('/foo/1.0.0')).toBeFalsy() diff --git a/packages/mount-modules/package.json b/packages/mount-modules/package.json index 877bbed703..75c856b020 100644 --- a/packages/mount-modules/package.json +++ b/packages/mount-modules/package.json @@ -49,7 +49,7 @@ "@pnpm/logger": "^5.0.0", "@pnpm/store-path": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "hyperdrive-schemas": "^2.0.0", "load-json-file": "^6.2.0", "normalize-path": "^3.0.0" diff --git a/packages/mount-modules/src/makeVirtualNodeModules.ts b/packages/mount-modules/src/makeVirtualNodeModules.ts index 195cfa1330..5d238f743d 100644 --- a/packages/mount-modules/src/makeVirtualNodeModules.ts +++ b/packages/mount-modules/src/makeVirtualNodeModules.ts @@ -2,7 +2,7 @@ import path from 'path' import { Lockfile } from '@pnpm/lockfile-file' import { DEPENDENCIES_FIELDS } from '@pnpm/types' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import normalize from 'normalize-path' type DirEntry = { diff --git a/pkg-manager/core/package.json b/pkg-manager/core/package.json index 6129c8ab17..0f343d0f61 100644 --- a/pkg-manager/core/package.json +++ b/pkg-manager/core/package.json @@ -54,7 +54,7 @@ "@pnpm/types": "workspace:*", "@pnpm/which-version-is-pinned": "workspace:*", "@zkochan/rimraf": "^2.1.2", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "is-inner-link": "^4.0.0", "load-json-file": "^6.2.0", "normalize-path": "^3.0.0", diff --git a/pkg-manager/core/test/install/autoInstallPeers.ts b/pkg-manager/core/test/install/autoInstallPeers.ts index 1fa2068e14..9c38950c6c 100644 --- a/pkg-manager/core/test/install/autoInstallPeers.ts +++ b/pkg-manager/core/test/install/autoInstallPeers.ts @@ -4,7 +4,7 @@ import { addDependenciesToPackage, install, mutateModules, mutateModulesInSingle import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import rimraf from '@zkochan/rimraf' -import { createPeersFolderSuffix } from 'dependency-path' +import { createPeersFolderSuffix } from '@pnpm/dependency-path' import { testDefaults } from '../utils' test('auto install non-optional peer dependencies', async () => { diff --git a/pkg-manager/core/test/install/defaultPeerDependencies.ts b/pkg-manager/core/test/install/defaultPeerDependencies.ts index eb055f4045..39a964f72c 100644 --- a/pkg-manager/core/test/install/defaultPeerDependencies.ts +++ b/pkg-manager/core/test/install/defaultPeerDependencies.ts @@ -3,7 +3,7 @@ import { prepareEmpty } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import { addDependenciesToPackage } from '@pnpm/core' import deepRequireCwd from 'deep-require-cwd' -import { createPeersFolderSuffix } from 'dependency-path' +import { createPeersFolderSuffix } from '@pnpm/dependency-path' import exists from 'path-exists' import { testDefaults } from '../utils' diff --git a/pkg-manager/core/test/install/multipleImporters.ts b/pkg-manager/core/test/install/multipleImporters.ts index 27d0c15e77..b7569b578e 100644 --- a/pkg-manager/core/test/install/multipleImporters.ts +++ b/pkg-manager/core/test/install/multipleImporters.ts @@ -12,7 +12,7 @@ import { mutateModulesInSingleProject, } from '@pnpm/core' import rimraf from '@zkochan/rimraf' -import { createPeersFolderSuffix } from 'dependency-path' +import { createPeersFolderSuffix } from '@pnpm/dependency-path' import loadJsonFile from 'load-json-file' import exists from 'path-exists' import pick from 'ramda/src/pick' diff --git a/pkg-manager/core/test/install/peerDependencies.ts b/pkg-manager/core/test/install/peerDependencies.ts index c405cfedf1..0673e8bdcf 100644 --- a/pkg-manager/core/test/install/peerDependencies.ts +++ b/pkg-manager/core/test/install/peerDependencies.ts @@ -18,7 +18,7 @@ import rimraf from '@zkochan/rimraf' import exists from 'path-exists' import sinon from 'sinon' import deepRequireCwd from 'deep-require-cwd' -import { createPeersFolderSuffix } from 'dependency-path' +import { createPeersFolderSuffix } from '@pnpm/dependency-path' import { testDefaults } from '../utils' const f = fixtures(__dirname) diff --git a/pkg-manager/headless/package.json b/pkg-manager/headless/package.json index fbc6afeb70..386c77974b 100644 --- a/pkg-manager/headless/package.json +++ b/pkg-manager/headless/package.json @@ -91,7 +91,7 @@ "@pnpm/symlink-dependency": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "^2.1.2", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "p-limit": "^3.1.0", "path-absolute": "^1.0.1", "path-exists": "^4.0.0", diff --git a/pkg-manager/headless/src/index.ts b/pkg-manager/headless/src/index.ts index f8e9065ec8..4ab7dd70a3 100644 --- a/pkg-manager/headless/src/index.ts +++ b/pkg-manager/headless/src/index.ts @@ -56,7 +56,7 @@ import { } from '@pnpm/store-controller-types' import { symlinkDependency } from '@pnpm/symlink-dependency' import { DependencyManifest, HoistedDependencies, ProjectManifest, Registries } from '@pnpm/types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import pLimit from 'p-limit' import pathAbsolute from 'path-absolute' import equals from 'ramda/src/equals' diff --git a/pkg-manager/headless/src/lockfileToDepGraph.ts b/pkg-manager/headless/src/lockfileToDepGraph.ts index af811ac309..0680a9ff62 100644 --- a/pkg-manager/headless/src/lockfileToDepGraph.ts +++ b/pkg-manager/headless/src/lockfileToDepGraph.ts @@ -21,7 +21,7 @@ import { PackageFilesResponse, StoreController, } from '@pnpm/store-controller-types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import pathExists from 'path-exists' import equals from 'ramda/src/equals' diff --git a/pkg-manager/headless/src/lockfileToHoistedDepGraph.ts b/pkg-manager/headless/src/lockfileToHoistedDepGraph.ts index a3e70a8df2..7745af6001 100644 --- a/pkg-manager/headless/src/lockfileToHoistedDepGraph.ts +++ b/pkg-manager/headless/src/lockfileToHoistedDepGraph.ts @@ -17,7 +17,7 @@ import { StoreController, } from '@pnpm/store-controller-types' import { hoist, HoistingLimits, HoisterResult } from '@pnpm/real-hoist' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import { DependenciesGraph, DepHierarchy, diff --git a/pkg-manager/hoist/package.json b/pkg-manager/hoist/package.json index f8762aa313..7c8469bf01 100644 --- a/pkg-manager/hoist/package.json +++ b/pkg-manager/hoist/package.json @@ -48,7 +48,7 @@ "@pnpm/matcher": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "1.0.0", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "is-subdir": "^1.2.0", "ramda": "npm:@pnpm/ramda@0.28.1", "resolve-link-target": "^2.0.0", diff --git a/pkg-manager/hoist/src/index.ts b/pkg-manager/hoist/src/index.ts index e45c9d6d00..d33ed11c1b 100644 --- a/pkg-manager/hoist/src/index.ts +++ b/pkg-manager/hoist/src/index.ts @@ -12,7 +12,7 @@ import { logger } from '@pnpm/logger' import { createMatcher } from '@pnpm/matcher' import { HoistedDependencies } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import isSubdir from 'is-subdir' import mapObjIndexed from 'ramda/src/mapObjIndexed' import resolveLinkTarget from 'resolve-link-target' diff --git a/pkg-manager/modules-cleaner/package.json b/pkg-manager/modules-cleaner/package.json index 2366355591..2807a33668 100644 --- a/pkg-manager/modules-cleaner/package.json +++ b/pkg-manager/modules-cleaner/package.json @@ -37,7 +37,7 @@ "@pnpm/store-controller-types": "workspace:*", "@pnpm/types": "workspace:*", "@zkochan/rimraf": "^2.1.2", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "ramda": "npm:@pnpm/ramda@0.28.1" }, "devDependencies": { diff --git a/pkg-manager/modules-cleaner/src/prune.ts b/pkg-manager/modules-cleaner/src/prune.ts index 62badbfa94..d1dc89d670 100644 --- a/pkg-manager/modules-cleaner/src/prune.ts +++ b/pkg-manager/modules-cleaner/src/prune.ts @@ -20,7 +20,7 @@ import { HoistedDependencies, Registries, } from '@pnpm/types' -import { depPathToFilename } from 'dependency-path' +import { depPathToFilename } from '@pnpm/dependency-path' import rimraf from '@zkochan/rimraf' import difference from 'ramda/src/difference' import equals from 'ramda/src/equals' diff --git a/pkg-manager/package-requester/package.json b/pkg-manager/package-requester/package.json index 3704fffd2b..d6021087fe 100644 --- a/pkg-manager/package-requester/package.json +++ b/pkg-manager/package-requester/package.json @@ -49,7 +49,7 @@ "@pnpm/resolver-base": "workspace:*", "@pnpm/store-controller-types": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "load-json-file": "^6.2.0", "p-defer": "^3.0.0", "p-limit": "^3.1.0", diff --git a/pkg-manager/package-requester/src/packageRequester.ts b/pkg-manager/package-requester/src/packageRequester.ts index 0024b80a3e..6d792ff01c 100644 --- a/pkg-manager/package-requester/src/packageRequester.ts +++ b/pkg-manager/package-requester/src/packageRequester.ts @@ -40,7 +40,7 @@ import { WantedDependency, } from '@pnpm/store-controller-types' import { DependencyManifest } from '@pnpm/types' -import { depPathToFilename } from 'dependency-path' +import { depPathToFilename } from '@pnpm/dependency-path' import pMapValues from 'p-map-values' import PQueue from 'p-queue' import loadJsonFile from 'load-json-file' diff --git a/pkg-manager/package-requester/test/index.ts b/pkg-manager/package-requester/test/index.ts index 7529996fdd..ea8f5122d9 100644 --- a/pkg-manager/package-requester/test/index.ts +++ b/pkg-manager/package-requester/test/index.ts @@ -11,7 +11,7 @@ import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { fixtures } from '@pnpm/test-fixtures' import { DependencyManifest } from '@pnpm/types' import delay from 'delay' -import { depPathToFilename } from 'dependency-path' +import { depPathToFilename } from '@pnpm/dependency-path' import loadJsonFile from 'load-json-file' import nock from 'nock' import normalize from 'normalize-path' diff --git a/pkg-manager/real-hoist/package.json b/pkg-manager/real-hoist/package.json index 3a29af30e8..3aa60b05d9 100644 --- a/pkg-manager/real-hoist/package.json +++ b/pkg-manager/real-hoist/package.json @@ -33,7 +33,7 @@ "@pnpm/error": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@yarnpkg/nm": "4.0.0-rc.27", - "dependency-path": "workspace:*" + "@pnpm/dependency-path": "workspace:*" }, "funding": "https://opencollective.com/pnpm", "devDependencies": { diff --git a/pkg-manager/real-hoist/src/index.ts b/pkg-manager/real-hoist/src/index.ts index 7dea528602..42976461da 100644 --- a/pkg-manager/real-hoist/src/index.ts +++ b/pkg-manager/real-hoist/src/index.ts @@ -3,7 +3,7 @@ import { Lockfile, nameVerFromPkgSnapshot, } from '@pnpm/lockfile-utils' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import { hoist as _hoist, HoisterDependencyKind, HoisterTree, HoisterResult } from '@yarnpkg/nm' export type HoistingLimits = Map> diff --git a/pkg-manager/resolve-dependencies/package.json b/pkg-manager/resolve-dependencies/package.json index 0c0d5a19e0..c2f64ae28c 100644 --- a/pkg-manager/resolve-dependencies/package.json +++ b/pkg-manager/resolve-dependencies/package.json @@ -44,7 +44,7 @@ "@pnpm/types": "workspace:*", "@pnpm/which-version-is-pinned": "workspace:*", "@yarnpkg/core": "4.0.0-rc.27", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "encode-registry": "^3.0.0", "filenamify": "^4.3.0", "get-npm-tarball-url": "^2.0.3", diff --git a/pkg-manager/resolve-dependencies/src/depPathToRef.ts b/pkg-manager/resolve-dependencies/src/depPathToRef.ts index e49385f66a..b2f75c0a60 100644 --- a/pkg-manager/resolve-dependencies/src/depPathToRef.ts +++ b/pkg-manager/resolve-dependencies/src/depPathToRef.ts @@ -1,6 +1,6 @@ import { Resolution } from '@pnpm/resolver-base' import { Registries } from '@pnpm/types' -import { getRegistryByPackageName } from 'dependency-path' +import { getRegistryByPackageName } from '@pnpm/dependency-path' import encodeRegistry from 'encode-registry' export function depPathToRef ( diff --git a/pkg-manager/resolve-dependencies/src/resolveDependencies.ts b/pkg-manager/resolve-dependencies/src/resolveDependencies.ts index e05bf75c19..f866d8745f 100644 --- a/pkg-manager/resolve-dependencies/src/resolveDependencies.ts +++ b/pkg-manager/resolve-dependencies/src/resolveDependencies.ts @@ -38,7 +38,7 @@ import { ReadPackageHook, Registries, } from '@pnpm/types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import normalizePath from 'normalize-path' import exists from 'path-exists' import pDefer from 'p-defer' diff --git a/pkg-manager/resolve-dependencies/src/resolvePeers.ts b/pkg-manager/resolve-dependencies/src/resolvePeers.ts index fa7757f732..fdec8e488c 100644 --- a/pkg-manager/resolve-dependencies/src/resolvePeers.ts +++ b/pkg-manager/resolve-dependencies/src/resolvePeers.ts @@ -6,7 +6,7 @@ import { PeerDependencyIssues, PeerDependencyIssuesByProjects, } from '@pnpm/types' -import { depPathToFilename, createPeersFolderSuffix } from 'dependency-path' +import { depPathToFilename, createPeersFolderSuffix } from '@pnpm/dependency-path' import { KeyValuePair } from 'ramda' import fromPairs from 'ramda/src/fromPairs' import isEmpty from 'ramda/src/isEmpty' diff --git a/pkg-manager/resolve-dependencies/src/updateLockfile.ts b/pkg-manager/resolve-dependencies/src/updateLockfile.ts index f163b7fca1..487a12ea21 100644 --- a/pkg-manager/resolve-dependencies/src/updateLockfile.ts +++ b/pkg-manager/resolve-dependencies/src/updateLockfile.ts @@ -8,7 +8,7 @@ import { } from '@pnpm/prune-lockfile' import { Resolution } from '@pnpm/resolver-base' import { Registries } from '@pnpm/types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import getNpmTarballUrl from 'get-npm-tarball-url' import { KeyValuePair } from 'ramda' import isEmpty from 'ramda/src/isEmpty' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e0c7a6e79..126bc395cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -964,6 +964,9 @@ importers: '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/find-workspace-packages': specifier: workspace:* version: link:../../workspace/find-workspace-packages @@ -1009,9 +1012,6 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../../packages/types - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path load-json-file: specifier: ^6.2.0 version: 6.2.0 @@ -1390,7 +1390,7 @@ importers: specifier: ^2.1.0 version: 2.1.0 devDependencies: - find-packages: + '@pnpm/fs.find-packages': specifier: workspace:* version: 'link:' @@ -1616,6 +1616,9 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -1637,9 +1640,6 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../../packages/types - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path ramda: specifier: npm:@pnpm/ramda@0.28.1 version: /@pnpm/ramda/0.28.1 @@ -1668,6 +1668,9 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -1695,9 +1698,6 @@ importers: comver-to-semver: specifier: ^1.0.0 version: 1.0.0 - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path js-yaml: specifier: npm:@zkochan/js-yaml@^0.0.6 version: /@zkochan/js-yaml/0.0.6 @@ -1750,6 +1750,9 @@ importers: lockfile/lockfile-to-pnp: dependencies: + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/lockfile-file': specifier: workspace:* version: link:../lockfile-file @@ -1765,9 +1768,6 @@ importers: '@yarnpkg/pnp': specifier: ^2.3.2 version: 2.3.2 - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path normalize-path: specifier: ^3.0.0 version: 3.0.0 @@ -1800,6 +1800,9 @@ importers: lockfile/lockfile-utils: dependencies: + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/lockfile-types': specifier: workspace:* version: link:../lockfile-types @@ -1809,9 +1812,6 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../../packages/types - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path get-npm-tarball-url: specifier: ^2.0.3 version: 2.0.3 @@ -1840,15 +1840,15 @@ importers: lockfile/lockfile-walker: dependencies: + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/lockfile-types': specifier: workspace:* version: link:../lockfile-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path ramda: specifier: npm:@pnpm/ramda@0.28.1 version: /@pnpm/ramda/0.28.1 @@ -1963,15 +1963,15 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/lockfile-types': specifier: workspace:* version: link:../lockfile-types '@pnpm/types': specifier: workspace:* version: link:../../packages/types - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path ramda: specifier: npm:@pnpm/ramda@0.28.1 version: /@pnpm/ramda/0.28.1 @@ -2103,12 +2103,12 @@ importers: specifier: ^7.3.8 version: 7.3.8 devDependencies: + '@pnpm/dependency-path': + specifier: workspace:* + version: 'link:' '@types/semver': specifier: 7.3.13 version: 7.3.13 - dependency-path: - specifier: workspace:* - version: 'link:' packages/error: dependencies: @@ -2187,6 +2187,9 @@ importers: '@pnpm/config': specifier: workspace:* version: link:../../config/config + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../dependency-path '@pnpm/lockfile-file': specifier: workspace:* version: link:../../lockfile/lockfile-file @@ -2202,9 +2205,6 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../types - dependency-path: - specifier: workspace:* - version: link:../dependency-path hyperdrive-schemas: specifier: ^2.0.0 version: 2.0.0 @@ -2479,6 +2479,9 @@ importers: '@pnpm/crypto.base32-hash': specifier: workspace:* version: link:../../packages/crypto.base32-hash + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -2584,9 +2587,6 @@ importers: '@zkochan/rimraf': specifier: ^2.1.2 version: 2.1.2 - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path is-inner-link: specifier: ^4.0.0 version: 4.0.0 @@ -2815,6 +2815,9 @@ importers: '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -2878,9 +2881,6 @@ importers: '@zkochan/rimraf': specifier: ^2.1.2 version: 2.1.2 - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path p-limit: specifier: ^3.1.0 version: 3.1.0 @@ -2966,6 +2966,9 @@ importers: '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/link-bins': specifier: workspace:* version: link:../link-bins @@ -2990,9 +2993,6 @@ importers: '@pnpm/util.lex-comparator': specifier: 1.0.0 version: 1.0.0 - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path is-subdir: specifier: ^1.2.0 version: 1.2.0 @@ -3100,6 +3100,9 @@ importers: '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/filter-lockfile': specifier: workspace:* version: link:../../lockfile/filter-lockfile @@ -3127,9 +3130,6 @@ importers: '@zkochan/rimraf': specifier: ^2.1.2 version: 2.1.2 - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path ramda: specifier: npm:@pnpm/ramda@0.28.1 version: /@pnpm/ramda/0.28.1 @@ -3199,6 +3199,9 @@ importers: '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -3229,9 +3232,6 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../../packages/types - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path load-json-file: specifier: ^6.2.0 version: 6.2.0 @@ -3547,6 +3547,9 @@ importers: pkg-manager/real-hoist: dependencies: + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -3556,9 +3559,6 @@ importers: '@yarnpkg/nm': specifier: 4.0.0-rc.27 version: 4.0.0-rc.27_typanion@3.12.1 - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path devDependencies: '@pnpm/lockfile-file': specifier: workspace:* @@ -3612,6 +3612,9 @@ importers: '@pnpm/core-loggers': specifier: workspace:* version: link:../../packages/core-loggers + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -3654,9 +3657,6 @@ importers: '@yarnpkg/core': specifier: 4.0.0-rc.27 version: 4.0.0-rc.27_typanion@3.12.1 - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path encode-registry: specifier: ^3.0.0 version: 3.0.0 @@ -3904,6 +3904,9 @@ importers: '@pnpm/default-reporter': specifier: workspace:* version: link:../cli/default-reporter + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../packages/dependency-path '@pnpm/filter-workspace-packages': specifier: workspace:* version: link:../workspace/filter-workspace-packages @@ -4003,6 +4006,9 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../packages/types + '@pnpm/workspace.pkgs-graph': + specifier: workspace:* + version: link:../workspace/pkgs-graph '@pnpm/write-project-manifest': specifier: workspace:* version: link:../pkg-manifest/write-project-manifest @@ -4048,9 +4054,6 @@ importers: delay: specifier: ^5.0.0 version: 5.0.0 - dependency-path: - specifier: workspace:* - version: link:../packages/dependency-path dir-is-case-sensitive: specifier: ^2.0.0 version: 2.0.0 @@ -4093,9 +4096,6 @@ importers: path-name: specifier: ^1.0.0 version: 1.0.0 - pkgs-graph: - specifier: workspace:* - version: link:../workspace/pkgs-graph ps-list: specifier: ^7.2.0 version: 7.2.0 @@ -4612,6 +4612,9 @@ importers: reviewing/dependencies-hierarchy: dependencies: + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/lockfile-file': specifier: workspace:* version: link:../../lockfile/lockfile-file @@ -4633,9 +4636,6 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../../packages/types - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path normalize-path: specifier: ^3.0.0 version: 3.0.0 @@ -4649,21 +4649,24 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants + '@pnpm/reviewing.dependencies-hierarchy': + specifier: workspace:* + version: 'link:' '@pnpm/test-fixtures': specifier: workspace:* version: link:../../__utils__/test-fixtures '@types/normalize-path': specifier: ^3.0.0 version: 3.0.0 - dependencies-hierarchy: - specifier: workspace:* - version: 'link:' reviewing/license-scanner: dependencies: '@pnpm/cafs': specifier: workspace:* version: link:../../store/cafs + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/directory-fetcher': specifier: workspace:* version: link:../../fetching/directory-fetcher @@ -4694,9 +4697,6 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../../packages/types - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path load-json-file: specifier: ^6.2.0 version: 6.2.0 @@ -4734,6 +4734,9 @@ importers: '@pnpm/read-project-manifest': specifier: workspace:* version: link:../../pkg-manifest/read-project-manifest + '@pnpm/reviewing.dependencies-hierarchy': + specifier: workspace:* + version: link:../dependencies-hierarchy '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -4746,9 +4749,6 @@ importers: cli-columns: specifier: ^4.0.0 version: 4.0.0 - dependencies-hierarchy: - specifier: workspace:* - version: link:../dependencies-hierarchy p-limit: specifier: ^3.1.0 version: 3.1.0 @@ -4783,6 +4783,9 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -4813,9 +4816,6 @@ importers: '@pnpm/types': specifier: workspace:* version: link:../../packages/types - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path ramda: specifier: npm:@pnpm/ramda@0.28.1 version: /@pnpm/ramda/0.28.1 @@ -5331,6 +5331,9 @@ importers: '@pnpm/config': specifier: workspace:* version: link:../../config/config + '@pnpm/dependency-path': + specifier: workspace:* + version: link:../../packages/dependency-path '@pnpm/error': specifier: workspace:* version: link:../../packages/error @@ -5367,9 +5370,6 @@ importers: archy: specifier: ^1.0.0 version: 1.0.0 - dependency-path: - specifier: workspace:* - version: link:../../packages/dependency-path dint: specifier: ^5.1.0 version: 5.1.0 @@ -5610,6 +5610,9 @@ importers: '@pnpm/matcher': specifier: workspace:* version: link:../../config/matcher + '@pnpm/workspace.pkgs-graph': + specifier: workspace:* + version: link:../pkgs-graph execa: specifier: npm:safe-execa@^0.1.2 version: /safe-execa/0.1.2 @@ -5622,9 +5625,6 @@ importers: micromatch: specifier: ^4.0.5 version: 4.0.5 - pkgs-graph: - specifier: workspace:* - version: link:../pkgs-graph ramda: specifier: npm:@pnpm/ramda@0.28.1 version: /@pnpm/ramda/0.28.1 @@ -5681,15 +5681,15 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants + '@pnpm/fs.find-packages': + specifier: workspace:* + version: link:../../fs/find-packages '@pnpm/types': specifier: workspace:* version: link:../../packages/types '@pnpm/util.lex-comparator': specifier: 1.0.0 version: 1.0.0 - find-packages: - specifier: workspace:* - version: link:../../fs/find-packages read-yaml-file: specifier: ^2.1.0 version: 2.1.0 @@ -5710,15 +5710,15 @@ importers: specifier: npm:@pnpm/ramda@0.28.1 version: /@pnpm/ramda/0.28.1 devDependencies: + '@pnpm/workspace.pkgs-graph': + specifier: workspace:* + version: 'link:' '@types/ramda': specifier: 0.28.20 version: 0.28.20 better-path-resolve: specifier: 1.0.0 version: 1.0.0 - pkgs-graph: - specifier: workspace:* - version: 'link:' workspace/resolve-workspace-range: dependencies: diff --git a/pnpm/dev/pd.js b/pnpm/dev/pd.js index 343af9386c..3385cbe056 100755 --- a/pnpm/dev/pd.js +++ b/pnpm/dev/pd.js @@ -21,11 +21,6 @@ const pnpmPackageJson = JSON.parse(fs.readFileSync(pathLib.join(__dirname, 'pack const spnpmImportsPlugin = { name: 'spnpmImports', setup: (build) => { - // This is an exception to the rule that all local packages start with `@pnpm` - build.onResolve({ filter: /^dependency-path$/ }, ({path, resolveDir}) => ({ - path: pathLib.resolve(dirByPackageName['dependency-path'], 'src', 'index.ts') - })) - // E.g. @pnpm/config -> //pnpm/packages/config/src/index.ts build.onResolve({ filter: /@pnpm\// }, ({path, resolveDir}) => { const pathParts = path.split('/') diff --git a/pnpm/package.json b/pnpm/package.json index 72c4cd3a94..48916da978 100644 --- a/pnpm/package.json +++ b/pnpm/package.json @@ -64,6 +64,7 @@ "@pnpm/test-fixtures": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/write-project-manifest": "workspace:*", + "@pnpm/workspace.pkgs-graph": "workspace:*", "@types/cross-spawn": "^6.0.2", "@types/is-ci": "^3.0.0", "@types/is-windows": "^1.0.0", @@ -78,7 +79,7 @@ "cross-var-no-babel": "^1.2.0", "deep-require-cwd": "1.0.0", "delay": "^5.0.0", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "dir-is-case-sensitive": "^2.0.0", "esbuild": "^0.15.16", "execa": "npm:safe-execa@^0.1.2", @@ -93,7 +94,6 @@ "p-defer": "^3.0.0", "path-exists": "^4.0.0", "path-name": "^1.0.0", - "pkgs-graph": "workspace:*", "ps-list": "^7.2.0", "ramda": "npm:@pnpm/ramda@0.28.1", "read-yaml-file": "^2.1.0", diff --git a/pnpm/test/install/hooks.ts b/pnpm/test/install/hooks.ts index b29685e7e6..fe30d45653 100644 --- a/pnpm/test/install/hooks.ts +++ b/pnpm/test/install/hooks.ts @@ -2,7 +2,7 @@ import { promises as fs } from 'fs' import path from 'path' import { Lockfile } from '@pnpm/lockfile-types' import { prepare, preparePackages } from '@pnpm/prepare' -import { createPeersFolderSuffix } from 'dependency-path' +import { createPeersFolderSuffix } from '@pnpm/dependency-path' import readYamlFile from 'read-yaml-file' import loadJsonFile from 'load-json-file' import writeYamlFile from 'write-yaml-file' diff --git a/renovate.json b/renovate.json index 2f72dce146..10e6959474 100644 --- a/renovate.json +++ b/renovate.json @@ -53,7 +53,7 @@ "@pnpm/utils", "@pnpm/write-project-manifest", "dependencies-hierarchy", - "dependency-path", + "@pnpm/dependency-path", "fetch-from-npm-registry", "find-packages", "npm", diff --git a/reviewing/dependencies-hierarchy/CHANGELOG.md b/reviewing/dependencies-hierarchy/CHANGELOG.md deleted file mode 100644 index 1efbc934fe..0000000000 --- a/reviewing/dependencies-hierarchy/CHANGELOG.md +++ /dev/null @@ -1,857 +0,0 @@ -# dependencies-hierarchy - -## 12.0.4 - -### Patch Changes - -- Updated dependencies [a9d59d8bc] - - @pnpm/lockfile-file@6.0.3 - - @pnpm/read-package-json@7.0.3 - -## 12.0.3 - -### Patch Changes - -- Updated dependencies [ecc8794bb] -- Updated dependencies [ecc8794bb] - - @pnpm/lockfile-utils@5.0.0 - -## 12.0.2 - -### Patch Changes - -- Updated dependencies [702e847c1] - - @pnpm/types@8.9.0 - - dependency-path@9.2.8 - - @pnpm/lockfile-file@6.0.2 - - @pnpm/lockfile-utils@4.2.8 - - @pnpm/modules-yaml@11.0.2 - - @pnpm/normalize-registries@4.0.2 - - @pnpm/read-package-json@7.0.2 - -## 12.0.1 - -### Patch Changes - -- Updated dependencies [844e82f3a] - - @pnpm/types@8.8.0 - - dependency-path@9.2.7 - - @pnpm/lockfile-file@6.0.1 - - @pnpm/lockfile-utils@4.2.7 - - @pnpm/modules-yaml@11.0.1 - - @pnpm/normalize-registries@4.0.1 - - @pnpm/read-package-json@7.0.1 - -## 12.0.0 - -### Major Changes - -- 043d988fc: Breaking change to the API. Defaul export is not used. -- f884689e0: Require `@pnpm/logger` v5. - -### Patch Changes - -- Updated dependencies [72f7d6b3b] -- Updated dependencies [f884689e0] - - @pnpm/modules-yaml@11.0.0 - - @pnpm/lockfile-file@6.0.0 - - @pnpm/normalize-registries@4.0.0 - - @pnpm/read-modules-dir@5.0.0 - - @pnpm/read-package-json@7.0.0 - -## 11.0.26 - -### Patch Changes - -- Updated dependencies [7c296fe9b] - - @pnpm/lockfile-file@5.3.8 - -## 11.0.25 - -### Patch Changes - -- @pnpm/lockfile-file@5.3.7 -- @pnpm/read-package-json@6.0.11 - -## 11.0.24 - -### Patch Changes - -- Updated dependencies [d665f3ff7] - - @pnpm/types@8.7.0 - - dependency-path@9.2.6 - - @pnpm/lockfile-file@5.3.6 - - @pnpm/lockfile-utils@4.2.6 - - @pnpm/modules-yaml@10.0.8 - - @pnpm/normalize-registries@3.0.8 - - @pnpm/read-package-json@6.0.10 - -## 11.0.23 - -### Patch Changes - -- Updated dependencies [156cc1ef6] - - @pnpm/types@8.6.0 - - dependency-path@9.2.5 - - @pnpm/lockfile-file@5.3.5 - - @pnpm/lockfile-utils@4.2.5 - - @pnpm/modules-yaml@10.0.7 - - @pnpm/normalize-registries@3.0.7 - - @pnpm/read-package-json@6.0.9 - -## 11.0.22 - -### Patch Changes - -- Updated dependencies [0373af22e] - - @pnpm/lockfile-file@5.3.4 - -## 11.0.21 - -### Patch Changes - -- Updated dependencies [07bc24ad1] - - @pnpm/read-package-json@6.0.8 - -## 11.0.20 - -### Patch Changes - -- @pnpm/lockfile-utils@4.2.4 - -## 11.0.19 - -### Patch Changes - -- Updated dependencies [1e5482da4] - - @pnpm/lockfile-file@5.3.3 - -## 11.0.18 - -### Patch Changes - -- Updated dependencies [8103f92bd] - - @pnpm/lockfile-file@5.3.2 - - @pnpm/lockfile-utils@4.2.3 - -## 11.0.17 - -### Patch Changes - -- Updated dependencies [44544b493] -- Updated dependencies [c90798461] - - @pnpm/lockfile-file@5.3.1 - - @pnpm/types@8.5.0 - - dependency-path@9.2.4 - - @pnpm/lockfile-utils@4.2.2 - - @pnpm/modules-yaml@10.0.6 - - @pnpm/normalize-registries@3.0.6 - - @pnpm/read-package-json@6.0.7 - -## 11.0.16 - -### Patch Changes - -- Updated dependencies [c83f40c10] - - @pnpm/lockfile-utils@4.2.1 - -## 11.0.15 - -### Patch Changes - -- Updated dependencies [8dcfbe357] - - @pnpm/lockfile-file@5.3.0 - - @pnpm/lockfile-utils@4.2.0 - -## 11.0.14 - -### Patch Changes - -- Updated dependencies [4fa1091c8] - - @pnpm/lockfile-file@5.2.0 - -## 11.0.13 - -### Patch Changes - -- Updated dependencies [e3f4d131c] - - @pnpm/lockfile-utils@4.1.0 - -## 11.0.12 - -### Patch Changes - -- dependency-path@9.2.3 -- @pnpm/lockfile-utils@4.0.10 - -## 11.0.11 - -### Patch Changes - -- Updated dependencies [ab684d77e] - - @pnpm/lockfile-file@5.1.4 - -## 11.0.10 - -### Patch Changes - -- Updated dependencies [5f643f23b] - - @pnpm/lockfile-file@5.1.3 - - @pnpm/lockfile-utils@4.0.9 - -## 11.0.9 - -### Patch Changes - -- Updated dependencies [fc581d371] - - dependency-path@9.2.2 - - @pnpm/lockfile-utils@4.0.8 - -## 11.0.8 - -### Patch Changes - -- Updated dependencies [8e5b77ef6] - - @pnpm/types@8.4.0 - - @pnpm/lockfile-file@5.1.2 - - @pnpm/lockfile-utils@4.0.7 - - dependency-path@9.2.1 - - @pnpm/modules-yaml@10.0.5 - - @pnpm/normalize-registries@3.0.5 - - @pnpm/read-package-json@6.0.6 - -## 11.0.7 - -### Patch Changes - -- Updated dependencies [2a34b21ce] -- Updated dependencies [c635f9fc1] - - @pnpm/types@8.3.0 - - dependency-path@9.2.0 - - @pnpm/lockfile-file@5.1.1 - - @pnpm/lockfile-utils@4.0.6 - - @pnpm/modules-yaml@10.0.4 - - @pnpm/normalize-registries@3.0.4 - - @pnpm/read-package-json@6.0.5 - -## 11.0.6 - -### Patch Changes - -- Updated dependencies [fb5bbfd7a] -- Updated dependencies [56cf04cb3] -- Updated dependencies [725636a90] - - @pnpm/types@8.2.0 - - @pnpm/lockfile-file@5.1.0 - - dependency-path@9.1.4 - - @pnpm/lockfile-utils@4.0.5 - - @pnpm/modules-yaml@10.0.3 - - @pnpm/normalize-registries@3.0.3 - - @pnpm/read-package-json@6.0.4 - -## 11.0.5 - -### Patch Changes - -- Updated dependencies [4d39e4a0c] - - @pnpm/types@8.1.0 - - dependency-path@9.1.3 - - @pnpm/lockfile-file@5.0.4 - - @pnpm/lockfile-utils@4.0.4 - - @pnpm/modules-yaml@10.0.2 - - @pnpm/normalize-registries@3.0.2 - - @pnpm/read-package-json@6.0.3 - -## 11.0.4 - -### Patch Changes - -- Updated dependencies [c57695550] - - dependency-path@9.1.2 - - @pnpm/lockfile-utils@4.0.3 - -## 11.0.3 - -### Patch Changes - -- Updated dependencies [52b0576af] - - @pnpm/lockfile-file@5.0.3 - -## 11.0.2 - -### Patch Changes - -- Updated dependencies [18ba5e2c0] - - @pnpm/types@8.0.1 - - dependency-path@9.1.1 - - @pnpm/lockfile-file@5.0.2 - - @pnpm/lockfile-utils@4.0.2 - - @pnpm/modules-yaml@10.0.1 - - @pnpm/normalize-registries@3.0.1 - - @pnpm/read-package-json@6.0.2 - -## 11.0.1 - -### Patch Changes - -- Updated dependencies [0a70aedb1] -- Updated dependencies [688b0eaff] - - dependency-path@9.1.0 - - @pnpm/lockfile-utils@4.0.1 - - @pnpm/lockfile-file@5.0.1 - - @pnpm/read-package-json@6.0.1 - -## 11.0.0 - -### Major Changes - -- 542014839: Node.js 12 is not supported. - -### Patch Changes - -- Updated dependencies [d504dc380] -- Updated dependencies [faf830b8f] -- Updated dependencies [542014839] - - @pnpm/types@8.0.0 - - dependency-path@9.0.0 - - @pnpm/lockfile-file@5.0.0 - - @pnpm/lockfile-utils@4.0.0 - - @pnpm/modules-yaml@10.0.0 - - @pnpm/normalize-registries@3.0.0 - - @pnpm/read-modules-dir@4.0.0 - - @pnpm/read-package-json@6.0.0 - -## 10.0.25 - -### Patch Changes - -- @pnpm/lockfile-file@4.3.1 -- @pnpm/read-package-json@5.0.12 - -## 10.0.24 - -### Patch Changes - -- Updated dependencies [b138d048c] - - @pnpm/lockfile-file@4.3.0 - - @pnpm/types@7.10.0 - - @pnpm/lockfile-utils@3.2.1 - - dependency-path@8.0.11 - - @pnpm/modules-yaml@9.1.1 - - @pnpm/normalize-registries@2.0.13 - - @pnpm/read-package-json@5.0.11 - -## 10.0.23 - -### Patch Changes - -- Updated dependencies [cdc521cfa] -- Updated dependencies [cdc521cfa] - - @pnpm/modules-yaml@9.1.0 - - @pnpm/lockfile-utils@3.2.0 - -## 10.0.22 - -### Patch Changes - -- Updated dependencies [26cd01b88] - - @pnpm/types@7.9.0 - - dependency-path@8.0.10 - - @pnpm/lockfile-file@4.2.6 - - @pnpm/lockfile-utils@3.1.6 - - @pnpm/modules-yaml@9.0.11 - - @pnpm/normalize-registries@2.0.12 - - @pnpm/read-package-json@5.0.10 - -## 10.0.21 - -### Patch Changes - -- Updated dependencies [7375396db] - - @pnpm/modules-yaml@9.0.10 - -## 10.0.20 - -### Patch Changes - -- Updated dependencies [b5734a4a7] - - @pnpm/types@7.8.0 - - dependency-path@8.0.9 - - @pnpm/lockfile-file@4.2.5 - - @pnpm/lockfile-utils@3.1.5 - - @pnpm/modules-yaml@9.0.9 - - @pnpm/normalize-registries@2.0.11 - - @pnpm/read-package-json@5.0.9 - -## 10.0.19 - -### Patch Changes - -- Updated dependencies [eb9ebd0f3] -- Updated dependencies [eb9ebd0f3] - - @pnpm/lockfile-file@4.2.4 - -## 10.0.18 - -### Patch Changes - -- Updated dependencies [6493e0c93] - - @pnpm/types@7.7.1 - - dependency-path@8.0.8 - - @pnpm/lockfile-file@4.2.3 - - @pnpm/lockfile-utils@3.1.4 - - @pnpm/modules-yaml@9.0.8 - - @pnpm/normalize-registries@2.0.10 - - @pnpm/read-package-json@5.0.8 - -## 10.0.17 - -### Patch Changes - -- Updated dependencies [30bfca967] -- Updated dependencies [ba9b2eba1] - - @pnpm/normalize-registries@2.0.9 - - @pnpm/types@7.7.0 - - dependency-path@8.0.7 - - @pnpm/lockfile-file@4.2.2 - - @pnpm/lockfile-utils@3.1.3 - - @pnpm/modules-yaml@9.0.7 - - @pnpm/read-package-json@5.0.7 - -## 10.0.16 - -### Patch Changes - -- Updated dependencies [46aaf7108] - - @pnpm/normalize-registries@2.0.8 - -## 10.0.15 - -### Patch Changes - -- Updated dependencies [3cf543fc1] - - @pnpm/lockfile-utils@3.1.2 - -## 10.0.14 - -### Patch Changes - -- Updated dependencies [a7ff2d5ce] - - @pnpm/normalize-registries@2.0.7 - -## 10.0.13 - -### Patch Changes - -- Updated dependencies [302ae4f6f] - - @pnpm/types@7.6.0 - - dependency-path@8.0.6 - - @pnpm/lockfile-file@4.2.1 - - @pnpm/lockfile-utils@3.1.1 - - @pnpm/modules-yaml@9.0.6 - - @pnpm/normalize-registries@2.0.6 - - @pnpm/read-package-json@5.0.6 - -## 10.0.12 - -### Patch Changes - -- Updated dependencies [4ab87844a] -- Updated dependencies [4ab87844a] -- Updated dependencies [4ab87844a] - - @pnpm/types@7.5.0 - - @pnpm/lockfile-file@4.2.0 - - @pnpm/lockfile-utils@3.1.0 - - dependency-path@8.0.5 - - @pnpm/modules-yaml@9.0.5 - - @pnpm/normalize-registries@2.0.5 - - @pnpm/read-package-json@5.0.5 - -## 10.0.11 - -### Patch Changes - -- Updated dependencies [71aab049d] - - @pnpm/read-modules-dir@3.0.1 - -## 10.0.10 - -### Patch Changes - -- Updated dependencies [b734b45ea] - - @pnpm/types@7.4.0 - - dependency-path@8.0.4 - - @pnpm/lockfile-file@4.1.1 - - @pnpm/lockfile-utils@3.0.8 - - @pnpm/modules-yaml@9.0.4 - - @pnpm/normalize-registries@2.0.4 - - @pnpm/read-package-json@5.0.4 - -## 10.0.9 - -### Patch Changes - -- Updated dependencies [8e76690f4] -- Updated dependencies [8e76690f4] - - @pnpm/lockfile-file@4.1.0 - - @pnpm/types@7.3.0 - - dependency-path@8.0.3 - - @pnpm/lockfile-utils@3.0.7 - - @pnpm/modules-yaml@9.0.3 - - @pnpm/normalize-registries@2.0.3 - - @pnpm/read-package-json@5.0.3 - -## 10.0.8 - -### Patch Changes - -- Updated dependencies [6c418943c] - - dependency-path@8.0.2 - - @pnpm/lockfile-utils@3.0.6 - -## 10.0.7 - -### Patch Changes - -- Updated dependencies [2dc5a7a4c] - - @pnpm/lockfile-file@4.0.4 - -## 10.0.6 - -### Patch Changes - -- Updated dependencies [724c5abd8] - - @pnpm/types@7.2.0 - - dependency-path@8.0.1 - - @pnpm/lockfile-file@4.0.3 - - @pnpm/lockfile-utils@3.0.5 - - @pnpm/modules-yaml@9.0.2 - - @pnpm/normalize-registries@2.0.2 - - @pnpm/read-package-json@5.0.2 - -## 10.0.5 - -### Patch Changes - -- Updated dependencies [a1a03d145] - - @pnpm/lockfile-file@4.0.2 - - @pnpm/lockfile-utils@3.0.4 - -## 10.0.4 - -### Patch Changes - -- a7de89feb: Do not include linked dependencies in search results if they do not match. - -## 10.0.3 - -### Patch Changes - -- Updated dependencies [20e2f235d] - - dependency-path@8.0.0 - - @pnpm/lockfile-utils@3.0.3 - -## 10.0.2 - -### Patch Changes - -- Updated dependencies [97c64bae4] - - @pnpm/types@7.1.0 - - dependency-path@7.0.1 - - @pnpm/lockfile-file@4.0.1 - - @pnpm/lockfile-utils@3.0.2 - - @pnpm/modules-yaml@9.0.1 - - @pnpm/normalize-registries@2.0.1 - - @pnpm/read-package-json@5.0.1 - -## 10.0.1 - -### Patch Changes - -- Updated dependencies [9ceab68f0] - - dependency-path@7.0.0 - - @pnpm/lockfile-utils@3.0.1 - -## 10.0.0 - -### Major Changes - -- 97b986fbc: Node.js 10 support is dropped. At least Node.js 12.17 is required for the package to work. - -### Patch Changes - -- Updated dependencies [97b986fbc] -- Updated dependencies [155e70597] -- Updated dependencies [9c2a878c3] -- Updated dependencies [e4efddbd2] -- Updated dependencies [8b66f26dc] -- Updated dependencies [f2bb5cbeb] -- Updated dependencies [f7750baed] -- Updated dependencies [78470a32d] -- Updated dependencies [9c2a878c3] - - dependency-path@6.0.0 - - @pnpm/lockfile-file@4.0.0 - - @pnpm/lockfile-utils@3.0.0 - - @pnpm/modules-yaml@9.0.0 - - @pnpm/normalize-registries@2.0.0 - - @pnpm/read-modules-dir@3.0.0 - - @pnpm/read-package-json@5.0.0 - - @pnpm/types@7.0.0 - -## 9.0.19 - -### Patch Changes - -- Updated dependencies [d853fb14a] - - @pnpm/read-package-json@4.0.0 - -## 9.0.18 - -### Patch Changes - -- Updated dependencies [51e1456dd] - - @pnpm/lockfile-file@3.2.1 - -## 9.0.17 - -### Patch Changes - -- Updated dependencies [9ad8c27bf] -- Updated dependencies [9ad8c27bf] - - @pnpm/lockfile-file@3.2.0 - - @pnpm/types@6.4.0 - - @pnpm/lockfile-utils@2.0.22 - - dependency-path@5.1.1 - - @pnpm/modules-yaml@8.0.6 - - @pnpm/normalize-registries@1.0.6 - - @pnpm/read-package-json@3.1.9 - -## 9.0.16 - -### Patch Changes - -- Updated dependencies [af897c324] - - @pnpm/lockfile-file@3.1.4 - -## 9.0.15 - -### Patch Changes - -- Updated dependencies [1e4a3a17a] - - @pnpm/lockfile-file@3.1.3 - -## 9.0.14 - -### Patch Changes - -- Updated dependencies [e27dcf0dc] - - dependency-path@5.1.0 - - @pnpm/lockfile-utils@2.0.21 - -## 9.0.13 - -### Patch Changes - -- Updated dependencies [fba715512] - - @pnpm/lockfile-file@3.1.2 - -## 9.0.12 - -### Patch Changes - -- @pnpm/lockfile-utils@2.0.20 - -## 9.0.11 - -### Patch Changes - -- @pnpm/lockfile-file@3.1.1 -- @pnpm/read-package-json@3.1.8 - -## 9.0.10 - -### Patch Changes - -- Updated dependencies [3776b5a52] - - @pnpm/lockfile-file@3.1.0 - -## 9.0.9 - -### Patch Changes - -- Updated dependencies [dbcc6c96f] -- Updated dependencies [09492b7b4] - - @pnpm/lockfile-file@3.0.18 - - @pnpm/modules-yaml@8.0.5 - -## 9.0.8 - -### Patch Changes - -- Updated dependencies [39142e2ad] -- Updated dependencies [aa6bc4f95] - - dependency-path@5.0.6 - - @pnpm/lockfile-file@3.0.17 - - @pnpm/lockfile-utils@2.0.19 - -## 9.0.7 - -### Patch Changes - -- Updated dependencies [b5d694e7f] - - @pnpm/types@6.3.1 - - @pnpm/lockfile-file@3.0.16 - - @pnpm/lockfile-utils@2.0.18 - - dependency-path@5.0.5 - - @pnpm/modules-yaml@8.0.4 - - @pnpm/normalize-registries@1.0.5 - - @pnpm/read-package-json@3.1.7 - -## 9.0.6 - -### Patch Changes - -- Updated dependencies [d54043ee4] -- Updated dependencies [212671848] - - @pnpm/types@6.3.0 - - @pnpm/read-package-json@3.1.6 - - @pnpm/lockfile-file@3.0.15 - - @pnpm/lockfile-utils@2.0.17 - - dependency-path@5.0.4 - - @pnpm/modules-yaml@8.0.3 - - @pnpm/normalize-registries@1.0.4 - -## 9.0.5 - -### Patch Changes - -- @pnpm/lockfile-file@3.0.14 -- @pnpm/read-package-json@3.1.5 - -## 9.0.4 - -### Patch Changes - -- Updated dependencies [9f5803187] -- Updated dependencies [9550b0505] - - @pnpm/read-package-json@3.1.4 - - @pnpm/lockfile-file@3.0.13 - -## 9.0.3 - -### Patch Changes - -- @pnpm/lockfile-file@3.0.12 - -## 9.0.2 - -### Patch Changes - -- Updated dependencies [24af41f20] - - @pnpm/read-modules-dir@2.0.3 - -## 9.0.1 - -### Patch Changes - -- a2ef8084f: Use the same versions of dependencies across the pnpm monorepo. -- Updated dependencies [1140ef721] -- Updated dependencies [a2ef8084f] - - @pnpm/lockfile-utils@2.0.16 - - dependency-path@5.0.3 - - @pnpm/modules-yaml@8.0.2 - - @pnpm/read-modules-dir@2.0.2 - -## 9.0.0 - -### Major Changes - -- c776db1a7: Look for dependencies at the correct location. - The dependency paths have changed in the `node_modules` created by pnpm v5. - -### Patch Changes - -- Updated dependencies [db17f6f7b] - - @pnpm/types@6.2.0 - - dependency-path@5.0.2 - - @pnpm/lockfile-file@3.0.11 - - @pnpm/lockfile-utils@2.0.15 - - @pnpm/modules-yaml@8.0.1 - - @pnpm/normalize-registries@1.0.3 - - @pnpm/read-package-json@3.1.3 - -## 8.0.23 - -### Patch Changes - -- Updated dependencies [71a8c8ce3] -- Updated dependencies [71a8c8ce3] - - @pnpm/types@6.1.0 - - @pnpm/modules-yaml@8.0.0 - - dependency-path@5.0.1 - - @pnpm/lockfile-file@3.0.10 - - @pnpm/lockfile-utils@2.0.14 - - @pnpm/normalize-registries@1.0.2 - - @pnpm/read-package-json@3.1.2 - -## 8.0.22 - -### Patch Changes - -- Updated dependencies [41d92948b] - - dependency-path@5.0.0 - - @pnpm/lockfile-utils@2.0.13 - -## 8.0.21 - -### Patch Changes - -- Updated dependencies [3f73eaf0c] -- Updated dependencies [da091c711] -- Updated dependencies [802d145fc] - - @pnpm/modules-yaml@7.0.0 - - @pnpm/types@6.0.0 - - dependency-path@4.0.7 - - @pnpm/lockfile-file@3.0.9 - - @pnpm/lockfile-utils@2.0.12 - - @pnpm/normalize-registries@1.0.1 - - @pnpm/read-modules-dir@2.0.2 - - @pnpm/read-package-json@3.1.1 - -## 8.0.21-alpha.2 - -### Patch Changes - -- @pnpm/lockfile-file@3.0.9-alpha.2 -- @pnpm/lockfile-utils@2.0.12-alpha.1 - -## 8.0.21-alpha.1 - -### Patch Changes - -- Updated dependencies [3f73eaf0] -- Updated dependencies [da091c71] - - @pnpm/modules-yaml@7.0.0-alpha.0 - - @pnpm/types@6.0.0-alpha.0 - - dependency-path@4.0.7-alpha.0 - - @pnpm/lockfile-file@3.0.9-alpha.1 - - @pnpm/lockfile-utils@2.0.12-alpha.0 - - @pnpm/normalize-registries@1.0.1-alpha.0 - - @pnpm/read-package-json@3.1.1-alpha.0 - -## 8.0.21-alpha.0 - -### Patch Changes - -- @pnpm/lockfile-file@3.0.9-alpha.0 - -## 8.0.20 - -### Patch Changes - -- Updated dependencies [907c63a48] -- Updated dependencies [907c63a48] -- Updated dependencies [907c63a48] - - @pnpm/lockfile-file@3.0.8 - - @pnpm/lockfile-utils@2.0.11 - - @pnpm/modules-yaml@6.0.2 diff --git a/reviewing/dependencies-hierarchy/README.md b/reviewing/dependencies-hierarchy/README.md index eb4c6259f7..ed8d84de57 100644 --- a/reviewing/dependencies-hierarchy/README.md +++ b/reviewing/dependencies-hierarchy/README.md @@ -1,4 +1,4 @@ -# dependencies-hierarchy +# @pnpm/reviewing.dependencies-hierarchy > Creates a dependencies hierarchy for a symlinked \`node_modules\` @@ -11,7 +11,7 @@ A symlinked `node_modules` is created when installing using [pnpm](https://githu ## Installation ``` -pnpm add dependencies-hierarchy +pnpm add @pnpm/reviewing.dependencies-hierarchy ``` ## License diff --git a/reviewing/dependencies-hierarchy/package.json b/reviewing/dependencies-hierarchy/package.json index d29584f4e0..68831d3c23 100644 --- a/reviewing/dependencies-hierarchy/package.json +++ b/reviewing/dependencies-hierarchy/package.json @@ -1,6 +1,6 @@ { - "name": "dependencies-hierarchy", - "version": "12.0.4", + "name": "@pnpm/reviewing.dependencies-hierarchy", + "version": "0.0.0", "description": "Creates a dependencies hierarchy for a symlinked `node_modules`", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -39,7 +39,7 @@ "@pnpm/read-modules-dir": "workspace:*", "@pnpm/read-package-json": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "normalize-path": "^3.0.0", "realpath-missing": "^1.1.0", "resolve-link-target": "^2.0.0" @@ -48,7 +48,7 @@ "@pnpm/constants": "workspace:*", "@pnpm/test-fixtures": "workspace:*", "@types/normalize-path": "^3.0.0", - "dependencies-hierarchy": "workspace:*" + "@pnpm/reviewing.dependencies-hierarchy": "workspace:*" }, "funding": "https://opencollective.com/pnpm", "exports": { diff --git a/reviewing/dependencies-hierarchy/src/index.ts b/reviewing/dependencies-hierarchy/src/index.ts index 80acdaf060..68b7cab1fd 100644 --- a/reviewing/dependencies-hierarchy/src/index.ts +++ b/reviewing/dependencies-hierarchy/src/index.ts @@ -17,7 +17,7 @@ import { normalizeRegistries } from '@pnpm/normalize-registries' import { readModulesDir } from '@pnpm/read-modules-dir' import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' import { DependenciesField, DEPENDENCIES_FIELDS, Registries } from '@pnpm/types' -import { depPathToFilename, refToRelative } from 'dependency-path' +import { depPathToFilename, refToRelative } from '@pnpm/dependency-path' import normalizePath from 'normalize-path' import realpathMissing from 'realpath-missing' import resolveLinkTarget from 'resolve-link-target' diff --git a/reviewing/dependencies-hierarchy/test/index.ts b/reviewing/dependencies-hierarchy/test/index.ts index 1a6ba082f1..b01743703a 100644 --- a/reviewing/dependencies-hierarchy/test/index.ts +++ b/reviewing/dependencies-hierarchy/test/index.ts @@ -2,7 +2,7 @@ import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' import { fixtures } from '@pnpm/test-fixtures' -import { buildDependenciesHierarchy, PackageNode } from 'dependencies-hierarchy' +import { buildDependenciesHierarchy, PackageNode } from '@pnpm/reviewing.dependencies-hierarchy' const f = fixtures(__dirname) const generalFixture = f.find('general') diff --git a/reviewing/license-scanner/package.json b/reviewing/license-scanner/package.json index 7a316584a7..d2dc7a06fd 100644 --- a/reviewing/license-scanner/package.json +++ b/reviewing/license-scanner/package.json @@ -46,7 +46,7 @@ "@pnpm/package-is-installable": "workspace:*", "@pnpm/read-package-json": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "load-json-file": "^6.2.0", "p-limit": "^3.1.0", "path-absolute": "^1.0.1", diff --git a/reviewing/license-scanner/src/getPkgInfo.ts b/reviewing/license-scanner/src/getPkgInfo.ts index 5d52dc1701..952442fdc4 100644 --- a/reviewing/license-scanner/src/getPkgInfo.ts +++ b/reviewing/license-scanner/src/getPkgInfo.ts @@ -2,7 +2,7 @@ import path from 'path' import pathAbsolute from 'path-absolute' import { readFile } from 'fs/promises' import { readPackageJson } from '@pnpm/read-package-json' -import { depPathToFilename } from 'dependency-path' +import { depPathToFilename } from '@pnpm/dependency-path' import pLimit from 'p-limit' import { PackageManifest, Registries } from '@pnpm/types' import { diff --git a/reviewing/list/package.json b/reviewing/list/package.json index 7f2ea453b0..ec835f42fc 100644 --- a/reviewing/list/package.json +++ b/reviewing/list/package.json @@ -34,6 +34,7 @@ }, "homepage": "https://github.com/pnpm/pnpm/blob/main/reviewing/list#readme", "dependencies": { + "@pnpm/reviewing.dependencies-hierarchy": "workspace:*", "@pnpm/matcher": "workspace:*", "@pnpm/npm-package-arg": "^1.0.0", "@pnpm/read-package-json": "workspace:*", @@ -42,7 +43,6 @@ "archy": "^1.0.0", "chalk": "^4.1.2", "cli-columns": "^4.0.0", - "dependencies-hierarchy": "workspace:*", "p-limit": "^3.1.0", "ramda": "npm:@pnpm/ramda@0.28.1", "semver": "^7.3.8" diff --git a/reviewing/list/src/createPackagesSearcher.ts b/reviewing/list/src/createPackagesSearcher.ts index ea61daefdc..f551d03902 100644 --- a/reviewing/list/src/createPackagesSearcher.ts +++ b/reviewing/list/src/createPackagesSearcher.ts @@ -1,6 +1,6 @@ import { createMatcher } from '@pnpm/matcher' import npa from '@pnpm/npm-package-arg' -import { SearchFunction } from 'dependencies-hierarchy' +import { SearchFunction } from '@pnpm/reviewing.dependencies-hierarchy' import semver from 'semver' export function createPackagesSearcher (queries: string[]) { diff --git a/reviewing/list/src/index.ts b/reviewing/list/src/index.ts index af99f207a9..fb02840af6 100644 --- a/reviewing/list/src/index.ts +++ b/reviewing/list/src/index.ts @@ -1,6 +1,6 @@ import { readProjectManifestOnly } from '@pnpm/read-project-manifest' import { DependenciesField, Registries } from '@pnpm/types' -import { buildDependenciesHierarchy } from 'dependencies-hierarchy' +import { buildDependenciesHierarchy } from '@pnpm/reviewing.dependencies-hierarchy' import { createPackagesSearcher } from './createPackagesSearcher' import { renderJson } from './renderJson' import { renderParseable } from './renderParseable' diff --git a/reviewing/list/src/renderJson.ts b/reviewing/list/src/renderJson.ts index 4ee0e8f751..d0f28213ca 100644 --- a/reviewing/list/src/renderJson.ts +++ b/reviewing/list/src/renderJson.ts @@ -1,5 +1,5 @@ import { DEPENDENCIES_FIELDS } from '@pnpm/types' -import { PackageNode } from 'dependencies-hierarchy' +import { PackageNode } from '@pnpm/reviewing.dependencies-hierarchy' import sortBy from 'ramda/src/sortBy' import path from 'ramda/src/path' import { Ord } from 'ramda' diff --git a/reviewing/list/src/renderParseable.ts b/reviewing/list/src/renderParseable.ts index 473046e0a1..26fff3f42f 100644 --- a/reviewing/list/src/renderParseable.ts +++ b/reviewing/list/src/renderParseable.ts @@ -1,4 +1,4 @@ -import { PackageNode } from 'dependencies-hierarchy' +import { PackageNode } from '@pnpm/reviewing.dependencies-hierarchy' import sortBy from 'ramda/src/sortBy' import prop from 'ramda/src/prop' import { PackageDependencyHierarchy } from './types' diff --git a/reviewing/list/src/renderTree.ts b/reviewing/list/src/renderTree.ts index b49e69484b..16f7caffc5 100644 --- a/reviewing/list/src/renderTree.ts +++ b/reviewing/list/src/renderTree.ts @@ -1,5 +1,5 @@ import path from 'path' -import { PackageNode } from 'dependencies-hierarchy' +import { PackageNode } from '@pnpm/reviewing.dependencies-hierarchy' import { DEPENDENCIES_FIELDS } from '@pnpm/types' import archy from 'archy' import chalk from 'chalk' diff --git a/reviewing/list/src/types.ts b/reviewing/list/src/types.ts index 85b3c67ecc..0c8fc76b6a 100644 --- a/reviewing/list/src/types.ts +++ b/reviewing/list/src/types.ts @@ -1,4 +1,4 @@ -import { DependenciesHierarchy } from 'dependencies-hierarchy' +import { DependenciesHierarchy } from '@pnpm/reviewing.dependencies-hierarchy' export type PackageDependencyHierarchy = DependenciesHierarchy & { name?: string diff --git a/reviewing/outdated/package.json b/reviewing/outdated/package.json index f8f704a6d6..b979820bf2 100644 --- a/reviewing/outdated/package.json +++ b/reviewing/outdated/package.json @@ -47,7 +47,7 @@ "@pnpm/npm-resolver": "workspace:*", "@pnpm/pick-registry-for-package": "workspace:*", "@pnpm/types": "workspace:*", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "ramda": "npm:@pnpm/ramda@0.28.1", "semver": "^7.3.8" }, diff --git a/reviewing/outdated/src/outdated.ts b/reviewing/outdated/src/outdated.ts index 61f71efdc0..7e0b4ccc8f 100644 --- a/reviewing/outdated/src/outdated.ts +++ b/reviewing/outdated/src/outdated.ts @@ -16,7 +16,7 @@ import { ProjectManifest, Registries, } from '@pnpm/types' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import semver from 'semver' export * from './createManifestGetter' diff --git a/store/plugin-commands-store/package.json b/store/plugin-commands-store/package.json index 6b8345b4af..85e5ba3bfe 100644 --- a/store/plugin-commands-store/package.json +++ b/store/plugin-commands-store/package.json @@ -62,7 +62,7 @@ "@pnpm/store-path": "workspace:*", "@pnpm/types": "workspace:*", "archy": "^1.0.0", - "dependency-path": "workspace:*", + "@pnpm/dependency-path": "workspace:*", "dint": "^5.1.0", "load-json-file": "^6.2.0", "p-filter": "^2.1.0", diff --git a/store/plugin-commands-store/src/storeStatus/index.ts b/store/plugin-commands-store/src/storeStatus/index.ts index cd2abbcc75..aa937cebb7 100644 --- a/store/plugin-commands-store/src/storeStatus/index.ts +++ b/store/plugin-commands-store/src/storeStatus/index.ts @@ -6,7 +6,7 @@ import { packageIdFromSnapshot, } from '@pnpm/lockfile-utils' import { streamParser } from '@pnpm/logger' -import * as dp from 'dependency-path' +import * as dp from '@pnpm/dependency-path' import dint from 'dint' import loadJsonFile from 'load-json-file' import pFilter from 'p-filter' diff --git a/workspace/filter-workspace-packages/package.json b/workspace/filter-workspace-packages/package.json index 29bc1d9cc8..90ad72c212 100644 --- a/workspace/filter-workspace-packages/package.json +++ b/workspace/filter-workspace-packages/package.json @@ -32,11 +32,11 @@ "@pnpm/error": "workspace:*", "@pnpm/find-workspace-packages": "workspace:*", "@pnpm/matcher": "workspace:*", + "@pnpm/workspace.pkgs-graph": "workspace:*", "execa": "npm:safe-execa@^0.1.2", "find-up": "^5.0.0", "is-subdir": "^1.2.0", "micromatch": "^4.0.5", - "pkgs-graph": "workspace:*", "ramda": "npm:@pnpm/ramda@0.28.1" }, "devDependencies": { diff --git a/workspace/filter-workspace-packages/src/index.ts b/workspace/filter-workspace-packages/src/index.ts index 97994bcbdb..ac13bf71d3 100644 --- a/workspace/filter-workspace-packages/src/index.ts +++ b/workspace/filter-workspace-packages/src/index.ts @@ -1,6 +1,6 @@ import { findWorkspacePackages, Project } from '@pnpm/find-workspace-packages' import { createMatcher } from '@pnpm/matcher' -import { createPkgGraph, Package, PackageNode } from 'pkgs-graph' +import { createPkgGraph, Package, PackageNode } from '@pnpm/workspace.pkgs-graph' import isSubdir from 'is-subdir' import difference from 'ramda/src/difference' import partition from 'ramda/src/partition' diff --git a/workspace/find-workspace-packages/package.json b/workspace/find-workspace-packages/package.json index a22497a075..26fedcdcc1 100644 --- a/workspace/find-workspace-packages/package.json +++ b/workspace/find-workspace-packages/package.json @@ -33,7 +33,7 @@ "@pnpm/constants": "workspace:*", "@pnpm/types": "workspace:*", "@pnpm/util.lex-comparator": "1.0.0", - "find-packages": "workspace:*", + "@pnpm/fs.find-packages": "workspace:*", "read-yaml-file": "^2.1.0" }, "funding": "https://opencollective.com/pnpm", diff --git a/workspace/find-workspace-packages/src/index.ts b/workspace/find-workspace-packages/src/index.ts index a8fc7d588e..1e543b2e98 100644 --- a/workspace/find-workspace-packages/src/index.ts +++ b/workspace/find-workspace-packages/src/index.ts @@ -3,7 +3,7 @@ import { packageIsInstallable } from '@pnpm/cli-utils' import { WORKSPACE_MANIFEST_FILENAME } from '@pnpm/constants' import { Project } from '@pnpm/types' import { lexCompare } from '@pnpm/util.lex-comparator' -import { findPackages } from 'find-packages' +import { findPackages } from '@pnpm/fs.find-packages' import readYamlFile from 'read-yaml-file' export { Project } diff --git a/workspace/pkgs-graph/CHANGELOG.md b/workspace/pkgs-graph/CHANGELOG.md deleted file mode 100644 index 11cdd95859..0000000000 --- a/workspace/pkgs-graph/CHANGELOG.md +++ /dev/null @@ -1,88 +0,0 @@ -# pkgs-graph - -## 8.0.0 - -### Major Changes - -- f884689e0: Require `@pnpm/logger` v5. - -### Patch Changes - -- Updated dependencies [f884689e0] - - @pnpm/resolve-workspace-range@4.0.0 - -## 7.0.2 - -### Patch Changes - -- 8103f92bd: Use a patched version of ramda to fix deprecation warnings on Node.js 16. Related issue: https://github.com/ramda/ramda/pull/3270 - -## 7.0.1 - -### Patch Changes - -- 5f643f23b: Update ramda to v0.28. -- 42c1ea1c0: Update validate-npm-package-name to v4. - -## 7.0.0 - -### Major Changes - -- 542014839: Node.js 12 is not supported. - -### Patch Changes - -- Updated dependencies [542014839] - - @pnpm/resolve-workspace-range@3.0.0 - -## 6.1.3 - -### Patch Changes - -- f82cc7f77: fix: when set workspace protocol the pkgs in workspace without version not ignore - -## 6.1.2 - -### Patch Changes - -- a1a03d145: Import only the required functions from ramda. - -## 6.1.1 - -### Patch Changes - -- 1084ca1a7: Include dependencies with workspace version aliases in graph - -## 6.1.0 - -### Minor Changes - -- dfdf669e6: Add new cli arg --filter-prod. --filter-prod acts the same as --filter, but it omits devDependencies when building dependencies - -### Patch Changes - -- Updated dependencies [85fb21a83] - - @pnpm/resolve-workspace-range@2.1.0 - -## 6.0.0 - -### Major Changes - -- 97b986fbc: Node.js 10 support is dropped. At least Node.js 12.17 is required for the package to work. - -### Patch Changes - -- Updated dependencies [97b986fbc] - - @pnpm/resolve-workspace-range@2.0.0 - -## 5.2.0 - -### Minor Changes - -- e37a5a175: Support linkedWorkspacePackages=false. - -## 5.1.6 - -### Patch Changes - -- @pnpm/resolve-workspace-range@1.0.2 diff --git a/workspace/pkgs-graph/README.md b/workspace/pkgs-graph/README.md index 8b88c8061f..74056beb62 100644 --- a/workspace/pkgs-graph/README.md +++ b/workspace/pkgs-graph/README.md @@ -1,4 +1,4 @@ -# pkgs-graph +# @pnpm/workspace.pkgs-graph > Create a graph from an array of packages @@ -7,7 +7,7 @@ ## Installation ``` -pnpm add pkgs-graph +pnpm add @pnpm/workspace.pkgs-graph ``` ## Usage @@ -57,11 +57,6 @@ console.log(graph) // } ``` -## Related - -* [find-packages](https://github.com/zkochan/find-packages) - Find all packages inside a directory -* [sort-pkgs](https://github.com/zkochan/sort-pkgs) - Sort packages. Dependents first. - ## License [MIT](LICENSE) © [Zoltan Kochan](https://www.kochan.io) diff --git a/workspace/pkgs-graph/package.json b/workspace/pkgs-graph/package.json index a75b9745fc..19c16c925f 100644 --- a/workspace/pkgs-graph/package.json +++ b/workspace/pkgs-graph/package.json @@ -1,6 +1,6 @@ { - "name": "pkgs-graph", - "version": "8.0.0", + "name": "@pnpm/workspace.pkgs-graph", + "version": "0.0.0", "description": "Create a graph from an array of packages", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -27,7 +27,7 @@ "devDependencies": { "@types/ramda": "0.28.20", "better-path-resolve": "1.0.0", - "pkgs-graph": "workspace:*" + "@pnpm/workspace.pkgs-graph": "workspace:*" }, "dependencies": { "@pnpm/npm-package-arg": "^1.0.0", diff --git a/workspace/pkgs-graph/test/index.ts b/workspace/pkgs-graph/test/index.ts index bb87832b83..3910666c15 100644 --- a/workspace/pkgs-graph/test/index.ts +++ b/workspace/pkgs-graph/test/index.ts @@ -1,5 +1,5 @@ /// -import { createPkgGraph } from 'pkgs-graph' +import { createPkgGraph } from '@pnpm/workspace.pkgs-graph' import pathResolve from 'better-path-resolve' const BAR1_PATH = pathResolve('/zkochan/src/bar')