diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
| commit | 7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch) | |
| tree | ef366f436ed5180489cc9377268e10328fe9a932 /package.json | |
| parent | 02f1c04fabab221130de8dfb5611be81825b193b (diff) | |
| parent | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package.json b/package.json index be4eb877f..b1c0ff8d1 100644 --- a/package.json +++ b/package.json @@ -60,11 +60,11 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.8.6", + "@babel/core": "^7.9.0", "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-decorators": "^7.8.3", - "@babel/plugin-transform-react-inline-elements": "^7.8.3", - "@babel/plugin-transform-runtime": "^7.8.3", + "@babel/plugin-transform-react-inline-elements": "^7.9.0", + "@babel/plugin-transform-runtime": "^7.9.0", "@babel/preset-env": "^7.8.3", "@babel/preset-react": "^7.8.3", "@babel/runtime": "^7.8.4", @@ -77,7 +77,7 @@ "axios": "^0.19.2", "babel-loader": "^8.0.6", "babel-plugin-lodash": "^3.3.4", - "babel-plugin-preval": "^4.0.0", + "babel-plugin-preval": "^5.0.0", "babel-plugin-react-intl": "^3.4.1", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", "babel-runtime": "^6.26.0", @@ -141,7 +141,7 @@ "react-redux-loading-bar": "^4.0.8", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", - "react-select": "^3.0.8", + "react-select": "^3.1.0", "react-sparklines": "^1.7.0", "react-swipeable-views": "^0.13.9", "react-textarea-autosize": "^7.1.2", @@ -165,9 +165,9 @@ "tiny-queue": "^0.2.1", "uuid": "^3.4.0", "wavesurfer.js": "^3.3.1", - "webpack": "^4.41.5", + "webpack": "^4.42.1", "webpack-assets-manifest": "^3.1.1", - "webpack-bundle-analyzer": "^3.6.0", + "webpack-bundle-analyzer": "^3.6.1", "webpack-cli": "^3.3.11", "webpack-merge": "^4.2.1", "wicg-inert": "^3.0.2" |