fix(nextjs): Support Next.js 16 cache invalidation on sign-out - #7211

Merged
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16
Nov 13, 2025
Merged

fix(nextjs): Support Next.js 16 cache invalidation on sign-out#7211
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16

Conversation

@LauraBeatris

@LauraBeatrisLauraBeatris commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Description

Currently, Next.js 16 is falling through to call invalidateCacheAction() which is causing issues with the navigation flow when switching to a session with pending status.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Fixed router cache handling during sign-out for Next.js 16.
  • Improvements

    • Extended cache invalidation behavior to support Next.js 16 during sign-out operations, ensuring consistent behavior across framework versions.

@LauraBeatrisLauraBeatris self-assigned this Nov 13, 2025
@changeset-bot

changeset-botBot commented Nov 13, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b06501c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/nextjsPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Nov 13, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentPreviewCommentsUpdated (UTC)
clerk-js-sandboxReadyReadyPreviewCommentNov 13, 2025 3:51pm

@coderabbitai

coderabbitaiBot commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

This change extends the sign-out cache invalidation noop handling in @clerk/nextjs to support Next.js 16 alongside Next.js 15. The modification updates version detection logic and corrects related comments to reflect broader version support.

Changes

Cohort / File(s)Summary
Release Documentation
\.changeset/major-rabbits-reply\.md
Adds patch release note documenting cache invalidation noop extension to Next.js 16 during sign-out
Version Handling Logic
packages/nextjs/src/app-router/client/ClerkProvider\.tsx
Extends sign-out version check to include Next.js 16; corrects comments (typo: "singed" → "signed", version scope clarification to "v15+", and cache aggressiveness description update)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

  • Focused, self-contained change affecting a single conditional check
  • Comment corrections are minor and straightforward
  • Logic addition is repetitive (extending existing pattern) rather than introducing new complexity

Poem

🐰 A version check hops forth with grace,
Extending care to v16's space,
While typos flee and comments shine—
Next.js fifteen, sixteen align! ✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title directly and accurately summarizes the main change: extending Next.js cache invalidation support from v15 to v16 during sign-out operations.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch laura/apply-cache-invalidation-next-16

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Nov 13, 2025

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7211

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7211

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7211

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7211

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7211

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7211

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7211

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7211

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7211

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7211

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7211

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7211

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7211

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7211

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7211

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7211

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7211

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7211

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7211

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7211

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7211

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7211

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7211

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7211

commit: b06501c

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

104-110: Fix correctly extends noop to Next.js 16; consider version check pattern for future maintenance.

The logic correctly addresses the reported bug by preventing invalidateCacheAction() from being called during sign-out on Next.js 16, avoiding 404/405 errors when the __session cookie has already been cleared.

The current approach using explicit OR conditions (nextVersion.startsWith('15') || nextVersion.startsWith('16')) is safe but will require updates for each new major version (17, 18, etc.). For improved maintainability, consider extracting the version check into a helper function or using major version comparison:

constshouldSkipCacheInvalidationOnSignOut=(version: string,intent: string)=>{constmajorVersion=parseInt(version.split('.')[0],10);returnmajorVersion>=15&&intent==='sign-out';};

However, this assumes future Next.js versions maintain the same cache behavior. Given the authentication-critical nature of this code, the current explicit version checking may be safer if you prefer to validate behavior for each new major version before enabling this optimization.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 42f0d95 and b06501c.

📒 Files selected for processing (2)
  • .changeset/major-rabbits-reply.md (1 hunks)
  • packages/nextjs/src/app-router/client/ClerkProvider.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (32)
  • GitHub Check: Integration Tests (nextjs, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 14)
  • GitHub Check: Integration Tests (quickstart, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 15, RQ)
  • GitHub Check: Integration Tests (nuxt, chrome)
  • GitHub Check: Integration Tests (billing, chrome, RQ)
  • GitHub Check: Integration Tests (quickstart, chrome, 15)
  • GitHub Check: Integration Tests (billing, chrome)
  • GitHub Check: Integration Tests (expo-web, chrome)
  • GitHub Check: Integration Tests (vue, chrome)
  • GitHub Check: Integration Tests (tanstack-react-start, chrome)
  • GitHub Check: Integration Tests (machine, chrome)
  • GitHub Check: Integration Tests (nextjs, chrome, 15)
  • GitHub Check: Integration Tests (astro, chrome)
  • GitHub Check: Integration Tests (custom, chrome)
  • GitHub Check: Integration Tests (react-router, chrome)
  • GitHub Check: Integration Tests (sessions, chrome)
  • GitHub Check: Integration Tests (elements, chrome)
  • GitHub Check: Integration Tests (localhost, chrome)
  • GitHub Check: Integration Tests (sessions:staging, chrome)
  • GitHub Check: Integration Tests (handshake, chrome)
  • GitHub Check: Integration Tests (handshake:staging, chrome)
  • GitHub Check: Integration Tests (express, chrome)
  • GitHub Check: Integration Tests (generic, chrome)
  • GitHub Check: Static analysis
  • GitHub Check: Unit Tests (22, shared, clerk-js, RQ)
  • GitHub Check: Unit Tests (22, **)
  • GitHub Check: Publish with pkg-pr-new
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (2)
.changeset/major-rabbits-reply.md (1)

1-5: LGTM! Changeset accurately documents the patch.

The changeset correctly describes the extension of cache invalidation noop handling to Next.js 16 during sign-out, matching the code changes in ClerkProvider.tsx.

packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

99-100: LGTM! Comment improvement and typo fix.

The comment update to "Next.js v15+" accurately reflects the extended version support, and the typo correction from "singed in" to "signed in" improves readability.

@LauraBeatris
LauraBeatris requested a review from a teamNovember 13, 2025 16:33
@LauraBeatris
LauraBeatris merged commit d7d0704 into mainNov 13, 2025
108 of 109 checks passed
@LauraBeatris
LauraBeatris deleted the laura/apply-cache-invalidation-next-16 branch November 13, 2025 16:59
// To mitigate this, since the router cache on version 15+ is much less aggressive, we can treat this as a noop and simply resolve the promise.
// Once `setActive` performs the navigation, `__unstable__onAfterSetActive` will kick in and perform a router.refresh ensuring shared layouts will also update with the correct authentication context.
else if (nextVersion.startsWith('15') && intent === 'sign-out') {
else if ((nextVersion.startsWith('15') || nextVersion.startsWith('16')) && intent === 'sign-out') {

@fscgustavofscgustavoNov 13, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LauraBeatris

This issue may occur again when future Next.js versions are released, such as version 17 and beyond.
To make the logic more future-proof, we could extract the major version number and compare it directly:

constmajorVersion=Number(nextVersion.split('.')[0]);majorVersion===13;// first condition majorVersion>=15&&intent==='sign-out';// second condition

This avoids having to manually update the code every time a new version (e.g., 17, 18…) is released.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@LauraBeatris@dstaley@brkalow@panteliselef@fscgustavo@clerk-cookie
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

fix(nextjs): Support Next.js 16 cache invalidation on sign-out - #7211

Merged
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16
Nov 13, 2025
Merged

fix(nextjs): Support Next.js 16 cache invalidation on sign-out#7211
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16

Conversation

@LauraBeatris

@LauraBeatrisLauraBeatris commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Description

Currently, Next.js 16 is falling through to call invalidateCacheAction() which is causing issues with the navigation flow when switching to a session with pending status.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Fixed router cache handling during sign-out for Next.js 16.
  • Improvements

    • Extended cache invalidation behavior to support Next.js 16 during sign-out operations, ensuring consistent behavior across framework versions.

@LauraBeatrisLauraBeatris self-assigned this Nov 13, 2025
@changeset-bot

changeset-botBot commented Nov 13, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b06501c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/nextjsPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Nov 13, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentPreviewCommentsUpdated (UTC)
clerk-js-sandboxReadyReadyPreviewCommentNov 13, 2025 3:51pm

@coderabbitai

coderabbitaiBot commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

This change extends the sign-out cache invalidation noop handling in @clerk/nextjs to support Next.js 16 alongside Next.js 15. The modification updates version detection logic and corrects related comments to reflect broader version support.

Changes

Cohort / File(s)Summary
Release Documentation
\.changeset/major-rabbits-reply\.md
Adds patch release note documenting cache invalidation noop extension to Next.js 16 during sign-out
Version Handling Logic
packages/nextjs/src/app-router/client/ClerkProvider\.tsx
Extends sign-out version check to include Next.js 16; corrects comments (typo: "singed" → "signed", version scope clarification to "v15+", and cache aggressiveness description update)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

  • Focused, self-contained change affecting a single conditional check
  • Comment corrections are minor and straightforward
  • Logic addition is repetitive (extending existing pattern) rather than introducing new complexity

Poem

🐰 A version check hops forth with grace,
Extending care to v16's space,
While typos flee and comments shine—
Next.js fifteen, sixteen align! ✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title directly and accurately summarizes the main change: extending Next.js cache invalidation support from v15 to v16 during sign-out operations.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch laura/apply-cache-invalidation-next-16

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Nov 13, 2025

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7211

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7211

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7211

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7211

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7211

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7211

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7211

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7211

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7211

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7211

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7211

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7211

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7211

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7211

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7211

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7211

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7211

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7211

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7211

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7211

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7211

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7211

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7211

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7211

commit: b06501c

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

104-110: Fix correctly extends noop to Next.js 16; consider version check pattern for future maintenance.

The logic correctly addresses the reported bug by preventing invalidateCacheAction() from being called during sign-out on Next.js 16, avoiding 404/405 errors when the __session cookie has already been cleared.

The current approach using explicit OR conditions (nextVersion.startsWith('15') || nextVersion.startsWith('16')) is safe but will require updates for each new major version (17, 18, etc.). For improved maintainability, consider extracting the version check into a helper function or using major version comparison:

constshouldSkipCacheInvalidationOnSignOut=(version: string,intent: string)=>{constmajorVersion=parseInt(version.split('.')[0],10);returnmajorVersion>=15&&intent==='sign-out';};

However, this assumes future Next.js versions maintain the same cache behavior. Given the authentication-critical nature of this code, the current explicit version checking may be safer if you prefer to validate behavior for each new major version before enabling this optimization.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 42f0d95 and b06501c.

📒 Files selected for processing (2)
  • .changeset/major-rabbits-reply.md (1 hunks)
  • packages/nextjs/src/app-router/client/ClerkProvider.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (32)
  • GitHub Check: Integration Tests (nextjs, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 14)
  • GitHub Check: Integration Tests (quickstart, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 15, RQ)
  • GitHub Check: Integration Tests (nuxt, chrome)
  • GitHub Check: Integration Tests (billing, chrome, RQ)
  • GitHub Check: Integration Tests (quickstart, chrome, 15)
  • GitHub Check: Integration Tests (billing, chrome)
  • GitHub Check: Integration Tests (expo-web, chrome)
  • GitHub Check: Integration Tests (vue, chrome)
  • GitHub Check: Integration Tests (tanstack-react-start, chrome)
  • GitHub Check: Integration Tests (machine, chrome)
  • GitHub Check: Integration Tests (nextjs, chrome, 15)
  • GitHub Check: Integration Tests (astro, chrome)
  • GitHub Check: Integration Tests (custom, chrome)
  • GitHub Check: Integration Tests (react-router, chrome)
  • GitHub Check: Integration Tests (sessions, chrome)
  • GitHub Check: Integration Tests (elements, chrome)
  • GitHub Check: Integration Tests (localhost, chrome)
  • GitHub Check: Integration Tests (sessions:staging, chrome)
  • GitHub Check: Integration Tests (handshake, chrome)
  • GitHub Check: Integration Tests (handshake:staging, chrome)
  • GitHub Check: Integration Tests (express, chrome)
  • GitHub Check: Integration Tests (generic, chrome)
  • GitHub Check: Static analysis
  • GitHub Check: Unit Tests (22, shared, clerk-js, RQ)
  • GitHub Check: Unit Tests (22, **)
  • GitHub Check: Publish with pkg-pr-new
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (2)
.changeset/major-rabbits-reply.md (1)

1-5: LGTM! Changeset accurately documents the patch.

The changeset correctly describes the extension of cache invalidation noop handling to Next.js 16 during sign-out, matching the code changes in ClerkProvider.tsx.

packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

99-100: LGTM! Comment improvement and typo fix.

The comment update to "Next.js v15+" accurately reflects the extended version support, and the typo correction from "singed in" to "signed in" improves readability.

@LauraBeatris
LauraBeatris requested a review from a teamNovember 13, 2025 16:33
@LauraBeatris
LauraBeatris merged commit d7d0704 into mainNov 13, 2025
108 of 109 checks passed
@LauraBeatris
LauraBeatris deleted the laura/apply-cache-invalidation-next-16 branch November 13, 2025 16:59
// To mitigate this, since the router cache on version 15+ is much less aggressive, we can treat this as a noop and simply resolve the promise.
// Once `setActive` performs the navigation, `__unstable__onAfterSetActive` will kick in and perform a router.refresh ensuring shared layouts will also update with the correct authentication context.
else if (nextVersion.startsWith('15') && intent === 'sign-out') {
else if ((nextVersion.startsWith('15') || nextVersion.startsWith('16')) && intent === 'sign-out') {

@fscgustavofscgustavoNov 13, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LauraBeatris

This issue may occur again when future Next.js versions are released, such as version 17 and beyond.
To make the logic more future-proof, we could extract the major version number and compare it directly:

constmajorVersion=Number(nextVersion.split('.')[0]);majorVersion===13;// first condition majorVersion>=15&&intent==='sign-out';// second condition

This avoids having to manually update the code every time a new version (e.g., 17, 18…) is released.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@LauraBeatris@dstaley@brkalow@panteliselef@fscgustavo@clerk-cookie
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(nextjs): Support Next.js 16 cache invalidation on sign-out - #7211

Merged
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16
Nov 13, 2025
Merged

fix(nextjs): Support Next.js 16 cache invalidation on sign-out#7211
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16

Conversation

@LauraBeatris

@LauraBeatrisLauraBeatris commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Description

Currently, Next.js 16 is falling through to call invalidateCacheAction() which is causing issues with the navigation flow when switching to a session with pending status.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Fixed router cache handling during sign-out for Next.js 16.
  • Improvements

    • Extended cache invalidation behavior to support Next.js 16 during sign-out operations, ensuring consistent behavior across framework versions.

@LauraBeatrisLauraBeatris self-assigned this Nov 13, 2025
@changeset-bot

changeset-botBot commented Nov 13, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b06501c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/nextjsPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Nov 13, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentPreviewCommentsUpdated (UTC)
clerk-js-sandboxReadyReadyPreviewCommentNov 13, 2025 3:51pm

@coderabbitai

coderabbitaiBot commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

This change extends the sign-out cache invalidation noop handling in @clerk/nextjs to support Next.js 16 alongside Next.js 15. The modification updates version detection logic and corrects related comments to reflect broader version support.

Changes

Cohort / File(s)Summary
Release Documentation
\.changeset/major-rabbits-reply\.md
Adds patch release note documenting cache invalidation noop extension to Next.js 16 during sign-out
Version Handling Logic
packages/nextjs/src/app-router/client/ClerkProvider\.tsx
Extends sign-out version check to include Next.js 16; corrects comments (typo: "singed" → "signed", version scope clarification to "v15+", and cache aggressiveness description update)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

  • Focused, self-contained change affecting a single conditional check
  • Comment corrections are minor and straightforward
  • Logic addition is repetitive (extending existing pattern) rather than introducing new complexity

Poem

🐰 A version check hops forth with grace,
Extending care to v16's space,
While typos flee and comments shine—
Next.js fifteen, sixteen align! ✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title directly and accurately summarizes the main change: extending Next.js cache invalidation support from v15 to v16 during sign-out operations.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch laura/apply-cache-invalidation-next-16

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Nov 13, 2025

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7211

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7211

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7211

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7211

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7211

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7211

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7211

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7211

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7211

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7211

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7211

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7211

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7211

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7211

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7211

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7211

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7211

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7211

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7211

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7211

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7211

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7211

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7211

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7211

commit: b06501c

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

104-110: Fix correctly extends noop to Next.js 16; consider version check pattern for future maintenance.

The logic correctly addresses the reported bug by preventing invalidateCacheAction() from being called during sign-out on Next.js 16, avoiding 404/405 errors when the __session cookie has already been cleared.

The current approach using explicit OR conditions (nextVersion.startsWith('15') || nextVersion.startsWith('16')) is safe but will require updates for each new major version (17, 18, etc.). For improved maintainability, consider extracting the version check into a helper function or using major version comparison:

constshouldSkipCacheInvalidationOnSignOut=(version: string,intent: string)=>{constmajorVersion=parseInt(version.split('.')[0],10);returnmajorVersion>=15&&intent==='sign-out';};

However, this assumes future Next.js versions maintain the same cache behavior. Given the authentication-critical nature of this code, the current explicit version checking may be safer if you prefer to validate behavior for each new major version before enabling this optimization.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 42f0d95 and b06501c.

📒 Files selected for processing (2)
  • .changeset/major-rabbits-reply.md (1 hunks)
  • packages/nextjs/src/app-router/client/ClerkProvider.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (32)
  • GitHub Check: Integration Tests (nextjs, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 14)
  • GitHub Check: Integration Tests (quickstart, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 15, RQ)
  • GitHub Check: Integration Tests (nuxt, chrome)
  • GitHub Check: Integration Tests (billing, chrome, RQ)
  • GitHub Check: Integration Tests (quickstart, chrome, 15)
  • GitHub Check: Integration Tests (billing, chrome)
  • GitHub Check: Integration Tests (expo-web, chrome)
  • GitHub Check: Integration Tests (vue, chrome)
  • GitHub Check: Integration Tests (tanstack-react-start, chrome)
  • GitHub Check: Integration Tests (machine, chrome)
  • GitHub Check: Integration Tests (nextjs, chrome, 15)
  • GitHub Check: Integration Tests (astro, chrome)
  • GitHub Check: Integration Tests (custom, chrome)
  • GitHub Check: Integration Tests (react-router, chrome)
  • GitHub Check: Integration Tests (sessions, chrome)
  • GitHub Check: Integration Tests (elements, chrome)
  • GitHub Check: Integration Tests (localhost, chrome)
  • GitHub Check: Integration Tests (sessions:staging, chrome)
  • GitHub Check: Integration Tests (handshake, chrome)
  • GitHub Check: Integration Tests (handshake:staging, chrome)
  • GitHub Check: Integration Tests (express, chrome)
  • GitHub Check: Integration Tests (generic, chrome)
  • GitHub Check: Static analysis
  • GitHub Check: Unit Tests (22, shared, clerk-js, RQ)
  • GitHub Check: Unit Tests (22, **)
  • GitHub Check: Publish with pkg-pr-new
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (2)
.changeset/major-rabbits-reply.md (1)

1-5: LGTM! Changeset accurately documents the patch.

The changeset correctly describes the extension of cache invalidation noop handling to Next.js 16 during sign-out, matching the code changes in ClerkProvider.tsx.

packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

99-100: LGTM! Comment improvement and typo fix.

The comment update to "Next.js v15+" accurately reflects the extended version support, and the typo correction from "singed in" to "signed in" improves readability.

@LauraBeatris
LauraBeatris requested a review from a teamNovember 13, 2025 16:33
@LauraBeatris
LauraBeatris merged commit d7d0704 into mainNov 13, 2025
108 of 109 checks passed
@LauraBeatris
LauraBeatris deleted the laura/apply-cache-invalidation-next-16 branch November 13, 2025 16:59
// To mitigate this, since the router cache on version 15+ is much less aggressive, we can treat this as a noop and simply resolve the promise.
// Once `setActive` performs the navigation, `__unstable__onAfterSetActive` will kick in and perform a router.refresh ensuring shared layouts will also update with the correct authentication context.
else if (nextVersion.startsWith('15') && intent === 'sign-out') {
else if ((nextVersion.startsWith('15') || nextVersion.startsWith('16')) && intent === 'sign-out') {

@fscgustavofscgustavoNov 13, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LauraBeatris

This issue may occur again when future Next.js versions are released, such as version 17 and beyond.
To make the logic more future-proof, we could extract the major version number and compare it directly:

constmajorVersion=Number(nextVersion.split('.')[0]);majorVersion===13;// first condition majorVersion>=15&&intent==='sign-out';// second condition

This avoids having to manually update the code every time a new version (e.g., 17, 18…) is released.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@LauraBeatris@dstaley@brkalow@panteliselef@fscgustavo@clerk-cookie
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(nextjs): Support Next.js 16 cache invalidation on sign-out - #7211

Merged
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16
Nov 13, 2025
Merged

fix(nextjs): Support Next.js 16 cache invalidation on sign-out#7211
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16

Conversation

@LauraBeatris

@LauraBeatrisLauraBeatris commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Description

Currently, Next.js 16 is falling through to call invalidateCacheAction() which is causing issues with the navigation flow when switching to a session with pending status.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Fixed router cache handling during sign-out for Next.js 16.
  • Improvements

    • Extended cache invalidation behavior to support Next.js 16 during sign-out operations, ensuring consistent behavior across framework versions.

@LauraBeatrisLauraBeatris self-assigned this Nov 13, 2025
@changeset-bot

changeset-botBot commented Nov 13, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b06501c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/nextjsPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Nov 13, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentPreviewCommentsUpdated (UTC)
clerk-js-sandboxReadyReadyPreviewCommentNov 13, 2025 3:51pm

@coderabbitai

coderabbitaiBot commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

This change extends the sign-out cache invalidation noop handling in @clerk/nextjs to support Next.js 16 alongside Next.js 15. The modification updates version detection logic and corrects related comments to reflect broader version support.

Changes

Cohort / File(s)Summary
Release Documentation
\.changeset/major-rabbits-reply\.md
Adds patch release note documenting cache invalidation noop extension to Next.js 16 during sign-out
Version Handling Logic
packages/nextjs/src/app-router/client/ClerkProvider\.tsx
Extends sign-out version check to include Next.js 16; corrects comments (typo: "singed" → "signed", version scope clarification to "v15+", and cache aggressiveness description update)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

  • Focused, self-contained change affecting a single conditional check
  • Comment corrections are minor and straightforward
  • Logic addition is repetitive (extending existing pattern) rather than introducing new complexity

Poem

🐰 A version check hops forth with grace,
Extending care to v16's space,
While typos flee and comments shine—
Next.js fifteen, sixteen align! ✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title directly and accurately summarizes the main change: extending Next.js cache invalidation support from v15 to v16 during sign-out operations.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch laura/apply-cache-invalidation-next-16

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Nov 13, 2025

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7211

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7211

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7211

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7211

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7211

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7211

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7211

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7211

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7211

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7211

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7211

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7211

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7211

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7211

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7211

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7211

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7211

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7211

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7211

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7211

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7211

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7211

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7211

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7211

commit: b06501c

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

104-110: Fix correctly extends noop to Next.js 16; consider version check pattern for future maintenance.

The logic correctly addresses the reported bug by preventing invalidateCacheAction() from being called during sign-out on Next.js 16, avoiding 404/405 errors when the __session cookie has already been cleared.

The current approach using explicit OR conditions (nextVersion.startsWith('15') || nextVersion.startsWith('16')) is safe but will require updates for each new major version (17, 18, etc.). For improved maintainability, consider extracting the version check into a helper function or using major version comparison:

constshouldSkipCacheInvalidationOnSignOut=(version: string,intent: string)=>{constmajorVersion=parseInt(version.split('.')[0],10);returnmajorVersion>=15&&intent==='sign-out';};

However, this assumes future Next.js versions maintain the same cache behavior. Given the authentication-critical nature of this code, the current explicit version checking may be safer if you prefer to validate behavior for each new major version before enabling this optimization.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 42f0d95 and b06501c.

📒 Files selected for processing (2)
  • .changeset/major-rabbits-reply.md (1 hunks)
  • packages/nextjs/src/app-router/client/ClerkProvider.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (32)
  • GitHub Check: Integration Tests (nextjs, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 14)
  • GitHub Check: Integration Tests (quickstart, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 15, RQ)
  • GitHub Check: Integration Tests (nuxt, chrome)
  • GitHub Check: Integration Tests (billing, chrome, RQ)
  • GitHub Check: Integration Tests (quickstart, chrome, 15)
  • GitHub Check: Integration Tests (billing, chrome)
  • GitHub Check: Integration Tests (expo-web, chrome)
  • GitHub Check: Integration Tests (vue, chrome)
  • GitHub Check: Integration Tests (tanstack-react-start, chrome)
  • GitHub Check: Integration Tests (machine, chrome)
  • GitHub Check: Integration Tests (nextjs, chrome, 15)
  • GitHub Check: Integration Tests (astro, chrome)
  • GitHub Check: Integration Tests (custom, chrome)
  • GitHub Check: Integration Tests (react-router, chrome)
  • GitHub Check: Integration Tests (sessions, chrome)
  • GitHub Check: Integration Tests (elements, chrome)
  • GitHub Check: Integration Tests (localhost, chrome)
  • GitHub Check: Integration Tests (sessions:staging, chrome)
  • GitHub Check: Integration Tests (handshake, chrome)
  • GitHub Check: Integration Tests (handshake:staging, chrome)
  • GitHub Check: Integration Tests (express, chrome)
  • GitHub Check: Integration Tests (generic, chrome)
  • GitHub Check: Static analysis
  • GitHub Check: Unit Tests (22, shared, clerk-js, RQ)
  • GitHub Check: Unit Tests (22, **)
  • GitHub Check: Publish with pkg-pr-new
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (2)
.changeset/major-rabbits-reply.md (1)

1-5: LGTM! Changeset accurately documents the patch.

The changeset correctly describes the extension of cache invalidation noop handling to Next.js 16 during sign-out, matching the code changes in ClerkProvider.tsx.

packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

99-100: LGTM! Comment improvement and typo fix.

The comment update to "Next.js v15+" accurately reflects the extended version support, and the typo correction from "singed in" to "signed in" improves readability.

@LauraBeatris
LauraBeatris requested a review from a teamNovember 13, 2025 16:33
@LauraBeatris
LauraBeatris merged commit d7d0704 into mainNov 13, 2025
108 of 109 checks passed
@LauraBeatris
LauraBeatris deleted the laura/apply-cache-invalidation-next-16 branch November 13, 2025 16:59
// To mitigate this, since the router cache on version 15+ is much less aggressive, we can treat this as a noop and simply resolve the promise.
// Once `setActive` performs the navigation, `__unstable__onAfterSetActive` will kick in and perform a router.refresh ensuring shared layouts will also update with the correct authentication context.
else if (nextVersion.startsWith('15') && intent === 'sign-out') {
else if ((nextVersion.startsWith('15') || nextVersion.startsWith('16')) && intent === 'sign-out') {

@fscgustavofscgustavoNov 13, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LauraBeatris

This issue may occur again when future Next.js versions are released, such as version 17 and beyond.
To make the logic more future-proof, we could extract the major version number and compare it directly:

constmajorVersion=Number(nextVersion.split('.')[0]);majorVersion===13;// first condition majorVersion>=15&&intent==='sign-out';// second condition

This avoids having to manually update the code every time a new version (e.g., 17, 18…) is released.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@LauraBeatris@dstaley@brkalow@panteliselef@fscgustavo@clerk-cookie
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix(nextjs): Support Next.js 16 cache invalidation on sign-out - #7211

Merged
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16
Nov 13, 2025
Merged

fix(nextjs): Support Next.js 16 cache invalidation on sign-out#7211
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16

Conversation

@LauraBeatris

@LauraBeatrisLauraBeatris commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Description

Currently, Next.js 16 is falling through to call invalidateCacheAction() which is causing issues with the navigation flow when switching to a session with pending status.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Fixed router cache handling during sign-out for Next.js 16.
  • Improvements

    • Extended cache invalidation behavior to support Next.js 16 during sign-out operations, ensuring consistent behavior across framework versions.

@LauraBeatrisLauraBeatris self-assigned this Nov 13, 2025
@changeset-bot

changeset-botBot commented Nov 13, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b06501c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/nextjsPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Nov 13, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentPreviewCommentsUpdated (UTC)
clerk-js-sandboxReadyReadyPreviewCommentNov 13, 2025 3:51pm

@coderabbitai

coderabbitaiBot commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

This change extends the sign-out cache invalidation noop handling in @clerk/nextjs to support Next.js 16 alongside Next.js 15. The modification updates version detection logic and corrects related comments to reflect broader version support.

Changes

Cohort / File(s)Summary
Release Documentation
\.changeset/major-rabbits-reply\.md
Adds patch release note documenting cache invalidation noop extension to Next.js 16 during sign-out
Version Handling Logic
packages/nextjs/src/app-router/client/ClerkProvider\.tsx
Extends sign-out version check to include Next.js 16; corrects comments (typo: "singed" → "signed", version scope clarification to "v15+", and cache aggressiveness description update)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

  • Focused, self-contained change affecting a single conditional check
  • Comment corrections are minor and straightforward
  • Logic addition is repetitive (extending existing pattern) rather than introducing new complexity

Poem

🐰 A version check hops forth with grace,
Extending care to v16's space,
While typos flee and comments shine—
Next.js fifteen, sixteen align! ✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title directly and accurately summarizes the main change: extending Next.js cache invalidation support from v15 to v16 during sign-out operations.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch laura/apply-cache-invalidation-next-16

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Nov 13, 2025

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7211

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7211

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7211

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7211

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7211

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7211

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7211

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7211

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7211

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7211

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7211

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7211

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7211

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7211

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7211

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7211

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7211

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7211

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7211

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7211

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7211

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7211

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7211

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7211

commit: b06501c

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

104-110: Fix correctly extends noop to Next.js 16; consider version check pattern for future maintenance.

The logic correctly addresses the reported bug by preventing invalidateCacheAction() from being called during sign-out on Next.js 16, avoiding 404/405 errors when the __session cookie has already been cleared.

The current approach using explicit OR conditions (nextVersion.startsWith('15') || nextVersion.startsWith('16')) is safe but will require updates for each new major version (17, 18, etc.). For improved maintainability, consider extracting the version check into a helper function or using major version comparison:

constshouldSkipCacheInvalidationOnSignOut=(version: string,intent: string)=>{constmajorVersion=parseInt(version.split('.')[0],10);returnmajorVersion>=15&&intent==='sign-out';};

However, this assumes future Next.js versions maintain the same cache behavior. Given the authentication-critical nature of this code, the current explicit version checking may be safer if you prefer to validate behavior for each new major version before enabling this optimization.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 42f0d95 and b06501c.

📒 Files selected for processing (2)
  • .changeset/major-rabbits-reply.md (1 hunks)
  • packages/nextjs/src/app-router/client/ClerkProvider.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (32)
  • GitHub Check: Integration Tests (nextjs, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 14)
  • GitHub Check: Integration Tests (quickstart, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 15, RQ)
  • GitHub Check: Integration Tests (nuxt, chrome)
  • GitHub Check: Integration Tests (billing, chrome, RQ)
  • GitHub Check: Integration Tests (quickstart, chrome, 15)
  • GitHub Check: Integration Tests (billing, chrome)
  • GitHub Check: Integration Tests (expo-web, chrome)
  • GitHub Check: Integration Tests (vue, chrome)
  • GitHub Check: Integration Tests (tanstack-react-start, chrome)
  • GitHub Check: Integration Tests (machine, chrome)
  • GitHub Check: Integration Tests (nextjs, chrome, 15)
  • GitHub Check: Integration Tests (astro, chrome)
  • GitHub Check: Integration Tests (custom, chrome)
  • GitHub Check: Integration Tests (react-router, chrome)
  • GitHub Check: Integration Tests (sessions, chrome)
  • GitHub Check: Integration Tests (elements, chrome)
  • GitHub Check: Integration Tests (localhost, chrome)
  • GitHub Check: Integration Tests (sessions:staging, chrome)
  • GitHub Check: Integration Tests (handshake, chrome)
  • GitHub Check: Integration Tests (handshake:staging, chrome)
  • GitHub Check: Integration Tests (express, chrome)
  • GitHub Check: Integration Tests (generic, chrome)
  • GitHub Check: Static analysis
  • GitHub Check: Unit Tests (22, shared, clerk-js, RQ)
  • GitHub Check: Unit Tests (22, **)
  • GitHub Check: Publish with pkg-pr-new
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (2)
.changeset/major-rabbits-reply.md (1)

1-5: LGTM! Changeset accurately documents the patch.

The changeset correctly describes the extension of cache invalidation noop handling to Next.js 16 during sign-out, matching the code changes in ClerkProvider.tsx.

packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

99-100: LGTM! Comment improvement and typo fix.

The comment update to "Next.js v15+" accurately reflects the extended version support, and the typo correction from "singed in" to "signed in" improves readability.

@LauraBeatris
LauraBeatris requested a review from a teamNovember 13, 2025 16:33
@LauraBeatris
LauraBeatris merged commit d7d0704 into mainNov 13, 2025
108 of 109 checks passed
@LauraBeatris
LauraBeatris deleted the laura/apply-cache-invalidation-next-16 branch November 13, 2025 16:59
// To mitigate this, since the router cache on version 15+ is much less aggressive, we can treat this as a noop and simply resolve the promise.
// Once `setActive` performs the navigation, `__unstable__onAfterSetActive` will kick in and perform a router.refresh ensuring shared layouts will also update with the correct authentication context.
else if (nextVersion.startsWith('15') && intent === 'sign-out') {
else if ((nextVersion.startsWith('15') || nextVersion.startsWith('16')) && intent === 'sign-out') {

@fscgustavofscgustavoNov 13, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LauraBeatris

This issue may occur again when future Next.js versions are released, such as version 17 and beyond.
To make the logic more future-proof, we could extract the major version number and compare it directly:

constmajorVersion=Number(nextVersion.split('.')[0]);majorVersion===13;// first condition majorVersion>=15&&intent==='sign-out';// second condition

This avoids having to manually update the code every time a new version (e.g., 17, 18…) is released.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@LauraBeatris@dstaley@brkalow@panteliselef@fscgustavo@clerk-cookie
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(nextjs): Support Next.js 16 cache invalidation on sign-out - #7211

Merged
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16
Nov 13, 2025
Merged

fix(nextjs): Support Next.js 16 cache invalidation on sign-out#7211
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16

Conversation

@LauraBeatris

@LauraBeatrisLauraBeatris commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Description

Currently, Next.js 16 is falling through to call invalidateCacheAction() which is causing issues with the navigation flow when switching to a session with pending status.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Fixed router cache handling during sign-out for Next.js 16.
  • Improvements

    • Extended cache invalidation behavior to support Next.js 16 during sign-out operations, ensuring consistent behavior across framework versions.

@LauraBeatrisLauraBeatris self-assigned this Nov 13, 2025
@changeset-bot

changeset-botBot commented Nov 13, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b06501c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/nextjsPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Nov 13, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentPreviewCommentsUpdated (UTC)
clerk-js-sandboxReadyReadyPreviewCommentNov 13, 2025 3:51pm

@coderabbitai

coderabbitaiBot commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

This change extends the sign-out cache invalidation noop handling in @clerk/nextjs to support Next.js 16 alongside Next.js 15. The modification updates version detection logic and corrects related comments to reflect broader version support.

Changes

Cohort / File(s)Summary
Release Documentation
\.changeset/major-rabbits-reply\.md
Adds patch release note documenting cache invalidation noop extension to Next.js 16 during sign-out
Version Handling Logic
packages/nextjs/src/app-router/client/ClerkProvider\.tsx
Extends sign-out version check to include Next.js 16; corrects comments (typo: "singed" → "signed", version scope clarification to "v15+", and cache aggressiveness description update)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

  • Focused, self-contained change affecting a single conditional check
  • Comment corrections are minor and straightforward
  • Logic addition is repetitive (extending existing pattern) rather than introducing new complexity

Poem

🐰 A version check hops forth with grace,
Extending care to v16's space,
While typos flee and comments shine—
Next.js fifteen, sixteen align! ✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title directly and accurately summarizes the main change: extending Next.js cache invalidation support from v15 to v16 during sign-out operations.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch laura/apply-cache-invalidation-next-16

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Nov 13, 2025

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7211

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7211

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7211

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7211

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7211

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7211

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7211

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7211

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7211

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7211

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7211

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7211

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7211

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7211

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7211

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7211

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7211

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7211

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7211

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7211

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7211

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7211

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7211

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7211

commit: b06501c

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

104-110: Fix correctly extends noop to Next.js 16; consider version check pattern for future maintenance.

The logic correctly addresses the reported bug by preventing invalidateCacheAction() from being called during sign-out on Next.js 16, avoiding 404/405 errors when the __session cookie has already been cleared.

The current approach using explicit OR conditions (nextVersion.startsWith('15') || nextVersion.startsWith('16')) is safe but will require updates for each new major version (17, 18, etc.). For improved maintainability, consider extracting the version check into a helper function or using major version comparison:

constshouldSkipCacheInvalidationOnSignOut=(version: string,intent: string)=>{constmajorVersion=parseInt(version.split('.')[0],10);returnmajorVersion>=15&&intent==='sign-out';};

However, this assumes future Next.js versions maintain the same cache behavior. Given the authentication-critical nature of this code, the current explicit version checking may be safer if you prefer to validate behavior for each new major version before enabling this optimization.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 42f0d95 and b06501c.

📒 Files selected for processing (2)
  • .changeset/major-rabbits-reply.md (1 hunks)
  • packages/nextjs/src/app-router/client/ClerkProvider.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (32)
  • GitHub Check: Integration Tests (nextjs, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 14)
  • GitHub Check: Integration Tests (quickstart, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 15, RQ)
  • GitHub Check: Integration Tests (nuxt, chrome)
  • GitHub Check: Integration Tests (billing, chrome, RQ)
  • GitHub Check: Integration Tests (quickstart, chrome, 15)
  • GitHub Check: Integration Tests (billing, chrome)
  • GitHub Check: Integration Tests (expo-web, chrome)
  • GitHub Check: Integration Tests (vue, chrome)
  • GitHub Check: Integration Tests (tanstack-react-start, chrome)
  • GitHub Check: Integration Tests (machine, chrome)
  • GitHub Check: Integration Tests (nextjs, chrome, 15)
  • GitHub Check: Integration Tests (astro, chrome)
  • GitHub Check: Integration Tests (custom, chrome)
  • GitHub Check: Integration Tests (react-router, chrome)
  • GitHub Check: Integration Tests (sessions, chrome)
  • GitHub Check: Integration Tests (elements, chrome)
  • GitHub Check: Integration Tests (localhost, chrome)
  • GitHub Check: Integration Tests (sessions:staging, chrome)
  • GitHub Check: Integration Tests (handshake, chrome)
  • GitHub Check: Integration Tests (handshake:staging, chrome)
  • GitHub Check: Integration Tests (express, chrome)
  • GitHub Check: Integration Tests (generic, chrome)
  • GitHub Check: Static analysis
  • GitHub Check: Unit Tests (22, shared, clerk-js, RQ)
  • GitHub Check: Unit Tests (22, **)
  • GitHub Check: Publish with pkg-pr-new
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (2)
.changeset/major-rabbits-reply.md (1)

1-5: LGTM! Changeset accurately documents the patch.

The changeset correctly describes the extension of cache invalidation noop handling to Next.js 16 during sign-out, matching the code changes in ClerkProvider.tsx.

packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

99-100: LGTM! Comment improvement and typo fix.

The comment update to "Next.js v15+" accurately reflects the extended version support, and the typo correction from "singed in" to "signed in" improves readability.

@LauraBeatris
LauraBeatris requested a review from a teamNovember 13, 2025 16:33
@LauraBeatris
LauraBeatris merged commit d7d0704 into mainNov 13, 2025
108 of 109 checks passed
@LauraBeatris
LauraBeatris deleted the laura/apply-cache-invalidation-next-16 branch November 13, 2025 16:59
// To mitigate this, since the router cache on version 15+ is much less aggressive, we can treat this as a noop and simply resolve the promise.
// Once `setActive` performs the navigation, `__unstable__onAfterSetActive` will kick in and perform a router.refresh ensuring shared layouts will also update with the correct authentication context.
else if (nextVersion.startsWith('15') && intent === 'sign-out') {
else if ((nextVersion.startsWith('15') || nextVersion.startsWith('16')) && intent === 'sign-out') {

@fscgustavofscgustavoNov 13, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LauraBeatris

This issue may occur again when future Next.js versions are released, such as version 17 and beyond.
To make the logic more future-proof, we could extract the major version number and compare it directly:

constmajorVersion=Number(nextVersion.split('.')[0]);majorVersion===13;// first condition majorVersion>=15&&intent==='sign-out';// second condition

This avoids having to manually update the code every time a new version (e.g., 17, 18…) is released.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@LauraBeatris@dstaley@brkalow@panteliselef@fscgustavo@clerk-cookie
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(nextjs): Support Next.js 16 cache invalidation on sign-out - #7211

Merged
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16
Nov 13, 2025
Merged

fix(nextjs): Support Next.js 16 cache invalidation on sign-out#7211
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16

Conversation

@LauraBeatris

@LauraBeatrisLauraBeatris commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Description

Currently, Next.js 16 is falling through to call invalidateCacheAction() which is causing issues with the navigation flow when switching to a session with pending status.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Fixed router cache handling during sign-out for Next.js 16.
  • Improvements

    • Extended cache invalidation behavior to support Next.js 16 during sign-out operations, ensuring consistent behavior across framework versions.

@LauraBeatrisLauraBeatris self-assigned this Nov 13, 2025
@changeset-bot

changeset-botBot commented Nov 13, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b06501c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/nextjsPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Nov 13, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentPreviewCommentsUpdated (UTC)
clerk-js-sandboxReadyReadyPreviewCommentNov 13, 2025 3:51pm

@coderabbitai

coderabbitaiBot commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

This change extends the sign-out cache invalidation noop handling in @clerk/nextjs to support Next.js 16 alongside Next.js 15. The modification updates version detection logic and corrects related comments to reflect broader version support.

Changes

Cohort / File(s)Summary
Release Documentation
\.changeset/major-rabbits-reply\.md
Adds patch release note documenting cache invalidation noop extension to Next.js 16 during sign-out
Version Handling Logic
packages/nextjs/src/app-router/client/ClerkProvider\.tsx
Extends sign-out version check to include Next.js 16; corrects comments (typo: "singed" → "signed", version scope clarification to "v15+", and cache aggressiveness description update)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

  • Focused, self-contained change affecting a single conditional check
  • Comment corrections are minor and straightforward
  • Logic addition is repetitive (extending existing pattern) rather than introducing new complexity

Poem

🐰 A version check hops forth with grace,
Extending care to v16's space,
While typos flee and comments shine—
Next.js fifteen, sixteen align! ✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title directly and accurately summarizes the main change: extending Next.js cache invalidation support from v15 to v16 during sign-out operations.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch laura/apply-cache-invalidation-next-16

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Nov 13, 2025

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7211

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7211

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7211

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7211

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7211

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7211

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7211

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7211

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7211

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7211

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7211

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7211

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7211

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7211

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7211

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7211

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7211

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7211

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7211

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7211

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7211

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7211

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7211

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7211

commit: b06501c

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

104-110: Fix correctly extends noop to Next.js 16; consider version check pattern for future maintenance.

The logic correctly addresses the reported bug by preventing invalidateCacheAction() from being called during sign-out on Next.js 16, avoiding 404/405 errors when the __session cookie has already been cleared.

The current approach using explicit OR conditions (nextVersion.startsWith('15') || nextVersion.startsWith('16')) is safe but will require updates for each new major version (17, 18, etc.). For improved maintainability, consider extracting the version check into a helper function or using major version comparison:

constshouldSkipCacheInvalidationOnSignOut=(version: string,intent: string)=>{constmajorVersion=parseInt(version.split('.')[0],10);returnmajorVersion>=15&&intent==='sign-out';};

However, this assumes future Next.js versions maintain the same cache behavior. Given the authentication-critical nature of this code, the current explicit version checking may be safer if you prefer to validate behavior for each new major version before enabling this optimization.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 42f0d95 and b06501c.

📒 Files selected for processing (2)
  • .changeset/major-rabbits-reply.md (1 hunks)
  • packages/nextjs/src/app-router/client/ClerkProvider.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (32)
  • GitHub Check: Integration Tests (nextjs, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 14)
  • GitHub Check: Integration Tests (quickstart, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 15, RQ)
  • GitHub Check: Integration Tests (nuxt, chrome)
  • GitHub Check: Integration Tests (billing, chrome, RQ)
  • GitHub Check: Integration Tests (quickstart, chrome, 15)
  • GitHub Check: Integration Tests (billing, chrome)
  • GitHub Check: Integration Tests (expo-web, chrome)
  • GitHub Check: Integration Tests (vue, chrome)
  • GitHub Check: Integration Tests (tanstack-react-start, chrome)
  • GitHub Check: Integration Tests (machine, chrome)
  • GitHub Check: Integration Tests (nextjs, chrome, 15)
  • GitHub Check: Integration Tests (astro, chrome)
  • GitHub Check: Integration Tests (custom, chrome)
  • GitHub Check: Integration Tests (react-router, chrome)
  • GitHub Check: Integration Tests (sessions, chrome)
  • GitHub Check: Integration Tests (elements, chrome)
  • GitHub Check: Integration Tests (localhost, chrome)
  • GitHub Check: Integration Tests (sessions:staging, chrome)
  • GitHub Check: Integration Tests (handshake, chrome)
  • GitHub Check: Integration Tests (handshake:staging, chrome)
  • GitHub Check: Integration Tests (express, chrome)
  • GitHub Check: Integration Tests (generic, chrome)
  • GitHub Check: Static analysis
  • GitHub Check: Unit Tests (22, shared, clerk-js, RQ)
  • GitHub Check: Unit Tests (22, **)
  • GitHub Check: Publish with pkg-pr-new
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (2)
.changeset/major-rabbits-reply.md (1)

1-5: LGTM! Changeset accurately documents the patch.

The changeset correctly describes the extension of cache invalidation noop handling to Next.js 16 during sign-out, matching the code changes in ClerkProvider.tsx.

packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

99-100: LGTM! Comment improvement and typo fix.

The comment update to "Next.js v15+" accurately reflects the extended version support, and the typo correction from "singed in" to "signed in" improves readability.

@LauraBeatris
LauraBeatris requested a review from a teamNovember 13, 2025 16:33
@LauraBeatris
LauraBeatris merged commit d7d0704 into mainNov 13, 2025
108 of 109 checks passed
@LauraBeatris
LauraBeatris deleted the laura/apply-cache-invalidation-next-16 branch November 13, 2025 16:59
// To mitigate this, since the router cache on version 15+ is much less aggressive, we can treat this as a noop and simply resolve the promise.
// Once `setActive` performs the navigation, `__unstable__onAfterSetActive` will kick in and perform a router.refresh ensuring shared layouts will also update with the correct authentication context.
else if (nextVersion.startsWith('15') && intent === 'sign-out') {
else if ((nextVersion.startsWith('15') || nextVersion.startsWith('16')) && intent === 'sign-out') {

@fscgustavofscgustavoNov 13, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LauraBeatris

This issue may occur again when future Next.js versions are released, such as version 17 and beyond.
To make the logic more future-proof, we could extract the major version number and compare it directly:

constmajorVersion=Number(nextVersion.split('.')[0]);majorVersion===13;// first condition majorVersion>=15&&intent==='sign-out';// second condition

This avoids having to manually update the code every time a new version (e.g., 17, 18…) is released.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@LauraBeatris@dstaley@brkalow@panteliselef@fscgustavo@clerk-cookie
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix(nextjs): Support Next.js 16 cache invalidation on sign-out - #7211

Merged
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16
Nov 13, 2025
Merged

fix(nextjs): Support Next.js 16 cache invalidation on sign-out#7211
LauraBeatris merged 2 commits into
mainfrom
laura/apply-cache-invalidation-next-16

Conversation

@LauraBeatris

@LauraBeatrisLauraBeatris commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Description

Currently, Next.js 16 is falling through to call invalidateCacheAction() which is causing issues with the navigation flow when switching to a session with pending status.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Fixed router cache handling during sign-out for Next.js 16.
  • Improvements

    • Extended cache invalidation behavior to support Next.js 16 during sign-out operations, ensuring consistent behavior across framework versions.

@LauraBeatrisLauraBeatris self-assigned this Nov 13, 2025
@changeset-bot

changeset-botBot commented Nov 13, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: b06501c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/nextjsPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Nov 13, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentPreviewCommentsUpdated (UTC)
clerk-js-sandboxReadyReadyPreviewCommentNov 13, 2025 3:51pm

@coderabbitai

coderabbitaiBot commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

This change extends the sign-out cache invalidation noop handling in @clerk/nextjs to support Next.js 16 alongside Next.js 15. The modification updates version detection logic and corrects related comments to reflect broader version support.

Changes

Cohort / File(s)Summary
Release Documentation
\.changeset/major-rabbits-reply\.md
Adds patch release note documenting cache invalidation noop extension to Next.js 16 during sign-out
Version Handling Logic
packages/nextjs/src/app-router/client/ClerkProvider\.tsx
Extends sign-out version check to include Next.js 16; corrects comments (typo: "singed" → "signed", version scope clarification to "v15+", and cache aggressiveness description update)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

  • Focused, self-contained change affecting a single conditional check
  • Comment corrections are minor and straightforward
  • Logic addition is repetitive (extending existing pattern) rather than introducing new complexity

Poem

🐰 A version check hops forth with grace,
Extending care to v16's space,
While typos flee and comments shine—
Next.js fifteen, sixteen align! ✨

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title directly and accurately summarizes the main change: extending Next.js cache invalidation support from v15 to v16 during sign-out operations.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch laura/apply-cache-invalidation-next-16

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new

pkg-pr-newBot commented Nov 13, 2025

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7211

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7211

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7211

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7211

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7211

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7211

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7211

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7211

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7211

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7211

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7211

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7211

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7211

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7211

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7211

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7211

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7211

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7211

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7211

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7211

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7211

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7211

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7211

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7211

commit: b06501c

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

104-110: Fix correctly extends noop to Next.js 16; consider version check pattern for future maintenance.

The logic correctly addresses the reported bug by preventing invalidateCacheAction() from being called during sign-out on Next.js 16, avoiding 404/405 errors when the __session cookie has already been cleared.

The current approach using explicit OR conditions (nextVersion.startsWith('15') || nextVersion.startsWith('16')) is safe but will require updates for each new major version (17, 18, etc.). For improved maintainability, consider extracting the version check into a helper function or using major version comparison:

constshouldSkipCacheInvalidationOnSignOut=(version: string,intent: string)=>{constmajorVersion=parseInt(version.split('.')[0],10);returnmajorVersion>=15&&intent==='sign-out';};

However, this assumes future Next.js versions maintain the same cache behavior. Given the authentication-critical nature of this code, the current explicit version checking may be safer if you prefer to validate behavior for each new major version before enabling this optimization.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 42f0d95 and b06501c.

📒 Files selected for processing (2)
  • .changeset/major-rabbits-reply.md (1 hunks)
  • packages/nextjs/src/app-router/client/ClerkProvider.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (32)
  • GitHub Check: Integration Tests (nextjs, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 14)
  • GitHub Check: Integration Tests (quickstart, chrome, 16)
  • GitHub Check: Integration Tests (nextjs, chrome, 15, RQ)
  • GitHub Check: Integration Tests (nuxt, chrome)
  • GitHub Check: Integration Tests (billing, chrome, RQ)
  • GitHub Check: Integration Tests (quickstart, chrome, 15)
  • GitHub Check: Integration Tests (billing, chrome)
  • GitHub Check: Integration Tests (expo-web, chrome)
  • GitHub Check: Integration Tests (vue, chrome)
  • GitHub Check: Integration Tests (tanstack-react-start, chrome)
  • GitHub Check: Integration Tests (machine, chrome)
  • GitHub Check: Integration Tests (nextjs, chrome, 15)
  • GitHub Check: Integration Tests (astro, chrome)
  • GitHub Check: Integration Tests (custom, chrome)
  • GitHub Check: Integration Tests (react-router, chrome)
  • GitHub Check: Integration Tests (sessions, chrome)
  • GitHub Check: Integration Tests (elements, chrome)
  • GitHub Check: Integration Tests (localhost, chrome)
  • GitHub Check: Integration Tests (sessions:staging, chrome)
  • GitHub Check: Integration Tests (handshake, chrome)
  • GitHub Check: Integration Tests (handshake:staging, chrome)
  • GitHub Check: Integration Tests (express, chrome)
  • GitHub Check: Integration Tests (generic, chrome)
  • GitHub Check: Static analysis
  • GitHub Check: Unit Tests (22, shared, clerk-js, RQ)
  • GitHub Check: Unit Tests (22, **)
  • GitHub Check: Publish with pkg-pr-new
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (2)
.changeset/major-rabbits-reply.md (1)

1-5: LGTM! Changeset accurately documents the patch.

The changeset correctly describes the extension of cache invalidation noop handling to Next.js 16 during sign-out, matching the code changes in ClerkProvider.tsx.

packages/nextjs/src/app-router/client/ClerkProvider.tsx (1)

99-100: LGTM! Comment improvement and typo fix.

The comment update to "Next.js v15+" accurately reflects the extended version support, and the typo correction from "singed in" to "signed in" improves readability.

@LauraBeatris
LauraBeatris requested a review from a teamNovember 13, 2025 16:33
@LauraBeatris
LauraBeatris merged commit d7d0704 into mainNov 13, 2025
108 of 109 checks passed
@LauraBeatris
LauraBeatris deleted the laura/apply-cache-invalidation-next-16 branch November 13, 2025 16:59
// To mitigate this, since the router cache on version 15+ is much less aggressive, we can treat this as a noop and simply resolve the promise.
// Once `setActive` performs the navigation, `__unstable__onAfterSetActive` will kick in and perform a router.refresh ensuring shared layouts will also update with the correct authentication context.
else if (nextVersion.startsWith('15') && intent === 'sign-out') {
else if ((nextVersion.startsWith('15') || nextVersion.startsWith('16')) && intent === 'sign-out') {

@fscgustavofscgustavoNov 13, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LauraBeatris

This issue may occur again when future Next.js versions are released, such as version 17 and beyond.
To make the logic more future-proof, we could extract the major version number and compare it directly:

constmajorVersion=Number(nextVersion.split('.')[0]);majorVersion===13;// first condition majorVersion>=15&&intent==='sign-out';// second condition

This avoids having to manually update the code every time a new version (e.g., 17, 18…) is released.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@LauraBeatris@dstaley@brkalow@panteliselef@fscgustavo@clerk-cookie