Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-add-promise-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

Handle non-promise return types when `require-auth-protection` rule fixer makes the function `async`.

The eslint rule fixer will now wrap a non-promise return type with `Promise<>` to produce valid TypeScript.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-fixer-quote-style.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` fixer now matches the string quote style of existing imports when inserting a new `auth` import.

Previously, new imports always used single quotes regardless of how other imports in the file were quoted.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-or-auth-guards.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` rule now accepts OR-conditions like `if (!isAuthenticated || otherCondition)` when determining if a resource is protected.

Previously, only bare auth checks such as `if (!isAuthenticated)` were recognized. Guards with only `||` are safe but were incorrectly reported as missing protection.
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export default async function Page() {
expect(result.unresolved).toEqual([]);
expect(result.fixed).toEqual([{ filePath: page, protections: 1 }]);

expect(await readFile(page, 'utf8')).toBe(`import { auth } from '@clerk/nextjs/server';
expect(await readFile(page, 'utf8')).toBe(`import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand DownExpand Up@@ -109,7 +109,7 @@ export async function POST() {
expect(result.fixed).toEqual([{ filePath: route, protections: 2 }]);

const output = await readFile(route, 'utf8');
expect(output).toBe(`import { auth } from '@clerk/nextjs/server';
expect(output).toBe(`import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand Down
44 changes: 44 additions & 0 deletions packages/eslint-plugin/src/next/__tests__/quote-style.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import * as tsParser from '@typescript-eslint/parser';
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import { describe, expect, it } from 'vitest';

import { inferQuoteChar } from '../lib/quote-style';

function parse(code: string): { sourceCode: TSESLint.SourceCode; program: TSESTree.Program } {
const program = tsParser.parse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: { jsx: true },
}) as TSESTree.Program;
const sourceCode = {
ast: program,
getText(node: TSESTree.Node) {
return code.slice(node.range[0], node.range[1]);
},
} as TSESLint.SourceCode;
return { sourceCode, program };
}

describe('inferQuoteChar', () => {
it('returns double quotes from a double-quoted import', () => {
const { sourceCode, program } = parse('import { x } from "@pkg/foo";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('returns single quotes from a single-quoted import', () => {
const { sourceCode, program } = parse("import { x } from '@pkg/foo';");
expect(inferQuoteChar(sourceCode, program)).toBe("'");
});

it('returns double quotes from a double-quoted export source', () => {
const { sourceCode, program } = parse('export { GET } from "./route";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('falls back to double quotes when the file has no module sources to infer from', () => {
const { sourceCode, program } = parse(`export default function Page() {
return <div />;
}`);
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ ruleTester.run('require-auth-protection (suggestions)', rule, {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -65,7 +65,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return null;
Expand All@@ -86,7 +86,7 @@ export default async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async () => {
await auth.protect();
return { ok: true };
Expand All@@ -107,7 +107,7 @@ export const GET = async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -132,7 +132,7 @@ export default Page;`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -159,7 +159,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand All@@ -174,7 +174,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
return new Response('ok');
}
Expand DownExpand Up@@ -204,7 +204,7 @@ export async function loadData() {
{
messageId: 'addAuthProtect',
output: `'use server';
import { auth } from '@clerk/nextjs/server';
import { auth } from "@clerk/nextjs/server";

export async function loadData() {
await auth.protect();
Expand All@@ -229,7 +229,7 @@ export async function loadData() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function action() {
'use server';
await auth.protect();
Expand All@@ -254,7 +254,7 @@ export async function action() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
const action = async function () {
'use server';
await auth.protect();
Expand DownExpand Up@@ -282,7 +282,7 @@ const action = async function () {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export function getAction() {
const create = async () => {
'use server';
Expand DownExpand Up@@ -339,6 +339,59 @@ export default function Page() {
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from '@clerk/nextjs/server';

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted clerk import without auth: merges the specifier without changing quote style',
code: `import { currentUser } from "@clerk/nextjs/server";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from "@clerk/nextjs/server";

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted import in file: new auth import matches file quote style',
code: `import { redirect } from "next/navigation";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
import { redirect } from "next/navigation";

export default async function Page() {
await auth.protect();
return null;
Expand DownExpand Up@@ -378,7 +431,7 @@ export default async function Page() {
},
{
name: 'existing await auth() destructure: merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth();
Expand All@@ -392,7 +445,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth.protect();
Expand All@@ -405,7 +458,7 @@ export default async function Page() {
},
{
name: 'existing bare await auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth();
Expand All@@ -419,7 +472,7 @@ export async function GET() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth.protect();
Expand All@@ -432,7 +485,7 @@ export async function GET() {
},
{
name: 'concise arrow awaiting auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth();`,
filename: abs('app/api/widgets/route.ts'),
Expand All@@ -443,7 +496,7 @@ export const POST = async () => await auth();`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth.protect();`,
},
Expand DownExpand Up@@ -472,6 +525,96 @@ export default async function Page() {
export default async function Page() {
const { userId } = await clerkAuth.protect();
return <div>{userId}</div>;
}`,
},
],
},
],
},
{
name: 'page: sync default export with explicit return type — wraps in Promise',
code: `export default function Page(): JSX.Element {
return <div>Hello</div>;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page(): Promise<JSX.Element> {
await auth.protect();
return <div>Hello</div>;
}`,
},
],
},
],
},
{
name: 'route: sync arrow with explicit return type — wraps in Promise',
code: `export const GET = (): Response => new Response('ok');`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async (): Promise<Response> => {
await auth.protect();
return new Response('ok');
};`,
},
],
},
],
},
{
name: 'route: sync function with Promise return type — does not double-wrap',
code: `export function GET(): Promise<Response> {
return Promise.resolve(new Response('ok'));
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(): Promise<Response> {
await auth.protect();
return Promise.resolve(new Response('ok'));
}`,
},
],
},
],
},
{
name: 'route: type-predicate return type — adds async but does not wrap return type',
code: `export function GET(value: unknown): value is boolean {
return typeof value === 'boolean';
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(value: unknown): value is boolean {
await auth.protect();
return typeof value === 'boolean';
}`,
},
],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(eslint-plugin): Fix initial lint rule bugs by Ephem · Pull Request #8941 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-add-promise-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

Handle non-promise return types when `require-auth-protection` rule fixer makes the function `async`.

The eslint rule fixer will now wrap a non-promise return type with `Promise<>` to produce valid TypeScript.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-fixer-quote-style.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` fixer now matches the string quote style of existing imports when inserting a new `auth` import.

Previously, new imports always used single quotes regardless of how other imports in the file were quoted.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-or-auth-guards.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` rule now accepts OR-conditions like `if (!isAuthenticated || otherCondition)` when determining if a resource is protected.

Previously, only bare auth checks such as `if (!isAuthenticated)` were recognized. Guards with only `||` are safe but were incorrectly reported as missing protection.
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export default async function Page() {
expect(result.unresolved).toEqual([]);
expect(result.fixed).toEqual([{ filePath: page, protections: 1 }]);

expect(await readFile(page, 'utf8')).toBe(`import { auth } from '@clerk/nextjs/server';
expect(await readFile(page, 'utf8')).toBe(`import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand DownExpand Up@@ -109,7 +109,7 @@ export async function POST() {
expect(result.fixed).toEqual([{ filePath: route, protections: 2 }]);

const output = await readFile(route, 'utf8');
expect(output).toBe(`import { auth } from '@clerk/nextjs/server';
expect(output).toBe(`import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand Down
44 changes: 44 additions & 0 deletions packages/eslint-plugin/src/next/__tests__/quote-style.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import * as tsParser from '@typescript-eslint/parser';
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import { describe, expect, it } from 'vitest';

import { inferQuoteChar } from '../lib/quote-style';

function parse(code: string): { sourceCode: TSESLint.SourceCode; program: TSESTree.Program } {
const program = tsParser.parse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: { jsx: true },
}) as TSESTree.Program;
const sourceCode = {
ast: program,
getText(node: TSESTree.Node) {
return code.slice(node.range[0], node.range[1]);
},
} as TSESLint.SourceCode;
return { sourceCode, program };
}

describe('inferQuoteChar', () => {
it('returns double quotes from a double-quoted import', () => {
const { sourceCode, program } = parse('import { x } from "@pkg/foo";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('returns single quotes from a single-quoted import', () => {
const { sourceCode, program } = parse("import { x } from '@pkg/foo';");
expect(inferQuoteChar(sourceCode, program)).toBe("'");
});

it('returns double quotes from a double-quoted export source', () => {
const { sourceCode, program } = parse('export { GET } from "./route";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('falls back to double quotes when the file has no module sources to infer from', () => {
const { sourceCode, program } = parse(`export default function Page() {
return <div />;
}`);
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ ruleTester.run('require-auth-protection (suggestions)', rule, {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -65,7 +65,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return null;
Expand All@@ -86,7 +86,7 @@ export default async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async () => {
await auth.protect();
return { ok: true };
Expand All@@ -107,7 +107,7 @@ export const GET = async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -132,7 +132,7 @@ export default Page;`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -159,7 +159,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand All@@ -174,7 +174,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
return new Response('ok');
}
Expand DownExpand Up@@ -204,7 +204,7 @@ export async function loadData() {
{
messageId: 'addAuthProtect',
output: `'use server';
import { auth } from '@clerk/nextjs/server';
import { auth } from "@clerk/nextjs/server";

export async function loadData() {
await auth.protect();
Expand All@@ -229,7 +229,7 @@ export async function loadData() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function action() {
'use server';
await auth.protect();
Expand All@@ -254,7 +254,7 @@ export async function action() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
const action = async function () {
'use server';
await auth.protect();
Expand DownExpand Up@@ -282,7 +282,7 @@ const action = async function () {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export function getAction() {
const create = async () => {
'use server';
Expand DownExpand Up@@ -339,6 +339,59 @@ export default function Page() {
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from '@clerk/nextjs/server';

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted clerk import without auth: merges the specifier without changing quote style',
code: `import { currentUser } from "@clerk/nextjs/server";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from "@clerk/nextjs/server";

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted import in file: new auth import matches file quote style',
code: `import { redirect } from "next/navigation";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
import { redirect } from "next/navigation";

export default async function Page() {
await auth.protect();
return null;
Expand DownExpand Up@@ -378,7 +431,7 @@ export default async function Page() {
},
{
name: 'existing await auth() destructure: merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth();
Expand All@@ -392,7 +445,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth.protect();
Expand All@@ -405,7 +458,7 @@ export default async function Page() {
},
{
name: 'existing bare await auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth();
Expand All@@ -419,7 +472,7 @@ export async function GET() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth.protect();
Expand All@@ -432,7 +485,7 @@ export async function GET() {
},
{
name: 'concise arrow awaiting auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth();`,
filename: abs('app/api/widgets/route.ts'),
Expand All@@ -443,7 +496,7 @@ export const POST = async () => await auth();`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth.protect();`,
},
Expand DownExpand Up@@ -472,6 +525,96 @@ export default async function Page() {
export default async function Page() {
const { userId } = await clerkAuth.protect();
return <div>{userId}</div>;
}`,
},
],
},
],
},
{
name: 'page: sync default export with explicit return type — wraps in Promise',
code: `export default function Page(): JSX.Element {
return <div>Hello</div>;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page(): Promise<JSX.Element> {
await auth.protect();
return <div>Hello</div>;
}`,
},
],
},
],
},
{
name: 'route: sync arrow with explicit return type — wraps in Promise',
code: `export const GET = (): Response => new Response('ok');`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async (): Promise<Response> => {
await auth.protect();
return new Response('ok');
};`,
},
],
},
],
},
{
name: 'route: sync function with Promise return type — does not double-wrap',
code: `export function GET(): Promise<Response> {
return Promise.resolve(new Response('ok'));
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(): Promise<Response> {
await auth.protect();
return Promise.resolve(new Response('ok'));
}`,
},
],
},
],
},
{
name: 'route: type-predicate return type — adds async but does not wrap return type',
code: `export function GET(value: unknown): value is boolean {
return typeof value === 'boolean';
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(value: unknown): value is boolean {
await auth.protect();
return typeof value === 'boolean';
}`,
},
],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(eslint-plugin): Fix initial lint rule bugs by Ephem · Pull Request #8941 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-add-promise-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

Handle non-promise return types when `require-auth-protection` rule fixer makes the function `async`.

The eslint rule fixer will now wrap a non-promise return type with `Promise<>` to produce valid TypeScript.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-fixer-quote-style.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` fixer now matches the string quote style of existing imports when inserting a new `auth` import.

Previously, new imports always used single quotes regardless of how other imports in the file were quoted.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-or-auth-guards.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` rule now accepts OR-conditions like `if (!isAuthenticated || otherCondition)` when determining if a resource is protected.

Previously, only bare auth checks such as `if (!isAuthenticated)` were recognized. Guards with only `||` are safe but were incorrectly reported as missing protection.
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export default async function Page() {
expect(result.unresolved).toEqual([]);
expect(result.fixed).toEqual([{ filePath: page, protections: 1 }]);

expect(await readFile(page, 'utf8')).toBe(`import { auth } from '@clerk/nextjs/server';
expect(await readFile(page, 'utf8')).toBe(`import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand DownExpand Up@@ -109,7 +109,7 @@ export async function POST() {
expect(result.fixed).toEqual([{ filePath: route, protections: 2 }]);

const output = await readFile(route, 'utf8');
expect(output).toBe(`import { auth } from '@clerk/nextjs/server';
expect(output).toBe(`import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand Down
44 changes: 44 additions & 0 deletions packages/eslint-plugin/src/next/__tests__/quote-style.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import * as tsParser from '@typescript-eslint/parser';
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import { describe, expect, it } from 'vitest';

import { inferQuoteChar } from '../lib/quote-style';

function parse(code: string): { sourceCode: TSESLint.SourceCode; program: TSESTree.Program } {
const program = tsParser.parse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: { jsx: true },
}) as TSESTree.Program;
const sourceCode = {
ast: program,
getText(node: TSESTree.Node) {
return code.slice(node.range[0], node.range[1]);
},
} as TSESLint.SourceCode;
return { sourceCode, program };
}

describe('inferQuoteChar', () => {
it('returns double quotes from a double-quoted import', () => {
const { sourceCode, program } = parse('import { x } from "@pkg/foo";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('returns single quotes from a single-quoted import', () => {
const { sourceCode, program } = parse("import { x } from '@pkg/foo';");
expect(inferQuoteChar(sourceCode, program)).toBe("'");
});

it('returns double quotes from a double-quoted export source', () => {
const { sourceCode, program } = parse('export { GET } from "./route";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('falls back to double quotes when the file has no module sources to infer from', () => {
const { sourceCode, program } = parse(`export default function Page() {
return <div />;
}`);
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ ruleTester.run('require-auth-protection (suggestions)', rule, {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -65,7 +65,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return null;
Expand All@@ -86,7 +86,7 @@ export default async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async () => {
await auth.protect();
return { ok: true };
Expand All@@ -107,7 +107,7 @@ export const GET = async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -132,7 +132,7 @@ export default Page;`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -159,7 +159,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand All@@ -174,7 +174,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
return new Response('ok');
}
Expand DownExpand Up@@ -204,7 +204,7 @@ export async function loadData() {
{
messageId: 'addAuthProtect',
output: `'use server';
import { auth } from '@clerk/nextjs/server';
import { auth } from "@clerk/nextjs/server";

export async function loadData() {
await auth.protect();
Expand All@@ -229,7 +229,7 @@ export async function loadData() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function action() {
'use server';
await auth.protect();
Expand All@@ -254,7 +254,7 @@ export async function action() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
const action = async function () {
'use server';
await auth.protect();
Expand DownExpand Up@@ -282,7 +282,7 @@ const action = async function () {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export function getAction() {
const create = async () => {
'use server';
Expand DownExpand Up@@ -339,6 +339,59 @@ export default function Page() {
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from '@clerk/nextjs/server';

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted clerk import without auth: merges the specifier without changing quote style',
code: `import { currentUser } from "@clerk/nextjs/server";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from "@clerk/nextjs/server";

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted import in file: new auth import matches file quote style',
code: `import { redirect } from "next/navigation";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
import { redirect } from "next/navigation";

export default async function Page() {
await auth.protect();
return null;
Expand DownExpand Up@@ -378,7 +431,7 @@ export default async function Page() {
},
{
name: 'existing await auth() destructure: merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth();
Expand All@@ -392,7 +445,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth.protect();
Expand All@@ -405,7 +458,7 @@ export default async function Page() {
},
{
name: 'existing bare await auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth();
Expand All@@ -419,7 +472,7 @@ export async function GET() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth.protect();
Expand All@@ -432,7 +485,7 @@ export async function GET() {
},
{
name: 'concise arrow awaiting auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth();`,
filename: abs('app/api/widgets/route.ts'),
Expand All@@ -443,7 +496,7 @@ export const POST = async () => await auth();`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth.protect();`,
},
Expand DownExpand Up@@ -472,6 +525,96 @@ export default async function Page() {
export default async function Page() {
const { userId } = await clerkAuth.protect();
return <div>{userId}</div>;
}`,
},
],
},
],
},
{
name: 'page: sync default export with explicit return type — wraps in Promise',
code: `export default function Page(): JSX.Element {
return <div>Hello</div>;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page(): Promise<JSX.Element> {
await auth.protect();
return <div>Hello</div>;
}`,
},
],
},
],
},
{
name: 'route: sync arrow with explicit return type — wraps in Promise',
code: `export const GET = (): Response => new Response('ok');`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async (): Promise<Response> => {
await auth.protect();
return new Response('ok');
};`,
},
],
},
],
},
{
name: 'route: sync function with Promise return type — does not double-wrap',
code: `export function GET(): Promise<Response> {
return Promise.resolve(new Response('ok'));
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(): Promise<Response> {
await auth.protect();
return Promise.resolve(new Response('ok'));
}`,
},
],
},
],
},
{
name: 'route: type-predicate return type — adds async but does not wrap return type',
code: `export function GET(value: unknown): value is boolean {
return typeof value === 'boolean';
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(value: unknown): value is boolean {
await auth.protect();
return typeof value === 'boolean';
}`,
},
],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(eslint-plugin): Fix initial lint rule bugs by Ephem · Pull Request #8941 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-add-promise-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

Handle non-promise return types when `require-auth-protection` rule fixer makes the function `async`.

The eslint rule fixer will now wrap a non-promise return type with `Promise<>` to produce valid TypeScript.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-fixer-quote-style.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` fixer now matches the string quote style of existing imports when inserting a new `auth` import.

Previously, new imports always used single quotes regardless of how other imports in the file were quoted.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-or-auth-guards.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` rule now accepts OR-conditions like `if (!isAuthenticated || otherCondition)` when determining if a resource is protected.

Previously, only bare auth checks such as `if (!isAuthenticated)` were recognized. Guards with only `||` are safe but were incorrectly reported as missing protection.
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export default async function Page() {
expect(result.unresolved).toEqual([]);
expect(result.fixed).toEqual([{ filePath: page, protections: 1 }]);

expect(await readFile(page, 'utf8')).toBe(`import { auth } from '@clerk/nextjs/server';
expect(await readFile(page, 'utf8')).toBe(`import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand DownExpand Up@@ -109,7 +109,7 @@ export async function POST() {
expect(result.fixed).toEqual([{ filePath: route, protections: 2 }]);

const output = await readFile(route, 'utf8');
expect(output).toBe(`import { auth } from '@clerk/nextjs/server';
expect(output).toBe(`import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand Down
44 changes: 44 additions & 0 deletions packages/eslint-plugin/src/next/__tests__/quote-style.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import * as tsParser from '@typescript-eslint/parser';
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import { describe, expect, it } from 'vitest';

import { inferQuoteChar } from '../lib/quote-style';

function parse(code: string): { sourceCode: TSESLint.SourceCode; program: TSESTree.Program } {
const program = tsParser.parse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: { jsx: true },
}) as TSESTree.Program;
const sourceCode = {
ast: program,
getText(node: TSESTree.Node) {
return code.slice(node.range[0], node.range[1]);
},
} as TSESLint.SourceCode;
return { sourceCode, program };
}

describe('inferQuoteChar', () => {
it('returns double quotes from a double-quoted import', () => {
const { sourceCode, program } = parse('import { x } from "@pkg/foo";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('returns single quotes from a single-quoted import', () => {
const { sourceCode, program } = parse("import { x } from '@pkg/foo';");
expect(inferQuoteChar(sourceCode, program)).toBe("'");
});

it('returns double quotes from a double-quoted export source', () => {
const { sourceCode, program } = parse('export { GET } from "./route";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('falls back to double quotes when the file has no module sources to infer from', () => {
const { sourceCode, program } = parse(`export default function Page() {
return <div />;
}`);
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ ruleTester.run('require-auth-protection (suggestions)', rule, {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -65,7 +65,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return null;
Expand All@@ -86,7 +86,7 @@ export default async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async () => {
await auth.protect();
return { ok: true };
Expand All@@ -107,7 +107,7 @@ export const GET = async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -132,7 +132,7 @@ export default Page;`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -159,7 +159,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand All@@ -174,7 +174,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
return new Response('ok');
}
Expand DownExpand Up@@ -204,7 +204,7 @@ export async function loadData() {
{
messageId: 'addAuthProtect',
output: `'use server';
import { auth } from '@clerk/nextjs/server';
import { auth } from "@clerk/nextjs/server";

export async function loadData() {
await auth.protect();
Expand All@@ -229,7 +229,7 @@ export async function loadData() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function action() {
'use server';
await auth.protect();
Expand All@@ -254,7 +254,7 @@ export async function action() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
const action = async function () {
'use server';
await auth.protect();
Expand DownExpand Up@@ -282,7 +282,7 @@ const action = async function () {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export function getAction() {
const create = async () => {
'use server';
Expand DownExpand Up@@ -339,6 +339,59 @@ export default function Page() {
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from '@clerk/nextjs/server';

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted clerk import without auth: merges the specifier without changing quote style',
code: `import { currentUser } from "@clerk/nextjs/server";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from "@clerk/nextjs/server";

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted import in file: new auth import matches file quote style',
code: `import { redirect } from "next/navigation";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
import { redirect } from "next/navigation";

export default async function Page() {
await auth.protect();
return null;
Expand DownExpand Up@@ -378,7 +431,7 @@ export default async function Page() {
},
{
name: 'existing await auth() destructure: merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth();
Expand All@@ -392,7 +445,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth.protect();
Expand All@@ -405,7 +458,7 @@ export default async function Page() {
},
{
name: 'existing bare await auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth();
Expand All@@ -419,7 +472,7 @@ export async function GET() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth.protect();
Expand All@@ -432,7 +485,7 @@ export async function GET() {
},
{
name: 'concise arrow awaiting auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth();`,
filename: abs('app/api/widgets/route.ts'),
Expand All@@ -443,7 +496,7 @@ export const POST = async () => await auth();`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth.protect();`,
},
Expand DownExpand Up@@ -472,6 +525,96 @@ export default async function Page() {
export default async function Page() {
const { userId } = await clerkAuth.protect();
return <div>{userId}</div>;
}`,
},
],
},
],
},
{
name: 'page: sync default export with explicit return type — wraps in Promise',
code: `export default function Page(): JSX.Element {
return <div>Hello</div>;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page(): Promise<JSX.Element> {
await auth.protect();
return <div>Hello</div>;
}`,
},
],
},
],
},
{
name: 'route: sync arrow with explicit return type — wraps in Promise',
code: `export const GET = (): Response => new Response('ok');`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async (): Promise<Response> => {
await auth.protect();
return new Response('ok');
};`,
},
],
},
],
},
{
name: 'route: sync function with Promise return type — does not double-wrap',
code: `export function GET(): Promise<Response> {
return Promise.resolve(new Response('ok'));
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(): Promise<Response> {
await auth.protect();
return Promise.resolve(new Response('ok'));
}`,
},
],
},
],
},
{
name: 'route: type-predicate return type — adds async but does not wrap return type',
code: `export function GET(value: unknown): value is boolean {
return typeof value === 'boolean';
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(value: unknown): value is boolean {
await auth.protect();
return typeof value === 'boolean';
}`,
},
],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(eslint-plugin): Fix initial lint rule bugs by Ephem · Pull Request #8941 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-add-promise-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

Handle non-promise return types when `require-auth-protection` rule fixer makes the function `async`.

The eslint rule fixer will now wrap a non-promise return type with `Promise<>` to produce valid TypeScript.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-fixer-quote-style.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` fixer now matches the string quote style of existing imports when inserting a new `auth` import.

Previously, new imports always used single quotes regardless of how other imports in the file were quoted.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-or-auth-guards.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` rule now accepts OR-conditions like `if (!isAuthenticated || otherCondition)` when determining if a resource is protected.

Previously, only bare auth checks such as `if (!isAuthenticated)` were recognized. Guards with only `||` are safe but were incorrectly reported as missing protection.
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export default async function Page() {
expect(result.unresolved).toEqual([]);
expect(result.fixed).toEqual([{ filePath: page, protections: 1 }]);

expect(await readFile(page, 'utf8')).toBe(`import { auth } from '@clerk/nextjs/server';
expect(await readFile(page, 'utf8')).toBe(`import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand DownExpand Up@@ -109,7 +109,7 @@ export async function POST() {
expect(result.fixed).toEqual([{ filePath: route, protections: 2 }]);

const output = await readFile(route, 'utf8');
expect(output).toBe(`import { auth } from '@clerk/nextjs/server';
expect(output).toBe(`import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand Down
44 changes: 44 additions & 0 deletions packages/eslint-plugin/src/next/__tests__/quote-style.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import * as tsParser from '@typescript-eslint/parser';
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import { describe, expect, it } from 'vitest';

import { inferQuoteChar } from '../lib/quote-style';

function parse(code: string): { sourceCode: TSESLint.SourceCode; program: TSESTree.Program } {
const program = tsParser.parse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: { jsx: true },
}) as TSESTree.Program;
const sourceCode = {
ast: program,
getText(node: TSESTree.Node) {
return code.slice(node.range[0], node.range[1]);
},
} as TSESLint.SourceCode;
return { sourceCode, program };
}

describe('inferQuoteChar', () => {
it('returns double quotes from a double-quoted import', () => {
const { sourceCode, program } = parse('import { x } from "@pkg/foo";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('returns single quotes from a single-quoted import', () => {
const { sourceCode, program } = parse("import { x } from '@pkg/foo';");
expect(inferQuoteChar(sourceCode, program)).toBe("'");
});

it('returns double quotes from a double-quoted export source', () => {
const { sourceCode, program } = parse('export { GET } from "./route";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('falls back to double quotes when the file has no module sources to infer from', () => {
const { sourceCode, program } = parse(`export default function Page() {
return <div />;
}`);
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ ruleTester.run('require-auth-protection (suggestions)', rule, {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -65,7 +65,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return null;
Expand All@@ -86,7 +86,7 @@ export default async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async () => {
await auth.protect();
return { ok: true };
Expand All@@ -107,7 +107,7 @@ export const GET = async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -132,7 +132,7 @@ export default Page;`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -159,7 +159,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand All@@ -174,7 +174,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
return new Response('ok');
}
Expand DownExpand Up@@ -204,7 +204,7 @@ export async function loadData() {
{
messageId: 'addAuthProtect',
output: `'use server';
import { auth } from '@clerk/nextjs/server';
import { auth } from "@clerk/nextjs/server";

export async function loadData() {
await auth.protect();
Expand All@@ -229,7 +229,7 @@ export async function loadData() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function action() {
'use server';
await auth.protect();
Expand All@@ -254,7 +254,7 @@ export async function action() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
const action = async function () {
'use server';
await auth.protect();
Expand DownExpand Up@@ -282,7 +282,7 @@ const action = async function () {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export function getAction() {
const create = async () => {
'use server';
Expand DownExpand Up@@ -339,6 +339,59 @@ export default function Page() {
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from '@clerk/nextjs/server';

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted clerk import without auth: merges the specifier without changing quote style',
code: `import { currentUser } from "@clerk/nextjs/server";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from "@clerk/nextjs/server";

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted import in file: new auth import matches file quote style',
code: `import { redirect } from "next/navigation";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
import { redirect } from "next/navigation";

export default async function Page() {
await auth.protect();
return null;
Expand DownExpand Up@@ -378,7 +431,7 @@ export default async function Page() {
},
{
name: 'existing await auth() destructure: merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth();
Expand All@@ -392,7 +445,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth.protect();
Expand All@@ -405,7 +458,7 @@ export default async function Page() {
},
{
name: 'existing bare await auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth();
Expand All@@ -419,7 +472,7 @@ export async function GET() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth.protect();
Expand All@@ -432,7 +485,7 @@ export async function GET() {
},
{
name: 'concise arrow awaiting auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth();`,
filename: abs('app/api/widgets/route.ts'),
Expand All@@ -443,7 +496,7 @@ export const POST = async () => await auth();`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth.protect();`,
},
Expand DownExpand Up@@ -472,6 +525,96 @@ export default async function Page() {
export default async function Page() {
const { userId } = await clerkAuth.protect();
return <div>{userId}</div>;
}`,
},
],
},
],
},
{
name: 'page: sync default export with explicit return type — wraps in Promise',
code: `export default function Page(): JSX.Element {
return <div>Hello</div>;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page(): Promise<JSX.Element> {
await auth.protect();
return <div>Hello</div>;
}`,
},
],
},
],
},
{
name: 'route: sync arrow with explicit return type — wraps in Promise',
code: `export const GET = (): Response => new Response('ok');`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async (): Promise<Response> => {
await auth.protect();
return new Response('ok');
};`,
},
],
},
],
},
{
name: 'route: sync function with Promise return type — does not double-wrap',
code: `export function GET(): Promise<Response> {
return Promise.resolve(new Response('ok'));
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(): Promise<Response> {
await auth.protect();
return Promise.resolve(new Response('ok'));
}`,
},
],
},
],
},
{
name: 'route: type-predicate return type — adds async but does not wrap return type',
code: `export function GET(value: unknown): value is boolean {
return typeof value === 'boolean';
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(value: unknown): value is boolean {
await auth.protect();
return typeof value === 'boolean';
}`,
},
],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(eslint-plugin): Fix initial lint rule bugs by Ephem · Pull Request #8941 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-add-promise-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

Handle non-promise return types when `require-auth-protection` rule fixer makes the function `async`.

The eslint rule fixer will now wrap a non-promise return type with `Promise<>` to produce valid TypeScript.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-fixer-quote-style.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` fixer now matches the string quote style of existing imports when inserting a new `auth` import.

Previously, new imports always used single quotes regardless of how other imports in the file were quoted.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-or-auth-guards.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` rule now accepts OR-conditions like `if (!isAuthenticated || otherCondition)` when determining if a resource is protected.

Previously, only bare auth checks such as `if (!isAuthenticated)` were recognized. Guards with only `||` are safe but were incorrectly reported as missing protection.
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export default async function Page() {
expect(result.unresolved).toEqual([]);
expect(result.fixed).toEqual([{ filePath: page, protections: 1 }]);

expect(await readFile(page, 'utf8')).toBe(`import { auth } from '@clerk/nextjs/server';
expect(await readFile(page, 'utf8')).toBe(`import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand DownExpand Up@@ -109,7 +109,7 @@ export async function POST() {
expect(result.fixed).toEqual([{ filePath: route, protections: 2 }]);

const output = await readFile(route, 'utf8');
expect(output).toBe(`import { auth } from '@clerk/nextjs/server';
expect(output).toBe(`import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand Down
44 changes: 44 additions & 0 deletions packages/eslint-plugin/src/next/__tests__/quote-style.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import * as tsParser from '@typescript-eslint/parser';
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import { describe, expect, it } from 'vitest';

import { inferQuoteChar } from '../lib/quote-style';

function parse(code: string): { sourceCode: TSESLint.SourceCode; program: TSESTree.Program } {
const program = tsParser.parse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: { jsx: true },
}) as TSESTree.Program;
const sourceCode = {
ast: program,
getText(node: TSESTree.Node) {
return code.slice(node.range[0], node.range[1]);
},
} as TSESLint.SourceCode;
return { sourceCode, program };
}

describe('inferQuoteChar', () => {
it('returns double quotes from a double-quoted import', () => {
const { sourceCode, program } = parse('import { x } from "@pkg/foo";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('returns single quotes from a single-quoted import', () => {
const { sourceCode, program } = parse("import { x } from '@pkg/foo';");
expect(inferQuoteChar(sourceCode, program)).toBe("'");
});

it('returns double quotes from a double-quoted export source', () => {
const { sourceCode, program } = parse('export { GET } from "./route";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('falls back to double quotes when the file has no module sources to infer from', () => {
const { sourceCode, program } = parse(`export default function Page() {
return <div />;
}`);
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ ruleTester.run('require-auth-protection (suggestions)', rule, {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -65,7 +65,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return null;
Expand All@@ -86,7 +86,7 @@ export default async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async () => {
await auth.protect();
return { ok: true };
Expand All@@ -107,7 +107,7 @@ export const GET = async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -132,7 +132,7 @@ export default Page;`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -159,7 +159,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand All@@ -174,7 +174,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
return new Response('ok');
}
Expand DownExpand Up@@ -204,7 +204,7 @@ export async function loadData() {
{
messageId: 'addAuthProtect',
output: `'use server';
import { auth } from '@clerk/nextjs/server';
import { auth } from "@clerk/nextjs/server";

export async function loadData() {
await auth.protect();
Expand All@@ -229,7 +229,7 @@ export async function loadData() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function action() {
'use server';
await auth.protect();
Expand All@@ -254,7 +254,7 @@ export async function action() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
const action = async function () {
'use server';
await auth.protect();
Expand DownExpand Up@@ -282,7 +282,7 @@ const action = async function () {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export function getAction() {
const create = async () => {
'use server';
Expand DownExpand Up@@ -339,6 +339,59 @@ export default function Page() {
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from '@clerk/nextjs/server';

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted clerk import without auth: merges the specifier without changing quote style',
code: `import { currentUser } from "@clerk/nextjs/server";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from "@clerk/nextjs/server";

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted import in file: new auth import matches file quote style',
code: `import { redirect } from "next/navigation";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
import { redirect } from "next/navigation";

export default async function Page() {
await auth.protect();
return null;
Expand DownExpand Up@@ -378,7 +431,7 @@ export default async function Page() {
},
{
name: 'existing await auth() destructure: merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth();
Expand All@@ -392,7 +445,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth.protect();
Expand All@@ -405,7 +458,7 @@ export default async function Page() {
},
{
name: 'existing bare await auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth();
Expand All@@ -419,7 +472,7 @@ export async function GET() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth.protect();
Expand All@@ -432,7 +485,7 @@ export async function GET() {
},
{
name: 'concise arrow awaiting auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth();`,
filename: abs('app/api/widgets/route.ts'),
Expand All@@ -443,7 +496,7 @@ export const POST = async () => await auth();`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth.protect();`,
},
Expand DownExpand Up@@ -472,6 +525,96 @@ export default async function Page() {
export default async function Page() {
const { userId } = await clerkAuth.protect();
return <div>{userId}</div>;
}`,
},
],
},
],
},
{
name: 'page: sync default export with explicit return type — wraps in Promise',
code: `export default function Page(): JSX.Element {
return <div>Hello</div>;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page(): Promise<JSX.Element> {
await auth.protect();
return <div>Hello</div>;
}`,
},
],
},
],
},
{
name: 'route: sync arrow with explicit return type — wraps in Promise',
code: `export const GET = (): Response => new Response('ok');`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async (): Promise<Response> => {
await auth.protect();
return new Response('ok');
};`,
},
],
},
],
},
{
name: 'route: sync function with Promise return type — does not double-wrap',
code: `export function GET(): Promise<Response> {
return Promise.resolve(new Response('ok'));
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(): Promise<Response> {
await auth.protect();
return Promise.resolve(new Response('ok'));
}`,
},
],
},
],
},
{
name: 'route: type-predicate return type — adds async but does not wrap return type',
code: `export function GET(value: unknown): value is boolean {
return typeof value === 'boolean';
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(value: unknown): value is boolean {
await auth.protect();
return typeof value === 'boolean';
}`,
},
],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(eslint-plugin): Fix initial lint rule bugs by Ephem · Pull Request #8941 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-add-promise-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

Handle non-promise return types when `require-auth-protection` rule fixer makes the function `async`.

The eslint rule fixer will now wrap a non-promise return type with `Promise<>` to produce valid TypeScript.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-fixer-quote-style.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` fixer now matches the string quote style of existing imports when inserting a new `auth` import.

Previously, new imports always used single quotes regardless of how other imports in the file were quoted.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-or-auth-guards.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` rule now accepts OR-conditions like `if (!isAuthenticated || otherCondition)` when determining if a resource is protected.

Previously, only bare auth checks such as `if (!isAuthenticated)` were recognized. Guards with only `||` are safe but were incorrectly reported as missing protection.
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export default async function Page() {
expect(result.unresolved).toEqual([]);
expect(result.fixed).toEqual([{ filePath: page, protections: 1 }]);

expect(await readFile(page, 'utf8')).toBe(`import { auth } from '@clerk/nextjs/server';
expect(await readFile(page, 'utf8')).toBe(`import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand DownExpand Up@@ -109,7 +109,7 @@ export async function POST() {
expect(result.fixed).toEqual([{ filePath: route, protections: 2 }]);

const output = await readFile(route, 'utf8');
expect(output).toBe(`import { auth } from '@clerk/nextjs/server';
expect(output).toBe(`import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand Down
44 changes: 44 additions & 0 deletions packages/eslint-plugin/src/next/__tests__/quote-style.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import * as tsParser from '@typescript-eslint/parser';
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import { describe, expect, it } from 'vitest';

import { inferQuoteChar } from '../lib/quote-style';

function parse(code: string): { sourceCode: TSESLint.SourceCode; program: TSESTree.Program } {
const program = tsParser.parse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: { jsx: true },
}) as TSESTree.Program;
const sourceCode = {
ast: program,
getText(node: TSESTree.Node) {
return code.slice(node.range[0], node.range[1]);
},
} as TSESLint.SourceCode;
return { sourceCode, program };
}

describe('inferQuoteChar', () => {
it('returns double quotes from a double-quoted import', () => {
const { sourceCode, program } = parse('import { x } from "@pkg/foo";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('returns single quotes from a single-quoted import', () => {
const { sourceCode, program } = parse("import { x } from '@pkg/foo';");
expect(inferQuoteChar(sourceCode, program)).toBe("'");
});

it('returns double quotes from a double-quoted export source', () => {
const { sourceCode, program } = parse('export { GET } from "./route";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('falls back to double quotes when the file has no module sources to infer from', () => {
const { sourceCode, program } = parse(`export default function Page() {
return <div />;
}`);
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ ruleTester.run('require-auth-protection (suggestions)', rule, {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -65,7 +65,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return null;
Expand All@@ -86,7 +86,7 @@ export default async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async () => {
await auth.protect();
return { ok: true };
Expand All@@ -107,7 +107,7 @@ export const GET = async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -132,7 +132,7 @@ export default Page;`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -159,7 +159,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand All@@ -174,7 +174,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
return new Response('ok');
}
Expand DownExpand Up@@ -204,7 +204,7 @@ export async function loadData() {
{
messageId: 'addAuthProtect',
output: `'use server';
import { auth } from '@clerk/nextjs/server';
import { auth } from "@clerk/nextjs/server";

export async function loadData() {
await auth.protect();
Expand All@@ -229,7 +229,7 @@ export async function loadData() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function action() {
'use server';
await auth.protect();
Expand All@@ -254,7 +254,7 @@ export async function action() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
const action = async function () {
'use server';
await auth.protect();
Expand DownExpand Up@@ -282,7 +282,7 @@ const action = async function () {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export function getAction() {
const create = async () => {
'use server';
Expand DownExpand Up@@ -339,6 +339,59 @@ export default function Page() {
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from '@clerk/nextjs/server';

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted clerk import without auth: merges the specifier without changing quote style',
code: `import { currentUser } from "@clerk/nextjs/server";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from "@clerk/nextjs/server";

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted import in file: new auth import matches file quote style',
code: `import { redirect } from "next/navigation";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
import { redirect } from "next/navigation";

export default async function Page() {
await auth.protect();
return null;
Expand DownExpand Up@@ -378,7 +431,7 @@ export default async function Page() {
},
{
name: 'existing await auth() destructure: merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth();
Expand All@@ -392,7 +445,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth.protect();
Expand All@@ -405,7 +458,7 @@ export default async function Page() {
},
{
name: 'existing bare await auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth();
Expand All@@ -419,7 +472,7 @@ export async function GET() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth.protect();
Expand All@@ -432,7 +485,7 @@ export async function GET() {
},
{
name: 'concise arrow awaiting auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth();`,
filename: abs('app/api/widgets/route.ts'),
Expand All@@ -443,7 +496,7 @@ export const POST = async () => await auth();`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth.protect();`,
},
Expand DownExpand Up@@ -472,6 +525,96 @@ export default async function Page() {
export default async function Page() {
const { userId } = await clerkAuth.protect();
return <div>{userId}</div>;
}`,
},
],
},
],
},
{
name: 'page: sync default export with explicit return type — wraps in Promise',
code: `export default function Page(): JSX.Element {
return <div>Hello</div>;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page(): Promise<JSX.Element> {
await auth.protect();
return <div>Hello</div>;
}`,
},
],
},
],
},
{
name: 'route: sync arrow with explicit return type — wraps in Promise',
code: `export const GET = (): Response => new Response('ok');`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async (): Promise<Response> => {
await auth.protect();
return new Response('ok');
};`,
},
],
},
],
},
{
name: 'route: sync function with Promise return type — does not double-wrap',
code: `export function GET(): Promise<Response> {
return Promise.resolve(new Response('ok'));
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(): Promise<Response> {
await auth.protect();
return Promise.resolve(new Response('ok'));
}`,
},
],
},
],
},
{
name: 'route: type-predicate return type — adds async but does not wrap return type',
code: `export function GET(value: unknown): value is boolean {
return typeof value === 'boolean';
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(value: unknown): value is boolean {
await auth.protect();
return typeof value === 'boolean';
}`,
},
],
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(eslint-plugin): Fix initial lint rule bugs by Ephem · Pull Request #8941 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-add-promise-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

Handle non-promise return types when `require-auth-protection` rule fixer makes the function `async`.

The eslint rule fixer will now wrap a non-promise return type with `Promise<>` to produce valid TypeScript.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-fixer-quote-style.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` fixer now matches the string quote style of existing imports when inserting a new `auth` import.

Previously, new imports always used single quotes regardless of how other imports in the file were quoted.
7 changes: 7 additions & 0 deletions .changeset/eslint-plugin-or-auth-guards.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/eslint-plugin': patch
---

The `require-auth-protection` rule now accepts OR-conditions like `if (!isAuthenticated || otherCondition)` when determining if a resource is protected.

Previously, only bare auth checks such as `if (!isAuthenticated)` were recognized. Guards with only `||` are safe but were incorrectly reported as missing protection.
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ export default async function Page() {
expect(result.unresolved).toEqual([]);
expect(result.fixed).toEqual([{ filePath: page, protections: 1 }]);

expect(await readFile(page, 'utf8')).toBe(`import { auth } from '@clerk/nextjs/server';
expect(await readFile(page, 'utf8')).toBe(`import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand DownExpand Up@@ -109,7 +109,7 @@ export async function POST() {
expect(result.fixed).toEqual([{ filePath: route, protections: 2 }]);

const output = await readFile(route, 'utf8');
expect(output).toBe(`import { auth } from '@clerk/nextjs/server';
expect(output).toBe(`import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand Down
44 changes: 44 additions & 0 deletions packages/eslint-plugin/src/next/__tests__/quote-style.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
import * as tsParser from '@typescript-eslint/parser';
import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
import { describe, expect, it } from 'vitest';

import { inferQuoteChar } from '../lib/quote-style';

function parse(code: string): { sourceCode: TSESLint.SourceCode; program: TSESTree.Program } {
const program = tsParser.parse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: { jsx: true },
}) as TSESTree.Program;
const sourceCode = {
ast: program,
getText(node: TSESTree.Node) {
return code.slice(node.range[0], node.range[1]);
},
} as TSESLint.SourceCode;
return { sourceCode, program };
}

describe('inferQuoteChar', () => {
it('returns double quotes from a double-quoted import', () => {
const { sourceCode, program } = parse('import { x } from "@pkg/foo";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('returns single quotes from a single-quoted import', () => {
const { sourceCode, program } = parse("import { x } from '@pkg/foo';");
expect(inferQuoteChar(sourceCode, program)).toBe("'");
});

it('returns double quotes from a double-quoted export source', () => {
const { sourceCode, program } = parse('export { GET } from "./route";');
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});

it('falls back to double quotes when the file has no module sources to infer from', () => {
const { sourceCode, program } = parse(`export default function Page() {
return <div />;
}`);
expect(inferQuoteChar(sourceCode, program)).toBe('"');
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ ruleTester.run('require-auth-protection (suggestions)', rule, {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -65,7 +65,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return null;
Expand All@@ -86,7 +86,7 @@ export default async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async () => {
await auth.protect();
return { ok: true };
Expand All@@ -107,7 +107,7 @@ export const GET = async () => {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export default async () => {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -132,7 +132,7 @@ export default Page;`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
async function Page() {
await auth.protect();
return <div>Hello</div>;
Expand All@@ -159,7 +159,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
await auth.protect();
return new Response('ok');
Expand All@@ -174,7 +174,7 @@ export const POST = () => new Response('ok');`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function GET() {
return new Response('ok');
}
Expand DownExpand Up@@ -204,7 +204,7 @@ export async function loadData() {
{
messageId: 'addAuthProtect',
output: `'use server';
import { auth } from '@clerk/nextjs/server';
import { auth } from "@clerk/nextjs/server";

export async function loadData() {
await auth.protect();
Expand All@@ -229,7 +229,7 @@ export async function loadData() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export async function action() {
'use server';
await auth.protect();
Expand All@@ -254,7 +254,7 @@ export async function action() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
const action = async function () {
'use server';
await auth.protect();
Expand DownExpand Up@@ -282,7 +282,7 @@ const action = async function () {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";
export function getAction() {
const create = async () => {
'use server';
Expand DownExpand Up@@ -339,6 +339,59 @@ export default function Page() {
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from '@clerk/nextjs/server';

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted clerk import without auth: merges the specifier without changing quote style',
code: `import { currentUser } from "@clerk/nextjs/server";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { currentUser, auth } from "@clerk/nextjs/server";

export default async function Page() {
await auth.protect();
return null;
}`,
},
],
},
],
},
{
name: 'double-quoted import in file: new auth import matches file quote style',
code: `import { redirect } from "next/navigation";

export default function Page() {
return null;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
import { redirect } from "next/navigation";

export default async function Page() {
await auth.protect();
return null;
Expand DownExpand Up@@ -378,7 +431,7 @@ export default async function Page() {
},
{
name: 'existing await auth() destructure: merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth();
Expand All@@ -392,7 +445,7 @@ export default async function Page() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export default async function Page() {
const { userId } = await auth.protect();
Expand All@@ -405,7 +458,7 @@ export default async function Page() {
},
{
name: 'existing bare await auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth();
Expand All@@ -419,7 +472,7 @@ export async function GET() {
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export async function GET() {
await auth.protect();
Expand All@@ -432,7 +485,7 @@ export async function GET() {
},
{
name: 'concise arrow awaiting auth(): merges .protect() into the call',
code: `import { auth } from '@clerk/nextjs/server';
code: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth();`,
filename: abs('app/api/widgets/route.ts'),
Expand All@@ -443,7 +496,7 @@ export const POST = async () => await auth();`,
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from '@clerk/nextjs/server';
output: `import { auth } from "@clerk/nextjs/server";

export const POST = async () => await auth.protect();`,
},
Expand DownExpand Up@@ -472,6 +525,96 @@ export default async function Page() {
export default async function Page() {
const { userId } = await clerkAuth.protect();
return <div>{userId}</div>;
}`,
},
],
},
],
},
{
name: 'page: sync default export with explicit return type — wraps in Promise',
code: `export default function Page(): JSX.Element {
return <div>Hello</div>;
}`,
filename: abs('app/dashboard/page.tsx'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export default async function Page(): Promise<JSX.Element> {
await auth.protect();
return <div>Hello</div>;
}`,
},
],
},
],
},
{
name: 'route: sync arrow with explicit return type — wraps in Promise',
code: `export const GET = (): Response => new Response('ok');`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export const GET = async (): Promise<Response> => {
await auth.protect();
return new Response('ok');
};`,
},
],
},
],
},
{
name: 'route: sync function with Promise return type — does not double-wrap',
code: `export function GET(): Promise<Response> {
return Promise.resolve(new Response('ok'));
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(): Promise<Response> {
await auth.protect();
return Promise.resolve(new Response('ok'));
}`,
},
],
},
],
},
{
name: 'route: type-predicate return type — adds async but does not wrap return type',
code: `export function GET(value: unknown): value is boolean {
return typeof value === 'boolean';
}`,
filename: abs('app/api/widgets/route.ts'),
options: [config],
errors: [
{
messageId: 'missingProtect',
suggestions: [
{
messageId: 'addAuthProtect',
output: `import { auth } from "@clerk/nextjs/server";
export async function GET(value: unknown): value is boolean {
await auth.protect();
return typeof value === 'boolean';
}`,
},
],
Expand Down
Loading
Loading