Update all

esgf2-us · Oct 14, 2021 · a2e1316 · a2e1316
1 parent 32bd766
commit a2e1316
Show file tree

Hide file tree

Showing 13 changed files with 256 additions and 151 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -65,7 +65,7 @@ jobs:
           pytest
 
       - name: Upload Coverage Report
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
           file: "./backend/coverage.xml"
           flags: backend

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -50,7 +50,7 @@ jobs:
           yarn test:coverage
 
       - name: Upload Coverage Report
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
           file: "./frontend/coverage/coverage-final.json"
           flags: frontend

diff --git a/backend/docker/production/postgres/Dockerfile b/backend/docker/production/postgres/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:12.6
+FROM postgres:14.0
 
 COPY ./docker/production/postgres/maintenance /usr/local/bin/maintenance
 RUN chmod +x /usr/local/bin/maintenance/*

diff --git a/backend/requirements/base.txt b/backend/requirements/base.txt
@@ -4,8 +4,8 @@ pytz==2021.1  # https://github.com/stub42/pytz
 django==3.1.13  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
-newrelic==6.2.0.156  # https://pypi.org/project/newrelic/
-argon2-cffi==20.1.0  # https://github.com/hynek/argon2_cffi
+newrelic==7.2.1.168  # https://pypi.org/project/newrelic/
+argon2-cffi==21.1.0  # https://github.com/hynek/argon2_cffi
 requests==2.25.1  # https://github.com/psf/requests
 whitenoise==5.2.0  # https://github.com/evansd/whitenoise
 
@@ -17,11 +17,11 @@ psycopg2-binary==2.8.6  # https://github.com/psycopg/psycopg2
 # ------------------------------------------------------------------------------
 djangorestframework==3.12.4  # https://github.com/encode/django-rest-framework
 Markdown==3.3.4  # https://pypi.org/project/Markdown/
-django-filter==2.4.0  # https://github.com/carltongibson/django-filter
+django-filter==21.1  # https://github.com/carltongibson/django-filter
 django-cors-headers==3.7.0  # https://github.com/adamchainz/django-cors-headers
 django-allauth==0.44.0  # https://github.com/pennersr/django-allauth
 dj-rest-auth==2.1.4  # https://github.com/jazzband/dj-rest-auth
-djangorestframework-simplejwt==4.6.0  # https://github.com/SimpleJWT/django-rest-framework-simplejwt/
+djangorestframework-simplejwt==5.0.0  # https://github.com/SimpleJWT/django-rest-framework-simplejwt/
 drf-yasg==1.20.0  # https://github.com/axnsan12/drf-yasg
 
 # Code quality

diff --git a/backend/requirements/local.txt b/backend/requirements/local.txt
@@ -2,7 +2,7 @@
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.9.0  # https://github.com/PyCQA/flake8
+flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 black==20.8b1  # https://github.com/ambv/black
 mypy==0.812  # https://github.com/python/mypy
@@ -11,7 +11,7 @@ mypy==0.812  # https://github.com/python/mypy
 # ------------------------------------------------------------------------------
 django-stubs==1.8.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.3  # https://github.com/pytest-dev/pytest
-pytest-cov==2.11.1  # https://github.com/pytest-dev/pytest-cov
+pytest-cov==3.0.0  # https://github.com/pytest-dev/pytest-cov
 pytest-django==4.2.0  # https://github.com/pytest-dev/pytest-django
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 pytest-watch==4.2.0  # https://github.com/joeyespo/pytest-watch

diff --git a/frontend/cors-proxy/package.json b/frontend/cors-proxy/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "cors-anywhere": "0.4.4",
-    "dotenv": "8.2.0"
+    "dotenv": "10.0.0"
   }
 }
diff --git a/frontend/cors-proxy/yarn.lock b/frontend/cors-proxy/yarn.lock
@@ -10,10 +10,10 @@ [email protected]:
     http-proxy "1.11.1"
     proxy-from-env "0.0.1"
 
-dotenv@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
-  integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
+dotenv@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
+  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
 [email protected]:
   version "1.2.0"

diff --git a/frontend/docker/local/cors-proxy/Dockerfile b/frontend/docker/local/cors-proxy/Dockerfile
@@ -1,5 +1,5 @@
 # Pull official base image
-FROM node:14.16.1-alpine
+FROM node:16.11.1-alpine
 
 # Set working directory
 WORKDIR /cors-proxy

diff --git a/frontend/docker/local/react/Dockerfile b/frontend/docker/local/react/Dockerfile
@@ -1,5 +1,5 @@
 # Pull official base image
-FROM node:14.16.1-alpine
+FROM node:16.11.1-alpine
 
 # Set working directory
 WORKDIR /app

diff --git a/frontend/docker/production/cors-proxy/Dockerfile b/frontend/docker/production/cors-proxy/Dockerfile
@@ -1,5 +1,5 @@
 # Pull official base image
-FROM node:14.16.1-alpine
+FROM node:16.11.1-alpine
 
 # Set working directory
 WORKDIR /cors-proxy

diff --git a/frontend/docker/production/react/Dockerfile b/frontend/docker/production/react/Dockerfile
@@ -1,5 +1,5 @@
 # Pull official base image
-FROM node:14.16.1-alpine as build
+FROM node:16.11.1-alpine as build
 
 # Set working directory
 WORKDIR /app

diff --git a/frontend/package.json b/frontend/package.json
@@ -6,28 +6,28 @@
     "@ant-design/icons": "4.6.2",
     "@react-keycloak/web": "3.4.0",
     "@testing-library/jest-dom": "5.11.10",
-    "@testing-library/react": "11.2.6",
+    "@testing-library/react": "12.1.2",
     "@testing-library/user-event": "13.1.2",
     "@types/humps": "2.0.0",
-    "@types/jest": "26.0.22",
+    "@types/jest": "27.0.2",
     "@types/node": "14.14.37",
     "@types/react": "17.0.3",
     "@types/react-dom": "17.0.3",
     "@types/react-router-dom": "5.1.7",
     "antd": "4.15.1",
     "axios": "0.21.2",
     "cors-anywhere": "0.4.4",
-    "dotenv": "8.2.0",
+    "dotenv": "10.0.0",
     "env-cmd": "10.1.0",
     "humps": "2.0.1",
-    "keycloak-js": "12.0.4",
+    "keycloak-js": "15.0.2",
     "moment": "2.29.1",
     "query-string": "7.0.0",
     "react": "17.0.2",
     "react-async": "10.0.1",
     "react-dom": "17.0.2",
     "react-ga": "3.3.0",
-    "react-hotjar": "2.2.1",
+    "react-hotjar": "3.0.1",
     "react-router-dom": "5.2.0",
     "react-scripts": "4.0.3",
     "typescript": "4.2.4",
@@ -64,12 +64,12 @@
     "@types/uuid": "8.3.0",
     "@typescript-eslint/eslint-plugin": "4.19.0",
     "@typescript-eslint/parser": "4.19.0",
-    "eslint": "7.24.0",
-    "eslint-config-airbnb-typescript": "12.3.1",
+    "eslint": "8.0.1",
+    "eslint-config-airbnb-typescript": "14.0.1",
     "eslint-config-prettier": "8.2.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jsx-a11y": "6.4.1",
-    "eslint-plugin-prettier": "3.3.1",
+    "eslint-plugin-prettier": "4.0.0",
     "eslint-plugin-react": "7.23.2",
     "eslint-plugin-react-hooks": "4.2.0",
     "jest-environment-jsdom-sixteen": "1.0.3",