Output -all as default

CSNW · Apr 15, 2016 · ccfc20b · ccfc20b
1 parent 3a8e2ee
commit ccfc20b
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -14,11 +14,6 @@ Compose rich, data-bound charts from charts (like Lines and Bars) and components
 ## Getting Started
 
 1. Download the [latest release](https://github.com/CSNW/d3.compose/releases)
-
-    - `d3.compose-all` Includes all charts, components, extensions, and mixins
-    - `d3.compose-mixins` Use if you're creating your own charts/components and want to use d3.compose's mixins to help
-    - `d3.compose` Use if you're using your own charts/components and don't need mixins, charts, or components provided by d3.compose
-
 2. Download the dependencies:
 
     - [D3.js (>= 3.0.0)](http://d3js.org/)
@@ -40,7 +35,7 @@ Compose rich, data-bound charts from charts (like Lines and Bars) and components
         <script src="d3.js"></script>
         <script src="d3.chart.js"></script>
 
-        <script src="d3.compose-all.js"></script>
+        <script src="d3.compose.js"></script>
 
         <!-- Your code -->
       </body>

diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "homepage": "https://github.com/CSNW/d3.compose",
   "version": "0.15.15",
   "main": [
-    "./dist/d3.compose-all.js",
+    "./dist/d3.compose.js",
     "./dist/d3.compose.css"
   ],
   "authors": [

diff --git a/d3.compose-mixins.js b/d3.compose-mixins.js
diff --git a/d3.compose.js b/d3.compose.js
diff --git a/example/debug.html b/example/debug.html
@@ -49,7 +49,7 @@
 
   <script src="../node_modules/d3/d3.js"></script>
   <script src="../node_modules/d3.chart/d3.chart.js"></script>
-  <script src="../.tmp/d3.compose-all.js"></script>
+  <script src="../.tmp/d3.compose.js"></script>
 
   <script src="../node_modules/jquery/dist/jquery.js"></script>
 

diff --git a/example/index.html b/example/index.html
@@ -24,7 +24,7 @@
   </style>
 
   <script src="../node_modules/d3/d3.js"></script>
-  <script src="../build/d3.compose-all.js"></script>
+  <script src="../build/d3.compose.js"></script>
   <script src="js/data.js"></script>
 </head>
 <body>

diff --git a/gulpfile.js b/gulpfile.js
@@ -22,7 +22,7 @@ const banner = '/*!\n' +
   Build distribution version of library
 */
 const dist_options = {minify: true, banner: true};
-gulp.task('build:dist:css', css(paths.css, paths.dist, dist_options));
+gulp.task('css', css(paths.css, paths.dist, dist_options));
 
 /**
   Bump the bower version to match package.json

diff --git a/d3.compose-all.js → index.js b/d3.compose-all.js → index.js
diff --git a/integration/charts/bars.html b/integration/charts/bars.html
@@ -26,7 +26,7 @@
   <div id="charts"></div>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/charts/labels.html b/integration/charts/labels.html
@@ -26,7 +26,7 @@
   <div id="charts"></div>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/charts/lines.html b/integration/charts/lines.html
@@ -28,7 +28,7 @@
   <div id="charts"></div>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/charts/scatter.html b/integration/charts/scatter.html
@@ -29,7 +29,7 @@
   <div id="charts"></div>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/components/axis.html b/integration/components/axis.html
@@ -33,7 +33,7 @@
   <div id="charts"></div>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/components/gridlines.html b/integration/components/gridlines.html
@@ -27,7 +27,7 @@
   <div id="charts"></div>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/components/legend.html b/integration/components/legend.html
@@ -22,7 +22,7 @@
   <div id="charts"></div>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/components/text.html b/integration/components/text.html
@@ -22,7 +22,7 @@
   <div id="charts"></div>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/components/title.html b/integration/components/title.html
@@ -22,7 +22,7 @@
   <div id="charts"></div>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/compose.html b/integration/compose.html
@@ -15,7 +15,7 @@
   <div id="charts"></div>
 
   <script src="../node_modules/d3/d3.js"></script>
-  <script src="../build/d3.compose-all.js"></script>
+  <script src="../build/d3.compose.js"></script>
   <script type="text/javascript">
     var charts = d3.select('#charts');
     var id = 1;

diff --git a/integration/helpers/align-text.html b/integration/helpers/align-text.html
@@ -31,7 +31,7 @@
   <svg id="chart"></svg>
 
   <script src="../../node_modules/d3/d3.js"></script>
-  <script src="../../build/d3.compose-all.js"></script>
+  <script src="../../build/d3.compose.js"></script>
   <script type="text/javascript">
     var helpers = d3c.helpers;
     var getTranslate = helpers.getTranslate;

diff --git a/package.json b/package.json
@@ -2,18 +2,13 @@
   "name": "d3.compose",
   "version": "0.15.15",
   "description": "Compose complex, data-driven visualizations from reusable charts and components with d3",
-  "main": "build/d3.compose-all.js",
+  "main": "build/d3.compose.js",
+  "jsnext:main": "index",
   "scripts": {
-    "pretest": "npm run build:all",
-    "test": "tape test/**/*-test.js | faucet && eslint src test d3.compose.js d3.compose-mixins.js d3.compose-all.js",
-    "build:core": "mkdirp build && rollup -c -o build/d3.compose.js -- d3.compose.js",
-    "build:mixins": "mkdirp build && rollup -c -o build/d3.compose-mixins.js -- d3.compose-mixins.js",
-    "build:all": "mkdirp build && rollup -c -o build/d3.compose-all.js -- d3.compose-all.js",
-    "build": "rimraf build && npm run build:core & npm run build:mixins & npm run build:all & gulp build:dist:css",
-    "uglify:core": "cd build && uglifyjs d3.compose.js --source-map d3.compose.min.js.map --comments -c -m -o d3.compose.min.js",
-    "uglify:mixins": "cd build && uglifyjs d3.compose-mixins.js --source-map d3.compose-mixins.min.js.map --comments -c -m -o d3.compose-mixins.min.js",
-    "uglify:all": "cd build && uglifyjs d3.compose-all.js --source-map d3.compose-all.min.js.map --comments -c -m -o d3.compose-all.min.js",
-    "uglify": "npm run uglify:core & npm run uglify:mixins & npm run uglify:all",
+    "pretest": "npm run build",
+    "test": "tape test/**/*-test.js | faucet && eslint src test index.js",
+    "build": "rimraf build && mkdirp build && rollup -c -o build/d3.compose.js -- index.js & gulp css",
+    "uglify": "cd build && uglifyjs d3.compose.js --source-map d3.compose.min.js.map --comments -c -m -o d3.compose.min.js",
     "docs": "rimraf _docs && yuidoc && gulp docs",
     "preversion": "npm test",
     "version": "npm run build && npm run uglify && gulp version:bower && git add -A",

diff --git a/src/compose.js b/src/compose.js
@@ -2,8 +2,6 @@ import d3 from 'd3';
 import {
   assign,
   difference,
-  extend,
-  isFunction,
   objectEach
 } from './utils';
 import {
@@ -44,7 +42,7 @@ var Compose = Chart.extend({
     // Attach mouse event source
     var transform = this.getRelativePoint.bind(this);
     this.unsubscribe = {
-      mouse: mouseSource(this.container, {transform: transform}, function(action) {
+      mouse: mouseSource(this.container, {transform: transform}, function() {
         // TODO
       })
     };

diff --git a/src/helpers.js b/src/helpers.js
@@ -46,7 +46,6 @@ export {
   helpers as default,
   alignText,
   checkProp,
-  connect,
   createChart,
   createDraw,
   createPrepare,