Skip to content

Commit

Permalink
chore(deps): update dependency webpack-merge to v6
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate-bot committed Dec 5, 2024
1 parent a761a8c commit 4c94a43
Show file tree
Hide file tree
Showing 19 changed files with 542 additions and 66 deletions.
2 changes: 1 addition & 1 deletion experimental/packages/exporter-logs-otlp-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/otlp-exporter-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/sdk-events/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/sdk-logs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/web-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Loading

0 comments on commit 4c94a43

Please sign in to comment.