Skip to content

Commit 58bf819

Browse files
committed
chore(deps): update dependency webpack-merge to v6
1 parent 2e0cbdf commit 58bf819

File tree

9 files changed

+54
-29
lines changed

9 files changed

+54
-29
lines changed

metapackages/auto-instrumentations-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"typescript": "4.4.4",
5858
"webpack": "5.94.0",
5959
"webpack-cli": "5.1.4",
60-
"webpack-merge": "5.10.0"
60+
"webpack-merge": "6.0.1"
6161
},
6262
"dependencies": {
6363
"@opentelemetry/instrumentation": "^0.56.0",

package-lock.json

Lines changed: 46 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/opentelemetry-id-generator-aws-xray/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"typescript": "4.4.4",
7474
"webpack": "5.94.0",
7575
"webpack-cli": "5.1.4",
76-
"webpack-merge": "5.10.0"
76+
"webpack-merge": "6.0.1"
7777
},
7878
"dependencies": {
7979
"@opentelemetry/core": "^1.0.0"

plugins/web/opentelemetry-instrumentation-long-task/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"typescript": "4.4.4",
7474
"webpack": "5.94.0",
7575
"webpack-cli": "5.1.4",
76-
"webpack-merge": "5.10.0",
76+
"webpack-merge": "6.0.1",
7777
"zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0"
7878
},
7979
"dependencies": {

plugins/web/opentelemetry-instrumentation-user-interaction/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"typescript": "4.4.4",
7676
"webpack": "5.94.0",
7777
"webpack-cli": "5.1.4",
78-
"webpack-merge": "5.10.0",
78+
"webpack-merge": "6.0.1",
7979
"zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0"
8080
},
8181
"dependencies": {

plugins/web/opentelemetry-plugin-react-load/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"typescript": "4.4.4",
8181
"webpack": "5.94.0",
8282
"webpack-cli": "5.1.4",
83-
"webpack-merge": "5.10.0"
83+
"webpack-merge": "6.0.1"
8484
},
8585
"peerDependencies": {
8686
"@opentelemetry/api": "^1.0.0",

propagators/opentelemetry-propagator-instana/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"typescript": "4.4.4",
6969
"webpack": "5.94.0",
7070
"webpack-cli": "5.1.4",
71-
"webpack-merge": "5.10.0"
71+
"webpack-merge": "6.0.1"
7272
},
7373
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-instana#readme"
7474
}

propagators/opentelemetry-propagator-ot-trace/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"typescript": "4.4.4",
6969
"webpack": "5.94.0",
7070
"webpack-cli": "5.1.4",
71-
"webpack-merge": "5.10.0"
71+
"webpack-merge": "6.0.1"
7272
},
7373
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-ot-trace#readme"
7474
}

propagators/propagator-aws-xray/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"typescript": "4.4.4",
7575
"webpack": "5.95.0",
7676
"webpack-cli": "5.1.4",
77-
"webpack-merge": "5.10.0"
77+
"webpack-merge": "6.0.1"
7878
},
7979
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray#readme"
8080
}

0 commit comments

Comments
 (0)