diff --git a/package-lock.json b/package-lock.json index e9eb12a2cea..bc5383f2d61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,6 @@ "license": "MIT", "dependencies": { "@plotly/d3": "3.8.2", - "@plotly/d3-sankey": "0.7.2", - "@plotly/d3-sankey-circular": "0.33.1", "@plotly/mapbox-gl": "1.13.4", "@plotly/regl": "^2.1.2", "@turf/area": "^7.1.0", @@ -30,6 +28,8 @@ "d3-geo-projection": "^2.9.0", "d3-hierarchy": "^1.1.9", "d3-interpolate": "^3.0.1", + "d3-sankey": "0.12.3", + "d3-sankey-circular": "0.34.0", "d3-time": "^1.1.0", "d3-time-format": "^2.2.3", "fast-isnumeric": "^1.1.4", @@ -1165,27 +1165,6 @@ "resolved": "https://registry.npmjs.org/@plotly/d3/-/d3-3.8.2.tgz", "integrity": "sha512-wvsNmh1GYjyJfyEBPKJLTMzgf2c2bEbSIL50lmqVUi+o1NHaLPi1Lb4v7VxXXJn043BhNyrxUrWI85Q+zmjOVA==" }, - "node_modules/@plotly/d3-sankey": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@plotly/d3-sankey/-/d3-sankey-0.7.2.tgz", - "integrity": "sha512-2jdVos1N3mMp3QW0k2q1ph7Gd6j5PY1YihBrwpkFnKqO+cqtZq3AdEYUeSGXMeLsBDQYiqTVcihYfk8vr5tqhw==", - "dependencies": { - "d3-array": "1", - "d3-collection": "1", - "d3-shape": "^1.2.0" - } - }, - "node_modules/@plotly/d3-sankey-circular": { - "version": "0.33.1", - "resolved": "https://registry.npmjs.org/@plotly/d3-sankey-circular/-/d3-sankey-circular-0.33.1.tgz", - "integrity": "sha512-FgBV1HEvCr3DV7RHhDsPXyryknucxtfnLwPtCKKxdolKyTFYoLX/ibEfX39iFYIL7DYbVeRtP43dbFcrHNE+KQ==", - "dependencies": { - "d3-array": "^1.2.1", - "d3-collection": "^1.0.4", - "d3-shape": "^1.2.0", - "elementary-circuits-directed-graph": "^1.0.4" - } - }, "node_modules/@plotly/mapbox-gl": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/@plotly/mapbox-gl/-/mapbox-gl-1.13.4.tgz", @@ -3229,6 +3208,28 @@ "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz", "integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==" }, + "node_modules/d3-sankey": { + "version": "0.12.3", + "resolved": "https://registry.npmjs.org/d3-sankey/-/d3-sankey-0.12.3.tgz", + "integrity": "sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ==", + "license": "BSD-3-Clause", + "dependencies": { + "d3-array": "1 - 2", + "d3-shape": "^1.2.0" + } + }, + "node_modules/d3-sankey-circular": { + "version": "0.34.0", + "resolved": "https://registry.npmjs.org/d3-sankey-circular/-/d3-sankey-circular-0.34.0.tgz", + "integrity": "sha512-eI0eoxqXbcW7oHzQA1DrsPhn7kaIK9ibh/XMhdU/zsyj4FQskaFMj/AAnY0GNcET5/0+VqZABhFfhqFrno7GUA==", + "license": "MIT", + "dependencies": { + "d3-array": "^1.2.1", + "d3-collection": "^1.0.4", + "d3-shape": "^1.2.0", + "elementary-circuits-directed-graph": "^1.0.4" + } + }, "node_modules/d3-shape": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz", diff --git a/package.json b/package.json index 9414c970ef1..2815add9fd6 100644 --- a/package.json +++ b/package.json @@ -68,8 +68,6 @@ }, "dependencies": { "@plotly/d3": "3.8.2", - "@plotly/d3-sankey": "0.7.2", - "@plotly/d3-sankey-circular": "0.33.1", "@plotly/mapbox-gl": "1.13.4", "@plotly/regl": "^2.1.2", "@turf/area": "^7.1.0", @@ -88,6 +86,8 @@ "d3-geo-projection": "^2.9.0", "d3-hierarchy": "^1.1.9", "d3-interpolate": "^3.0.1", + "d3-sankey": "0.12.3", + "d3-sankey-circular": "0.34.0", "d3-time": "^1.1.0", "d3-time-format": "^2.2.3", "fast-isnumeric": "^1.1.4", diff --git a/src/traces/sankey/render.js b/src/traces/sankey/render.js index a07d18a9c9e..7fd65f3cb77 100644 --- a/src/traces/sankey/render.js +++ b/src/traces/sankey/render.js @@ -3,8 +3,8 @@ var d3Force = require('d3-force'); var interpolateNumber = require('d3-interpolate').interpolateNumber; var d3 = require('@plotly/d3'); -var d3Sankey = require('@plotly/d3-sankey'); -var d3SankeyCircular = require('@plotly/d3-sankey-circular'); +var d3Sankey = require('d3-sankey'); +var d3SankeyCircular = require('d3-sankey-circular'); var c = require('./constants'); var tinycolor = require('tinycolor2'); diff --git a/test/image/baselines/sankey_align_center.png b/test/image/baselines/sankey_align_center.png index ec1cdc2e74d..c608a4c42fa 100644 Binary files a/test/image/baselines/sankey_align_center.png and b/test/image/baselines/sankey_align_center.png differ diff --git a/test/image/baselines/sankey_align_justify.png b/test/image/baselines/sankey_align_justify.png index 9113df3b924..6e925f7932d 100644 Binary files a/test/image/baselines/sankey_align_justify.png and b/test/image/baselines/sankey_align_justify.png differ diff --git a/test/image/baselines/sankey_align_left.png b/test/image/baselines/sankey_align_left.png index 0022c7589cc..8fb835e853a 100644 Binary files a/test/image/baselines/sankey_align_left.png and b/test/image/baselines/sankey_align_left.png differ diff --git a/test/image/baselines/sankey_align_right.png b/test/image/baselines/sankey_align_right.png index ae0552ddedf..75e8615e178 100644 Binary files a/test/image/baselines/sankey_align_right.png and b/test/image/baselines/sankey_align_right.png differ diff --git a/test/image/baselines/sankey_energy.png b/test/image/baselines/sankey_energy.png index ffe9b26f1de..8d39c59b5c7 100644 Binary files a/test/image/baselines/sankey_energy.png and b/test/image/baselines/sankey_energy.png differ diff --git a/test/image/baselines/sankey_energy_dark.png b/test/image/baselines/sankey_energy_dark.png index fd154477e96..671920ab5e6 100644 Binary files a/test/image/baselines/sankey_energy_dark.png and b/test/image/baselines/sankey_energy_dark.png differ diff --git a/test/image/baselines/sankey_large_padding.png b/test/image/baselines/sankey_large_padding.png index dd4c3de97af..e7a7df6bec7 100644 Binary files a/test/image/baselines/sankey_large_padding.png and b/test/image/baselines/sankey_large_padding.png differ diff --git a/test/image/baselines/sankey_messy.png b/test/image/baselines/sankey_messy.png index e1d33a5f004..66ccd1c5668 100644 Binary files a/test/image/baselines/sankey_messy.png and b/test/image/baselines/sankey_messy.png differ diff --git a/test/image/baselines/sankey_subplots.png b/test/image/baselines/sankey_subplots.png index 0643f1f3271..20bab51102a 100644 Binary files a/test/image/baselines/sankey_subplots.png and b/test/image/baselines/sankey_subplots.png differ diff --git a/test/jasmine/tests/sankey_test.js b/test/jasmine/tests/sankey_test.js index 09faf905013..7751b133f3f 100644 --- a/test/jasmine/tests/sankey_test.js +++ b/test/jasmine/tests/sankey_test.js @@ -3,8 +3,8 @@ var attributes = require('../../../src/traces/sankey/attributes'); var Lib = require('../../../src/lib'); var d3Select = require('../../strict-d3').select; var d3SelectAll = require('../../strict-d3').selectAll; -var d3sankey = require('@plotly/d3-sankey'); -var d3SankeyCircular = require('@plotly/d3-sankey-circular'); +var d3sankey = require('d3-sankey'); +var d3SankeyCircular = require('d3-sankey-circular'); var mock = require('../../image/mocks/sankey_energy.json'); var mockDark = require('../../image/mocks/sankey_energy_dark.json'); var mockCircular = require('../../image/mocks/sankey_circular.json');