Skip to content

Make window compatible with ts 3.6 #2984

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

Merged
ry merged 2 commits into from
Sep 19, 2019
+3 −4
Merged

Make window compatible with ts 3.6 #2984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
965be5e
Make `window` compatible with ts 3.6
justjavac Sep 19, 2019
f19c583
fix type_definitions test
justjavac Sep 19, 2019
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: 1 addition & 1 deletion cli/tests/types.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ declare interface Window {
Deno: typeof Deno;
}

declare const window: Window;
declare const window: Window & typeof globalThis;
[WILDCARD]
1 change: 0 additions & 1 deletion js/globals_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ test(function windowWindowExists(): void {
});

test(function globalThisEqualsWindow(): void {
// @ts-ignore (TypeScript thinks globalThis and window don't match)
assert(globalThis === window);
});

Expand Down
4 changes: 2 additions & 2 deletions js/lib.deno_runtime.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ declare namespace Deno {
// @url js/globals.ts

declare interface Window {
window: Window;
window: Window & typeof globalThis;
atob: typeof textEncoding.atob;
btoa: typeof textEncoding.btoa;
fetch: typeof fetchTypes.fetch;
Expand Down Expand Up @@ -1263,7 +1263,7 @@ declare interface Window {
Deno: typeof Deno;
}

declare const window: Window;
declare const window: Window & typeof globalThis;
declare const atob: typeof textEncoding.atob;
declare const btoa: typeof textEncoding.btoa;
declare const fetch: typeof fetchTypes.fetch;
Expand Down