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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ playground
packages/backend/tests/**/*.js
packages/clerk-js/src/core/resources/internal.ts
packages/clerk-js/src/core/resources/index.ts
packages/shared/src/compiled
/**/CHANGELOG.md
renovate.json5
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"devDependencies": {
"@actions/core": "^1.11.1",
"@arethetypeswrong/cli": "0.17.4",
"@arethetypeswrong/cli": "0.18.2",
"@changesets/cli": "^2.29.4",
"@changesets/get-github-info": "^0.6.0",
"@clerk/backend": "workspace:*",
Expand Down Expand Up @@ -126,11 +126,11 @@
"jsonwebtoken": "9.0.2",
"lint-staged": "^14.0.1",
"pkglab": "0.17.1",
"prettier": "^3.6.2",
"prettier": "^3.8.1",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-packagejson": "^2.5.15",
"prettier-plugin-tailwindcss": "^0.6.12",
"publint": "^0.3.12",
"publint": "^0.3.18",
"react": "catalog:react",
"react-dom": "catalog:react",
"rimraf": "6.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/core/resources/UserSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ export class UserSettings extends BaseResource implements UserSettingsResource {
get hasValidAuthFactor() {
return Boolean(
this.attributes?.email_address?.enabled ||
this.attributes?.phone_number?.enabled ||
(this.attributes.password?.required && this.attributes.username?.required),
this.attributes?.phone_number?.enabled ||
(this.attributes.password?.required && this.attributes.username?.required),
);
}

Expand Down
5 changes: 2 additions & 3 deletions packages/nextjs/src/app-router/server/keyless-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ export const KeylessProvider = async (props: KeylessProviderProps) => {
.then(mod => mod.keyless().getOrCreateKeys())
.catch(() => null);

const { clerkDevelopmentCache, createConfirmationMessage, createKeylessModeMessage } = await import(
'../../server/keyless-log-cache.js'
);
const { clerkDevelopmentCache, createConfirmationMessage, createKeylessModeMessage } =
await import('../../server/keyless-log-cache.js');

if (!newOrReadKeys) {
// When case keyless should run, but keys are not available, then fallback to throwing for missing keys
Expand Down
41 changes: 20 additions & 21 deletions packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,26 @@ type BillingHookConfig<TResource extends ClerkResource, TParams extends PagesOrI
/**
* @interface
*/
export interface HookParams
extends PaginatedHookConfig<
PagesOrInfiniteOptions & {
/**
* If `true`, a request will be triggered when the hook is mounted.
*
* @default true
*/
enabled?: boolean;
/**
* On `cache` mode, no request will be triggered when the hook is mounted and the data will be fetched from the cache.
*
* @default undefined
*
* @hidden
*
* @experimental
*/
__experimental_mode?: 'cache';
}
> {
export interface HookParams extends PaginatedHookConfig<
PagesOrInfiniteOptions & {
/**
* If `true`, a request will be triggered when the hook is mounted.
*
* @default true
*/
enabled?: boolean;
/**
* On `cache` mode, no request will be triggered when the hook is mounted and the data will be fetched from the cache.
*
* @default undefined
*
* @hidden
*
* @experimental
*/
__experimental_mode?: 'cache';
}
> {
/**
* Specifies whether to fetch for the current user or Organization.
*
Expand Down
5 changes: 3 additions & 2 deletions packages/shared/src/types/localization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ type DeepLocalizationWithoutObjects<T> = {
* as a starting point.
*/
// eslint-disable-next-line @typescript-eslint/no-empty-object-type -- Needs to be an interface for typedoc to link correctly
export interface LocalizationResource
extends DeepPartial<DeepLocalizationWithoutObjects<__internal_LocalizationResource>> {}
export interface LocalizationResource extends DeepPartial<
DeepLocalizationWithoutObjects<__internal_LocalizationResource>
> {}

export type __internal_LocalizationResource = {
locale: string;
Expand Down
77 changes: 39 additions & 38 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading