revert 74d3b14 and resolve conflicts

Author: archmoj

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