diff --git a/.babelrc b/.babelrc index 15d27ad9b4..8eb3668dd1 100644 --- 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 index b110a8d13a..7104895017 100644 --- 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 index 8d134df252..12bcb25c37 100644 --- 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 index 49beb20fb8..561be0f8af 100644 --- a/examples/async/package.json +++ b/examples/async/package.json @@ -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 index b110a8d13a..7104895017 100644 --- 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 index 134c195db7..e7c00fc43f 100644 --- 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 index b110a8d13a..7104895017 100644 --- a/examples/real-world/.babelrc +++ b/examples/real-world/.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/real-world/index.js b/examples/real-world/index.js index bad6387fc6..3a8de9d2ef 100644 --- 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 index 0e0e11c2c5..5108527348 100644 --- 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 new file mode 100644 index 0000000000..7104895017 --- /dev/null +++ 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 index e45da48dda..5fbd925047 100644 --- 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 index b110a8d13a..a23b5c9953 100644 --- 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 index dcc36c5b6b..988cc99ccd 100644 --- 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 index cb83e3b5b0..6fb2c26638 100644 --- 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 index b110a8d13a..7104895017 100644 --- 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 index 7cefb7ffce..08e4a3f592 100644 --- 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 new file mode 100644 index 0000000000..dfc45b13da --- /dev/null +++ b/examples/universal/.babelrc @@ -0,0 +1,3 @@ +{ + presets: ["es2015","stage-2", "react"] +} \ No newline at end of file diff --git a/examples/universal/client/index.js b/examples/universal/client/index.js index d7137099c6..16d2b5cd53 100644 --- 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 index 767e28e89a..8c8bc92232 100644 --- 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 index 44fee93658..ef4fa33355 100644 --- 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') diff --git a/examples/universal/webpack.config.js b/examples/universal/webpack.config.js index 13318161f3..1710fabd40 100644 --- a/examples/universal/webpack.config.js +++ b/examples/universal/webpack.config.js @@ -25,27 +25,17 @@ module.exports = { exclude: /node_modules/, include: __dirname, query: { - optional: [ 'runtime' ], - stage: 2, - env: { - development: { - plugins: [ - 'react-transform' - ], - extra: { - 'react-transform': { - transforms: [ - { - transform: 'react-transform-hmr', - imports: [ 'react' ], - locals: [ 'module' ] - } - ] - } - } + plugins: [ + [ + "react-transform", { + transforms: [{ + transform: "react-transform-hmr", + imports: ["react"], + locals: ["module"] + }] } - } - } + ] + ]} } ] } @@ -63,6 +53,6 @@ if (fs.existsSync(reduxSrc) && fs.existsSync(reduxNodeModules)) { module.exports.module.loaders.push({ test: /\.js$/, loaders: [ 'babel' ], - include: reduxSrc + include: reduxSrc, }) } diff --git a/package.json b/package.json index 552a876290..6c0b90b0bf 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "scripts": { "clean": "rimraf lib dist coverage", "lint": "eslint src test examples", - "test": "mocha --compilers js:babel/register --recursive", + "test": "mocha --compilers js:babel-register --recursive", "test:watch": "npm test -- --watch", "test:cov": "babel-node $(npm bin)/isparta cover $(npm bin)/_mocha -- --recursive", "test:examples": "babel-node examples/testAll.js", @@ -59,16 +59,19 @@ }, "homepage": "http://rackt.github.io/redux", "devDependencies": { - "babel": "^5.5.8", - "babel-core": "^5.6.18", - "babel-eslint": "^4.1.0", - "babel-loader": "^5.1.4", + "babel-cli": "^6.3.15", + "babel-core": "^6.3.15", + "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-register": "^6.3.13", "eslint": "^1.7.1", "eslint-config-rackt": "1.0.0", "eslint-plugin-react": "^3.6.3", "expect": "^1.8.0", "gitbook-cli": "^0.3.4", - "isparta": "^3.0.3", + "isparta": "^4.0.0", "mocha": "^2.2.5", "rimraf": "^2.3.4", "webpack": "^1.9.6"