diff --git a/package-lock.json b/package-lock.json
index 6a5d6ddf..03aa60b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -474,6 +474,11 @@
"resolved": "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz",
"integrity": "sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ="
},
+ "@types/color-name": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+ "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
+ },
"@types/connect": {
"version": "3.4.33",
"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz",
@@ -1085,6 +1090,11 @@
"integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
"dev": true
},
+ "array-flat-polyfill": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/array-flat-polyfill/-/array-flat-polyfill-1.0.1.tgz",
+ "integrity": "sha512-hfJmKupmQN0lwi0xG6FQ5U8Rd97RnIERplymOv/qpq8AoNKPPAnxJadjFA23FNWm88wykh9HmpLJUUwUtNU/iw=="
+ },
"array-flatten": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -5971,6 +5981,11 @@
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
},
+ "fast-json-patch": {
+ "version": "3.0.0-1",
+ "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz",
+ "integrity": "sha512-6pdFb07cknxvPzCeLsFHStEy+MysPJPgZQ9LbQ/2O67unQF93SNqfdSqnPPl71YMHX+AD8gbl7iuoGFzHEdDuw=="
+ },
"fast-json-stable-stringify": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -15348,34 +15363,35 @@
}
},
"vega": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/vega/-/vega-5.4.0.tgz",
- "integrity": "sha512-1c77yse5ZOYXgVig5RjJCWwM8yHvY1Ds7ncusiT1Hu3wXVhOw8TKe2CLCbcOpWSmPRJ48BRw/6qF70iS4zWYAQ==",
+ "version": "5.9.1",
+ "resolved": "https://registry.npmjs.org/vega/-/vega-5.9.1.tgz",
+ "integrity": "sha512-Wd5WAfaXPGuHk5cSFqiFNkkw5DXRSZcl+q4x351VUbmV5/IRipyGZx05EbBP5D9B40Xb/Tt2I+JQBBdxuYYIxQ==",
"requires": {
- "vega-crossfilter": "^4.0.1",
- "vega-dataflow": "^5.2.1",
- "vega-encode": "^4.3.0",
- "vega-event-selector": "^2.0.0",
- "vega-expression": "^2.6.0",
- "vega-force": "^4.0.1",
- "vega-functions": "^5.3.0",
- "vega-geo": "^4.0.3",
- "vega-hierarchy": "^4.0.1",
- "vega-loader": "^4.1.0",
- "vega-parser": "^5.7.0",
- "vega-projection": "^1.2.1",
- "vega-regression": "^1.0.0",
- "vega-runtime": "^5.0.1",
- "vega-scale": "^4.1.1",
- "vega-scenegraph": "^4.2.0",
- "vega-statistics": "^1.4.0",
- "vega-transforms": "^4.1.0",
- "vega-typings": "^0.7.0",
- "vega-util": "^1.10.0",
- "vega-view": "^5.2.2",
- "vega-view-transforms": "^4.3.1",
- "vega-voronoi": "^4.0.1",
- "vega-wordcloud": "^4.0.2"
+ "vega-crossfilter": "4.0.1",
+ "vega-dataflow": "5.5.0",
+ "vega-encode": "4.5.2",
+ "vega-event-selector": "2.0.2",
+ "vega-expression": "2.6.3",
+ "vega-force": "4.0.3",
+ "vega-functions": "5.5.1",
+ "vega-geo": "4.3.0",
+ "vega-hierarchy": "4.0.3",
+ "vega-loader": "4.1.3",
+ "vega-parser": "5.12.0",
+ "vega-projection": "1.4.0",
+ "vega-regression": "1.0.4",
+ "vega-runtime": "5.0.2",
+ "vega-scale": "6.0.0",
+ "vega-scenegraph": "4.5.0",
+ "vega-statistics": "1.7.2",
+ "vega-time": "1.0.0",
+ "vega-transforms": "4.6.0",
+ "vega-typings": "0.12.0",
+ "vega-util": "1.12.2",
+ "vega-view": "5.4.0",
+ "vega-view-transforms": "4.5.0",
+ "vega-voronoi": "4.1.1",
+ "vega-wordcloud": "4.0.4"
}
},
"vega-canvas": {
@@ -15410,16 +15426,16 @@
}
},
"vega-embed": {
- "version": "4.2.2",
- "resolved": "https://registry.npmjs.org/vega-embed/-/vega-embed-4.2.2.tgz",
- "integrity": "sha512-0CkTK8EQu7tzojhTMRfWDv1QKBy6debQRFpJ+QWKxgA+6O6fV3UkufpZaD2XccMAkCRDAFUl6tmxsLta2HBHRQ==",
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/vega-embed/-/vega-embed-6.2.2.tgz",
+ "integrity": "sha512-u9CX9jpIbu2DY2lqs0J7CLA7+VXNlR+qkzxOwaVKfS0ivB54dxQXKvE59VHV02Nwb5XhaDGTEMN0FRCAvgkdLQ==",
"requires": {
- "d3-selection": "^1.4.0",
+ "fast-json-patch": "^3.0.0-1",
"json-stringify-pretty-compact": "^2.0.0",
"semver": "^6.3.0",
"vega-schema-url-parser": "^1.1.0",
- "vega-themes": "^2.3.2",
- "vega-tooltip": "^0.18.1"
+ "vega-themes": "^2.6.0",
+ "vega-tooltip": "^0.20.0"
},
"dependencies": {
"semver": {
@@ -15447,29 +15463,6 @@
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
"integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw=="
- },
- "d3-scale": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.1.tgz",
- "integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==",
- "requires": {
- "d3-array": "1.2.0 - 2",
- "d3-format": "1",
- "d3-interpolate": "^1.2.0",
- "d3-time": "1",
- "d3-time-format": "2"
- }
- },
- "vega-scale": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-6.0.0.tgz",
- "integrity": "sha512-uNJ5LC+s+XLxdO2iXC36/TLen3mMNv0wzhMZMNXa8h+Ih10geJ57sHbYYA8Z8403JC9AYTaWUe7m0H9CHgV9NA==",
- "requires": {
- "d3-array": "^2.4.0",
- "d3-interpolate": "^1.4.0",
- "d3-scale": "^3.2.1",
- "vega-util": "^1.12.1"
- }
}
}
},
@@ -15532,29 +15525,6 @@
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
"integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw=="
- },
- "d3-scale": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.1.tgz",
- "integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==",
- "requires": {
- "d3-array": "1.2.0 - 2",
- "d3-format": "1",
- "d3-interpolate": "^1.2.0",
- "d3-time": "1",
- "d3-time-format": "2"
- }
- },
- "vega-scale": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-6.0.0.tgz",
- "integrity": "sha512-uNJ5LC+s+XLxdO2iXC36/TLen3mMNv0wzhMZMNXa8h+Ih10geJ57sHbYYA8Z8403JC9AYTaWUe7m0H9CHgV9NA==",
- "requires": {
- "d3-array": "^2.4.0",
- "d3-interpolate": "^1.4.0",
- "d3-scale": "^3.2.1",
- "vega-util": "^1.12.1"
- }
}
}
},
@@ -15591,33 +15561,179 @@
}
},
"vega-lite": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-3.4.0.tgz",
- "integrity": "sha512-RJg9uBNh5g0hA8xTzAcALUfNx0cEq7E7xx+vxPEGSMgI8z+A5KlE9u4jUx6nKu7Mjg1qZO8WOyWCmBS1kdFWPg==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-4.4.0.tgz",
+ "integrity": "sha512-Np48CMrCJRDkYQOYdcQ1s6Fuwc4/m/mj3JgVve73J7AvX5nxDsliTk9z/A4krSyTh1O4sHgOhW/N/BtIz5DpIg==",
"requires": {
"@types/clone": "~0.1.30",
"@types/fast-json-stable-stringify": "^2.0.0",
+ "array-flat-polyfill": "^1.0.1",
"clone": "~2.1.2",
- "fast-deep-equal": "~2.0.1",
- "fast-json-stable-stringify": "~2.0.0",
+ "fast-deep-equal": "~3.1.1",
+ "fast-json-stable-stringify": "~2.1.0",
"json-stringify-pretty-compact": "~2.0.0",
"tslib": "~1.10.0",
- "vega-event-selector": "~2.0.0",
- "vega-expression": "~2.6.0",
- "vega-typings": "0.7.2",
- "vega-util": "~1.10.0",
- "yargs": "~13.3.0"
+ "vega-event-selector": "~2.0.2",
+ "vega-expression": "~2.6.3",
+ "vega-scale": "^6.0.0",
+ "vega-util": "~1.12.2",
+ "yargs": "~15.1.0"
},
"dependencies": {
- "fast-json-stable-stringify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
- "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
},
- "vega-util": {
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.10.0.tgz",
- "integrity": "sha512-fTGnTG7FhtTG9tiYDL3k5s8YHqB71Ml5+aC9B7eaBygeB8GKXBrcbTXLOzoCRxT3Jr5cRhr99PMBu0AkqmhBog=="
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "cliui": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+ "requires": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ },
+ "emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+ },
+ "fast-deep-equal": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+ "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+ },
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+ },
+ "is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
+ },
+ "p-limit": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+ "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+ },
+ "string-width": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+ "requires": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+ "requires": {
+ "ansi-regex": "^5.0.0"
+ }
+ },
+ "wrap-ansi": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "requires": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ }
+ },
+ "yargs": {
+ "version": "15.1.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
+ "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+ "requires": {
+ "cliui": "^6.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^4.1.0",
+ "get-caller-file": "^2.0.1",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^2.0.0",
+ "set-blocking": "^2.0.0",
+ "string-width": "^4.2.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^16.1.0"
+ }
+ },
+ "yargs-parser": {
+ "version": "16.1.0",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
+ "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
}
}
},
@@ -15651,36 +15767,6 @@
"vega-functions": "^5.5.0",
"vega-scale": "^6.0.0",
"vega-util": "^1.12.1"
- },
- "dependencies": {
- "d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw=="
- },
- "d3-scale": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.1.tgz",
- "integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==",
- "requires": {
- "d3-array": "1.2.0 - 2",
- "d3-format": "1",
- "d3-interpolate": "^1.2.0",
- "d3-time": "1",
- "d3-time-format": "2"
- }
- },
- "vega-scale": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-6.0.0.tgz",
- "integrity": "sha512-uNJ5LC+s+XLxdO2iXC36/TLen3mMNv0wzhMZMNXa8h+Ih10geJ57sHbYYA8Z8403JC9AYTaWUe7m0H9CHgV9NA==",
- "requires": {
- "d3-array": "^2.4.0",
- "d3-interpolate": "^1.4.0",
- "d3-scale": "^3.2.1",
- "vega-util": "^1.12.1"
- }
- }
}
},
"vega-projection": {
@@ -15720,15 +15806,14 @@
}
},
"vega-scale": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-4.1.3.tgz",
- "integrity": "sha512-hpLrEFntN18e+eRAxa8b8malSbNVQyziKmUMGI1Za8ZB64cYj+A/G87ePE0ExSymfrvc/Xulh4VQZNxkPJll4w==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-6.0.0.tgz",
+ "integrity": "sha512-uNJ5LC+s+XLxdO2iXC36/TLen3mMNv0wzhMZMNXa8h+Ih10geJ57sHbYYA8Z8403JC9AYTaWUe7m0H9CHgV9NA==",
"requires": {
- "d3-array": "^2.3.2",
- "d3-interpolate": "^1.3.2",
- "d3-scale": "^3.1.0",
- "d3-time": "^1.1.0",
- "vega-util": "^1.11.0"
+ "d3-array": "^2.4.0",
+ "d3-interpolate": "^1.4.0",
+ "d3-scale": "^3.2.1",
+ "vega-util": "^1.12.1"
},
"dependencies": {
"d3-array": {
@@ -15815,11 +15900,11 @@
}
},
"vega-tooltip": {
- "version": "0.18.1",
- "resolved": "https://registry.npmjs.org/vega-tooltip/-/vega-tooltip-0.18.1.tgz",
- "integrity": "sha512-g/i69QLTVhGeHNT8k646Qr8SFss9kbnt6XmU9ujjqgaW5B/p1FPUrMzFh/88rMF704EHYyBH7Aj3t0ds1cCHbQ==",
+ "version": "0.20.1",
+ "resolved": "https://registry.npmjs.org/vega-tooltip/-/vega-tooltip-0.20.1.tgz",
+ "integrity": "sha512-kk1p2VRDAZRdoi9C6UdItOO8GCFbtVfUNT1g3XPpHCYuQ4Lrjffa0SNcT/i69luC3n6qd9VyrceFoPBGM4YvTw==",
"requires": {
- "vega-util": "^1.10.0"
+ "vega-util": "^1.12.2"
}
},
"vega-transforms": {
@@ -15842,11 +15927,11 @@
}
},
"vega-typings": {
- "version": "0.7.2",
- "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.7.2.tgz",
- "integrity": "sha512-BReB2qRERA/Ke+QoxKDQ7fES25A9Q3qKRm1CJxwvpLGhAl4k5cGDORx6yW+J3rFHMzpJlmdRM+kb489EuphxZQ==",
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.12.0.tgz",
+ "integrity": "sha512-K+IoUTTtXW3E1Qhr/y+JgLRxy476viAm6DeM8IiVrA8vvuLA3FTzHaeI7TCnaWEwk9xxLJBtdVKKC5FGbp0Nyw==",
"requires": {
- "vega-util": "^1.10.0"
+ "vega-util": "^1.12.1"
}
},
"vega-util": {
@@ -15905,36 +15990,6 @@
"vega-scale": "^6.0.0",
"vega-statistics": "^1.7.1",
"vega-util": "^1.12.1"
- },
- "dependencies": {
- "d3-array": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
- "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw=="
- },
- "d3-scale": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.1.tgz",
- "integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==",
- "requires": {
- "d3-array": "1.2.0 - 2",
- "d3-format": "1",
- "d3-interpolate": "^1.2.0",
- "d3-time": "1",
- "d3-time-format": "2"
- }
- },
- "vega-scale": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-6.0.0.tgz",
- "integrity": "sha512-uNJ5LC+s+XLxdO2iXC36/TLen3mMNv0wzhMZMNXa8h+Ih10geJ57sHbYYA8Z8403JC9AYTaWUe7m0H9CHgV9NA==",
- "requires": {
- "d3-array": "^2.4.0",
- "d3-interpolate": "^1.4.0",
- "d3-scale": "^3.2.1",
- "vega-util": "^1.12.1"
- }
- }
}
},
"velocity-animate": {
diff --git a/package.json b/package.json
index fe307209..64acc325 100644
--- a/package.json
+++ b/package.json
@@ -144,9 +144,9 @@
"turndown": "~5.0.3",
"uuid": "~3.3.2",
"validator": "~11.1.0",
- "vega": "~5.4.0",
- "vega-embed": "~4.2.2",
- "vega-lite": "~3.4.0",
+ "vega": "~5.9.1",
+ "vega-embed": "~6.2.2",
+ "vega-lite": "~4.4.0",
"velocity-animate": "~1.5.2",
"visibilityjs": "~2.0.2",
"viz.js": "~2.1.2",
diff --git a/public/docs/features.md b/public/docs/features.md
index 4f7d2819..c3f5fac9 100644
--- a/public/docs/features.md
+++ b/public/docs/features.md
@@ -334,7 +334,7 @@ stop
### Vega-Lite
```vega
{
- "$schema": "https://vega.github.io/schema/vega-lite/v3.json",
+ "$schema": "https://vega.github.io/schema/vega-lite/v4.json",
"data": {"url": "https://vega.github.io/editor/data/barley.json"},
"mark": "bar",
"encoding": {
diff --git a/public/js/extra.js b/public/js/extra.js
index 6f1455cf..f32e13c8 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -437,7 +437,7 @@ export function finishView (view) {
const specText = $value.text()
$value.unwrap()
- window.vegaEmbed($ele[0], JSON.parse(specText))
+ window.vegaEmbed($ele[0], JSON.parse(specText), { renderer: 'svg' })
.then(result => {
$ele.addClass('vega')
})
diff --git a/public/js/lib/editor/index.js b/public/js/lib/editor/index.js
index 5daca68d..830670e3 100644
--- a/public/js/lib/editor/index.js
+++ b/public/js/lib/editor/index.js
@@ -131,6 +131,17 @@ export default class Editor {
}
this.eventListeners = {}
this.config = config
+
+ // define modes from mode mime
+ const ignoreOverlay = {
+ token: function (stream, state) {
+ stream.next()
+ return null
+ }
+ }
+ CodeMirror.defineMode('vega', function (config, modeConfig) {
+ return CodeMirror.overlayMode(CodeMirror.getMode(config, 'application/ld+json'), ignoreOverlay)
+ })
}
on (event, cb) {
diff --git a/public/views/codimd/foot.ejs b/public/views/codimd/foot.ejs
index db2248e3..e9aa5e7a 100644
--- a/public/views/codimd/foot.ejs
+++ b/public/views/codimd/foot.ejs
@@ -21,9 +21,9 @@
-
-
-
+
+
+
<%- include ../build/index-scripts %>
<% } else { %>
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 445048b8..31567801 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -90,9 +90,9 @@
-
-
-
+
+
+
<%- include build/pretty-scripts %>
<% } else { %>
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index 22f12091..6503aff8 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -105,9 +105,9 @@
-
-
-
+
+
+
<%- include build/slide-scripts %>
<% } else { %>