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
8 changes: 4 additions & 4 deletions packages/clerk-js/src/core/resources/Passkey.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { ClerkWebAuthnError } from '@clerk/shared/error';
import {
serializePublicKeyCredential,
webAuthnCreateCredential as webAuthnCreateCredentialOnWindow,
} from '@clerk/shared/internal/clerk-js/passkeys';
import type {
DeletedObjectJSON,
DeletedObjectResource,
Expand All @@ -15,10 +19,6 @@ import {
} from '@clerk/shared/webauthn';

import { unixEpochToDate } from '../../utils/date';
import {
serializePublicKeyCredential,
webAuthnCreateCredential as webAuthnCreateCredentialOnWindow,
} from '@clerk/shared/internal/clerk-js/passkeys';
import { clerkMissingWebAuthnPublicKeyOptions } from '../errors';
import { BaseResource, DeletedObject, PasskeyVerification } from './internal';

Expand Down
10 changes: 5 additions & 5 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { createCheckAuthorization } from '@clerk/shared/authorization';
import { ClerkWebAuthnError, is4xxError } from '@clerk/shared/error';
import {
convertJSONToPublicKeyRequestOptions,
serializePublicKeyCredentialAssertion,
webAuthnGetCredential as webAuthnGetCredentialOnWindow,
} from '@clerk/shared/internal/clerk-js/passkeys';
import { retry } from '@clerk/shared/retry';
import type {
ActClaim,
Expand Down Expand Up @@ -28,11 +33,6 @@ import { isWebAuthnSupported as isWebAuthnSupportedOnWindow } from '@clerk/share

import { unixEpochToDate } from '@/utils/date';
import { debugLogger } from '@/utils/debug';
import {
convertJSONToPublicKeyRequestOptions,
serializePublicKeyCredentialAssertion,
webAuthnGetCredential as webAuthnGetCredentialOnWindow,
} from '@clerk/shared/internal/clerk-js/passkeys';
import { TokenId } from '@/utils/tokenId';

import { clerkInvalidStrategy, clerkMissingWebAuthnPublicKeyOptions } from '../errors';
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/core/resources/Verification.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ClerkAPIError, errorToJSON } from '@clerk/shared/error';
import { convertJSONToPublicKeyCreateOptions } from '@clerk/shared/internal/clerk-js/passkeys';
import type {
PasskeyVerificationResource,
PhoneCodeChannel,
Expand All @@ -17,7 +18,6 @@ import type {
} from '@clerk/shared/types';

import { unixEpochToDate } from '../../utils/date';
import { convertJSONToPublicKeyCreateOptions } from '@clerk/shared/internal/clerk-js/passkeys';
import { BaseResource } from './internal';

export class Verification extends BaseResource implements VerificationResource {
Expand Down
2 changes: 0 additions & 2 deletions packages/shared/src/errors/createErrorTypeGuard.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable jsdoc/require-jsdoc */

type Value = unknown;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';

import type { SignUpField, SignUpResource } from '../../../types';
import type { SignUpField, SignUpResource } from '@/types';

import { completeSignUpFlow } from '../completeSignUpFlow';

const mockHandleComplete = vi.fn();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { describe, expect, it } from 'vitest';
import type {
PublicKeyCredentialWithAuthenticatorAssertionResponse,
PublicKeyCredentialWithAuthenticatorAttestationResponse,
} from '../../../types';
} from '@/types';

import {
bufferToBase64Url,
convertJSONToPublicKeyCreateOptions,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { describe, expect, it } from 'vitest';

import { camelToSnake } from '../../../underscore';
import { camelToSnake } from '@/underscore';

import { getQueryParams, stringifyQueryParams } from '../querystring';

describe('getQueryParams(string)', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { afterAll, beforeEach, describe, expect, it } from 'vitest';

import type { RedirectOptions } from '../../../types';
import { snakeToCamel } from '../../../underscore';
import type { RedirectOptions } from '@/types';
import { snakeToCamel } from '@/underscore';

import { RedirectUrls } from '../redirectUrls';

const oldWindowLocation = window.location;
Expand Down
5 changes: 3 additions & 2 deletions packages/shared/src/internal/clerk-js/__tests__/url.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { afterAll, beforeEach, describe, expect, it, test, vi } from 'vitest';

import { logger } from '../../../logger';
import type { SignUpResource } from '../../../types';
import { logger } from '@/logger';
import type { SignUpResource } from '@/types';

import {
buildURL,
createAllowedRedirectOrigins,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { PasswordSettingsData } from '../../../types';
import type { PasswordSettingsData } from '@/types';

export type ComplexityErrors = {
[key in keyof Partial<Omit<PasswordSettingsData, 'disable_hibp' | 'min_zxcvbn_strength' | 'show_zxcvbn'>>]?: boolean;
Expand Down
5 changes: 3 additions & 2 deletions packages/shared/src/internal/clerk-js/passwords/password.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { PasswordSettingsData, PasswordValidation, ValidatePasswordCallbacks, ZxcvbnResult } from '../../../types';
import { noop } from '../../../utils';
import type { PasswordSettingsData, PasswordValidation, ValidatePasswordCallbacks, ZxcvbnResult } from '@/types';
import { noop } from '@/utils';

import { createValidateComplexity } from './complexity';
import { createValidatePasswordStrength } from './strength';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { PasswordSettingsData, ZxcvbnResult } from '../../../types';
import type { PasswordSettingsData, ZxcvbnResult } from '@/types';

type zxcvbnFN = (password: string, userInputs?: (string | number)[]) => ZxcvbnResult;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { act, renderHook, waitFor } from '@testing-library/react';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import type { ClerkResource } from '../../../types';
import type { ClerkResource } from '@/types';

import type { ResourceCacheStableKey } from '../../stable-keys';
import { createBillingPaginatedHook } from '../createBillingPaginatedHook';
import { createMockClerk, createMockOrganization, createMockQueryClient, createMockUser } from './mocks/clerk';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { act, renderHook, waitFor } from '@testing-library/react';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { createDeferredPromise } from '../../../utils/createDeferredPromise';
import { createDeferredPromise } from '@/utils/createDeferredPromise';

import type { ResourceCacheStableKey } from '../../stable-keys';
import { createCacheKeys } from '../createCacheKeys';
import { usePagesOrInfinite } from '../usePagesOrInfinite';
Expand Down
8 changes: 4 additions & 4 deletions packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ import { act, render, renderHook, screen, waitFor } from '@testing-library/react
import React from 'react';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import type { BillingPlanResource } from '@/types/billing';

import { usePlans } from '../usePlans';
import { createMockClerk, createMockOrganization, createMockQueryClient, createMockUser } from './mocks/clerk';
import { wrapper } from './wrapper';

const mockUser: any = createMockUser();
const mockOrganization: any = createMockOrganization();
Expand Down Expand Up @@ -36,10 +40,6 @@ vi.mock('../../contexts', () => {
};
});

import type { BillingPlanResource } from '../../../types/billing';
import { usePlans } from '../usePlans';
import { wrapper } from './wrapper';

describe('usePlans', () => {
beforeEach(() => {
vi.clearAllMocks();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { act, renderHook, waitFor } from '@testing-library/react';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { createDeferredPromise } from '../../../utils/createDeferredPromise';
import { createDeferredPromise } from '@/utils/createDeferredPromise';

import { useSubscription } from '../useSubscription';
import { createMockClerk, createMockOrganization, createMockQueryClient, createMockUser } from './mocks/clerk';
import { wrapper } from './wrapper';
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/react/hooks/useCheckout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useCallback, useSyncExternalStore } from 'react';

import type { CheckoutSignalValue } from '../../types/clerk';
import type { __experimental_CheckoutProvider } from '../contexts';
import { useCheckoutContext, useOrganizationContext, useClerkInstanceContext } from '../contexts';
import { useCheckoutContext, useClerkInstanceContext, useOrganizationContext } from '../contexts';
import { useUser } from './useUser';

type UseCheckoutParams = Parameters<typeof __experimental_CheckoutProvider>[0];
Expand Down
Loading