Merge pull request #503 from Kitware/slim-bundle

Update infrastructure to avoid "fat" Candela bundle
Kitware · Jul 7, 2017 · 9a3c04e · 9a3c04e
2 parents 9c8a1b2 + 237f28b
commit 9a3c04e
Show file tree

Hide file tree

Showing 241 changed files with 1,519 additions and 937 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,11 +1,19 @@
-app
-build
-config
+build/
+docs/
+examples/
+python/
+R/
+script/
+test/
+**/test/
+candela-all.js
+!dist/candela.js
+circle.yml
 CONTRIBUTING.md
-coverage
-docs
-python
-R
 requirements-dev.txt
-script
-tests.bundle.js
+shell.nix
+webpack.config.js
+.babelrc
+.npmignore
+.server.pid
+.server.log
diff --git a/R/candela/inst/htmlwidgets/lib/candela/candela.js b/R/candela/inst/htmlwidgets/lib/candela/candela.js
@@ -1,4 +1,4 @@
 var s = document.createElement('script');
 s.type = 'text/javascript';
-s.src = '//unpkg.com/candela';
+s.src = '//unpkg.com/candela/dist/candela.min.js';
 document.head.appendChild(s);
diff --git a/app/examples/date-histogram/index.js b/app/examples/date-histogram/index.js
diff --git a/app/examples/geodots/index.js b/app/examples/geodots/index.js
diff --git a/app/examples/index.jade b/app/examples/index.jade
diff --git a/app/examples/index.js b/app/examples/index.js
diff --git a/app/examples/tree-heatmap/index.js b/app/examples/tree-heatmap/index.js
diff --git a/app/examples/util/showComponent/index.jade b/app/examples/util/showComponent/index.jade
diff --git a/app/examples/util/showComponent/index.js b/app/examples/util/showComponent/index.js
diff --git a/candela-all.js b/candela-all.js
@@ -0,0 +1,16 @@
+import './plugins/geojs/load';
+import './plugins/glo/load';
+import './plugins/lineup/load';
+import './plugins/mixin/load';
+import './plugins/onset/load';
+import './plugins/sententree/load';
+import './plugins/similaritygraph/load';
+import './plugins/trackerdash/load';
+import './plugins/treeheatmap/load';
+import './plugins/upset/load';
+import './plugins/vega/load';
+
+import candela from '.';
+
+export default candela;
+export * from '.';
diff --git a/candela.js b/candela.js
diff --git a/circle.yml b/circle.yml
@@ -16,9 +16,16 @@ dependencies:
 
 compile:
   override:
+    # Build Candela.
     - npm run build
+
+    # Build the examples.
     - npm run build:examples
 
+    # Build the unit test and coverage test bundles.
+    - npm run build:test:unit
+    - npm run build:test:coverage
+
 test:
   override:
     # Lint tests.
@@ -34,17 +41,20 @@ test:
           CANDELA_DUMP_IMAGE: all
 
     # Coverage tests.
-    - npm run cover
-    - npm run codecov
+    - npm run test:coverage
+    - npm run test:coverage:codecov
 
   post:
     # Gather up the testing images as build artifacts.
     - mkdir $CIRCLE_ARTIFACTS/test_images
-    - find components -name '*.png' | xargs -I xxx cp xxx $CIRCLE_ARTIFACTS/test_images
+    - find plugins -name '*.png' | xargs -I xxx cp xxx $CIRCLE_ARTIFACTS/test_images
+
+    # Copy the html coverage report to the artifacts directory as well.
+    - mkdir $CIRCLE_ARTIFACTS/coverage
+    - cp -r build/coverage/html $CIRCLE_ARTIFACTS/coverage
 
 deployment:
   semantic-release:
     branch: master
     commands:
-      - npm run dist
       - npm run semantic-release || true
diff --git a/components/LineChart/test/linechart-points.image.js b/components/LineChart/test/linechart-points.image.js
diff --git a/config/karma-base.conf.js b/config/karma-base.conf.js
diff --git a/config/karma-coverage.conf.js b/config/karma-coverage.conf.js
diff --git a/config/karma-testing.conf.js b/config/karma-testing.conf.js
diff --git a/config/webpack-coverage.config.js b/config/webpack-coverage.config.js