Upgrade to react-transform-hmr

Requires removing the transforms from running on server
erikras · Sep 22, 2015 · 48eb512 · 48eb512
1 parent 472dc64
commit 48eb512
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/.babelrc b/.babelrc
@@ -4,20 +4,5 @@
   "loose": "all",
   "plugins": [
     "typecheck"
-  ],
-  "env": {
-    "development": {
-      "plugins": [
-        "typecheck",
-        "react-transform"
-      ],
-      "extra": {
-        "react-transform": [{
-            "target": "react-transform-webpack-hmr",
-            "imports": ["react"],
-            "locals": ["module"]
-        }]
-      }
-    }
-  }
+  ]
 }
diff --git a/package.json b/package.json
@@ -121,8 +121,8 @@
     "concurrently": "0.1.1",
     "css-loader": "^0.18.0",
     "eslint": "^1.3.1",
-    "eslint-loader": "^1.0.0",
     "eslint-config-airbnb": "0.0.8",
+    "eslint-loader": "^1.0.0",
     "eslint-plugin-react": "^3.2.3",
     "extract-text-webpack-plugin": "^0.8.1",
     "json-loader": "^0.5.3",
@@ -138,7 +138,7 @@
     "node-sass": "^3.2.0",
     "react-a11y": "0.2.6",
     "react-hot-loader": "1.3.0",
-    "react-transform-webpack-hmr": "^0.1.3",
+    "react-transform-hmr": "^1.0.0",
     "redux-devtools": "^2.1.2",
     "sass-loader": "^2.0.0",
     "strip-loader": "^0.1.0",

diff --git a/webpack/dev.config.js b/webpack/dev.config.js
@@ -1,3 +1,4 @@
+var fs = require('fs');
 var path = require('path');
 var webpack = require('webpack');
 var WebpackIsomorphicTools = require('webpack-isomorphic-tools');
@@ -9,6 +10,26 @@ var port = parseInt(process.env.PORT) + 1 || 3001;
 var WebpackIsomorphicToolsPlugin = require('webpack-isomorphic-tools/plugin');
 var webpackIsomorphicToolsPlugin = new WebpackIsomorphicToolsPlugin(require('./webpack-isomorphic-tools'));
 
+var babelrc = fs.readFileSync('./.babelrc');
+var babelLoaderQuery = {};
+
+try {
+  babelLoaderQuery = JSON.parse(babelrc);
+} catch (err) {
+  console.error('==>     ERROR: Error parsing your .babelrc.');
+  console.error(err);
+}
+
+babelLoaderQuery.plugins = babelLoaderQuery.plugins || [];
+babelLoaderQuery.plugins.push('react-transform');
+babelLoaderQuery.extra = {
+  'react-transform': [{
+    target: 'react-transform-hmr',
+    imports: ['react'],
+    locals: ['module']
+  }]
+};
+
 module.exports = {
   devtool: 'inline-source-map',
   context: path.resolve(__dirname, '..'),
@@ -26,7 +47,7 @@ module.exports = {
   },
   module: {
     loaders: [
-      { test: /\.js$/, exclude: /node_modules/, loaders: ['babel', 'eslint-loader']},
+      { test: /\.js$/, exclude: /node_modules/, loaders: ['babel?' + JSON.stringify(babelLoaderQuery), 'eslint-loader']},
       { test: /\.json$/, loader: 'json-loader' },
       { test: /\.less$/, loader: 'style!css!less' },
       { test: /\.scss$/, loader: 'style!css?modules&importLoaders=2&sourceMap&localIdentName=[local]___[hash:base64:5]!autoprefixer?browsers=last 2 version!sass?outputStyle=expanded&sourceMap' },