From ee1f4b390e9c2a97ab129a8cb57c2decf8a1b7d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Jul 2024 01:41:31 +0000
Subject: [PATCH] build(deps-dev): bump webpack-merge from 5.10.0 to 6.0.1

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.10.0 to 6.0.1.
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.10.0...v6.0.1)

---
updated-dependencies:
- dependency-name: webpack-merge
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 26 ++++++++++++++++++++------
 package.json      |  2 +-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 23481d1eae279..1e3efbaed06d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -161,7 +161,7 @@
         "wait-on": "^7.2.0",
         "webpack": "^5.91.0",
         "webpack-cli": "^5.0.2",
-        "webpack-merge": "^5.8.0",
+        "webpack-merge": "^6.0.1",
         "workbox-webpack-plugin": "^7.0.0"
       },
       "engines": {
@@ -27374,6 +27374,20 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/webpack-cli/node_modules/webpack-merge": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/webpack-dev-middleware": {
       "version": "5.3.4",
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
@@ -27459,17 +27473,17 @@
       }
     },
     "node_modules/webpack-merge": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
-      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+      "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
       "dev": true,
       "dependencies": {
         "clone-deep": "^4.0.1",
         "flat": "^5.0.2",
-        "wildcard": "^2.0.0"
+        "wildcard": "^2.0.1"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/webpack-sources": {
diff --git a/package.json b/package.json
index 6f518ba0730b9..997578dbac5d4 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
     "wait-on": "^7.2.0",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.0.2",
-    "webpack-merge": "^5.8.0",
+    "webpack-merge": "^6.0.1",
     "workbox-webpack-plugin": "^7.0.0"
   },
   "browserslist": [