diff options
| author | violoncello.ch <22591354+violoncelloCH@users.noreply.github.com> | 2022-04-23 13:59:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 13:59:29 +0200 |
| commit | e4469d6526ad2821f81bbc2e9d4613bb52e50128 (patch) | |
| tree | 78fee84ec4805a4029a06eab6c272afc528a058e | |
| parent | 7cb1823693f716dd44066071d794649061da5c54 (diff) | |
| parent | 1712cabd5a5a14d971c5bda227db34d936c6f1b8 (diff) | |
Merge pull request #1398 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.8.0
Bump webpack-merge from 5.7.3 to 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 7b4ec768..60143e91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20442,9 +20442,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 5dc1ba8d..53131b21 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "vue-template-compiler": "^2.6.14", "webpack": "^4.46.0", "webpack-cli": "^4.9.2", - "webpack-merge": "^5.7.3" + "webpack-merge": "^5.8.0" }, "jest": { "moduleFileExtensions": [ |