WIP

.babelrc

@@ -1,20 +1,23 @@
 {
-  "stage": 0,
+  "presets": ["es2015", "react", "stage-0"],
   "env": {
     "browser": {
       "plugins": ["react-transform"],
       "extra": {
         "react-transform": {
-          "transforms": [{
-            "transform": "react-transform-hmr",
-            "imports": ["react"],
-            "locals": ["module"]
-          }, {
-            "transform": "react-transform-catch-errors",
-            "imports": ["react", "redbox-react"]
-          }]
+          "transforms": [
+            {
+              "transform": "react-transform-hmr",
+              "imports": ["react"],
+              "locals": ["module"]
+            },
+            {
+              "transform": "react-transform-catch-errors",
+              "imports": ["react", "redbox-react"]
+            }
+          ]
         }
       }
     }
   }
- }
+}

app/index.js

@@ -1,5 +1,5 @@
 // Browser ES6 Polyfill
-require('babel/polyfill');
+require('babel-polyfill');
 
 // Start application
 require('./main');

package.json

@@ -20,7 +20,6 @@
   "license": "MIT",
   "dependencies": {
     "alt": "^0.17.1",
-    "babel": "^5.8.3",
     "blocked": "^1.1.0",
     "classnames": "^2.1.3",
     "cookies-js": "^1.2.1",
@@ -52,11 +51,16 @@
   },
   "devDependencies": {
     "autoprefixer": "^6.0.3",
-    "babel-core": "^5.8.3",
+    "babel": "^6.0.15",
+    "babel-cli": "^6.1.1",
+    "babel-core": "^6.0.20",
     "babel-eslint": "^4.0.5",
-    "babel-loader": "^5.3.2",
+    "babel-loader": "^6.0.1",
     "babel-plugin-react-transform": "^1.0.3",
-    "babel-runtime": "^5.8.24",
+    "babel-polyfill": "^6.0.16",
+    "babel-preset-es2015": "^6.0.15",
+    "babel-preset-react": "^6.0.15",
+    "babel-preset-stage-0": "^6.0.15",
     "browser-sync": "^2.8.0",
     "css-loader": "^0.21.0",
     "del": "^2.0.2",

server/index.js

@@ -8,7 +8,7 @@ process.env.NODE_PATH = 'app';
 require('module').Module._initPaths();
 
 // Install `babel` hook for ES6
-require('babel/register');
+require('babel-core/register');
 
 // Load Intl polyfill
 require('utils/intl-polyfill')(require('./config/init').locales);