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

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.
This commit is contained in:
Claire
2021-10-25 20:28:51 +02:00
258 changed files with 12765 additions and 4746 deletions

View File

@ -75,7 +75,7 @@
"atrament": "0.2.4",
"arrow-key-navigation": "^1.2.0",
"autoprefixer": "^9.8.8",
"axios": "^0.22.0",
"axios": "^0.23.0",
"babel-loader": "^8.2.2",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^5.0.0",
@ -155,7 +155,7 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.2",
"sass": "^1.42.1",
"sass": "^1.43.2",
"sass-loader": "^10.2.0",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
@ -168,7 +168,7 @@
"uuid": "^8.3.1",
"webpack": "^4.46.0",
"webpack-assets-manifest": "^4.0.6",
"webpack-bundle-analyzer": "^4.4.2",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.8.0",
"wicg-inert": "^3.1.1",
@ -178,13 +178,13 @@
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.1.2",
"babel-eslint": "^10.1.0",
"babel-jest": "^27.2.5",
"babel-jest": "^27.3.1",
"eslint": "^7.32.0",
"eslint-plugin-import": "~2.24.2",
"eslint-plugin-import": "~2.25.2",
"eslint-plugin-jsx-a11y": "~6.4.1",
"eslint-plugin-promise": "~5.1.0",
"eslint-plugin-react": "~7.26.1",
"jest": "^27.2.5",
"jest": "^27.3.1",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.14.0",
@ -196,7 +196,7 @@
"kind-of": "^6.0.3"
},
"optionalDependencies": {
"bufferutil": "^4.0.4",
"utf-8-validate": "^5.0.6"
"bufferutil": "^4.0.5",
"utf-8-validate": "^5.0.7"
}
}