Merge pull request #17 from colinmeinke/master

Update to Babel 6

Author: chibicode

.babelrc

@@ -1,4 +1,4 @@
 {
-  "stage": 0,
-  "loose": "all"
+  "plugins": ["transform-decorators-legacy"],
+  "presets": ["es2015-loose", "stage-0", "react"]
 }

.eslintrc

@@ -12,6 +12,7 @@
     "no-console": 0,
     // Temporarily disabled due to babel-eslint issues:
     "block-scoped-var": 0,
+    "no-dupe-keys": 0,
     "padded-blocks": 0,
     "no-param-reassign": 0,
   },

examples/.babelrc

@@ -1,3 +1,3 @@
 {
-  "stage": 0
-}
+  "presets": ["es2015-loose", "stage-0", "react"]
+}

examples/package.json

@@ -28,9 +28,12 @@
   },
   "homepage": "https://github.com/gaearon/react-hot-boilerplate",
   "devDependencies": {
-    "babel-core": "^5.4.7",
-    "babel-eslint": "^3.1.9",
-    "babel-loader": "^5.1.2",
+    "babel-core": "^6.3.17",
+    "babel-eslint": "^4.1.6",
+    "babel-loader": "^6.2.0",
+    "babel-preset-es2015-loose": "^6.1.3",
+    "babel-preset-stage-0": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
     "eslint-plugin-react": "^2.3.0",
     "react-hot-loader": "^1.2.7",
     "webpack": "^1.9.6",

package.json

@@ -7,8 +7,8 @@
     "clean": "rimraf lib",
     "build": "babel src --optional runtime --out-dir lib",
     "lint": "eslint src test examples",
-    "test": "NODE_ENV=test mocha --compilers js:babel/register --recursive",
-    "test:watch": "NODE_ENV=test mocha --compilers js:babel/register --recursive --watch",
+    "test": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive",
+    "test:watch": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive --watch",
     "test:cov": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha -- --recursive",
     "prepublish": "npm run lint && npm run test && npm run clean && npm run build"
   },
@@ -31,10 +31,14 @@
   },
   "homepage": "https://github.com/chibicode/react-json-tree",
   "devDependencies": {
-    "babel": "^5.5.8",
-    "babel-core": "^5.6.18",
-    "babel-eslint": "^3.1.15",
-    "babel-loader": "^5.1.4",
+    "babel-cli": "^6.3.17",
+    "babel-core": "^6.3.17",
+    "babel-eslint": "^4.1.6",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-transform-decorators-legacy": "^1.3.3",
+    "babel-preset-es2015-loose": "^6.1.3",
+    "babel-preset-stage-0": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
     "eslint": "^0.23",
     "eslint-config-airbnb": "0.0.6",
     "eslint-plugin-react": "^2.3.0",
@@ -47,7 +51,7 @@
     "react": ">=0.13.1 || >=0.14.0-beta3"
   },
   "dependencies": {
-    "babel-runtime": "^5.8.20",
+    "babel-runtime": "^6.3.13",
     "react-mixin": "^1.7.0"
   }
 }