Merge branch 'main' into kevin/handle-nested-iframes

Author: thiskevinwang

.changeset/major-rabbits-reply.md

@@ -0,0 +1,5 @@
+---
+'@clerk/nextjs': patch
+---
+
+Extend cache invalidation noop to Next.js 16 during sign-out

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

@@ -96,14 +96,14 @@ const NextClientClerkProvider = (props: NextClerkProviderProps) => {
             router.refresh();
           });
         }
-        // On Next.js v15 calling a server action that returns a 404 error when deployed on Vercel is prohibited, failing with 405 status code.
-        // When a user transitions from "signed in" to "singed out", we clear the `__session` cookie, then we call `__unstable__onBeforeSetActive`.
+        // On Next.js v15+ calling a server action that returns a 404 error when deployed on Vercel is prohibited, failing with 405 status code.
+        // When a user transitions from "signed in" to "signed out", we clear the `__session` cookie, then we call `__unstable__onBeforeSetActive`.
         // If we were to call `invalidateCacheAction` while the user is already signed out (deleted cookie), any page protected by `auth.protect()`
         // will result to the server action returning a 404 error (this happens because server actions inherit the protection rules of the page they are called from).
         // SOLUTION:
-        // 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.
+        // 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') {
           resolve(); // noop
         } else {
           void invalidateCacheAction().then(() => resolve());