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

Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
This commit is contained in:
Claire
2022-05-03 10:16:49 +02:00
67 changed files with 1518 additions and 892 deletions

View File

@@ -63,11 +63,11 @@
},
"private": true,
"dependencies": {
"@babel/core": "^7.17.9",
"@babel/core": "^7.17.10",
"@babel/plugin-proposal-decorators": "^7.17.9",
"@babel/plugin-transform-react-inline-elements": "^7.16.7",
"@babel/plugin-transform-runtime": "^7.17.0",
"@babel/preset-env": "^7.16.11",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/runtime": "^7.17.9",
"@gamestdio/websocket": "^0.3.2",
@@ -78,7 +78,7 @@
"arrow-key-navigation": "^1.2.0",
"autoprefixer": "^9.8.8",
"axios": "^0.26.1",
"babel-loader": "^8.2.4",
"babel-loader": "^8.2.5",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^5.1.0",
"babel-plugin-react-intl": "^6.2.0",
@@ -97,7 +97,7 @@
"es6-symbol": "^3.1.3",
"escape-html": "^1.0.3",
"exif-js": "^2.3.0",
"express": "^4.18.0",
"express": "^4.18.1",
"favico.js": "^0.3.10",
"file-loader": "^6.2.0",
"font-awesome": "^4.7.0",
@@ -143,7 +143,7 @@
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
"react-select": "^5.3.0",
"react-select": "^5.3.1",
"react-sparklines": "^1.7.0",
"react-swipeable-views": "^0.14.0",
"react-textarea-autosize": "^8.3.3",
@@ -157,7 +157,7 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.1.5",
"rimraf": "^3.0.2",
"sass": "^1.50.1",
"sass": "^1.51.0",
"sass-loader": "^10.2.0",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",