From 4c69b998966dfa07ea7f0225e1b66f6f5e0ddeb9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 27 Nov 2024 18:51:24 +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 7ed8bc3717d..609d706ea11 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.96.1", "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 67ecc7af792..7211352a707 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.96.1", "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 ff107ad15bf..1a56043a62e 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.96.1", "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 cb4bda3ac2c..446ea4c7730 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.96.1", "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 681066899b0..f9231241adb 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.96.1", "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 606d3d793fc..66c06fc6843 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.96.1", "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 c6904f4aa8c..38198a7f0f1 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.96.1", "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 c6d940e0ff2..4ef84907d28 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.96.1", "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 fca79dc4d40..6c07553a9b2 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -108,7 +108,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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 592d7edda82..f167757f5a9 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -113,7 +113,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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 29d5a471baa..a4f64eb270a 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.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@opentelemetry/api-events": "0.55.0", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index bae3727e892..d104fb7945e 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.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@opentelemetry/api-logs": "0.55.0", diff --git a/experimental/packages/web-common/package.json b/experimental/packages/web-common/package.json index 226bf7a107a..163a3cdd776 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.96.1", "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 386118cee58..99dbf8a86aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -458,7 +458,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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.55.0", @@ -503,7 +517,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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.55.0", @@ -582,7 +610,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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.55.0", @@ -625,7 +667,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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.55.0", @@ -664,7 +720,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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.55.0", @@ -744,7 +814,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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.55.0", @@ -854,7 +938,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -901,7 +985,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -910,6 +994,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.55.0", @@ -1029,7 +1127,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -1038,6 +1136,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.55.0", @@ -1115,7 +1241,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -1124,6 +1250,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.55.0", @@ -1308,7 +1448,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -1326,6 +1466,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.55.0", @@ -1359,7 +1513,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -1418,6 +1572,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.55.0", @@ -1487,7 +1655,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -1505,6 +1673,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.28.0", @@ -28101,7 +28283,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -28110,6 +28292,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.28.0", @@ -28202,7 +28398,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -28261,6 +28457,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.28.0", @@ -28374,7 +28584,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -28383,6 +28593,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.28.0", @@ -28443,7 +28667,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -28452,6 +28676,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.28.0", @@ -28503,7 +28741,7 @@ "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=14" @@ -28640,6 +28878,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.28.0", @@ -31715,7 +31967,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -31750,7 +32015,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -31810,7 +32088,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -31910,7 +32201,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -31943,7 +32247,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -31978,7 +32295,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -32017,7 +32347,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -32054,7 +32397,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -32152,7 +32508,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -32194,7 +32563,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -32224,7 +32606,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -32347,7 +32742,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@opentelemetry/api": { @@ -32382,6 +32777,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" + } } } }, @@ -32458,7 +32864,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@types/sinon": { @@ -32469,6 +32875,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" + } } } }, @@ -32501,7 +32918,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@opentelemetry/api": { @@ -32536,6 +32953,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" + } } } }, @@ -32566,7 +32994,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -32694,7 +33135,20 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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": { @@ -32729,7 +33183,7 @@ "webpack": "5.96.1", "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 || ^0.15.0" }, "dependencies": { @@ -32818,6 +33272,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" + } } } }, @@ -32923,7 +33388,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@types/sinon": { @@ -32934,6 +33399,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 53ce039a0d1..a6044b3761c 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.96.1", "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 3345b3204ac..2489b957d70 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -85,7 +85,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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 d0e0ec55734..a8eb7345ace 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.96.1", "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 130bd14ca4c..28d36d7cf3f 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -76,7 +76,7 @@ "typescript": "4.4.4", "webpack": "5.96.1", "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 8f750d1f380..bc9863cbec7 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -51,7 +51,7 @@ "webpack": "5.96.1", "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"