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

This commit is contained in:
Claire
2023-03-02 17:32:38 +01:00
97 changed files with 1412 additions and 523 deletions

View File

@@ -32,7 +32,7 @@
"@babel/preset-react": "^7.18.6",
"@babel/runtime": "^7.21.0",
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^0.5.7",
"@github/webauthn-json": "^2.1.1",
"@rails/ujs": "^6.1.7",
"abortcontroller-polyfill": "^1.7.5",
"array-includes": "^3.1.6",
@@ -48,7 +48,7 @@
"blurhash": "^2.0.5",
"classnames": "^2.3.2",
"cocoon-js-vanilla": "^1.3.0",
"color-blend": "^3.0.1",
"color-blend": "^4.0.0",
"compression-webpack-plugin": "^6.1.1",
"cross-env": "^7.0.3",
"css-loader": "^5.2.7",
@@ -63,7 +63,7 @@
"favico.js": "^0.3.10",
"file-loader": "^6.2.0",
"font-awesome": "^4.7.0",
"fuzzysort": "^1.9.0",
"fuzzysort": "^2.0.4",
"glob": "^8.1.0",
"history": "^4.10.1",
"http-link-header": "^1.1.0",