RetroSearch Browse

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://github.com/npm/cli/commit/f9b2e1884fbfe2a2c41e3fcaa4be722209141aed below:

update parse-conflict-json@4.0.0 · npm/cli@f9b2e18 · GitHub

File tree Expand file treeCollapse file tree 8 files changed

+21

-243

lines changed

Filter options

- - node_modules/json-parse-even-better-errors

Expand file treeCollapse file tree 8 files changed

+21

-243

lines changed Original file line number Diff line number Diff line change


 @@ -284,9 +284,6 @@

284 284


 !/pacote/node_modules/ssri

285 285


 !/pacote/node_modules/which

286 286


 !/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

290 287


 !/path-key

291 288


 !/path-scurry

292 289


 !/postcss-selector-parser

Original file line number Diff line number Diff line change


 @@ -1,18 +1,19 @@

1 1

2 2


 "name": "parse-conflict-json",

3

-
 "version": "3.0.1",

3

+
 "version": "4.0.0",

4 4


 "description": "Parse a JSON string that has git merge conflicts, resolving if possible",

5 5


 "author": "GitHub Inc.",

6 6


 "license": "ISC",

7 7


 "main": "lib",

8 8


 "scripts": {

9 9


 "test": "tap",

10 10


 "snap": "tap",

11

-
 "lint": "eslint \"**/*.js\"",

11

+
 "lint": "npm run eslint",

12 12


 "postlint": "template-oss-check",

13

-
 "lintfix": "npm run lint -- --fix",

13

+
 "lintfix": "npm run eslint -- --fix",

14 14


 "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}\""

16 17

},

17 18


 "tap": {

18 19


 "check-coverage": true,


 @@ -22,28 +23,29 @@

22 23

23 24

},

24 25


 "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",

27 28


 "tap": "^16.0.1"

28 29

},

29 30


 "dependencies": {

30

-
 "json-parse-even-better-errors": "^3.0.0",

31

+
 "json-parse-even-better-errors": "^4.0.0",

31 32


 "just-diff": "^6.0.0",

32 33


 "just-diff-apply": "^5.2.0"

33 34

},

34 35


 "repository": {

35 36


 "type": "git",

36

-
 "url": "https://github.com/npm/parse-conflict-json.git"

37

+
 "url": "git+https://github.com/npm/parse-conflict-json.git"

37 38

},

38 39


 "files": [

39 40


 "bin/",

40 41


 "lib/"

41 42

],

42 43


 "engines": {

43

-
 "node": "^14.17.0 || ^16.13.0 || >=18.0.0"

44

+
 "node": "^18.17.0 || >=20.5.0"

44 45

},

45 46


 "templateOSS": {

46 47


 "//@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

48 50

49 51

Original file line number Diff line number Diff line change


 @@ -139,7 +139,7 @@

139 139


 "npm-user-validate": "^3.0.0",

140 140


 "p-map": "^4.0.0",

141 141


 "pacote": "^19.0.0",

142

-
 "parse-conflict-json": "^3.0.1",

142

+
 "parse-conflict-json": "^4.0.0",

143 143


 "proc-log": "^4.2.0",

144 144


 "qrcode-terminal": "^0.12.0",

145 145


 "read": "^3.0.1",


 @@ -11423,28 +11423,18 @@

11423 11423

11424 11424

},

11425 11425


 "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==",

11429 11429


 "inBundle": true,

11430 11430


 "license": "ISC",

11431 11431


 "dependencies": {

11432

-
 "json-parse-even-better-errors": "^3.0.0",

11432

+
 "json-parse-even-better-errors": "^4.0.0",

11433 11433


 "just-diff": "^6.0.0",

11434 11434


 "just-diff-apply": "^5.2.0"

11435 11435

},

11436 11436


 "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"

11448 11438

11449 11439

},

11450 11440


 "node_modules/parse-diff": {


 @@ -17169,7 +17159,7 @@

17169 17159


 "npm-pick-manifest": "^10.0.0",

17170 17160


 "npm-registry-fetch": "^18.0.1",

17171 17161


 "pacote": "^19.0.0",

17172

-
 "parse-conflict-json": "^3.0.0",

17162

+
 "parse-conflict-json": "^4.0.0",

17173 17163


 "proc-log": "^4.2.0",

17174 17164


 "proggy": "^2.0.0",

17175 17165


 "promise-all-reject-late": "^1.0.0",

Original file line number Diff line number Diff line change


 @@ -104,7 +104,7 @@

104 104


 "npm-user-validate": "^3.0.0",

105 105


 "p-map": "^4.0.0",

106 106


 "pacote": "^19.0.0",

107

-
 "parse-conflict-json": "^3.0.1",

107

+
 "parse-conflict-json": "^4.0.0",

108 108


 "proc-log": "^4.2.0",

109 109


 "qrcode-terminal": "^0.12.0",

110 110


 "read": "^3.0.1",

Original file line number Diff line number Diff line change


 @@ -28,7 +28,7 @@

28 28


 "npm-pick-manifest": "^10.0.0",

29 29


 "npm-registry-fetch": "^18.0.1",

30 30


 "pacote": "^19.0.0",

31

-
 "parse-conflict-json": "^3.0.0",

31

+
 "parse-conflict-json": "^4.0.0",

32 32


 "proc-log": "^4.2.0",

33 33


 "proggy": "^2.0.0",

34 34


 "promise-all-reject-late": "^1.0.0",

You can’t perform that action at this time.

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4