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
This commit is contained in:
Claire
2022-05-24 13:59:21 +02:00
parent c279dbd470 e5997a1956
commit 22111914bf
130 changed files with 2804 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
package.json
View File

@ -22,20 +22,14 @@
"type": "git",
"url": "https://github.com/mastodon/mastodon.git"
},
"browserslist": [
"last 2 versions",
"not IE 11",
"iOS >= 9",
"not dead"
],
"private": true,
"dependencies": {
"@babel/core": "^7.17.10",
"@babel/plugin-proposal-decorators": "^7.17.9",
"@babel/core": "^7.17.12",
"@babel/plugin-proposal-decorators": "^7.17.12",
"@babel/plugin-transform-react-inline-elements": "^7.16.7",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/plugin-transform-runtime": "^7.17.12",
"@babel/preset-env": "^7.17.12",
"@babel/preset-react": "^7.17.12",
"@babel/runtime": "^7.17.9",
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^0.5.7",
@ -59,7 +53,7 @@
"css-loader": "^5.2.7",
"cssnano": "^4.1.11",
"detect-passive-events": "^2.0.3",
"dotenv": "^16.0.0",
"dotenv": "^16.0.1",
"emoji-mart": "npm:emoji-mart-lazyload",
"es6-symbol": "^3.1.3",
"escape-html": "^1.0.3",
@ -69,7 +63,7 @@
"file-loader": "^6.2.0",
"font-awesome": "^4.7.0",
"fuzzysort": "^1.9.0",
"glob": "^8.0.1",
"glob": "^8.0.3",
"history": "^4.10.1",
"http-link-header": "^1.0.4",
"immutable": "^4.0.0",
@ -162,7 +156,7 @@
"react-test-renderer": "^16.14.0",
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.11.3",
"yargs": "^17.4.1"
"yargs": "^17.5.1"
},
"resolutions": {
"kind-of": "^6.0.3"