Merge branch 'dev' into 158-FRONT-ConsistentStyling

hackforla · Feb 26, 2020 · 09f9ffc · 09f9ffc
2 parents a5af2f9 + 3d363e2
commit 09f9ffc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/index.js b/src/index.js
@@ -14,3 +14,6 @@ ReactDOM.render(
   </Provider>,
   document.getElementById('root'),
 );
+
+// hot module replacement during development
+if (module.hot) module.hot.accept();
diff --git a/src/redux/store.js b/src/redux/store.js
@@ -1,5 +1,6 @@
 import { applyMiddleware, createStore } from 'redux';
 import logger from 'redux-logger';
+import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly';
 
 import rootReducer from './rootReducer';
 
@@ -9,9 +10,8 @@ if (process.env.NODE_ENV === 'development') {
   middlewares.push(logger);
 }
 
-const store = createStore(
-  rootReducer,
+const store = createStore(rootReducer, composeWithDevTools(
   applyMiddleware(...middlewares),
-);
+));
 
 export default store;
diff --git a/webpack.config.js b/webpack.config.js
@@ -24,7 +24,12 @@ module.exports = {
       {
         test: /\.(css|scss|sass)$/,
         use: [
-          MiniCssExtractPlugin.loader,
+          {
+            loader: MiniCssExtractPlugin.loader,
+            options: {
+              hmr: true
+            }
+          },
           {
             loader: 'css-loader',
           },