From 570ac92a8667152bec5bdc616dbe1642246839b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2024 01:14:21 +0000
Subject: [PATCH] Bump webpack-merge from 5.10.0 to 6.0.1 (#675)

---
 package-lock.json | 18 ++++++++++++++++--
 package.json      |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 838620e8..bf6533b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
         "textlint-rule-preset-jtf-style": "^2.3.14",
         "webpack": "^5.92.1",
         "webpack-cli": "^5.1.1",
-        "webpack-merge": "^5.10.0"
+        "webpack-merge": "^6.0.1"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -6314,7 +6314,7 @@
         "node": ">=14"
       }
     },
-    "node_modules/webpack-merge": {
+    "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==",
@@ -6328,6 +6328,20 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/webpack-merge": {
+      "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.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/webpack-sources": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
diff --git a/package.json b/package.json
index a75827bd..805c3d07 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "textlint-rule-preset-jtf-style": "^2.3.14",
     "webpack": "^5.92.1",
     "webpack-cli": "^5.1.1",
-    "webpack-merge": "^5.10.0"
+    "webpack-merge": "^6.0.1"
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.6.0",