Merge pull request gitify-app#442 from manosim/feat/update-electron

feat: Update Electron, Webpack, TS & Jest

Author: manosim

main.js

@@ -14,6 +14,7 @@ const browserWindowOpts = {
  minHeight: 400,
  resizable: false,
  webPreferences: {
+ enableRemoteModule: true,
  overlayScrollbars: true,
  nodeIntegration: true,
  },

package.json

@@ -109,9 +109,9 @@
  "@primer/octicons-react": "^9.6.0",
  "axios": "=0.19.2",
  "date-fns": "^2.11.1",
- "electron-updater": "^4.2.5",
+ "electron-updater": "^4.3.5",
  "final-form": "^4.19.1",
- "lodash": "^4.17.15",
+ "lodash": "^4.17.20",
  "menubar": "^9.0.1",
  "nprogress": "=0.2.0",
  "react": "=16.13.1",
@@ -129,29 +129,29 @@
  "redux-storage-engine-localstorage": "=1.1.4",
  "redux-thunk": "=2.3.0",
  "styled-components": "^5.0.1",
- "ts-loader": "^6.2.2",
- "typescript": "^3.8.3"
+ "ts-loader": "^8.0.11",
+ "typescript": "^4.1.2"
  },
  "devDependencies": {
  "@testing-library/react": "^10.0.2",
- "@types/jest": "^25.2.1",
+ "@types/jest": "^26.0.15",
  "@types/lodash": "^4.14.149",
  "@types/node": "^13.11.0",
  "@types/react": "^16.9.32",
  "@types/react-redux": "^7.1.7",
  "@types/react-transition-group": "^4.2.4",
  "@types/styled-components": "^5.0.1",
- "electron": "^9.0.0",
- "electron-builder": "^22.4.1",
- "electron-notarize": "^0.3.0",
- "jest": "^25.2.7",
+ "electron": "^11.0.2",
+ "electron-builder": "^22.9.1",
+ "electron-notarize": "^1.0.0",
+ "jest": "^26.6.3",
  "nock": "^12.0.3",
  "prettier": "=2.0.2",
  "react-test-renderer": "=16.13.1",
  "redux-mock-store": "=1.5.4",
- "ts-jest": "^25.3.1",
- "webpack": "^4.42.1",
- "webpack-cli": "^3.3.11",
- "webpack-merge": "^4.2.2"
+ "ts-jest": "^26.4.4",
+ "webpack": "^5.6.0",
+ "webpack-cli": "^4.2.0",
+ "webpack-merge": "^5.4.0"
  }
 }

src/js/components/sidebar.tsx

@@ -217,4 +217,4 @@ export default compose(
  fetchNotifications,
  logout,
  })
-)(Sidebar);
+)(Sidebar) as any;

webpack.prod.js

@@ -1,4 +1,4 @@
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 
 module.exports = merge(common, {