Skip to content

Commit 37c338e

Browse files
Update @types/Webpack (dotnet#45211)
1 parent 2e94b96 commit 37c338e

14 files changed

+1708
-1926
lines changed

src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ describe("hubConnection", () => {
198198
// exception expected but none thrown
199199
fail();
200200
} catch (e) {
201-
expect(e.message).toBe(errorMessage);
201+
expect((e as any).message).toBe(errorMessage);
202202
}
203203

204204
await hubConnection.stop();
@@ -216,7 +216,7 @@ describe("hubConnection", () => {
216216
// exception expected but none thrown
217217
fail();
218218
} catch (e) {
219-
expect(e.message).toBe("The client attempted to invoke the streaming 'EmptyStream' method with a non-streaming invocation.");
219+
expect((e as any).message).toBe("The client attempted to invoke the streaming 'EmptyStream' method with a non-streaming invocation.");
220220
}
221221

222222
await hubConnection.stop();
@@ -234,7 +234,7 @@ describe("hubConnection", () => {
234234
// exception expected but none thrown
235235
fail();
236236
} catch (e) {
237-
expect(e.message).toBe("The client attempted to invoke the streaming 'Stream' method with a non-streaming invocation.");
237+
expect((e as any).message).toBe("The client attempted to invoke the streaming 'Stream' method with a non-streaming invocation.");
238238
}
239239

240240
await hubConnection.stop();
@@ -377,12 +377,12 @@ describe("hubConnection", () => {
377377
try {
378378
await hubConnection.start();
379379
} catch (error) {
380-
if (error!.message.includes("404")) {
380+
if ((error as any)!.message.includes("404")) {
381381
// SSE can race with the connection closing and the initial ping being successful or failing with a 404.
382382
// LongPolling doesn't have pings and WebSockets is a synchronous API over a single HTTP request so it doesn't have the same issues
383-
expect(error!.message).toEqual("No Connection with that ID: Status code '404'");
383+
expect((error as any)!.message).toEqual("No Connection with that ID: Status code '404'");
384384
} else {
385-
expect(error!.message).toEqual(expectedErrorMessage);
385+
expect((error as any)!.message).toEqual(expectedErrorMessage);
386386
}
387387
closePromise.resolve();
388388
}
@@ -515,7 +515,7 @@ describe("hubConnection", () => {
515515
await resultPromise;
516516
expect(false).toBe(true);
517517
} catch (err) {
518-
expect(err.message).toEqual("An unexpected error occurred invoking 'StreamingConcat' on the server. Exception: Something bad");
518+
expect((err as any).message).toEqual("An unexpected error occurred invoking 'StreamingConcat' on the server. Exception: Something bad");
519519
} finally {
520520
await hubConnection.stop();
521521
}

src/SignalR/clients/ts/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"devDependencies": {
1414
"@types/jest": "^26.0.20",
1515
"@types/node": "^14.14.31",
16-
"@types/webpack": "^4.41.26",
16+
"@types/webpack": "^5.28.0",
1717
"@typescript-eslint/eslint-plugin": "^5.26.0",
1818
"@typescript-eslint/parser": "^5.26.0",
1919
"eslint": "^8.16.0",

src/SignalR/clients/ts/common/yarn.lock

Lines changed: 1670 additions & 1897 deletions
Large diffs are not rendered by default.

src/SignalR/clients/ts/signalr/src/HttpConnection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ export class HttpConnection implements IConnection {
434434
return this.transport!.connect(url, transferFormat);
435435
}
436436

437-
private _resolveTransportOrError(endpoint: IAvailableTransport, requestedTransport: HttpTransportType | undefined, requestedTransferFormat: TransferFormat): ITransport | Error {
437+
private _resolveTransportOrError(endpoint: IAvailableTransport, requestedTransport: HttpTransportType | undefined, requestedTransferFormat: TransferFormat): ITransport | Error | unknown {
438438
const transport = HttpTransportType[endpoint.transport];
439439
if (transport === null || transport === undefined) {
440440
this._logger.log(LogLevel.Debug, `Skipping transport '${endpoint.transport}' because it is not supported by this client.`);

src/SignalR/clients/ts/signalr/src/HubConnection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ export class HubConnection {
862862
return;
863863
}
864864

865-
retryError = e instanceof Error ? e : new Error(e.toString());
865+
retryError = e instanceof Error ? e : new Error((e as any).toString());
866866
nextRetryDelay = this._getNextRetryDelay(previousReconnectAttempts++, Date.now() - reconnectStartTime, retryError);
867867
}
868868
}

src/SignalR/clients/ts/signalr/src/IConnection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export interface IConnection {
1212

1313
start(transferFormat: TransferFormat): Promise<void>;
1414
send(data: string | ArrayBuffer): Promise<void>;
15-
stop(error?: Error): Promise<void>;
15+
stop(error?: Error | unknown): Promise<void>;
1616

1717
onreceive: ((data: string | ArrayBuffer) => void) | null;
1818
onclose: ((error?: Error) => void) | null;

src/SignalR/clients/ts/signalr/src/LongPollingTransport.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ export class LongPollingTransport implements ITransport {
2020
private _url?: string;
2121
private _running: boolean;
2222
private _receiving?: Promise<void>;
23-
private _closeError?: Error;
23+
private _closeError?: Error | unknown;
2424

2525
public onreceive: ((data: string | ArrayBuffer) => void) | null;
26-
public onclose: ((error?: Error) => void) | null;
26+
public onclose: ((error?: Error | unknown) => void) | null;
2727

2828
// This is an internal type, not exported from 'index' so this is really just internal.
2929
public get pollAborted(): boolean {
@@ -122,7 +122,7 @@ export class LongPollingTransport implements ITransport {
122122
} catch (e) {
123123
if (!this._running) {
124124
// Log but disregard errors that occur after stopping
125-
this._logger.log(LogLevel.Trace, `(LongPolling transport) Poll errored after shutdown: ${e.message}`);
125+
this._logger.log(LogLevel.Trace, `(LongPolling transport) Poll errored after shutdown: ${(e as any).message}`);
126126
} else {
127127
if (e instanceof TimeoutError) {
128128
// Ignore timeouts and reissue the poll.

src/SignalR/clients/ts/signalr/src/ServerSentEventsTransport.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class ServerSentEventsTransport implements ITransport {
1818
private _url?: string;
1919

2020
public onreceive: ((data: string | ArrayBuffer) => void) | null;
21-
public onclose: ((error?: Error) => void) | null;
21+
public onclose: ((error?: Error | unknown) => void) | null;
2222

2323
constructor(httpClient: HttpClient, accessToken: string | undefined, logger: ILogger,
2424
options: IHttpConnectionOptions) {
@@ -116,7 +116,7 @@ export class ServerSentEventsTransport implements ITransport {
116116
return Promise.resolve();
117117
}
118118

119-
private _close(e?: Error) {
119+
private _close(e?: Error | unknown) {
120120
if (this._eventSource) {
121121
this._eventSource.close();
122122
this._eventSource = undefined;

src/SignalR/clients/ts/signalr/src/WebSocketTransport.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export class WebSocketTransport implements ITransport {
159159
return Promise.resolve();
160160
}
161161

162-
private _close(event?: CloseEvent | Error): void {
162+
private _close(event?: CloseEvent | Error | unknown): void {
163163
// webSocket will be null if the transport did not start successfully
164164
if (this._webSocket) {
165165
// Clear websocket handlers because we are considering the socket closed now

src/SignalR/clients/ts/signalr/tests/HttpConnection.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ describe("HttpConnection", () => {
483483
await connection.start(TransferFormat.Text);
484484
fail("Expected connection.start to throw!");
485485
} catch (e) {
486-
expect(e.message).toBe(`Unable to connect to the server with any of the available transports. ${HttpTransportType[requestedTransport]} failed: Error: '${HttpTransportType[requestedTransport]}' is disabled by the client.`);
486+
expect((e as any).message).toBe(`Unable to connect to the server with any of the available transports. ${HttpTransportType[requestedTransport]} failed: Error: '${HttpTransportType[requestedTransport]}' is disabled by the client.`);
487487
}
488488
},
489489
`Failed to start the connection: Error: Unable to connect to the server with any of the available transports. ${HttpTransportType[requestedTransport]} failed: Error: '${HttpTransportType[requestedTransport]}' is disabled by the client.`);

0 commit comments

Comments
 (0)