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');

src/components/errorbars/plot.js

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

src/components/errorbars/style.js

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

src/components/fx/hover.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var Lib = require('../../lib');
 var dragElement = require('../dragelement');
 var helpers = require('./helpers');

src/components/fx/index.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var Drawing = require('../drawing');
 var Axes = require('../../plots/cartesian/axes');
 var axisIds = require('../../plots/cartesian/axis_ids');

src/components/images/draw.js

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

src/components/legend/draw.js

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

src/components/legend/style.js

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

src/components/modebar/modebar.js

@@ -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/rangeselector/draw.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 module.exports = function getUpdateObject(axisLayout, buttonLayout) {
     var axName = axisLayout._name;

src/components/rangeselector/get_update_object.js

@@ -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/rangeslider/draw.js

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

src/components/sliders/draw.js

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

src/components/titles/index.js

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

src/components/updatemenus/draw.js

@@ -10,7 +10,7 @@
 
 module.exports = ScrollBox;
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 var Color = require('../color');
 var Drawing = require('../drawing');

src/components/updatemenus/scrollbox.js

@@ -81,4 +81,4 @@ exports.PlotSchema = require('./plot_api/plot_schema');
 exports.Queue = require('./lib/queue');
 
 // export d3 used in the bundle
-exports.d3 = require('d3');
+exports.d3 = require('@plotly/d3');

src/core.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var loggers = require('./loggers');
 var matrix = require('./matrix');
 var mat4X4 = require('gl-mat4');

src/lib/dom.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var countryRegex = require('country-regex');
 var turfArea = require('@turf/area');
 var turfCentroid = require('@turf/centroid');

src/lib/geo_location_utils.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var utcFormat = require('d3-time-format').utcFormat;
 var isNumeric = require('fast-isnumeric');
 

src/lib/index.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 /**
  * General helper to manage trace groups based on calcdata

src/lib/make_trace_groups.js

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

src/lib/notifier.js

@@ -11,7 +11,7 @@
 
 /* global MathJax:false */
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 var Lib = require('../lib');
 var strTranslate = Lib.strTranslate;

src/lib/svg_text_utils.js

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

src/plot_api/plot_api.js

@@ -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/plot_api/subroutines.js

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

src/plots/cartesian/axes.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var tinycolor = require('tinycolor2');
 var supportsPassive = require('has-passive-events');
 

src/plots/cartesian/dragbox.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 var Fx = require('../../components/fx');
 var dragElement = require('../../components/dragelement');

src/plots/cartesian/graph_interact.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 var Registry = require('../../registry');
 var Lib = require('../../lib');

src/plots/cartesian/index.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var utcFormat = require('d3-time-format').utcFormat;
 var isNumeric = require('fast-isnumeric');
 

src/plots/cartesian/set_convert.js

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

src/plots/cartesian/transition_axes.js

@@ -10,7 +10,7 @@
 
 /* global PlotlyGeoAssets:false */
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 
 var Registry = require('../../registry');
 var Lib = require('../../lib');

src/plots/geo/geo.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var Lib = require('../../lib');
 var Registry = require('../../registry');
 

src/plots/geo/zoom.js

@@ -15,7 +15,7 @@ var strTranslate = Lib.strTranslate;
 var strScale = Lib.strScale;
 var getSubplotCalcData = require('../../plots/get_data').getSubplotCalcData;
 var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
-var d3 = require('d3');
+var d3 = require('@plotly/d3');
 var Drawing = require('../../components/drawing');
 var svgTextUtils = require('../../lib/svg_text_utils');