Update dependencies versions (#112)

* Fix scrollspy throttle issue * Fix new Scrollspy version * add * update to React 16 * fix testing
experience-experiments · Dec 7, 2017 · c7b37aa · c7b37aa
1 parent 868775a
commit c7b37aa
Show file tree

Hide file tree

Showing 28 changed files with 124 additions and 115 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    "es2015",
+    "env",
     "stage-0",
     "stage-1",
     "react"
@@ -10,4 +10,4 @@
     "transform-class-properties",
     "transform-object-rest-spread"
   ]
-}
+}
diff --git a/examples/area-chart/App.js b/examples/area-chart/App.js
@@ -1,15 +1,15 @@
 /* eslint import/no-unresolved: 0 */
 
-import React from 'react';
+import React, { PureComponent } from 'react';
 import ReactDom from 'react-dom';
 import { escapeHTML } from '../util';
 import ToolTip from '../ToolTip';
 import { AreaChart } from 'react-easy-chart';
 import moment from 'moment';
 import { timeParse as parse } from 'd3-time-format';
-import { Scrollspy } from 'react-scrollspy';
+import Scrollspy from 'react-scrollspy';
 
-class AreaChartContainer extends React.Component {
+class AreaChartContainer extends PureComponent {
   constructor(props) {
     super(props);
       // Generate multiple Areas of data

diff --git a/examples/bar-chart/App.js b/examples/bar-chart/App.js
@@ -1,13 +1,13 @@
 /* eslint import/no-unresolved: 0 */
 
-import React from 'react';
+import React, { PureComponent } from 'react';
 import ReactDOM from 'react-dom';
 import { BarChart } from 'react-easy-chart';
 import ToolTip from '../ToolTip';
 import { escapeHTML } from '../util';
-import { Scrollspy } from 'react-scrollspy';
+import Scrollspy from 'react-scrollspy';
 
-export default class BarChartContainer extends React.Component {
+export default class BarChartContainer extends PureComponent {
   constructor(props) {
     super(props);
 

diff --git a/examples/legend/App.js b/examples/legend/App.js
@@ -1,14 +1,14 @@
 /* eslint import/no-unresolved: 0 */
 
-import React from 'react';
+import React, { PureComponent } from 'react';
 import ReactDOM from 'react-dom';
 import {
   Legend,
   PieChart,
   ScatterplotChart
 } from 'react-easy-chart';
 import { escapeHTML } from '../util';
-import { Scrollspy } from 'react-scrollspy';
+import Scrollspy from 'react-scrollspy';
 
 const pieData = [
   { key: 'Cats', value: 100 },
@@ -128,7 +128,7 @@ const bigData = [
   }
 ];
 
-export default class LegendContainer extends React.Component {
+export default class LegendContainer extends PureComponent {
 
   constructor(props) {
     super(props);

diff --git a/examples/line-chart/app.js b/examples/line-chart/app.js
@@ -1,15 +1,15 @@
 /* eslint import/no-unresolved: 0 */
 
-import React from 'react';
+import React, { PureComponent } from 'react';
 import ReactDom from 'react-dom';
 import { escapeHTML } from '../util';
 import ToolTip from '../ToolTip';
 import { LineChart } from 'react-easy-chart';
 import moment from 'moment';
 import { timeParse as parse } from 'd3-time-format';
-import { Scrollspy } from 'react-scrollspy';
+import Scrollspy from 'react-scrollspy';
 
-class LineChartContainer extends React.Component {
+class LineChartContainer extends PureComponent {
   constructor(props) {
     super(props);
       // Generate multiple lines of data

diff --git a/examples/pie-chart/App.js b/examples/pie-chart/App.js
@@ -1,11 +1,11 @@
 /* eslint import/no-unresolved: 0 */
 
-import React from 'react';
+import React, { PureComponent } from 'react';
 import ReactDOM from 'react-dom';
 import ToolTip from '../ToolTip';
 import { escapeHTML } from '../util';
 import { PieChart } from 'react-easy-chart';
-import { Scrollspy } from 'react-scrollspy';
+import Scrollspy from 'react-scrollspy';
 
 const brandColors = {
   greyBlueOne: '#1e313c',
@@ -18,7 +18,7 @@ const brandColors = {
   lightGrey: '#e4e8ec'
 };
 
-export default class PieChartContainer extends React.Component {
+export default class PieChartContainer extends PureComponent {
   constructor(props) {
     super(props);
 

diff --git a/examples/scatterplot-chart/App.js b/examples/scatterplot-chart/App.js
@@ -1,12 +1,12 @@
 /* eslint import/no-unresolved: 0 */
 
-import React from 'react';
+import React, { PureComponent } from 'react';
 import ReactDOM from 'react-dom';
 import { ScatterplotChart } from 'react-easy-chart';
 import ToolTip from '../ToolTip';
 import Legend from '../Legend';
 import { escapeHTML } from '../util';
-import { Scrollspy } from 'react-scrollspy';
+import Scrollspy from 'react-scrollspy';
 
 const exampleText = [
   {
@@ -253,7 +253,7 @@ const configGen = [
   }
 ];
 
-export default class ScatterplotContainer extends React.Component {
+export default class ScatterplotContainer extends PureComponent {
   constructor(props) {
     super(props);
 

diff --git a/karma.conf.js b/karma.conf.js
@@ -16,7 +16,6 @@ module.exports = (config) => {
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: processCwd,
 
-
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
     frameworks: ['mocha', 'chai', 'sinon', 'phantomjs-shim', 'es6-shim'],
@@ -25,9 +24,11 @@ module.exports = (config) => {
     // list of files / patterns to load in the browser
     files: [
       'node_modules/phantomjs-polyfill/bind-polyfill.js',
-      'tests/index.js'
+      './tests/**/*.js'
+    ],
+    exclude: [
+      './tests/index.js'
     ],
-
 
     plugins: [
       'karma-chai',
@@ -51,7 +52,7 @@ module.exports = (config) => {
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'tests/index.js': ['webpack', 'sourcemap']
+      'tests/**/*.js': ['webpack', 'sourcemap']
     },
 
 

diff --git a/modules/area-chart/index.js b/modules/area-chart/index.js
@@ -1,5 +1,5 @@
-import React from 'react';
-import { createElement } from 'react-faux-dom';
+import React, { PureComponent } from 'react';
+import ReactFauxDOM from 'react-faux-dom';
 import {
   createUniqueID,
   reduce,
@@ -23,7 +23,7 @@ import { timeParse as parse } from 'd3-time-format';
 
 const dateParser = {};
 
-export default class AreaChart extends React.Component {
+export default class AreaChart extends PureComponent {
   static get propTypes() {
     return {
       data: PropTypes.array.isRequired,
@@ -95,7 +95,7 @@ export default class AreaChart extends React.Component {
   }
 
   createSvgNode({ m, w, h }) {
-    const node = createElement('svg');
+    const node = new ReactFauxDOM.Element('svg');
     node.setAttribute('width', w + m.left + m.right);
     node.setAttribute('height', h + m.top + m.bottom);
     return node;

diff --git a/modules/bar-chart/index.js b/modules/bar-chart/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
 import { scaleBand as band, scaleLinear as linear } from 'd3-scale';
 import {
   event as lastEvent,
@@ -20,7 +20,7 @@ import {
 } from '../shared';
 import { extent } from 'd3-array';
 import { timeParse as parse } from 'd3-time-format';
-import { createElement } from 'react-faux-dom';
+import ReactFauxDOM from 'react-faux-dom';
 import PropTypes from 'prop-types';
 import { Style } from 'radium';
 import merge from 'lodash.merge';
@@ -29,7 +29,7 @@ const dateParser = {};
 
 const colorScale = scale.category20();
 
-export default class BarChart extends React.Component {
+export default class BarChart extends PureComponent {
 
   static get propTypes() {
     return {
@@ -154,7 +154,7 @@ export default class BarChart extends React.Component {
   }
 
   createSvgNode({ m, w, h }) {
-    const node = createElement('svg');
+    const node = new ReactFauxDOM.Element('svg');
     node.setAttribute('width', w + m.left + m.right);
     node.setAttribute('height', h + m.top + m.bottom);
     return node;

diff --git a/modules/legend/index.js b/modules/legend/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Style } from 'radium';
 import { scale } from 'd3';
@@ -11,7 +11,7 @@ import defaultStyles from './defaultStyles';
 
 const colors = scale.category20().range();
 
-export default class Legend extends React.Component {
+export default class Legend extends PureComponent {
 
   static get propTypes() {
     return {

diff --git a/modules/line-chart/hybrid/index.js b/modules/line-chart/hybrid/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
 import {
   createUniqueID,
   defaultStyles,
@@ -10,7 +10,7 @@ import merge from 'lodash.merge';
 
 import lineChart from './LineChart';
 
-export default class LineChart extends React.Component {
+export default class LineChart extends PureComponent {
   constructor(props) {
     super(props);
     this.uid = createUniqueID();

diff --git a/modules/line-chart/index.js b/modules/line-chart/index.js
@@ -1,5 +1,6 @@
 import React from 'react';
-import { createElement } from 'react-faux-dom';
+import ReactFauxDOM from 'react-faux-dom';
+
 import {
   event as lastEvent,
   select,
@@ -95,7 +96,7 @@ export default class LineChart extends React.Component {
   }
 
   createSvgNode({ m, w, h }) {
-    const node = createElement('svg');
+    const node = new ReactFauxDOM.Element('svg');
     node.setAttribute('width', w + m.left + m.right);
     node.setAttribute('height', h + m.top + m.bottom);
     return node;

diff --git a/modules/line-chart/static/index.js b/modules/line-chart/static/index.js
@@ -1,5 +1,5 @@
-import React from 'react';
-import { createElement } from 'react-faux-dom';
+import React, { PureComponent } from 'react';
+import ReactFauxDOM from 'react-faux-dom';
 import {
   event as lastEvent,
   select,
@@ -24,7 +24,7 @@ import { timeParse as parse } from 'd3-time-format';
 
 const dateParser = {};
 
-export default class LineChart extends React.Component {
+export default class LineChart extends PureComponent {
   static get propTypes() {
     return {
       data: PropTypes.array.isRequired,
@@ -95,7 +95,7 @@ export default class LineChart extends React.Component {
   }
 
   createSvgNode({ m, w, h }) {
-    const node = createElement('svg');
+    const node = new ReactFauxDOM.Element('svg');
     node.setAttribute('width', w + m.left + m.right);
     node.setAttribute('height', h + m.top + m.bottom);
     return node;

diff --git a/modules/pie-chart/hybrid/index.js b/modules/pie-chart/hybrid/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
 import {
   scale,
   layout,
@@ -11,7 +11,7 @@ import {
   createUniqueID,
   defaultStyles
 } from '../../shared';
-import { createElement } from 'react-faux-dom';
+import ReactFauxDOM from 'react-faux-dom';
 import PropTypes from 'prop-types';
 import { Style } from 'radium';
 import merge from 'lodash.merge';
@@ -28,7 +28,7 @@ const getSliceFill = (d, i) => (
 
 const getLabelText = (d) => d.data.key;
 
-export default class PieChart extends React.Component {
+export default class PieChart extends PureComponent {
   static get propTypes() {
     return {
       data: PropTypes.array.isRequired,
@@ -138,7 +138,7 @@ export default class PieChart extends React.Component {
   }
 
   createSvgNode({ size }) {
-    const node = createElement('svg');
+    const node = new ReactFauxDOM.Element('svg');
     node.setAttribute('width', size);
     node.setAttribute('height', size);
     return node;

diff --git a/modules/pie-chart/static/index.js b/modules/pie-chart/static/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
 import {
   scale,
   layout,
@@ -10,7 +10,7 @@ import {
   createUniqueID,
   defaultStyles
 } from '../../shared';
-import { createElement } from 'react-faux-dom';
+import ReactFauxDOM from 'react-faux-dom';
 import PropTypes from 'prop-types';
 import { Style } from 'radium';
 import merge from 'lodash.merge';
@@ -27,7 +27,7 @@ const getSliceFill = (d, i) => (
 
 const getLabelText = (d) => d.data.key;
 
-export default class PieChart extends React.Component {
+export default class PieChart extends PureComponent {
   static get propTypes() {
     return {
       data: PropTypes.array.isRequired,
@@ -97,7 +97,7 @@ export default class PieChart extends React.Component {
   }
 
   createSvgNode({ size }) {
-    const node = createElement('svg');
+    const node = new ReactFauxDOM.Element('svg');
     node.setAttribute('width', size);
     node.setAttribute('height', size);
     return node;