Merge branch 'alexcarpenter/sdk-2050-menubutton-element-affects-button-for-dropdown-and-other' of github.com:clerk/javascript into alexcarpenter/sdk-2050-menubutton-element-affects-button-for-dropdown-and-other

alexcarpenter · alexcarpenter · commit 923dbbe2811e · 2025-02-07T10:39:28.000-05:00
diff --git a/.changeset/beige-planes-unite.md b/.changeset/beige-planes-unite.md
@@ -0,0 +1,5 @@
+---
+'@clerk/backend': minor
+---
+
+Add organizationId to GetOrganizationListParams
diff --git a/.changeset/eleven-cougars-film.md b/.changeset/eleven-cougars-film.md
@@ -0,0 +1,13 @@
+---
+"@clerk/shared": minor
+---
+
+Introduce unified environment variable handling across all supported platforms
+
+Usage:
+
+```ts
+import { getEnvVariable } from '@clerk/shared/getEnvVariable'
+
+const publishableKey = getEnvVariable('CLERK_PUBLISHABLE_KEY')
+```
diff --git a/.changeset/late-bags-hang.md b/.changeset/late-bags-hang.md
@@ -0,0 +1,6 @@
+---
+'@clerk/shared': patch
+'@clerk/types': patch
+---
+
+Small JSDoc and type improvements
diff --git a/.changeset/metal-jokes-notice.md b/.changeset/metal-jokes-notice.md
@@ -0,0 +1,5 @@
+---
+'@clerk/themes': patch
+---
+
+Invert OKX Wallet icon in dark theme.
diff --git a/.changeset/nervous-humans-repeat.md b/.changeset/nervous-humans-repeat.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/shaggy-rocks-look.md b/.changeset/shaggy-rocks-look.md
@@ -0,0 +1,7 @@
+---
+"@clerk/localizations": patch
+---
+
+Update "profile" translations for en-MX.ts
+- `userProfile.profilePage.title`
+- `userProfile.start.profileSection.primaryButton`
diff --git a/.changeset/unlucky-gifts-obey.md b/.changeset/unlucky-gifts-obey.md
@@ -0,0 +1,6 @@
+---
+'@clerk/tanstack-start': patch
+'@clerk/react-router': patch
+---
+
+Internal changes to use new `getEnvVariable` utility from `@clerk/shared`
diff --git a/.changeset/witty-cougars-tickle.md b/.changeset/witty-cougars-tickle.md
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Avoid triggering email code verification twice on React strict mode
diff --git a/package.json b/package.json
@@ -128,7 +128,7 @@
     "turbo": "^2.0.14",
     "turbo-ignore": "^2.0.6",
     "typedoc": "0.27.6",
-    "typedoc-plugin-missing-exports": "3.1.0",
+    "typedoc-plugin-markdown": "4.4.1",
     "typescript": "catalog:repo",
     "typescript-eslint": "8.21.0",
     "uuid": "8.3.2",
diff --git a/packages/backend/src/api/endpoints/OrganizationApi.ts b/packages/backend/src/api/endpoints/OrganizationApi.ts
@@ -25,6 +25,7 @@ type GetOrganizationListParams = ClerkPaginationRequest<{
   includeMembersCount?: boolean;
   query?: string;
   orderBy?: WithSign<'name' | 'created_at' | 'members_count'>;
+  organizationId?: string[];
 }>;
 
 type CreateParams = {
diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json
@@ -81,12 +81,7 @@
     "@rspack/core": "^1.2.2",
     "@rspack/plugin-react-refresh": "^1.0.1",
     "@svgr/webpack": "^6.5.1",
-    "@types/webpack-dev-server": "^4.7.2",
     "@types/webpack-env": "^1.18.8",
-    "react-refresh": "^0.16.0",
-    "react-refresh-typescript": "^2.0.10",
-    "terser-webpack-plugin": "^5.3.11",
-    "ts-loader": "^9.5.2",
     "webpack-merge": "^5.10.0"
   },
   "peerDependencies": {
diff --git a/packages/clerk-js/src/ui/components/SignIn/SignInFactorOneCodeForm.tsx b/packages/clerk-js/src/ui/components/SignIn/SignInFactorOneCodeForm.tsx
@@ -1,12 +1,12 @@
 import { isUserLockedError } from '@clerk/shared/error';
 import { useClerk } from '@clerk/shared/react';
 import type { EmailCodeFactor, PhoneCodeFactor, ResetPasswordCodeFactor } from '@clerk/types';
-import React from 'react';
 
 import { clerkInvalidFAPIResponse } from '../../../core/errors';
 import { useCoreSignIn, useSignInContext } from '../../contexts';
 import type { VerificationCodeCardProps } from '../../elements';
 import { useCardState, VerificationCodeCard } from '../../elements';
+import { useFetch } from '../../hooks';
 import { useSupportEmail } from '../../hooks/useSupportEmail';
 import type { LocalizationKey } from '../../localization';
 import { useRouter } from '../../router';
@@ -37,23 +37,40 @@ export const SignInFactorOneCodeForm = (props: SignInFactorOneCodeFormProps) =>
   const supportEmail = useSupportEmail();
   const clerk = useClerk();
 
+  const shouldAvoidPrepare = signIn.firstFactorVerification.status === 'verified' && props.factorAlreadyPrepared;
+
   const goBack = () => {
     return navigate('../');
   };
 
-  React.useEffect(() => {
-    if (!props.factorAlreadyPrepared) {
-      prepare();
+  const prepare = () => {
+    if (shouldAvoidPrepare) {
+      return;
     }
-  }, []);
 
-  const prepare = () => {
     void signIn
       .prepareFirstFactor(props.factor)
       .then(() => props.onFactorPrepare())
       .catch(err => handleError(err, [], card.setError));
   };
 
+  useFetch(
+    shouldAvoidPrepare
+      ? undefined
+      : () =>
+          signIn
+            ?.prepareFirstFactor(props.factor)
+            .then(() => props.onFactorPrepare())
+            .catch(err => handleError(err, [], card.setError)),
+    {
+      name: 'signIn.prepareFirstFactor',
+      factor: props.factor,
+    },
+    {
+      staleTime: 100,
+    },
+  );
+
   const action: VerificationCodeCardProps['onCodeEntryFinishedAction'] = (code, resolve, reject) => {
     signIn
       .attemptFirstFactor({ strategy: props.factor.strategy, code })
diff --git a/packages/localizations/src/es-MX.ts b/packages/localizations/src/es-MX.ts
@@ -820,7 +820,7 @@ export const esMX: LocalizationResource = {
       imageFormTitle: 'Imagen de perfil',
       readonly: 'Tu información de perfil ha sido proporcionada por la conexión de empresa y no se puede editar.',
       successMessage: 'Tu perfil ha sido actualizado.',
-      title: 'Actualizar Cuenta',
+      title: 'Actualizar perfil',
     },
     start: {
       activeDevicesSection: {
@@ -892,7 +892,7 @@ export const esMX: LocalizationResource = {
         title: 'Números telefónicos',
       },
       profileSection: {
-        primaryButton: undefined,
+        primaryButton: 'Actualizar perfil',
         title: 'Perfil',
       },
       usernameSection: {
diff --git a/packages/react-router/src/ssr/loadOptions.ts b/packages/react-router/src/ssr/loadOptions.ts
@@ -1,10 +1,11 @@
 import { createClerkRequest } from '@clerk/backend/internal';
 import { apiUrlFromPublishableKey } from '@clerk/shared/apiUrlFromPublishableKey';
+import { getEnvVariable } from '@clerk/shared/getEnvVariable';
 import { isDevelopmentFromSecretKey } from '@clerk/shared/keys';
 import { isHttpOrHttps, isProxyUrlRelative } from '@clerk/shared/proxy';
 import { handleValueOrFn } from '@clerk/shared/utils';
 
-import { getEnvVariable, getPublicEnvVariables } from '../utils/env';
+import { getPublicEnvVariables } from '../utils/env';
 import { noSecretKeyError, satelliteAndMissingProxyUrlAndDomain, satelliteAndMissingSignInUrl } from '../utils/errors';
 import type { LoaderFunctionArgs, RootAuthLoaderOptions } from './types';
 import { patchRequest } from './utils';
diff --git a/packages/react-router/src/utils/env.ts b/packages/react-router/src/utils/env.ts
@@ -1,59 +1,7 @@
+import { getEnvVariable } from '@clerk/shared/getEnvVariable';
 import { isTruthy } from '@clerk/shared/underscore';
 import type { AppLoadContext } from 'react-router';
 
-type CloudflareEnv = { env: Record<string, string> };
-
-const hasCloudflareProxyContext = (context: any): context is { cloudflare: CloudflareEnv } => {
-  return !!context?.cloudflare?.env;
-};
-
-const hasCloudflareContext = (context: any): context is CloudflareEnv => {
-  return !!context?.env;
-};
-
-/**
- *
- * Utility function to get env variables across Node and Edge runtimes.
- *
- * @param name
- * @returns string
- */
-export const getEnvVariable = (name: string, context: AppLoadContext | undefined): string => {
-  // Node envs
-  if (typeof process !== 'undefined' && process.env && typeof process.env[name] === 'string') {
-    return process.env[name];
-  }
-
-  // @ts-expect-error - Vite specific
-  if (typeof import.meta !== 'undefined' && import.meta.env && typeof import.meta.env[name] === 'string') {
-    // @ts-expect-error - Vite specific
-    return import.meta.env[name];
-  }
-
-  if (hasCloudflareProxyContext(context)) {
-    return context.cloudflare.env[name] || '';
-  }
-
-  // Cloudflare
-  if (hasCloudflareContext(context)) {
-    return context.env[name] || '';
-  }
-
-  // Check whether the value exists in the context object directly
-  if (context && typeof context[name] === 'string') {
-    return context[name];
-  }
-
-  // Cloudflare workers
-  try {
-    return globalThis[name as keyof typeof globalThis];
-  } catch {
-    // This will raise an error in Cloudflare Pages
-  }
-
-  return '';
-};
-
 export const getPublicEnvVariables = (context: AppLoadContext | undefined) => {
   return {
     publishableKey:
diff --git a/packages/shared/global.d.ts b/packages/shared/global.d.ts
@@ -2,3 +2,11 @@ declare const PACKAGE_NAME: string;
 declare const PACKAGE_VERSION: string;
 declare const JS_PACKAGE_VERSION: string;
 declare const __DEV__: boolean;
+
+interface ImportMetaEnv {
+  readonly [key: string]: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -115,6 +115,7 @@
     "object",
     "oauth",
     "web3",
+    "getEnvVariable",
     "pathMatcher"
   ],
   "scripts": {
diff --git a/packages/shared/src/getEnvVariable.ts b/packages/shared/src/getEnvVariable.ts
@@ -0,0 +1,50 @@
+type CloudflareEnv = { env: Record<string, string> };
+
+const hasCloudflareProxyContext = (context: any): context is { cloudflare: CloudflareEnv } => {
+  return !!context?.cloudflare?.env;
+};
+
+const hasCloudflareContext = (context: any): context is CloudflareEnv => {
+  return !!context?.env;
+};
+
+/**
+ * Retrieves an environment variable across runtime environments.
+ * @param name - The environment variable name to retrieve
+ * @param context - Optional context object that may contain environment values
+ * @returns The environment variable value or empty string if not found
+ */
+export const getEnvVariable = (name: string, context?: Record<string, any>): string => {
+  // Node envs
+  if (typeof process !== 'undefined' && process.env && typeof process.env[name] === 'string') {
+    return process.env[name];
+  }
+
+  // Vite specific
+  if (typeof import.meta !== 'undefined' && import.meta.env && typeof import.meta.env[name] === 'string') {
+    return import.meta.env[name];
+  }
+
+  if (hasCloudflareProxyContext(context)) {
+    return context.cloudflare.env[name] || '';
+  }
+
+  // Cloudflare
+  if (hasCloudflareContext(context)) {
+    return context.env[name] || '';
+  }
+
+  // Check whether the value exists in the context object directly
+  if (context && typeof context[name] === 'string') {
+    return context[name];
+  }
+
+  // Cloudflare workers
+  try {
+    return globalThis[name as keyof typeof globalThis];
+  } catch {
+    // This will raise an error in Cloudflare Pages
+  }
+
+  return '';
+};
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
@@ -35,4 +35,5 @@ export * from './object';
 export * from './logger';
 export { createWorkerTimers } from './workerTimers';
 export { DEV_BROWSER_JWT_KEY, extractDevBrowserJWTFromURL, setDevBrowserJWTInURL } from './devBrowser';
+export { getEnvVariable } from './getEnvVariable';
 export * from './pathMatcher';
diff --git a/packages/shared/src/telemetry/throttler.ts b/packages/shared/src/telemetry/throttler.ts
@@ -48,7 +48,7 @@ export class TelemetryEventThrottler {
   #generateKey(event: TelemetryEvent): string {
     const { sk: _sk, pk: _pk, payload, ...rest } = event;
 
-    const sanitizedEvent = {
+    const sanitizedEvent: Omit<TelemetryEvent, 'sk' | 'pk' | 'payload'> & TelemetryEvent['payload'] = {
       ...payload,
       ...rest,
     };
diff --git a/packages/shared/tsup.config.ts b/packages/shared/tsup.config.ts
@@ -24,6 +24,7 @@ export default defineConfig(overrideOptions => {
     minify: false,
     sourcemap: true,
     dts: true,
+    target: 'es2020',
     external: ['react', 'react-dom'],
     esbuildPlugins: [WebWorkerMinifyPlugin as any],
     define: {
diff --git a/packages/shared/typedoc.json b/packages/shared/typedoc.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://typedoc.org/schema.json",
+  "entryPoints": ["./src/index.ts", "./src/react/index.ts"],
+  "compilerOptions": {
+    "noImplicitAny": false
+  }
+}
diff --git a/packages/tanstack-start/src/server/constants.ts b/packages/tanstack-start/src/server/constants.ts
@@ -1,11 +1,12 @@
 import { apiUrlFromPublishableKey } from '@clerk/shared/apiUrlFromPublishableKey';
+import { getEnvVariable } from '@clerk/shared/getEnvVariable';
 import { getEvent } from 'vinxi/http';
 
-import { getEnvVariable, getPublicEnvVariables } from '../utils/env';
+import { getPublicEnvVariables } from '../utils/env';
 
 export const commonEnvs = () => {
   const event = getEvent();
-  const publicEnvs = getPublicEnvVariables(event);
+  const publicEnvs = getPublicEnvVariables(event.context);
 
   return {
     // Public environment variables
@@ -21,16 +22,16 @@ export const commonEnvs = () => {
     TELEMETRY_DEBUG: publicEnvs.telemetryDebug,
 
     // Server-only environment variables
-    API_VERSION: getEnvVariable('CLERK_API_VERSION', 'v1', event),
-    SECRET_KEY: getEnvVariable('CLERK_SECRET_KEY', '', event),
-    ENCRYPTION_KEY: getEnvVariable('CLERK_ENCRYPTION_KEY', '', event),
-    CLERK_JWT_KEY: getEnvVariable('CLERK_JWT_KEY', '', event),
-    API_URL: getEnvVariable('CLERK_API_URL', '', event) || apiUrlFromPublishableKey(publicEnvs.publishableKey),
+    API_VERSION: getEnvVariable('CLERK_API_VERSION', event.context) || 'v1',
+    SECRET_KEY: getEnvVariable('CLERK_SECRET_KEY', event.context),
+    ENCRYPTION_KEY: getEnvVariable('CLERK_ENCRYPTION_KEY', event.context),
+    CLERK_JWT_KEY: getEnvVariable('CLERK_JWT_KEY', event.context),
+    API_URL: getEnvVariable('CLERK_API_URL', event.context) || apiUrlFromPublishableKey(publicEnvs.publishableKey),
 
     SDK_METADATA: {
       name: PACKAGE_NAME,
       version: PACKAGE_VERSION,
-      environment: getEnvVariable('NODE_ENV', '', event),
+      environment: getEnvVariable('NODE_ENV', event.context),
     },
   } as const;
 };
diff --git a/packages/tanstack-start/src/server/loadOptions.ts b/packages/tanstack-start/src/server/loadOptions.ts
diff --git a/packages/tanstack-start/src/server/utils/index.ts b/packages/tanstack-start/src/server/utils/index.ts
diff --git a/packages/tanstack-start/src/utils/env.ts b/packages/tanstack-start/src/utils/env.ts
diff --git a/packages/themes/src/themes/dark.ts b/packages/themes/src/themes/dark.ts
diff --git a/packages/types/src/hooks.ts b/packages/types/src/hooks.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/typedoc.config.mjs b/typedoc.config.mjs

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@clerk/backend': minor
 +---
++
 +Add organizationId to GetOrganizationListParams