Merge remote-tracking branch 'upstream/main'

b310-digital · Oct 3, 2022 · 4138cde · 4138cde
2 parents 872b1fd + 7488601
commit 4138cde
Show file tree

Hide file tree

Showing 75 changed files with 31,349 additions and 26,236 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - name: Set up QEMU
               uses: docker/setup-qemu-action@v1
@@ -29,7 +29,7 @@ jobs:
                   password: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Build and export to Docker
-              uses: docker/build-push-action@v2
+              uses: docker/build-push-action@v3
               with:
                   context: .
                   tags: |
@@ -39,12 +39,22 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - run: npm --prefix teammapper-backend ci
 
             - run: npm --prefix teammapper-backend run lint
 
+    teammapper-frontend-lint:
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v3
+
+            - run: npm --prefix teammapper-frontend ci
+
+            - run: npm --prefix teammapper-frontend run lint
+
     teammapper-backend-test-e2e:
         runs-on: ubuntu-latest
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.14.0-alpine3.15 as base
+FROM node:16.17.1-alpine3.15 as base
 # Ensuring that all npm packages and commands are executed with a non-root user
 USER node
 

diff --git a/package.json b/package.json
@@ -6,8 +6,8 @@
     "private": false,
     "license": "MIT",
     "engines": {
-      "npm": "~8.3.1",
-      "node": "~16.14.0"
+      "npm": "~8.15.0",
+      "node": "~16.17.1"
     },
     "scripts": {
       "build:prod": "npm run build:frontend:prod && cp teammapper-frontend/dist -TRv teammapper-backend/client && npm run build:backend:prod",

diff --git a/teammapper-backend/.eslintrc.json b/teammapper-backend/.eslintrc.json
@@ -1,13 +1,13 @@
 {
     "env": {
-        "browser": true,
         "es2021": true,
-        "jest/globals": true
+        "jest/globals": true,
+        "node": true
     },
     "extends": [
-        "plugin:import/typescript",
-        "airbnb-typescript/base",
-        "plugin:nestjs/recommended"
+        "eslint:recommended",
+        "plugin:nestjs/recommended",
+        "plugin:import/typescript"
     ],
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
@@ -22,6 +22,8 @@
         "import"
     ],
     "rules": {
+        "no-unused-vars": "off",
+        "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
         "import/extensions": [
            "error",
            "ignorePackages",