deps: @npmcli/arborist@4.1.1 parse-conflict-json@2.0.1

* Fixes object property assignment bug in resolving package-locks with
  conflicts

PR-URL: https://github.com/npm/cli/pull/4141
Credit: @wraithgar
Close: #4141
Reviewed-by: @fritzy

1 files changed, 37 insertions, 34 deletions

diff --git a/package-lock.json b/package-lock.json
index b6df88dfe..e38318d1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -87,7 +87,7 @@
       ],
       "dependencies": {
         "@isaacs/string-locale-compare": "^1.1.0",
-        "@npmcli/arborist": "^4.1.0",
+        "@npmcli/arborist": "^4.1.1",
         "@npmcli/ci-detect": "^1.4.0",
         "@npmcli/config": "^2.3.2",
         "@npmcli/map-workspaces": "^2.0.0",
@@ -140,7 +140,7 @@
         "npmlog": "^6.0.0",
         "opener": "^1.5.2",
         "pacote": "^12.0.2",
-        "parse-conflict-json": "^1.1.1",
+        "parse-conflict-json": "^2.0.1",
         "proc-log": "^1.0.0",
         "qrcode-terminal": "^0.12.0",
         "read": "~1.0.7",
@@ -801,9 +801,9 @@
       }
     },
     "node_modules/@npmcli/arborist": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.1.0.tgz",
-      "integrity": "sha512-bkaOqCuTUtpVOe1vaAP7TUihu64wIbnSDpsbqBJUsGFTLYXbjKwi6xj8Zx5cfHkM3nqyeEEbPYlGkt0TXjKrUg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.1.1.tgz",
+      "integrity": "sha512-sASzHngGWt8l6ic1VP0Qf3+ral/RL8L+MculTp2w8NYjjkDiurByOT39KiYmLwpeJ2GQoDR/rdhEwnII8wZQ9g==",
       "inBundle": true,
       "dependencies": {
         "@isaacs/string-locale-compare": "^1.1.0",
@@ -827,7 +827,7 @@
         "npm-pick-manifest": "^6.1.0",
         "npm-registry-fetch": "^11.0.0",
         "pacote": "^12.0.2",
-        "parse-conflict-json": "^1.1.1",
+        "parse-conflict-json": "^2.0.1",
         "proc-log": "^1.0.0",
         "promise-all-reject-late": "^1.0.0",
         "promise-call-limit": "^1.0.1",
@@ -4584,15 +4584,15 @@
       }
     },
     "node_modules/just-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-3.1.1.tgz",
-      "integrity": "sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-5.0.1.tgz",
+      "integrity": "sha512-X00TokkRIDotUIf3EV4xUm6ELc/IkqhS/vPSHdWnsM5y0HoNMfEqrazizI7g78lpHvnRSRt/PFfKtRqJCOGIuQ==",
       "inBundle": true
     },
     "node_modules/just-diff-apply": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-3.0.0.tgz",
-      "integrity": "sha512-K2MLc+ZC2DVxX4V61bIKPeMUUfj1YYZ3h0myhchDXOW1cKoPZMnjIoNCqv9bF2n5Oob1PFxuR2gVJxkxz4e58w==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-4.0.1.tgz",
+      "integrity": "sha512-AKOkzB5P6FkfP21UlZVX/OPXx/sC2GagpLX9cBxqHqDuRjwmZ/AJRKSNrB9jHPpRW1W1ONs6gly1gW46t055nQ==",
       "inBundle": true
     },
     "node_modules/lcov-parse": {
@@ -5835,14 +5835,17 @@
       }
     },
     "node_modules/parse-conflict-json": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz",
-      "integrity": "sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-2.0.1.tgz",
+      "integrity": "sha512-Y7nYw+QaSGBto1LB9lgwOR05Rtz5SbuTf+Oe7HJ6SYQ/DHsvRjQ8O03oWdJbvkt6GzDWospgyZbGmjDYL0sDgA==",
       "inBundle": true,
       "dependencies": {
-        "json-parse-even-better-errors": "^2.3.0",
-        "just-diff": "^3.0.1",
-        "just-diff-apply": "^3.0.0"
+        "json-parse-even-better-errors": "^2.3.1",
+        "just-diff": "^5.0.1",
+        "just-diff-apply": "^4.0.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16"
       }
     },
     "node_modules/parse-entities": {
@@ -10664,9 +10667,9 @@
       "dev": true
     },
     "@npmcli/arborist": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.1.0.tgz",
-      "integrity": "sha512-bkaOqCuTUtpVOe1vaAP7TUihu64wIbnSDpsbqBJUsGFTLYXbjKwi6xj8Zx5cfHkM3nqyeEEbPYlGkt0TXjKrUg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.1.1.tgz",
+      "integrity": "sha512-sASzHngGWt8l6ic1VP0Qf3+ral/RL8L+MculTp2w8NYjjkDiurByOT39KiYmLwpeJ2GQoDR/rdhEwnII8wZQ9g==",
       "requires": {
         "@isaacs/string-locale-compare": "^1.1.0",
         "@npmcli/installed-package-contents": "^1.0.7",
@@ -10689,7 +10692,7 @@
         "npm-pick-manifest": "^6.1.0",
         "npm-registry-fetch": "^11.0.0",
         "pacote": "^12.0.2",
-        "parse-conflict-json": "^1.1.1",
+        "parse-conflict-json": "^2.0.1",
         "proc-log": "^1.0.0",
         "promise-all-reject-late": "^1.0.0",
         "promise-call-limit": "^1.0.1",
@@ -13435,14 +13438,14 @@
       }
     },
     "just-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-3.1.1.tgz",
-      "integrity": "sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-5.0.1.tgz",
+      "integrity": "sha512-X00TokkRIDotUIf3EV4xUm6ELc/IkqhS/vPSHdWnsM5y0HoNMfEqrazizI7g78lpHvnRSRt/PFfKtRqJCOGIuQ=="
     },
     "just-diff-apply": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-3.0.0.tgz",
-      "integrity": "sha512-K2MLc+ZC2DVxX4V61bIKPeMUUfj1YYZ3h0myhchDXOW1cKoPZMnjIoNCqv9bF2n5Oob1PFxuR2gVJxkxz4e58w=="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-4.0.1.tgz",
+      "integrity": "sha512-AKOkzB5P6FkfP21UlZVX/OPXx/sC2GagpLX9cBxqHqDuRjwmZ/AJRKSNrB9jHPpRW1W1ONs6gly1gW46t055nQ=="
     },
     "lcov-parse": {
       "version": "1.0.0",
@@ -14379,13 +14382,13 @@
       }
     },
     "parse-conflict-json": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz",
-      "integrity": "sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-2.0.1.tgz",
+      "integrity": "sha512-Y7nYw+QaSGBto1LB9lgwOR05Rtz5SbuTf+Oe7HJ6SYQ/DHsvRjQ8O03oWdJbvkt6GzDWospgyZbGmjDYL0sDgA==",
       "requires": {
-        "json-parse-even-better-errors": "^2.3.0",
-        "just-diff": "^3.0.1",
-        "just-diff-apply": "^3.0.0"
+        "json-parse-even-better-errors": "^2.3.1",
+        "just-diff": "^5.0.1",
+        "just-diff-apply": "^4.0.1"
       }
     },
     "parse-entities": {