From 011bb122035dcd43769ec35982662cca41635068 Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Fri, 11 Dec 2020 11:49:38 -0800
Subject: [PATCH] @npmcli/arborist@2.0.1

* Do not save with ^ and no version

Fix: #2320
---
 .../@npmcli/arborist/lib/arborist/reify.js     |  2 +-
 node_modules/@npmcli/arborist/package.json     |  2 +-
 package-lock.json                              | 18 +++++++++---------
 package.json                                   |  4 +++-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/node_modules/@npmcli/arborist/lib/arborist/reify.js b/node_modules/@npmcli/arborist/lib/arborist/reify.js
index b16f2085566b2..1f979ba1402c3 100644
--- a/node_modules/@npmcli/arborist/lib/arborist/reify.js
+++ b/node_modules/@npmcli/arborist/lib/arborist/reify.js
@@ -808,7 +808,7 @@ module.exports = cls => class Reifier extends cls {
 
         if (req.registry) {
           const version = child.version
-          const prefixRange = this[_savePrefix] + version
+          const prefixRange = version ? this[_savePrefix] + version : '*'
           // if we installed a range, then we save the range specified
           // if it is not a subset of the ^x.y.z.  eg, installing a range
           // of `1.x <1.2.3` will not be saved as `^1.2.0`, because that
diff --git a/node_modules/@npmcli/arborist/package.json b/node_modules/@npmcli/arborist/package.json
index c8dce9a2b0684..2f3ccb6131982 100644
--- a/node_modules/@npmcli/arborist/package.json
+++ b/node_modules/@npmcli/arborist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/arborist",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Manage node_modules trees",
   "dependencies": {
     "@npmcli/installed-package-contents": "^1.0.5",
diff --git a/package-lock.json b/package-lock.json
index 43ffa8666dea5..dc2ecebbb4a84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,6 +43,8 @@
         "libnpmteam",
         "libnpmversion",
         "make-fetch-happen",
+        "minipass",
+        "minipass-pipeline",
         "mkdirp",
         "mkdirp-infer-owner",
         "ms",
@@ -248,12 +250,10 @@
         "mime-types",
         "minimatch",
         "minimist",
-        "minipass",
         "minipass-collect",
         "minipass-fetch",
         "minipass-flush",
         "minipass-json-stream",
-        "minipass-pipeline",
         "minipass-sized",
         "minizlib",
         "mute-stream",
@@ -356,7 +356,7 @@
       ],
       "license": "Artistic-2.0",
       "dependencies": {
-        "@npmcli/arborist": "^2.0.0",
+        "@npmcli/arborist": "^2.0.1",
         "@npmcli/ci-detect": "^1.2.0",
         "@npmcli/config": "^1.2.6",
         "@npmcli/run-script": "^1.8.1",
@@ -685,9 +685,9 @@
       }
     },
     "node_modules/@npmcli/arborist": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.0.0.tgz",
-      "integrity": "sha512-0h32rv2ZU6j5NR6V3WWx+8u10rwoF2SH1uTRzuNeTxfkHWbiuMd4xeUqJDMYzzlVAi9Jdk9L3pgtiDyXZP+8Lw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.0.1.tgz",
+      "integrity": "sha512-xUH2aggJhPTrKu94sAQxwyPLr/LHFLYTEzd+tQ/Ubgrs6H1UQSdQKrq/U+mlx74ypxw7Ee/blPJBed8SnMqXpA==",
       "inBundle": true,
       "dependencies": {
         "@npmcli/installed-package-contents": "^1.0.5",
@@ -9861,9 +9861,9 @@
       }
     },
     "@npmcli/arborist": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.0.0.tgz",
-      "integrity": "sha512-0h32rv2ZU6j5NR6V3WWx+8u10rwoF2SH1uTRzuNeTxfkHWbiuMd4xeUqJDMYzzlVAi9Jdk9L3pgtiDyXZP+8Lw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.0.1.tgz",
+      "integrity": "sha512-xUH2aggJhPTrKu94sAQxwyPLr/LHFLYTEzd+tQ/Ubgrs6H1UQSdQKrq/U+mlx74ypxw7Ee/blPJBed8SnMqXpA==",
       "requires": {
         "@npmcli/installed-package-contents": "^1.0.5",
         "@npmcli/map-workspaces": "^1.0.1",
diff --git a/package.json b/package.json
index f944cb2ddcb51..cdf90c82a1d7e 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@npmcli/arborist": "^2.0.0",
+    "@npmcli/arborist": "^2.0.1",
     "@npmcli/ci-detect": "^1.2.0",
     "@npmcli/config": "^1.2.6",
     "@npmcli/run-script": "^1.8.1",
@@ -146,6 +146,8 @@
     "libnpmteam",
     "libnpmversion",
     "make-fetch-happen",
+    "minipass",
+    "minipass-pipeline",
     "mkdirp",
     "mkdirp-infer-owner",
     "ms",