From 20069dfa52ef71779cedc61eb8b77d35e677ee01 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Fri, 20 Dec 2024 10:35:34 +0100 Subject: [PATCH] chore(deps): remove webpack-merge where it is not needed --- .../exporter-logs-otlp-http/package.json | 3 +- .../exporter-logs-otlp-proto/package.json | 3 +- .../exporter-trace-otlp-http/package.json | 3 +- .../exporter-trace-otlp-proto/package.json | 3 +- .../package.json | 3 +- .../package.json | 3 +- .../package.json | 3 +- .../package.json | 3 +- .../package.json | 3 +- .../packages/otlp-exporter-base/package.json | 3 +- experimental/packages/sdk-events/package.json | 3 +- experimental/packages/sdk-logs/package.json | 3 +- experimental/packages/web-common/package.json | 3 +- package-lock.json | 102 ++++++------------ .../package.json | 3 +- packages/opentelemetry-resources/package.json | 3 +- .../opentelemetry-sdk-trace-web/package.json | 3 +- packages/sdk-metrics/package.json | 3 +- 18 files changed, 51 insertions(+), 102 deletions(-) diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 3dac38ea7ef..eead6b4d09d 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -94,8 +94,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "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 143944cd87e..e3a35e0ba6b 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -84,8 +84,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "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 6716a830bc6..23cb8c2795a 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -85,8 +85,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "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 f809cd9d9fb..76a51fadf03 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -83,8 +83,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "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 addc8c3c81d..c8a6b5c8b78 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -74,8 +74,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "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 28a5a0910d9..215ab037e8b 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -85,8 +85,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "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 2943b07c132..4568310c116 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -80,8 +80,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "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 418fe11bfd2..90712d9705e 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -80,8 +80,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 3824983ab54..ef14a7cacbb 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -107,8 +107,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 58c4803819a..f6f9450f4fd 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -112,8 +112,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/experimental/packages/sdk-events/package.json b/experimental/packages/sdk-events/package.json index 8d876f8b833..36f0d678d85 100644 --- a/experimental/packages/sdk-events/package.json +++ b/experimental/packages/sdk-events/package.json @@ -88,8 +88,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "dependencies": { "@opentelemetry/api-events": "0.57.0", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 24f494fd1e7..dab9c09bb91 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -93,8 +93,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "dependencies": { "@opentelemetry/api-logs": "0.57.0", diff --git a/experimental/packages/web-common/package.json b/experimental/packages/web-common/package.json index a28770f93f4..bd8b7341fd4 100644 --- a/experimental/packages/web-common/package.json +++ b/experimental/packages/web-common/package.json @@ -95,7 +95,6 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } } diff --git a/package-lock.json b/package-lock.json index dbd8b37732a..9300e03b92d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -457,8 +457,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -502,8 +501,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -581,8 +579,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -624,8 +621,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -663,8 +659,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -743,8 +738,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -853,8 +847,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -900,8 +893,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -1028,8 +1020,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -1118,8 +1109,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -1311,8 +1301,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=14" @@ -1362,8 +1351,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -1490,8 +1478,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=14" @@ -28113,8 +28100,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -28214,8 +28200,7 @@ "sinon": "15.1.2", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -28386,8 +28371,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -28455,8 +28439,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "engines": { "node": ">=18" @@ -31718,8 +31701,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/exporter-logs-otlp-proto": { @@ -31753,8 +31735,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/exporter-metrics-otlp-grpc": { @@ -31813,8 +31794,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/exporter-metrics-otlp-proto": { @@ -31913,8 +31893,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/exporter-trace-otlp-proto": { @@ -31946,8 +31925,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/exporter-zipkin": { @@ -31981,8 +31959,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/instrumentation": { @@ -32020,8 +31997,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/instrumentation-fetch": { @@ -32057,8 +32033,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/instrumentation-grpc": { @@ -32155,8 +32130,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/integration-tests-api": { @@ -32197,8 +32171,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/otlp-exporter-base": { @@ -32227,8 +32200,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/otlp-grpc-exporter-base": { @@ -32350,8 +32322,7 @@ "sinon": "15.1.2", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "dependencies": { "@opentelemetry/api": { @@ -32461,8 +32432,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "dependencies": { "@types/sinon": { @@ -32504,8 +32474,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "dependencies": { "@opentelemetry/api": { @@ -32569,8 +32538,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/sdk-node": { @@ -32701,8 +32669,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" } }, "@opentelemetry/selenium-tests": { @@ -32924,8 +32891,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "dependencies": { "@types/sinon": { diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index ea543831830..e5e2c6a076a 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -83,8 +83,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 7f2a5470808..52a8e4fea18 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -84,8 +84,7 @@ "sinon": "15.1.2", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 2f3808fa4f0..fea33b534bb 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -83,8 +83,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index b21ee2073e3..e4968a79f44 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -75,8 +75,7 @@ "ts-loader": "9.5.1", "typescript": "4.4.4", "webpack": "5.96.1", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-cli": "5.1.4" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0"