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

This commit is contained in:
Claire
2021-05-10 21:45:32 +02:00
55 changed files with 652 additions and 425 deletions

View File

@@ -64,7 +64,7 @@
"@babel/plugin-proposal-decorators": "^7.13.15",
"@babel/plugin-transform-react-inline-elements": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.0",
"@babel/preset-env": "^7.14.1",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@gamestdio/websocket": "^0.3.2",
@@ -89,7 +89,7 @@
"css-loader": "^5.2.4",
"cssnano": "^4.1.11",
"detect-passive-events": "^2.0.3",
"dotenv": "^8.2.0",
"dotenv": "^9.0.1",
"emoji-mart": "Gargron/emoji-mart#build",
"es6-symbol": "^3.1.3",
"escape-html": "^1.0.3",
@@ -98,7 +98,7 @@
"favico.js": "^0.3.10",
"file-loader": "^6.2.0",
"font-awesome": "^4.7.0",
"glob": "^7.1.6",
"glob": "^7.1.7",
"history": "^4.10.1",
"http-link-header": "^1.0.3",
"immutable": "^3.8.2",
@@ -178,7 +178,7 @@
"@testing-library/react": "^11.2.6",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"eslint": "^7.25.0",
"eslint": "^7.26.0",
"eslint-plugin-import": "~2.22.1",
"eslint-plugin-jsx-a11y": "~6.4.1",
"eslint-plugin-promise": "~5.1.0",
@@ -189,13 +189,13 @@
"react-test-renderer": "^16.14.0",
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.11.2",
"yargs": "^17.0.0"
"yargs": "^17.0.1"
},
"resolutions": {
"kind-of": "^6.0.3"
},
"optionalDependencies": {
"bufferutil": "^4.0.3",
"utf-8-validate": "^5.0.4"
"utf-8-validate": "^5.0.5"
}
}