From 5f9406d5621671cd71c4c3ce48e86183fbacbd27 Mon Sep 17 00:00:00 2001
From: lukasmartinelli <me@lukasmartinelli.ch>
Date: Wed, 23 Nov 2016 16:04:00 +0100
Subject: [PATCH] Upgrade React to 15.4

---
 package.json       | 12 ++++++++----
 src/index.jsx      |  5 +++--
 webpack.loaders.js |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index b9632e91..4ae35def 100644
--- a/package.json
+++ b/package.json
@@ -24,10 +24,10 @@
     "mapbox-gl": "^0.24.0",
     "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#83b1a3e5837d785af582efd5ed1a212f2df6a4ae",
     "randomcolor": "^0.4.4",
-    "react": "^15.3.0",
-    "react-addons-pure-render-mixin": "15.3.1",
+    "react": "^15.4.0",
+    "react-addons-pure-render-mixin": "^15.4.0",
     "react-collapse": "^2.3.3",
-    "react-dom": "15.3.0",
+    "react-dom": "^15.4.0",
     "react-file-reader-input": "^1.1.0",
     "react-height": "^2.1.1",
     "react-icons": "^2.2.1",
@@ -88,9 +88,13 @@
     "html-webpack-plugin": "^2.22.0",
     "json-loader": "^0.5.4",
     "karma": "^1.3.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-mocha": "^1.3.0",
     "karma-webpack": "^1.8.0",
+    "mocha": "^3.1.2",
+    "mocha-loader": "^1.0.0",
     "node-sass": "^3.9.2",
-    "react-hot-loader": "1.3.0",
+    "react-hot-loader": "^3.0.0-beta.6",
     "sass-loader": "^4.0.1",
     "style-loader": "0.13.1",
     "transform-loader": "^0.2.3",
diff --git a/src/index.jsx b/src/index.jsx
index 5aa7e017..14d4f4ad 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { render } from 'react-dom';
+import ReactDOM from 'react-dom';
+
 import App from './app.jsx';
 
-render(<App/>, document.querySelector("#app"));
+ReactDOM.render(<App/>, document.querySelector("#app"));
diff --git a/webpack.loaders.js b/webpack.loaders.js
index 2105f304..75fd2329 100644
--- a/webpack.loaders.js
+++ b/webpack.loaders.js
@@ -2,7 +2,7 @@ module.exports = [
 	{
 		test: /\.jsx?$/,
 		exclude: /(node_modules|bower_components|public)/,
-		loaders: ['react-hot']
+		loaders: ['react-hot-loader/webpack']
 	},
 	{
 		test: /\.jsx?$/,