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 7, 2024
1 parent 30d668e commit 4f000e3
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 29 deletions.
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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/instrumentation": "^0.56.0",
Expand Down
67 changes: 46 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/opentelemetry-id-generator-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,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/core": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0",
"webpack-merge": "6.0.1",
"zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0"
},
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0",
"webpack-merge": "6.0.1",
"zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion plugins/web/opentelemetry-plugin-react-load/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,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 propagators/opentelemetry-propagator-instana/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-instana#readme"
}
2 changes: 1 addition & 1 deletion propagators/opentelemetry-propagator-ot-trace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"typescript": "4.4.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-ot-trace#readme"
}
2 changes: 1 addition & 1 deletion propagators/propagator-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"typescript": "4.4.4",
"webpack": "5.95.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"webpack-merge": "6.0.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray#readme"
}

0 comments on commit 4f000e3

Please sign in to comment.