tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `.github/dependabot.yml`:
  Changed upstream, while we modified it in glitch-soc to not get spammed
  by dependabot.
  Kept it removed.
- `README.md`:
  Changed upstream, which has a very different version.
  Discarded upstream changes.
This commit is contained in:
Claire
2022-06-21 08:28:59 +02:00
parent 7a75bce1b4 27f41768e8
commit 0e74d4da59
172 changed files with 1982 additions and 1008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
package.json
View File

@ -2,7 +2,7 @@
"name": "@mastodon/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {
"node": ">=12"
"node": ">=14"
},
"scripts": {
"postversion": "git push --tags",
@ -24,10 +24,10 @@
},
"private": true,
"dependencies": {
"@babel/core": "^7.18.2",
"@babel/core": "^7.18.5",
"@babel/plugin-proposal-decorators": "^7.18.2",
"@babel/plugin-transform-react-inline-elements": "^7.16.7",
"@babel/plugin-transform-runtime": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/runtime": "^7.18.3",
@ -67,7 +67,7 @@
"http-link-header": "^1.0.4",
"immutable": "^4.1.0",
"imports-loader": "^1.2.0",
"intersection-observer": "^0.12.0",
"intersection-observer": "^0.12.2",
"intl": "^1.2.5",
"intl-messageformat": "^2.2.0",
"intl-relativeformat": "^6.4.3",
@ -117,9 +117,9 @@
"regenerator-runtime": "^0.13.9",
"rellax": "^1.12.1",
"requestidlecallback": "^0.3.0",
"reselect": "^4.1.5",
"reselect": "^4.1.6",
"rimraf": "^3.0.2",
"sass": "^1.52.1",
"sass": "^1.52.3",
"sass-loader": "^10.2.0",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
@ -135,27 +135,27 @@
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.8.0",
"wicg-inert": "^3.1.1",
"ws": "^8.7.0"
"wicg-inert": "^3.1.2",
"ws": "^8.8.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.18.2",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^12.1.5",
"babel-jest": "^28.1.0",
"babel-jest": "^28.1.1",
"eslint": "^7.32.0",
"eslint-plugin-import": "~2.26.0",
"eslint-plugin-jsx-a11y": "~6.5.1",
"eslint-plugin-promise": "~6.0.0",
"eslint-plugin-react": "~7.30.0",
"jest": "^28.1.0",
"jest-environment-jsdom": "^28.1.0",
"jest": "^28.1.1",
"jest-environment-jsdom": "^28.1.1",
"postcss-scss": "^4.0.4",
"prettier": "^2.6.2",
"prettier": "^2.7.1",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.14.0",
"stylelint": "^14.8.5",
"stylelint": "^14.9.1",
"stylelint-config-standard-scss": "^4.0.0",
"webpack-dev-server": "^3.11.3",
"yargs": "^17.5.1"