From 618508c5f27ee036a562781a0c15066e9344c310 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 23 Oct 2024 14:42:11 +0000 Subject: [PATCH] chore(deps): update dependency webpack-merge to v6 --- .../exporter-logs-otlp-http/package.json | 2 +- .../exporter-logs-otlp-proto/package.json | 2 +- .../exporter-trace-otlp-http/package.json | 2 +- .../exporter-trace-otlp-proto/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../packages/otlp-exporter-base/package.json | 2 +- experimental/packages/sdk-events/package.json | 2 +- experimental/packages/sdk-logs/package.json | 2 +- experimental/packages/web-common/package.json | 2 +- package-lock.json | 548 ++++++++++++++++-- .../package.json | 2 +- packages/opentelemetry-resources/package.json | 2 +- .../opentelemetry-sdk-trace-web/package.json | 2 +- packages/sdk-metrics/package.json | 2 +- selenium-tests/package.json | 2 +- 19 files changed, 530 insertions(+), 54 deletions(-) diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 4d59e8f792..36260dac4a 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -95,7 +95,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.3.0" diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index 4b3b5d033d..27e272ab67 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -85,7 +85,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.3.0" diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index a4cbaca498..ddc33c5f2b 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -86,7 +86,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.3.0" diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index 38467931b6..f8e2ce84cf 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -84,7 +84,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.3.0" diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index bbf02c2e2c..810ab608f4 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/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" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 572b551b96..2bdcd2518c 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -86,7 +86,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.3.0" diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 5af891a079..b959ddced9 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -81,7 +81,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.3.0" diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index b45562a87b..d724c99672 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -81,7 +81,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.3.0" diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 9add816e4c..957db64367 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -109,7 +109,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" diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 939f2efadb..20f35ebf9c 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -86,7 +86,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.3.0" diff --git a/experimental/packages/sdk-events/package.json b/experimental/packages/sdk-events/package.json index f481180673..5171d4f36f 100644 --- a/experimental/packages/sdk-events/package.json +++ b/experimental/packages/sdk-events/package.json @@ -89,7 +89,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/api-events": "0.54.0", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 8ddf0ed277..589ee222bd 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -94,7 +94,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/api-logs": "0.54.0", diff --git a/experimental/packages/web-common/package.json b/experimental/packages/web-common/package.json index 081a8841ac..685bfade9a 100644 --- a/experimental/packages/web-common/package.json +++ b/experimental/packages/web-common/package.json @@ -96,6 +96,6 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/package-lock.json b/package-lock.json index 875b8fbaf6..74c0e5ad68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -458,7 +458,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" @@ -467,6 +467,20 @@ "@opentelemetry/api": "^1.3.0" } }, + "experimental/packages/exporter-logs-otlp-http/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" + } + }, "experimental/packages/exporter-logs-otlp-proto": { "name": "@opentelemetry/exporter-logs-otlp-proto", "version": "0.54.0", @@ -503,7 +517,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" @@ -512,6 +526,20 @@ "@opentelemetry/api": "^1.3.0" } }, + "experimental/packages/exporter-logs-otlp-proto/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" + } + }, "experimental/packages/exporter-trace-otlp-grpc": { "name": "@opentelemetry/exporter-trace-otlp-grpc", "version": "0.54.0", @@ -582,7 +610,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" @@ -591,6 +619,20 @@ "@opentelemetry/api": "^1.3.0" } }, + "experimental/packages/exporter-trace-otlp-http/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" + } + }, "experimental/packages/exporter-trace-otlp-proto": { "name": "@opentelemetry/exporter-trace-otlp-proto", "version": "0.54.0", @@ -625,7 +667,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" @@ -634,6 +676,20 @@ "@opentelemetry/api": "^1.3.0" } }, + "experimental/packages/exporter-trace-otlp-proto/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" + } + }, "experimental/packages/opentelemetry-browser-detector": { "name": "@opentelemetry/opentelemetry-browser-detector", "version": "0.54.0", @@ -664,7 +720,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" @@ -673,6 +729,20 @@ "@opentelemetry/api": "^1.3.0" } }, + "experimental/packages/opentelemetry-browser-detector/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" + } + }, "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc": { "name": "@opentelemetry/exporter-metrics-otlp-grpc", "version": "0.54.0", @@ -744,7 +814,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" @@ -753,6 +823,20 @@ "@opentelemetry/api": "^1.3.0" } }, + "experimental/packages/opentelemetry-exporter-metrics-otlp-http/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" + } + }, "experimental/packages/opentelemetry-exporter-metrics-otlp-proto": { "name": "@opentelemetry/exporter-metrics-otlp-proto", "version": "0.54.0", @@ -855,7 +939,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" @@ -902,7 +986,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" @@ -911,6 +995,20 @@ "@opentelemetry/api": "^1.3.0" } }, + "experimental/packages/opentelemetry-instrumentation-fetch/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" + } + }, "experimental/packages/opentelemetry-instrumentation-grpc": { "name": "@opentelemetry/instrumentation-grpc", "version": "0.54.0", @@ -1041,7 +1139,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" @@ -1050,6 +1148,34 @@ "@opentelemetry/api": "^1.3.0" } }, + "experimental/packages/opentelemetry-instrumentation-xml-http-request/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" + } + }, + "experimental/packages/opentelemetry-instrumentation/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" + } + }, "experimental/packages/opentelemetry-sdk-node": { "name": "@opentelemetry/sdk-node", "version": "0.54.0", @@ -1127,7 +1253,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" @@ -1136,6 +1262,20 @@ "@opentelemetry/api": "^1.3.0" } }, + "experimental/packages/otlp-exporter-base/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" + } + }, "experimental/packages/otlp-grpc-exporter-base": { "name": "@opentelemetry/otlp-grpc-exporter-base", "version": "0.54.0", @@ -1403,7 +1543,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" @@ -1421,6 +1561,20 @@ "@types/sinonjs__fake-timers": "*" } }, + "experimental/packages/sdk-events/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" + } + }, "experimental/packages/sdk-logs": { "name": "@opentelemetry/sdk-logs", "version": "0.54.0", @@ -1454,7 +1608,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" @@ -1513,6 +1667,20 @@ "node": ">=14" } }, + "experimental/packages/sdk-logs/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" + } + }, "experimental/packages/shim-opencensus": { "name": "@opentelemetry/shim-opencensus", "version": "0.54.0", @@ -1582,7 +1750,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" @@ -1600,6 +1768,20 @@ "@types/sinonjs__fake-timers": "*" } }, + "experimental/packages/web-common/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" + } + }, "integration-tests/api": { "name": "@opentelemetry/integration-tests-api", "version": "1.27.0", @@ -28841,7 +29023,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" @@ -28850,6 +29032,20 @@ "@opentelemetry/api": "^1.0.0" } }, + "packages/opentelemetry-exporter-zipkin/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" + } + }, "packages/opentelemetry-propagator-b3": { "name": "@opentelemetry/propagator-b3", "version": "1.27.0", @@ -28942,7 +29138,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" @@ -29001,6 +29197,20 @@ "node": ">=14" } }, + "packages/opentelemetry-resources/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" + } + }, "packages/opentelemetry-sdk-trace-base": { "name": "@opentelemetry/sdk-trace-base", "version": "1.27.0", @@ -29114,7 +29324,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" @@ -29123,6 +29333,20 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, + "packages/opentelemetry-sdk-trace-web/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" + } + }, "packages/opentelemetry-shim-opentracing": { "name": "@opentelemetry/shim-opentracing", "version": "1.27.0", @@ -29183,7 +29407,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" @@ -29192,6 +29416,20 @@ "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, + "packages/sdk-metrics/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" + } + }, "packages/template": { "name": "@opentelemetry/template", "version": "1.27.0", @@ -29243,7 +29481,7 @@ "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -29380,6 +29618,20 @@ } } }, + "selenium-tests/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" + } + }, "semantic-conventions": { "name": "@opentelemetry/semantic-conventions", "version": "1.27.0", @@ -32720,7 +32972,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/exporter-logs-otlp-proto": { @@ -32755,7 +33020,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/exporter-metrics-otlp-grpc": { @@ -32815,7 +33093,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/exporter-metrics-otlp-proto": { @@ -32915,7 +33206,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/exporter-trace-otlp-proto": { @@ -32948,7 +33252,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/exporter-zipkin": { @@ -32983,7 +33300,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/instrumentation": { @@ -33023,7 +33353,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/instrumentation-fetch": { @@ -33060,7 +33403,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/instrumentation-grpc": { @@ -33171,7 +33527,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/integration-tests-api": { @@ -33213,7 +33582,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/otlp-exporter-base": { @@ -33243,7 +33625,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/otlp-grpc-exporter-base": { @@ -33366,7 +33761,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/api": { @@ -33401,6 +33796,17 @@ "dev": true } } + }, + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } } } }, @@ -33541,7 +33947,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/sinon": { @@ -33552,6 +33958,17 @@ "requires": { "@types/sinonjs__fake-timers": "*" } + }, + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } } } }, @@ -33584,7 +34001,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/api": { @@ -33619,6 +34036,17 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.9.0.tgz", "integrity": "sha512-po7penSfQ/Z8352lRVDpaBrd9znwA5mHGqXR7nDEiVnxkDFkBIhVf/tKeAJDIq/erFpcRowKFeCsr5eqqcSyFQ==", "dev": true + }, + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } } } }, @@ -33649,7 +34077,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/sdk-node": { @@ -33777,7 +34218,20 @@ "typescript": "4.4.4", "webpack": "5.94.0", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" + }, + "dependencies": { + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/selenium-tests": { @@ -33812,7 +34266,7 @@ "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0" }, "dependencies": { @@ -33901,6 +34355,17 @@ "webpack-dev-middleware": "^5.2.1", "ws": "^8.1.0" } + }, + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } } } }, @@ -34006,7 +34471,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/sinon": { @@ -34017,6 +34482,17 @@ "requires": { "@types/sinonjs__fake-timers": "*" } + }, + "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, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } } } }, diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index fe42768df5..4822df5594 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -84,7 +84,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/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 931490f0aa..b0805706c9 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -85,7 +85,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 <1.10.0" diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 7a53d6bc2b..35eeb46adb 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -84,7 +84,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 <1.10.0" diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index c83f57db62..e2d71694e9 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -76,7 +76,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.3.0 <1.10.0" diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 5ceb876b7d..5e5a2fe0d2 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -51,7 +51,7 @@ "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0"