Skip to content

Commit 968e039

Browse files
authored
Merge branch 'main' into jrad/js-prop-bundling
2 parents 210cac5 + 6e90b7f commit 968e039

4 files changed

Lines changed: 22 additions & 2 deletions

File tree

.changeset/fifty-suits-vanish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@clerk/backend": patch
3+
---
4+
5+
Added date filter parameters to user list endpoint

.changeset/ready-cats-tease.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/astro': patch
3+
---
4+
5+
Fixed an issue when using `ClientRouter` where Clerk components don't load until navigation is performed.

packages/astro/src/integration/create-integration.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,10 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
127127
}
128128
129129
if (transitionEnabledOnThisPage()) {
130-
const { navigate, swapFunctions } = await import('astro:transitions/client');
130+
// We must do the dynamic imports within the event listeners because otherwise we may race and miss initial astro:page-load
131+
document.addEventListener('astro:before-swap', async (e) => {
132+
const { swapFunctions } = await import('astro:transitions/client');
131133
132-
document.addEventListener('astro:before-swap', (e) => {
133134
const clerkComponents = document.querySelector('#clerk-components');
134135
// Keep the div element added by Clerk
135136
if (clerkComponents) {
@@ -141,6 +142,8 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
141142
});
142143
143144
document.addEventListener('astro:page-load', async (e) => {
145+
const { navigate } = await import('astro:transitions/client');
146+
144147
await runInjectionScript({
145148
...${JSON.stringify(internalParams)},
146149
routerPush: navigate,

packages/backend/src/api/endpoints/UserApi.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,14 @@ type UserListParams = ClerkPaginationRequest<
4040
| 'last_active_at'
4141
| 'last_sign_in_at'
4242
>;
43+
/**
44+
* @deprecated Use `lastActiveAtAfter` instead. This parameter will be removed in a future version.
45+
*/
4346
last_active_at_since?: number;
47+
lastActiveAtBefore?: number;
48+
lastActiveAtAfter?: number;
49+
createdAtBefore?: number;
50+
createdAtAfter?: number;
4451
lastSignInAtAfter?: number;
4552
lastSignInAtBefore?: number;
4653
organizationId?: string[];

0 commit comments

Comments
 (0)