From 4f000e3b000a636fa71a3e1f6276e8689b5d99c6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sat, 7 Dec 2024 01:28:35 +0000 Subject: [PATCH] chore(deps): update dependency webpack-merge to v6 --- .../auto-instrumentations-web/package.json | 2 +- package-lock.json | 67 +++++++++++++------ .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- propagators/propagator-aws-xray/package.json | 2 +- 9 files changed, 54 insertions(+), 29 deletions(-) diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 64bc1fb283..916fc169f6 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -57,7 +57,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@opentelemetry/instrumentation": "^0.56.0", diff --git a/package-lock.json b/package-lock.json index a18cb0fc4c..1c0a1bce2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -580,7 +580,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -34420,7 +34420,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==", @@ -34434,6 +34434,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", @@ -35364,7 +35378,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -38992,7 +39006,7 @@ "typescript": "4.4.4", "webpack": "5.94.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 || ^0.15.0" }, "engines": { @@ -39086,7 +39100,7 @@ "typescript": "4.4.4", "webpack": "5.94.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 || ^0.15.0" }, "engines": { @@ -39185,7 +39199,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -39269,7 +39283,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=8.12.0" @@ -39333,7 +39347,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -39414,7 +39428,7 @@ "typescript": "4.4.4", "webpack": "5.95.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -46695,7 +46709,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@types/mocha": { @@ -46977,7 +46991,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@types/mocha": { @@ -47999,7 +48013,7 @@ "typescript": "4.4.4", "webpack": "5.94.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 || ^0.15.0" }, "dependencies": { @@ -49593,7 +49607,7 @@ "typescript": "4.4.4", "webpack": "5.94.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 || ^0.15.0" }, "dependencies": { @@ -49762,7 +49776,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@types/mocha": { @@ -49862,7 +49876,7 @@ "typescript": "4.4.4", "webpack": "5.95.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@types/mocha": { @@ -50025,7 +50039,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@types/mocha": { @@ -50084,7 +50098,7 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@types/mocha": { @@ -69403,18 +69417,29 @@ "requires": { "resolve": "^1.20.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==", + "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 20c6a6392f..dbfffb9eb5 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -73,7 +73,7 @@ "typescript": "4.4.4", "webpack": "5.94.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 abc2dbbcb5..e114eb3f52 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -73,7 +73,7 @@ "typescript": "4.4.4", "webpack": "5.94.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 || ^0.15.0" }, "dependencies": { diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 110e78f90b..1775d062f2 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -75,7 +75,7 @@ "typescript": "4.4.4", "webpack": "5.94.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 || ^0.15.0" }, "dependencies": { diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 155015a8ea..2e3a94628d 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -80,7 +80,7 @@ "typescript": "4.4.4", "webpack": "5.94.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 8cd2cca638..0334b452f9 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -68,7 +68,7 @@ "typescript": "4.4.4", "webpack": "5.94.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 50f407b4a2..091b81e04c 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -68,7 +68,7 @@ "typescript": "4.4.4", "webpack": "5.94.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" } diff --git a/propagators/propagator-aws-xray/package.json b/propagators/propagator-aws-xray/package.json index f11a4b7f36..aff47986bd 100644 --- a/propagators/propagator-aws-xray/package.json +++ b/propagators/propagator-aws-xray/package.json @@ -74,7 +74,7 @@ "typescript": "4.4.4", "webpack": "5.95.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/propagator-aws-xray#readme" }