disable react-transform-hmr for now, align to new babel6 requires nee…

…ding default for those exporting
XiXora · Dec 21, 2015 · 2e2901b · 2e2901b
1 parent 886d8ec
commit 2e2901b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,21 +1,15 @@
 {
+  "presets": [
+    "es2015",
+    "stage-0",
+    "react"
+  ],
   "env": {
     "development": {
       "plugins": [
-        [
-          "react-transform", {
-            "transforms": [{
-              "transform": "react-transform-hmr",
-              "imports": ["react"],
-              "locals": ["module"]
-            }, {
-              "transform": "react-transform-catch-errors",
-              "imports": ["react", "redbox-react"]
-            }]
-          }
-        ],
         [ "transform-runtime" ],
-        [ "typecheck" ]
+        [ "typecheck" ],
+        [ "transform-decorators-legacy" ]
       ]
     }
   }

diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -16,7 +16,7 @@ var CleanPlugin = require('clean-webpack-plugin');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var strip = require('strip-loader');
 
-var babelConfig = 'babel-loader?presets[]=es2015,presets[]=stage-0,presets[]=react'
+var babelConfig = 'babel-loader?presets[]=es2015,presets[]=stage-0,presets[]=react,plugins[]=transform-runtime,plugins[]=transform-decorators-legacy'
 if (process.env.NODE_ENV !== 'production') {
   var jsLoaders = [babelConfig];
 } else {

diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "babel-eslint": "^5.0.0-beta3",
     "babel-loader": "~6.2.0",
     "babel-plugin-react-transform": "~2.0.0-beta1",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-runtime": "^6.3.13",
     "babel-plugin-typecheck": "^3.5.1",
     "babel-preset-es2015": "^6.3.13",

diff --git a/src/client.js b/src/client.js
@@ -62,7 +62,7 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 if (__DEVTOOLS__ && !window.devToolsExtension) {
-  const DevTools = require('./containers/DevTools/DevTools');
+  const DevTools = require('./containers/DevTools/DevTools').default;
   ReactDOM.render(
     <Provider store={store} key="provider">
       <div>

diff --git a/src/redux/create.js b/src/redux/create.js
@@ -13,7 +13,7 @@ export default function createStore(customMiddleware, reducers, data) {
   let finalCreateStore;
   if (__DEVELOPMENT__ && __CLIENT__ && __DEVTOOLS__) {
     const { persistState } = require('redux-devtools');
-    const DevTools = require('../containers/DevTools/DevTools');
+    const DevTools = require('../containers/DevTools/DevTools').default;
     finalCreateStore = compose(
       applyMiddleware(...middleware),
       window.devToolsExtension ? window.devToolsExtension() : DevTools.instrument(),

diff --git a/src/server.js b/src/server.js
@@ -47,13 +47,13 @@ function setupAssets(rootDir) {
 
 function setupRenderer() {
 
-  const getRoutes = require(path.resolve(config.routes));
-  const reducers = require(path.resolve(config.redux.reducers));
+  const getRoutes = require(path.resolve(config.routes)).default;
+  const reducers = require(path.resolve(config.redux.reducers)).default;
   const pretty = new PrettyError();
 
   let CustomHtml;
   if (config.htmlShell) {
-    CustomHtml = require(path.resolve(config.htmlShell));
+    CustomHtml = require(path.resolve(config.htmlShell)).default;
   } else {
     CustomHtml = Html;
   }
@@ -69,7 +69,7 @@ function setupRenderer() {
     // assemble custom middleware, pass req, res
     const middleware = [];
     if (config.redux.middleware) {
-      const customMiddleware = require(path.resolve(config.redux.middleware));
+      const customMiddleware = require(path.resolve(config.redux.middleware)).default;
       each(customMiddleware, (customMiddlewareToAdd) => {
         if (typeof customMiddlewareToAdd === 'function') {
           middleware.push(customMiddlewareToAdd(req, res));