diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 8eae6957f4b..cd71ad79f75 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 92914e82d93..9a86521664b 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 c4e4d8b9e44..1c27af7b62c 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 4785aed8365..b903b0a4fa6 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 fdd85bce0da..c91442c2720 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 374afbc3537..d6c50b63bb4 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 c390d5a43c1..698d5102ecd 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 fb02950c93e..08f190ffc70 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 406032b1985..ce9e0a1215f 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 f3298ffb26c..bd6938bd536 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 b5638490af2..2cc9dc0a167 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.56.0", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index fb0a1c16c50..a47a6a0be63 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.56.0", diff --git a/experimental/packages/web-common/package.json b/experimental/packages/web-common/package.json index 42a2e76666d..1dd633498d8 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 c2c49c22cff..aa966b57b9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -391,7 +391,7 @@ "version": "0.56.0", "license": "Apache-2.0", "dependencies": { - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "1.29.0", "@opentelemetry/otlp-grpc-exporter-base": "0.56.0", "@opentelemetry/otlp-transformer": "0.56.0", @@ -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.56.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,12 +526,26 @@ "@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.56.0", "license": "Apache-2.0", "dependencies": { - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "1.29.0", "@opentelemetry/otlp-grpc-exporter-base": "0.56.0", "@opentelemetry/otlp-transformer": "0.56.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.56.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.56.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,12 +729,26 @@ "@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.56.0", "license": "Apache-2.0", "dependencies": { - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "1.29.0", "@opentelemetry/exporter-metrics-otlp-http": "0.56.0", "@opentelemetry/otlp-exporter-base": "0.56.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.56.0", @@ -821,7 +905,7 @@ "dependencies": { "@opentelemetry/api-logs": "0.56.0", "@types/shimmer": "^1.2.0", - "import-in-the-middle": "^1.11.3", + "import-in-the-middle": "^1.8.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" @@ -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.56.0", @@ -920,7 +1018,7 @@ }, "devDependencies": { "@bufbuild/buf": "1.47.2", - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", "@opentelemetry/context-async-hooks": "1.29.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.56.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,12 +1250,26 @@ "@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.56.0", "license": "Apache-2.0", "dependencies": { - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "1.29.0", "@opentelemetry/otlp-exporter-base": "0.56.0", "@opentelemetry/otlp-transformer": "0.56.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.56.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.56.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.29.0", @@ -28317,7 +28499,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" @@ -28326,6 +28508,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.29.0", @@ -28418,7 +28614,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" @@ -28477,6 +28673,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.29.0", @@ -28590,7 +28800,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" @@ -28599,6 +28809,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.29.0", @@ -28659,7 +28883,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" @@ -28668,6 +28892,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.29.0", @@ -28719,7 +28957,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" @@ -28847,6 +29085,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", @@ -31867,7 +32119,7 @@ "@opentelemetry/exporter-logs-otlp-grpc": { "version": "file:experimental/packages/exporter-logs-otlp-grpc", "requires": { - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", "@opentelemetry/api-logs": "0.56.0", @@ -31922,7 +32174,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": { @@ -31957,13 +32222,26 @@ "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": { "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "requires": { - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", "@opentelemetry/core": "1.29.0", @@ -32017,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/exporter-metrics-otlp-proto": { @@ -32064,7 +32355,7 @@ "@opentelemetry/exporter-trace-otlp-grpc": { "version": "file:experimental/packages/exporter-trace-otlp-grpc", "requires": { - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", "@opentelemetry/core": "1.29.0", @@ -32117,7 +32408,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": { @@ -32150,7 +32454,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": { @@ -32185,7 +32502,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": { @@ -32206,7 +32536,7 @@ "babel-plugin-istanbul": "7.0.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "import-in-the-middle": "1.11.3", + "import-in-the-middle": "^1.8.1", "karma": "6.4.4", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -32224,7 +32554,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": { @@ -32261,14 +32604,27 @@ "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": { "version": "file:experimental/packages/opentelemetry-instrumentation-grpc", "requires": { "@bufbuild/buf": "1.47.2", - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.9.0", "@opentelemetry/context-async-hooks": "1.29.0", @@ -32359,7 +32715,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": { @@ -32401,7 +32770,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": { @@ -32431,13 +32813,26 @@ "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": { "version": "file:experimental/packages/otlp-grpc-exporter-base", "requires": { - "@grpc/grpc-js": "^1.12.4", + "@grpc/grpc-js": "^1.7.1", "@opentelemetry/api": "1.9.0", "@opentelemetry/core": "1.29.0", "@opentelemetry/otlp-exporter-base": "0.56.0", @@ -32554,7 +32949,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": { @@ -32589,6 +32984,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" + } } } }, @@ -32665,7 +33071,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": { @@ -32676,6 +33082,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" + } } } }, @@ -32708,7 +33125,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": { @@ -32743,6 +33160,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" + } } } }, @@ -32773,7 +33201,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": { @@ -32901,7 +33342,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": { @@ -32936,7 +33390,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": { @@ -33019,6 +33473,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" + } } } }, @@ -33124,7 +33589,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": { @@ -33135,6 +33600,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 2d13f057aab..25db17d6c28 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 6d013cf4973..d38be9f0953 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 51d4344200c..5064af63441 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 6d4d494ef98..987415708a6 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 6449842fa9c..e4f1022bf32 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"