From ca9009e7ec9dc9606744f64ebf65abac765d06b2 Mon Sep 17 00:00:00 2001
From: Jos de Jong
Date: Sat, 29 Jan 2022 10:53:38 +0100
Subject: [PATCH 01/19] Fix #1413: show color indicator on readonly fields
---
HISTORY.md | 5 +++++
src/js/Node.js | 14 +++++++++++---
src/scss/jsoneditor/_editor.scss | 4 ++++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/HISTORY.md b/HISTORY.md
index 47da538ba..886ed60c8 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,11 @@
https://github.com/josdejong/jsoneditor
+## not yet published, version 9.7.0
+
+- Implement #1413: show color indicator on readonly fields.
+
+
## 2022-01-13, version 9.6.0
- Pass a new property `value` along with the `onNodeName` callback, see #1409.
diff --git a/src/js/Node.js b/src/js/Node.js
index 8d4c22e86..72e8b778c 100644
--- a/src/js/Node.js
+++ b/src/js/Node.js
@@ -1785,8 +1785,7 @@ export class Node {
}
// show color picker when value is a color
- if (this.editable.value &&
- this.editor.options.colorPicker &&
+ if (this.editor.options.colorPicker &&
typeof value === 'string' &&
isValidColor(value)) {
if (!this.dom.color) {
@@ -1802,6 +1801,11 @@ export class Node {
// update styling of value and color background
addClassName(this.dom.value, 'jsoneditor-color-value')
+ if (!this.editable.value) {
+ addClassName(this.dom.color, 'jsoneditor-color-readonly')
+ } else {
+ removeClassName(this.dom.color, 'jsoneditor-color-readonly')
+ }
this.dom.color.style.backgroundColor = value
} else {
// cleanup color picker when displayed
@@ -2536,7 +2540,11 @@ export class Node {
}
}
- if (type === 'click' && (event.target === node.dom.tdColor || event.target === node.dom.color)) {
+ if (
+ type === 'click' &&
+ (event.target === node.dom.tdColor || event.target === node.dom.color) &&
+ this.editable.value
+ ) {
this._showColorPicker()
}
diff --git a/src/scss/jsoneditor/_editor.scss b/src/scss/jsoneditor/_editor.scss
index 1bbe6cd0c..762f57b9b 100644
--- a/src/scss/jsoneditor/_editor.scss
+++ b/src/scss/jsoneditor/_editor.scss
@@ -185,6 +185,10 @@ div {
margin: 4px;
border: 1px solid $jse-readonly;
cursor: pointer;
+
+ &.jsoneditor-color-readonly {
+ cursor: inherit;
+ }
}
&.jsoneditor-date {
background: $jse-date;
From ca82ea871b4bbf27aff989b00777140ef4817aeb Mon Sep 17 00:00:00 2001
From: Jos de Jong
Date: Sun, 30 Jan 2022 09:04:27 +0100
Subject: [PATCH 02/19] Publish v9.7.0
---
HISTORY.md | 4 +-
package-lock.json | 342 +++++++++++++++++++++-------------------------
package.json | 20 +--
3 files changed, 169 insertions(+), 197 deletions(-)
diff --git a/HISTORY.md b/HISTORY.md
index 886ed60c8..70a20c036 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,9 +3,9 @@
https://github.com/josdejong/jsoneditor
-## not yet published, version 9.7.0
+## 2022-01-30, version 9.7.0
-- Implement #1413: show color indicator on readonly fields.
+- Implement #1413: show color indicator on readonly fields and in mode `view`.
## 2022-01-13, version 9.6.0
diff --git a/package-lock.json b/package-lock.json
index ad8cdae00..29ca279ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,18 +1,18 @@
{
"name": "jsoneditor",
- "version": "9.6.0",
+ "version": "9.7.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "jsoneditor",
- "version": "9.6.0",
+ "version": "9.7.0",
"license": "Apache-2.0",
"dependencies": {
- "ace-builds": "^1.4.13",
+ "ace-builds": "^1.4.14",
"ajv": "^6.12.6",
"javascript-natural-sort": "^0.7.1",
- "jmespath": "^0.15.0",
+ "jmespath": "^0.16.0",
"json-source-map": "^0.6.1",
"jsonrepair": "^2.2.1",
"mobius1-selectr": "^2.4.13",
@@ -20,12 +20,12 @@
"vanilla-picker": "^2.12.1"
},
"devDependencies": {
- "@babel/core": "7.16.7",
- "@babel/preset-env": "7.16.8",
+ "@babel/core": "7.16.12",
+ "@babel/preset-env": "7.16.11",
"@babel/register": "7.16.9",
"babel-loader": "8.2.3",
"btoa": "1.2.1",
- "date-format": "4.0.1",
+ "date-format": "4.0.3",
"fancy-log": "2.0.0",
"gulp": "4.0.2",
"gulp-clean-css": "4.3.0",
@@ -34,12 +34,12 @@
"jsdom": "19.0.0",
"json-loader": "0.5.7",
"mkdirp": "1.0.4",
- "mocha": "9.1.3",
- "sass": "1.48.0",
+ "mocha": "9.2.0",
+ "sass": "1.49.0",
"source-map-loader": "3.0.1",
"standard": "16.0.4",
- "uglify-js": "3.14.5",
- "webpack": "5.66.0"
+ "uglify-js": "3.15.0",
+ "webpack": "5.67.0"
}
},
"node_modules/@babel/code-frame": {
@@ -64,20 +64,20 @@
}
},
"node_modules/@babel/core": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
- "integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
+ "version": "7.16.12",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
+ "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.16.7",
+ "@babel/generator": "^7.16.8",
"@babel/helper-compilation-targets": "^7.16.7",
"@babel/helper-module-transforms": "^7.16.7",
"@babel/helpers": "^7.16.7",
- "@babel/parser": "^7.16.7",
+ "@babel/parser": "^7.16.12",
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.7",
- "@babel/types": "^7.16.7",
+ "@babel/traverse": "^7.16.10",
+ "@babel/types": "^7.16.8",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -169,9 +169,9 @@
}
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.7.tgz",
- "integrity": "sha512-kIFozAvVfK05DM4EVQYKK+zteWvY85BFdGBRQBytRyY3y+6PX0DkDOn/CZ3lEuczCfrCxEzwt0YtP/87YPTWSw==",
+ "version": "7.16.10",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz",
+ "integrity": "sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==",
"dev": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.16.7",
@@ -487,9 +487,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz",
- "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==",
+ "version": "7.16.12",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
+ "integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
"dev": true,
"bin": {
"parser": "bin/babel-parser.js"
@@ -729,12 +729,12 @@
}
},
"node_modules/@babel/plugin-proposal-private-methods": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.7.tgz",
- "integrity": "sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==",
+ "version": "7.16.11",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
+ "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
"dev": true,
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.16.7",
+ "@babel/helper-create-class-features-plugin": "^7.16.10",
"@babel/helper-plugin-utils": "^7.16.7"
},
"engines": {
@@ -1462,9 +1462,9 @@
}
},
"node_modules/@babel/preset-env": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.8.tgz",
- "integrity": "sha512-9rNKgVCdwHb3z1IlbMyft6yIXIeP3xz6vWvGaLHrJThuEIqWfHb0DNBH9VuTgnDfdbUDhkmkvMZS/YMCtP7Elg==",
+ "version": "7.16.11",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
+ "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
"dev": true,
"dependencies": {
"@babel/compat-data": "^7.16.8",
@@ -1485,7 +1485,7 @@
"@babel/plugin-proposal-object-rest-spread": "^7.16.7",
"@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
"@babel/plugin-proposal-optional-chaining": "^7.16.7",
- "@babel/plugin-proposal-private-methods": "^7.16.7",
+ "@babel/plugin-proposal-private-methods": "^7.16.11",
"@babel/plugin-proposal-private-property-in-object": "^7.16.7",
"@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
"@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -1620,9 +1620,9 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.8.tgz",
- "integrity": "sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==",
+ "version": "7.16.10",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
+ "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.16.7",
@@ -1631,7 +1631,7 @@
"@babel/helper-function-name": "^7.16.7",
"@babel/helper-hoist-variables": "^7.16.7",
"@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/parser": "^7.16.8",
+ "@babel/parser": "^7.16.10",
"@babel/types": "^7.16.8",
"debug": "^4.1.0",
"globals": "^11.1.0"
@@ -1918,9 +1918,9 @@
"dev": true
},
"node_modules/ace-builds": {
- "version": "1.4.13",
- "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
- "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
+ "version": "1.4.14",
+ "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.14.tgz",
+ "integrity": "sha512-NBOQlm9+7RBqRqZwimpgquaLeTJFayqb9UEPtTkpC3TkkwDnlsT/TwsCC0svjt9kEZ6G9mH5AEOHSz6Q/HrzQQ=="
},
"node_modules/acorn": {
"version": "8.5.0",
@@ -3292,18 +3292,18 @@
}
},
"node_modules/date-format": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.1.tgz",
- "integrity": "sha512-bT1w9Fhk/1VBj7rK1n8JFADwvp0Oh8eHy1OlBK6bAYTbrKdBtAJTyiOG3o+ZFyjG+OBssQ8+VkhtyyYtA+cX9Q==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
+ "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
"dev": true,
"engines": {
"node": ">=4.0"
}
},
"node_modules/debug": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
- "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+ "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
"dev": true,
"dependencies": {
"ms": "2.1.2"
@@ -5911,9 +5911,9 @@
}
},
"node_modules/glob": {
- "version": "7.1.6",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
- "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+ "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
"dev": true,
"dependencies": {
"fs.realpath": "^1.0.0",
@@ -7145,9 +7145,9 @@
}
},
"node_modules/jmespath": {
- "version": "0.15.0",
- "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
- "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=",
+ "version": "0.16.0",
+ "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
+ "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==",
"engines": {
"node": ">= 0.6.0"
}
@@ -7893,32 +7893,32 @@
"integrity": "sha512-Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw=="
},
"node_modules/mocha": {
- "version": "9.1.3",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
- "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
+ "version": "9.2.0",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz",
+ "integrity": "sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==",
"dev": true,
"dependencies": {
"@ungap/promise-all-settled": "1.1.2",
"ansi-colors": "4.1.1",
"browser-stdout": "1.3.1",
- "chokidar": "3.5.2",
- "debug": "4.3.2",
+ "chokidar": "3.5.3",
+ "debug": "4.3.3",
"diff": "5.0.0",
"escape-string-regexp": "4.0.0",
"find-up": "5.0.0",
- "glob": "7.1.7",
+ "glob": "7.2.0",
"growl": "1.10.5",
"he": "1.2.0",
"js-yaml": "4.1.0",
"log-symbols": "4.1.0",
"minimatch": "3.0.4",
"ms": "2.1.3",
- "nanoid": "3.1.25",
+ "nanoid": "3.2.0",
"serialize-javascript": "6.0.0",
"strip-json-comments": "3.1.1",
"supports-color": "8.1.1",
"which": "2.0.2",
- "workerpool": "6.1.5",
+ "workerpool": "6.2.0",
"yargs": "16.2.0",
"yargs-parser": "20.2.4",
"yargs-unparser": "2.0.0"
@@ -8009,10 +8009,16 @@
}
},
"node_modules/mocha/node_modules/chokidar": {
- "version": "3.5.2",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
- "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+ "version": "3.5.3",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+ "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
"dev": true,
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://paulmillr.com/funding/"
+ }
+ ],
"dependencies": {
"anymatch": "~3.1.2",
"braces": "~3.0.2",
@@ -8121,26 +8127,6 @@
"node": "6.* || 8.* || >= 10.*"
}
},
- "node_modules/mocha/node_modules/glob": {
- "version": "7.1.7",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
- "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
- "dev": true,
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- },
- "engines": {
- "node": "*"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/mocha/node_modules/glob-parent": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -8429,9 +8415,9 @@
"optional": true
},
"node_modules/nanoid": {
- "version": "3.1.25",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
- "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
+ "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
"dev": true,
"bin": {
"nanoid": "bin/nanoid.cjs"
@@ -9801,9 +9787,9 @@
"dev": true
},
"node_modules/sass": {
- "version": "1.48.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.48.0.tgz",
- "integrity": "sha512-hQi5g4DcfjcipotoHZ80l7GNJHGqQS5LwMBjVYB/TaT0vcSSpbgM8Ad7cgfsB2M0MinbkEQQPO9+sjjSiwxqmw==",
+ "version": "1.49.0",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
+ "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
"dev": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
@@ -11083,9 +11069,9 @@
"dev": true
},
"node_modules/uglify-js": {
- "version": "3.14.5",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz",
- "integrity": "sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==",
+ "version": "3.15.0",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz",
+ "integrity": "sha512-x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg==",
"dev": true,
"bin": {
"uglifyjs": "bin/uglifyjs"
@@ -11482,9 +11468,9 @@
}
},
"node_modules/webpack": {
- "version": "5.66.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.66.0.tgz",
- "integrity": "sha512-NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==",
+ "version": "5.67.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz",
+ "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==",
"dev": true,
"dependencies": {
"@types/eslint-scope": "^3.7.0",
@@ -11510,7 +11496,7 @@
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.1.3",
"watchpack": "^2.3.1",
- "webpack-sources": "^3.2.2"
+ "webpack-sources": "^3.2.3"
},
"bin": {
"webpack": "bin/webpack.js"
@@ -11529,9 +11515,9 @@
}
},
"node_modules/webpack-sources": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
- "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==",
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+ "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
"dev": true,
"engines": {
"node": ">=10.13.0"
@@ -11633,9 +11619,9 @@
}
},
"node_modules/workerpool": {
- "version": "6.1.5",
- "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
- "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
+ "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
"dev": true
},
"node_modules/wrap-ansi": {
@@ -11817,20 +11803,20 @@
"dev": true
},
"@babel/core": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
- "integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
+ "version": "7.16.12",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
+ "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.16.7",
+ "@babel/generator": "^7.16.8",
"@babel/helper-compilation-targets": "^7.16.7",
"@babel/helper-module-transforms": "^7.16.7",
"@babel/helpers": "^7.16.7",
- "@babel/parser": "^7.16.7",
+ "@babel/parser": "^7.16.12",
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.7",
- "@babel/types": "^7.16.7",
+ "@babel/traverse": "^7.16.10",
+ "@babel/types": "^7.16.8",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -11898,9 +11884,9 @@
}
},
"@babel/helper-create-class-features-plugin": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.7.tgz",
- "integrity": "sha512-kIFozAvVfK05DM4EVQYKK+zteWvY85BFdGBRQBytRyY3y+6PX0DkDOn/CZ3lEuczCfrCxEzwt0YtP/87YPTWSw==",
+ "version": "7.16.10",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz",
+ "integrity": "sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==",
"dev": true,
"requires": {
"@babel/helper-annotate-as-pure": "^7.16.7",
@@ -12140,9 +12126,9 @@
}
},
"@babel/parser": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz",
- "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==",
+ "version": "7.16.12",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
+ "integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
"dev": true
},
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
@@ -12292,12 +12278,12 @@
}
},
"@babel/plugin-proposal-private-methods": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.7.tgz",
- "integrity": "sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==",
+ "version": "7.16.11",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
+ "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
"dev": true,
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.16.7",
+ "@babel/helper-create-class-features-plugin": "^7.16.10",
"@babel/helper-plugin-utils": "^7.16.7"
}
},
@@ -12764,9 +12750,9 @@
}
},
"@babel/preset-env": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.8.tgz",
- "integrity": "sha512-9rNKgVCdwHb3z1IlbMyft6yIXIeP3xz6vWvGaLHrJThuEIqWfHb0DNBH9VuTgnDfdbUDhkmkvMZS/YMCtP7Elg==",
+ "version": "7.16.11",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
+ "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
"dev": true,
"requires": {
"@babel/compat-data": "^7.16.8",
@@ -12787,7 +12773,7 @@
"@babel/plugin-proposal-object-rest-spread": "^7.16.7",
"@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
"@babel/plugin-proposal-optional-chaining": "^7.16.7",
- "@babel/plugin-proposal-private-methods": "^7.16.7",
+ "@babel/plugin-proposal-private-methods": "^7.16.11",
"@babel/plugin-proposal-private-property-in-object": "^7.16.7",
"@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
"@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -12900,9 +12886,9 @@
}
},
"@babel/traverse": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.8.tgz",
- "integrity": "sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==",
+ "version": "7.16.10",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
+ "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.16.7",
@@ -12911,7 +12897,7 @@
"@babel/helper-function-name": "^7.16.7",
"@babel/helper-hoist-variables": "^7.16.7",
"@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/parser": "^7.16.8",
+ "@babel/parser": "^7.16.10",
"@babel/types": "^7.16.8",
"debug": "^4.1.0",
"globals": "^11.1.0"
@@ -13182,9 +13168,9 @@
"dev": true
},
"ace-builds": {
- "version": "1.4.13",
- "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
- "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
+ "version": "1.4.14",
+ "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.14.tgz",
+ "integrity": "sha512-NBOQlm9+7RBqRqZwimpgquaLeTJFayqb9UEPtTkpC3TkkwDnlsT/TwsCC0svjt9kEZ6G9mH5AEOHSz6Q/HrzQQ=="
},
"acorn": {
"version": "8.5.0",
@@ -14264,15 +14250,15 @@
}
},
"date-format": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.1.tgz",
- "integrity": "sha512-bT1w9Fhk/1VBj7rK1n8JFADwvp0Oh8eHy1OlBK6bAYTbrKdBtAJTyiOG3o+ZFyjG+OBssQ8+VkhtyyYtA+cX9Q==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
+ "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
"dev": true
},
"debug": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
- "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+ "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
"dev": true,
"requires": {
"ms": "2.1.2"
@@ -16286,9 +16272,9 @@
"dev": true
},
"glob": {
- "version": "7.1.6",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
- "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+ "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
@@ -17240,9 +17226,9 @@
}
},
"jmespath": {
- "version": "0.15.0",
- "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
- "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
+ "version": "0.16.0",
+ "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
+ "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw=="
},
"js-tokens": {
"version": "4.0.0",
@@ -17848,32 +17834,32 @@
"integrity": "sha512-Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw=="
},
"mocha": {
- "version": "9.1.3",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
- "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
+ "version": "9.2.0",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz",
+ "integrity": "sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==",
"dev": true,
"requires": {
"@ungap/promise-all-settled": "1.1.2",
"ansi-colors": "4.1.1",
"browser-stdout": "1.3.1",
- "chokidar": "3.5.2",
- "debug": "4.3.2",
+ "chokidar": "3.5.3",
+ "debug": "4.3.3",
"diff": "5.0.0",
"escape-string-regexp": "4.0.0",
"find-up": "5.0.0",
- "glob": "7.1.7",
+ "glob": "7.2.0",
"growl": "1.10.5",
"he": "1.2.0",
"js-yaml": "4.1.0",
"log-symbols": "4.1.0",
"minimatch": "3.0.4",
"ms": "2.1.3",
- "nanoid": "3.1.25",
+ "nanoid": "3.2.0",
"serialize-javascript": "6.0.0",
"strip-json-comments": "3.1.1",
"supports-color": "8.1.1",
"which": "2.0.2",
- "workerpool": "6.1.5",
+ "workerpool": "6.2.0",
"yargs": "16.2.0",
"yargs-parser": "20.2.4",
"yargs-unparser": "2.0.0"
@@ -17932,9 +17918,9 @@
}
},
"chokidar": {
- "version": "3.5.2",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
- "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+ "version": "3.5.3",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+ "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
"dev": true,
"requires": {
"anymatch": "~3.1.2",
@@ -18011,20 +17997,6 @@
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
"dev": true
},
- "glob": {
- "version": "7.1.7",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
- "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
- "dev": true,
- "requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- }
- },
"glob-parent": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -18231,9 +18203,9 @@
"optional": true
},
"nanoid": {
- "version": "3.1.25",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
- "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
+ "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
"dev": true
},
"nanomatch": {
@@ -19312,9 +19284,9 @@
"dev": true
},
"sass": {
- "version": "1.48.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.48.0.tgz",
- "integrity": "sha512-hQi5g4DcfjcipotoHZ80l7GNJHGqQS5LwMBjVYB/TaT0vcSSpbgM8Ad7cgfsB2M0MinbkEQQPO9+sjjSiwxqmw==",
+ "version": "1.49.0",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
+ "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0",
@@ -20292,9 +20264,9 @@
"dev": true
},
"uglify-js": {
- "version": "3.14.5",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz",
- "integrity": "sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==",
+ "version": "3.15.0",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz",
+ "integrity": "sha512-x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg==",
"dev": true
},
"unbox-primitive": {
@@ -20612,9 +20584,9 @@
"dev": true
},
"webpack": {
- "version": "5.66.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.66.0.tgz",
- "integrity": "sha512-NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==",
+ "version": "5.67.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz",
+ "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
@@ -20640,7 +20612,7 @@
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.1.3",
"watchpack": "^2.3.1",
- "webpack-sources": "^3.2.2"
+ "webpack-sources": "^3.2.3"
},
"dependencies": {
"schema-utils": {
@@ -20657,9 +20629,9 @@
}
},
"webpack-sources": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
- "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==",
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+ "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
"dev": true
},
"whatwg-encoding": {
@@ -20722,9 +20694,9 @@
"dev": true
},
"workerpool": {
- "version": "6.1.5",
- "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
- "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
+ "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
"dev": true
},
"wrap-ansi": {
diff --git a/package.json b/package.json
index ff3e44480..7b3092ae0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "jsoneditor",
- "version": "9.6.0",
+ "version": "9.7.0",
"main": "./dist/jsoneditor.min.js",
"description": "A web-based tool to view, edit, format, and validate JSON",
"tags": [
@@ -26,10 +26,10 @@
"prepublishOnly": "npm test && npm run build"
},
"dependencies": {
- "ace-builds": "^1.4.13",
+ "ace-builds": "^1.4.14",
"ajv": "^6.12.6",
"javascript-natural-sort": "^0.7.1",
- "jmespath": "^0.15.0",
+ "jmespath": "^0.16.0",
"jsonrepair": "^2.2.1",
"json-source-map": "^0.6.1",
"mobius1-selectr": "^2.4.13",
@@ -37,12 +37,12 @@
"vanilla-picker": "^2.12.1"
},
"devDependencies": {
- "@babel/core": "7.16.7",
- "@babel/preset-env": "7.16.8",
+ "@babel/core": "7.16.12",
+ "@babel/preset-env": "7.16.11",
"@babel/register": "7.16.9",
"babel-loader": "8.2.3",
"btoa": "1.2.1",
- "date-format": "4.0.1",
+ "date-format": "4.0.3",
"fancy-log": "2.0.0",
"gulp": "4.0.2",
"gulp-clean-css": "4.3.0",
@@ -51,12 +51,12 @@
"jsdom": "19.0.0",
"json-loader": "0.5.7",
"mkdirp": "1.0.4",
- "mocha": "9.1.3",
- "sass": "1.48.0",
+ "mocha": "9.2.0",
+ "sass": "1.49.0",
"source-map-loader": "3.0.1",
"standard": "16.0.4",
- "uglify-js": "3.14.5",
- "webpack": "5.66.0"
+ "uglify-js": "3.15.0",
+ "webpack": "5.67.0"
},
"files": [
"dist",
From b00dcf35c762afcc82a0ee22396c96b6807ba0ef Mon Sep 17 00:00:00 2001
From: Jos de Jong
Date: Wed, 2 Feb 2022 13:37:04 +0100
Subject: [PATCH 03/19] Update devDependencies
---
package-lock.json | 103 +++++++++++++++++++++++++++-------------------
package.json | 4 +-
2 files changed, 62 insertions(+), 45 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 29ca279ff..4f848aba7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,11 +35,11 @@
"json-loader": "0.5.7",
"mkdirp": "1.0.4",
"mocha": "9.2.0",
- "sass": "1.49.0",
+ "sass": "1.49.7",
"source-map-loader": "3.0.1",
"standard": "16.0.4",
"uglify-js": "3.15.0",
- "webpack": "5.67.0"
+ "webpack": "5.68.0"
}
},
"node_modules/@babel/code-frame": {
@@ -3184,13 +3184,22 @@
}
},
"node_modules/copy-props": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
- "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+ "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
"dev": true,
"dependencies": {
- "each-props": "^1.3.0",
- "is-plain-object": "^2.0.1"
+ "each-props": "^1.3.2",
+ "is-plain-object": "^5.0.0"
+ }
+ },
+ "node_modules/copy-props/node_modules/is-plain-object": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+ "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
}
},
"node_modules/core-js-compat": {
@@ -4364,9 +4373,9 @@
}
},
"node_modules/eslint/node_modules/ansi-regex": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
- "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true,
"engines": {
"node": ">=8"
@@ -7945,9 +7954,9 @@
}
},
"node_modules/mocha/node_modules/ansi-regex": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
- "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true,
"engines": {
"node": ">=8"
@@ -8941,9 +8950,9 @@
}
},
"node_modules/path-parse": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
- "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
"dev": true
},
"node_modules/path-root": {
@@ -9787,9 +9796,9 @@
"dev": true
},
"node_modules/sass": {
- "version": "1.49.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
- "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
+ "version": "1.49.7",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.7.tgz",
+ "integrity": "sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ==",
"dev": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
@@ -9800,7 +9809,7 @@
"sass": "sass.js"
},
"engines": {
- "node": ">=8.9.0"
+ "node": ">=12.0.0"
}
},
"node_modules/sass/node_modules/anymatch": {
@@ -11468,9 +11477,9 @@
}
},
"node_modules/webpack": {
- "version": "5.67.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz",
- "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==",
+ "version": "5.68.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz",
+ "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==",
"dev": true,
"dependencies": {
"@types/eslint-scope": "^3.7.0",
@@ -14152,13 +14161,21 @@
"dev": true
},
"copy-props": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
- "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+ "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
"dev": true,
"requires": {
- "each-props": "^1.3.0",
- "is-plain-object": "^2.0.1"
+ "each-props": "^1.3.2",
+ "is-plain-object": "^5.0.0"
+ },
+ "dependencies": {
+ "is-plain-object": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+ "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+ "dev": true
+ }
}
},
"core-js-compat": {
@@ -14657,9 +14674,9 @@
},
"dependencies": {
"ansi-regex": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
- "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true
},
"ansi-styles": {
@@ -17872,9 +17889,9 @@
"dev": true
},
"ansi-regex": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
- "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true
},
"ansi-styles": {
@@ -18605,9 +18622,9 @@
"dev": true
},
"path-parse": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
- "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
"dev": true
},
"path-root": {
@@ -19284,9 +19301,9 @@
"dev": true
},
"sass": {
- "version": "1.49.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
- "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
+ "version": "1.49.7",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.7.tgz",
+ "integrity": "sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0",
@@ -20584,9 +20601,9 @@
"dev": true
},
"webpack": {
- "version": "5.67.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz",
- "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==",
+ "version": "5.68.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz",
+ "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
diff --git a/package.json b/package.json
index 7b3092ae0..554228b59 100644
--- a/package.json
+++ b/package.json
@@ -52,11 +52,11 @@
"json-loader": "0.5.7",
"mkdirp": "1.0.4",
"mocha": "9.2.0",
- "sass": "1.49.0",
+ "sass": "1.49.7",
"source-map-loader": "3.0.1",
"standard": "16.0.4",
"uglify-js": "3.15.0",
- "webpack": "5.67.0"
+ "webpack": "5.68.0"
},
"files": [
"dist",
From 998da88bd0c9d972c0ca8d5f9206d9a1474edf35 Mon Sep 17 00:00:00 2001
From: Jos de Jong
Date: Wed, 9 Feb 2022 11:51:38 +0100
Subject: [PATCH 04/19] Fix #1419: blurry text preview on Chrome
---
HISTORY.md | 5 +++++
src/scss/jsoneditor/_contextmenu.scss | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/HISTORY.md b/HISTORY.md
index 70a20c036..87e3c36d3 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,11 @@
https://github.com/josdejong/jsoneditor
+## 2022-02-09, version 9.7.1
+
+- Fix #1419: blurry text preview on Chrome.
+
+
## 2022-01-30, version 9.7.0
- Implement #1413: show color indicator on readonly fields and in mode `view`.
diff --git a/src/scss/jsoneditor/_contextmenu.scss b/src/scss/jsoneditor/_contextmenu.scss
index 53f293942..8e937bfbc 100644
--- a/src/scss/jsoneditor/_contextmenu.scss
+++ b/src/scss/jsoneditor/_contextmenu.scss
@@ -408,6 +408,12 @@
border-radius: 3px;
padding: 4px;
}
+.jsoneditor-modal textarea {
+ // workaround for a bug on Chrome resulting in blurry text,
+ // see https://github.com/josdejong/jsoneditor/issues/1419
+ border-radius: unset;
+}
+
.jsoneditor-modal,
.jsoneditor-modal table td,
.jsoneditor-modal table th,
From 1fa6d567492e58aad2de5313b76d83f2f27c13d8 Mon Sep 17 00:00:00 2001
From: Jos de Jong
Date: Wed, 9 Feb 2022 11:53:05 +0100
Subject: [PATCH 05/19] Publish v9.7.1
---
package-lock.json | 4 ++--
package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 4f848aba7..939774334 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "jsoneditor",
- "version": "9.7.0",
+ "version": "9.7.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "jsoneditor",
- "version": "9.7.0",
+ "version": "9.7.1",
"license": "Apache-2.0",
"dependencies": {
"ace-builds": "^1.4.14",
diff --git a/package.json b/package.json
index 554228b59..657406901 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "jsoneditor",
- "version": "9.7.0",
+ "version": "9.7.1",
"main": "./dist/jsoneditor.min.js",
"description": "A web-based tool to view, edit, format, and validate JSON",
"tags": [
From 94e5b13b39ced4bbd09c03123d51cdbcb1e9619f Mon Sep 17 00:00:00 2001
From: Jos de Jong
Date: Wed, 9 Feb 2022 12:14:12 +0100
Subject: [PATCH 06/19] Fix #1419: blurry text preview on Chrome, publish
v9.7.2
---
HISTORY.md | 5 +++++
package-lock.json | 4 ++--
package.json | 2 +-
src/scss/jsoneditor/_contextmenu.scss | 3 ++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/HISTORY.md b/HISTORY.md
index 87e3c36d3..1dbd06800 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,11 @@
https://github.com/josdejong/jsoneditor
+## 2022-02-09, version 9.7.2
+
+- Fix #1419: blurry text preview query on Chrome.
+
+
## 2022-02-09, version 9.7.1
- Fix #1419: blurry text preview on Chrome.
diff --git a/package-lock.json b/package-lock.json
index 939774334..24c3cf237 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "jsoneditor",
- "version": "9.7.1",
+ "version": "9.7.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "jsoneditor",
- "version": "9.7.1",
+ "version": "9.7.2",
"license": "Apache-2.0",
"dependencies": {
"ace-builds": "^1.4.14",
diff --git a/package.json b/package.json
index 657406901..a5b6793c1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "jsoneditor",
- "version": "9.7.1",
+ "version": "9.7.2",
"main": "./dist/jsoneditor.min.js",
"description": "A web-based tool to view, edit, format, and validate JSON",
"tags": [
diff --git a/src/scss/jsoneditor/_contextmenu.scss b/src/scss/jsoneditor/_contextmenu.scss
index 8e937bfbc..c8cdb9fb2 100644
--- a/src/scss/jsoneditor/_contextmenu.scss
+++ b/src/scss/jsoneditor/_contextmenu.scss
@@ -408,7 +408,8 @@
border-radius: 3px;
padding: 4px;
}
-.jsoneditor-modal textarea {
+.jsoneditor-modal textarea,
+.jsoneditor-modal #query {
// workaround for a bug on Chrome resulting in blurry text,
// see https://github.com/josdejong/jsoneditor/issues/1419
border-radius: unset;
From ca4306253be34ab5feae685ed71736a68461e88c Mon Sep 17 00:00:00 2001
From: Jos de Jong
Date: Fri, 4 Mar 2022 11:42:39 +0100
Subject: [PATCH 07/19] Fix #1422: fix `setSchema` not working
---
src/js/JSONEditor.js | 1 +
src/js/Node.js | 31 +++++++++++++++++++++++--------
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/js/JSONEditor.js b/src/js/JSONEditor.js
index f583a332f..e363d2d29 100644
--- a/src/js/JSONEditor.js
+++ b/src/js/JSONEditor.js
@@ -384,6 +384,7 @@ JSONEditor.prototype.setSchema = function (schema, schemaRefs) {
// add schema to the options, so that when switching to an other mode,
// the set schema is not lost
this.options.schema = schema
+ this.options.schemaRefs = schemaRefs
// validate now
this.validate()
diff --git a/src/js/Node.js b/src/js/Node.js
index 72e8b778c..42a8172c0 100644
--- a/src/js/Node.js
+++ b/src/js/Node.js
@@ -1741,12 +1741,7 @@ export class Node {
this.dom.select.appendChild(defaultOption)
// Iterate all enum values and add them as options
- for (let i = 0; i < this.enum.length; i++) {
- const option = document.createElement('option')
- option.value = this.enum[i]
- option.textContent = this.enum[i]
- this.dom.select.appendChild(option)
- }
+ this._updateEnumOptions()
this.dom.tdSelect = document.createElement('td')
this.dom.tdSelect.className = 'jsoneditor-tree'
@@ -1773,7 +1768,7 @@ export class Node {
delete this.valueFieldHTML
}
} else {
- // cleanup select box when displayed
+ // cleanup select box when displayed, and attach the editable div instead
if (this.dom.tdSelect) {
this.dom.tdSelect.parentNode.removeChild(this.dom.tdSelect)
delete this.dom.tdSelect
@@ -1781,6 +1776,8 @@ export class Node {
this.dom.tdValue.innerHTML = this.valueFieldHTML
this.dom.tdValue.style.visibility = ''
delete this.valueFieldHTML
+
+ this.dom.tdValue.appendChild(this.dom.value)
}
}
@@ -1852,6 +1849,23 @@ export class Node {
}
}
+ _updateEnumOptions () {
+ if (!this.enum || !this.dom.select) {
+ return
+ }
+
+ // clear the existing options
+ this.dom.select.innerHTML = ''
+
+ // Iterate all enum values and add them as options
+ for (let i = 0; i < this.enum.length; i++) {
+ const option = document.createElement('option')
+ option.value = this.enum[i]
+ option.textContent = this.enum[i]
+ this.dom.select.appendChild(option)
+ }
+ }
+
_deleteDomColor () {
if (this.dom.color) {
this.dom.tdColor.parentNode.removeChild(this.dom.tdColor)
@@ -2260,6 +2274,7 @@ export class Node {
domField.innerHTML = escapedField
}
this._updateSchema()
+ this._updateEnumOptions()
}
// apply value to DOM
@@ -4496,7 +4511,7 @@ Node._findSchema = (topLevelSchema, schemaRefs, path, currentSchema = topLevelSc
if (segment in currentSchema) {
currentSchema = currentSchema[segment]
} else {
- throw Error(`Unable to resovle reference ${ref}`)
+ throw Error(`Unable to resolve reference ${ref}`)
}
}
} else if (ref.match(/#\//g)?.length === 1) {
From 92bf96d20496efe31216979b9030eb14ed287d20 Mon Sep 17 00:00:00 2001
From: Jos de Jong
Date: Fri, 4 Mar 2022 11:44:25 +0100
Subject: [PATCH 08/19] Publish v9.7.3
---
HISTORY.md | 5 +
package-lock.json | 381 ++++++++++++++++++++++++++--------------------
package.json | 16 +-
3 files changed, 227 insertions(+), 175 deletions(-)
diff --git a/HISTORY.md b/HISTORY.md
index 1dbd06800..c7e89e28c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,11 @@
https://github.com/josdejong/jsoneditor
+## 2022-03-04, version 9.7.3
+
+- Fix #1422: fix `setSchema` not working.
+
+
## 2022-02-09, version 9.7.2
- Fix #1419: blurry text preview query on Chrome.
diff --git a/package-lock.json b/package-lock.json
index 24c3cf237..31a591328 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "jsoneditor",
- "version": "9.7.2",
+ "version": "9.7.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "jsoneditor",
- "version": "9.7.2",
+ "version": "9.7.3",
"license": "Apache-2.0",
"dependencies": {
"ace-builds": "^1.4.14",
@@ -20,12 +20,12 @@
"vanilla-picker": "^2.12.1"
},
"devDependencies": {
- "@babel/core": "7.16.12",
+ "@babel/core": "7.17.5",
"@babel/preset-env": "7.16.11",
- "@babel/register": "7.16.9",
+ "@babel/register": "7.17.0",
"babel-loader": "8.2.3",
"btoa": "1.2.1",
- "date-format": "4.0.3",
+ "date-format": "4.0.4",
"fancy-log": "2.0.0",
"gulp": "4.0.2",
"gulp-clean-css": "4.3.0",
@@ -34,12 +34,24 @@
"jsdom": "19.0.0",
"json-loader": "0.5.7",
"mkdirp": "1.0.4",
- "mocha": "9.2.0",
- "sass": "1.49.7",
+ "mocha": "9.2.1",
+ "sass": "1.49.9",
"source-map-loader": "3.0.1",
"standard": "16.0.4",
- "uglify-js": "3.15.0",
- "webpack": "5.68.0"
+ "uglify-js": "3.15.2",
+ "webpack": "5.70.0"
+ }
+ },
+ "node_modules/@ampproject/remapping": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
+ "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/trace-mapping": "^0.3.0"
+ },
+ "engines": {
+ "node": ">=6.0.0"
}
},
"node_modules/@babel/code-frame": {
@@ -64,26 +76,26 @@
}
},
"node_modules/@babel/core": {
- "version": "7.16.12",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
- "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
+ "version": "7.17.5",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz",
+ "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
"dev": true,
"dependencies": {
+ "@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.16.8",
+ "@babel/generator": "^7.17.3",
"@babel/helper-compilation-targets": "^7.16.7",
"@babel/helper-module-transforms": "^7.16.7",
- "@babel/helpers": "^7.16.7",
- "@babel/parser": "^7.16.12",
+ "@babel/helpers": "^7.17.2",
+ "@babel/parser": "^7.17.3",
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.10",
- "@babel/types": "^7.16.8",
+ "@babel/traverse": "^7.17.3",
+ "@babel/types": "^7.17.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
"json5": "^2.1.2",
- "semver": "^6.3.0",
- "source-map": "^0.5.0"
+ "semver": "^6.3.0"
},
"engines": {
"node": ">=6.9.0"
@@ -103,12 +115,12 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
- "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
+ "version": "7.17.3",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz",
+ "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.16.8",
+ "@babel/types": "^7.17.0",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
},
@@ -459,14 +471,14 @@
}
},
"node_modules/@babel/helpers": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
- "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+ "version": "7.17.2",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz",
+ "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
"dev": true,
"dependencies": {
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.7",
- "@babel/types": "^7.16.7"
+ "@babel/traverse": "^7.17.0",
+ "@babel/types": "^7.17.0"
},
"engines": {
"node": ">=6.9.0"
@@ -487,9 +499,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.16.12",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
- "integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
+ "version": "7.17.3",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz",
+ "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==",
"dev": true,
"bin": {
"parser": "bin/babel-parser.js"
@@ -1575,15 +1587,15 @@
}
},
"node_modules/@babel/register": {
- "version": "7.16.9",
- "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.16.9.tgz",
- "integrity": "sha512-jJ72wcghdRIlENfvALcyODhNoGE5j75cYHdC+aQMh6cU/P86tiiXTp9XYZct1UxUMo/4+BgQRyNZEGx0KWGS+g==",
+ "version": "7.17.0",
+ "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.17.0.tgz",
+ "integrity": "sha512-UNZsMAZ7uKoGHo1HlEXfteEOYssf64n/PNLHGqOKq/bgYcu/4LrQWAHJwSCb3BRZK8Hi5gkJdRcwrGTO2wtRCg==",
"dev": true,
"dependencies": {
"clone-deep": "^4.0.1",
"find-cache-dir": "^2.0.0",
"make-dir": "^2.1.0",
- "pirates": "^4.0.0",
+ "pirates": "^4.0.5",
"source-map-support": "^0.5.16"
},
"engines": {
@@ -1620,19 +1632,19 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.16.10",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
- "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
+ "version": "7.17.3",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
+ "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.16.8",
+ "@babel/generator": "^7.17.3",
"@babel/helper-environment-visitor": "^7.16.7",
"@babel/helper-function-name": "^7.16.7",
"@babel/helper-hoist-variables": "^7.16.7",
"@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/parser": "^7.16.10",
- "@babel/types": "^7.16.8",
+ "@babel/parser": "^7.17.3",
+ "@babel/types": "^7.17.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -1641,9 +1653,9 @@
}
},
"node_modules/@babel/types": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
- "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+ "version": "7.17.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
+ "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
"dev": true,
"dependencies": {
"@babel/helper-validator-identifier": "^7.16.7",
@@ -1689,6 +1701,31 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/@jridgewell/resolve-uri": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
+ "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/sourcemap-codec": {
+ "version": "1.4.11",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
+ "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
+ "dev": true
+ },
+ "node_modules/@jridgewell/trace-mapping": {
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
+ "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/resolve-uri": "^3.0.3",
+ "@jridgewell/sourcemap-codec": "^1.4.10"
+ }
+ },
"node_modules/@sphinxxxx/color-conversion": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz",
@@ -1704,9 +1741,9 @@
}
},
"node_modules/@types/eslint": {
- "version": "7.2.13",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz",
- "integrity": "sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==",
+ "version": "8.4.1",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
+ "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
"dev": true,
"dependencies": {
"@types/estree": "*",
@@ -1714,9 +1751,9 @@
}
},
"node_modules/@types/eslint-scope": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
- "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+ "version": "3.7.3",
+ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
+ "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
"dev": true,
"dependencies": {
"@types/eslint": "*",
@@ -1724,9 +1761,9 @@
}
},
"node_modules/@types/estree": {
- "version": "0.0.50",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
- "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+ "version": "0.0.51",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+ "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
"dev": true
},
"node_modules/@types/json-schema": {
@@ -3301,9 +3338,9 @@
}
},
"node_modules/date-format": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
- "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.4.tgz",
+ "integrity": "sha512-/jyf4rhB17ge328HJuJjAcmRtCsGd+NDeAtahRBTaK6vSPR6MO5HlrAit3Nn7dVjaa6sowW0WXt8yQtLyZQFRg==",
"dev": true,
"engines": {
"node": ">=4.0"
@@ -3553,9 +3590,9 @@
}
},
"node_modules/enhanced-resolve": {
- "version": "5.8.3",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
- "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
+ "version": "5.9.2",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
+ "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
"dev": true,
"dependencies": {
"graceful-fs": "^4.2.4",
@@ -7902,9 +7939,9 @@
"integrity": "sha512-Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw=="
},
"node_modules/mocha": {
- "version": "9.2.0",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz",
- "integrity": "sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==",
+ "version": "9.2.1",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz",
+ "integrity": "sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==",
"dev": true,
"dependencies": {
"@ungap/promise-all-settled": "1.1.2",
@@ -8475,15 +8512,6 @@
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
"dev": true
},
- "node_modules/node-modules-regexp": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
- "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/node-releases": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
@@ -9053,13 +9081,10 @@
}
},
"node_modules/pirates": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
- "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+ "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
"dev": true,
- "dependencies": {
- "node-modules-regexp": "^1.0.0"
- },
"engines": {
"node": ">= 6"
}
@@ -9796,9 +9821,9 @@
"dev": true
},
"node_modules/sass": {
- "version": "1.49.7",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.7.tgz",
- "integrity": "sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ==",
+ "version": "1.49.9",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz",
+ "integrity": "sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==",
"dev": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
@@ -11078,9 +11103,9 @@
"dev": true
},
"node_modules/uglify-js": {
- "version": "3.15.0",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz",
- "integrity": "sha512-x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg==",
+ "version": "3.15.2",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
+ "integrity": "sha512-peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A==",
"dev": true,
"bin": {
"uglifyjs": "bin/uglifyjs"
@@ -11477,13 +11502,13 @@
}
},
"node_modules/webpack": {
- "version": "5.68.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz",
- "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==",
+ "version": "5.70.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz",
+ "integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==",
"dev": true,
"dependencies": {
- "@types/eslint-scope": "^3.7.0",
- "@types/estree": "^0.0.50",
+ "@types/eslint-scope": "^3.7.3",
+ "@types/estree": "^0.0.51",
"@webassemblyjs/ast": "1.11.1",
"@webassemblyjs/wasm-edit": "1.11.1",
"@webassemblyjs/wasm-parser": "1.11.1",
@@ -11491,7 +11516,7 @@
"acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2",
- "enhanced-resolve": "^5.8.3",
+ "enhanced-resolve": "^5.9.2",
"es-module-lexer": "^0.9.0",
"eslint-scope": "5.1.1",
"events": "^3.2.0",
@@ -11796,6 +11821,15 @@
}
},
"dependencies": {
+ "@ampproject/remapping": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
+ "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/trace-mapping": "^0.3.0"
+ }
+ },
"@babel/code-frame": {
"version": "7.16.7",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
@@ -11812,26 +11846,26 @@
"dev": true
},
"@babel/core": {
- "version": "7.16.12",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
- "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
+ "version": "7.17.5",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz",
+ "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
"dev": true,
"requires": {
+ "@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.16.8",
+ "@babel/generator": "^7.17.3",
"@babel/helper-compilation-targets": "^7.16.7",
"@babel/helper-module-transforms": "^7.16.7",
- "@babel/helpers": "^7.16.7",
- "@babel/parser": "^7.16.12",
+ "@babel/helpers": "^7.17.2",
+ "@babel/parser": "^7.17.3",
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.10",
- "@babel/types": "^7.16.8",
+ "@babel/traverse": "^7.17.3",
+ "@babel/types": "^7.17.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
"json5": "^2.1.2",
- "semver": "^6.3.0",
- "source-map": "^0.5.0"
+ "semver": "^6.3.0"
},
"dependencies": {
"semver": {
@@ -11843,12 +11877,12 @@
}
},
"@babel/generator": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
- "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
+ "version": "7.17.3",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz",
+ "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
"dev": true,
"requires": {
- "@babel/types": "^7.16.8",
+ "@babel/types": "^7.17.0",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
@@ -12113,14 +12147,14 @@
}
},
"@babel/helpers": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
- "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+ "version": "7.17.2",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz",
+ "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
"dev": true,
"requires": {
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.7",
- "@babel/types": "^7.16.7"
+ "@babel/traverse": "^7.17.0",
+ "@babel/types": "^7.17.0"
}
},
"@babel/highlight": {
@@ -12135,9 +12169,9 @@
}
},
"@babel/parser": {
- "version": "7.16.12",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
- "integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
+ "version": "7.17.3",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz",
+ "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==",
"dev": true
},
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
@@ -12862,15 +12896,15 @@
}
},
"@babel/register": {
- "version": "7.16.9",
- "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.16.9.tgz",
- "integrity": "sha512-jJ72wcghdRIlENfvALcyODhNoGE5j75cYHdC+aQMh6cU/P86tiiXTp9XYZct1UxUMo/4+BgQRyNZEGx0KWGS+g==",
+ "version": "7.17.0",
+ "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.17.0.tgz",
+ "integrity": "sha512-UNZsMAZ7uKoGHo1HlEXfteEOYssf64n/PNLHGqOKq/bgYcu/4LrQWAHJwSCb3BRZK8Hi5gkJdRcwrGTO2wtRCg==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",
"find-cache-dir": "^2.0.0",
"make-dir": "^2.1.0",
- "pirates": "^4.0.0",
+ "pirates": "^4.0.5",
"source-map-support": "^0.5.16"
}
},
@@ -12895,27 +12929,27 @@
}
},
"@babel/traverse": {
- "version": "7.16.10",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
- "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
+ "version": "7.17.3",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
+ "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.16.8",
+ "@babel/generator": "^7.17.3",
"@babel/helper-environment-visitor": "^7.16.7",
"@babel/helper-function-name": "^7.16.7",
"@babel/helper-hoist-variables": "^7.16.7",
"@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/parser": "^7.16.10",
- "@babel/types": "^7.16.8",
+ "@babel/parser": "^7.17.3",
+ "@babel/types": "^7.17.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
}
},
"@babel/types": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
- "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+ "version": "7.17.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
+ "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.16.7",
@@ -12951,6 +12985,28 @@
}
}
},
+ "@jridgewell/resolve-uri": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
+ "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
+ "dev": true
+ },
+ "@jridgewell/sourcemap-codec": {
+ "version": "1.4.11",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
+ "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
+ "dev": true
+ },
+ "@jridgewell/trace-mapping": {
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
+ "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/resolve-uri": "^3.0.3",
+ "@jridgewell/sourcemap-codec": "^1.4.10"
+ }
+ },
"@sphinxxxx/color-conversion": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz",
@@ -12963,9 +13019,9 @@
"dev": true
},
"@types/eslint": {
- "version": "7.2.13",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz",
- "integrity": "sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==",
+ "version": "8.4.1",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
+ "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
"dev": true,
"requires": {
"@types/estree": "*",
@@ -12973,9 +13029,9 @@
}
},
"@types/eslint-scope": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
- "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+ "version": "3.7.3",
+ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
+ "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
"dev": true,
"requires": {
"@types/eslint": "*",
@@ -12983,9 +13039,9 @@
}
},
"@types/estree": {
- "version": "0.0.50",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
- "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+ "version": "0.0.51",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+ "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
"dev": true
},
"@types/json-schema": {
@@ -14267,9 +14323,9 @@
}
},
"date-format": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
- "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.4.tgz",
+ "integrity": "sha512-/jyf4rhB17ge328HJuJjAcmRtCsGd+NDeAtahRBTaK6vSPR6MO5HlrAit3Nn7dVjaa6sowW0WXt8yQtLyZQFRg==",
"dev": true
},
"debug": {
@@ -14464,9 +14520,9 @@
}
},
"enhanced-resolve": {
- "version": "5.8.3",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
- "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
+ "version": "5.9.2",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
+ "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
"dev": true,
"requires": {
"graceful-fs": "^4.2.4",
@@ -17851,9 +17907,9 @@
"integrity": "sha512-Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw=="
},
"mocha": {
- "version": "9.2.0",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz",
- "integrity": "sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==",
+ "version": "9.2.1",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz",
+ "integrity": "sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==",
"dev": true,
"requires": {
"@ungap/promise-all-settled": "1.1.2",
@@ -18262,12 +18318,6 @@
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
"dev": true
},
- "node-modules-regexp": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
- "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
- "dev": true
- },
"node-releases": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
@@ -18700,13 +18750,10 @@
}
},
"pirates": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
- "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
- "dev": true,
- "requires": {
- "node-modules-regexp": "^1.0.0"
- }
+ "version": "4.0.5",
+ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+ "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+ "dev": true
},
"pkg-conf": {
"version": "3.1.0",
@@ -19301,9 +19348,9 @@
"dev": true
},
"sass": {
- "version": "1.49.7",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.7.tgz",
- "integrity": "sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ==",
+ "version": "1.49.9",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz",
+ "integrity": "sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0",
@@ -20281,9 +20328,9 @@
"dev": true
},
"uglify-js": {
- "version": "3.15.0",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz",
- "integrity": "sha512-x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg==",
+ "version": "3.15.2",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
+ "integrity": "sha512-peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A==",
"dev": true
},
"unbox-primitive": {
@@ -20601,13 +20648,13 @@
"dev": true
},
"webpack": {
- "version": "5.68.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.68.0.tgz",
- "integrity": "sha512-zUcqaUO0772UuuW2bzaES2Zjlm/y3kRBQDVFVCge+s2Y8mwuUTdperGaAv65/NtRL/1zanpSJOq/MD8u61vo6g==",
+ "version": "5.70.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz",
+ "integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==",
"dev": true,
"requires": {
- "@types/eslint-scope": "^3.7.0",
- "@types/estree": "^0.0.50",
+ "@types/eslint-scope": "^3.7.3",
+ "@types/estree": "^0.0.51",
"@webassemblyjs/ast": "1.11.1",
"@webassemblyjs/wasm-edit": "1.11.1",
"@webassemblyjs/wasm-parser": "1.11.1",
@@ -20615,7 +20662,7 @@
"acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2",
- "enhanced-resolve": "^5.8.3",
+ "enhanced-resolve": "^5.9.2",
"es-module-lexer": "^0.9.0",
"eslint-scope": "5.1.1",
"events": "^3.2.0",
diff --git a/package.json b/package.json
index a5b6793c1..74fc65ed1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "jsoneditor",
- "version": "9.7.2",
+ "version": "9.7.3",
"main": "./dist/jsoneditor.min.js",
"description": "A web-based tool to view, edit, format, and validate JSON",
"tags": [
@@ -37,12 +37,12 @@
"vanilla-picker": "^2.12.1"
},
"devDependencies": {
- "@babel/core": "7.16.12",
+ "@babel/core": "7.17.5",
"@babel/preset-env": "7.16.11",
- "@babel/register": "7.16.9",
+ "@babel/register": "7.17.0",
"babel-loader": "8.2.3",
"btoa": "1.2.1",
- "date-format": "4.0.3",
+ "date-format": "4.0.4",
"fancy-log": "2.0.0",
"gulp": "4.0.2",
"gulp-clean-css": "4.3.0",
@@ -51,12 +51,12 @@
"jsdom": "19.0.0",
"json-loader": "0.5.7",
"mkdirp": "1.0.4",
- "mocha": "9.2.0",
- "sass": "1.49.7",
+ "mocha": "9.2.1",
+ "sass": "1.49.9",
"source-map-loader": "3.0.1",
"standard": "16.0.4",
- "uglify-js": "3.15.0",
- "webpack": "5.68.0"
+ "uglify-js": "3.15.2",
+ "webpack": "5.70.0"
},
"files": [
"dist",
From e00af16344c65dc284b3081d5b69772b26cc25dd Mon Sep 17 00:00:00 2001
From: Jos de Jong
Date: Tue, 15 Mar 2022 17:01:39 +0100
Subject: [PATCH 09/19] Fix #1421: fix `onBlur` event not firing when focus
goes to an `iframe`
---
HISTORY.md | 5 +++++
src/js/FocusTracker.js | 3 +++
test/test_build.html | 6 ++++++
3 files changed, 14 insertions(+)
diff --git a/HISTORY.md b/HISTORY.md
index c7e89e28c..fa445e360 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,11 @@
https://github.com/josdejong/jsoneditor
+## 2022-03-22, version 9.7.4
+
+- Fix #1421: fix `onBlur` event not firing when focus goes to an `iframe`.
+
+
## 2022-03-04, version 9.7.3
- Fix #1422: fix `setSchema` not working.
diff --git a/src/js/FocusTracker.js b/src/js/FocusTracker.js
index 453f8bb81..3a9e785c4 100644
--- a/src/js/FocusTracker.js
+++ b/src/js/FocusTracker.js
@@ -26,6 +26,7 @@ export class FocusTracker {
this._onEvent(event)
}
}.bind(this)
+ this._onBlur = this._onEvent.bind(this)
this.focusFlag = false
this.firstEventFlag = true
@@ -37,6 +38,7 @@ export class FocusTracker {
if (this.onFocus || this.onBlur) {
document.addEventListener('click', this._onClick)
document.addEventListener('keyup', this._onKeyUp)
+ document.addEventListener('blur', this._onBlur)
}
}
@@ -47,6 +49,7 @@ export class FocusTracker {
destroy () {
document.removeEventListener('click', this._onClick)
document.removeEventListener('keyup', this._onKeyUp)
+ document.removeEventListener('blur', this._onBlur)
this._onEvent({ target: document.body }) // calling _onEvent with body element in the hope that the FocusTracker is added to an element inside the body tag
}
diff --git a/test/test_build.html b/test/test_build.html
index 7483074be..b992c7c33 100644
--- a/test/test_build.html
+++ b/test/test_build.html
@@ -42,6 +42,10 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+