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

Conflicts:
- `app/models/status.rb`:
  Minor upstream refactor moved hook definitions around,
  and glitch-soc has an extra `before_create`.
  Moved the `before_create` accordingly.
- `app/services/batched_remove_status_service.rb`:
  Minor upstream refactor changed a block in which glitch-soc
  had one extra call to handle direct timelines.
  Adapted changes to keep glitch-soc's extra call.
This commit is contained in:
Claire
2023-01-12 10:15:46 +01:00
144 changed files with 1747 additions and 1538 deletions

View File

@ -24,7 +24,7 @@
},
"private": true,
"dependencies": {
"@babel/core": "^7.20.7",
"@babel/core": "^7.20.12",
"@babel/plugin-proposal-decorators": "^7.20.7",
"@babel/plugin-transform-react-inline-elements": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.19.6",
@ -67,7 +67,7 @@
"glob": "^8.0.3",
"history": "^4.10.1",
"http-link-header": "^1.1.0",
"immutable": "^4.2.1",
"immutable": "^4.2.2",
"imports-loader": "^1.2.0",
"intersection-observer": "^0.12.2",
"intl": "^1.2.5",
@ -75,7 +75,7 @@
"intl-relativeformat": "^6.4.3",
"is-nan": "^1.3.2",
"js-yaml": "^4.1.0",
"jsdom": "^20.0.3",
"jsdom": "^21.0.0",
"lodash": "^4.17.21",
"mark-loader": "^0.1.6",
"marky": "^1.2.5",
@ -86,7 +86,7 @@
"object.values": "^1.1.6",
"path-complete-extname": "^1.0.0",
"pg": "^8.5.0",
"postcss": "^8.4.20",
"postcss": "^8.4.21",
"postcss-loader": "^3.0.0",
"promise.prototype.finally": "^3.1.4",
"prop-types": "^15.8.1",
@ -100,7 +100,7 @@
"react-intl": "^2.9.0",
"react-motion": "^0.5.2",
"react-notification": "^6.8.5",
"react-overlays": "^0.9.3",
"react-overlays": "^5.2.1",
"react-redux": "^7.2.9",
"react-redux-loading-bar": "^5.0.4",
"react-router-dom": "^4.1.1",
@ -141,7 +141,7 @@
"workbox-strategies": "^6.5.4",
"workbox-webpack-plugin": "^6.5.4",
"workbox-window": "^6.5.4",
"ws": "^8.10.0"
"ws": "^8.12.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.19.1",
@ -156,7 +156,7 @@
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"postcss-scss": "^4.0.6",
"prettier": "^2.8.1",
"prettier": "^2.8.2",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.14.0",
@ -170,6 +170,6 @@
},
"optionalDependencies": {
"bufferutil": "^4.0.7",
"utf-8-validate": "^5.0.10"
"utf-8-validate": "^6.0.0"
}
}