Use images that we have already compiled on the website

Author: domoritz

.travis.yml

@@ -12,8 +12,9 @@ before_install:
 
 script:
   - npm run build
-  - npm run build:examples-only
   - npm run test:nocompile # already run schema and tsc in build
+  - npm run data
+  - npm run build:examples-only
   - npm run check:schema
   - npm run check:examples
   - npm run codecov

_config.yml

@@ -15,9 +15,9 @@ description: Vega-Lite - a high-level grammar for statistical graphics.
 
 baseurl: "/vega-lite" # the subpath of your site, e.g. /blog/
 url: "http://vega.github.io" # the base hostname & protocol for your site
-exclude: [bin, coverage, examples/_original, examples/_output, examples/_diff, Gemfile, Gemfile.lock,
-  lib/schema.json, node_modules, scripts, test, test-gallery, typings, package.json, bower.json, src, tsconfig.json, tslint.json,
-  nodemon.json, CONTRIBUTING.md, README.md, LICENSE]
+exclude: [bin, coverage, Gemfile, Gemfile.lock, lib/schema.json, node_modules,
+  scripts, test, test-gallery, typings, package.json, bower.json, src, tsconfig.json,
+  tslint.json, nodemon.json, yarn.lock, CONTRIBUTING.md, README.md, LICENSE]
 
 markdown: kramdown
 highlighter: rouge

_data/versions.yml

@@ -1,5 +1,5 @@
-vega: 3.0.0-rc2
+vega: 3.0.0-rc4
 vega-lite: 2.0.0-beta.10
 vega-embed: 3.0.0-beta.19
-vega-tooltip: 0.4.2
+vega-tooltip: 3.0.0-beta.19
 

_includes/preview

@@ -1,4 +1,4 @@
 <a class="imagegroup" href="https://vega.github.io/editor/#/examples/vega-lite/{{ include.spec }}">
-  <span class="image" alt="{{ include.title | strip }}" style="background-image: url({{site.baseurl}}/build/examples/images/{{ include.spec }}.vl.svg);"></span>
+  <span class="image" alt="{{ include.title | strip }}" style="background-image: url({{site.baseurl}}/examples/compiled/{{ include.spec }}.svg);"></span>
   <span class="image-title">{{ include.title | strip }}</span>
 </a>

_includes/showcase.html

@@ -2,7 +2,7 @@
   <div class="examples">
   {% for image in page.images %}
     <a class="preview" href="https://vega.github.io/editor/#/examples/vega-lite/{{image.spec}}"
-      style="background-image: url('build/examples/images/{{image.spec}}.vl.svg')">
+      style="background-image: url('{{site.baseurl}}/examples/compiled/{{image.spec}}.svg')">
     </a>
   {% endfor %}
   </div>

package.json

@@ -22,13 +22,12 @@
   "scripts": {
     "pretsc": "mkdir -p build && rm -rf build/*/** && cp package.json build/",
     "tsc": "tsc",
-    "prebuild": "mkdir -p build/site build/examples/images build/test-gallery",
+    "prebuild": "mkdir -p build/site build/test-gallery",
     "build": "npm run build:only",
     "build:only": "npm run tsc && cp package.json build && browserify src/index.ts -p tsify -d -s vl | exorcist build/vega-lite.js.map > build/vega-lite.js",
     "postbuild": "node node_modules/uglify-js/bin/uglifyjs build/vega-lite.js -cm --source-map content=build/vega-lite.js.map,filename=build/vega-lite.min.js.map -o build/vega-lite.min.js && npm run schema",
-    "build:examples": "npm run build:only && npm run build:examples-only",
+    "build:examples": "npm run data && npm run build:only && npm run build:examples-only",
     "build:examples-only": "TZ=America/Los_Angeles ./scripts/build-examples.sh && rm -rf examples/specs/normalized/* && scripts/build-normalized-examples",
-    "build:images": "npm run data && scripts/generate-images.sh",
     "build:toc": "bundle exec jekyll build -q && scripts/generate-toc",
     "build:site": "browserify site/static/main.ts -p [tsify -p site] -d | exorcist build/site/main.js.map > build/site/main.js",
     "build:versions": "scripts/update-version.sh",

scripts/build-examples.sh

@@ -11,13 +11,13 @@ mkdir $dir
 if type parallel >/dev/null 2>&1
 then
   echo "Using parallel to generate vega specs from examples in parallel."
-  ls examples/specs/*.vl.json | parallel --no-notice --plus --halt 1 "bin/vl2vg -p {} > examples/compiled/{/..}.vg.json && node_modules/vega/bin/vg2svg examples/compiled/{/..}.vg.json examples/compiled/{/..}.svg -b node_modules/vega-datasets/"
+  ls examples/specs/*.vl.json | parallel --no-notice --plus --halt 1 "bin/vl2vg -p {} > examples/compiled/{/..}.vg.json && node_modules/vega/bin/vg2svg examples/compiled/{/..}.vg.json examples/compiled/{/..}.svg -b ."
 else
   echo "Parallel not found! Sequentially generate vega specs from examples."
   for file in examples/specs/*.vl.json; do
     filename=$(basename "$file")
     name="${filename%.vl.json}"
     bin/vl2vg -p $file > $dir/$name.vg.json
-    node_modules/vega/bin/vg2svg $dir/$name.vg.json $dir/$name.svg -b node_modules/vega-datasets/
+    node_modules/vega/bin/vg2svg $dir/$name.vg.json $dir/$name.svg -b .
   done
 fi

scripts/deploy-gh.sh

@@ -11,8 +11,6 @@ git merge master --no-edit
 
 # build
 npm run presite
-npm run build:images
-npm run schema
 git add data/* -f
 git add build/** -f
 git add _data/* -f