Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 #4320

Merged
merged 20 commits into from
Jan 17, 2024
Merged

chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 #4320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a042172
chore(opentelemetry-context-zone-peer-dep):
rodgerbrennan Nov 22, 2023
52326e0
Merge branch 'main' into fix/zonejs-version
rodgerbrennan Nov 22, 2023
c81d19a
Merge branch 'main' into fix/zonejs-version
rodgerbrennan Nov 28, 2023
624df4e
update packages
rodgerbrennan Nov 29, 2023
27158dd
Merge branch 'fix/zonejs-version' of https://github.com/rodgerbrennan…
rodgerbrennan Nov 29, 2023
ea1e5c8
Revert "update packages"
rodgerbrennan Nov 29, 2023
3b2086b
Merge branch 'main' into fix/zonejs-version
rodgerbrennan Nov 29, 2023
4c98a21
Merge branch 'main' into fix/zonejs-version
rodgerbrennan Dec 1, 2023
80de34d
chore: sync package-lock.json
pichlermarc Dec 14, 2023
e0ffaa7
Merge remote-tracking branch 'upstream' into fix/zonejs-version
pichlermarc Dec 14, 2023
117660f
chore: sync package-lock.json
pichlermarc Dec 14, 2023
8321266
Merge remote-tracking branch 'upstream' into fix/zonejs-version
pichlermarc Dec 14, 2023
3cebfb5
chore: sync package-lock.json
pichlermarc Dec 14, 2023
0001860
Merge branch 'main' into fix/zonejs-version
rodgerbrennan Dec 16, 2023
4edaab8
Merge branch 'main' into fix/zonejs-version
rodgerbrennan Dec 18, 2023
089fd6f
Update ZoneContextManager.test to use ES5 UMD bundle
rodgerbrennan Jan 4, 2024
dedd752
Merge branch 'main' into fix/zonejs-version
rodgerbrennan Jan 4, 2024
27fbd36
Merge branch 'main' into fix/zonejs-version
rodgerbrennan Jan 16, 2024
eb17069
add changelog
rodgerbrennan Jan 16, 2024
0bc5230
remove trailing space from changelog
rodgerbrennan Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :house: (Internal)

* chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 [#4320](https://github.com/open-telemetry/opentelemetry-js/pull/4320)

## 1.20.0

### :rocket: (Enhancement)
Expand Down
19 changes: 11 additions & 8 deletions package-lock.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions packages/opentelemetry-context-zone-peer-dep/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@
"typescript": "4.4.4",
"webpack": "5.89.0",
"webpack-cli": "5.1.4",
"zone.js": "0.11.4"
"zone.js": "0.13.3"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.8.0",
"zone.js": "^0.10.2 || ^0.11.0"
"zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0"
rodgerbrennan marked this conversation as resolved.
Show resolved Hide resolved
},
"sideEffects": false,
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone-peer-dep"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import 'zone.js';
import 'zone.js/dist/zone';
Copy link
Member

@legendecas legendecas Jan 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we should enable transpiling the zone.js with webpack if the default entry of zone.js contains advanced syntax.

This can be done in a follow-up PR.

Suggested change
import 'zone.js/dist/zone';
// Default 'zone.js' contains advanced syntax that can not be consumed by the test webpack.
// Load the es5 target bundle instead.
import 'zone.js/dist/zone';

import * as sinon from 'sinon';
import * as assert from 'assert';
import { ZoneContextManager } from '../src';
Expand Down