Merge pull request #335 from ruisaraiva19/chore/upgrade-packages

chore: upgrade desktop app packages

desktop-app/.gitignore

@@ -50,6 +50,7 @@ main.js.map
 
 .idea
 npm-debug.log.*
+package-lock.json
 
 # local configs
 setCreds.sh

desktop-app/app/components/NetworkThrottling/ProfileManager/styles.css

@@ -14,10 +14,6 @@ td {
   padding-right: 16px !important;
 }
 
-.profilesRow > th {
-  cursor: default;
-}
-
 .profilesHeader > tr > th {
   font-size: 20px;
   font-weight: bold;

desktop-app/app/utils/TextAreaWithCopyButton.js

@@ -2,9 +2,7 @@ import React from 'react';
 import Button from '@material-ui/core/Button';
 import Box from '@material-ui/core/Box';
 import {makeStyles} from '@material-ui/core/styles';
-import {
+import {clipboard} from 'electron';
-  clipboard,
-} from 'electron';
 
 const useStyles = makeStyles(theme => ({
   codeBoxContainer: {
@@ -40,9 +38,14 @@ const TextAreaWithCopyButton = props => {
           })}
         </pre>
       </div>
-        <Button onClick={() => clipboard.writeText(props.text, 'clipboard')} size="small" variant="contained" color="primary">
+      <Button
-          Copy
+        onClick={() => clipboard.writeText(props.text, 'clipboard')}
-        </Button>
+        size="small"
+        variant="contained"
+        color="primary"
+      >
+        Copy
+      </Button>
     </Box>
   );
 };

desktop-app/configs/webpack.config.renderer.dev.babel.js

@@ -260,7 +260,7 @@ export default merge.smart(baseConfig, {
     before() {
       if (process.env.START_HOT) {
         console.log('Starting Main Process...');
-        spawn('npm', ['run', 'start-main-dev'], {
+        spawn('yarn', ['start-main-dev'], {
           shell: true,
           env: process.env,
           stdio: 'inherit',

desktop-app/package.json

@@ -29,7 +29,6 @@
     "postinstall": "electron-builder install-app-deps && yarn build-dll",
     "postlint-fix": "prettier --ignore-path .eslintignore --single-quote --write '**/*.{*{js,jsx,json},babelrc,eslintrc,prettierrc,stylelintrc}'",
     "postlint-styles-fix": "prettier --ignore-path .eslintignore --single-quote --write '**/*.{css,scss}'",
-    "precommit": "lint-staged",
     "prestart": "yarn build",
     "start": "cross-env NODE_ENV=production electron ./app/main.prod.js",
     "start-main-dev": "cross-env HOT=1 NODE_ENV=development electron -r @babel/register ./app/main.dev.js",
@@ -40,24 +39,25 @@
     "test-e2e-live": "node -r @babel/register ./internals/scripts/CheckBuiltsExist.js && cross-env NODE_ENV=test testcafe-live electron:./ ./test/e2e/HomePage.e2e.js",
     "test-watch": "yarn test --watch"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
   "lint-staged": {
     "*.{js,jsx}": [
       "cross-env NODE_ENV=development eslint --cache --format=pretty",
-      "prettier --ignore-path .eslintignore --single-quote --write",
+      "prettier --ignore-path .eslintignore --single-quote --write"
-      "git add"
     ],
     "{*.json,.{babelrc,eslintrc,prettierrc,stylelintrc}}": [
-      "prettier --ignore-path .eslintignore --parser json --write",
+      "prettier --ignore-path .eslintignore --parser json --write"
-      "git add"
     ],
     "*.{css,scss}": [
       "stylelint --ignore-path .eslintignore --syntax scss --fix",
-      "prettier --ignore-path .eslintignore --single-quote --write",
+      "prettier --ignore-path .eslintignore --single-quote --write"
-      "git add"
     ],
     "*.{yml,md}": [
-      "prettier --ignore-path .eslintignore --single-quote --write",
+      "prettier --ignore-path .eslintignore --single-quote --write"
-      "git add"
     ]
   },
   "main": "./app/main.prod.js",
@@ -249,19 +249,19 @@
     "flow-bin": "^0.77.0",
     "flow-runtime": "^0.17.0",
     "flow-typed": "^3.2.0",
-    "husky": "^1.1.4",
+    "husky": "^4.2.5",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^26.1.0",
+    "jest": "^23.6.0",
-    "lint-staged": "^8.1.0",
+    "lint-staged": "^10.2.11",
     "mini-css-extract-plugin": "^0.4.4",
-    "node-sass": "^4.10.0",
     "opencollective-postinstall": "^2.0.1",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "prettier": "^1.15.2",
     "react-test-renderer": "^16.6.3",
     "redux-logger": "^3.0.6",
     "rimraf": "^2.6.2",
-    "sass-loader": "^7.1.0",
+    "sass": "^1.26.10",
+    "sass-loader": "^9.0.2",
     "sinon": "^7.1.1",
     "style-loader": "^0.23.1",
     "stylelint": "^13.6.1",