diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f2ffadf63..e3a1497245 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ * feat(sdk-metrics): allow single bucket histograms [#4456](https://github.com/open-telemetry/opentelemetry-js/pull/4456) @pichlermarc * feat(instrumentation): Make `init()` method public [#4418](https://github.com/open-telemetry/opentelemetry-js/pull/4418) +* feat(context-zone-peer-dep, context-zone): support zone.js 0.13.x, 0.14.x [#4469](https://github.com/open-telemetry/opentelemetry-js/pull/4469) @pichlermarc ### :bug: (Bug Fix) @@ -21,6 +22,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ * fixes a bug where recording `NaN` on a histogram would result in the sum of bucket count values not matching the overall count * fix(sdk-metrics): allow single bucket histograms [#4456](https://github.com/open-telemetry/opentelemetry-js/pull/4456) @pichlermarc * fixes a bug where `Meter.createHistogram()` with the advice `explicitBucketBoundaries: []` would throw +* fix(context-zone-peer-dep, context-zone): support zone.js 0.13.x, 0.14.x [#4469](https://github.com/open-telemetry/opentelemetry-js/pull/4469) @pichlermarc + * fixes a bug where old versions of `zone.js` affected by would be pulled in ### :books: (Refine Doc) diff --git a/package-lock.json b/package-lock.json index daff8df12e..07bc80e1db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33287,8 +33287,9 @@ } }, "node_modules/zone.js": { - "version": "0.11.8", - "license": "MIT", + "version": "0.14.3", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.3.tgz", + "integrity": "sha512-jYoNqF046Q+JfcZSItRSt+oXFcpXL88yq7XAZjb/NKTS7w2hHpKjRJ3VlFD1k75wMaRRXNUt5vrZVlygiMyHbA==", "dependencies": { "tslib": "^2.3.0" } @@ -33322,7 +33323,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/context-zone-peer-dep": "1.21.0", - "zone.js": "^0.11.0" + "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0" }, "devDependencies": { "cross-var": "1.1.0", @@ -33372,7 +33373,7 @@ }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0" + "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0 || ^0.14.0" } }, "packages/opentelemetry-context-zone-peer-dep/node_modules/@webpack-cli/configtest": { @@ -35547,7 +35548,7 @@ "@opentelemetry/sdk-metrics": "1.21.0", "@opentelemetry/sdk-trace-base": "1.21.0", "@opentelemetry/sdk-trace-web": "1.21.0", - "zone.js": "0.11.4" + "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0" }, "devDependencies": { "@babel/core": "7.23.6", @@ -36095,13 +36096,6 @@ "engines": { "node": ">= 8" } - }, - "selenium-tests/node_modules/zone.js": { - "version": "0.11.4", - "license": "MIT", - "dependencies": { - "tslib": "^2.0.0" - } } }, "dependencies": { @@ -39219,7 +39213,7 @@ "cross-var": "1.1.0", "lerna": "6.6.2", "typescript": "4.4.4", - "zone.js": "^0.11.0" + "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0" } }, "@opentelemetry/context-zone-peer-dep": { @@ -43029,7 +43023,7 @@ "webpack-cli": "5.1.4", "webpack-dev-server": "4.5.0", "webpack-merge": "5.10.0", - "zone.js": "0.11.4" + "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0" }, "dependencies": { "@webpack-cli/configtest": { @@ -43315,12 +43309,6 @@ "requires": { "isexe": "^2.0.0" } - }, - "zone.js": { - "version": "0.11.4", - "requires": { - "tslib": "^2.0.0" - } } } }, @@ -59475,7 +59463,9 @@ } }, "zone.js": { - "version": "0.11.8", + "version": "0.14.3", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.3.tgz", + "integrity": "sha512-jYoNqF046Q+JfcZSItRSt+oXFcpXL88yq7XAZjb/NKTS7w2hHpKjRJ3VlFD1k75wMaRRXNUt5vrZVlygiMyHbA==", "requires": { "tslib": "^2.3.0" } diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 53c143ba17..a3670ad10f 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -84,7 +84,7 @@ }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.8.0", - "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0" + "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0 || ^0.14.0" }, "sideEffects": false, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone-peer-dep" diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index b09c844e95..e5d964c092 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -56,7 +56,7 @@ }, "dependencies": { "@opentelemetry/context-zone-peer-dep": "1.21.0", - "zone.js": "^0.11.0" + "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0" }, "sideEffects": true, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone" diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 8af0f1f07d..6ec77a3f8a 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -66,6 +66,6 @@ "@opentelemetry/sdk-metrics": "1.21.0", "@opentelemetry/sdk-trace-base": "1.21.0", "@opentelemetry/sdk-trace-web": "1.21.0", - "zone.js": "0.11.4" + "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0" } }