deps: update [email protected]

npm · Oct 2, 2024 · f9b2e18 · f9b2e18
1 parent e7ab206
commit f9b2e18
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 243 deletions.
diff --git a/node_modules/.gitignore b/node_modules/.gitignore
@@ -284,9 +284,6 @@
 !/pacote/node_modules/ssri
 !/pacote/node_modules/which
 !/parse-conflict-json
-!/parse-conflict-json/node_modules/
-/parse-conflict-json/node_modules/*
-!/parse-conflict-json/node_modules/json-parse-even-better-errors
 !/path-key
 !/path-scurry
 !/postcss-selector-parser

diff --git a/...dules/parse-conflict-json/node_modules/json-parse-even-better-errors/LICENSE.md b/...dules/parse-conflict-json/node_modules/json-parse-even-better-errors/LICENSE.md
diff --git a/node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors/lib/index.js b/node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors/lib/index.js
diff --git a/node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors/package.json b/node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors/package.json
diff --git a/node_modules/parse-conflict-json/package.json b/node_modules/parse-conflict-json/package.json
@@ -1,18 +1,19 @@
 {
   "name": "parse-conflict-json",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "description": "Parse a JSON string that has git merge conflicts, resolving if possible",
   "author": "GitHub Inc.",
   "license": "ISC",
   "main": "lib",
   "scripts": {
     "test": "tap",
     "snap": "tap",
-    "lint": "eslint \"**/*.js\"",
+    "lint": "npm run eslint",
     "postlint": "template-oss-check",
-    "lintfix": "npm run lint -- --fix",
+    "lintfix": "npm run eslint -- --fix",
     "posttest": "npm run lint",
-    "template-oss-apply": "template-oss-apply --force"
+    "template-oss-apply": "template-oss-apply --force",
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "tap": {
     "check-coverage": true,
@@ -22,28 +23,29 @@
     ]
   },
   "devDependencies": {
-    "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.12.0",
+    "@npmcli/eslint-config": "^5.0.0",
+    "@npmcli/template-oss": "4.23.3",
     "tap": "^16.0.1"
   },
   "dependencies": {
-    "json-parse-even-better-errors": "^3.0.0",
+    "json-parse-even-better-errors": "^4.0.0",
     "just-diff": "^6.0.0",
     "just-diff-apply": "^5.2.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/npm/parse-conflict-json.git"
+    "url": "git+https://github.com/npm/parse-conflict-json.git"
   },
   "files": [
     "bin/",
     "lib/"
   ],
   "engines": {
-    "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+    "node": "^18.17.0 || >=20.5.0"
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.12.0"
+    "version": "4.23.3",
+    "publish": true
   }
 }
diff --git a/package-lock.json b/package-lock.json
@@ -139,7 +139,7 @@
         "npm-user-validate": "^3.0.0",
         "p-map": "^4.0.0",
         "pacote": "^19.0.0",
-        "parse-conflict-json": "^3.0.1",
+        "parse-conflict-json": "^4.0.0",
         "proc-log": "^4.2.0",
         "qrcode-terminal": "^0.12.0",
         "read": "^3.0.1",
@@ -11423,28 +11423,18 @@
       }
     },
     "node_modules/parse-conflict-json": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz",
-      "integrity": "sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-4.0.0.tgz",
+      "integrity": "sha512-37CN2VtcuvKgHUs8+0b1uJeEsbGn61GRHz469C94P5xiOoqpDYJYwjg4RY9Vmz39WyZAVkR5++nbJwLMIgOCnQ==",
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
-        "json-parse-even-better-errors": "^3.0.0",
+        "json-parse-even-better-errors": "^4.0.0",
         "just-diff": "^6.0.0",
         "just-diff-apply": "^5.2.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
-      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/parse-diff": {
@@ -17169,7 +17159,7 @@
         "npm-pick-manifest": "^10.0.0",
         "npm-registry-fetch": "^18.0.1",
         "pacote": "^19.0.0",
-        "parse-conflict-json": "^3.0.0",
+        "parse-conflict-json": "^4.0.0",
         "proc-log": "^4.2.0",
         "proggy": "^2.0.0",
         "promise-all-reject-late": "^1.0.0",

diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
     "npm-user-validate": "^3.0.0",
     "p-map": "^4.0.0",
     "pacote": "^19.0.0",
-    "parse-conflict-json": "^3.0.1",
+    "parse-conflict-json": "^4.0.0",
     "proc-log": "^4.2.0",
     "qrcode-terminal": "^0.12.0",
     "read": "^3.0.1",

diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json
@@ -28,7 +28,7 @@
     "npm-pick-manifest": "^10.0.0",
     "npm-registry-fetch": "^18.0.1",
     "pacote": "^19.0.0",
-    "parse-conflict-json": "^3.0.0",
+    "parse-conflict-json": "^4.0.0",
     "proc-log": "^4.2.0",
     "proggy": "^2.0.0",
     "promise-all-reject-late": "^1.0.0",