Skip to content

Commit 9bafaf5

Browse files
authored
fix(repo): Additional ESLint resolvers (#4997)
1 parent 5475d2a commit 9bafaf5

File tree

13 files changed

+66
-19
lines changed

13 files changed

+66
-19
lines changed

.changeset/orange-wolves-eat.md

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

eslint.config.mjs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,13 @@ export default tseslint.config([
9494
},
9595
settings: {
9696
'import/ignore': ['node_modules/react-native/index\\.js$'],
97+
'import/resolver': {
98+
node: true,
99+
typescript: {
100+
alwaysTryTypes: true,
101+
project: ['packages/*/tsconfig.json', 'integration/tsconfig.json'],
102+
},
103+
},
97104
},
98105
rules: {
99106
curly: ['error', 'all'],

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
"eslint": "9.18.0",
8989
"eslint-config-prettier": "10.0.1",
9090
"eslint-config-turbo": "2.3.3",
91+
"eslint-import-resolver-typescript": "3.7.0",
9192
"eslint-plugin-import": "2.31.0",
9293
"eslint-plugin-jest": "28.11.0",
9394
"eslint-plugin-jsx-a11y": "6.10.2",

packages/nextjs/src/app-router/client/ClerkProvider.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import { useAwaitableReplace } from './useAwaitableReplace';
2323
* Note: Using lazy() with Suspense instead of dynamic is not possible as React will throw a hydration error when `ClerkProvider` wraps `<html><body>...`
2424
*/
2525
const LazyCreateKeylessApplication = dynamic(() =>
26-
// eslint-disable-next-line import/no-unresolved
2726
import('./keyless-creator-reader.js').then(m => m.KeylessCreatorOrReader),
2827
);
2928

packages/nextjs/src/app-router/client/keyless-cookie-sync.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { canUseKeyless } from '../../utils/feature-flags';
99
export function KeylessCookieSync(props: PropsWithChildren<AccountlessApplication>) {
1010
useEffect(() => {
1111
if (canUseKeyless) {
12-
// eslint-disable-next-line import/no-unresolved
1312
void import('../keyless-actions.js').then(m =>
1413
m.syncKeylessConfigAction({
1514
...props,

packages/nextjs/src/app-router/keyless-actions.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ export async function createOrReadKeylessAction(): Promise<null | Omit<Accountle
3535
return null;
3636
}
3737

38-
// eslint-disable-next-line import/no-unresolved
3938
const result = await import('../server/keyless-node.js').then(m => m.createOrReadKeyless());
4039

4140
if (!result) {
4241
return null;
4342
}
4443

45-
// eslint-disable-next-line import/no-unresolved
4644
const { keylessLogger, createKeylessModeMessage } = await import('../server/keyless-log-cache.js');
4745

4846
/**
@@ -72,7 +70,6 @@ export async function deleteKeylessAction() {
7270
return;
7371
}
7472

75-
// eslint-disable-next-line import/no-unresolved
7673
await import('../server/keyless-node.js').then(m => m.removeKeyless());
7774
return;
7875
}

packages/nextjs/src/app-router/server/ClerkProvider.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ export async function ClerkProvider(
8181

8282
let [shouldRunAsKeyless, runningWithClaimedKeys] = [false, false];
8383
if (canUseKeyless) {
84-
// eslint-disable-next-line import/no-unresolved
8584
const locallyStorePublishableKey = await import('../../server/keyless-node.js')
8685
.then(mod => mod.safeParseClerkFile()?.publishableKey)
8786
.catch(() => undefined);
@@ -93,10 +92,9 @@ export async function ClerkProvider(
9392

9493
if (shouldRunAsKeyless) {
9594
// NOTE: Create or read keys on every render. Usually this means only on hard refresh or hard navigations.
96-
// eslint-disable-next-line import/no-unresolved
95+
9796
const newOrReadKeys = await import('../../server/keyless-node.js').then(mod => mod.createOrReadKeyless());
9897
const { keylessLogger, createConfirmationMessage, createKeylessModeMessage } = await import(
99-
// eslint-disable-next-line import/no-unresolved
10098
'../../server/keyless-log-cache.js'
10199
);
102100

@@ -128,7 +126,6 @@ export async function ClerkProvider(
128126

129127
output = clientProvider;
130128
} else {
131-
// eslint-disable-next-line import/no-unresolved
132129
const KeylessCookieSync = await import('../client/keyless-cookie-sync.js').then(mod => mod.KeylessCookieSync);
133130

134131
const headerStore = await headers();

packages/nextjs/src/server/__tests__/clerkMiddleware.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ afterAll(() => {
4747

4848
// Removing this mock will cause the clerkMiddleware tests to fail due to missing publishable key
4949
// This mock SHOULD exist before the imports
50-
// eslint-disable-next-line import/no-unresolved
5150
vi.mock(import('../constants.js'), async importOriginal => {
5251
const actual = await importOriginal();
5352
return {

packages/nuxt/src/module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
createResolver,
88
defineNuxtModule,
99
updateRuntimeConfig,
10-
// eslint-disable-next-line import/no-unresolved -- FIXME: eslint@9
1110
} from '@nuxt/kit';
1211

1312
export type ModuleOptions = Omit<LoadClerkJsScriptOptions, 'routerPush' | 'routerReplace'> & {

packages/nuxt/src/runtime/plugin.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { setClerkJsLoadingErrorPackageName } from '@clerk/shared/loadClerkJsScript';
22
import { clerkPlugin } from '@clerk/vue';
3-
// eslint-disable-next-line import/no-unresolved -- FIXME: eslint@9
43
import { setErrorThrowerOptions } from '@clerk/vue/internal';
5-
// eslint-disable-next-line import/no-unresolved -- FIXME: eslint@9
64
import { defineNuxtPlugin, navigateTo, useRuntimeConfig, useState } from 'nuxt/app';
75

86
setErrorThrowerOptions({ packageName: PACKAGE_NAME });

0 commit comments

Comments
 (0)