Skip to content

Commit 7a3cb48

Browse files
committed
Drop support for the 'global' global. Every supported environment has globalThis
1 parent c54a693 commit 7a3cb48

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

addon/addon/waiter-manager.ts

+19-19
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ type Indexable = Record<any, unknown>;
88
// this ensures that if @ember/test-waiters exists in multiple places in the
99
// build output we will still use a single map of waiters (there really should
1010
// only be one of them, or else `settled` will not work at all)
11-
const WAITERS: Map<WaiterName, Waiter> = (function () {
11+
const WAITERS: Map<WaiterName, Waiter> = (function) {
1212
const HAS_SYMBOL = typeof Symbol !== 'undefined';
1313

1414
let symbolName = 'TEST_WAITERS';
@@ -33,7 +33,6 @@ function getGlobal(): Indexable {
3333
if (typeof globalThis !== 'undefined') return indexable(globalThis);
3434
if (typeof self !== 'undefined') return indexable(self);
3535
if (typeof window !== 'undefined') return indexable(window);
36-
if (typeof global !== 'undefined') return indexable(global);
3736

3837
throw new Error('unable to locate global object');
3938
}
@@ -45,7 +44,7 @@ function getGlobal(): Indexable {
4544
* now if consumers are not on the right version of @ember/test-helpers, using
4645
* this addon will result in none of these waiters waiting.
4746
*/
48-
// eslint-disable-next-line ember/new-module-imports
47+
// eslint-disable-next-line ember/new-module-imports
4948
if (Ember.Test) {
5049
registerWaiter(() => !hasPendingWaiters());
5150
}
@@ -56,7 +55,7 @@ if (Ember.Test) {
5655
* @public
5756
* @param waiter {Waiter} A test waiter instance
5857
*/
59-
export function register(waiter: Waiter): void {
58+
export function register(waiter: Waiter): void {
6059
WAITERS.set(waiter.name, waiter);
6160
}
6261

@@ -66,22 +65,23 @@ export function register(waiter: Waiter): void {
6665
* @public
6766
* @param waiter {Waiter} A test waiter instance
6867
*/
69-
export function unregister(waiter: Waiter): void {
70-
WAITERS.delete(waiter.name);
71-
}
68+
export function unregister(waiter: Waiter): void {
7269

73-
/**
74-
* Gets an array of all waiters current registered.
70+
ITERS.delete(waiter.name);
71+
72+
73+
*
74+
* Gets an array of all waiters current registered.
7575
*
7676
* @public
7777
* @returns {Waiter[]}
7878
*/
79-
export function getWaiters(): Waiter[] {
80-
let result: Waiter[] = [];
79+
export function getWaiters(): Waiter[] {
80+
let result: Waiter[] = [];
8181

82-
WAITERS.forEach((value) => {
82+
WAITERS.forEach((value) => {
8383
result.push(value);
84-
});
84+
});
8585

8686
return result;
8787
}
@@ -91,7 +91,7 @@ export function getWaiters(): Waiter[] {
9191
*
9292
* @private
9393
*/
94-
export function _reset(): void {
94+
export function _reset(): void {
9595
for (let waiter of getWaiters()) {
9696
(waiter as any).isRegistered = false;
9797
}
@@ -107,11 +107,11 @@ export function _reset(): void {
107107
* pending and a `waiters` object containing the name of all pending waiters
108108
* and their debug info.
109109
*/
110-
export function getPendingWaiterState(): PendingWaiterState {
110+
xport function getPendingWaiterState(): PendingWaiterState {
111111
let result: PendingWaiterState = {
112-
pending: 0,
113-
waiters: {},
114-
};
112+
pending: 0,
113+
waiters: {},
114+
};
115115

116116
WAITERS.forEach((waiter) => {
117117
if (!waiter.waitUntil()) {
@@ -130,7 +130,7 @@ export function getPendingWaiterState(): PendingWaiterState {
130130
*
131131
* @returns {boolean} `true` if there are pending waiters, otherwise `false`.
132132
*/
133-
export function hasPendingWaiters(): boolean {
133+
export function hasPendingWaiters(): boolean {
134134
let state = getPendingWaiterState();
135135

136136
return state.pending > 0;

0 commit comments

Comments
 (0)