Merge pull request #704 from nextcloud/dependabot/npm_and_yarn/webpac…

…k-merge-6.0.1 build(deps-dev): Bump webpack-merge from 5.10.0 to 6.0.1
nextcloud · Jul 15, 2024 · 470982b · 470982b
2 parents 81477ed + 30acc04
commit 470982b
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "style-loader": "^3.3.4",
     "vue-eslint-parser": "^9.4.3",
     "webpack": "^5.93.0",
-    "webpack-merge": "^5.10.0",
+    "webpack-merge": "^6.0.1",
     "worker-loader": "^3.0.8",
     "zx": "^8.1.4"
   },