From 09ca568baa2dd32ca30b24e7b19931cd67e28b33 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:49:51 +0000
Subject: [PATCH] fix(deps): update dependency webpack-merge to v4.2.2 (#35842)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 20 ++++++--------------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ba55a7803290..689e00036d26 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,7 +71,7 @@
         "underscore.string": "3.3.6",
         "webpack": "^5.90.3",
         "webpack-bundle-tracker": "0.4.3",
-        "webpack-merge": "4.1.1",
+        "webpack-merge": "4.2.2",
         "whatwg-fetch": "2.0.4",
         "which-country": "1.0.0"
       },
@@ -16086,15 +16086,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/karma-webpack/node_modules/webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.15"
-      }
-    },
     "node_modules/karma/node_modules/lodash": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
@@ -25616,11 +25607,12 @@
       }
     },
     "node_modules/webpack-merge": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.1.tgz",
-      "integrity": "sha512-geQsZ86YkXOVOjvPC5yv3JSNnL6/X3Kzh935AQ/gJNEYXEfJDQFu/sdFuktS9OW2JcH/SJec8TGfRdrpHshH7A==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "license": "MIT",
       "dependencies": {
-        "lodash": "^4.17.4"
+        "lodash": "^4.17.15"
       }
     },
     "node_modules/webpack-sources": {
diff --git a/package.json b/package.json
index 88ec52d82069..cc83709ed013 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "underscore.string": "3.3.6",
     "webpack": "^5.90.3",
     "webpack-bundle-tracker": "0.4.3",
-    "webpack-merge": "4.1.1",
+    "webpack-merge": "4.2.2",
     "whatwg-fetch": "2.0.4",
     "which-country": "1.0.0"
   },