Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: @npmcli/[email protected] #3990

Merged
merged 1 commit into from
Nov 4, 2021
Merged

deps: @npmcli/[email protected] #3990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions node_modules/@npmcli/arborist/lib/arborist/reify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,10 @@ module.exports = cls => class Reifier extends cls {
}

let newSpec
// True if the dependency is getting installed from a local file path
// In this case it is not possible to do the normal version comparisons
// as the new version will be a file path
const isLocalDep = req.type === 'directory' || req.type === 'file'
if (req.registry) {
const version = child.version
const prefixRange = version ? this[_savePrefix] + version : '*'
Expand Down Expand Up @@ -1204,7 +1208,7 @@ module.exports = cls => class Reifier extends cls {
} else {
newSpec = h.shortcut(opt)
}
} else if (req.type === 'directory' || req.type === 'file') {
} else if (isLocalDep) {
// save the relative path in package.json
// Normally saveSpec is updated with the proper relative
// path already, but it's possible to specify a full absolute
Expand Down Expand Up @@ -1233,11 +1237,11 @@ module.exports = cls => class Reifier extends cls {
if (hasSubKey(pkg, 'devDependencies', name)) {
pkg.devDependencies[name] = newSpec
// don't update peer or optional if we don't have to
if (hasSubKey(pkg, 'peerDependencies', name) && !intersects(newSpec, pkg.peerDependencies[name])) {
if (hasSubKey(pkg, 'peerDependencies', name) && (isLocalDep || !intersects(newSpec, pkg.peerDependencies[name]))) {
pkg.peerDependencies[name] = newSpec
}

if (hasSubKey(pkg, 'optionalDependencies', name) && !intersects(newSpec, pkg.optionalDependencies[name])) {
if (hasSubKey(pkg, 'optionalDependencies', name) && (isLocalDep || !intersects(newSpec, pkg.optionalDependencies[name]))) {
pkg.optionalDependencies[name] = newSpec
}
} else {
Expand Down
7 changes: 4 additions & 3 deletions node_modules/@npmcli/arborist/lib/place-dep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,11 +407,12 @@ class PlaceDep {
for (const entryEdge of peerEntrySets(edge.from).keys()) {
// either this one needs to be pruned and re-evaluated, or marked
// as peerConflicted and warned about. If the entryEdge comes in from
// the root, then we have to leave it alone, and in that case, it
// will have already warned or crashed by getting to this point.
// the root or a workspace, then we have to leave it alone, and in that
// case, it will have already warned or crashed by getting to this point
const entryNode = entryEdge.to
const deepestTarget = deepestNestingTarget(entryNode)
if (deepestTarget !== target && !entryEdge.from.isRoot) {
if (deepestTarget !== target &&
!(entryEdge.from.isProjectRoot || entryEdge.from.isWorkspace)) {
prunePeerSets.push(...gatherDepSet([entryNode], e => {
return e.to !== entryNode && !e.peerConflicted
}))
Expand Down
2 changes: 1 addition & 1 deletion node_modules/@npmcli/arborist/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@npmcli/arborist",
"version": "4.0.3",
"version": "4.0.4",
"description": "Manage node_modules trees",
"dependencies": {
"@isaacs/string-locale-compare": "^1.0.1",
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
],
"dependencies": {
"@isaacs/string-locale-compare": "^1.1.0",
"@npmcli/arborist": "^4.0.3",
"@npmcli/arborist": "^4.0.4",
"@npmcli/ci-detect": "^1.4.0",
"@npmcli/config": "^2.3.0",
"@npmcli/map-workspaces": "^2.0.0",
Expand Down Expand Up @@ -772,9 +772,9 @@
}
},
"node_modules/@npmcli/arborist": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.0.3.tgz",
"integrity": "sha512-gFz/dNJtpv2bYXlupcUpEaWlFDRUNmvVnQNbE6dY4ild6beZ2SkG4R5/CM4GZZwj9HD2TyfGjO350Ja+xlLzuA==",
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.0.4.tgz",
"integrity": "sha512-5hRkiHF9zu62z6a7CJqhVG5CFUVnbYqvrrcxxEmhxFgyH2ovICyULOrj7nF4VBlfzp7OPu/rveV2ts9iYrn74g==",
"inBundle": true,
"dependencies": {
"@isaacs/string-locale-compare": "^1.0.1",
Expand Down Expand Up @@ -11082,9 +11082,9 @@
"dev": true
},
"@npmcli/arborist": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.0.3.tgz",
"integrity": "sha512-gFz/dNJtpv2bYXlupcUpEaWlFDRUNmvVnQNbE6dY4ild6beZ2SkG4R5/CM4GZZwj9HD2TyfGjO350Ja+xlLzuA==",
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.0.4.tgz",
"integrity": "sha512-5hRkiHF9zu62z6a7CJqhVG5CFUVnbYqvrrcxxEmhxFgyH2ovICyULOrj7nF4VBlfzp7OPu/rveV2ts9iYrn74g==",
"requires": {
"@isaacs/string-locale-compare": "^1.0.1",
"@npmcli/installed-package-contents": "^1.0.7",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
},
"dependencies": {
"@isaacs/string-locale-compare": "^1.1.0",
"@npmcli/arborist": "^4.0.3",
"@npmcli/arborist": "^4.0.4",
"@npmcli/ci-detect": "^1.4.0",
"@npmcli/config": "^2.3.0",
"@npmcli/map-workspaces": "^2.0.0",
Expand Down