Skip to content

Commit ef95330

Browse files
committed
Add d3 as npm dependency and remove from bower
1 parent 135c179 commit ef95330

17 files changed

+23
-12
lines changed

frontend/app/components/chart/g-blank-flat.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Ember from 'ember';
22
import Graphable from 'flaredown/components/chart/graphable';
3+
import * as d3 from "d3";
34

45
const {
56
get,

frontend/app/components/chart/g-blank-trackable.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Ember from 'ember';
22
import Graphable from 'flaredown/components/chart/graphable';
3+
import * as d3 from "d3";
34

45
const {
56
computed,

frontend/app/components/chart/g-flat.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Ember from 'ember';
22
import moment from 'moment';
33
import Graphable from 'flaredown/components/chart/graphable';
4+
import * as d3 from "d3";
45

56
const {
67
get,

frontend/app/components/chart/g-hbi.js

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Ember from 'ember';
22
import moment from 'moment';
33
import Colorable from 'flaredown/mixins/colorable';
44
import Graphable from 'flaredown/components/chart/graphable';
5+
import * as d3 from "d3";
56

67
const {
78
$,

frontend/app/components/chart/g-timeline.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Ember from 'ember';
22
import moment from 'moment';
3+
import * as d3 from "d3";
34

45
export default Ember.Component.extend( {
56
tagName: 'g',

frontend/app/components/chart/g-trackable.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Ember from 'ember';
22
import moment from 'moment';
33
import Graphable from 'flaredown/components/chart/graphable';
4+
import * as d3 from "d3";
45

56
const {
67
$,

frontend/app/components/chart/g-weather.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Ember from 'ember';
22
import moment from 'moment';
3+
import * as d3 from "d3";
34
import Colorable from 'flaredown/mixins/colorable';
45
import Graphable from 'flaredown/components/chart/graphable';
56

frontend/app/components/chart/graphable.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Ember from 'ember';
2+
import * as d3 from "d3";
23

34
/* no-unexpected-multiline: "error" */
45

frontend/app/components/health-chart.js

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { extendMoment } from 'moment-range';
44
import Resizable from './chart/resizable';
55
import FieldsByUnits from 'flaredown/mixins/fields-by-units';
66
import DatesRetriever from 'flaredown/mixins/chart/dates-retriever';
7+
import * as d3 from "d3";
78

89
const moment = extendMoment(Moment);
910

frontend/app/components/pattern/chart-group.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Ember from 'ember';
22
import moment from 'moment';
3-
4-
/* global d3 */
3+
import * as d3 from "d3";
54

65
const {
76
get,

frontend/app/components/pattern/chart-hover.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import Ember from 'ember';
22
import moment from 'moment';
33

4-
/* global d3 */
5-
64
const {
75
$,
86
get,

frontend/app/components/pattern/chart-item.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Ember from 'ember';
22
import moment from 'moment';
3-
4-
/* global d3 */
3+
import * as d3 from "d3";
54

65
const {
76
$,

frontend/app/components/pattern/chart-legend-item.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import Ember from 'ember';
22

3-
/* global d3 */
4-
53
const {
64
get,
75
computed,

frontend/bower.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"bourbon": "4.2.3",
55
"neat": "~1.7.2",
66
"pace": "vectart/pace",
7-
"d3": "~3.5.13",
87
"drag-drop-polyfill": "2.0.0-beta.1",
98
"pickadate": "^3.5.6",
109
"At.js": "^1.5.4"

frontend/ember-cli-build.js

-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ module.exports = function(defaults) {
6565
// Spinkit
6666
app.import('node_modules/spinkit/spinkit.css')
6767

68-
// d3
69-
app.import(app.bowerDirectory + '/d3/d3.min.js');
70-
7168
// HTML5 Drag and Drop Polyfill for Mobile
7269
app.import(app.bowerDirectory + '/drag-drop-polyfill/release/drag-drop-polyfill-scroll-behaviour.js');
7370
app.import(app.bowerDirectory + '/drag-drop-polyfill/release/drag-drop-polyfill.css');

frontend/package-lock.json

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
]
8585
},
8686
"dependencies": {
87+
"d3": "^3.5.17",
8788
"moment": "^2.29.4",
8889
"moment-range": "^4.0.2",
8990
"moment-timezone": "^0.5.43",

0 commit comments

Comments
 (0)