diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2019-09-01 01:14:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-01 01:14:45 +0000 |
| commit | 5813136e84f7040c37a487a2dcc13c4629a1d41b (patch) | |
| tree | 9cc3b18f736c474bcd865be1e0f877fbc19acd20 | |
| parent | e5c81ceda402c97b11badbb056193b563230fe41 (diff) | |
| download | nextcloud-server-5813136e84f7040c37a487a2dcc13c4629a1d41b.tar.gz nextcloud-server-5813136e84f7040c37a487a2dcc13c4629a1d41b.zip | |
Bump webpack-merge from 4.2.1 to 4.2.2
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v4.2.1...v4.2.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
| -rw-r--r-- | package-lock.json | 16 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/package-lock.json b/package-lock.json index 8e65978e5b1..03c4833d2a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3560,11 +3560,11 @@ } }, "follow-redirects": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", - "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.8.1.tgz", + "integrity": "sha512-micCIbldHioIegeKs41DoH0KS3AXfFzgS30qVkM6z/XOE/GJgvmsoc839NUqa1B9udYe9dQxgv7KFwng6+p/dw==", "requires": { - "debug": "^3.2.6" + "debug": "^3.0.0" } }, "for-in": { @@ -9239,12 +9239,12 @@ } }, "webpack-merge": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", - "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", + "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", "dev": true, "requires": { - "lodash": "^4.17.5" + "lodash": "^4.17.15" } }, "webpack-sources": { diff --git a/package.json b/package.json index 246da9ced0b..e6c5efbf475 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "vue-template-compiler": "^2.6.10", "webpack": "^4.39.2", "webpack-cli": "^3.3.7", - "webpack-merge": "^4.2.1" + "webpack-merge": "^4.2.2" }, "browserslist": [ "extends browserslist-config-nextcloud" |