Make d3 an npm dependency, bump version

.eslintrc.js

@@ -25,7 +25,6 @@ module.exports = {
     'no-empty': 'off'
   },
   globals: {
-    'd3': 'readonly',
     '_': 'readonly',
     '$': 'readonly',
     'andThen': 'readonly',

addon/components/bubble-chart.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import ChartComponent from './chart-component';
 
 import FloatingTooltipMixin from '../mixins/floating-tooltip';

addon/components/chart-component.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import { uniq } from 'lodash-es';
 import ResizeHandlerMixin from '../mixins/resize-handler';
 import ColorableMixin from '../mixins/colorable';

addon/components/horizontal-bar-chart.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import { map } from 'lodash-es';
 import ChartComponent from './chart-component';
 import FormattableMixin from '../mixins/formattable';

addon/components/pie-chart.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import { cloneDeep, drop, each, find, indexOf, last, max, min, sortBy, take, takeRight } from 'lodash-es';
 import ChartComponent from './chart-component';
 import FormattableMixin from '../mixins/formattable';

addon/components/scatter-chart.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import { keys, values } from 'lodash-es';
 import ChartComponent from './chart-component';
 

addon/components/stacked-vertical-bar-chart.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import { clone, difference, filter, groupBy, map, max, maxBy, range, reduce, sortBy, takeRight, zipObject } from 'lodash-es';
 import ChartComponent from './chart-component';
 import LegendMixin from '../mixins/legend';

addon/components/time-series-chart.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import { head, keys, last as lodashLast, map } from 'lodash-es';
 import ChartComponent from './chart-component';
 

addon/components/vertical-bar-chart.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import { assign, each, flatten, groupBy as lodashGroupBy, keys, map, max as lodashMax, min as lodashMin, sortBy, uniq, values } from 'lodash-es';
 import ChartComponent from './chart-component';
 import LegendMixin from '../mixins/legend';

addon/mixins/axes.js

@@ -1,4 +1,6 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
+
 export default Ember.Mixin.create({
 
   // # ------------------------------------------------------------------------

addon/mixins/axis-titles.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 
 /**
  * Adds axis titles to a chart and sets left/bottom margins to allow space

addon/mixins/colorable.js

@@ -1,4 +1,6 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
+
 export default Ember.Mixin.create({
 
   selectedSeedColor: 'rgb(65, 65, 65)',

addon/mixins/formattable.js

@@ -1,4 +1,6 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
+
 export default Ember.Mixin.create({
 
   // # Getters for formatting human-readable labels from provided data

addon/mixins/has-time-series-rule.js

@@ -1,4 +1,6 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
+
 export default Ember.Mixin.create({
 
   // # ----------------------------------------------------------------------

addon/mixins/legend.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import { isFunction, sortBy } from 'lodash-es';
 import LabelTrimmer from '../utils/label-trimmer';
 

addon/mixins/time-series-labeler.js

@@ -1,6 +1,7 @@
 // Creates time series labels that are spaced reasonably.
 //  Provides this.formattedTime. Depends on this.xDomain and this.selectedInterval.
 import Ember from 'ember';
+import * as d3 from 'd3';
 
 // The labeller type used to create the labels for each domain type
 // Note that quarters uses a month labeller to create the labels

bower.json

@@ -20,7 +20,6 @@
   },
   "devDependencies": {
     "font-awesome": "~3.2.1",
-    "d3": "~3.5.3",
     "tinycolor": "~1.4.1"
   }
 }

ember-cli-build.js

@@ -7,7 +7,6 @@ module.exports = function(defaults) {
     // Add options here
   });
   app.import(app.bowerDirectory + '/jquery-ui/themes/base/jquery-ui.css');
-  app.import(app.bowerDirectory + '/d3/d3.js');
   app.import(app.bowerDirectory + '/tinycolor/tinycolor.js');
 
   /*

index.js

@@ -3,14 +3,4 @@
 
 module.exports = {
   name: 'ember-charts',
-
-  included: function(app) {
-    this._super.included(app);
-
-    app.import(app.bowerDirectory + '/d3/d3.js');
-  },
-
-  afterInstall: function() {
-    this.addBowerPackageToProject('d3');
-  }
 };

package.json

@@ -24,6 +24,7 @@
     "release": "release-it"
   },
   "dependencies": {
+    "d3": "~3.5.17",
     "ember-auto-import": "^1.5.2",
     "ember-cli-babel": "^7.7.3",
     "ember-cli-less": "~1.3.1",

tests/dummy/app/models/single_group/single_sector_return.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [
   {
     time: d3.time.format('%Y-%m-%d').parse("2013-06-15"),

tests/dummy/app/models/time_series/daily_curr_value.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),
     value: 43642.83058384 

tests/dummy/app/models/time_series/daily_diff_value.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
   time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),
   value: 18906.16756396448
@@ -451,4 +453,4 @@ export default [{
 }, {
   time: d3.time.format('%Y-%m-%d').parse("2013-09-31"),
   value: 11718.60614444795
-}];
+}];

tests/dummy/app/models/time_series/daily_five_series.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     label: 'Group One',
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),

tests/dummy/app/models/time_series/daily_four_series.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     label: 'Group One',
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),

tests/dummy/app/models/time_series/daily_six_series.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     label: 'Group One',
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),

tests/dummy/app/models/time_series/daily_three_series.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     label: 'Group One',
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),

tests/dummy/app/models/time_series/daily_two_series.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     label: 'Group One',
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),

tests/dummy/app/models/time_series/monthly_return_double_period.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2013-05-15"),
     label: "Insurance companies",

tests/dummy/app/models/time_series/monthly_return_double_series.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2013-05-15"),
     label: "Software & Programming",

tests/dummy/app/models/time_series/monthly_return_negative_period.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2013-05-15"),
     label: "Insurance companies",
@@ -173,4 +175,4 @@ export default [{
     label: "Financial analytics software",
     value: 3.50,
     type: "money"
-}];
+}];

tests/dummy/app/models/time_series/monthly_return_single_period.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2013-07-16"),
     label: "Insurance companies",

tests/dummy/app/models/time_series/monthly_return_single_series.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2013-05-15"),
     label: "Financial analytics software",

tests/dummy/app/models/time_series/monthly_return_triple_series.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2013-05-15"),
     label: "Software & Programming",

tests/dummy/app/models/time_series/population.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
   time: d3.time.format('%Y-%m-%d').parse("2011-10-01"),
   label: "San Francisco",
@@ -2398,4 +2400,4 @@ export default [{
   time: d3.time.format('%Y-%m-%d').parse("2012-04-17"),
   label: "Boston",
   value: 67.3
-}];
+}];

tests/dummy/app/models/time_series/same_value_grouped.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     label: 'Group One',
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),

tests/dummy/app/models/time_series/same_value_ungrouped.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),
     value: -100

tests/dummy/app/models/time_series/value_p1d_p1y.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2012-04-27"),
     value: 142096015.71742177

tests/dummy/app/models/time_series/value_p1m_p1y.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2012-04-16"),
     value: 142096015.71742177

tests/dummy/app/models/time_series/value_p1m_p2y.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2011-04-16"),
     value: 3190223.5507746544

tests/dummy/app/models/time_series/value_p1m_p5y.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2008-04-16"),
     value: 3311114.0604923926

tests/dummy/app/models/time_series/value_p1w_p1y.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2012-04-27"),
     value: 142096015.71742177

tests/dummy/app/models/time_series/zeroes_grouped.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     label: 'Group One',
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),

tests/dummy/app/models/time_series/zeroes_ungrouped.js

@@ -1,3 +1,5 @@
+import * as d3 from 'd3';
+
 export default [{
     time: d3.time.format('%Y-%m-%d').parse("2013-05-01"),
     value: 0

tests/unit/mixins/legend-test.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import * as d3 from 'd3';
 import LegendMixin from 'dummy/mixins/legend';
 import { module, test } from 'qunit';
 

tests/unit/time-series-test.js

@@ -1,11 +1,12 @@
- import Ember from "ember";
- import { test, moduleForComponent } from 'ember-qunit';
-
- moduleForComponent('time-series-chart', '[Unit] Time series component', {
-   needs: [ 'template:components/chart-component'],
-   beforeEach: function () {},
-   afterEach: function () {}
- });
+import Ember from "ember";
+import * as d3 from 'd3';
+import { test, moduleForComponent } from 'ember-qunit';
+
+moduleForComponent('time-series-chart', '[Unit] Time series component', {
+  needs: [ 'template:components/chart-component'],
+  beforeEach: function () {},
+  afterEach: function () {}
+});
 
 var timeSeriesContentBarNonDynamic = {
   barPadding: 0,

yarn.lock

@@ -3934,6 +3934,11 @@ cyclist@~0.2.2:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
   integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
+d3@~3.5.17:
+  version "3.5.17"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"
+  integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=
+
 dag-map@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"