Skip to content

Commit a06a944

Browse files
authoredNov 15, 2022
fix(SetupApi): validate given request handlers (#1460)
1 parent 99d49f9 commit a06a944

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed
 

‎src/SetupApi.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export abstract class SetupApi<EventsMap extends EventMapType> {
2222

2323
public readonly events: LifeCycleEventEmitter<EventsMap>
2424

25-
constructor(initialHandlers: Array<RequestHandler>) {
25+
constructor(...initialHandlers: Array<RequestHandler>) {
2626
this.validateHandlers(initialHandlers)
2727

2828
this.initialHandlers = toReadonlyArray(initialHandlers)

‎src/native/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ export function setupServer(
1212
): SetupServerApi {
1313
// Provision request interception via patching the `XMLHttpRequest` class only
1414
// in React Native. There is no `http`/`https` modules in that environment.
15-
return new SetupServerApi([XMLHttpRequestInterceptor], handlers)
15+
return new SetupServerApi([XMLHttpRequestInterceptor], ...handlers)
1616
}

‎src/node/SetupServerApi.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ export class SetupServerApi extends SetupApi<ServerLifecycleEventsMap> {
3939
interceptors: Array<{
4040
new (): Interceptor<HttpRequestEventMap>
4141
}>,
42-
handlers: Array<RequestHandler>,
42+
...handlers: Array<RequestHandler>
4343
) {
44-
super(handlers)
44+
super(...handlers)
4545

4646
this.interceptor = new BatchInterceptor({
4747
name: 'setup-server',

‎src/node/setupServer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ export const setupServer = (
1313
): SetupServerApi => {
1414
return new SetupServerApi(
1515
[ClientRequestInterceptor, XMLHttpRequestInterceptor],
16-
handlers,
16+
...handlers,
1717
)
1818
}

‎src/setupWorker/setupWorker.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export class SetupWorkerApi extends SetupApi<WorkerLifecycleEventsMap> {
3232
private stopHandler: StopHandler = null as any
3333
private listeners: Array<Listener>
3434

35-
constructor(handlers: Array<RequestHandler>) {
36-
super(handlers)
35+
constructor(...handlers: Array<RequestHandler>) {
36+
super(...handlers)
3737

3838
invariant(
3939
!isNodeProcess(),
@@ -224,5 +224,5 @@ export class SetupWorkerApi extends SetupApi<WorkerLifecycleEventsMap> {
224224
export function setupWorker(
225225
...handlers: Array<RequestHandler>
226226
): SetupWorkerApi {
227-
return new SetupWorkerApi(handlers)
227+
return new SetupWorkerApi(...handlers)
228228
}

0 commit comments

Comments
 (0)
Please sign in to comment.