Skip to content

Commit 3e9a67f

Browse files
authored
fix(electron): typecheck tests in the package tsconfig (#9674)
1 parent fb1d6ad commit 3e9a67f

7 files changed

Lines changed: 48 additions & 72 deletions

File tree

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎packages/electron/src/main/__tests__/create-clerk-bridge.test.ts‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ const windowSender = { mainFrame, getType: () => 'window' };
5858
const mainFrameEvent = { sender: windowSender, senderFrame: mainFrame } as unknown as Electron.IpcMainInvokeEvent;
5959
const subframeEvent = { sender: windowSender, senderFrame: {} } as unknown as Electron.IpcMainInvokeEvent;
6060

61+
function getAppListener<T extends (...args: never[]) => void>(event: string): T | undefined {
62+
return (vi.mocked(app.on).mock.calls as unknown as Array<[string, T]>).find(
63+
([registered]) => registered === event,
64+
)?.[1];
65+
}
66+
6167
describe('createClerkBridge', () => {
6268
const missingStorage = {} as Parameters<typeof createClerkBridge>[0];
6369
const storage: TokenStorage = {
@@ -145,7 +151,6 @@ describe('createClerkBridge', () => {
145151
host: 'renderer',
146152
scheme: 'my-app',
147153
privileges: {
148-
allowExtensions: true,
149154
allowServiceWorkers: true,
150155
bypassCSP: true,
151156
codeCache: true,
@@ -157,7 +162,6 @@ describe('createClerkBridge', () => {
157162
{
158163
scheme: 'my-app',
159164
privileges: {
160-
allowExtensions: true,
161165
allowServiceWorkers: true,
162166
bypassCSP: true,
163167
codeCache: true,
@@ -590,12 +594,9 @@ describe('createClerkBridge', () => {
590594
return channel === OAUTH_TRANSPORT_CHANNELS.open;
591595
})?.[1];
592596
const openPromise = openHandler?.(mainFrameEvent, 'https://accounts.example.com/oauth');
593-
const openUrlListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'open-url')?.[1] as (
594-
event: Electron.Event,
595-
url: string,
596-
) => void;
597+
const openUrlListener = getAppListener<(event: Electron.Event, url: string) => void>('open-url');
597598

598-
openUrlListener({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');
599+
openUrlListener?.({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');
599600

600601
await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
601602
expect(shell.openExternal).toHaveBeenCalledWith('https://accounts.example.com/oauth');
@@ -615,12 +616,9 @@ describe('createClerkBridge', () => {
615616
return channel === OAUTH_TRANSPORT_CHANNELS.open;
616617
})?.[1];
617618
const openPromise = openHandler?.(mainFrameEvent, 'https://accounts.example.com/oauth');
618-
const secondInstanceListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'second-instance')?.[1] as (
619-
event: Electron.Event,
620-
argv: string[],
621-
) => void;
619+
const secondInstanceListener = getAppListener<(event: Electron.Event, argv: string[]) => void>('second-instance');
622620

623-
secondInstanceListener({} as Electron.Event, [
621+
secondInstanceListener?.({} as Electron.Event, [
624622
'/opt/MyApp/my-app',
625623
'--enable-features=UseOzonePlatform',
626624
'my-app://renderer/?code=123',
@@ -647,12 +645,9 @@ describe('createClerkBridge', () => {
647645
return channel === OAUTH_TRANSPORT_CHANNELS.open;
648646
})?.[1];
649647
const openPromise = openHandler?.(mainFrameEvent, 'https://accounts.example.com/oauth');
650-
const secondInstanceListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'second-instance')?.[1] as (
651-
event: Electron.Event,
652-
argv: string[],
653-
) => void;
648+
const secondInstanceListener = getAppListener<(event: Electron.Event, argv: string[]) => void>('second-instance');
654649

655-
secondInstanceListener({} as Electron.Event, ['/opt/MyApp/my-app', 'my-app://renderer/?code=123']);
650+
secondInstanceListener?.({} as Electron.Event, ['/opt/MyApp/my-app', 'my-app://renderer/?code=123']);
656651

657652
await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
658653
expect(rendererWindow.restore).toHaveBeenCalledOnce();
@@ -676,13 +671,10 @@ describe('createClerkBridge', () => {
676671
return channel === OAUTH_TRANSPORT_CHANNELS.open;
677672
})?.[1];
678673
const openPromise = openHandler?.(mainFrameEvent, 'https://accounts.example.com/oauth');
679-
const secondInstanceListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'second-instance')?.[1] as (
680-
event: Electron.Event,
681-
argv: string[],
682-
) => void;
674+
const secondInstanceListener = getAppListener<(event: Electron.Event, argv: string[]) => void>('second-instance');
683675

684676
rendererWindow.isDestroyed.mockReturnValue(true);
685-
secondInstanceListener({} as Electron.Event, ['/opt/MyApp/my-app', 'my-app://renderer/?code=123']);
677+
secondInstanceListener?.({} as Electron.Event, ['/opt/MyApp/my-app', 'my-app://renderer/?code=123']);
686678

687679
await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
688680
expect(rendererWindow.focus).not.toHaveBeenCalled();

‎packages/electron/src/passkeys/__tests__/index.test.ts‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
import { webAuthnCreateCredential, webAuthnGetCredential } from '@clerk/shared/internal/clerk-js/passkeys';
2+
import type {
3+
PublicKeyCredentialCreationOptionsWithoutExtensions,
4+
PublicKeyCredentialRequestOptionsWithoutExtensions,
5+
} from '@clerk/shared/types';
26
import { isWebAuthnAutofillSupported } from '@clerk/shared/webauthn';
37
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
48

@@ -22,7 +26,7 @@ vi.mock('@clerk/shared/webauthn', () => ({
2226

2327
const HELLO_B64URL = 'aGVsbG8';
2428

25-
const creationOptions = () =>
29+
const creationOptions = (): PublicKeyCredentialCreationOptionsWithoutExtensions =>
2630
({
2731
rp: { id: 'example.com', name: 'Example' },
2832
user: { id: new Uint8Array([1]).buffer, name: 'jdoe', displayName: 'J Doe' },
@@ -37,28 +41,26 @@ const creationOptions = () =>
3741
},
3842
attestation: 'none',
3943
excludeCredentials: [],
40-
}) as never;
44+
}) as PublicKeyCredentialCreationOptionsWithoutExtensions;
4145

42-
const requestOptions = () =>
46+
const requestOptions = (): PublicKeyCredentialRequestOptionsWithoutExtensions =>
4347
({
4448
challenge: new Uint8Array([1, 2, 3]).buffer,
4549
rpId: 'example.com',
4650
timeout: 60_000,
4751
userVerification: 'required',
4852
allowCredentials: [],
49-
}) as never;
53+
}) as PublicKeyCredentialRequestOptionsWithoutExtensions;
5054

51-
const creationOptionsForRpId = (rpId: string) =>
52-
({
53-
...creationOptions(),
54-
rp: { id: rpId, name: 'Example' },
55-
}) as never;
55+
const creationOptionsForRpId = (rpId: string): PublicKeyCredentialCreationOptionsWithoutExtensions => ({
56+
...creationOptions(),
57+
rp: { id: rpId, name: 'Example' },
58+
});
5659

57-
const requestOptionsForRpId = (rpId: string) =>
58-
({
59-
...requestOptions(),
60-
rpId,
61-
}) as never;
60+
const requestOptionsForRpId = (rpId: string): PublicKeyCredentialRequestOptionsWithoutExtensions => ({
61+
...requestOptions(),
62+
rpId,
63+
});
6264

6365
const registrationJSON = {
6466
id: HELLO_B64URL,

‎packages/electron/src/react/__tests__/ClerkProvider.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ describe('Electron ClerkProvider', () => {
306306
tokenCache.getToken.mockResolvedValue('client-jwt');
307307
renderToStaticMarkup(<ClerkProvider publishableKey='pk_test_before_request'>App</ClerkProvider>);
308308

309-
const request = {
309+
const request: { credentials?: RequestCredentials; headers: Headers; url: URL } = {
310310
headers: new Headers(),
311311
url: new URL('https://api.clerk.test/v1/client'),
312312
};

‎packages/electron/tsconfig.base.json‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎packages/electron/tsconfig.json‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
{
2-
"extends": "./tsconfig.base.json",
32
"compilerOptions": {
3+
"target": "ES2019",
4+
"lib": ["dom", "dom.iterable", "esnext"],
5+
"allowJs": true,
6+
"skipLibCheck": true,
7+
"esModuleInterop": true,
8+
"allowSyntheticDefaultImports": true,
9+
"strict": true,
10+
"forceConsistentCasingInFileNames": true,
11+
"noFallthroughCasesInSwitch": true,
12+
"module": "preserve",
13+
"moduleResolution": "bundler",
14+
"resolveJsonModule": true,
15+
"isolatedModules": true,
16+
"jsx": "react-jsx",
417
"declaration": true,
518
"declarationDir": "dist/types",
619
"declarationMap": true,
720
"emitDeclarationOnly": true,
821
"rootDir": "./src"
922
},
10-
"include": ["src"],
11-
"exclude": ["src/**/__tests__/**"],
12-
"references": [{ "path": "./tsconfig.test.json" }]
23+
"include": ["src"]
1324
}

‎packages/electron/tsconfig.test.json‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)