chore: update dependencies

Author: dgeibi

README.md

@@ -48,7 +48,7 @@ $ yarn
 Run the current application in development mode
 
 ```
-$ yarn app start
+$ yarn app dev
 ```
 
 Create packages

lerna.json

@@ -9,25 +9,25 @@
     "app": "cd packages/p2p-chat && yarn run",
     "lint": "eslint .",
     "fix": "eslint . --fix",
-    "format": "prettier --write '**/*.{js,scss}'",
-    "precommit": "lint-staged",
-    "pub": "lerna publish",
-    "postinstall": "cd packages/p2p-chat && yarn"
+    "format": "prettier --write '**/*.{js,scss}'"
   },
   "lint-staged": {
     "*.{scss,js}": [
       "prettier --write",
       "git add"
     ]
   },
+  "husky": {
+    "hooks": {
+      "precommit": "lint-staged"
+    }
+  },
   "devDependencies": {
-    "eslint": "^5.5.0",
+    "eslint": "^5.11.0",
     "eslint-config-dgeibi": "^5.1.1",
-    "husky": "^0.14.3",
-    "lerna": "2.8.0",
-    "lint-staged": "^7.2.2",
-    "npm-run-all": "^4.1.3",
-    "prettier": "^1.14.2"
+    "husky": "^1.2.1",
+    "lint-staged": "^8.1.0",
+    "prettier": "^1.15.3"
   },
   "workspaces": [
     "packages/*"

package.json

@@ -4,7 +4,7 @@ const logger = require('p2p-chat-logger')
 
 class StartElectron {
   apply(compiler) {
-    compiler.plugin('done', () => {
+    compiler.hooks.done.tap('selfdone', () => {
       if (this.started) return
       this.started = true
       spawn('electron .', {
@@ -30,6 +30,7 @@ module.exports = options => wtf => {
   wtf.config.devServer = Object.assign(
     wtf.config.devServer,
     {
+      disableHostCheck: true,
       hot: true,
       stats: {
         colors: true,

packages/p2p-chat/config/devServer.js

@@ -50,7 +50,7 @@ module.exports = (env = {}) => {
             '@babel/env',
             {
               targets: {
-                electron: '3.0.0',
+                electron: '4.0.0',
               },
               modules: false,
               useBuiltIns: 'usage',

packages/p2p-chat/config/fromAntdStyle.js

@@ -55,7 +55,7 @@ module.exports = (env = {}) => {
             '@dgeibi/babel-preset-react-app',
             {
               targets: {
-                electron: '3.0.0',
+                electron: '4.0.0',
               },
               useBuiltIns: 'usage',
               shippedProposals: true,
@@ -67,7 +67,8 @@ module.exports = (env = {}) => {
             'import',
             {
               libraryName: 'antd',
-              style: true,
+              libraryDirectory: 'es',
+              style: 'css',
             },
             'antd-import',
           ],
@@ -94,25 +95,16 @@ module.exports = (env = {}) => {
     .use(
       css({
         rule: {
-          test: /\.less$/,
+          test: /\.css$/,
           use: [
             {
               loader: 'css-loader',
               options: {
-                minimize: true,
-              },
-            },
-            {
-              loader: 'less-loader',
-              options: {
-                javascriptEnabled: true,
-                modifyVars: {
-                  'icon-url': require('./fromAntdStyle')(
-                    `${__dirname}/../public/fonts/iconfont`
-                  ),
-                },
+                importLoaders: 1,
+                sourceMap: false,
               },
             },
+            { loader: 'postcss-loader', options: { sourceMap: false } },
           ],
         },
         extract: PROD,
@@ -122,19 +114,17 @@ module.exports = (env = {}) => {
       css({
         rule: {
           test: /\.scss$/,
-          include: defaultInclude,
           use: [
             {
               loader: 'css-loader',
               options: {
                 getLocalIdent,
                 modules: true,
                 importLoaders: 1,
-                minimize: true,
-                sourceMap: true,
+                sourceMap: false,
               },
             },
-            { loader: 'postcss-loader', options: { sourceMap: true } },
+            { loader: 'postcss-loader', options: { sourceMap: false } },
           ],
         },
         extract: PROD,

packages/p2p-chat/config/main.config.js

@@ -200,6 +200,9 @@ function createWindow() {
     width: 800,
     height: 600,
     title: pkg.name,
+    webPreferences: {
+      nodeIntegration: true,
+    }
   })
 
   const urlObj = Object.assign(

packages/p2p-chat/config/renderer.config.js

@@ -42,51 +42,49 @@
     "p2p-chat-utils": "*"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
-    "@babel/runtime": "^7.0.0",
-    "@dgeibi/babel-preset-react-app": "^1.2.1",
-    "antd": "^3.8.4",
+    "@babel/core": "^7.2.2",
+    "@babel/preset-env": "^7.2.3",
+    "@dgeibi/babel-preset-react-app": "2.0.4",
+    "antd": "^3.11.4",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-loader": "^8.0.0",
-    "babel-plugin-import": "^1.8.0",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.15",
-    "css-loader": "^1.0.0",
+    "babel-loader": "^8.0.4",
+    "babel-plugin-import": "^1.11.0",
+    "connected-react-router": "^6.0.0",
+    "css-loader": "^2.0.0",
+    "cssnano": "^4.1.8",
     "dateformat": "^2.0.0",
-    "electron": "^3.0.0-beta.8",
-    "electron-builder": "^20.28.0",
-    "file-loader": "^2.0.0",
+    "electron": "^4.0.0",
+    "electron-builder": "^20.38.0",
+    "file-loader": "^3.0.0",
     "history": "^4.7.2",
     "html-webpack-plugin": "^3.2.0",
-    "less": "^3.0.0",
+    "less": "^3.9.0",
     "less-loader": "^4.1.0",
-    "lodash": "^4.17.0",
-    "mini-css-extract-plugin": "^0.4.2",
-    "npm-run-all": "^4.1.2",
-    "postcss-loader": "^2.0.10",
-    "postcss-scss": "^1.0.3",
+    "lodash": "^4.17.11",
+    "mini-css-extract-plugin": "^0.5.0",
+    "npm-run-all": "^4.1.5",
+    "postcss-loader": "^3.0.0",
+    "postcss-scss": "^2.0.0",
     "precss": "^3.0.0",
-    "prop-types": "^15.6.0",
-    "react": "^16.4.2",
-    "react-dom": "^16.4.2",
-    "react-hot-loader": "^4.3.5",
-    "react-redux": "^5.0.6",
-    "react-router": "^4.2.0",
-    "react-router-dom": "^4.2.2",
-    "react-router-redux": "^5.0.0-alpha.9",
-    "redux": "^3.7.2",
-    "redux-actions": "^2.2.1",
-    "redux-devtools": "^3.4.1",
+    "prop-types": "15.6.2",
+    "react": "16.7.0",
+    "react-dom": "16.7.0",
+    "react-hot-loader": "^4.6.3",
+    "react-redux": "6.0.0",
+    "react-router": "4.3.1",
+    "react-router-dom": "4.3.1",
+    "redux": "^4.0.1",
+    "redux-actions": "^2.6.4",
+    "redux-devtools": "^3.5.0",
     "redux-devtools-dock-monitor": "^1.1.3",
     "redux-devtools-log-monitor": "^1.4.0",
-    "reselect": "^3.0.1",
+    "reselect": "^4.0.0",
     "rimraf": "^2.6.2",
-    "style-loader": "^0.23.0",
-    "uglifyjs-webpack-plugin": "^1.3.0",
-    "webpack": "^4.16.0",
-    "webpack-bundle-analyzer": "^2.11.1",
-    "webpack-cli": "^3.0.0",
-    "webpack-dev-server": "^3.1.7",
+    "style-loader": "^0.23.1",
+    "webpack": "^4.28.2",
+    "webpack-bundle-analyzer": "^3.0.3",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.13",
     "wtf-webpack-config": "^0.1.3"
   },
   "build": {

packages/p2p-chat/main/index.js

@@ -1,4 +1,4 @@
-import { push } from 'react-router-redux'
+import { push } from 'connected-react-router'
 import constants from '../../../utils/constants'
 import createReducer from '../../../utils/createReducer'
 

packages/p2p-chat/package.json

@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import { push } from 'react-router-redux'
+import { push } from 'connected-react-router'
 
 import createReducer from '../../../utils/createReducer'
 import getConstants from '../../../utils/constants'

packages/p2p-chat/src/components/Aside/ChatList/redux.js

@@ -1,26 +1,26 @@
 import { combineReducers } from 'redux'
-
-import { routerReducer } from 'react-router-redux'
+import { connectRouter } from 'connected-react-router'
 import settings from '../views/SettingsRedux'
 import aside from '../views/AsideRedux'
 import chatting from '../views/ChattingRedux'
 import modalbtns from '../views/ModalBtnRedux'
 
-const appReducer = combineReducers({
-  settings,
-  aside,
-  chatting,
-  modalbtns,
-  routing: routerReducer,
-})
+// const initialState = appReducer({}, {})
 
-const initialState = appReducer({}, {})
+export default history => {
+  const appReducer = combineReducers({
+    settings,
+    aside,
+    chatting,
+    modalbtns,
+    router: connectRouter(history),
+  })
 
-export default (state, action) => {
-  if (action.type === 'LOGOUT') {
-    const { routing } = state
-    return { ...initialState, routing }
-  }
+  return (state, action) => {
+    if (action.type === 'LOGOUT') {
+      window.location.reload()
+    }
 
-  return appReducer(state, action)
+    return appReducer(state, action)
+  }
 }

packages/p2p-chat/src/components/Settings/Login/redux.js

@@ -1,7 +1,7 @@
 import { createStore, applyMiddleware, compose } from 'redux'
-import { routerMiddleware as createRouterMiddleware } from 'react-router-redux'
+import { routerMiddleware as createRouterMiddleware } from 'connected-react-router'
 import createHistory from 'history/createHashHistory'
-import rootReducer from './reducer'
+import makeReducer from './reducer'
 
 const history = createHistory()
 const RouterMiddleware = createRouterMiddleware(history)
@@ -14,11 +14,11 @@ const middlewares = [
 const finalCreateStore = compose(...middlewares)(createStore)
 
 const configureStore = initialState => {
-  const store = finalCreateStore(rootReducer, initialState)
+  const store = finalCreateStore(makeReducer(history), initialState)
 
   if (process.env.NODE_ENV !== 'production' && module.hot) {
     module.hot.accept('./reducer', () => {
-      store.replaceReducer(rootReducer)
+      store.replaceReducer(makeReducer(history))
     })
   }
 

packages/p2p-chat/src/global/reducer.js

@@ -1,4 +1,4 @@
-import { push } from 'react-router-redux'
+import { push } from 'connected-react-router'
 
 import { configureStore, history } from './global/redux'
 import ipc from './global/ipc'

packages/p2p-chat/src/global/redux.js

@@ -3,7 +3,7 @@ import { Provider } from 'react-redux'
 import PropTypes from 'prop-types'
 import { Row, Col } from 'antd'
 import { Route } from 'react-router-dom'
-import { ConnectedRouter as Router } from 'react-router-redux'
+import { ConnectedRouter as Router } from 'connected-react-router'
 import { hot } from 'react-hot-loader'
 
 import SettingNav from '../views/Settings'

packages/p2p-chat/src/index.js

@@ -28,7 +28,7 @@ const selectSortedUsers = createSelector([selectUsers], users =>
   sortBy(Object.values(users), byOnline('username'))
 )
 
-const selectLocation = state => state.routing.location
+const selectLocation = state => state.router.location
 const selectCurrent = createSelector([selectLocation], location => {
   if (!location) return {}
   const match = matchPath(location.pathname, {

packages/p2p-chat/src/layouts/App.js

@@ -0,0 +1,7 @@
+module.exports = ({ file, env }) => ({
+  parser: file.extname === '.scss' ? 'postcss-scss' : false,
+  plugins: {
+    precss: file.extname === '.scss',
+    cssnano: env === 'production' ? {} : false,
+  },
+})