From 0c7a1b2f4158bc5d5c77c7709bd9b2e7142bb2cd Mon Sep 17 00:00:00 2001
From: ido <idok@wix.com>
Date: Wed, 30 Dec 2015 15:21:20 +0200
Subject: [PATCH] babel 6

---
 .babelrc              | 16 ++-------------
 package.json          | 46 +++++++++++++++++++++++--------------------
 src/App.js            |  6 ++++--
 webpack.config.dev.js |  8 +++++---
 4 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/.babelrc b/.babelrc
index a3a2c1d..1d3c91a 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,20 +1,8 @@
 {
-  "stage": 0,
+  "presets": ["react", "es2015"],
   "env": {
     "development": {
-      "plugins": ["react-transform"],
-      "extra": {
-        "react-transform": {
-          "transforms": [{
-            "transform": "react-transform-hmr",
-            "imports": ["react"],
-            "locals": ["module"]
-          }, {
-            "transform": "react-transform-catch-errors",
-            "imports": ["react", "redbox-react"]
-          }]
-        }
-      }
+      "presets": ["react-hmre"]
     }
   }
 }
diff --git a/package.json b/package.json
index 5ef9f92..3dab10f 100644
--- a/package.json
+++ b/package.json
@@ -34,32 +34,36 @@
   },
   "homepage": "https://github.com/wix/react-templates-transform-boilerplate",
   "devDependencies": {
-    "babel-core": "^5.4.7",
-    "babel-eslint": "^3.1.9",
-    "babel-loader": "^5.1.2",
-    "babel-plugin-react-transform": "^1.1.1",
-    "css-loader": "^0.23.0",
-    "eslint": "^1.3.1",
-    "eslint-plugin-react": "^2.3.0",
+    "babel-core": "^6.3.26",
+    "babel-eslint": "^5.0.0-beta6",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-react-transform": "^2.0.0",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-react-hmre": "^1.0.0",
+    "css-loader": "^0.23.1",
+    "eslint": "^1.10.3",
+    "eslint-plugin-react": "^3.13.1",
     "express": "^4.13.3",
-    "file-loader": "^0.8.4",
+    "file-loader": "^0.8.5",
     "node-sass": "^3.4.2",
-    "react-addons-linked-state-mixin": "^0.14.2",
-    "react-templates": "^0.2.1",
-    "react-templates-loader": "^0.2.0",
-    "react-transform-catch-errors": "^1.0.0",
+    "react-addons-linked-state-mixin": "^0.14.5",
+    "react-templates": "^0.3.0",
+    "react-templates-loader": "^0.3.1",
+    "react-transform-catch-errors": "^1.0.1",
     "react-transform-hmr": "^1.0.0",
-    "redbox-react": "^1.0.1",
-    "rimraf": "^2.4.3",
-    "sass-loader": "^3.1.1",
+    "redbox-react": "^1.2.0",
+    "rimraf": "^2.5.0",
+    "sass-loader": "^3.1.2",
     "style-loader": "^0.13.0",
-    "url-loader": "^0.5.6",
-    "webpack": "^1.9.6",
-    "webpack-dev-middleware": "^1.2.0",
-    "webpack-hot-middleware": "^2.0.0"
+    "url-loader": "^0.5.7",
+    "webpack": "^1.12.9",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "eventsource-polyfill": "^0.9.6"
   },
   "dependencies": {
-    "react": "^0.14.0",
-    "react-dom": "^0.14.0"
+    "react": "^0.14.5",
+    "react-dom": "^0.14.5"
   }
 }
diff --git a/src/App.js b/src/App.js
index 5bf0031..320f2a2 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,5 +2,7 @@ import React, { Component } from 'react';
 import template from './App.rt';
 
 export class App extends Component {
-  render = template
-}
\ No newline at end of file
+  render() {
+      return template()
+  }
+}
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index 5ac0017..6bbca18 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -2,8 +2,10 @@ var path = require('path');
 var webpack = require('webpack');
 
 module.exports = {
-  devtool: 'eval',
+  devtool: 'cheap-module-eval-source-map',
+  //devtool: 'eval',
   entry: [
+    'eventsource-polyfill', // necessary for hot reloading with IE
     'webpack-hot-middleware/client',
     './src/index'
   ],
@@ -18,12 +20,12 @@ module.exports = {
   ],
   module: {
     loaders: [
-      {test: /\.js$/, loaders: ['babel'], include: path.join(__dirname, 'src')},
+        {test: /\.js$/, loaders: ['babel'], include: path.join(__dirname, 'src')},
         {test: /\.less$/, loader: 'style-loader!css-loader!less-loader'}, // use ! to chain loaders
         {test: /\.css$/, loader: 'style-loader!css-loader'},
         {test: /\.scss$/, loader: 'style!css!sass'},
         {test: /\.(png|jpg)$/, loader: 'url-loader?limit=8192'}, // inline base64 URLs for <=8k images, direct URLs for the rest
-        {test: /\.rt/, loaders: ['react-templates-loader?targetVersion=0.14.0'], include: path.join(__dirname, 'src')}
+        {test: /\.rt$/, loaders: ['react-templates-loader?targetVersion=0.14.0'], include: path.join(__dirname, 'src')}
     ]
   }
 };