StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/preview 

# Conflicts:
#	HISTORY.md
This commit is contained in:
jos 2019-07-24 13:48:20 +02:00
parent 745a4f3665 8c06c41f02
commit 6bef66aaba
6 changed files with 694 additions and 983 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HISTORY.md
View File

@ -5,10 +5,12 @@ https://github.com/josdejong/jsoneditor
## not yet published, version 6.2.0
- Implemented new mode `preview`, capable of working with JSON files up to
about 500 MB.
- Fixed #730: in `code` mode, there was an initial undo action which clears
the content.
- Upgraded dependencies `vanilla-picker@2.9.0`, `mobius1-selectr@2.4.13`.
- Upgraded dependencies `vanilla-picker@2.9.1`, `mobius1-selectr@2.4.13`,
`ajv@6.10.2`.
## 2019-06-22, version 6.1.0

797
examples/react_advanced_demo/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
examples/react_advanced_demo/package.json
View File

@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"jsoneditor": "file:../..",
"lodash": "4.17.13",
"lodash": "4.17.15",
"react": "16.8.6",
"react-dom": "16.8.6",
"react-scripts": "3.0.1"

800
examples/react_demo/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

62
package-lock.json generated
View File

@ -226,9 +226,9 @@
"dev": true
},
"ajv": {
"version": "6.10.1",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz",
"integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==",
"version": "6.10.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
"integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
"requires": {
"fast-deep-equal": "^2.0.1",
"fast-json-stable-stringify": "^2.0.0",
@ -1350,12 +1350,12 @@
"dev": true
},
"cssstyle": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.3.0.tgz",
"integrity": "sha512-wXsoRfsRfsLVNaVzoKdqvEmK/5PFaEXNspVT22Ots6K/cnJdpoDKuQFw+qlMiXnmaif1OgeC466X1zISgAOcGg==",
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
"integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
"dev": true,
"requires": {
"cssom": "~0.3.6"
"cssom": "0.3.x"
}
},
"cyclist": {
@ -1395,9 +1395,9 @@
}
},
"date-format": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
"integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==",
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
"integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
"dev": true
},
"date-now": {
@ -3842,9 +3842,9 @@
}
},
"lodash": {
"version": "4.17.14",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
"integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
"version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
"dev": true
},
"lodash._baseassign": {
@ -4235,9 +4235,9 @@
"integrity": "sha512-Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw=="
},
"mocha": {
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-6.1.4.tgz",
"integrity": "sha512-PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg==",
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.0.tgz",
"integrity": "sha512-qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ==",
"dev": true,
"requires": {
"ansi-colors": "3.2.3",
@ -5856,9 +5856,9 @@
}
},
"spdx-license-ids": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
"integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
"integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
"dev": true
},
"split-string": {
@ -6519,9 +6519,9 @@
"dev": true
},
"vanilla-picker": {
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.9.0.tgz",
"integrity": "sha512-L9dPXeXrfpT3qDqoaeMj0g7twSOz1NFmsmxEm8GwnbIQzPsOcc0n3zty/Iqgr69h3qDxuZEvv3UxXS6nKgLiOQ==",
"version": "2.9.1",
"resolved": "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.9.1.tgz",
"integrity": "sha512-JcXwFwclAdfJ1eJWeiLdM9sYMPfmrUEqzCOeO74QaAgdZpe8VyBldSlimZfLP8OefBXWGH+wL80QwhP2TSv0eg==",
"requires": {
"@sphinxxxx/color-conversion": "^2.2.1"
}
@ -6644,9 +6644,9 @@
"dev": true
},
"webpack": {
"version": "4.35.3",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.35.3.tgz",
"integrity": "sha512-xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA==",
"version": "4.36.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz",
"integrity": "sha512-Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.8.5",
@ -6774,9 +6774,9 @@
"dev": true
},
"ws": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.0.1.tgz",
"integrity": "sha512-ILHfMbuqLJvnSgYXLgy4kMntroJpe8hT41dOVWM8bxRuw6TK4mgMp9VJUNsZTEc5Bh+Mbs0DJT4M0N+wBG9l9A==",
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz",
"integrity": "sha512-o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==",
"dev": true,
"requires": {
"async-limiter": "^1.0.0"
@ -6795,9 +6795,9 @@
"dev": true
},
"xtend": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
"dev": true
},
"y18n": {

10
package.json
View File

@ -23,17 +23,17 @@
"test": "mocha test"
},
"dependencies": {
"ajv": "6.10.1",
"ajv": "6.10.2",
"brace": "0.11.1",
"javascript-natural-sort": "0.7.1",
"jmespath": "0.15.0",
"json-source-map": "0.4.0",
"mobius1-selectr": "2.4.13",
"picomodal": "3.0.0",
"vanilla-picker": "2.9.0"
"vanilla-picker": "2.9.1"
},
"devDependencies": {
"date-format": "2.0.0",
"date-format": "2.1.0",
"fancy-log": "1.3.3",
"gulp": "4.0.2",
"gulp-clean-css": "4.2.0",
@ -41,8 +41,8 @@
"jsdom": "15.1.1",
"json-loader": "0.5.7",
"mkdirp": "0.5.1",
"mocha": "6.1.4",
"mocha": "6.2.0",
"uglify-js": "3.6.0",
"webpack": "4.35.3"
"webpack": "4.36.1"
}
}