Merge pull request SFDO-Tooling#662 from oddbird/upgrade-deps

Combined deps upgrade.

.eslintrc.yml

@@ -23,8 +23,8 @@ settings:
             - static
             - node_modules
           alias:
-            '@': js
-            '#': images
+            '~js': js
+            '~img': images
   react:
     version: 'detect'
 plugins:

jest.config.js

@@ -69,8 +69,8 @@ module.exports = {
   moduleNameMapper: {
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
       '<rootDir>/__mocks__/fileMock.js',
-    '^@/(.*)': '<rootDir>/src/js/$1',
-    '#/(.*)': '<rootDir>/static/images/$1',
+    '^~js/(.*)': '<rootDir>/src/js/$1',
+    '~img/(.*)': '<rootDir>/static/images/$1',
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader

package.json

@@ -51,7 +51,7 @@
   "dependencies": {
     "@salesforce-ux/design-system": "2.13.7",
     "@salesforce/design-system-react": "0.10.24",
-    "@sentry/browser": "^5.29.0",
+    "@sentry/browser": "^5.29.2",
     "classnames": "^2.2.6",
     "date-fns": "^2.16.1",
     "i18next": "^19.8.4",
@@ -63,7 +63,7 @@
     "react-document-title": "^2.0.3",
     "react-dom": "^16.14.0",
     "react-fns": "^1.4.0",
-    "react-i18next": "^11.8.2",
+    "react-i18next": "^11.8.5",
     "react-redux": "^7.2.2",
     "react-router-dom": "^5.2.0",
     "redux": "^4.0.5",
@@ -76,77 +76,76 @@
     "whatwg-fetch": "^3.5.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.9",
+    "@babel/core": "^7.12.10",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-proposal-export-default-from": "^7.12.1",
     "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
     "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-    "@babel/preset-env": "^7.12.7",
-    "@babel/preset-react": "^7.12.7",
+    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-react": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
-    "@testing-library/jest-dom": "^5.11.6",
+    "@testing-library/jest-dom": "^5.11.8",
     "@testing-library/react": "^11.2.2",
     "@testing-library/react-hooks": "^3.7.0",
     "@types/classnames": "^2.2.11",
     "@types/core-js": "^2.5.4",
     "@types/js-cookie": "^2.2.6",
-    "@types/lodash": "^4.14.165",
+    "@types/lodash": "^4.14.167",
     "@types/react": "^16.14.2",
     "@types/react-document-title": "^2.0.4",
     "@types/react-dom": "^16.9.10",
-    "@types/react-redux": "^7.1.11",
-    "@types/react-router-dom": "^5.1.6",
+    "@types/react-redux": "^7.1.15",
+    "@types/react-router-dom": "^5.1.7",
     "@types/redux-logger": "^3.0.8",
     "@types/uuid": "^8.3.0",
-    "@typescript-eslint/eslint-plugin": "^4.9.1",
-    "@typescript-eslint/parser": "^4.9.1",
-    "autoprefixer": "^10.1.0",
+    "@typescript-eslint/eslint-plugin": "^4.12.0",
+    "@typescript-eslint/parser": "^4.12.0",
+    "autoprefixer": "^10.2.0",
     "babel-jest": "^26.6.3",
     "babel-loader": "^8.2.2",
-    "clean-webpack-plugin": "^3.0.0",
-    "core-js": "^3.8.1",
+    "core-js": "^3.8.2",
     "coveralls": "^3.1.0",
     "css-loader": "^5.0.1",
-    "eslint": "^7.15.0",
-    "eslint-config-prettier": "^7.0.0",
+    "css-minimizer-webpack-plugin": "^1.1.5",
+    "eslint": "^7.17.0",
+    "eslint-config-prettier": "^7.1.0",
     "eslint-import-resolver-typescript": "^2.3.0",
     "eslint-import-resolver-webpack": "^0.13.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-prettier": "^3.2.0",
-    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "fetch-mock": "^9.11.0",
     "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^4.5.0",
-    "i18next-scanner-webpack": "^0.6.0",
+    "html-webpack-plugin": "^5.0.0-0",
+    "i18next-scanner-webpack": "^0.7.0",
     "jest": "^26.6.3",
     "jest-junit": "^12.0.0",
-    "mini-css-extract-plugin": "^1.3.2",
+    "mini-css-extract-plugin": "^1.3.3",
     "node-fetch": "^2.6.1",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.4",
-    "postcss": "^8.2.1",
+    "postcss": "^8.2.2",
     "postcss-loader": "^4.1.0",
     "prettier": "^2.2.1",
+    "raw-loader": "^4.0.2",
     "react-test-renderer": "^16.13.1",
     "redux-mock-store": "^1.5.4",
-    "sass": "^1.30.0",
+    "sass": "^1.32.0",
     "sass-loader": "^10.1.0",
     "stylelint": "^13.8.0",
     "stylelint-config-prettier": "^8.0.2",
     "stylelint-config-recommended": "^3.0.0",
     "stylelint-prettier": "^1.1.2",
     "stylelint-scss": "^3.18.0",
-    "svg-inline-loader": "^0.8.2",
-    "typescript": "^4.1.2",
+    "typescript": "^4.1.3",
     "url-loader": "^4.1.1",
-    "webpack": "^4.44.2",
-    "webpack-cli": "^4.2.0",
-    "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "^5.4.1"
+    "webpack": "^5.11.1",
+    "webpack-cli": "^4.3.1",
+    "webpack-dev-server": "^4.0.0-0",
+    "webpack-merge": "^5.7.3"
   },
   "resolutions": {
     "@types/react": "^16.14.2"

requirements/dev.in

@@ -1,20 +1,20 @@
 -c prod.txt
-Sphinx==3.3.1
+Sphinx==3.4.2
 black==20.8b1
 coveralls==2.2.0
 django-extensions==3.1.0
 doc8==0.8.1
-factory_boy==3.1.0
+factory_boy==3.2.0
 flake8-bugbear==20.11.1
 flake8==3.8.4
 ipython==7.19.0
-isort==5.6.4
+isort==5.7.0
 pytest-asyncio==0.14.0
 pytest-cov==2.10.1
 pytest-django==4.1.0
-pytest-factoryboy==2.0.3
-pytest-mock==3.3.1
+pytest-factoryboy==2.1.0
+pytest-mock==3.5.0
 pytest-sugar==0.9.4
-pytest==6.1.2
+pytest==6.2.1
 remote-pdb==2.1.0
 sphinxcontrib-httpdomain==1.7.0

requirements/dev.txt

@@ -13,15 +13,15 @@ black==20.8b1             # via -r requirements/dev.in
 certifi==2020.11.8        # via -c requirements/prod.txt, requests
 chardet==3.0.4            # via -c requirements/prod.txt, doc8, requests
 click==7.1.2              # via -c requirements/prod.txt, black
-coverage==5.3             # via coveralls, pytest-cov
+coverage==5.3.1           # via coveralls, pytest-cov
 coveralls==2.2.0          # via -r requirements/dev.in
 decorator==4.4.2          # via ipython
 django-extensions==3.1.0  # via -r requirements/dev.in
 doc8==0.8.1               # via -r requirements/dev.in
 docopt==0.6.2             # via coveralls
 docutils==0.16            # via -c requirements/prod.txt, doc8, restructuredtext-lint, sphinx
-factory-boy==3.1.0        # via -r requirements/dev.in, pytest-factoryboy
-faker==4.17.1             # via -c requirements/prod.txt, factory-boy
+factory-boy==3.2.0        # via -r requirements/dev.in, pytest-factoryboy
+faker==4.18.0             # via -c requirements/prod.txt, factory-boy
 flake8-bugbear==20.11.1   # via -r requirements/dev.in
 flake8==3.8.4             # via -r requirements/dev.in, flake8-bugbear
 idna==2.10                # via -c requirements/prod.txt, requests
@@ -30,33 +30,33 @@ inflection==0.5.1         # via pytest-factoryboy
 iniconfig==1.1.1          # via pytest
 ipython-genutils==0.2.0   # via traitlets
 ipython==7.19.0           # via -r requirements/dev.in
-isort==5.6.4              # via -r requirements/dev.in
-jedi==0.17.2              # via ipython
+isort==5.7.0              # via -r requirements/dev.in
+jedi==0.18.0              # via ipython
 jinja2==2.11.2            # via -c requirements/prod.txt, sphinx
 markupsafe==1.1.1         # via -c requirements/prod.txt, jinja2
 mccabe==0.6.1             # via flake8
 mypy-extensions==0.4.3    # via black
-packaging==20.7           # via -c requirements/prod.txt, pytest, pytest-sugar, sphinx
-parso==0.7.1              # via jedi
+packaging==20.8           # via -c requirements/prod.txt, pytest, pytest-sugar, sphinx
+parso==0.8.1              # via jedi
 pathspec==0.8.1           # via black
 pbr==5.5.1                # via stevedore
 pexpect==4.8.0            # via ipython
 pickleshare==0.7.5        # via ipython
 pluggy==0.13.1            # via pytest
-prompt-toolkit==3.0.8     # via ipython
-ptyprocess==0.6.0         # via pexpect
-py==1.9.0                 # via pytest
+prompt-toolkit==3.0.9     # via ipython
+ptyprocess==0.7.0         # via pexpect
+py==1.10.0                # via pytest
 pycodestyle==2.6.0        # via flake8
 pyflakes==2.2.0           # via flake8
 pygments==2.7.3           # via doc8, ipython, sphinx
 pyparsing==2.4.7          # via -c requirements/prod.txt, packaging
 pytest-asyncio==0.14.0    # via -r requirements/dev.in
 pytest-cov==2.10.1        # via -r requirements/dev.in
 pytest-django==4.1.0      # via -r requirements/dev.in
-pytest-factoryboy==2.0.3  # via -r requirements/dev.in
-pytest-mock==3.3.1        # via -r requirements/dev.in
+pytest-factoryboy==2.1.0  # via -r requirements/dev.in
+pytest-mock==3.5.0        # via -r requirements/dev.in
 pytest-sugar==0.9.4       # via -r requirements/dev.in
-pytest==6.1.2             # via -r requirements/dev.in, pytest-asyncio, pytest-cov, pytest-django, pytest-factoryboy, pytest-mock, pytest-sugar
+pytest==6.2.1             # via -r requirements/dev.in, pytest-asyncio, pytest-cov, pytest-django, pytest-factoryboy, pytest-mock, pytest-sugar
 python-dateutil==2.8.1    # via -c requirements/prod.txt, faker
 pytz==2020.4              # via -c requirements/prod.txt, babel
 regex==2020.11.13         # via black
@@ -65,7 +65,7 @@ requests==2.25.0          # via -c requirements/prod.txt, coveralls, sphinx
 restructuredtext-lint==1.3.2  # via doc8
 six==1.15.0               # via -c requirements/prod.txt, doc8, python-dateutil, sphinxcontrib-httpdomain
 snowballstemmer==2.0.0    # via sphinx
-sphinx==3.3.1             # via -r requirements/dev.in, sphinxcontrib-httpdomain
+sphinx==3.4.2             # via -r requirements/dev.in, sphinxcontrib-httpdomain
 sphinxcontrib-applehelp==1.0.2  # via sphinx
 sphinxcontrib-devhelp==1.0.2  # via sphinx
 sphinxcontrib-htmlhelp==1.0.3  # via sphinx
@@ -78,7 +78,7 @@ termcolor==1.1.0          # via pytest-sugar
 text-unidecode==1.3       # via -c requirements/prod.txt, faker
 toml==0.10.2              # via black, pytest
 traitlets==5.0.5          # via ipython
-typed-ast==1.4.1          # via black
+typed-ast==1.4.2          # via black
 typing-extensions==3.7.4.3  # via -c requirements/prod.txt, black
 urllib3==1.26.2           # via -c requirements/prod.txt, requests
 wcwidth==0.2.5            # via prompt-toolkit

requirements/prod.in

@@ -1,9 +1,9 @@
-Django==3.1.4
+Django==3.1.5
 beautifulsoup4==4.9.3
 bleach==3.2.1
 channels-redis==3.2.0
-channels==3.0.2
-cumulusci==3.24.1
+channels==3.0.3
+cumulusci==3.25.0
 dj-database-url==0.5.0
 django-allauth==0.44.0
 django-anymail[mailgun]==8.1
@@ -29,7 +29,7 @@ markdown==3.3.3
 psycopg2-binary==2.8.6
 
 rq-scheduler==0.10.0
-sentry-sdk==0.19.4
+sentry-sdk==0.19.5
 service_identity==18.1.0
 https://github.com/SFDO-Tooling/sfdo-template-helpers/archive/v0.16.0.tar.gz
 whitenoise==5.2.0

requirements/prod.txt

@@ -11,21 +11,21 @@ asn1crypto==1.4.0         # via cumulusci
 async-timeout==3.0.1      # via aioredis
 attrs==20.3.0             # via automat, service-identity, twisted
 authlib==0.15.2           # via simple-salesforce
-autobahn==20.7.1          # via daphne
+autobahn==20.12.3         # via daphne
 automat==20.2.0           # via twisted
 beautifulsoup4==4.9.3     # via -r requirements/prod.in
 bleach==3.2.1             # via -r requirements/prod.in, sfdo-template-helpers
 certifi==2020.11.8        # via cumulusci, requests, sentry-sdk
 cffi==1.14.4              # via cryptography, cumulusci
 channels-redis==3.2.0     # via -r requirements/prod.in
-channels==3.0.2           # via -r requirements/prod.in, channels-redis
+channels==3.0.3           # via -r requirements/prod.in, channels-redis
 chardet==3.0.4            # via cumulusci, requests
 click==7.1.2              # via cumulusci, rq, snowfakery
 coloredlogs==14.0         # via cumulusci
 constantly==15.1.0        # via twisted
-croniter==0.3.36          # via rq-scheduler
+croniter==0.3.37          # via rq-scheduler
 cryptography==3.2.1       # via authlib, autobahn, cumulusci, jwcrypto, pyjwt, pyopenssl, secretstorage, service-identity, sfdo-template-helpers
-cumulusci==3.24.1         # via -r requirements/prod.in
+cumulusci==3.25.0         # via -r requirements/prod.in
 daphne==3.0.1             # via channels
 defusedxml==0.6.0         # via python3-openid
 dj-database-url==0.5.0    # via -r requirements/prod.in
@@ -39,42 +39,42 @@ django-model-utils==4.1.1  # via -r requirements/prod.in
 django-parler==2.2        # via -r requirements/prod.in
 django-redis==4.12.1      # via -r requirements/prod.in
 django-rq==2.4.0          # via -r requirements/prod.in
-django==3.1.4             # via -r requirements/prod.in, channels, django-allauth, django-anymail, django-filter, django-hashid-field, django-js-reverse, django-log-request-id, django-model-utils, django-redis, django-rq, djangorestframework, sfdo-template-helpers
+django==3.1.5             # via -r requirements/prod.in, channels, django-allauth, django-anymail, django-filter, django-hashid-field, django-js-reverse, django-log-request-id, django-model-utils, django-redis, django-rq, djangorestframework, sfdo-template-helpers
 djangorestframework==3.12.2  # via -r requirements/prod.in, sfdo-template-helpers
 docutils==0.16            # via cumulusci
-faker==4.17.1             # via cumulusci, snowfakery
+faker==4.18.0             # via cumulusci, snowfakery
 fs==2.4.11                # via cumulusci
 furl==2.1.0               # via -r requirements/prod.in
 github3-py==1.3.0         # via -r requirements/prod.in
 github3.py==1.3.0         # via cumulusci
 hashids==1.3.1            # via django-hashid-field
 hiredis==1.1.0            # via aioredis
 honcho==1.0.1             # via -r requirements/prod.in
-humanfriendly==8.2        # via coloredlogs, cumulusci
-hyperlink==20.0.1         # via twisted
+humanfriendly==9.0        # via coloredlogs, cumulusci
+hyperlink==20.0.1         # via autobahn, twisted
 idna==2.10                # via hyperlink, requests, twisted
 incremental==17.5.0       # via twisted
 jeepney==0.6.0            # via keyring, secretstorage
 jinja2==2.11.2            # via cumulusci, snowfakery
 jwcrypto==0.8             # via cumulusci, github3-py, github3.py
 keyring==21.5.0           # via cumulusci
 logfmt==0.4               # via -r requirements/prod.in, sfdo-template-helpers
-lxml==4.6.1               # via cumulusci
+lxml==4.6.2               # via cumulusci
 markdown==3.3.3           # via -r requirements/prod.in, sfdo-template-helpers
 markupsafe==1.1.1         # via cumulusci, jinja2
-msgpack==1.0.0            # via channels-redis
+msgpack==1.0.2            # via channels-redis
 natsort==7.1.0            # via croniter
 oauthlib==3.1.0           # via requests-oauthlib
 orderedmultidict==1.0.1   # via furl
-packaging==20.7           # via bleach
+packaging==20.8           # via bleach
 psycopg2-binary==2.8.6    # via -r requirements/prod.in
 pyasn1-modules==0.2.8     # via service-identity
 pyasn1==0.4.8             # via pyasn1-modules, service-identity
 pycparser==2.20           # via cffi, cumulusci
-pydantic==1.7.2           # via cumulusci
+pydantic==1.7.3           # via cumulusci
 pyhamcrest==2.0.2         # via twisted
 pyjwt[crypto]==1.7.1      # via cumulusci, django-allauth
-pyopenssl==20.0.0         # via twisted
+pyopenssl==20.0.1         # via twisted
 pyparsing==2.4.7          # via packaging
 python-dateutil==2.8.1    # via croniter, cumulusci, faker, github3-py, github3.py, snowfakery
 python3-openid==3.2.0     # via django-allauth
@@ -86,7 +86,7 @@ requests-oauthlib==1.3.0  # via django-allauth
 requests==2.25.0          # via cumulusci, django-allauth, django-anymail, github3-py, github3.py, requests-oauthlib, robotframework-requests, salesforce-bulk, simple-salesforce
 robotframework-lint==1.1  # via cumulusci
 robotframework-pabot==1.10.0  # via cumulusci
-robotframework-pythonlibcore==2.1.0  # via robotframework-seleniumlibrary
+robotframework-pythonlibcore==2.2.1  # via robotframework-seleniumlibrary
 robotframework-requests==0.7.2  # via cumulusci
 robotframework-seleniumlibrary==4.5.0  # via cumulusci
 robotframework==3.2.2     # via cumulusci, robotframework-lint, robotframework-pabot, robotframework-requests, robotframework-seleniumlibrary
@@ -97,19 +97,19 @@ salesforce-bulk==2.2.0    # via cumulusci
 sarge==0.1.6              # via cumulusci
 secretstorage==3.3.0      # via keyring
 selenium==3.141.0         # via cumulusci, robotframework-seleniumlibrary
-sentry-sdk==0.19.4        # via -r requirements/prod.in
+sentry-sdk==0.19.5        # via -r requirements/prod.in
 service-identity==18.1.0  # via -r requirements/prod.in, twisted
 https://github.com/SFDO-Tooling/sfdo-template-helpers/archive/v0.16.0.tar.gz  # via -r requirements/prod.in
 simple-salesforce==1.10.1  # via cumulusci, salesforce-bulk
 six==1.15.0               # via automat, bleach, cryptography, cumulusci, fs, furl, orderedmultidict, pyopenssl, python-dateutil, salesforce-bulk
 snowfakery==1.3.0         # via cumulusci
-soupsieve==2.0.1          # via beautifulsoup4
+soupsieve==2.1            # via beautifulsoup4
 sqlalchemy==1.3.20        # via cumulusci, snowfakery
 sqlparse==0.4.1           # via django
 terminaltables==3.1.0     # via cumulusci
 text-unidecode==1.3       # via faker
 twisted[tls]==20.3.0      # via daphne
-txaio==20.4.1             # via autobahn
+txaio==20.12.1            # via autobahn
 typing-extensions==3.7.4.3  # via cumulusci
 unicodecsv==0.14.1        # via salesforce-bulk
 uritemplate==3.0.1        # via cumulusci, github3-py, github3.py

src/js/@types/global.d.ts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/browser';
 
-import { Socket } from '@/utils/websockets';
+import { Socket } from '~js/utils/websockets';
 
 declare global {
   interface Window {