Skip to content

Commit f9b2e18

Browse files
reggireggi
committed
deps: update [email protected]
1 parent e7ab206 commit f9b2e18

File tree

8 files changed

+21
-243
lines changed

8 files changed

+21
-243
lines changed

‎node_modules/.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,6 @@
284284
!/pacote/node_modules/ssri
285285
!/pacote/node_modules/which
286286
!/parse-conflict-json
287-
!/parse-conflict-json/node_modules/
288-
/parse-conflict-json/node_modules/*
289-
!/parse-conflict-json/node_modules/json-parse-even-better-errors
290287
!/path-key
291288
!/path-scurry
292289
!/postcss-selector-parser

‎node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors/LICENSE.md

-25
This file was deleted.

‎node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors/lib/index.js

-137
This file was deleted.

‎node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors/package.json

-49
This file was deleted.

‎node_modules/parse-conflict-json/package.json

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"name": "parse-conflict-json",
3-
"version": "3.0.1",
3+
"version": "4.0.0",
44
"description": "Parse a JSON string that has git merge conflicts, resolving if possible",
55
"author": "GitHub Inc.",
66
"license": "ISC",
77
"main": "lib",
88
"scripts": {
99
"test": "tap",
1010
"snap": "tap",
11-
"lint": "eslint \"**/*.js\"",
11+
"lint": "npm run eslint",
1212
"postlint": "template-oss-check",
13-
"lintfix": "npm run lint -- --fix",
13+
"lintfix": "npm run eslint -- --fix",
1414
"posttest": "npm run lint",
15-
"template-oss-apply": "template-oss-apply --force"
15+
"template-oss-apply": "template-oss-apply --force",
16+
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
1617
},
1718
"tap": {
1819
"check-coverage": true,
@@ -22,28 +23,29 @@
2223
]
2324
},
2425
"devDependencies": {
25-
"@npmcli/eslint-config": "^4.0.0",
26-
"@npmcli/template-oss": "4.12.0",
26+
"@npmcli/eslint-config": "^5.0.0",
27+
"@npmcli/template-oss": "4.23.3",
2728
"tap": "^16.0.1"
2829
},
2930
"dependencies": {
30-
"json-parse-even-better-errors": "^3.0.0",
31+
"json-parse-even-better-errors": "^4.0.0",
3132
"just-diff": "^6.0.0",
3233
"just-diff-apply": "^5.2.0"
3334
},
3435
"repository": {
3536
"type": "git",
36-
"url": "https://github.com/npm/parse-conflict-json.git"
37+
"url": "git+https://github.com/npm/parse-conflict-json.git"
3738
},
3839
"files": [
3940
"bin/",
4041
"lib/"
4142
],
4243
"engines": {
43-
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
44+
"node": "^18.17.0 || >=20.5.0"
4445
},
4546
"templateOSS": {
4647
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
47-
"version": "4.12.0"
48+
"version": "4.23.3",
49+
"publish": true
4850
}
4951
}

‎package-lock.json

+7-17
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
"npm-user-validate": "^3.0.0",
140140
"p-map": "^4.0.0",
141141
"pacote": "^19.0.0",
142-
"parse-conflict-json": "^3.0.1",
142+
"parse-conflict-json": "^4.0.0",
143143
"proc-log": "^4.2.0",
144144
"qrcode-terminal": "^0.12.0",
145145
"read": "^3.0.1",
@@ -11423,28 +11423,18 @@
1142311423
}
1142411424
},
1142511425
"node_modules/parse-conflict-json": {
11426-
"version": "3.0.1",
11427-
"resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz",
11428-
"integrity": "sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==",
11426+
"version": "4.0.0",
11427+
"resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-4.0.0.tgz",
11428+
"integrity": "sha512-37CN2VtcuvKgHUs8+0b1uJeEsbGn61GRHz469C94P5xiOoqpDYJYwjg4RY9Vmz39WyZAVkR5++nbJwLMIgOCnQ==",
1142911429
"inBundle": true,
1143011430
"license": "ISC",
1143111431
"dependencies": {
11432-
"json-parse-even-better-errors": "^3.0.0",
11432+
"json-parse-even-better-errors": "^4.0.0",
1143311433
"just-diff": "^6.0.0",
1143411434
"just-diff-apply": "^5.2.0"
1143511435
},
1143611436
"engines": {
11437-
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
11438-
}
11439-
},
11440-
"node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors": {
11441-
"version": "3.0.2",
11442-
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
11443-
"integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
11444-
"inBundle": true,
11445-
"license": "MIT",
11446-
"engines": {
11447-
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
11437+
"node": "^18.17.0 || >=20.5.0"
1144811438
}
1144911439
},
1145011440
"node_modules/parse-diff": {
@@ -17169,7 +17159,7 @@
1716917159
"npm-pick-manifest": "^10.0.0",
1717017160
"npm-registry-fetch": "^18.0.1",
1717117161
"pacote": "^19.0.0",
17172-
"parse-conflict-json": "^3.0.0",
17162+
"parse-conflict-json": "^4.0.0",
1717317163
"proc-log": "^4.2.0",
1717417164
"proggy": "^2.0.0",
1717517165
"promise-all-reject-late": "^1.0.0",

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"npm-user-validate": "^3.0.0",
105105
"p-map": "^4.0.0",
106106
"pacote": "^19.0.0",
107-
"parse-conflict-json": "^3.0.1",
107+
"parse-conflict-json": "^4.0.0",
108108
"proc-log": "^4.2.0",
109109
"qrcode-terminal": "^0.12.0",
110110
"read": "^3.0.1",

‎workspaces/arborist/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"npm-pick-manifest": "^10.0.0",
2929
"npm-registry-fetch": "^18.0.1",
3030
"pacote": "^19.0.0",
31-
"parse-conflict-json": "^3.0.0",
31+
"parse-conflict-json": "^4.0.0",
3232
"proc-log": "^4.2.0",
3333
"proggy": "^2.0.0",
3434
"promise-all-reject-late": "^1.0.0",

0 commit comments

Comments
 (0)