From 3baefe7879469997a4067cc82d125da139714efd Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Sat, 28 Dec 2019 16:28:46 -0500 Subject: [PATCH 1/7] fix links for beta --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0710dbaca..ce6a30513 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Version 4.* is compatible with d3 versions 4 and 5. It is not compatible with IE ## CDN location ``` -http://unpkg.com/dc@4/dc.js -http://unpkg.com/dc@4/dc.css +https://unpkg.com/dc@%5E4.0.0-beta.1/dist/dc.js +https://unpkg.com/dc@%5E4.0.0-beta.1/dist/style/dc.css ``` or copy the latest links from [CDNJS](https://cdnjs.com/libraries/dc) From f8c1affa0f128edda9c53fdd218198aa35e52283 Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Thu, 9 Jan 2020 10:00:22 -0500 Subject: [PATCH 2/7] fix broken links; use conf.web and conf.websrc consistently in build --- Gruntfile.js | 31 ++- src/charts/data-grid.js | 2 +- src/charts/data-table.js | 2 +- web-src/ep/index.html | 6 +- web-src/examples/pareto-chart.html | 2 - web-src/examples/sparkline.html | 2 +- web-src/img/class-hierarchy.svg | 428 +++++++++++++---------------- 7 files changed, 206 insertions(+), 267 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index d5c9aa39a..8da412e90 100644 --- a/Gruntfile.js +++ b/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,7 @@ 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 +178,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 +210,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 +280,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 +294,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 +311,10 @@ module.exports = function (grunt) { 'For the examples with a single chart taking up the entire window, you can add ?resize=viewbox ' + 'to the URL to test resizing the chart using the ' + 'useViewBoxResizing 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 +325,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 +368,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' diff --git a/src/charts/data-grid.js b/src/charts/data-grid.js index cce3c130e..30acc4ef9 100644 --- a/src/charts/data-grid.js +++ b/src/charts/data-grid.js @@ -18,7 +18,7 @@ const GRID_CSS_CLASS = 'dc-grid-top'; * together in sections. This was confusing so it has been renamed to `section`, although `group` still works. * * Examples: - * - {@link http://europarl.me/dc.js/web/ep/index.html List of members of the european parliament} + * - {@link https://dc-js.github.io/dc.js/ep/ List of members of the european parliament} * @mixes BaseMixin */ export class DataGrid extends BaseMixin { diff --git a/src/charts/data-table.js b/src/charts/data-table.js index 5e2dac997..57309ce2e 100644 --- a/src/charts/data-table.js +++ b/src/charts/data-table.js @@ -30,7 +30,7 @@ const HEAD_CSS_CLASS = 'dc-table-head'; * Examples: * - {@link http://dc-js.github.com/dc.js/ Nasdaq 100 Index} * - {@link http://dc-js.github.io/dc.js/examples/table-on-aggregated-data.html dataTable on a crossfilter group} - * ({@link https://github.com/dc-js/dc.js/blob/develop/web/examples/table-on-aggregated-data.html source}) + * ({@link https://github.com/dc-js/dc.js/blob/master/web-src/examples/table-on-aggregated-data.html source}) * * @mixes BaseMixin */ diff --git a/web-src/ep/index.html b/web-src/ep/index.html index 2a21e1f21..887e9a84c 100644 --- a/web-src/ep/index.html +++ b/web-src/ep/index.html @@ -13,13 +13,13 @@ - - + + - diff --git a/web-src/examples/sparkline.html b/web-src/examples/sparkline.html index 478d26a21..125773788 100644 --- a/web-src/examples/sparkline.html +++ b/web-src/examples/sparkline.html @@ -11,7 +11,7 @@

Sparklines

-

A sparkline is just a tiny chart that fits in to the flow of text. We can achieve this by using a span instead of a div, and making the dimensions really small. They will work well for any chart with a large x:y aspect ratio, like a line chart or a bar chart but other kinds of charts probably won't work so well. We'll also use a little bit of custom CSS to hide the axes (see the source for details).

+

A sparkline is just a tiny chart that fits in to the flow of text. We can achieve this by using a span instead of a div, and making the dimensions really small. They will work well for any chart with a large x:y aspect ratio, like a line chart or a bar chart but other kinds of charts probably won't work so well. We'll also use a little bit of custom CSS to hide the axes (see the source for details).

diff --git a/web-src/img/class-hierarchy.svg b/web-src/img/class-hierarchy.svg index e6f9a96f3..e5a88a5ad 100644 --- a/web-src/img/class-hierarchy.svg +++ b/web-src/img/class-hierarchy.svg @@ -1,454 +1,394 @@ - - + dcHierarchy - + - -BaseMixin +BaseMixin - -BaseMixin + +BaseMixin - -ColorMixin +ColorMixin - -ColorMixin + +ColorMixin - -BaseMixin->ColorMixin - - +BaseMixin->ColorMixin + + - -MarginMixin +MarginMixin - -MarginMixin + +MarginMixin - -BaseMixin->MarginMixin - - +BaseMixin->MarginMixin + + - -CapMixin +CapMixin - -CapMixin + +CapMixin - -BaseMixin->CapMixin - - +BaseMixin->CapMixin + + - -DataCount +DataCount - -DataCount + +DataCount - -BaseMixin->DataCount - - +BaseMixin->DataCount + + - -DataGrid +DataGrid - -DataGrid + +DataGrid - -BaseMixin->DataGrid - - +BaseMixin->DataGrid + + - -DataTable +DataTable - -DataTable + +DataTable - -BaseMixin->DataTable - - +BaseMixin->DataTable + + - -NumberDisplay +NumberDisplay - -NumberDisplay + +NumberDisplay - -BaseMixin->NumberDisplay - - +BaseMixin->NumberDisplay + + - -SelectMenu +SelectMenu - -SelectMenu + +SelectMenu - -BaseMixin->SelectMenu - - +BaseMixin->SelectMenu + + - -CboxMenu +CboxMenu - -CboxMenu + +CboxMenu - -BaseMixin->CboxMenu - - +BaseMixin->CboxMenu + + - -TextFilterWidget +TextFilterWidget - -TextFilterWidget + +TextFilterWidget - -BaseMixin->TextFilterWidget - - +BaseMixin->TextFilterWidget + + - -BubbleMixin +BubbleMixin - -BubbleMixin + +BubbleMixin - -ColorMixin->BubbleMixin - - +ColorMixin->BubbleMixin + + - -CoordinateGridMixin +CoordinateGridMixin - -CoordinateGridMixin + +CoordinateGridMixin - -ColorMixin->CoordinateGridMixin - - +ColorMixin->CoordinateGridMixin + + - -GeoChoroplethChart +GeoChoroplethChart - -GeoChoroplethChart + +GeoChoroplethChart - -ColorMixin->GeoChoroplethChart - - +ColorMixin->GeoChoroplethChart + + - -HeatMap +HeatMap - -HeatMap + +HeatMap - -ColorMixin->HeatMap - - +ColorMixin->HeatMap + + - -PieChart +PieChart - -PieChart + +PieChart - -ColorMixin->PieChart - - +ColorMixin->PieChart + + - -RowChart +RowChart - -RowChart + +RowChart - -ColorMixin->RowChart - - +ColorMixin->RowChart + + - -SunburstChart +SunburstChart - -SunburstChart + +SunburstChart - -ColorMixin->SunburstChart - - +ColorMixin->SunburstChart + + - -MarginMixin->CoordinateGridMixin - - +MarginMixin->CoordinateGridMixin + + - -MarginMixin->HeatMap - - +MarginMixin->HeatMap + + - -MarginMixin->RowChart - - +MarginMixin->RowChart + + - -BubbleChart +BubbleChart - -BubbleChart + +BubbleChart - -BubbleMixin->BubbleChart - - +BubbleMixin->BubbleChart + + - -BubbleOverlay +BubbleOverlay - -BubbleOverlay + +BubbleOverlay - -BubbleMixin->BubbleOverlay - - +BubbleMixin->BubbleOverlay + + - -StackMixin +StackMixin - -StackMixin + +StackMixin - -CoordinateGridMixin->StackMixin - - +CoordinateGridMixin->StackMixin + + - -BoxPlot +BoxPlot - -BoxPlot + +BoxPlot - -CoordinateGridMixin->BoxPlot - - +CoordinateGridMixin->BoxPlot + + - -CoordinateGridMixin->BubbleChart - - +CoordinateGridMixin->BubbleChart + + - -CompositeChart +CompositeChart - -CompositeChart + +CompositeChart - -CoordinateGridMixin->CompositeChart - - +CoordinateGridMixin->CompositeChart + + - -ScatterPlot +ScatterPlot - -ScatterPlot + +ScatterPlot - -CoordinateGridMixin->ScatterPlot - - +CoordinateGridMixin->ScatterPlot + + - -BarChart +BarChart - -BarChart + +BarChart - -StackMixin->BarChart - - +StackMixin->BarChart + + - -LineChart +LineChart - -LineChart + +LineChart - -StackMixin->LineChart - - +StackMixin->LineChart + + - -CapMixin->PieChart - - +CapMixin->PieChart + + - -CapMixin->RowChart - - +CapMixin->RowChart + + - -CapMixin->SunburstChart - - +CapMixin->SunburstChart + + - -SeriesChart +SeriesChart - -SeriesChart + +SeriesChart - -CompositeChart->SeriesChart - - +CompositeChart->SeriesChart + + From a7a1649a170d0feac886dc499bfd6a47af7ff47e Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Thu, 9 Jan 2020 10:00:47 -0500 Subject: [PATCH 3/7] break up long line for linter --- Gruntfile.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 8da412e90..76612c481 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -65,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', '<%= conf.websrc %>/**/*', 'docs/**/*'], + files: [ + '<%= conf.src %>/**/*.js', + '<%= conf.spec %>/*.js', + '<%= conf.spec %>/helpers/*.js', + '<%= conf.websrc %>/**/*', + 'docs/**/*'], tasks: ['test'] }, reload: { From 803d4bf66d880aed3e536c279eb7265259abed62 Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Thu, 9 Jan 2020 10:06:07 -0500 Subject: [PATCH 4/7] update dependencies --- package-lock.json | 76 +++++++++++++++++++++++------------------------ package.json | 24 +++++++-------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01ce2df6f..f786be978 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "dc", - "version": "4.0.0-beta.1", + "version": "4.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -37,15 +37,15 @@ "dev": true }, "@types/estree": { - "version": "0.0.41", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.41.tgz", - "integrity": "sha512-rIAmXyJlqw4KEBO7+u9gxZZSQHaCNnIzYrnNmYVpgfJhxTqO0brCX0SYpqUTkVI5mwwUwzmtspLBGBKroMeynA==", + "version": "0.0.42", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz", + "integrity": "sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==", "dev": true }, "@types/node": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.1.tgz", - "integrity": "sha512-hx6zWtudh3Arsbl3cXay+JnkvVgCKzCWKv42C9J01N2T2np4h8w5X8u6Tpz5mj38kE3M9FM0Pazx8vKFFMnjLQ==", + "version": "13.1.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.5.tgz", + "integrity": "sha512-wupvfmtbqRJzjCm1H2diy7wo31Gn1OzvqoxCfQuKM9eSecogzP0WTlrjdq7cf7jgSO2ZX6hxwgRPR8Wt7FA22g==", "dev": true }, "JSONStream": { @@ -1442,9 +1442,9 @@ } }, "crossfilter2": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/crossfilter2/-/crossfilter2-1.5.1.tgz", - "integrity": "sha512-dx9s8FbnUuaG8GvrdxkEa8i9vk61RDQFUir3X/Cdd7htpYG65vXOWRXtTLLnCbm/0RzZKqgXfk5aPrftqHLEBQ==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/crossfilter2/-/crossfilter2-1.5.2.tgz", + "integrity": "sha512-ImlvPlUOQ2MW+DJmoglK3anU9GwvHk2EWaqUoXczydhIKzg7ot4W+w8kPNlUAW6Onoyg2AE1QhH5fzK2gNSbYg==", "dev": true, "requires": { "@ranfdev/deepobj": "1.0.2" @@ -1482,9 +1482,9 @@ } }, "d3": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/d3/-/d3-5.14.2.tgz", - "integrity": "sha512-Ccipa9XrYW5N0QkP6u0Qb8kU6WekIXBiDenmZm1zLvuq/9pBBhRCJLCICEOsH5Og4B0Xw02bhqGkK5VN/oPH0w==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-5.15.0.tgz", + "integrity": "sha512-C+E80SL2nLLtmykZ6klwYj5rPqB5nlfN5LdWEAVdWPppqTD8taoJi2PxLZjPeYT8FFRR2yucXq+kBlOnnvZeLg==", "requires": { "d3-array": "1", "d3-axis": "1", @@ -1652,9 +1652,9 @@ } }, "d3-format": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.2.tgz", - "integrity": "sha512-gco1Ih54PgMsyIXgttLxEhNy/mXxq8+rLnCb5shQk+P5TsiySrwWU5gpB4zen626J4LIwBxHvDChyA8qDm57ww==" + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.3.tgz", + "integrity": "sha512-mm/nE2Y9HgGyjP+rKIekeITVgBtX97o1nrvHCWX8F/yBYyevUTvu9vb5pUnKwrcSw7o7GuwMOWjS9gFDs4O+uQ==" }, "d3-geo": { "version": "1.11.9", @@ -1745,9 +1745,9 @@ "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==" }, "d3-time-format": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.2.2.tgz", - "integrity": "sha512-pweL2Ri2wqMY+wlW/wpkl8T3CUzKAha8S9nmiQlMABab8r5MJN0PD1V4YyRNVaKQfeh4Z0+VO70TLw6ESVOYzw==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.2.3.tgz", + "integrity": "sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA==", "requires": { "d3-time": "1" } @@ -3637,7 +3637,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -3910,7 +3910,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -4367,9 +4367,9 @@ } }, "inquirer": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.1.tgz", - "integrity": "sha512-V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.3.tgz", + "integrity": "sha512-+OiOVeVydu4hnCGLCSX+wedovR/Yzskv9BFqUNNKq9uU2qg7LCcCo3R86S2E7WLo0y/x2pnEZfZe1CoYnORUAw==", "dev": true, "requires": { "ansi-escapes": "^4.2.1", @@ -5108,9 +5108,9 @@ } }, "karma-firefox-launcher": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.2.0.tgz", - "integrity": "sha512-j9Zp8M8+VLq1nI/5xZGfzeaEPtGQ/vk3G+Y8vpmFWLvKLNZ2TDjD6cu2dUu7lDbu1HXNgatsAX4jgCZTkR9qhQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.3.0.tgz", + "integrity": "sha512-Fi7xPhwrRgr+94BnHX0F5dCl1miIW4RHnzjIGxF8GaIEp7rNqX7LSi7ok63VXs3PS/5MQaQMhGxw+bvD+pibBQ==", "dev": true, "requires": { "is-wsl": "^2.1.0" @@ -5521,7 +5521,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -5937,7 +5937,7 @@ }, "next-tick": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, @@ -6052,7 +6052,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -6994,7 +6994,7 @@ }, "qs": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz", + "resolved": "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz", "integrity": "sha1-GbV/8k3CqZzh+L32r82ln472H4g=", "dev": true } @@ -7373,9 +7373,9 @@ } }, "rollup": { - "version": "1.27.14", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.14.tgz", - "integrity": "sha512-DuDjEyn8Y79ALYXMt+nH/EI58L5pEw5HU9K38xXdRnxQhvzUTI/nxAawhkAHUQeudANQ//8iyrhVRHJBuR6DSQ==", + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.29.0.tgz", + "integrity": "sha512-V63Iz0dSdI5qPPN5HmCN6OBRzBFhMqNWcvwgq863JtSCTU6Vdvqq6S2fYle/dSCyoPrBkIP3EIr1RVs3HTRqqg==", "dev": true, "requires": { "@types/estree": "*", @@ -8593,9 +8593,9 @@ "dev": true }, "terser": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.3.tgz", - "integrity": "sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.2.tgz", + "integrity": "sha512-6FUjJdY2i3WZAtYBtnV06OOcOfzl+4hSKYE9wgac8rkLRBToPDDrBB2AcHwQD/OKDxbnvhVy2YgOPWO2SsKWqg==", "dev": true, "requires": { "commander": "^2.20.0", @@ -8683,7 +8683,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { diff --git a/package.json b/package.json index 17af10fad..ce4d25a0c 100644 --- a/package.json +++ b/package.json @@ -25,31 +25,31 @@ "url": "https://github.com/dc-js/dc.js.git" }, "dependencies": { - "d3": "^5.12.0" + "d3": "^5.15.0" }, "devDependencies": { "compare-versions": "^3.5.1", - "crossfilter2": "^1.4.7", + "crossfilter2": "^1.5.2", "d3-array": "^2.4.0", "d3-axis": "^1.0.12", - "d3-brush": "^1.1.4", + "d3-brush": "^1.1.5", "d3-collection": "^1.0.7", "d3-dispatch": "^1.0.6", "d3-ease": "^1.0.6", - "d3-format": "^1.4.2", + "d3-format": "^1.4.3", "d3-geo": "^1.11.9", "d3-hierarchy": "^1.1.9", - "d3-interpolate": "^1.3.3", - "d3-scale": "^3.2.0", + "d3-interpolate": "^1.4.0", + "d3-scale": "^3.2.1", "d3-scale-chromatic": "^1.5.0", "d3-selection": "^1.4.1", "d3-shape": "^1.3.7", "d3-time": "^1.1.0", - "d3-time-format": "^2.2.2", + "d3-time-format": "^2.2.3", "d3-timer": "^1.0.10", "d3-zoom": "^1.8.3", - "eslint": "^6.6.0", - "eslint-plugin-import": "^2.18.2", + "eslint": "^6.8.0", + "eslint-plugin-import": "^2.19.1", "eslint-plugin-node": "^10.0.0", "eslint-plugin-promise": "^4.2.1", "file-saver": "^1.3.8", @@ -73,17 +73,17 @@ "karma": "^4.4.1", "karma-chrome-launcher": "^2.2.0", "karma-coverage": "^1.1.2", - "karma-firefox-launcher": "^1.2.0", + "karma-firefox-launcher": "^1.3.0", "karma-jasmine": "^1.1.2", "karma-sauce-launcher": "^1.2.0", "karma-summary-reporter": "^1.7.1", "load-grunt-tasks": "~4", "node-sass": "^4.13.0", "reductio": "0.6.x", - "rollup": "^1.26.0", + "rollup": "^1.29.0", "rollup-plugin-json": "^4.0.0", "rollup-plugin-license": "^0.12.1", - "rollup-plugin-terser": "^5.1.2", + "rollup-plugin-terser": "^5.1.3", "time-grunt": "~1.4" }, "scripts": { From 6014eb38de5678ece53ff240f0237f595b1b5736 Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Thu, 9 Jan 2020 10:07:59 -0500 Subject: [PATCH 5/7] version and changelog --- Changelog.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index ded57d48a..4d783249e 100644 --- a/Changelog.md +++ b/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. diff --git a/package.json b/package.json index ce4d25a0c..a15142185 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dc", - "version": "4.0.0-beta.5", + "version": "4.0.0", "license": "Apache-2.0", "copyright": "2019", "description": "A multi-dimensional charting library built to work natively with crossfilter and rendered using d3.js ", From 7c75fafea111a2611683f4c28783de059a616dfb Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Thu, 9 Jan 2020 10:09:49 -0500 Subject: [PATCH 6/7] generated docs - our last checked-in artifact #1647 --- docs/api-latest.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-latest.md b/docs/api-latest.md index dd861f175..e55446f68 100644 --- a/docs/api-latest.md +++ b/docs/api-latest.md @@ -94,7 +94,7 @@ keying function for List of members of the european parliament +
  • List of members of the european parliament
    • DataTable
    @@ -115,7 +115,7 @@ Examples:

    GeoChoroplethChart
    @@ -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**: [BaseMixin](#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**: [BaseMixin](#BaseMixin) From ce2f7a7994c074a18f2471ca8cb7f6dea2dc9469 Mon Sep 17 00:00:00 2001 From: Gordon Woodhull Date: Thu, 9 Jan 2020 10:27:54 -0500 Subject: [PATCH 7/7] update fiddles and CDN links to 4.0 --- CONTRIBUTING.md | 2 +- README.md | 6 +++--- web-src/index.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 153744349..43527ea47 100644 --- a/CONTRIBUTING.md +++ b/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:
    -[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 diff --git a/README.md b/README.md index ce6a30513..15147ead1 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ 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:
    -[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. @@ -41,8 +41,8 @@ Version 4.* is compatible with d3 versions 4 and 5. It is not compatible with IE ## CDN location ``` -https://unpkg.com/dc@%5E4.0.0-beta.1/dist/dc.js -https://unpkg.com/dc@%5E4.0.0-beta.1/dist/style/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) diff --git a/web-src/index.html b/web-src/index.html index a67939a36..dcbc6fa0b 100644 --- a/web-src/index.html +++ b/web-src/index.html @@ -65,7 +65,7 @@

    For more information and assistance

    Get help faster with a working example! Fork these to get started:
    - blank jsFiddle - example jsFiddle - blank bl.ock - example bl.ock + blank jsFiddle - example jsFiddle - blank bl.ock - example bl.ock

    Examples