Merge pull request #59 from hasPatrickC/react-upgrade

upgrading react components for use with v15 or v0.14
alfredkam · Jul 25, 2016 · c15d29a · c15d29a
2 parents 3ad2594 + 57e3571
commit c15d29a
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 22 deletions.
diff --git a/demo/bundle.js b/demo/bundle.js
diff --git a/demo/example/react-bubble-hover-tooltip/bubble-point.jsx b/demo/example/react-bubble-hover-tooltip/bubble-point.jsx
@@ -4,7 +4,7 @@
 var React = require('react');
 var yako = require('../../../src');
 var Bubble = require('../../../src/addons/react-components/bubble/bubble-point');
-var PureRenderMixin = React.addons.PureRenderMixin;
+var PureRenderMixin = require('react-addons-pure-render-mixin');
 
 /* Tool Tip Component */
 var ToolTip = React.createClass({

diff --git a/demo/example/react-bubble-hover-tooltip/bubble-scatter.jsx b/demo/example/react-bubble-hover-tooltip/bubble-scatter.jsx
@@ -4,7 +4,7 @@
 var React = require('react');
 var yako = require('../../../src');
 var Bubble = require('../../../src/addons/react-components/bubble/bubble-scatter');
-var PureRenderMixin = React.addons.PureRenderMixin;
+var PureRenderMixin = require('react-addons-pure-render-mixin');
 
 /* Tool Tip Component */
 var ToolTip = React.createClass({

diff --git a/demo/example/react-line-hover-tooltip/graph.jsx b/demo/example/react-line-hover-tooltip/graph.jsx
@@ -6,7 +6,7 @@ var yako = require('../../../src');
 var Line = require('../../../src/addons/react-components/line');
 var svg = yako.svg;
 
-var PureRenderMixin = React.addons.PureRenderMixin;
+var PureRenderMixin = require('react-addons-pure-render-mixin');
 
 /* Tool Tip Component */
 var ToolTip = React.createClass({

diff --git a/dev/base.jsx b/dev/base.jsx
@@ -4,7 +4,7 @@
  */
 var React = require('react');
 var Spark = require('../addons/react-components/spark');
-var PureRenderMixin = React.addons.PureRenderMixin;
+var PureRenderMixin = require('react-addons-pure-render-mixin');
 
 var ToolTip = React.createClass({
   mixin: [PureRenderMixin],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yako",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "description": "A minimal and light weight graph",
   "repository": {
     "type": "git",
@@ -38,7 +38,8 @@
   "readmeFilename": "README.md",
   "devDependencies": {
     "autoprefixer-loader": "^3.1.0",
-    "babel-loader": "^5.0.0",
+    "babel-core": "^5.8.22",
+    "babel-loader": "^5.3.2",
     "chai": "^3.3.0",
     "coveralls": "^2.11.2",
     "del": "^2.0.2",
@@ -61,16 +62,14 @@
     "lodash": "^3.5.0",
     "mocha": "^2.1.0",
     "mocha-lcov-reporter": "1.0.0",
-    "react": "^0.13.3",
+    "react": "^15.0.0",
+    "react-addons-pure-render-mixin": "^15.2.1",
+    "react-dom": "^15.0.0",
     "react-hot-loader": "^1.2.3",
     "style-loader": "^0.12.4",
-    "webpack": "^1.5.3",
+    "webpack": "^1.11.0",
     "webpack-dev-middleware": "^1.0.11",
-    "webpack-dev-server": "^1.7.0",
-    "babel-core": "^5.8.22",
-    "babel-loader": "^5.3.2",
-    "webpack": "^1.11.0"
+    "webpack-dev-server": "^1.7.0"
   },
-  "dependencies": {
-  }
+  "dependencies": {}
 }
diff --git a/src/addons/react-components/bubble/bubble-point.jsx b/src/addons/react-components/bubble/bubble-point.jsx
@@ -1,7 +1,7 @@
-var React = require('react/addons');
+var React = require('react');
 var EventsClass = require('../../Events');
 var cssPrefix = ['Moz','Webkit','ms','O'];
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+var PureRenderMixin = require('react-addons-pure-render-mixin');
 var GraphPureRenderMixin = require('../utils/GraphPureRenderMixin');
 
 /* Bubble Component */

diff --git a/src/addons/react-components/bubble/bubble-scatter.jsx b/src/addons/react-components/bubble/bubble-scatter.jsx
@@ -1,7 +1,7 @@
-var React = require('react/addons');
+var React = require('react');
 var EventsClass = require('../../Events');
 var cssPrefix = ['Moz','Webkit','ms','O'];
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+var PureRenderMixin = require('react-addons-pure-render-mixin');
 var GraphPureRenderMixin = require('../utils/GraphPureRenderMixin');
 
 /* Bubble Component */

diff --git a/src/addons/react-components/event-ready/spark-event.js b/src/addons/react-components/event-ready/spark-event.js
@@ -1,6 +1,6 @@
 var React = require('react');
 var Label = require('../../Label');
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+var PureRenderMixin = require('react-addons-pure-render-mixin');
 
 module.exports = React.createClass({
     displayName: 'YakoSparkEventHandler',

diff --git a/src/addons/react-components/legend.jsx b/src/addons/react-components/legend.jsx
@@ -1,5 +1,5 @@
 var React = require('react');
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+var PureRenderMixin = require('react-addons-pure-render-mixin');
 var extend = require('../../utils/extend');
 
 module.exports = React.createClass({