From 57f5a9bc4564a229e53fd171e38be6eeb5c135c7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:45:35 +0000
Subject: [PATCH] chore(deps): update dependency webpack-merge to v5.10.0

---
 package-lock.json | 32 +++++---------------------------
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 594ab29c93..dc61303b43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -90,7 +90,7 @@
         "html-webpack-plugin": "4.5.0",
         "mini-css-extract-plugin": "0.11.2",
         "webpack": "^5.0.0",
-        "webpack-merge": "5.4.0"
+        "webpack-merge": "5.10.0"
       }
     },
     "node_modules/@adobe/css-tools": {
@@ -4734,18 +4734,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@openedx/frontend-build/node_modules/webpack-merge": {
-      "version": "5.10.0",
-      "license": "MIT",
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "flat": "^5.0.2",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
     "node_modules/@openedx/paragon": {
       "version": "21.13.1",
       "license": "Apache-2.0",
@@ -21832,18 +21820,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/webpack-cli/node_modules/webpack-merge": {
-      "version": "5.10.0",
-      "license": "MIT",
-      "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",
       "license": "MIT",
@@ -22048,11 +22024,13 @@
       }
     },
     "node_modules/webpack-merge": {
-      "version": "5.4.0",
+      "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==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
         "wildcard": "^2.0.0"
       },
       "engines": {
diff --git a/package.json b/package.json
index 0c5fb38a52..7b7c22b1e4 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "html-webpack-plugin": "4.5.0",
     "mini-css-extract-plugin": "0.11.2",
     "webpack": "^5.0.0",
-    "webpack-merge": "5.4.0"
+    "webpack-merge": "5.10.0"
   },
   "devDependencies": {
     "@edx/browserslist-config": "1.0.0",