revert 74d3b14 and resolve conflicts

devtools/image_viewer/viewer.js

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

devtools/test_dashboard/devtools.js

@@ -6,7 +6,7 @@ var Fuse = require('fuse.js/dist/fuse.common.js');
 var mocks = require('../../build/test_dashboard_mocks.json');
 var credentials = require('../../build/credentials.json');
 var Lib = require('@src/lib');
-var d3 = Lib.d3;
+var d3 = Plotly.d3;
 
 require('./perf');
 

src/components/annotations/draw.js

@@ -8,10 +8,11 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
+
 var Registry = require('../../registry');
 var Plots = require('../../plots/plots');
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var Axes = require('../../plots/cartesian/axes');
 var Color = require('../color');

src/components/annotations/draw_arrow_head.js

@@ -9,12 +9,13 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
+
 var Color = require('../color');
 
 var ARROWPATHS = require('./arrow_paths');
 
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strScale = Lib.strScale;
 var strRotate = Lib.strRotate;
 var strTranslate = Lib.strTranslate;

src/components/colorbar/draw.js

@@ -8,14 +8,14 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
 var tinycolor = require('tinycolor2');
 
 var Plots = require('../../plots/plots');
 var Registry = require('../../registry');
 var Axes = require('../../plots/cartesian/axes');
 var dragElement = require('../dragelement');
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var extendFlat = require('../../lib/extend').extendFlat;
 var setCursor = require('../../lib/setcursor');

src/components/colorscale/helpers.js

@@ -8,11 +8,11 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
 var tinycolor = require('tinycolor2');
 var isNumeric = require('fast-isnumeric');
 
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var Color = require('../color');
 
 var isValidScale = require('./scales').isValid;

src/components/drawing/index.js

@@ -9,14 +9,14 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
 var isNumeric = require('fast-isnumeric');
 var tinycolor = require('tinycolor2');
 
 var Registry = require('../../registry');
 var Color = require('../color');
 var Colorscale = require('../colorscale');
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var svgTextUtils = require('../../lib/svg_text_utils');
 

src/components/drawing/symbol_defs.js

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

src/components/errorbars/plot.js

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

src/components/errorbars/style.js

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

src/components/fx/hover.js

@@ -8,11 +8,11 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
 var isNumeric = require('fast-isnumeric');
 var tinycolor = require('tinycolor2');
 
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var strRotate = Lib.strRotate;
 var Events = require('../../lib/events');

src/components/fx/index.js

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

src/components/images/draw.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var d3 = require('../../lib/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/legend/draw.js

@@ -8,8 +8,9 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
+
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var Plots = require('../../plots/plots');
 var Registry = require('../../registry');
 var Events = require('../../lib/events');

src/components/legend/style.js

@@ -8,9 +8,10 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
+
 var Registry = require('../../registry');
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var Drawing = require('../drawing');
 var Color = require('../color');

src/components/modebar/modebar.js

@@ -9,10 +9,10 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
 var isNumeric = require('fast-isnumeric');
 
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var Icons = require('../../fonts/ploticon');
 var Parser = new DOMParser();
 

src/components/rangeselector/draw.js

@@ -8,12 +8,13 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
+
 var Registry = require('../../registry');
 var Plots = require('../../plots/plots');
 var Color = require('../color');
 var Drawing = require('../drawing');
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var svgTextUtils = require('../../lib/svg_text_utils');
 var axisIds = require('../../plots/cartesian/axis_ids');

src/components/rangeselector/get_update_object.js

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

src/components/rangeslider/draw.js

@@ -8,11 +8,12 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
+
 var Registry = require('../../registry');
 var Plots = require('../../plots/plots');
 
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var Drawing = require('../drawing');
 var Color = require('../color');

src/components/sliders/draw.js

@@ -8,11 +8,12 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
+
 var Plots = require('../../plots/plots');
 var Color = require('../color');
 var Drawing = require('../drawing');
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var svgTextUtils = require('../../lib/svg_text_utils');
 var arrayEditor = require('../../plot_api/plot_template').arrayEditor;

src/components/titles/index.js

@@ -9,12 +9,12 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
 var isNumeric = require('fast-isnumeric');
 
 var Plots = require('../../plots/plots');
 var Registry = require('../../registry');
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var Drawing = require('../drawing');
 var Color = require('../color');

src/components/updatemenus/draw.js

@@ -9,11 +9,12 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
+
 var Plots = require('../../plots/plots');
 var Color = require('../color');
 var Drawing = require('../drawing');
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var svgTextUtils = require('../../lib/svg_text_utils');
 var arrayEditor = require('../../plot_api/plot_template').arrayEditor;
 

src/components/updatemenus/scrollbox.js

@@ -10,11 +10,12 @@
 
 module.exports = ScrollBox;
 
+var d3 = require('@plotly/d3');
+
 var Color = require('../color');
 var Drawing = require('../drawing');
 
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 
 /**
  * Helper class to setup a scroll box

src/core.js

@@ -79,3 +79,6 @@ exports.Fx = require('./components/fx');
 exports.Snapshot = require('./snapshot');
 exports.PlotSchema = require('./plot_api/plot_schema');
 exports.Queue = require('./lib/queue');
+
+// export d3 used in the bundle
+exports.d3 = require('@plotly/d3');

src/lib/dom.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/geo_location_utils.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/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');
 
@@ -18,8 +18,6 @@ var BADNUM = numConstants.BADNUM;
 
 var lib = module.exports = {};
 
-lib.d3 = d3;
-
 lib.nestedProperty = require('./nested_property');
 lib.keyedContainer = require('./keyed_container');
 lib.relativeAttr = require('./relative_attr');

src/lib/make_trace_groups.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/notifier.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/svg_text_utils.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/plot_api/plot_api.js

@@ -8,11 +8,11 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
 var isNumeric = require('fast-isnumeric');
 var hasHover = require('has-hover');
 
 var Lib = require('../lib');
-var d3 = Lib.d3;
 var nestedProperty = Lib.nestedProperty;
 
 var Events = require('../lib/events');

src/plot_api/subroutines.js

@@ -8,11 +8,11 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
 var Registry = require('../registry');
 var Plots = require('../plots/plots');
 
 var Lib = require('../lib');
-var d3 = Lib.d3;
 var clearGlCanvases = require('../lib/clear_gl_canvases');
 
 var Color = require('../components/color');

src/plots/cartesian/axes.js

@@ -8,12 +8,12 @@
 
 'use strict';
 
+var d3 = require('@plotly/d3');
 var isNumeric = require('fast-isnumeric');
 var Plots = require('../../plots/plots');
 
 var Registry = require('../../registry');
 var Lib = require('../../lib');
-var d3 = Lib.d3;
 var strTranslate = Lib.strTranslate;
 var svgTextUtils = require('../../lib/svg_text_utils');
 var Titles = require('../../components/titles');