@@ -46,7 +46,7 @@ interface IConfig extends IStaticContext {
46
46
storageProvider ?: IStorageProvider ;
47
47
context ?: IMutableContext ;
48
48
fetch ?: any ;
49
- createAbortController ?: ( ) => AbortController ;
49
+ createAbortController ?: ( ) => AbortController | null ;
50
50
bootstrap ?: IToggle [ ] ;
51
51
bootstrapOverride ?: boolean ;
52
52
headerName ?: string ;
@@ -100,7 +100,9 @@ export const resolveFetch = () => {
100
100
try {
101
101
if ( typeof window !== 'undefined' && 'fetch' in window ) {
102
102
return fetch . bind ( window ) ;
103
- } else if ( 'fetch' in globalThis ) {
103
+ }
104
+
105
+ if ( 'fetch' in globalThis ) {
104
106
return fetch . bind ( globalThis ) ;
105
107
}
106
108
} catch ( e ) {
@@ -114,7 +116,9 @@ const resolveAbortController = () => {
114
116
try {
115
117
if ( typeof window !== 'undefined' && 'AbortController' in window ) {
116
118
return ( ) => new window . AbortController ( ) ;
117
- } else if ( 'fetch' in globalThis ) {
119
+ }
120
+
121
+ if ( 'fetch' in globalThis ) {
118
122
return ( ) => new globalThis . AbortController ( ) ;
119
123
}
120
124
} catch ( e ) {
@@ -135,7 +139,7 @@ export class UnleashClient extends TinyEmitter {
135
139
private metrics : Metrics ;
136
140
private ready : Promise < void > ;
137
141
private fetch : any ;
138
- private createAbortController ?: ( ) => AbortController ;
142
+ private createAbortController ?: ( ) => AbortController | null ;
139
143
private abortController ?: AbortController | null ;
140
144
private bootstrap ?: IToggle [ ] ;
141
145
private bootstrapOverride : boolean ;
@@ -431,8 +435,7 @@ export class UnleashClient extends TinyEmitter {
431
435
if ( this . abortController ) {
432
436
this . abortController . abort ( ) ;
433
437
}
434
- this . abortController =
435
- this . createAbortController && this . createAbortController ( ) ;
438
+ this . abortController = this . createAbortController ?.( ) ;
436
439
const signal = this . abortController
437
440
? this . abortController . signal
438
441
: undefined ;
0 commit comments