From 285976fd12f037f59da47307d98df7ebda5278d9 Mon Sep 17 00:00:00 2001 From: Gar Date: Mon, 10 May 2021 10:04:09 -0700 Subject: [PATCH] @npmcli/arborist@2.4.4 --- .../@npmcli/arborist/lib/arborist/reify.js | 11 +++++++++-- node_modules/@npmcli/arborist/package.json | 2 +- package-lock.json | 14 +++++++------- package.json | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/node_modules/@npmcli/arborist/lib/arborist/reify.js b/node_modules/@npmcli/arborist/lib/arborist/reify.js index f7731e1c90da0..b09a9e0fe16d7 100644 --- a/node_modules/@npmcli/arborist/lib/arborist/reify.js +++ b/node_modules/@npmcli/arborist/lib/arborist/reify.js @@ -972,8 +972,15 @@ module.exports = cls => class Reifier extends cls { // would allow versions outside the requested range. Tags and // specific versions save with the save-prefix. const isRange = (subSpec || req).type === 'range' - const range = !isRange || subset(prefixRange, spec, { loose: true }) - ? prefixRange : spec + + let range = spec + if ( + !isRange || + spec === '*' || + subset(prefixRange, spec, { loose: true }) + ) + range = prefixRange + const pname = child.packageName const alias = name !== pname newSpec = alias ? `npm:${pname}@${range}` : range diff --git a/node_modules/@npmcli/arborist/package.json b/node_modules/@npmcli/arborist/package.json index 7f70198cc1f80..bbe87d8bf97ad 100644 --- a/node_modules/@npmcli/arborist/package.json +++ b/node_modules/@npmcli/arborist/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/arborist", - "version": "2.4.3", + "version": "2.4.4", "description": "Manage node_modules trees", "dependencies": { "@npmcli/installed-package-contents": "^1.0.7", diff --git a/package-lock.json b/package-lock.json index 22a7c8763687e..7ea46a300d744 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,7 +78,7 @@ ], "license": "Artistic-2.0", "dependencies": { - "@npmcli/arborist": "^2.4.3", + "@npmcli/arborist": "^2.4.4", "@npmcli/ci-detect": "^1.2.0", "@npmcli/config": "^2.2.0", "@npmcli/run-script": "^1.8.5", @@ -712,9 +712,9 @@ } }, "node_modules/@npmcli/arborist": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.4.3.tgz", - "integrity": "sha512-8BJKsRXfJ+Ie9QxIJjQbjGysWRQF5rTR32jKlZYYR+O//GcoYkBdlklytQg1OBSECojAAbZY8glMEmW/HhElBA==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.4.4.tgz", + "integrity": "sha512-mqZvcPCWT6gSSYxs08aKvXmECXh9fP85q1pUIY/jDkaQ58QTRy6F7XrUQr7F77jXpYfpYKPUi6RhpuSpOXCITA==", "inBundle": true, "dependencies": { "@npmcli/installed-package-contents": "^1.0.7", @@ -10823,9 +10823,9 @@ "dev": true }, "@npmcli/arborist": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.4.3.tgz", - "integrity": "sha512-8BJKsRXfJ+Ie9QxIJjQbjGysWRQF5rTR32jKlZYYR+O//GcoYkBdlklytQg1OBSECojAAbZY8glMEmW/HhElBA==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.4.4.tgz", + "integrity": "sha512-mqZvcPCWT6gSSYxs08aKvXmECXh9fP85q1pUIY/jDkaQ58QTRy6F7XrUQr7F77jXpYfpYKPUi6RhpuSpOXCITA==", "requires": { "@npmcli/installed-package-contents": "^1.0.7", "@npmcli/map-workspaces": "^1.0.2", diff --git a/package.json b/package.json index 49b347db1cd47..8e63dcd5ce076 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "./package.json": "./package.json" }, "dependencies": { - "@npmcli/arborist": "^2.4.3", + "@npmcli/arborist": "^2.4.4", "@npmcli/ci-detect": "^1.2.0", "@npmcli/config": "^2.2.0", "@npmcli/run-script": "^1.8.5",