diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-06-09 10:39:20 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-09 10:39:20 +0200 |
commit | 12c8ac9e1443d352eca3538ed1558de8ccdd9434 (patch) | |
tree | ed480d77b29f0d571ad219190288bde3b0c09b32 /package.json | |
parent | f328f2faa3fbdb182921366c6a20e745c069b840 (diff) | |
parent | 89f40b6c3ec525b09d02f21e9b45276084167d8d (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/package.json b/package.json index 53937fab4..afb16618f 100644 --- a/package.json +++ b/package.json @@ -60,13 +60,13 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.9.6", + "@babel/core": "^7.10.2", "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-decorators": "^7.8.3", "@babel/plugin-transform-react-inline-elements": "^7.9.0", - "@babel/plugin-transform-runtime": "^7.9.0", - "@babel/preset-env": "^7.9.6", - "@babel/preset-react": "^7.9.4", + "@babel/plugin-transform-runtime": "^7.10.1", + "@babel/preset-env": "^7.10.2", + "@babel/preset-react": "^7.10.1", "@babel/runtime": "^7.8.4", "@clusterws/cws": "^2.0.0", "@gamestdio/websocket": "^0.3.2", @@ -74,7 +74,7 @@ "array-includes": "^3.1.1", "arrow-key-navigation": "^1.1.0", "atrament": "0.2.4", - "autoprefixer": "^9.7.6", + "autoprefixer": "^9.8.0", "axios": "^0.19.2", "babel-loader": "^8.1.0", "babel-plugin-lodash": "^3.3.4", @@ -85,7 +85,7 @@ "blurhash": "^1.1.3", "classnames": "^2.2.5", "compression-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^5.1.1", + "copy-webpack-plugin": "^6.0.2", "cross-env": "^7.0.2", "css-loader": "^3.5.3", "cssnano": "^4.1.10", @@ -97,7 +97,7 @@ "exif-js": "^2.3.0", "express": "^4.17.1", "favico.js": "^0.3.10", - "file-loader": "^5.1.0", + "file-loader": "^6.0.0", "font-awesome": "^4.7.0", "glob": "^7.1.6", "history": "^4.10.1", @@ -131,7 +131,7 @@ "react-dom": "^16.13.1", "react-hotkeys": "^1.1.4", "react-immutable-proptypes": "^2.2.0", - "react-immutable-pure-component": "^1.1.1", + "react-immutable-pure-component": "^2.2.2", "react-intl": "^2.9.0", "react-masonry-infinite": "^1.2.2", "react-motion": "^0.5.2", @@ -144,7 +144,7 @@ "react-select": "^3.1.0", "react-sparklines": "^1.7.0", "react-swipeable-views": "^0.13.9", - "react-textarea-autosize": "^7.1.2", + "react-textarea-autosize": "^8.0.1", "react-toggle": "^4.1.1", "redis": "^3.0.2", "redux": "^4.0.5", @@ -159,7 +159,7 @@ "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", "substring-trie": "^1.0.2", - "terser-webpack-plugin": "^3.0.1", + "terser-webpack-plugin": "^3.0.3", "tesseract.js": "^2.1.1", "throng": "^4.0.0", "tiny-queue": "^0.2.1", @@ -167,13 +167,13 @@ "wavesurfer.js": "^3.3.3", "webpack": "^4.43.0", "webpack-assets-manifest": "^3.1.1", - "webpack-bundle-analyzer": "^3.7.0", + "webpack-bundle-analyzer": "^3.8.0", "webpack-cli": "^3.3.11", "webpack-merge": "^4.2.1", "wicg-inert": "^3.0.3" }, "devDependencies": { - "babel-eslint": "^10.0.3", + "babel-eslint": "^10.1.0", "babel-jest": "^25.2.4", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.2", @@ -181,7 +181,7 @@ "eslint-plugin-import": "~2.20.2", "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-promise": "~4.2.1", - "eslint-plugin-react": "~7.19.0", + "eslint-plugin-react": "~7.20.0", "jest": "^25.4.0", "raf": "^3.4.1", "react-intl-translations-manager": "^5.0.3", |