diff --git a/packages/clerk-js/src/core/resources/Passkey.ts b/packages/clerk-js/src/core/resources/Passkey.ts index b073e1f4b4c..f3325604f67 100644 --- a/packages/clerk-js/src/core/resources/Passkey.ts +++ b/packages/clerk-js/src/core/resources/Passkey.ts @@ -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, @@ -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'; diff --git a/packages/clerk-js/src/core/resources/Session.ts b/packages/clerk-js/src/core/resources/Session.ts index 3c77d311a26..a31123b8d71 100644 --- a/packages/clerk-js/src/core/resources/Session.ts +++ b/packages/clerk-js/src/core/resources/Session.ts @@ -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, @@ -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'; diff --git a/packages/clerk-js/src/core/resources/Verification.ts b/packages/clerk-js/src/core/resources/Verification.ts index 8adde912f1d..af1f61a4f88 100644 --- a/packages/clerk-js/src/core/resources/Verification.ts +++ b/packages/clerk-js/src/core/resources/Verification.ts @@ -1,4 +1,5 @@ import { ClerkAPIError, errorToJSON } from '@clerk/shared/error'; +import { convertJSONToPublicKeyCreateOptions } from '@clerk/shared/internal/clerk-js/passkeys'; import type { PasskeyVerificationResource, PhoneCodeChannel, @@ -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 { diff --git a/packages/shared/src/errors/createErrorTypeGuard.ts b/packages/shared/src/errors/createErrorTypeGuard.ts index aa6afe5d96d..842e8d4e8c3 100644 --- a/packages/shared/src/errors/createErrorTypeGuard.ts +++ b/packages/shared/src/errors/createErrorTypeGuard.ts @@ -1,5 +1,3 @@ -/* eslint-disable jsdoc/require-jsdoc */ - type Value = unknown; /** diff --git a/packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts b/packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts index 907d065adc1..237bebe54ce 100644 --- a/packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts +++ b/packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts @@ -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(); diff --git a/packages/shared/src/internal/clerk-js/__tests__/passkeys.test.ts b/packages/shared/src/internal/clerk-js/__tests__/passkeys.test.ts index ecb96bdf735..338bb87ddf2 100644 --- a/packages/shared/src/internal/clerk-js/__tests__/passkeys.test.ts +++ b/packages/shared/src/internal/clerk-js/__tests__/passkeys.test.ts @@ -3,7 +3,8 @@ import { describe, expect, it } from 'vitest'; import type { PublicKeyCredentialWithAuthenticatorAssertionResponse, PublicKeyCredentialWithAuthenticatorAttestationResponse, -} from '../../../types'; +} from '@/types'; + import { bufferToBase64Url, convertJSONToPublicKeyCreateOptions, diff --git a/packages/shared/src/internal/clerk-js/__tests__/querystring.test.ts b/packages/shared/src/internal/clerk-js/__tests__/querystring.test.ts index 5bec66cbe33..46d1e4513e9 100644 --- a/packages/shared/src/internal/clerk-js/__tests__/querystring.test.ts +++ b/packages/shared/src/internal/clerk-js/__tests__/querystring.test.ts @@ -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)', () => { diff --git a/packages/shared/src/internal/clerk-js/__tests__/redirectUrls.test.ts b/packages/shared/src/internal/clerk-js/__tests__/redirectUrls.test.ts index a40d0e09c6d..6b59b3b79f0 100644 --- a/packages/shared/src/internal/clerk-js/__tests__/redirectUrls.test.ts +++ b/packages/shared/src/internal/clerk-js/__tests__/redirectUrls.test.ts @@ -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; diff --git a/packages/shared/src/internal/clerk-js/__tests__/url.test.ts b/packages/shared/src/internal/clerk-js/__tests__/url.test.ts index 16e665c5c5c..63927fae344 100644 --- a/packages/shared/src/internal/clerk-js/__tests__/url.test.ts +++ b/packages/shared/src/internal/clerk-js/__tests__/url.test.ts @@ -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, diff --git a/packages/shared/src/internal/clerk-js/passwords/complexity.ts b/packages/shared/src/internal/clerk-js/passwords/complexity.ts index f42ff3893ce..cb0ffd3e546 100644 --- a/packages/shared/src/internal/clerk-js/passwords/complexity.ts +++ b/packages/shared/src/internal/clerk-js/passwords/complexity.ts @@ -1,4 +1,4 @@ -import type { PasswordSettingsData } from '../../../types'; +import type { PasswordSettingsData } from '@/types'; export type ComplexityErrors = { [key in keyof Partial>]?: boolean; diff --git a/packages/shared/src/internal/clerk-js/passwords/password.ts b/packages/shared/src/internal/clerk-js/passwords/password.ts index e2aea466d33..5bf369271f0 100644 --- a/packages/shared/src/internal/clerk-js/passwords/password.ts +++ b/packages/shared/src/internal/clerk-js/passwords/password.ts @@ -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'; diff --git a/packages/shared/src/internal/clerk-js/passwords/strength.ts b/packages/shared/src/internal/clerk-js/passwords/strength.ts index 26f4486d0fd..4cd5946cfc6 100644 --- a/packages/shared/src/internal/clerk-js/passwords/strength.ts +++ b/packages/shared/src/internal/clerk-js/passwords/strength.ts @@ -1,4 +1,4 @@ -import type { PasswordSettingsData, ZxcvbnResult } from '../../../types'; +import type { PasswordSettingsData, ZxcvbnResult } from '@/types'; type zxcvbnFN = (password: string, userInputs?: (string | number)[]) => ZxcvbnResult; diff --git a/packages/shared/src/react/hooks/__tests__/createBillingPaginatedHook.spec.tsx b/packages/shared/src/react/hooks/__tests__/createBillingPaginatedHook.spec.tsx index 6431b98a428..403b7855d0f 100644 --- a/packages/shared/src/react/hooks/__tests__/createBillingPaginatedHook.spec.tsx +++ b/packages/shared/src/react/hooks/__tests__/createBillingPaginatedHook.spec.tsx @@ -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'; diff --git a/packages/shared/src/react/hooks/__tests__/usePagesOrInfinite.spec.ts b/packages/shared/src/react/hooks/__tests__/usePagesOrInfinite.spec.ts index 19cf0d3ce95..31e26912eaf 100644 --- a/packages/shared/src/react/hooks/__tests__/usePagesOrInfinite.spec.ts +++ b/packages/shared/src/react/hooks/__tests__/usePagesOrInfinite.spec.ts @@ -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'; diff --git a/packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx b/packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx index a240759d779..5f81151e570 100644 --- a/packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx +++ b/packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx @@ -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(); @@ -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(); diff --git a/packages/shared/src/react/hooks/__tests__/useSubscription.spec.tsx b/packages/shared/src/react/hooks/__tests__/useSubscription.spec.tsx index 69fe3d7bb4c..1e5d9da2980 100644 --- a/packages/shared/src/react/hooks/__tests__/useSubscription.spec.tsx +++ b/packages/shared/src/react/hooks/__tests__/useSubscription.spec.tsx @@ -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'; diff --git a/packages/shared/src/react/hooks/useCheckout.ts b/packages/shared/src/react/hooks/useCheckout.ts index 35fc4a37fc9..6ca07b297f1 100644 --- a/packages/shared/src/react/hooks/useCheckout.ts +++ b/packages/shared/src/react/hooks/useCheckout.ts @@ -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[0];