Merge pull request #383 from ExpressLRS/upgrade-deps

Upgrade packages
ExpressLRS · Sep 7, 2022 · b26c069 · b26c069
2 parents c8e2b5d + 49cf18c
commit b26c069
Show file tree

Hide file tree

Showing 4 changed files with 2,679 additions and 2,797 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,18 +16,18 @@ jobs:
           sudo apt-get install --no-install-recommends -y libarchive-tools rpm
 
       - name: Checkout git repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Install Node, NPM and Yarn
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16.15.0
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v3
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,30 +1,49 @@
 name: Test
 
-on: [ push, pull_request, workflow_dispatch ]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        os: [ macos-latest, windows-2019, ubuntu-latest ]
+        os: [ 'ubuntu-18.04', 'windows-2019', 'macos-latest' ]
 
     steps:
       - name: Setup apt dependencies
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-18.04'
         run: |
           sudo apt update
           sudo apt-get install --no-install-recommends -y libarchive-tools rpm
 
       - name: Checkout git repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Install Node, NPM and Yarn
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16.15.0
 
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v3
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
       - name: Install dependencies
         run: |
           yarn install --network-timeout 180000

diff --git a/package.json b/package.json
@@ -185,8 +185,8 @@
     ]
   },
   "resolutions": {
-    "watchpack": "2.3.1",
-    "node-abi": "3.22.0"
+    "watchpack": "2.4.0",
+    "node-abi": "3.24.0"
   },
   "devDependencies": {
     "@babel/core": "^7.18.6",
@@ -216,11 +216,11 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@babel/register": "^7.18.6",
-    "@graphql-codegen/cli": "2.6.2",
-    "@graphql-codegen/introspection": "2.1.1",
-    "@graphql-codegen/typescript": "2.5.1",
+    "@graphql-codegen/cli": "2.12.0",
+    "@graphql-codegen/introspection": "2.2.1",
+    "@graphql-codegen/typescript": "2.7.3",
     "@graphql-codegen/typescript-operations": "^2.4.2",
-    "@graphql-codegen/typescript-react-apollo": "3.2.16",
+    "@graphql-codegen/typescript-react-apollo": "3.3.3",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
     "@testing-library/jest-dom": "^5.16.4",
@@ -256,7 +256,7 @@
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.0.0",
     "detect-port": "^1.3.0",
-    "electron": "^19.0.7",
+    "electron": "^20.1.1",
     "electron-builder": "^23.1.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.2.1",
@@ -269,7 +269,7 @@
     "eslint-plugin-compat": "^4.0.2",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^26.5.3",
-    "eslint-plugin-jsx-a11y": "6.5.1",
+    "eslint-plugin-jsx-a11y": "6.6.1",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-react": "^7.30.0",
@@ -282,7 +282,7 @@
     "mini-css-extract-plugin": "^2.6.0",
     "opencollective-postinstall": "^2.0.3",
     "prettier": "^2.6.2",
-    "react-refresh": "^0.13.0",
+    "react-refresh": "^0.14.0",
     "rimraf": "^3.0.2",
     "sass": "^1.52.3",
     "sass-loader": "^13.0.0",
@@ -295,17 +295,16 @@
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.9.2",
     "webpack-merge": "^5.8.0",
-    "yarn-deduplicate": "^5.0.0"
+    "yarn-deduplicate": "^6.0.0"
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
     "@emotion/react": "^11.9.3",
     "@emotion/styled": "^11.9.3",
     "@fontsource/roboto": "^4.5.7",
-    "@hapi/joi": "^17.1.1",
     "@mui/icons-material": "^5.8.4",
     "@mui/material": "^5.8.6",
-    "@octokit/rest": "^18.12.0",
+    "@octokit/rest": "^19.0.4",
     "apollo-server-express": "^3.9.0",
     "autosuggest-highlight": "^3.2.1",
     "class-validator": "^0.13.2",
@@ -316,8 +315,9 @@
     "express": "^4.17.1",
     "extract-zip": "^2.0.1",
     "get-port": "^5.1.1",
-    "graphql": "15.5.0",
+    "graphql": "15.7.2",
     "graphql-subscriptions": "^2.0.0",
+    "graphql-tag": "^2.12.6",
     "graphql-ws": "^5.9.1",
     "history": "^5.3.0",
     "http": "^0.0.1-security",
@@ -335,6 +335,7 @@
     "semver": "^7.3.7",
     "simple-git": "^3.7.1",
     "source-map-support": "^0.5.21",
+    "ts-node": "^10.9.1",
     "type-graphql": "1.2.0-rc.1",
     "typedi": "^0.10.0",
     "winston": "^3.7.2",