Merge pull request #24123 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.4.0

Bump webpack-merge from 5.2.0 to 5.4.0

package-lock.json

@@ -11240,9 +11240,9 @@
       }
     },
     "webpack-merge": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.2.0.tgz",
-      "integrity": "sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz",
+      "integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",

package.json

@@ -127,7 +127,7 @@
     "vue-template-compiler": "^2.6.12",
     "webpack": "^4.44.2",
     "webpack-cli": "^4.2.0",
-    "webpack-merge": "^5.2.0",
+    "webpack-merge": "^5.4.0",
     "webpack-node-externals": "^2.5.2"
   },
   "browserslist": [