From 959cca8e37ac3b090e03776b0c8ac0ae563abbf9 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Wed, 28 Mar 2018 21:13:17 -0700 Subject: [PATCH 1/3] Update vega dependencies --- deps/build.jl | 8 ++++---- deps/package.json | 4 ++-- src/render.jl | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deps/build.jl b/deps/build.jl index 3abd7601..6c98befb 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -3,10 +3,10 @@ using BinDeps @BinDeps.setup -uschema = "https://vega.github.io/schema/vega-lite/v2.1.3.json" -uvega = "https://cdnjs.cloudflare.com/ajax/libs/vega/3.1.0/vega.min.js" -uvegalite = "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.1.3/vega-lite.min.js" -uembed = "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.0.0/vega-embed.min.js" +uschema = "https://vega.github.io/schema/vega-lite/v2.3.1.json" +uvega = "https://cdnjs.cloudflare.com/ajax/libs/vega/3.2.1/vega.min.js" +uvegalite = "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.3.1/vega-lite.min.js" +uembed = "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.2.0/vega-embed.min.js" destdir = joinpath(@__DIR__, "lib") diff --git a/deps/package.json b/deps/package.json index d32432bf..98a7ec7b 100644 --- a/deps/package.json +++ b/deps/package.json @@ -3,8 +3,8 @@ "version": "1.0.1", "dependencies": { "rw": "^1.3.3", - "vega": "^3.1.0", - "vega-lite": "^2.1.3", + "vega": "^3.2.1", + "vega-lite": "^2.3.1", "xmlhttprequest": "^1.8.0" } } diff --git a/src/render.jl b/src/render.jl index 6ba21a1a..f61a8e09 100644 --- a/src/render.jl +++ b/src/render.jl @@ -96,9 +96,9 @@ function writehtml_partial(io::IO, spec::String; title="VegaLite plot") requirejs.config({ paths: { - vg: "https://cdnjs.cloudflare.com/ajax/libs/vega/3.1.0/vega.min.js?noext", - vl: "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.1.3/vega-lite.min.js?noext", - vg_embed: "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.0.0/vega-embed.min.js?noext" + vg: "https://cdnjs.cloudflare.com/ajax/libs/vega/3.2.1/vega.min.js?noext", + vl: "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.3.1/vega-lite.min.js?noext", + vg_embed: "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.2.0/vega-embed.min.js?noext" }, shim: { vg_embed: {deps: ["vg.global", "vl.global"]}, From 760aa10420f56c3460462f68e6e9a36c09dfee3b Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 24 Apr 2018 21:26:53 -0700 Subject: [PATCH 2/3] Update to vega-lite 2.4.0 --- deps/build.jl | 8 ++++---- deps/package.json | 4 ++-- src/render.jl | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deps/build.jl b/deps/build.jl index 6c98befb..0f2d3740 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -3,10 +3,10 @@ using BinDeps @BinDeps.setup -uschema = "https://vega.github.io/schema/vega-lite/v2.3.1.json" -uvega = "https://cdnjs.cloudflare.com/ajax/libs/vega/3.2.1/vega.min.js" -uvegalite = "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.3.1/vega-lite.min.js" -uembed = "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.2.0/vega-embed.min.js" +uschema = "https://vega.github.io/schema/vega-lite/v2.4.0.json" +uvega = "https://cdnjs.cloudflare.com/ajax/libs/vega/3.3.1/vega.min.js" +uvegalite = "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.4.0/vega-lite.min.js" +uembed = "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.7.1/vega-embed.min.js" destdir = joinpath(@__DIR__, "lib") diff --git a/deps/package.json b/deps/package.json index 98a7ec7b..28dd68e4 100644 --- a/deps/package.json +++ b/deps/package.json @@ -3,8 +3,8 @@ "version": "1.0.1", "dependencies": { "rw": "^1.3.3", - "vega": "^3.2.1", - "vega-lite": "^2.3.1", + "vega": "^3.3.1", + "vega-lite": "^2.4.0", "xmlhttprequest": "^1.8.0" } } diff --git a/src/render.jl b/src/render.jl index f61a8e09..3dc35d33 100644 --- a/src/render.jl +++ b/src/render.jl @@ -96,9 +96,9 @@ function writehtml_partial(io::IO, spec::String; title="VegaLite plot") requirejs.config({ paths: { - vg: "https://cdnjs.cloudflare.com/ajax/libs/vega/3.2.1/vega.min.js?noext", - vl: "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.3.1/vega-lite.min.js?noext", - vg_embed: "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.2.0/vega-embed.min.js?noext" + vg: "https://cdnjs.cloudflare.com/ajax/libs/vega/3.3.1/vega.min.js?noext", + vl: "https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.4.0/vega-lite.min.js?noext", + vg_embed: "https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.7.1/vega-embed.min.js?noext" }, shim: { vg_embed: {deps: ["vg.global", "vl.global"]}, From 4d833bfd6b844f1bf2b6315cf85f614e4d7b44c4 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 24 Apr 2018 21:40:04 -0700 Subject: [PATCH 3/3] Track rename in vega-lite schema --- src/schema_parsing.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/schema_parsing.jl b/src/schema_parsing.jl index 52d7a49a..f259b7c8 100644 --- a/src/schema_parsing.jl +++ b/src/schema_parsing.jl @@ -151,11 +151,11 @@ fn = joinpath(@__DIR__, "../deps/lib/", "vega-lite-schema.json") schema = JSON.parsefile(fn) # showall(keys(schema["definitions"])) # schema["definitions"]["TopLevelProperties"] -# schema["definitions"]["TopLevelExtendedSpec"] +# schema["definitions"]["TopLevelSpec"] # collect(Iterators.filter(n -> startswith(n, "TopLevel"), keys(schema["definitions"]))) refs = Dict{String, SpecDef}() -rootSpec = toDef(schema["definitions"]["TopLevelExtendedSpec"]) +rootSpec = toDef(schema["definitions"]["TopLevelSpec"]) # length(refs) # 124 # dl = rootSpec.items[2].props["layer"]