Merge pull request #539 from Kitware/fat-bundle

Create a "fat bundle" for use without webpack, etc.
Kitware · May 14, 2018 · f46cc9f · f46cc9f
2 parents 7dacf70 + 8b9e529
commit f46cc9f
Show file tree

Hide file tree

Showing 34 changed files with 212 additions and 123 deletions.
diff --git a/circle.yml b/circle.yml
@@ -22,9 +22,12 @@ compile:
     # Build Candela.
     - npm run build
 
-    # Build the examples.
+    # Build the examples package.
     - npm run build:examples
 
+    # Build the big bundle.
+    - npm run build:bundle
+
     # Build the unit test and coverage test bundles.
     - npm run build:test
     - npm run build:coverage

diff --git a/package.json b/package.json
@@ -5,18 +5,19 @@
   "scripts": {
     "install": "lerna bootstrap --hoist",
     "clean:lerna": "lerna clean",
-    "clean:dist": "bash scripts/clean-all",
-    "build": "bash scripts/build-all",
+    "clean": "lerna run clean",
+    "build": "lerna run build --ignore @candela/examples --ignore @candela/all",
     "build:examples": "cd packages/examples && npm run build",
+    "build:bundle": "cd packages/all && npm run build",
     "examples": "cd packages/examples && npm run serve",
-    "build:test": "bash scripts/build-test",
-    "build:coverage": "COVERAGE=1 bash scripts/build-test",
-    "test:unit": "bash scripts/run-test",
+    "build:test": "lerna run build:test",
+    "build:coverage": "COVERAGE=1 npm run build:test",
+    "test:unit": "lerna run test --ignore @candela/examples",
     "test:image": "cd packages/examples && npm test",
-    "test:coverage": "COVERAGE=1 bash scripts/run-test",
+    "test:coverage": "COVERAGE=1 npm run test:unit",
     "coverage:report": "http-server build/coverage/html -p ${PORT-3000}",
     "build:docs": "sphinx-build -a -b html docs/ build/docs/",
-    "lint": "bash scripts/run-lint",
+    "lint": "lerna run lint --ignore @candela/trackerdash",
     "lint:pycandela": "flake8 --config python/pycandela/flake8.cfg python/pycandela",
     "docs": "http-server build/docs -p ${PORT-3000}",
     "commit": "git-cz",

diff --git a/packages/all/CHANGELOG.md b/packages/all/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
diff --git a/packages/all/package.json b/packages/all/package.json
@@ -0,0 +1,62 @@
+{
+  "name": "@candela/all",
+  "version": "0.20.0",
+  "description": "Candela all-inclusive library",
+  "main": "dist/candela-all.js",
+  "scripts": {
+    "build": "webpack --mode development",
+    "clean": "rm -rf dist build",
+    "lint": "semistandard | snazzy"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "babel": {
+    "presets": [
+      "@babel/env"
+    ]
+  },
+  "keywords": [],
+  "author": "Kitware Inc.",
+  "license": "Apache-2.0",
+  "semistandard": {
+    "ignore": [
+      "dist",
+      "build"
+    ]
+  },
+  "dependencies": {
+    "@candela/core": "^0.20.0",
+    "@candela/events": "^0.20.0",
+    "@candela/geojs": "^0.20.0",
+    "@candela/glo": "^0.20.0",
+    "@candela/lineup": "^0.20.0",
+    "@candela/onset": "^0.20.0",
+    "@candela/sententree": "^0.20.0",
+    "@candela/similaritygraph": "^0.20.0",
+    "@candela/size": "^0.20.0",
+    "@candela/stats": "^0.20.0",
+    "@candela/treeheatmap": "^0.20.0",
+    "@candela/upset": "^0.20.0",
+    "@candela/vega": "^0.20.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.0.0-beta.44",
+    "@babel/preset-env": "^7.0.0-beta.44",
+    "@babel/register": "^7.0.0-beta.44",
+    "babel-loader": "^8.0.0-beta.2",
+    "istanbul-instrumenter-loader": "^3.0.1",
+    "karma": "^2.0.2",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage-istanbul-reporter": "^1.4.2",
+    "karma-tap": "^4.1.3",
+    "karma-tap-pretty-reporter": "^4.0.0",
+    "semistandard": "^7.0.5",
+    "snazzy": "^4.0.0",
+    "tap-spec": "^4.1.1",
+    "tape": "^4.9.0",
+    "tape-catch": "^1.0.6",
+    "webpack": "^4.6.0",
+    "webpack-cli": "^2.0.14"
+  }
+}
diff --git a/packages/all/src/index.js b/packages/all/src/index.js
@@ -0,0 +1,53 @@
+import * as core from '@candela/core';
+import * as events from '@candela/events';
+import * as geojs from '@candela/geojs';
+import * as glo from '@candela/glo';
+import * as lineup from '@candela/lineup';
+import * as onset from '@candela/onset';
+import * as sententree from '@candela/sententree';
+import * as similaritygraph from '@candela/similaritygraph';
+import * as size from '@candela/size';
+import * as stats from '@candela/stats';
+import * as treeheatmap from '@candela/treeheatmap';
+import * as upset from '@candela/upset';
+import * as vega from '@candela/vega';
+
+function load (obj, target) {
+  for (let prop in obj) {
+    target[prop] = obj[prop];
+  }
+}
+
+// Collect all candela components into a single object.
+let components = {};
+for (let bundle of [geojs, glo, lineup, onset, sententree, similaritygraph, stats, treeheatmap, upset]) {
+  load(bundle, components);
+}
+for (let component in vega) {
+  if (vega[component] !== vega.VegaView) {
+    components[component] = vega[component];
+  }
+}
+
+// Collect all candela mixings into a single object.
+let mixins = {};
+for (let bundle of [events, size]) {
+  load(bundle, mixins);
+}
+mixins.VegaView = vega.VegaView;
+
+let VisComponent = core.VisComponent;
+
+// Export everything, both as default...
+export default {
+  VisComponent,
+  components,
+  mixins
+};
+
+// ...and non-default.
+export {
+  VisComponent,
+  components,
+  mixins
+};
diff --git a/packages/all/webpack.config.babel.js b/packages/all/webpack.config.babel.js
@@ -0,0 +1,26 @@
+import path from 'path';
+
+export default {
+  entry: './src/index.js',
+  output: {
+    libraryTarget: 'umd',
+    path: path.resolve('dist'),
+    filename: 'candela-all.js'
+  },
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: [
+              '@babel/env'
+            ]
+          }
+        }
+      }
+    ]
+  }
+};
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/events/package.json b/packages/events/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -47,8 +47,8 @@
     "babel-loader": "^8.0.0-beta.2",
     "callsite": "^1.0.0",
     "css-loader": "^0.28.11",
-    "d3-selection": "^1.3.0",
-    "datalib": "^1.8.0",
+    "d3-selection": "^1.1.0",
+    "datalib": "^1.7.3",
     "html-webpack-plugin": "^3.2.0",
     "http-server": "^0.11.1",
     "jade": "^1.11.0",

diff --git a/packages/examples/treeheatmap/index.js b/packages/examples/treeheatmap/index.js
@@ -3,7 +3,7 @@ import { heatmap } from '../datasets';
 import showComponent from '../util/showComponent';
 
 window.onload = () => {
-  showComponent(TreeHeatmap, {
+  const vis = showComponent(TreeHeatmap, {
     data: heatmap,
     scale: 'column'
   });

diff --git a/packages/geojs/package.json b/packages/geojs/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/glo/package.json b/packages/glo/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/lineup/package.json b/packages/lineup/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"
@@ -41,7 +41,7 @@
     "@babel/register": "^7.0.0-beta.44",
     "@candela/core": "^0.20.1",
     "babel-loader": "^8.0.0-beta.2",
-    "css-loader": "^0.26.1",
+    "css-loader": "^0.28.11",
     "file-loader": "^1.1.11",
     "istanbul-instrumenter-loader": "^3.0.1",
     "karma": "^2.0.2",

diff --git a/packages/lineup/webpack.config.babel.js b/packages/lineup/webpack.config.babel.js
@@ -7,9 +7,13 @@ export default {
     path: path.resolve('dist'),
     filename: 'candela-lineup.js'
   },
-  externals: {
-    d3: 'd3'
-  },
+  externals: [
+    '@candela/core',
+    'd3',
+    'datalib',
+    'jquery',
+    'lineupjs'
+  ],
   module: {
     rules: [
       {

diff --git a/packages/onset/package.json b/packages/onset/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/onset/webpack.config.babel.js b/packages/onset/webpack.config.babel.js
@@ -7,9 +7,12 @@ export default {
     path: path.resolve('dist'),
     filename: 'candela-onset.js'
   },
-  externals: {
-    d3: 'd3'
-  },
+  externals: [
+    '@candela/core',
+    'd3',
+    'datalib',
+    'onset'
+  ],
   module: {
     rules: [
       {

diff --git a/packages/sententree/package.json b/packages/sententree/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/sententree/webpack.config.babel.js b/packages/sententree/webpack.config.babel.js
@@ -7,6 +7,10 @@ export default {
     path: path.resolve('dist'),
     filename: 'candela-sententree.js'
   },
+  externals: [
+    '@candela/core',
+    'sententree'
+  ],
   module: {
     rules: [
       {

diff --git a/packages/similaritygraph/package.json b/packages/similaritygraph/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/size/package.json b/packages/size/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/stats/package.json b/packages/stats/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/trackerdash/package.json b/packages/trackerdash/package.json
@@ -4,7 +4,6 @@
   "description": "Candela components for the TrackerDash dashboard",
   "main": "dist/candela-trackerdash.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "build": "webpack --mode development",
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy"

diff --git a/packages/treeheatmap/package.json b/packages/treeheatmap/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/treeheatmap/webpack.config.babel.js b/packages/treeheatmap/webpack.config.babel.js
@@ -7,6 +7,14 @@ export default {
     path: path.resolve('dist'),
     filename: 'candela-treeheatmap.js'
   },
+  externals: [
+    '@candela/core',
+    'd3-array',
+    'd3-scale',
+    'd3-selection',
+    'd3-shape',
+    'd3-transition'
+  ],
   module: {
     rules: [
       {

diff --git a/packages/upset/package.json b/packages/upset/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf dist build",
     "lint": "semistandard | snazzy",
     "build:test": "webpack --config webpack.config.test.babel.js --mode development",
-    "test": "karma start --log-level error"
+    "test": "karma start --colors --log-level error"
   },
   "publishConfig": {
     "access": "public"