Skip to content

Commit

Permalink
Upgrade Vega and Vega-Lite
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed Dec 5, 2018
1 parent 6a4c0f6 commit 036d4bd
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 98 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
"redux-localstorage": "^0.4.1",
"redux-thunk": "^2.3.0",
"tslib": "^1.9.3",
"vega": "github:vega/vega#v4.3.0",
"vega": "github:vega/vega#v4.4.0",
"vega-datasets": "^1.20.0",
"vega-lite": "github:vega/vega-lite#v3.0.0-rc9",
"vega-lite": "github:vega/vega-lite#v3.0.0-rc10",
"vega-schema-url-parser": "^1.1.0",
"vega-tooltip": "^0.13.0"
},
Expand Down
5 changes: 4 additions & 1 deletion public/spec/vega-lite/bar_layered_weather.vl.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"$schema":
"https://vega.github.io/schema/vega-lite/v3.json",
"description": "A layered bar chart with floating bars representing weekly weather data",
"title": "Weekly Weather Observations and Predictions",
"title": {
"text": "Weekly Weather Observations and Predictions",
"frame": "bounds"
},
"data":{
"url": "data/weather.json" },
"width": 250,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
},
"vconcat": [
{
"title": "Mean of Subject Ratings (95% CIs)",
"title": {
"text": "Mean of Subject Ratings (95% CIs)",
"frame": "bounds"
},
"encoding": {
"y": {
"field": "study",
Expand Down
5 changes: 4 additions & 1 deletion public/spec/vega-lite/window_rank.vl.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"$schema": "https://vega.github.io/schema/vega-lite/v3.json",
"title": "World Cup 2018: Group F Rankings",
"title": {
"text": "World Cup 2018: Group F Rankings",
"frame": "bounds"
},
"data": {
"values": [
{"team": "Germany", "matchday": 1, "point": 0, "diff": -1},
Expand Down
186 changes: 93 additions & 93 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ cyclist@~0.2.2:
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=

d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0, d3-array@^1.2.1, d3-array@^1.2.4:
d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
version "1.2.4"
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
Expand All @@ -1145,7 +1145,7 @@ d3-color@1, d3-color@^1.2.3:
resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.2.3.tgz#6c67bb2af6df3cc8d79efcc4d3a3e83e28c8048f"
integrity sha512-x37qq3ChOTLd26hnps36lexMRhNXEtVxZ4B25rL0DVdDsGQIJGB18S7y9XDwlDD6MD/ZBzITCf4JjGMM10TZkw==

d3-contour@^1.3.0:
d3-contour@^1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3"
integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==
Expand Down Expand Up @@ -1190,7 +1190,7 @@ d3-geo-projection@^2.5.0:
d3-array "1"
d3-geo "^1.10.0"

d3-geo@^1.10.0, d3-geo@^1.11.1:
d3-geo@^1.10.0, d3-geo@^1.11.3:
version "1.11.3"
resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.3.tgz#5bb08388f45e4b281491faa72d3abd43215dbd1c"
integrity sha512-n30yN9qSKREvV2fxcrhmHUdXP9TNH7ZZj3C/qnaoU0cVf/Ea85+yT7HY7i8ySPwkwjCNYtmKqQFTvLFngfkItQ==
Expand Down Expand Up @@ -3286,9 +3286,9 @@ node-pre-gyp@^0.10.0:
tar "^4"

node-releases@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.5.tgz#a641adcc968b039a27345d92ef10b093e5cbd41d"
integrity sha512-Ky7q0BO1BBkG/rQz6PkEZ59rwo+aSfhczHP1wwq8IowoVdN/FpiP7qp0XW0P2+BVCWe5fQUBozdbVd54q1RbCQ==
version "1.1.0"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.0.tgz#be7464fa8d877808237520fd49436d5e79191c3d"
integrity sha512-+qV91QMDBvARuPxUEfI/mRF/BY+UAkTIn3pvmvM2iOLIRvv6RNYklFXBgrkky6P1wXUqQW1P3qKlWxxy4JZbfg==
dependencies:
semver "^5.3.0"

Expand Down Expand Up @@ -5133,37 +5133,37 @@ vega-canvas@^1.0.1, vega-canvas@^1.1.0:
resolved "https://registry.yarnpkg.com/vega-canvas/-/vega-canvas-1.1.0.tgz#99ce74d4510a46fc9ed1a8721014da725898ec9f"
integrity sha512-0RBwjnrFf4VRhNm5ICY+o1/q6mynli+VheOXKGML9mElRsplZgzd/pv9NnNRNigU+M66Kr7zUpskoakh8EhW9Q==

vega-crossfilter@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/vega-crossfilter/-/vega-crossfilter-3.0.0.tgz#390f4c380a9c6018bf89700c38c08d16cd95607a"
integrity sha512-h8HLc0YGaCFx3XTJYe2ixDQKHErvAFmFCE5EzLf7qmoWKtfXvXqB0+YcV/h5XC6VmLdUwFzMah+deDjIwncq7g==
vega-crossfilter@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/vega-crossfilter/-/vega-crossfilter-3.0.1.tgz#8b4394fb5e354e5c6f79ca9f491531a292c04209"
integrity sha512-GNCP0k1otJKtE9SnYm1cDBqUfBvWTaxJ3/bdMpWvGNUtAdDBAlrtspDBTpwMu4MLNWbAy1zp9jN0ztCXBZF29Q==
dependencies:
d3-array "^1.2.1"
vega-dataflow "^4.0.0"
d3-array "^2.0.2"
vega-dataflow "^4.1.0"
vega-util "^1.7.0"

vega-dataflow@^4.0.0, vega-dataflow@^4.0.3, vega-dataflow@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/vega-dataflow/-/vega-dataflow-4.0.4.tgz#e2f4b4805618d01c0b833a93484d3c244675fba3"
integrity sha1-4vS0gFYY0BwLgzqTSE08JEZ1+6M=
vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/vega-dataflow/-/vega-dataflow-4.1.0.tgz#c63abee8502eedf42a972ad5d3a2ce7475aab7d8"
integrity sha512-LuXoN3LkYWNYTPeMiOgSlw2TZAWjmN46Q9HmHM8ClhXYAj+pYme3IPdtYn1OmcvWe4rKeiYgNYrtJCgTOvCepg==
dependencies:
vega-loader "^3.0.1"
vega-loader "^3.1.0"
vega-util "^1.7.0"

vega-datasets@^1.20.0:
version "1.20.0"
resolved "https://registry.yarnpkg.com/vega-datasets/-/vega-datasets-1.20.0.tgz#d1d9710cdc03bbdeed2f98f2098ceae6d0509f0d"
integrity sha512-ynJOgUjwD2iYn/dNzfS51mkQxt5d75nCK7U/kqwGClU8ba0FIB9wB5M4VQ22h0U1AdC/rWTAI/JEjh4rgJWTzA==

vega-encode@^3.2.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/vega-encode/-/vega-encode-3.2.1.tgz#07e23b56612cf76044731eca9ce18270f389e2f1"
integrity sha512-ueNdUlm3KU8F4jLbW+V/VLZbhM9mkwSY9AJC60C4yaKKt0UnOO/xMewLW69A3D+s6WzJK1ARhyVBR+iktzWOPA==
vega-encode@^3.2.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/vega-encode/-/vega-encode-3.2.2.tgz#b7bdee200629b1d54de8267b1b8aafef9f1be8b7"
integrity sha512-Hmk+ReH6R1wTnz56gWyk8CnzgAzq11QYkrEzw794MMY2l61EG3sX9veyZ9AdtDufOq9oDa58/kfgk65UD9A+sA==
dependencies:
d3-array "^2.0.2"
d3-format "^1.3.2"
d3-interpolate "^1.3.2"
vega-dataflow "^4.0.4"
vega-dataflow "^4.1.0"
vega-scale "^2.5.0"
vega-util "^1.7.0"

Expand All @@ -5188,15 +5188,15 @@ vega-force@^3.0.0:
vega-dataflow "^4.0.0"
vega-util "^1.7.0"

vega-geo@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/vega-geo/-/vega-geo-3.1.0.tgz#2022f0dc612199585b10d2274967fee94d7505b4"
integrity sha1-ICLw3GEhmVhbENInSWf+6U11BbQ=
vega-geo@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/vega-geo/-/vega-geo-3.1.1.tgz#5ff84061dea93d89a453e1b56b3444a6031810f6"
integrity sha512-EltBQmid6DZ7d4iArgTnsGRsx4ZaHrwvaegq6iIwWp7GHtJ8i+8bzPFfHo1pBuRVmHG4ZA2NH+cNaW2IIgWcPg==
dependencies:
d3-array "^1.2.1"
d3-contour "^1.3.0"
d3-geo "^1.10.0"
vega-dataflow "^4.0.3"
d3-array "^2.0.2"
d3-contour "^1.3.2"
d3-geo "^1.11.3"
vega-dataflow "^4.1.0"
vega-projection "^1.2.0"
vega-util "^1.7.0"

Expand All @@ -5210,37 +5210,37 @@ vega-hierarchy@^3.1.0:
vega-dataflow "^4.0.4"
vega-util "^1.7.0"

vega-lib@4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.3.0.tgz#b17bea4393a281db3e647e665b9e97aa793ccfd6"
integrity sha512-NNTpxpUAQfFUqkf6XnsL5nko9sCIQPMRe5AZI9Bsb8mHaA0oukAV1dPIb57MIYZg/wYwtrvc6EwhKxsjCQZHnA==
vega-lib@4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880"
integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg==
dependencies:
vega-crossfilter "^3.0.0"
vega-dataflow "^4.0.4"
vega-encode "^3.2.0"
vega-crossfilter "^3.0.1"
vega-dataflow "^4.1.0"
vega-encode "^3.2.2"
vega-event-selector "^2.0.0"
vega-expression "^2.4.0"
vega-force "^3.0.0"
vega-geo "^3.1.0"
vega-geo "^3.1.1"
vega-hierarchy "^3.1.0"
vega-loader "^3.0.1"
vega-parser "^3.8.0"
vega-loader "^3.1.0"
vega-parser "^3.9.0"
vega-projection "^1.2.0"
vega-runtime "^3.1.1"
vega-scale "^2.5.0"
vega-runtime "^3.2.0"
vega-scale "^2.5.1"
vega-scenegraph "^3.2.3"
vega-statistics "^1.2.2"
vega-transforms "^2.3.0"
vega-statistics "^1.2.3"
vega-transforms "^2.3.1"
vega-typings "*"
vega-util "^1.7.0"
vega-view "^3.4.0"
vega-view "^3.4.1"
vega-view-transforms "^2.0.3"
vega-voronoi "^3.0.0"
vega-wordcloud "^3.0.0"

"vega-lite@github:vega/vega-lite#v3.0.0-rc9":
version "3.0.0-rc9"
resolved "https://codeload.github.com/vega/vega-lite/tar.gz/98b4592898006941f7c070e1fff44c03ee28aed6"
"vega-lite@github:vega/vega-lite#v3.0.0-rc10":
version "3.0.0-rc10"
resolved "https://codeload.github.com/vega/vega-lite/tar.gz/a90206727941626d1837241844972b60f63228ae"
dependencies:
fast-deep-equal "^2.0.1"
json-stable-stringify "^1.0.1"
Expand All @@ -5251,7 +5251,7 @@ vega-lib@4.3.0:
vega-util "^1.7.0"
yargs "^12.0.5"

vega-loader@^3.0.1:
vega-loader@^3.0.1, vega-loader@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/vega-loader/-/vega-loader-3.1.0.tgz#21caa0e78e158a676eafd0e7cb5bae4c18996c5a"
integrity sha512-FD9KJdPxBOa+fTnjC2dfY5+kB05hXyVOfjIkssmgyyhELJPp2FwclcF4mVy7Ay1E8fUHY3GgbwSE5jL8k4pYUg==
Expand All @@ -5262,22 +5262,22 @@ vega-loader@^3.0.1:
topojson-client "^3.0.0"
vega-util "^1.7.0"

vega-parser@3.8.0, vega-parser@^3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/vega-parser/-/vega-parser-3.8.0.tgz#875fe6d6d22649fdc9764ca57e2402d4bc9b3512"
integrity sha512-kO8uZHjUq4fnBtiegueNmDP0dzckRW9zbZp285Ece1V6qRPmkatQSMcMQkc3RWqAjz76ty2I/qt1LcgMJXfeQw==
vega-parser@3.9.0, vega-parser@^3.9.0:
version "3.9.0"
resolved "https://registry.yarnpkg.com/vega-parser/-/vega-parser-3.9.0.tgz#a7bbe380c5ae70ddd501163302a948f25aadd686"
integrity sha512-/fdPt5wcZgbPi0zwzJsBgi/k2GO3s53j7kJUYFGff75+wLJ2n/XtLCU295Wo7+cGCfkCZs0FfYKWa8AJrQZiag==
dependencies:
d3-array "^1.2.4"
d3-array "^2.0.2"
d3-color "^1.2.3"
d3-format "^1.3.2"
d3-geo "^1.11.1"
d3-geo "^1.11.3"
d3-time-format "^2.1.3"
vega-dataflow "^4.0.4"
vega-dataflow "^4.1.0"
vega-event-selector "^2.0.0"
vega-expression "^2.4.0"
vega-scale "^2.5.0"
vega-scale "^2.5.1"
vega-scenegraph "^3.2.3"
vega-statistics "^1.2.2"
vega-statistics "^1.2.3"
vega-util "^1.7.0"

vega-projection@^1.2.0:
Expand All @@ -5287,20 +5287,20 @@ vega-projection@^1.2.0:
dependencies:
d3-geo "^1.10.0"

vega-runtime@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/vega-runtime/-/vega-runtime-3.1.1.tgz#b6994d043b4f2d12616fdbce60d3524e4c5549e2"
integrity sha512-blO3qROr+Rmy/X50tskG5iKmG/hzL55sdw/tly4VIStJ7sVE4ivc0iqyVuka7ID88ft3iVieljZGExAldP/S8w==
vega-runtime@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/vega-runtime/-/vega-runtime-3.2.0.tgz#ad4152079989058db90ce1993f16b3876f628d8b"
integrity sha512-aoWqH+U5tiByj3cIGZsTDPMTb10tUN2nm4zWa3Z7lOUilbw/+gEaOuy1qvr4VrVhUShsnytudED4OpQNUkKy3Q==
dependencies:
vega-dataflow "^4.0.4"
vega-dataflow "^4.1.0"
vega-util "^1.7.0"

vega-scale@^2.1.1, vega-scale@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/vega-scale/-/vega-scale-2.5.0.tgz#9fcb73650288454d597172df54222bc0229b5d74"
integrity sha512-dDpVyQClEpZuR03c71jAPoBSHhkRYc+iyNerA9UeZYbOJZK/yhsicgbifXUEMz5cmJBdGIMFugbw/FBtmzeFQQ==
vega-scale@^2.1.1, vega-scale@^2.5.0, vega-scale@^2.5.1:
version "2.5.1"
resolved "https://registry.yarnpkg.com/vega-scale/-/vega-scale-2.5.1.tgz#5b5ce7752e904c17077db9a924418dabd6ffb991"
integrity sha512-EOpUDOjTAD7DhXglyOquXTzXFXjnNvrGyMDCOsfRL/XUTsbjYYNkdl0Q30c9fVN1I+H65lMz52xwN16yxwMuTw==
dependencies:
d3-array "^1.2.4"
d3-array "^2.0.2"
d3-interpolate "^1.3.2"
d3-scale "^2.1.2"
d3-scale-chromatic "^1.3.3"
Expand All @@ -5323,12 +5323,12 @@ vega-schema-url-parser@^1.1.0:
resolved "https://registry.yarnpkg.com/vega-schema-url-parser/-/vega-schema-url-parser-1.1.0.tgz#39168ec04e5468ce278a06c16ec0d126035a85b5"
integrity sha512-Tc85J2ofMZZOsxiqDM9sbvfsa+Vdo3GwNLjEEsPOsCDeYqsUHKAlc1IpbbhPLZ6jusyM9Lk0e1izF64GGklFDg==

vega-statistics@^1.2.1, vega-statistics@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/vega-statistics/-/vega-statistics-1.2.2.tgz#ce925d56bafec13d6bd0ee49e6d6c0c85e2be643"
integrity sha512-8izr76Ub5n7vSV+I72t07LOGpgynXN1/0Kbrxpw4LaPEHPG4OWORiZczEypL2VWWGXU8GBVaXHSlrJvyWujo9A==
vega-statistics@^1.2.1, vega-statistics@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/vega-statistics/-/vega-statistics-1.2.3.tgz#4a7ca4c5fd9cc00c3700cb9cde336995439a55fa"
integrity sha512-Acs6kswwO7lJYiG7KXxSI+Hr+PDKF+EMX/KmCOmyn8JB1W9fWIhTMBCNKf27r8XuAboBd0fQixuIx9L1Scdo+g==
dependencies:
d3-array "^1.2.4"
d3-array "^2.0.2"

vega-tooltip@^0.13.0:
version "0.13.0"
Expand All @@ -5337,14 +5337,14 @@ vega-tooltip@^0.13.0:
dependencies:
vega-util "^1.7.0"

vega-transforms@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/vega-transforms/-/vega-transforms-2.3.0.tgz#bcfb90f8f8253914c71bad786ac230a16c2ae372"
integrity sha512-iTcnKTAOMIDs2pYj82P6izEymXF04niMpAu8697aNUOe+6KsHjpJDV8EvBlHbcB6mZ99GwvtgTPzdV/2enb5eA==
vega-transforms@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/vega-transforms/-/vega-transforms-2.3.1.tgz#a31a1ff8086c6909384ddfcc973bd58d53d801ae"
integrity sha512-jvDz33ohZiP6cN74quEvesHr0sbSMMQ69ZZqgL6cRDHBqfiuHPhZofBKWDXE1nEWDmJqTEyvg0gsnA8vpHzpjQ==
dependencies:
d3-array "^1.2.4"
vega-dataflow "^4.0.4"
vega-statistics "^1.2.2"
d3-array "^2.0.2"
vega-dataflow "^4.1.0"
vega-statistics "^1.2.3"
vega-util "^1.7.0"

vega-typings@*, vega-typings@0.3.51:
Expand All @@ -5368,16 +5368,16 @@ vega-view-transforms@^2.0.3:
vega-scenegraph "^3.2.3"
vega-util "^1.7.0"

vega-view@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/vega-view/-/vega-view-3.4.0.tgz#158d4417e08573aa949789d9a119efd6a240ec09"
integrity sha512-QLWYNaoA/m6M4n2CG98rsdgGbkjLTlFtUQleK9oy4XdTkSZSSwwVt/j3xDSCn1gvWMB7rxdBqisFnMi7oxSfOw==
vega-view@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/vega-view/-/vega-view-3.4.1.tgz#8f36fea88792b3b1ee3a535c5322dc7ecd975532"
integrity sha512-hT9Bj9qRCGz+4umid8tFuADyUF7xOHTQmeu18XtRgEkNOtTALlDYLmCSpcGkP1N6eeZm3aRWBtkUz/XE7/6d+Q==
dependencies:
d3-array "^1.2.4"
d3-array "^2.0.2"
d3-timer "^1.0.9"
vega-dataflow "^4.0.4"
vega-parser "^3.8.0"
vega-runtime "^3.1.1"
vega-dataflow "^4.1.0"
vega-parser "^3.9.0"
vega-runtime "^3.2.0"
vega-scenegraph "^3.2.3"
vega-util "^1.7.0"

Expand All @@ -5401,12 +5401,12 @@ vega-wordcloud@^3.0.0:
vega-statistics "^1.2.1"
vega-util "^1.7.0"

"vega@github:vega/vega#v4.3.0":
version "4.3.0"
resolved "https://codeload.github.com/vega/vega/tar.gz/9284d044ef8421cdb7fa57510d2261480e8eb3b0"
"vega@github:vega/vega#v4.4.0":
version "4.4.0"
resolved "https://codeload.github.com/vega/vega/tar.gz/ba6e58e4c845a3cca67b552f89b4f02597e0f947"
dependencies:
vega-lib "4.3.0"
vega-parser "3.8.0"
vega-lib "4.4.0"
vega-parser "3.9.0"
vega-typings "*"
yargs "12"
optionalDependencies:
Expand Down

0 comments on commit 036d4bd

Please sign in to comment.