Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2022-03-30 13:40:10 +02:00
70 changed files with 900 additions and 623 deletions

View File

@@ -78,7 +78,7 @@
"arrow-key-navigation": "^1.2.0",
"autoprefixer": "^9.8.8",
"axios": "^0.26.1",
"babel-loader": "^8.2.3",
"babel-loader": "^8.2.4",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^5.1.0",
"babel-plugin-react-intl": "^6.2.0",
@@ -177,7 +177,7 @@
"ws": "^8.5.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/jest-dom": "^5.16.3",
"@testing-library/react": "^12.1.4",
"babel-eslint": "^10.1.0",
"babel-jest": "^27.5.1",
@@ -187,13 +187,13 @@
"eslint-plugin-promise": "~6.0.0",
"eslint-plugin-react": "~7.29.4",
"jest": "^27.5.1",
"prettier": "^2.6.0",
"prettier": "^2.6.1",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.14.0",
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.11.3",
"yargs": "^17.3.1"
"yargs": "^17.4.0"
},
"resolutions": {
"kind-of": "^6.0.3"