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

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
This commit is contained in:
Claire
2022-03-15 20:45:27 +01:00
146 changed files with 1357 additions and 820 deletions

View File

@@ -61,21 +61,21 @@
},
"private": true,
"dependencies": {
"@babel/core": "^7.17.5",
"@babel/core": "^7.17.7",
"@babel/plugin-proposal-decorators": "^7.17.2",
"@babel/plugin-transform-react-inline-elements": "^7.16.7",
"@babel/plugin-transform-runtime": "^7.17.0",
"@babel/preset-env": "^7.16.11",
"@babel/preset-react": "^7.16.7",
"@babel/runtime": "^7.17.2",
"@babel/runtime": "^7.17.7",
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^0.5.7",
"@rails/ujs": "^6.1.4",
"@rails/ujs": "^6.1.5",
"array-includes": "^3.1.4",
"atrament": "0.2.4",
"arrow-key-navigation": "^1.2.0",
"autoprefixer": "^9.8.8",
"axios": "^0.26.0",
"axios": "^0.26.1",
"babel-loader": "^8.2.3",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^5.1.0",
@@ -176,7 +176,7 @@
},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.3",
"@testing-library/react": "^12.1.4",
"babel-eslint": "^10.1.0",
"babel-jest": "^27.5.1",
"eslint": "^7.32.0",
@@ -197,6 +197,6 @@
},
"optionalDependencies": {
"bufferutil": "^4.0.6",
"utf-8-validate": "^5.0.8"
"utf-8-validate": "^5.0.9"
}
}