diff options
| author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2021-06-08 22:55:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 22:55:38 +0000 |
| commit | 5257688afb80724f2a64f2857c3d79bc5e51a339 (patch) | |
| tree | 9b6f343797b71b4ab3d280a28350573b18f37f28 | |
| parent | d8bc0665d662eae3eedda1fc6bd70726e904b8f6 (diff) | |
| parent | d4159fa99bfeab2224d8098d368f5e5291ee90fa (diff) | |
| download | nextcloud-server-5257688afb80724f2a64f2857c3d79bc5e51a339.tar.gz nextcloud-server-5257688afb80724f2a64f2857c3d79bc5e51a339.zip | |
Merge pull request #27419 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.8.0
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json index 146344d88d1..c5691ab8cc3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16122,9 +16122,9 @@ } }, "webpack-merge": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", - "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "dev": true, "requires": { "clone-deep": "^4.0.1", diff --git a/package.json b/package.json index 9b5d30bf755..e6688a3fe9d 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "vue-template-compiler": "^2.6.12", "webpack": "^4.46.0", "webpack-cli": "^4.7.2", - "webpack-merge": "^5.7.3", + "webpack-merge": "^5.8.0", "webpack-node-externals": "^3.0.0" }, "browserslist": [ |