Merge branch 'release/4.0.0'

CONTRIBUTING.md

@@ -5,7 +5,7 @@
 If you are trying to get a particular effect or you have a problem with your code, please ask your question [on stackoverflow.com](http://stackoverflow.com/questions/tagged/dc.js) or the [user group](https://groups.google.com/forum/?fromgroups#!forum/dc-js-user-group). We use the issue tracker for bug reports and feature requests only.
 
 Get help faster with a working example! Fork these to get started:<br>
-[blank jsFiddle](https://jsfiddle.net/gordonwoodhull/rL82bguk/) - [example jsFiddle](https://jsfiddle.net/gordonwoodhull/5ztavmjy/) - [blank bl.ock](https://blockbuilder.org/gordonwoodhull/f6bab3d2f5b34018548207014b4056bf) - [example bl.ock](https://blockbuilder.org/gordonwoodhull/bcf9eaa0bfc2c84373cffac06d5755e5)
+[blank jsFiddle](https://jsfiddle.net/gordonwoodhull/rL82bguk/1) - [example jsFiddle](https://jsfiddle.net/gordonwoodhull/5ztavmjy/2) - [blank bl.ock](https://blockbuilder.org/gordonwoodhull/f6bab3d2f5b34018548207014b4056bf) - [example bl.ock](https://blockbuilder.org/gordonwoodhull/bcf9eaa0bfc2c84373cffac06d5755e5)
 
 For bug reports and feature requests submit a [github issue](http://github.com/dc-js/dc.js/issues)
   * Please include the version of DC you are using

Changelog.md

@@ -1,7 +1,7 @@
-## 4.0.0 beta 5
+## 4.0.0
 * Thanks to the diligent and careful effort of Deepak Kumar, dc.js has been ported to ES6 modules, classes and syntax.
 
-IE is no longer supported. dc.js will not support transpilation - stick with dc@3 for IE support.
+IE is no longer supported. dc.js will not support transpilation. Stick with dc@3 for IE support.
 
 The API is mostly compatible, but there are a few breaking changes - see the [v4 upgrade guide](https://github.com/dc-js/dc.js/blob/develop/docs/dc-v4-upgrade-guide.md) for details.
 

Gruntfile.js

@@ -14,6 +14,7 @@ module.exports = function (grunt) {
         src: 'src',
         spec: 'spec',
         web: 'web',
+        websrc: 'web-src',
         dist: 'dist',
         pkg: require('./package.json'),
         banner: grunt.file.read('./LICENSE_BANNER')
@@ -22,7 +23,7 @@ module.exports = function (grunt) {
     // in d3v4 and d3v5 pre-built d3.js are in different sub folders
     const d3pkgSubDir = config.pkg.dependencies.d3.split('.')[0].replace(/[^\d]/g, '') === '4' ? 'build' : 'dist';
 
-    const lintableFiles = `'${config.src}' '${config.spec}' '*.js' 'grunt/*.js' 'web-src/stock.js'`;
+    const lintableFiles = `'${config.src}' '${config.spec}' '*.js' 'grunt/*.js' '<%= conf.websrc %>/stock.js'`;
 
     const sass = require('node-sass');
 
@@ -64,7 +65,12 @@ module.exports = function (grunt) {
                 tasks: ['sass', 'cssmin:main', 'copy:dc-to-gh']
             },
             tests: {
-                files: ['<%= conf.src %>/**/*.js', '<%= conf.spec %>/*.js', '<%= conf.spec %>/helpers/*.js', 'web-src/**/*', 'docs/**/*'],
+                files: [
+                    '<%= conf.src %>/**/*.js',
+                    '<%= conf.spec %>/*.js',
+                    '<%= conf.spec %>/helpers/*.js',
+                    '<%= conf.websrc %>/**/*',
+                    'docs/**/*'],
                 tasks: ['test']
             },
             reload: {
@@ -177,7 +183,7 @@ module.exports = function (grunt) {
             dist: {
                 src: ['docs/welcome.base.md', '<%= conf.src %>/**/*.js', '!<%= conf.src %>/{banner,footer}.js'],
                 options: {
-                    destination: 'web/docs/html',
+                    destination: '<%= conf.web %>/docs/html',
                     template: 'node_modules/ink-docstrap/template',
                     configure: 'jsdoc.conf.json'
                 }
@@ -209,15 +215,15 @@ module.exports = function (grunt) {
                     {
                         expand: true,
                         nonull: true,
-                        cwd: 'web-src',
+                        cwd: '<%= conf.websrc %>',
                         src: '**',
-                        dest: 'web/'
+                        dest: '<%= conf.web %>/'
                     },
                     {
                         expand: true,
                         cwd: 'docs/old-api-docs',
                         src: '**',
-                        dest: 'web/docs/'
+                        dest: '<%= conf.web %>/docs/'
                     },
                     {
                         expand: true,
@@ -279,10 +285,10 @@ module.exports = function (grunt) {
                     title: 'Index of dc.js examples',
                     heading: 'Examples of using dc.js',
                     description: 'An attempt to present a simple example of each chart type.',
-                    sourceLink: 'https://github.com/dc-js/dc.js/tree/master/<%= conf.web %>/examples'
+                    sourceLink: 'https://github.com/dc-js/dc.js/tree/master/<%= conf.websrc %>/examples'
                 },
                 files: [
-                    {dest: '<%= conf.web %>/examples/index.html', src: ['<%= conf.web %>/examples/*.html']}
+                    {dest: '<%= conf.web %>/examples/index.html', src: ['<%= conf.websrc %>/examples/*.html']}
                 ]
             },
             'transitions-listing': {
@@ -293,10 +299,10 @@ module.exports = function (grunt) {
                     heading: 'Eyeball tests for dc.js transitions',
                     description: 'Transitions can only be tested by eye. ' +
                         'These pages automate the transitions so they can be visually verified.',
-                    sourceLink: 'https://github.com/dc-js/dc.js/tree/master/<%= conf.web %>/transitions'
+                    sourceLink: 'https://github.com/dc-js/dc.js/tree/master/<%= conf.websrc %>/transitions'
                 },
                 files: [
-                    {dest: '<%= conf.web %>/transitions/index.html', src: ['<%= conf.web %>/transitions/*.html']}
+                    {dest: '<%= conf.web %>/transitions/index.html', src: ['<%= conf.websrc %>/transitions/*.html']}
                 ]
             },
             'resizing-listing': {
@@ -310,10 +316,10 @@ module.exports = function (grunt) {
                         'For the examples with a single chart taking up the entire window, you can add <code>?resize=viewbox</code> ' +
                         'to the URL to test resizing the chart using the ' +
           '<a href="http://dc-js.github.io/dc.js/docs/html/dc.baseMixin.html#useViewBoxResizing__anchor">useViewBoxResizing</a> strategy.',
-                    sourceLink: 'https://github.com/dc-js/dc.js/tree/master/<%= conf.web %>/resizing'
+                    sourceLink: 'https://github.com/dc-js/dc.js/tree/master/<%= conf.websrc %>/resizing'
                 },
                 files: [
-                    {dest: '<%= conf.web %>/resizing/index.html', src: ['<%= conf.web %>/resizing/*.html']}
+                    {dest: '<%= conf.web %>/resizing/index.html', src: ['<%= conf.websrc %>/resizing/*.html']}
                 ]
             },
             'zoom-listing': {
@@ -324,10 +330,10 @@ module.exports = function (grunt) {
                     heading: 'Interactive test for dc.js chart zoom',
                     description: 'It\'s hard to conceive of a way to test zoom except by trying it. ' +
                         'So this is a substitute for automated tests in this area',
-                    sourceLink: 'https://github.com/dc-js/dc.js/tree/master/<%= conf.web %>/zoom'
+                    sourceLink: 'https://github.com/dc-js/dc.js/tree/master/<%= conf.websrc %>/zoom'
                 },
                 files: [
-                    {dest: '<%= conf.web %>/zoom/index.html', src: ['<%= conf.web %>/zoom/*.html']}
+                    {dest: '<%= conf.web %>/zoom/index.html', src: ['<%= conf.websrc %>/zoom/*.html']}
                 ]
             }
         },
@@ -367,7 +373,7 @@ module.exports = function (grunt) {
                     ' || echo \'Cowardly refusing to overwrite your existing git pre-commit hook.\''
             },
             hierarchy: {
-                command: 'dot -Tsvg -o web-src/img/class-hierarchy.svg class-hierarchy.dot'
+                command: 'dot -Tsvg -o <%= conf.websrc %>/img/class-hierarchy.svg class-hierarchy.dot'
             },
             rollup: {
                 command: 'rm -rf dist/; rollup --config'

README.md

@@ -33,16 +33,16 @@ Support
 *Please direct questions and support requests to Stack Overflow or the user group. When posting to Stack Overflow, use the* `[dc.js]` *and/or* `[crossfilter]` *tags - other tags are likely to draw unwanted attention.*
 
 Get help faster with a working example! Fork these to get started:<br>
-[blank jsFiddle](https://jsfiddle.net/gordonwoodhull/rL82bguk/) - [example jsFiddle](https://jsfiddle.net/gordonwoodhull/5ztavmjy/) - [blank bl.ock](https://blockbuilder.org/gordonwoodhull/f6bab3d2f5b34018548207014b4056bf) - [example bl.ock](https://blockbuilder.org/gordonwoodhull/bcf9eaa0bfc2c84373cffac06d5755e5)
+[blank jsFiddle](https://jsfiddle.net/gordonwoodhull/rL82bguk/1) - [example jsFiddle](https://jsfiddle.net/gordonwoodhull/5ztavmjy/2) - [blank bl.ock](https://blockbuilder.org/gordonwoodhull/f6bab3d2f5b34018548207014b4056bf) - [example bl.ock](https://blockbuilder.org/gordonwoodhull/bcf9eaa0bfc2c84373cffac06d5755e5)
 
 ## Versioning
 Version 4.* is compatible with d3 versions 4 and 5. It is not compatible with IE. Use dc.js 3.* if you need IE support, or use dc.js 2.* if you need compatibility with d3 version 3.
 
 ## CDN location
 
 ```
-http://unpkg.com/dc@4/dc.js
-http://unpkg.com/dc@4/dc.css
+https://unpkg.com/dc@4/dist/dc.js
+https://unpkg.com/dc@4/dist/style/dc.css
 ```
 
 or copy the latest links from [CDNJS](https://cdnjs.com/libraries/dc)

docs/api-latest.md

@@ -94,7 +94,7 @@ keying function for <a href="https://github.com/d3/d3-collection/blob/master/REA
 together in sections.  This was confusing so it has been renamed to <code>section</code>, although <code>group</code> still works.</p>
 <p>Examples:</p>
 <ul>
-<li><a href="http://europarl.me/dc.js/web/ep/index.html">List of members of the european parliament</a></li>
+<li><a href="https://dc-js.github.io/dc.js/ep/">List of members of the european parliament</a></li>
 </ul>
 </dd>
 <dt><a href="#DataTable">DataTable</a></dt>
@@ -115,7 +115,7 @@ Examples:</p>
 <ul>
 <li><a href="http://dc-js.github.com/dc.js/">Nasdaq 100 Index</a></li>
 <li><a href="http://dc-js.github.io/dc.js/examples/table-on-aggregated-data.html">dataTable on a crossfilter group</a>
-(<a href="https://github.com/dc-js/dc.js/blob/develop/web/examples/table-on-aggregated-data.html">source</a>)</li>
+(<a href="https://github.com/dc-js/dc.js/blob/master/web-src/examples/table-on-aggregated-data.html">source</a>)</li>
 </ul>
 </dd>
 <dt><a href="#GeoChoroplethChart">GeoChoroplethChart</a></dt>
@@ -1339,7 +1339,7 @@ keying function for [nesting](https://github.com/d3/d3-collection/blob/master/RE
 together in sections.  This was confusing so it has been renamed to `section`, although `group` still works.
 
 Examples:
-- [List of members of the european parliament](http://europarl.me/dc.js/web/ep/index.html)
+- [List of members of the european parliament](https://dc-js.github.io/dc.js/ep/)
 
 **Kind**: global class  
 **Mixes**: [<code>BaseMixin</code>](#BaseMixin)  
@@ -1538,7 +1538,7 @@ together in sections.  This was confusing so it has been renamed to `section`, a
 Examples:
 - [Nasdaq 100 Index](http://dc-js.github.com/dc.js/)
 - [dataTable on a crossfilter group](http://dc-js.github.io/dc.js/examples/table-on-aggregated-data.html)
-([source](https://github.com/dc-js/dc.js/blob/develop/web/examples/table-on-aggregated-data.html))
+([source](https://github.com/dc-js/dc.js/blob/master/web-src/examples/table-on-aggregated-data.html))
 
 **Kind**: global class  
 **Mixes**: [<code>BaseMixin</code>](#BaseMixin)