Skip to content

Commit

Permalink
Merge pull request uber#115 from uber/upgrade-d3-modules
Browse files Browse the repository at this point in the history
Upgrade all d3 modules to 1.0
  • Loading branch information
jckr authored Aug 8, 2016
2 parents 0dc0357 + 68ed6b1 commit 4779d68
Showing 13 changed files with 28 additions and 27 deletions.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -22,15 +22,15 @@
},
"main": "index.js",
"dependencies": {
"d3-array": "^0.7.1",
"d3-axis": "^0.3.1",
"d3-collection": "^0.1.2",
"d3-color": "^0.4.2",
"d3-hierarchy": "^0.2.2",
"d3-scale": "^0.7.0",
"d3-selection": "^0.7.1",
"d3-shape": "^0.6.0",
"d3-transition": "^0.2.8",
"d3-array": "^1.0.1",
"d3-axis": "^1.0.3",
"d3-collection": "^1.0.1",
"d3-color": "^1.0.1",
"d3-hierarchy": "^1.0.2",
"d3-scale": "^1.0.3",
"d3-selection": "^1.0.2",
"d3-shape": "^1.0.2",
"d3-transition": "^1.0.1",
"deep-equal": "^1.0.1",
"global": "^4.3.0",
"warning": "^2.1.0"
2 changes: 1 addition & 1 deletion src/lib/plot/axis.js
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
// THE SOFTWARE.

import React from 'react';
import d3Selection from 'd3-selection';
import * as d3Selection from 'd3-selection';

import PureRenderComponent from '../pure-render-component';
import {getDOMNode} from '../utils/react-utils';
2 changes: 1 addition & 1 deletion src/lib/plot/grid-lines.js
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
// THE SOFTWARE.

import React from 'react';
import d3Selection from 'd3-selection';
import * as d3Selection from 'd3-selection';

import PureRenderComponent from '../pure-render-component';
import {getDOMNode} from '../utils/react-utils';
2 changes: 1 addition & 1 deletion src/lib/plot/series/abstract-series.js
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
// THE SOFTWARE.

import React from 'react';
import d3Selection from 'd3-selection';
import * as d3Selection from 'd3-selection';

import PureRenderComponent from '../../pure-render-component';
import {
4 changes: 2 additions & 2 deletions src/lib/plot/series/area-series.js
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@
// THE SOFTWARE.

import React from 'react';
import d3Selection from 'd3-selection';
import d3Shape from 'd3-shape';
import * as d3Selection from 'd3-selection';
import * as d3Shape from 'd3-shape';

import AbstractSeries from './abstract-series';
import {getDOMNode} from '../../utils/react-utils';
2 changes: 1 addition & 1 deletion src/lib/plot/series/bar-series.js
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
// THE SOFTWARE.

import React from 'react';
import d3Selection from 'd3-selection';
import * as d3Selection from 'd3-selection';

import AbstractSeries from './abstract-series';
import {getDOMNode} from '../../utils/react-utils';
2 changes: 1 addition & 1 deletion src/lib/plot/series/heatmap-series.js
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
// THE SOFTWARE.

import React from 'react';
import d3Selection from 'd3-selection';
import * as d3Selection from 'd3-selection';

import AbstractSeries from './abstract-series';
import {getDOMNode} from '../../utils/react-utils';
4 changes: 2 additions & 2 deletions src/lib/plot/series/line-series.js
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@
// THE SOFTWARE.

import React from 'react';
import d3Selection from 'd3-selection';
import d3Shape from 'd3-shape';
import * as d3Selection from 'd3-selection';
import * as d3Shape from 'd3-shape';

import AbstractSeries from './abstract-series';
import {getDOMNode} from '../../utils/react-utils';
2 changes: 1 addition & 1 deletion src/lib/plot/series/mark-series.js
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
// THE SOFTWARE.

import React from 'react';
import d3Selection from 'd3-selection';
import * as d3Selection from 'd3-selection';

import AbstractSeries from './abstract-series';
import {getDOMNode} from '../../utils/react-utils';
4 changes: 2 additions & 2 deletions src/lib/radial-chart/radial-chart.js
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@

import React from 'react';
import equal from 'deep-equal';
import d3Selection from 'd3-selection';
import d3Shape from 'd3-shape';
import * as d3Selection from 'd3-selection';
import * as d3Shape from 'd3-shape';

import {getAttributeFunctor} from '../utils/scales-utils';

4 changes: 2 additions & 2 deletions src/lib/treemap/treemap.js
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@
// THE SOFTWARE.

import React from 'react';
import d3Hierarchy from 'd3-hierarchy';
import d3Color from 'd3-color';
import * as d3Hierarchy from 'd3-hierarchy';
import * as d3Color from 'd3-color';
import {getCSSAnimation, AnimationPropType} from '../utils/animation-utils';
import {getAttributeFunctor} from '../utils/scales-utils';
import {CONTINUOUS_COLOR_RANGE, DEFAULT_COLOR, OPACITY_RANGE} from '../theme';
2 changes: 1 addition & 1 deletion src/lib/utils/axis-utils.js
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import d3Axis from 'd3-axis';
import * as d3Axis from 'd3-axis';

const AXIS_FNS = {
left: d3Axis.axisLeft,
7 changes: 4 additions & 3 deletions src/lib/utils/scales-utils.js
Original file line number Diff line number Diff line change
@@ -18,9 +18,10 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import d3Scale from 'd3-scale';
import d3Array from 'd3-array';
import d3Collection from 'd3-collection';
import * as d3Scale from 'd3-scale';
import * as d3Array from 'd3-array';
import * as d3Collection from 'd3-collection';

import React from 'react';
import warning from 'warning';

0 comments on commit 4779d68

Please sign in to comment.