fix(clerk-react): Replace optional Clerk properties with undefined

clerk · Nov 29, 2023 · 0e0c835 · 0e0c835
1 parent bd4e6ee
commit 0e0c835
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/packages/clerk-js/src/core/clerk.ts b/packages/clerk-js/src/core/clerk.ts
@@ -146,10 +146,10 @@ export class Clerk implements ClerkInterface {
     version: __PKG_VERSION__,
   };
 
-  public client?: ClientResource;
-  public session?: ActiveSessionResource | null;
-  public organization?: OrganizationResource | null;
-  public user?: UserResource | null;
+  public client: ClientResource | undefined;
+  public session: ActiveSessionResource | null | undefined;
+  public organization: OrganizationResource | null | undefined;
+  public user: UserResource | null | undefined;
   public __internal_country?: string | null;
   public telemetry?: TelemetryCollector;
 

diff --git a/packages/react/src/isomorphicClerk.ts b/packages/react/src/isomorphicClerk.ts
@@ -33,6 +33,7 @@ import type {
   UserButtonProps,
   UserProfileProps,
   UserResource,
+  Without,
 } from '@clerk/types';
 
 import { unsupportedNonBrowserDomainOrProxyUrlFunction } from './errors';
@@ -62,7 +63,7 @@ type MethodName<T> = {
 
 type MethodCallback = () => Promise<unknown> | unknown;
 
-type IsomorphicLoadedClerk = Omit<
+type IsomorphicLoadedClerk = Without<
   LoadedClerk,
   /**
    * Override ClerkJS methods in order to support premountMethodCalls

diff --git a/packages/types/src/clerk.ts b/packages/types/src/clerk.ts
@@ -59,13 +59,13 @@ export interface Clerk {
   /**
    * Clerk SDK version number.
    */
-  version?: string;
+  version: string | undefined;
 
   /**
    * If present, contains information about the SDK that the host application is using.
    * For example, if Clerk is loaded through `@clerk/nextjs`, this would be `{ name: '@clerk/nextjs', version: '1.0.0' }`
    */
-  sdkMetadata?: SDKMetadata;
+  sdkMetadata: SDKMetadata | undefined;
 
   /**
    * If true the bootstrapping of Clerk.load() has completed successfully.
@@ -78,7 +78,7 @@ export interface Clerk {
   publishableKey: string;
 
   /** Clerk Proxy url string. */
-  proxyUrl?: string;
+  proxyUrl: string | undefined;
 
   /** Clerk Satellite Frontend API string. */
   domain: string;
@@ -87,22 +87,22 @@ export interface Clerk {
   isSatellite: boolean;
 
   /** Clerk Instance type is defined from the Publishable key */
-  instanceType?: InstanceType;
+  instanceType: InstanceType | undefined;
 
   /** Clerk flag for loading Clerk in a standard browser setup */
-  isStandardBrowser?: boolean;
+  isStandardBrowser: boolean | undefined;
 
   /** Client handling most Clerk operations. */
-  client?: ClientResource;
+  client: ClientResource | undefined;
 
   /** Active Session. */
-  session?: ActiveSessionResource | null;
+  session: ActiveSessionResource | null | undefined;
 
   /** Active Organization */
-  organization?: OrganizationResource | null;
+  organization: OrganizationResource | null | undefined;
 
   /** Current User. */
-  user?: UserResource | null;
+  user: UserResource | null | undefined;
 
   /**
    * Signs out the current user on single-session instances, or all users on multi-session instances