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
2021-03-31 10:34:29 +02:00
parent a2a85d5ae0 f5bcc6bc65
commit 15efa32cca
12 changed files with 382 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
package.json
View File

@ -60,13 +60,13 @@
},
"private": true,
"dependencies": {
"@babel/core": "^7.13.10",
"@babel/core": "^7.13.14",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-decorators": "^7.13.5",
"@babel/plugin-transform-react-inline-elements": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.13.10",
"@babel/preset-env": "^7.13.10",
"@babel/preset-react": "^7.12.13",
"@babel/preset-env": "^7.13.12",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.13.10",
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^0.5.7",
@ -87,7 +87,7 @@
"color-blend": "^3.0.1",
"compression-webpack-plugin": "^6.1.1",
"cross-env": "^7.0.3",
"css-loader": "^5.1.3",
"css-loader": "^5.2.0",
"cssnano": "^4.1.10",
"detect-passive-events": "^2.0.3",
"dotenv": "^8.2.0",
@ -113,7 +113,7 @@
"lodash": "^4.17.21",
"mark-loader": "^0.1.6",
"marky": "^1.2.1",
"mini-css-extract-plugin": "^1.3.9",
"mini-css-extract-plugin": "^1.4.0",
"mkdirp": "^1.0.4",
"npmlog": "^4.1.2",
"object-assign": "^4.1.1",
@ -137,11 +137,11 @@
"react-motion": "^0.5.2",
"react-notification": "^6.8.5",
"react-overlays": "^0.9.3",
"react-redux": "^7.2.2",
"react-redux": "^7.2.3",
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
"react-select": "^4.0.2",
"react-select": "^4.3.0",
"react-sparklines": "^1.7.0",
"react-swipeable-views": "^0.13.9",
"react-textarea-autosize": "^8.3.2",
@ -175,15 +175,15 @@
"ws": "^7.4.4"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/jest-dom": "^5.11.10",
"@testing-library/react": "^11.2.5",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"eslint": "^7.22.0",
"eslint": "^7.23.0",
"eslint-plugin-import": "~2.22.1",
"eslint-plugin-jsx-a11y": "~6.4.1",
"eslint-plugin-promise": "~4.3.1",
"eslint-plugin-react": "~7.22.0",
"eslint-plugin-react": "~7.23.1",
"jest": "^26.6.3",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",