Skip to content

Commit f6b6c3e

Browse files
committed
fix(nextjs): refresh the router when cache invalidation fails
1 parent 840b5d4 commit f6b6c3e

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@ const NextClientClerkProvider = <TUi extends Ui = Ui>(props: NextClerkProviderPr
5656
if ((nextVersion.startsWith('15') || nextVersion.startsWith('16')) && intent === 'sign-out') {
5757
resolve(); // noop
5858
} else {
59-
// Resolve even if the action rejects (for example, after a redeploy), so `setActive` and `signOut` do not hang.
6059
void invalidateCacheAction().then(
6160
() => resolve(),
62-
() => resolve(),
61+
() => {
62+
router.refresh();
63+
resolve();
64+
},
6365
);
6466
}
6567
});

‎packages/nextjs/src/app-router/client/__tests__/ClerkProvider.test.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { cleanup, render } from '@testing-library/react';
22
import React from 'react';
33
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
44

5-
const { invalidateCacheAction } = vi.hoisted(() => ({ invalidateCacheAction: vi.fn() }));
5+
const { invalidateCacheAction, refresh } = vi.hoisted(() => ({ invalidateCacheAction: vi.fn(), refresh: vi.fn() }));
66

77
vi.mock('next/navigation', () => ({
8-
useRouter: () => ({ refresh: vi.fn(), push: vi.fn(), replace: vi.fn() }),
8+
useRouter: () => ({ refresh, push: vi.fn(), replace: vi.fn() }),
99
usePathname: () => '/',
1010
}));
1111

@@ -26,6 +26,7 @@ import { ClientClerkProvider } from '../ClerkProvider';
2626
describe('ClientClerkProvider __internal_onBeforeSetActive', () => {
2727
beforeEach(() => {
2828
invalidateCacheAction.mockReset();
29+
refresh.mockReset();
2930
render(
3031
<ClientClerkProvider publishableKey='pk_test_Y2xlcmsuZXhhbXBsZS5jb20k'>
3132
<div />
@@ -42,6 +43,7 @@ describe('ClientClerkProvider __internal_onBeforeSetActive', () => {
4243

4344
await expect(window.__internal_onBeforeSetActive()).resolves.toBeUndefined();
4445
expect(invalidateCacheAction).toHaveBeenCalledTimes(1);
46+
expect(refresh).not.toHaveBeenCalled();
4547
});
4648

4749
it('resolves when the cache invalidation action rejects', async () => {
@@ -53,5 +55,6 @@ describe('ClientClerkProvider __internal_onBeforeSetActive', () => {
5355
]);
5456

5557
expect(outcome).toBe('settled');
58+
expect(refresh).toHaveBeenCalledTimes(1);
5659
});
5760
});

0 commit comments

Comments
 (0)