Osmwithspace/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Experimental json merge driver

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-01 04:59:22 +02:00
parent e904043069
commit 4480f2f5e3
5 changed files with 281 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

75
package-lock.json generated
View file

@ -51,6 +51,7 @@
"@types/node": "^7.0.5",
"assert": "^2.0.0",
"fs": "0.0.1-security",
"git-json-merge": "^0.4.5",
"marked": "^2.0.0",
"read-file": "^0.2.0",
"sharp": "^0.28.3",
@ -3078,6 +3079,12 @@
"node": ">=0.4.0"
}
},
"node_modules/adiff": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/adiff/-/adiff-0.2.13.tgz",
"integrity": "sha1-3D3TL5RNl/J366WM5SmXrf8fdyg=",
"dev": true
},
"node_modules/affine-hull": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/affine-hull/-/affine-hull-1.0.0.tgz",
@ -5255,6 +5262,15 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
"node_modules/detect-indent": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
"integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/detect-libc": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@ -6260,6 +6276,22 @@
"assert-plus": "^1.0.0"
}
},
"node_modules/git-json-merge": {
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/git-json-merge/-/git-json-merge-0.4.5.tgz",
"integrity": "sha512-akVUhyzRtkXGe5uAcw3AijF/253RA7tAPdfHtKLawYAhDjuyP+Ebr1YvZUv+7Jyr41g+IVRpKPBd2h+m6AHNqQ==",
"dev": true,
"dependencies": {
"detect-indent": "^6.0.0",
"xdiff": "^0.2.11"
},
"bin": {
"git-json-merge": "bin/git-json-merge"
},
"engines": {
"node": ">=4"
}
},
"node_modules/github-from-package": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@ -16338,6 +16370,18 @@
"async-limiter": "~1.0.0"
}
},
"node_modules/xdiff": {
"version": "0.2.11",
"resolved": "https://registry.npmjs.org/xdiff/-/xdiff-0.2.11.tgz",
"integrity": "sha1-cj1SPhtvJlojPK/HeGBiLqXS2Mg=",
"dev": true,
"dependencies": {
"adiff": "~0.2.4"
},
"engines": {
"node": "*"
}
},
"node_modules/xml-name-validator": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
@ -19104,6 +19148,12 @@
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
},
"adiff": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/adiff/-/adiff-0.2.13.tgz",
"integrity": "sha1-3D3TL5RNl/J366WM5SmXrf8fdyg=",
"dev": true
},
"affine-hull": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/affine-hull/-/affine-hull-1.0.0.tgz",
@ -20861,6 +20911,12 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
"detect-indent": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
"integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
"dev": true
},
"detect-libc": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@ -21666,6 +21722,16 @@
"assert-plus": "^1.0.0"
}
},
"git-json-merge": {
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/git-json-merge/-/git-json-merge-0.4.5.tgz",
"integrity": "sha512-akVUhyzRtkXGe5uAcw3AijF/253RA7tAPdfHtKLawYAhDjuyP+Ebr1YvZUv+7Jyr41g+IVRpKPBd2h+m6AHNqQ==",
"dev": true,
"requires": {
"detect-indent": "^6.0.0",
"xdiff": "^0.2.11"
}
},
"github-from-package": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@ -29892,6 +29958,15 @@
"async-limiter": "~1.0.0"
}
},
"xdiff": {
"version": "0.2.11",
"resolved": "https://registry.npmjs.org/xdiff/-/xdiff-0.2.11.tgz",
"integrity": "sha1-cj1SPhtvJlojPK/HeGBiLqXS2Mg=",
"dev": true,
"requires": {
"adiff": "~0.2.4"
}
},
"xml-name-validator": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",