From 76c43571620ac260b6bf7e2a4a94b280cc7fcf21 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 5 Jul 2024 00:49:19 +0000
Subject: [PATCH] chore(deps): update dependency webpack-merge to v6

---
 .../auto-instrumentations-web/package.json    |  2 +-
 package-lock.json                             | 63 +++++++++++++------
 .../package.json                              |  2 +-
 .../package.json                              |  2 +-
 .../package.json                              |  2 +-
 .../package.json                              |  2 +-
 .../package.json                              |  2 +-
 .../package.json                              |  2 +-
 8 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
index 37522b0ae7..d18f1d17f9 100644
--- a/metapackages/auto-instrumentations-web/package.json
+++ b/metapackages/auto-instrumentations-web/package.json
@@ -61,7 +61,7 @@
     "typescript": "4.4.4",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "webpack-merge": "5.10.0"
+    "webpack-merge": "6.0.1"
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.52.0",
diff --git a/package-lock.json b/package-lock.json
index 5c23d15b67..357a438b65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -390,7 +390,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "engines": {
         "node": ">=14"
@@ -35859,7 +35859,7 @@
         "node": ">=10.13.0"
       }
     },
-    "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==",
@@ -35873,6 +35873,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",
@@ -36925,7 +36939,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "engines": {
         "node": ">=14"
@@ -39737,7 +39751,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0",
+        "webpack-merge": "6.0.1",
         "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0"
       },
       "engines": {
@@ -40351,7 +40365,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0",
+        "webpack-merge": "6.0.1",
         "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0"
       },
       "engines": {
@@ -40970,7 +40984,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "engines": {
         "node": ">=14"
@@ -41598,7 +41612,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "engines": {
         "node": ">=8.12.0"
@@ -42173,7 +42187,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "engines": {
         "node": ">=14"
@@ -50460,7 +50474,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "dependencies": {
         "@babel/core": {
@@ -51058,7 +51072,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "dependencies": {
         "@babel/core": {
@@ -52135,7 +52149,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0",
+        "webpack-merge": "6.0.1",
         "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0"
       },
       "dependencies": {
@@ -53501,7 +53515,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0",
+        "webpack-merge": "6.0.1",
         "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0"
       },
       "dependencies": {
@@ -54028,7 +54042,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "dependencies": {
         "@babel/core": {
@@ -54512,7 +54526,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "dependencies": {
         "@babel/core": {
@@ -54941,7 +54955,7 @@
         "typescript": "4.4.4",
         "webpack": "5.89.0",
         "webpack-cli": "5.1.4",
-        "webpack-merge": "5.10.0"
+        "webpack-merge": "6.0.1"
       },
       "dependencies": {
         "@babel/core": {
@@ -75147,18 +75161,29 @@
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
           "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
           "dev": true
+        },
+        "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,
+          "requires": {
+            "clone-deep": "^4.0.1",
+            "flat": "^5.0.2",
+            "wildcard": "^2.0.0"
+          }
         }
       }
     },
     "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,
       "requires": {
         "clone-deep": "^4.0.1",
         "flat": "^5.0.2",
-        "wildcard": "^2.0.0"
+        "wildcard": "^2.0.1"
       }
     },
     "webpack-sources": {
diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
index 03fd94813f..20ea320b2f 100644
--- a/packages/opentelemetry-id-generator-aws-xray/package.json
+++ b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -77,7 +77,7 @@
     "typescript": "4.4.4",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "webpack-merge": "5.10.0"
+    "webpack-merge": "6.0.1"
   },
   "dependencies": {
     "@opentelemetry/core": "^1.0.0"
diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json
index 150eb5940c..0700171e03 100644
--- a/plugins/web/opentelemetry-instrumentation-long-task/package.json
+++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json
@@ -76,7 +76,7 @@
     "typescript": "4.4.4",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "webpack-merge": "5.10.0",
+    "webpack-merge": "6.0.1",
     "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0"
   },
   "dependencies": {
diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json
index 642570faaf..e982162eae 100644
--- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json
+++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json
@@ -79,7 +79,7 @@
     "typescript": "4.4.4",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "webpack-merge": "5.10.0",
+    "webpack-merge": "6.0.1",
     "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0"
   },
   "dependencies": {
diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json
index c59081cd09..386cf32c7f 100644
--- a/plugins/web/opentelemetry-plugin-react-load/package.json
+++ b/plugins/web/opentelemetry-plugin-react-load/package.json
@@ -81,7 +81,7 @@
     "typescript": "4.4.4",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "webpack-merge": "5.10.0"
+    "webpack-merge": "6.0.1"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0",
diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json
index ea88db3b1e..ef459836ab 100644
--- a/propagators/opentelemetry-propagator-instana/package.json
+++ b/propagators/opentelemetry-propagator-instana/package.json
@@ -72,7 +72,7 @@
     "typescript": "4.4.4",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "webpack-merge": "5.10.0"
+    "webpack-merge": "6.0.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-instana#readme"
 }
diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json
index ff172873f3..c5c3917221 100644
--- a/propagators/opentelemetry-propagator-ot-trace/package.json
+++ b/propagators/opentelemetry-propagator-ot-trace/package.json
@@ -72,7 +72,7 @@
     "typescript": "4.4.4",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "webpack-merge": "5.10.0"
+    "webpack-merge": "6.0.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-ot-trace#readme"
 }