diff --git a/.babelrc b/.babelrc index a3a2c1d4..1d3c91a6 100644 --- a/.babelrc +++ b/.babelrc @@ -1,20 +1,8 @@ { - "stage": 0, + "presets": ["react", "es2015"], "env": { "development": { - "plugins": ["react-transform"], - "extra": { - "react-transform": { - "transforms": [{ - "transform": "react-transform-hmr", - "imports": ["react"], - "locals": ["module"] - }, { - "transform": "react-transform-catch-errors", - "imports": ["react", "redbox-react"] - }] - } - } + "presets": ["react-hmre"] } } } diff --git a/package.json b/package.json index d436f294..e6e9f757 100644 --- a/package.json +++ b/package.json @@ -45,23 +45,25 @@ "superagent-promise": "^1.0.3" }, "devDependencies": { - "babel-loader": "^5.3.2", - "babel-plugin-react-transform": "^1.1.0", + "babel-core": "^6.3.26", + "babel-loader": "^6.2.0", + "babel-plugin-react-transform": "^2.0.0", + "babel-preset-es2015": "^6.3.13", + "babel-preset-react": "^6.3.13", + "babel-preset-react-hmre": "^1.0.1", "css-loader": "^0.19.0", "electron-packager": "^5.1.0", "electron-prebuilt": "^0.35.1", "electron-release": "^2.2.0", "grunt": "^0.4.5", "grunt-electron-installer": "^1.2.0", + "history": "^1.17.0", "nib": "^1.1.0", - "react": "^0.14.0", - "react-dom": "^0.14.0", - "react-redux": "^4.0.0", + "react": "^0.14.3", + "react-dom": "^0.14.3", + "react-redux": "^4.0.6", "react-router": "^1.0.0-rc1", - "react-transform-catch-errors": "^1.0.0", - "react-transform-hmr": "^1.0.1", - "redbox-react": "^1.2.0", - "redux": "^3.0.2", + "redux": "^3.0.5", "standard": "^5.3.1", "style-loader": "^0.12.4", "stylus": "^0.52.4", diff --git a/webpack.config.js b/webpack.config.js index 29c5ddc9..5176d0ec 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,8 +1,6 @@ const skeleton = require('./webpack-skeleton') const webpack = require('webpack') const path = require('path') -const JsonpTemplatePlugin = webpack.JsonpTemplatePlugin -const FunctionModulePlugin = require('webpack/lib/FunctionModulePlugin') var config = Object.assign({}, skeleton, { module: { @@ -30,12 +28,5 @@ var config = Object.assign({}, skeleton, { devtool: 'eval-source-map' }) -config.target = function renderer (compiler) { - compiler.apply( - new JsonpTemplatePlugin(config.output), - new FunctionModulePlugin(config.output) - ) -} - module.exports = config