diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2021-03-18 11:14:38 -0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 11:14:38 -0100 |
| commit | d9984a6ae780378a427e2be0754b67654521c7d2 (patch) | |
| tree | 6657c97af830285623e0730ea25229f0dcb8a909 | |
| parent | c75a8c29180bdcdf564d8c2e85e71e2fe0b2077e (diff) | |
| parent | 5dc0ff48576a110a3cb35e07b774ce05fb682e4d (diff) | |
Merge pull request #1171 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.3
Bump webpack-merge from 5.4.0 to 5.7.3
| -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 349f0972..321d18d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20357,9 +20357,9 @@ } }, "webpack-merge": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz", - "integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==", + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", + "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", "dev": true, "requires": { "clone-deep": "^4.0.1", diff --git a/package.json b/package.json index 11a7b9d9..12390b6d 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "vue-template-compiler": "^2.6.12", "webpack": "^4.46.0", "webpack-cli": "^4.5.0", - "webpack-merge": "^5.4.0" + "webpack-merge": "^5.7.3" }, "jest": { "moduleFileExtensions": [ |