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

Conflicts:
- `README.md`:
  Our README is completely different.
  Discarded upstream changes.
This commit is contained in:
Claire
2022-11-28 11:33:34 +01:00
246 changed files with 17637 additions and 6738 deletions

View File

@@ -24,13 +24,13 @@
},
"private": true,
"dependencies": {
"@babel/core": "^7.19.6",
"@babel/plugin-proposal-decorators": "^7.19.6",
"@babel/core": "^7.20.2",
"@babel/plugin-proposal-decorators": "^7.20.2",
"@babel/plugin-transform-react-inline-elements": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.19.6",
"@babel/preset-env": "^7.19.4",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/runtime": "^7.19.4",
"@babel/runtime": "^7.20.1",
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^0.5.7",
"@rails/ujs": "^6.1.7",
@@ -40,7 +40,7 @@
"arrow-key-navigation": "^1.2.0",
"autoprefixer": "^9.8.8",
"axios": "^1.1.3",
"babel-loader": "^8.2.5",
"babel-loader": "^8.3.0",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^5.1.0",
"babel-plugin-react-intl": "^6.2.0",
@@ -75,7 +75,7 @@
"intl-relativeformat": "^6.4.3",
"is-nan": "^1.3.2",
"js-yaml": "^4.1.0",
"jsdom": "^20.0.2",
"jsdom": "^20.0.3",
"lodash": "^4.17.21",
"mark-loader": "^0.1.6",
"marky": "^1.2.5",
@@ -116,11 +116,11 @@
"redux": "^4.2.0",
"redux-immutable": "^4.0.0",
"redux-thunk": "^2.4.2",
"regenerator-runtime": "^0.13.10",
"regenerator-runtime": "^0.13.11",
"requestidlecallback": "^0.3.0",
"reselect": "^4.1.7",
"rimraf": "^3.0.2",
"sass": "^1.55.0",
"sass": "^1.56.1",
"sass-loader": "^10.2.0",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
@@ -133,7 +133,7 @@
"uuid": "^8.3.1",
"webpack": "^4.46.0",
"webpack-assets-manifest": "^4.0.6",
"webpack-bundle-analyzer": "^4.6.1",
"webpack-bundle-analyzer": "^4.7.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.8.0",
"wicg-inert": "^3.1.2",
@@ -154,7 +154,7 @@
"eslint-plugin-import": "~2.26.0",
"eslint-plugin-jsx-a11y": "~6.6.1",
"eslint-plugin-promise": "~6.1.1",
"eslint-plugin-react": "~7.31.10",
"eslint-plugin-react": "~7.31.11",
"jest": "^29.2.2",
"jest-environment-jsdom": "^29.2.1",
"postcss-scss": "^4.0.5",