Move to react-transform

roman-haluska · Nov 23, 2015 · aa5472a · aa5472a
1 parent 4a7c32e
commit aa5472a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,4 @@
+{
+  "stage": 0,
+  "plugins": ["react-display-name"]
+}
diff --git a/package.json b/package.json
@@ -43,7 +43,9 @@
     "babel-core": "^5.x",
     "babel-eslint": "^4.1.5",
     "babel-loader": "^5.x",
-    "babel-plugin-typecheck": "^3.0.1",
+    "babel-plugin-react-display-name": "^2.0.0",
+    "babel-plugin-react-transform": "^1.1.1",
+    "babel-plugin-typecheck": "^2.0.0",
     "babel-runtime": "5.x",
     "css-loader": "^0.23.0",
     "ejs": "^2.3.4",
@@ -58,6 +60,7 @@
     "react": "^0.14.2",
     "react-dom": "^0.14.2",
     "react-hot-loader": "^1.3.0",
+    "react-transform-hmr": "^1.0.1",
     "style-loader": "^0.13.0",
     "webpack": "^1.12.6",
     "webpack-dev-server": "^1.12.1"

diff --git a/webpack-dev-server.config.js b/webpack-dev-server.config.js
@@ -14,8 +14,23 @@ module.exports = {
     },
     module: {
       loaders: [
-        {test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?stage=0&plugins=typecheck'},
-        {test: /\.jsx$/, exclude: /node_modules/, loader: 'react-hot-loader'}
+        {test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader',
+          query: {
+            cacheDirectory: true,
+            plugins: ['react-transform'],
+            extra: {
+              'react-transform': {
+                transforms: [
+                  {
+                    transform: 'react-transform-hmr',
+                    imports: ['react'],
+                    locals: ['module']
+                  }
+                ]
+              }
+            }
+          }
+        }
       ]
     },
     plugins: [

diff --git a/webpack-examples.config.js b/webpack-examples.config.js
@@ -15,7 +15,7 @@ module.exports = {
     },
     module: {
       loaders: [
-        {test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?stage=0&optional=runtime'}
+        {test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?optional=runtime'}
       ]
     },
     plugins: [

diff --git a/webpack.config.js b/webpack.config.js
@@ -24,7 +24,7 @@ module.exports = {
   },
   module: {
     loaders: [
-      {test: /\.jsx?$/, exclude: /node_modules/, loader: "babel-loader?stage=0"}
+      {test: /\.jsx?$/, exclude: /node_modules/, loader: "babel-loader"}
     ]
   },
   plugins: [