Merge branch 'heldr-babel6'

Author: roylee0704

.babelrc

@@ -1,4 +1,8 @@
 {
-  "stage": 0,
-  "loose": "all"
+  "presets": ["es2015-loose", "stage-0", "react"],
+  "env": {
+    "development": {
+      "presets": ["react-hmre"]
+    }
+  }
 }

.nvmrc

@@ -1 +1 @@
-4.2.2
+stable

README.md

@@ -1,4 +1,4 @@
-# react-flexbox-grid 
+# react-flexbox-grid
 [![npm version](https://badge.fury.io/js/react-flexbox-grid.svg)](https://badge.fury.io/js/react-flexbox-grid)
 [![Build Status](https://travis-ci.org/roylee0704/react-flexbox-grid.svg)](https://travis-ci.org/roylee0704/react-flexbox-grid)
 [![NPM Status](http://img.shields.io/npm/dm/react-flexbox-grid.svg?style=flat-square)](https://www.npmjs.org/package/react-flexbox-grid)

doc/.babelrc

@@ -0,0 +1,8 @@
+{
+  "presets": ["es2015-loose", "stage-0", "react"],
+  "env": {
+    "development": {
+      "presets": ["react-hmre"]
+    }
+  }
+}

doc/app/index.jsx

@@ -1,3 +1,4 @@
+import 'babel-polyfill';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Home from './components/home';

doc/package.json

@@ -26,11 +26,16 @@
   },
   "devDependencies": {
     "autoprefixer": "^6.0.3",
-    "babel": "^5.8.23",
-    "babel-core": "^5.8.23",
-    "babel-eslint": "^4.1.3",
-    "babel-loader": "^5.3.2",
-    "babel-plugin-react-transform": "^1.1.1",
+    "babel-cli": "^6.4.0",
+    "babel-core": "^6.4.0",
+    "babel-eslint": "^5.0.0-beta6",
+    "babel-loader": "^6.2.1",
+    "babel-plugin-react-transform": "^2.0.0",
+    "babel-polyfill": "^6.3.14",
+    "babel-preset-es2015-loose": "^6.1.4",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-react-hmre": "^1.0.1",
+    "babel-preset-stage-0": "^6.3.13",
     "cross-env": "^1.0.4",
     "css-loader": "^0.21.0",
     "eslint-config-airbnb": "^1.0.0",
@@ -46,8 +51,6 @@
     "node-sass": "^3.3.3",
     "postcss-loader": "^0.7.0",
     "raw-loader": "^0.5.1",
-    "react-transform-catch-errors": "^1.0.0",
-    "react-transform-hmr": "^1.0.1",
     "redbox-react": "^1.1.1",
     "sass-loader": "^3.0.0",
     "style-loader": "^0.13.0",

karma.conf.js

@@ -7,7 +7,7 @@ module.exports = function karmaConfig(config) {
     frameworks: ['mocha'],
     files: [
       './node_modules/phantomjs-polyfill/bind-polyfill.js',
-      './node_modules/babel-core/browser-polyfill.js',
+      './node_modules/babel-polyfill/browser.js',
       'tests.webpack.js'
     ],
     reporters: ['dots'],

package.json

@@ -21,11 +21,16 @@
   ],
   "devDependencies": {
     "autoprefixer": "^6.0.3",
-    "babel": "^5.8.23",
-    "babel-core": "^5.8.23",
-    "babel-eslint": "^4.1.5",
-    "babel-loader": "^5.3.2",
-    "babel-plugin-react-transform": "^1.1.1",
+    "babel-cli": "^6.4.0",
+    "babel-core": "^6.4.0",
+    "babel-eslint": "^5.0.0-beta6",
+    "babel-loader": "^6.2.1",
+    "babel-plugin-react-transform": "^2.0.0",
+    "babel-polyfill": "^6.3.14",
+    "babel-preset-es2015-loose": "^6.1.4",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-react-hmre": "^1.0.1",
+    "babel-preset-stage-0": "^6.3.13",
     "classnames": ">=2.1.2",
     "cpx": "^1.2.1",
     "cross-env": "^1.0.4",
@@ -54,8 +59,6 @@
     "react-addons-test-utils": "^0.14.0",
     "react-dom": "^0.14.3",
     "react-hot-loader": "^1.3.0",
-    "react-transform-catch-errors": "^1.0.0",
-    "react-transform-hmr": "^1.0.1",
     "redbox-react": "^1.1.1",
     "rimraf": "^2.4.4",
     "sass-loader": "^3.1.2",
@@ -65,8 +68,8 @@
     "webpack-hot-middleware": "^2.4.1"
   },
   "scripts": {
-    "babel": "babel ./src --out-dir ./lib",
-    "build": "cross-env NODE_ENV=production npm run babel && npm run sass",
+    "compile": "./node_modules/.bin/babel -d ./lib ./src",
+    "build": "cross-env NODE_ENV=production npm run compile && npm run sass",
     "clean": "rimraf ./lib",
     "lint": "eslint src test",
     "patch": "bumped release patch",
@@ -81,6 +84,7 @@
   "license": "MIT",
   "peerDependencies": {
     "flexboxgrid": "^6.3.0",
+    "babel-polyfill": ">=6.0.0",
     "react": "^0.14.3"
   }
 }