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 Sep 16, 2024
1 parent e9eb924 commit 87ece62
Show file tree
Hide file tree
Showing 19 changed files with 531 additions and 54 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 @@ -98,7 +98,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.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.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"engines": {
"node": ">=14"
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 @@ -89,7 +89,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.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 @@ -94,7 +94,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"dependencies": {
"@opentelemetry/api-events": "0.53.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 @@ -97,7 +97,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"dependencies": {
"@opentelemetry/api-logs": "0.53.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 @@ -99,6 +99,6 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
}
}
Loading

0 comments on commit 87ece62

Please sign in to comment.