diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-01-10 21:43:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 21:43:32 +0100 |
| commit | 6eff95b361165cbd66cf457f808f64d793064ade (patch) | |
| tree | 22b3836e493e2b7de2b154c652017cdcb0860f2a | |
| parent | 5756658b03c7a1d02cf0e522be7be018c9f8aa11 (diff) | |
| parent | 78a4c60f675fa74c1efe1952acea9743fa6f20a7 (diff) | |
| download | nextcloud-server-6eff95b361165cbd66cf457f808f64d793064ade.tar.gz nextcloud-server-6eff95b361165cbd66cf457f808f64d793064ade.zip | |
Merge pull request #13497 from nextcloud/dependabot/npm_and_yarn/webpack-merge-4.2.1
Bump webpack-merge from 4.1.5 to 4.2.1
| -rw-r--r-- | package-lock.json | 21 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 14 insertions, 9 deletions
diff --git a/package-lock.json b/package-lock.json index df3342840a2..553b24ed427 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1030,7 +1030,7 @@ }, "Select2": { "version": "git+https://github.com/select2/select2.git#b5f3b2839c48c53f9641d6bb1bccafc5260c7620", - "from": "git+https://github.com/select2/select2.git#3.4.8" + "from": "git+https://github.com/select2/select2.git#b5f3b2839c48c53f9641d6bb1bccafc5260c7620" }, "acorn": { "version": "5.7.3", @@ -2623,7 +2623,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3038,7 +3039,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3094,6 +3096,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3137,12 +3140,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -5719,9 +5724,9 @@ } }, "webpack-merge": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz", - "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", + "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/package.json b/package.json index 98d306ce536..f76e437b401 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,6 @@ "url-loader": "^1.1.2", "webpack": "^4.28.4", "webpack-cli": "^3.1.2", - "webpack-merge": "^4.1.5" + "webpack-merge": "^4.2.1" } } |