remove react-hot-loader

likun7981 · likun7981 · commit 172c91b2d625 · 2016-12-21T18:35:41.000+08:00
diff --git a/.babelrc b/.babelrc
@@ -5,7 +5,6 @@
 		"react"
 	],
 	"plugins":[
-		"transform-runtime",
-		"react-hot-loader/babel"
+		"transform-runtime"
 	]
 }
diff --git a/build/webpack-config/base.js b/build/webpack-config/base.js
@@ -23,7 +23,6 @@ module.exports = (paths) => {
   });
   if (__DEV__) {
     App.unshift('webpack-hot-middleware/client');
-    App.unshift('react-hot-loader/patch');
   }
   return {
     context: paths.root(),
diff --git a/package.json b/package.json
@@ -55,7 +55,6 @@
     "less-loader": "^2.2.3",
     "line-debugger": "^0.0.1",
     "mocha": "^3.2.0",
-    "react-hot-loader": "3.0.0-beta.6",
     "redbox-react": "^1.3.3",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
diff --git a/src/main.js b/src/main.js
@@ -13,6 +13,7 @@ const store = createStore(initialState);
 // Render Setup
 // ========================================================
 const MOUNT_NODE = document.getElementById('root');
+console.log(ReactDOM);
 let render = () => {
   const routes = require('./routes/index').default(store); // !important
   ReactDOM.render(
@@ -21,14 +22,7 @@ let render = () => {
   );
 };
 if (__DEV__ && module.hot) {
-  const AppContainer = require('react-hot-loader').AppContainer; // eslint-disable-line
-  const renderApp = () => {
-    const routes = require('./routes/index').default(store); // !important
-    ReactDOM.render(
-      <AppContainer><App store={store} routes={routes} /></AppContainer>,
-      MOUNT_NODE
-    );
-  };
+  const renderApp = render;
   const renderError = (error) => {
     const RedBox = require('redbox-react').default; // eslint-disable-line
     ReactDOM.render(<RedBox error={error} />, MOUNT_NODE);
@@ -41,6 +35,7 @@ if (__DEV__ && module.hot) {
     }
   };
   module.hot.accept('./routes/index', () => {
+    ReactDOM.unmountComponentAtNode(MOUNT_NODE);
     render();
   });
 }
diff --git a/src/reducers/location.js b/src/reducers/location.js
@@ -12,7 +12,6 @@ export function locationChange(location = '/') {
     payload: location
   };
 }
-
 // ------------------------------------
 // Specialized Action Creator
 // ------------------------------------
diff --git a/src/routes/increase/containers/increaseContainer.js b/src/routes/increase/containers/increaseContainer.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
-import { actions } from '../reducers/increase';
+import { actions } from '../reducers/Increase';
 
-import IncreaseComponents from '../components/increaseComponent';
+import IncreaseComponents from '../components/IncreaseComponent';
 
 const mapDispatchToProps = actions;
 
diff --git a/src/routes/increase/index.js b/src/routes/increase/index.js
@@ -1,19 +1,6 @@
-// import { injectReducer } from 'REDUCER_TOOL';
-
-// export default store => ({
-//   path: 'counter',
-//   getComponent(nextState, cb) {
-//     require.ensure([], (require) => {
-//       const Counter = require('./containers/CounterContainer').default;
-//       const reducer = require('./reducers/Counter').default;
-//       injectReducer(store, { key: 'counter', reducer });
-//       cb(null, Counter);
-//     }, 'counter');
-//   }
-// });
-import container from './containers/increaseContainer';
-import reducer from './reducers/increase';
-import component from './components/increaseComponent';
+import container from './containers/IncreaseContainer';
+import reducer from './reducers/Increase';
+import component from './components/IncreaseComponent';
 
 export default component;
 export { reducer, container, component };
diff --git a/src/routes/index.js b/src/routes/index.js
@@ -6,25 +6,19 @@ const createChildRoute = (path, store) => ({
   path,
   getComponent(nextState, cb) {
     const injectReducer = injectReducerFactory(store);
-    // System.import(`./${path}/index`).then((routeModule) => {
-    //   const { container, reducer } = routeModule;
-    //   injectReducer(`${path}`, reducer);
-    //   cb(null, container);
-    // });
-    require.ensure([], (require) => {
-      const routeModule = require('./increase');
+    System.import(`./${path}/index`).then((routeModule) => {
       const { container, reducer } = routeModule;
-      injectReducer('increase', reducer);
+      injectReducer(`${path}`, reducer);
       cb(null, container);
-    }, 'increase');
+    });
   }
 });
-// const paths = ['increase'];
+const paths = ['increase'];
 export const createRoutes = store => ({
   path: '/',
   component: CoreLayout,
   indexRoute: Home,
-  childRoutes: [createChildRoute('increase', store)]
+  childRoutes: paths.map(path => createChildRoute(path, store))
 });
 
 export default createRoutes;
diff --git a/src/store/createStore.js b/src/store/createStore.js
@@ -25,13 +25,15 @@ export default (initialState = {}) => {
     )
   );
   store.asyncReducers = {};
-  // store.unsubscribeHistory = browserHistory.listen(updateLocation(store));
+
+  // Anywhere, you can call store.unsubscribeHistory() to cancel subscribe;
+  store.unsubscribeHistory = browserHistory.listen(updateLocation(store));
+
+  // Make reducers hot reloadable, see http://mxs.is/googmo
   if (module.hot) {
     module.hot.accept('../utils/reducerTool', () => {
-      System.import('../utils/reducerTool').then((module) => {
-        const makeReducer = module.default;
-        store.replaceReducer(makeReducer(store.asyncReducers));
-      });
+      const makeReducer = require('../utils/reducerTool').default;
+      store.replaceReducer(makeReducer(store.asyncReducers));
     });
   }
 
diff --git a/yarn.lock b/yarn.lock
@@ -894,7 +894,7 @@ babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtim
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.14.0, babel-template@^6.15.0, babel-template@^6.16.0, babel-template@^6.7.0, babel-template@^6.8.0:
+babel-template@^6.14.0, babel-template@^6.15.0, babel-template@^6.16.0, babel-template@^6.8.0:
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.16.0.tgz#e149dd1a9f03a35f817ddbc4d0481988e7ebc8ca"
   dependencies:
@@ -1764,10 +1764,6 @@ dom-serializer@0:
     domelementtype "~1.1.1"
     entities "~1.1.1"
 
-dom-walk@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
-
 domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
@@ -2492,13 +2488,6 @@ glob@7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global@^4.3.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.3.1.tgz#5f757908c7cbabce54f386ae440e11e26b7916df"
-  dependencies:
-    min-document "^2.19.0"
-    process "~0.5.1"
-
 globals@^9.0.0, globals@^9.14.0:
   version "9.14.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
@@ -3308,7 +3297,7 @@ lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.0.1, lodash@^4.14.0, lodash@^4.16.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1:
+lodash@^4.0.0, lodash@^4.0.1, lodash@^4.14.0, lodash@^4.16.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0:
   version "4.17.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
 
@@ -3456,12 +3445,6 @@ mime@1.2.x:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
 
-min-document@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
-  dependencies:
-    dom-walk "^0.1.0"
-
 minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
@@ -4176,10 +4159,6 @@ process@^0.11.0, process@~0.11.0:
   version "0.11.9"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
 
-process@~0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
-
 progress@^1.1.8, progress@~1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
@@ -4290,10 +4269,6 @@ react:
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
-react-deep-force-update@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz#4f7f6c12c3e7de42f345992a3c518236fa1ecad3"
-
 react-dom:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.1.tgz#d54c913261aaedb17adc20410d029dcc18a1344a"
@@ -4302,23 +4277,6 @@ react-dom:
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
-react-hot-loader@3.0.0-beta.6:
-  version "3.0.0-beta.6"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-3.0.0-beta.6.tgz#463fac0bfc8b63a8385258af20c91636abce75f4"
-  dependencies:
-    babel-template "^6.7.0"
-    global "^4.3.0"
-    react-deep-force-update "^2.0.1"
-    react-proxy "^3.0.0-alpha.0"
-    redbox-react "^1.2.5"
-    source-map "^0.4.4"
-
-react-proxy@^3.0.0-alpha.0:
-  version "3.0.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz#4400426bcfa80caa6724c7755695315209fa4b07"
-  dependencies:
-    lodash "^4.6.1"
-
 react-redux:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.0.tgz#2693227b19876b6e0047f4b94eb4910f43b677ca"
@@ -4421,7 +4379,7 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
-redbox-react, redbox-react@^1.2.5:
+redbox-react:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/redbox-react/-/redbox-react-1.3.3.tgz#63ec9c2cb9c620c46e2b9f8543b4898f1b787e41"
   dependencies:
@@ -4803,16 +4761,16 @@ source-map@^0.1.41:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.4.4, source-map@0.4.x:
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
+source-map@0.4.x:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
 spdx-correct@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`"react"`
`6`	`6`	`],`
`7`	`7`	`"plugins":[`
`8`		`- "transform-runtime",`
`9`		`- "react-hot-loader/babel"`
	`8`	`+ "transform-runtime"`
`10`	`9`	`]`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ module.exports = (paths) => {`
`23`	`23`	`});`
`24`	`24`	`if (__DEV__) {`
`25`	`25`	`App.unshift('webpack-hot-middleware/client');`
`26`		`- App.unshift('react-hot-loader/patch');`
`27`	`26`	`}`
`28`	`27`	`return {`
`29`	`28`	`context: paths.root(),`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ export function locationChange(location = '/') {`
`12`	`12`	`payload: location`
`13`	`13`	`};`
`14`	`14`	`}`
`15`		`-`
`16`	`15`	`// ------------------------------------`
`17`	`16`	`// Specialized Action Creator`
`18`	`17`	`// ------------------------------------`