Merge pull request #5359 from plotly/d3-v3-no-eval-func

Avoid function constructor in d3

Author: archmoj

devtools/image_viewer/viewer.js

@@ -1,7 +1,7 @@
 var fs = require('fs');
 var path = require('path');
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 var $plotlist = document.getElementById('plot-list');
 var $toggles = document.getElementById('plot-toggles');

package-lock.json

@@ -56,6 +56,7 @@
     ]
   },
   "dependencies": {
+    "@plotly/d3": "^3.5.18",
     "@plotly/d3-sankey": "0.7.2",
     "@plotly/d3-sankey-circular": "0.33.1",
     "@plotly/point-cluster": "^3.1.9",
@@ -70,7 +71,6 @@
     "color-rgba": "2.1.1",
     "convex-hull": "^1.0.3",
     "country-regex": "^1.1.0",
-    "d3": "^3.5.17",
     "d3-force": "^1.2.1",
     "d3-hierarchy": "^1.1.9",
     "d3-interpolate": "^1.4.0",

package.json

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 var Registry = require('../../registry');
 var Plots = require('../../plots/plots');

src/components/annotations/draw.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 var Color = require('../color');
 

src/components/annotations/draw_arrow_head.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var tinycolor = require('tinycolor2');
 
 var Plots = require('../../plots/plots');

src/components/colorbar/draw.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var tinycolor = require('tinycolor2');
 var isNumeric = require('fast-isnumeric');
 

src/components/colorscale/helpers.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var isNumeric = require('fast-isnumeric');
 var tinycolor = require('tinycolor2');
 

src/components/drawing/index.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 /** Marker symbol definitions
  * users can specify markers either by number or name

src/components/drawing/symbol_defs.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var isNumeric = require('fast-isnumeric');
 
 var Drawing = require('../drawing');