-
Notifications
You must be signed in to change notification settings - Fork 916
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[2.x] Add aliased vega-lite v5 dependency and bundle from source (#3151…
…) (#3237) * [Chore] Add vega-lite v5 dep and bundle from source - Add vega-lite@^5.6.0 dependency, aliased to `vega-lite-next` to maintain backwards compatability for any plugins dependent on v4 - Update webpack config to build `vega-lite-next` from typescript source to target es5 - Add babel plugin for logical assignment operators - Selectively import only the vega-lite modules used - Update vega_parser tests Co-authored-by: Miki <[email protected]> Signed-off-by: Josh Romero <[email protected]> * [Chore] Update vega-lite defaults and tests to v5 - Add test case for older vega-light spec parsing - Update default schema version in default spec, test specs, mocked saved objects - Fix indentation of comments in default spec - Update jest mock imports to use `vega-lite-next` Signed-off-by: Josh Romero <[email protected]> * [Chore] Change @babel/plugin-proposal-logical-assignment-operators version - Keep new babel proposal plugin version in sync with other babel plugins Signed-off-by: Josh Romero <[email protected]> Signed-off-by: Josh Romero <[email protected]> Co-authored-by: Miki <[email protected]> (cherry picked from commit ad2cd3a) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: Josh Romero <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Miki <[email protected]>
- Loading branch information
1 parent
0c02514
commit 6df998c
Showing
12 changed files
with
129 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -454,6 +454,7 @@ | |
"vega": "^5.17.3", | ||
"vega-interpreter": "npm:@amoo-miki/[email protected]", | ||
"vega-lite": "^4.16.8", | ||
"vega-lite-next": "npm:vega-lite@^5.6.0", | ||
"vega-schema-url-parser": "^2.1.0", | ||
"vega-tooltip": "^0.24.2", | ||
"vinyl-fs": "^3.0.3", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/plugins/vis_type_vega/public/test_utils/vegalite_graph.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -345,6 +345,11 @@ | |
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" | ||
integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== | ||
|
||
"@babel/helper-plugin-utils@^7.20.2": | ||
version "7.20.2" | ||
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" | ||
integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== | ||
|
||
"@babel/helper-remap-async-to-generator@^7.16.8": | ||
version "7.16.8" | ||
resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" | ||
|
@@ -495,6 +500,14 @@ | |
"@babel/helper-plugin-utils" "^7.16.7" | ||
"@babel/plugin-syntax-json-strings" "^7.8.3" | ||
|
||
"@babel/plugin-proposal-logical-assignment-operators@^7.16.5": | ||
version "7.20.7" | ||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" | ||
integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== | ||
dependencies: | ||
"@babel/helper-plugin-utils" "^7.20.2" | ||
"@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" | ||
|
||
"@babel/plugin-proposal-logical-assignment-operators@^7.16.7": | ||
version "7.16.7" | ||
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" | ||
|
@@ -2742,7 +2755,7 @@ | |
resolved "https://registry.yarnpkg.com/@types/chroma-js/-/chroma-js-2.1.3.tgz#0b03d737ff28fad10eb884e0c6cedd5ffdc4ba0a" | ||
integrity sha512-1xGPhoSGY1CPmXLCBcjVZSQinFjL26vlR8ZqprsBWiFyED4JacJJ9zHhh5aaUXqbY9B37mKQ73nlydVAXmr1+g== | ||
|
||
"@types/clone@~2.1.0": | ||
"@types/clone@~2.1.0", "@types/clone@~2.1.1": | ||
version "2.1.1" | ||
resolved "https://registry.yarnpkg.com/@types/clone/-/clone-2.1.1.tgz#9b880d0ce9b1f209b5e0bd6d9caa38209db34024" | ||
integrity sha512-BZIU34bSYye0j/BFcPraiDZ5ka6MJADjcDVELGf7glr9K+iE8NYVjFslJFVWzskSxkLLyCrSPScE82/UUoBSvg== | ||
|
@@ -4104,9 +4117,9 @@ acorn@^7.0.0, acorn@^7.1.1: | |
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== | ||
|
||
acorn@^8.2.4: | ||
version "8.7.0" | ||
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" | ||
integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== | ||
version "8.8.1" | ||
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" | ||
integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== | ||
|
||
[email protected]: | ||
version "0.5.9" | ||
|
@@ -5727,6 +5740,15 @@ cliui@^7.0.0, cliui@^7.0.2: | |
strip-ansi "^6.0.0" | ||
wrap-ansi "^7.0.0" | ||
|
||
cliui@^8.0.1: | ||
version "8.0.1" | ||
resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" | ||
integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== | ||
dependencies: | ||
string-width "^4.2.0" | ||
strip-ansi "^6.0.1" | ||
wrap-ansi "^7.0.0" | ||
|
||
clone-buffer@^1.0.0: | ||
version "1.0.0" | ||
resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" | ||
|
@@ -11442,6 +11464,11 @@ json-stringify-pretty-compact@~2.0.0: | |
resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" | ||
integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== | ||
|
||
json-stringify-pretty-compact@~3.0.0: | ||
version "3.0.0" | ||
resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz#f71ef9d82ef16483a407869556588e91b681d9ab" | ||
integrity sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA== | ||
|
||
[email protected], json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: | ||
version "5.0.1" | ||
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" | ||
|
@@ -17116,6 +17143,11 @@ tslib@~2.0.3: | |
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" | ||
integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== | ||
|
||
tslib@~2.4.0: | ||
version "2.4.1" | ||
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" | ||
integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== | ||
|
||
tsutils@^3.17.1, tsutils@^3.21.0: | ||
version "3.21.0" | ||
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" | ||
|
@@ -17825,6 +17857,22 @@ vega-label@~1.2.0: | |
vega-scenegraph "^4.9.2" | ||
vega-util "^1.15.2" | ||
|
||
"vega-lite-next@npm:vega-lite@^5.6.0": | ||
version "5.6.0" | ||
resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-5.6.0.tgz#0f0adfc8b86f5eea071df186b2877d828c870c11" | ||
integrity sha512-aTjQk//SzL9ctHY4ItA8yZSGflHMWPJmCXEs8LeRlixuOaAbamZmeL8xNMbQpS/vAZQeFAqjcJ32Fuztz/oGww== | ||
dependencies: | ||
"@types/clone" "~2.1.1" | ||
clone "~2.1.2" | ||
fast-deep-equal "~3.1.3" | ||
fast-json-stable-stringify "~2.1.0" | ||
json-stringify-pretty-compact "~3.0.0" | ||
tslib "~2.4.0" | ||
vega-event-selector "~3.0.0" | ||
vega-expression "~5.0.0" | ||
vega-util "~1.17.0" | ||
yargs "~17.6.0" | ||
|
||
vega-lite@^4.16.8: | ||
version "4.17.0" | ||
resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-4.17.0.tgz#01ad4535e92f28c3852c1071711de272ddfb4631" | ||
|
@@ -18705,6 +18753,11 @@ yargs-parser@^20.0.0, yargs-parser@^20.2.2, yargs-parser@^20.2.3: | |
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" | ||
integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== | ||
|
||
yargs-parser@^21.1.1: | ||
version "21.1.1" | ||
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" | ||
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== | ||
|
||
[email protected]: | ||
version "1.6.0" | ||
resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f" | ||
|
@@ -18773,6 +18826,19 @@ yargs@~16.0.3: | |
y18n "^5.0.1" | ||
yargs-parser "^20.0.0" | ||
|
||
yargs@~17.6.0: | ||
version "17.6.2" | ||
resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" | ||
integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== | ||
dependencies: | ||
cliui "^8.0.1" | ||
escalade "^3.1.1" | ||
get-caller-file "^2.0.5" | ||
require-directory "^2.1.1" | ||
string-width "^4.2.3" | ||
y18n "^5.0.5" | ||
yargs-parser "^21.1.1" | ||
|
||
yauzl@^2.10.0: | ||
version "2.10.0" | ||
resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" | ||
|