upgrade to babel6

reduxjs · Dec 20, 2015 · 7f1e4f2 · 7f1e4f2
1 parent d1c8d87
commit 7f1e4f2
Show file tree

Hide file tree

Showing 22 changed files with 148 additions and 127 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,3 @@
 {
-  "stage": 0,
-  "loose": "all"
+  "presets": ["stage-0", "es2015-loose"]
 }
diff --git a/examples/async/.babelrc b/examples/async/.babelrc
@@ -1,19 +1,18 @@
 {
-  "stage": 2,
+  "presets": ["es2015","stage-2", "react"],
   "env": {
     "development": {
       "plugins": [
-        "react-transform"
-      ],
-      "extra": {
-        "react-transform": {
-          "transforms": [{
-            "transform": "react-transform-hmr",
-            "imports": ["react"],
-            "locals":  ["module"]
-          }]
-        }
-      }
+        [
+          "react-transform", {
+            "transforms": [{
+              "transform": "react-transform-hmr",
+              "imports": ["react"],
+              "locals": ["module"]
+            }]
+          }
+        ]
+      ]
     }
   }
 }
diff --git a/examples/async/index.js b/examples/async/index.js
@@ -1,4 +1,4 @@
-import 'babel-core/polyfill'
+import 'babel-polyfill'
 import React from 'react'
 import { render } from 'react-dom'
 import { Provider } from 'react-redux'

diff --git a/examples/async/package.json b/examples/async/package.json
@@ -25,7 +25,7 @@
     "url": "https://github.com/rackt/redux/issues"
   },
   "homepage": "http://rackt.github.io/redux",
-  "dependencies": {
+  "dependencies": {    
     "isomorphic-fetch": "^2.1.1",
     "react": "^0.14.0",
     "react-dom": "^0.14.0",
@@ -35,13 +35,17 @@
     "redux-thunk": "^0.1.0"
   },
   "devDependencies": {
-    "babel-core": "^5.6.18",
-    "babel-loader": "^5.1.4",
-    "babel-plugin-react-transform": "^1.1.0",
+    "babel-polyfill": "^6.3.14",
+    "babel-core": "^6.3.15",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-react-transform": "^2.0.0-beta1",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-2": "^6.3.13",
     "expect": "^1.6.0",
     "express": "^4.13.3",
     "node-libs-browser": "^0.5.2",
-    "react-transform-hmr": "^1.0.0",
+    "react-transform-hmr": "^1.0.1",
     "webpack": "^1.9.11",
     "webpack-dev-middleware": "^1.2.0",
     "webpack-hot-middleware": "^2.2.0"

diff --git a/examples/counter/.babelrc b/examples/counter/.babelrc
@@ -1,19 +1,18 @@
 {
-  "stage": 2,
+  "presets": ["es2015","stage-2", "react"],
   "env": {
     "development": {
       "plugins": [
-        "react-transform"
-      ],
-      "extra": {
-        "react-transform": {
-          "transforms": [{
-            "transform": "react-transform-hmr",
-            "imports": ["react"],
-            "locals":  ["module"]
-          }]
-        }
-      }
+        [
+          "react-transform", {
+            "transforms": [{
+              "transform": "react-transform-hmr",
+              "imports": ["react"],
+              "locals": ["module"]
+            }]
+          }
+        ]
+      ]
     }
   }
 }
diff --git a/examples/counter/package.json b/examples/counter/package.json
@@ -24,9 +24,12 @@
     "redux-thunk": "^0.1.0"
   },
   "devDependencies": {
-    "babel-core": "^5.6.18",
-    "babel-loader": "^5.1.4",
-    "babel-plugin-react-transform": "^1.1.0",
+    "babel-core": "^6.3.15",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-react-transform": "^2.0.0-beta1",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-2": "^6.3.13",
     "expect": "^1.6.0",
     "express": "^4.13.3",
     "jsdom": "^5.6.1",

diff --git a/examples/real-world/.babelrc b/examples/real-world/.babelrc
@@ -1,19 +1,20 @@
 {
-  "stage": 2,
+  "presets": ["es2015","stage-2", "react"],
   "env": {
     "development": {
       "plugins": [
-        "react-transform"
-      ],
-      "extra": {
-        "react-transform": {
-          "transforms": [{
-            "transform": "react-transform-hmr",
-            "imports": ["react"],
-            "locals":  ["module"]
-          }]
-        }
-      }
+        [
+          "react-transform", {
+            "transforms": [{
+              "transform": "react-transform-hmr",
+              "imports": ["react"],
+              "locals": ["module"]
+            }]
+          }
+        ]
+      ]
     }
   }
-}
+
+
+}
diff --git a/examples/real-world/index.js b/examples/real-world/index.js
@@ -1,4 +1,4 @@
-import 'babel-core/polyfill'
+import 'babel-polyfill'
 import React from 'react'
 import { render } from 'react-dom'
 import Root from './containers/Root'

diff --git a/examples/real-world/package.json b/examples/real-world/package.json
@@ -30,9 +30,13 @@
     "redux-thunk": "^0.1.0"
   },
   "devDependencies": {
-    "babel-core": "^5.6.18",
-    "babel-loader": "^5.1.4",
-    "babel-plugin-react-transform": "^1.1.0",
+    "babel-polyfill": "^6.3.14",
+    "babel-core": "^6.3.15",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-react-transform": "^2.0.0-beta1",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-2": "^6.3.13",
     "concurrently": "^0.1.1",
     "express": "^4.13.3",
     "react-transform-hmr": "^1.0.0",

diff --git a/examples/shopping-cart/.babelrc b/examples/shopping-cart/.babelrc
@@ -0,0 +1,18 @@
+{
+  "presets": ["es2015","stage-2", "react"],
+  "env": {
+    "development": {
+      "plugins": [
+        [
+          "react-transform", {
+            "transforms": [{
+              "transform": "react-transform-hmr",
+              "imports": ["react"],
+              "locals": ["module"]
+            }]
+          }
+        ]
+      ]
+    }
+  }
+}
diff --git a/examples/shopping-cart/package.json b/examples/shopping-cart/package.json
@@ -22,11 +22,15 @@
     "redux-thunk": "^1.0.0"
   },
   "devDependencies": {
-    "babel-core": "^5.6.18",
-    "babel-loader": "^5.1.4",
-    "babel-plugin-react-transform": "^1.0.3",
+    "babel-core": "^6.3.15",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-react-transform": "^2.0.0-beta1",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-2": "^6.3.13",
     "express": "^4.13.3",
     "json-loader": "^0.5.3",
+    "react-transform-hmr": "^1.0.0",
     "redux-logger": "^2.0.1",
     "webpack": "^1.9.11",
     "webpack-dev-middleware": "^1.2.0",

diff --git a/examples/todomvc/.babelrc b/examples/todomvc/.babelrc
@@ -1,19 +1,3 @@
 {
-  "stage": 2,
-  "env": {
-    "development": {
-      "plugins": [
-        "react-transform"
-      ],
-      "extra": {
-        "react-transform": {
-          "transforms": [{
-            "transform": "react-transform-hmr",
-            "imports": ["react"],
-            "locals":  ["module"]
-          }]
-        }
-      }
-    }
-  }
+  "presets": ["es2015","stage-2", "react"]
 }
diff --git a/examples/todomvc/index.js b/examples/todomvc/index.js
@@ -1,4 +1,4 @@
-import 'babel-core/polyfill'
+import 'babel-polyfill'
 import React from 'react'
 import { render } from 'react-dom'
 import { Provider } from 'react-redux'

diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json
@@ -24,9 +24,13 @@
     "redux": "^3.0.0"
   },
   "devDependencies": {
-    "babel-core": "^5.6.18",
-    "babel-loader": "^5.1.4",
-    "babel-plugin-react-transform": "^1.1.0",
+    "babel-polyfill": "^6.3.14",
+    "babel-core": "^6.3.15",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-react-transform": "^2.0.0-beta1",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-2": "^6.3.13",
     "expect": "^1.8.0",
     "express": "^4.13.3",
     "jsdom": "^5.6.1",

diff --git a/examples/todos-with-undo/.babelrc b/examples/todos-with-undo/.babelrc
@@ -1,19 +1,18 @@
 {
-  "stage": 2,
+  "presets": ["es2015","stage-2", "react"],
   "env": {
     "development": {
       "plugins": [
-        "react-transform"
-      ],
-      "extra": {
-        "react-transform": {
-          "transforms": [{
-            "transform": "react-transform-hmr",
-            "imports": ["react"],
-            "locals":  ["module"]
-          }]
-        }
-      }
+        [
+          "react-transform", {
+            "transforms": [{
+              "transform": "react-transform-hmr",
+              "imports": ["react"],
+              "locals": ["module"]
+            }]
+          }
+        ]
+      ]
     }
   }
 }
diff --git a/examples/todos-with-undo/package.json b/examples/todos-with-undo/package.json
@@ -23,9 +23,12 @@
     "redux-undo": "^0.5.0"
   },
   "devDependencies": {
-    "babel-core": "^5.6.18",
-    "babel-loader": "^5.1.4",
-    "babel-plugin-react-transform": "^1.1.0",
+    "babel-core": "^6.3.15",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-react-transform": "^2.0.0-beta1",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-2": "^6.3.13",
     "expect": "^1.6.0",
     "express": "^4.13.3",
     "node-libs-browser": "^0.5.2",

diff --git a/examples/universal/.babelrc b/examples/universal/.babelrc
@@ -0,0 +1,3 @@
+{
+  presets: ["es2015","stage-2", "react"]  
+}
diff --git a/examples/universal/client/index.js b/examples/universal/client/index.js
@@ -1,4 +1,4 @@
-import 'babel-core/polyfill'
+import 'babel-polyfill'
 import React from 'react'
 import { render } from 'react-dom'
 import { Provider } from 'react-redux'

diff --git a/examples/universal/package.json b/examples/universal/package.json
@@ -15,7 +15,7 @@
   },
   "homepage": "http://rackt.github.io/redux",
   "dependencies": {
-    "babel": "^5.8.21",
+    "babel": "^6.3.13",
     "express": "^4.13.3",
     "qs": "^4.0.0",
     "react": "^0.14.0",
@@ -26,13 +26,17 @@
     "serve-static": "^1.10.0"
   },
   "devDependencies": {
-    "babel-core": "^5.8.22",
-    "babel-loader": "^5.3.2",
-    "babel-plugin-react-transform": "^1.1.0",
-    "babel-runtime": "^5.8.20",
+    "babel-core": "^6.3.15",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-react-transform": "^2.0.0-beta1",
+    "babel-polyfill": "^6.3.14",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-2": "^6.3.13",
+    "babel-runtime": "^6.3.13",
     "react-transform-hmr": "^1.0.0",
     "webpack": "^1.11.0",
-    "webpack-dev-middleware": "^1.2.0",
-    "webpack-hot-middleware": "^2.2.0"
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0"
   }
 }
diff --git a/examples/universal/server/index.js b/examples/universal/server/index.js
@@ -1,2 +1,2 @@
-require('babel/register')
+require('babel-core/register')
 require('./server')