Fix router (#949)

* v0.11.1 (#941) * [WIP] Route-based code splitting (#884) * Upgrading to React Router v4, using react-router-redux@next Refactoring routes.js to use Switch store now export history renamed router reducer switch to react-router-dom * Adding code-splitting at route level * Fix flow warnings * Fix Typo during eslint no-shadow fix * More flow fixes... * Even more Flow checking * Switching to babel preset dynamic import webpack * Fixing CounterPage spec * Route-based code splitting * Updated all deps * Updated flow types * Fix npm start and npm run dev (#901) * should fix npm start and npm run dev * change back to warn about the global requires * makes flow happy * flow again use Children, passes npm run lint locally * flow again use any so we only get a warning * flow disable children * Updated deps * Cleaned up code style, removed unnecessary eslint supressions * Removed flow children disabled line * Added HtmlWebpackPlugin (#916) * Fixed HMR (disabled multiStep) (#920) * Fixed HMR * Commented multiPass instead of removing * Updated CHANGELOG (#923) * Updated changelog * Added more notable changes [ci skip] * Added support for Webpack Bundle Analyzer (#922) * Added webpack bundle analyzer to CHANGELOG [ci skip] * Bump package.json version [ci skip] * Bump flow-bin [ci skip] * Fixed hot-reload refresh url * Bumped electron * Added Initial Jest Snapshot Testing Support (#928) * Updated CHANGELOG date [ci skip] s * Revert "Added HtmlWebpackPlugin (#916)" This reverts commit f36e9d2. * Second attempt fix of script race condition * Fixed flow-typed Overwrite (#940) * Release 0.11.0 (#921) * [WIP] Route-based code splitting (#884) * Upgrading to React Router v4, using react-router-redux@next Refactoring routes.js to use Switch store now export history renamed router reducer switch to react-router-dom * Adding code-splitting at route level * Fix flow warnings * Fix Typo during eslint no-shadow fix * More flow fixes... * Even more Flow checking * Switching to babel preset dynamic import webpack * Fixing CounterPage spec * Route-based code splitting * Updated all deps * Updated flow types * Fix npm start and npm run dev (#901) * should fix npm start and npm run dev * change back to warn about the global requires * makes flow happy * flow again use Children, passes npm run lint locally * flow again use any so we only get a warning * flow disable children * Updated deps * Cleaned up code style, removed unnecessary eslint supressions * Removed flow children disabled line * Added HtmlWebpackPlugin (#916) * Fixed HMR (disabled multiStep) (#920) * Fixed HMR * Commented multiPass instead of removing * Updated CHANGELOG (#923) * Updated changelog * Added more notable changes [ci skip] * Added support for Webpack Bundle Analyzer (#922) * Added webpack bundle analyzer to CHANGELOG [ci skip] * Bump package.json version [ci skip] * Bump flow-bin [ci skip] * Fixed hot-reload refresh url * Bumped electron * Added Initial Jest Snapshot Testing Support (#928) * Updated CHANGELOG date [ci skip] s * Update package.json * Added temporary hack to fix flow-typed * Updated repo badge to reflect github releases * Fixed unexpected merge override of changes * Added support for debugging prod build, fixed prod styles, updated deps * Updated CHANGELOG [ci skip] * Used hash history instead of html5 router to fix route resolution * Use local flow-bin package (#945) If this setting is not present then flow extension suggests to install flow globally which should is not necessary at all because locally flow-bin is already available. * Fix router
electron-react-boilerplate · Apr 26, 2017 · 1014df0 · 1014df0
1 parent d9bb26c
commit 1014df0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "javascript.validate.enable": false,
+  "flow.useNPMPackagedFlow": true,
   "search.exclude": {
     ".git": true,
     "node_modules": true,

diff --git a/app/routes.js b/app/routes.js
@@ -1,18 +1,15 @@
 /* eslint flowtype-errors/show-errors: 0 */
 import React from 'react';
-import { HashRouter as Router } from 'react-router-dom';
 import { Switch, Route } from 'react-router';
 import App from './containers/App';
 import HomePage from './containers/HomePage';
 import CounterPage from './containers/CounterPage';
 
 export default () => (
-  <Router>
-    <App>
-      <Switch>
-        <Route path="/counter" component={CounterPage} />
-        <Route path="/" component={HomePage} />
-      </Switch>
-    </App>
-  </Router>
+  <App>
+    <Switch>
+      <Route path="/counter" component={CounterPage} />
+      <Route path="/" component={HomePage} />
+    </Switch>
+  </App>
 );
diff --git a/app/store/configureStore.development.js b/app/store/configureStore.development.js
@@ -1,8 +1,7 @@
 import { createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
-import { hashHistory } from 'react-router-dom';
 import { createBrowserHistory } from 'history';
-import { routerMiddleware, push } from 'react-router-redux';
+import { routerMiddleware, routerActions } from 'react-router-redux';
 import { createLogger } from 'redux-logger';
 import rootReducer from '../reducers';
 import * as counterActions from '../actions/counter';
@@ -26,13 +25,13 @@ const configureStore = (initialState: ?counterStateType) => {
   middleware.push(logger);
 
   // Router Middleware
-  const router = routerMiddleware(hashHistory);
+  const router = routerMiddleware(history);
   middleware.push(router);
 
   // Redux DevTools Configuration
   const actionCreators = {
     ...counterActions,
-    push,
+    ...routerActions,
   };
   // If Redux DevTools Extension is installed use it, otherwise use Redux compose
   /* eslint-disable no-underscore-dangle */