Skip to content
10 changes: 10 additions & 0 deletions .changeset/eager-baboons-sink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@clerk/astro": patch
"@clerk/express": patch
"@clerk/nextjs": patch
"@clerk/nuxt": patch
"@clerk/react-router": patch
"@clerk/tanstack-react-start": patch
---

Wire `clerkUIVersion` option through all framework packages
2 changes: 1 addition & 1 deletion packages/astro/src/integration/create-integration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ function createClerkEnvSchema() {
PUBLIC_CLERK_DOMAIN: envField.string({ context: 'client', access: 'public', optional: true, url: true }),
PUBLIC_CLERK_JS_URL: envField.string({ context: 'client', access: 'public', optional: true, url: true }),
PUBLIC_CLERK_JS_VERSION: envField.string({ context: 'client', access: 'public', optional: true }),
PUBLIC_CLERK_UI_URL: envField.string({ context: 'client', access: 'public', optional: true, url: true }),
PUBLIC_CLERK_UI_VERSION: envField.string({ context: 'client', access: 'public', optional: true }),
PUBLIC_CLERK_PREFETCH_UI: envField.string({ context: 'client', access: 'public', optional: true }),
PUBLIC_CLERK_UI_URL: envField.string({ context: 'client', access: 'public', optional: true, url: true }),
PUBLIC_CLERK_TELEMETRY_DISABLED: envField.boolean({ context: 'client', access: 'public', optional: true }),
PUBLIC_CLERK_TELEMETRY_DEBUG: envField.boolean({ context: 'client', access: 'public', optional: true }),
CLERK_SECRET_KEY: envField.string({ context: 'server', access: 'secret' }),
Expand Down
1 change: 1 addition & 0 deletions packages/express/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const loadClientEnv = () => {
clerkJSUrl: process.env.CLERK_JS || process.env.CLERK_JS_URL || '',
clerkJSVersion: process.env.CLERK_JS_VERSION || '',
clerkUIUrl: process.env.CLERK_UI_URL || '',
clerkUIVersion: process.env.CLERK_UI_VERSION || '',
prefetchUI: process.env.CLERK_PREFETCH_UI === 'false' ? false : undefined,
};
};
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/server/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { isTruthy } from '@clerk/shared/underscore';

export const CLERK_JS_VERSION = process.env.NEXT_PUBLIC_CLERK_JS_VERSION || '';
export const CLERK_JS_URL = process.env.NEXT_PUBLIC_CLERK_JS_URL || '';
export const CLERK_UI_VERSION = process.env.NEXT_PUBLIC_CLERK_UI_VERSION || '';
export const CLERK_UI_URL = process.env.NEXT_PUBLIC_CLERK_UI_URL || '';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
Expand Down
4 changes: 3 additions & 1 deletion packages/nextjs/src/utils/clerk-script.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ function ClerkScript(props: ClerkScriptProps) {
}

export function ClerkScripts({ router }: { router: ClerkScriptProps['router'] }) {
const { publishableKey, clerkJSUrl, clerkJSVersion, clerkUIUrl, nonce, prefetchUI, ui } = useClerkNextOptions();
const { publishableKey, clerkJSUrl, clerkJSVersion, clerkUIUrl, clerkUIVersion, nonce, prefetchUI, ui } =
useClerkNextOptions();
const { domain, proxyUrl } = useClerk();

if (!publishableKey) {
Expand All @@ -50,6 +51,7 @@ export function ClerkScripts({ router }: { router: ClerkScriptProps['router'] })
clerkJSUrl,
clerkJSVersion,
clerkUIUrl,
clerkUIVersion,
nonce,
domain,
proxyUrl,
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
clerkJSUrl: props.clerkJSUrl || process.env.NEXT_PUBLIC_CLERK_JS_URL,
clerkJSVersion: props.clerkJSVersion || process.env.NEXT_PUBLIC_CLERK_JS_VERSION,
clerkUIUrl: props.clerkUIUrl || process.env.NEXT_PUBLIC_CLERK_UI_URL,
clerkUIVersion: props.clerkUIVersion || process.env.NEXT_PUBLIC_CLERK_UI_VERSION,
prefetchUI: getPrefetchUIFromEnvAndProps(props.prefetchUI),
proxyUrl: props.proxyUrl || process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '',
domain: props.domain || process.env.NEXT_PUBLIC_CLERK_DOMAIN || '',
Expand Down
1 change: 1 addition & 0 deletions packages/nuxt/src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export default defineNuxtModule<ModuleOptions>({
jsUrl: options.clerkJSUrl,
uiUrl: options.clerkUIUrl,
clerkJSVersion: options.clerkJSVersion,
clerkUIVersion: options.clerkUIVersion,
// prefetchUI config: can be false or undefined
prefetchUI: options.prefetchUI,
isSatellite: options.isSatellite,
Expand Down
2 changes: 2 additions & 0 deletions packages/react-router/src/client/ReactRouterClerkProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ function ClerkProviderBase<TUi extends Ui = Ui>({ children, ...rest }: ClerkProv
__clerkJSUrl,
__clerkJSVersion,
__clerkUIUrl,
__clerkUIVersion,
__prefetchUI,
__telemetryDisabled,
__telemetryDebug,
Expand Down Expand Up @@ -93,6 +94,7 @@ function ClerkProviderBase<TUi extends Ui = Ui>({ children, ...rest }: ClerkProv
clerkJSUrl: __clerkJSUrl,
clerkJSVersion: __clerkJSVersion,
clerkUIUrl: __clerkUIUrl,
clerkUIVersion: __clerkUIVersion,
prefetchUI: __prefetchUI,
telemetry: {
disabled: __telemetryDisabled,
Expand Down
1 change: 1 addition & 0 deletions packages/react-router/src/client/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export type ClerkState = {
__clerkJSUrl: string | undefined;
__clerkJSVersion: string | undefined;
__clerkUIUrl: string | undefined;
__clerkUIVersion: string | undefined;
__prefetchUI: boolean | undefined;
__telemetryDisabled: boolean | undefined;
__telemetryDebug: boolean | undefined;
Expand Down
1 change: 1 addition & 0 deletions packages/react-router/src/server/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export function getResponseClerkState(requestState: RequestStateWithRedirectUrls
__clerkJSUrl: envVars.clerkJsUrl,
__clerkJSVersion: envVars.clerkJsVersion,
__clerkUIUrl: envVars.clerkUIUrl,
__clerkUIVersion: envVars.clerkUIVersion,
__prefetchUI: envVars.prefetchUI,
__telemetryDisabled: envVars.telemetryDisabled,
__telemetryDebug: envVars.telemetryDebug,
Expand Down
1 change: 1 addition & 0 deletions packages/react-router/src/utils/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const getPublicEnvVariables = (context: AppLoadContext | undefined) => {
clerkJsUrl: getValue('CLERK_JS_URL'),
clerkJsVersion: getValue('CLERK_JS_VERSION'),
clerkUIUrl: getValue('CLERK_UI_URL'),
clerkUIVersion: getValue('CLERK_UI_VERSION'),
prefetchUI: getValue('CLERK_PREFETCH_UI') === 'false' ? false : undefined,
telemetryDisabled: isTruthy(getValue('CLERK_TELEMETRY_DISABLED')),
telemetryDebug: isTruthy(getValue('CLERK_TELEMETRY_DEBUG')),
Expand Down
1 change: 1 addition & 0 deletions packages/tanstack-react-start/src/client/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export type ClerkState = {
__clerkJSUrl: string | undefined;
__clerkJSVersion: string | undefined;
__clerkUIUrl: string | undefined;
__clerkUIVersion: string | undefined;
__prefetchUI: boolean | undefined;
__telemetryDisabled: boolean | undefined;
__telemetryDebug: boolean | undefined;
Expand Down
3 changes: 3 additions & 0 deletions packages/tanstack-react-start/src/client/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const pickFromClerkInitState = (
__clerkJSUrl,
__clerkJSVersion,
__clerkUIUrl,
__clerkUIVersion,
__telemetryDisabled,
__telemetryDebug,
__signInForceRedirectUrl,
Expand All @@ -43,6 +44,7 @@ export const pickFromClerkInitState = (
clerkJSUrl: __clerkJSUrl,
clerkJSVersion: __clerkJSVersion,
clerkUIUrl: __clerkUIUrl,
clerkUIVersion: __clerkUIVersion,
prefetchUI: __prefetchUI,
telemetry: {
disabled: __telemetryDisabled,
Expand All @@ -69,6 +71,7 @@ export const mergeWithPublicEnvs = (restInitState: any) => {
clerkJSUrl: restInitState.clerkJSUrl || envVars.clerkJsUrl,
clerkJSVersion: restInitState.clerkJSVersion || envVars.clerkJsVersion,
clerkUIUrl: restInitState.clerkUIUrl || envVars.clerkUIUrl,
clerkUIVersion: restInitState.clerkUIVersion || envVars.clerkUIVersion,
signInForceRedirectUrl: restInitState.signInForceRedirectUrl,
prefetchUI: restInitState.prefetchUI ?? envVars.prefetchUI,
};
Expand Down
2 changes: 2 additions & 0 deletions packages/tanstack-react-start/src/server/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export const commonEnvs = () => {
// Public environment variables
CLERK_JS_VERSION: publicEnvs.clerkJsVersion,
CLERK_JS_URL: publicEnvs.clerkJsUrl,
CLERK_UI_URL: publicEnvs.clerkUIUrl,
CLERK_UI_VERSION: publicEnvs.clerkUIVersion,
PREFETCH_UI: publicEnvs.prefetchUI,
PUBLISHABLE_KEY: publicEnvs.publishableKey,
DOMAIN: publicEnvs.domain,
Expand Down
1 change: 1 addition & 0 deletions packages/tanstack-react-start/src/server/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export function getResponseClerkState(requestState: RequestState, additionalStat
__clerkJSUrl: getEnvVariable('CLERK_JS') || getEnvVariable('CLERK_JS_URL'),
__clerkJSVersion: getEnvVariable('CLERK_JS_VERSION'),
__clerkUIUrl: getEnvVariable('CLERK_UI_URL'),
__clerkUIVersion: getEnvVariable('CLERK_UI_VERSION'),
__prefetchUI: getPrefetchUIFromEnv(),
__telemetryDisabled: isTruthy(getEnvVariable('CLERK_TELEMETRY_DISABLED')),
__telemetryDebug: isTruthy(getEnvVariable('CLERK_TELEMETRY_DEBUG')),
Expand Down
1 change: 1 addition & 0 deletions packages/tanstack-react-start/src/utils/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const getPublicEnvVariables = () => {
clerkJsUrl: getValue('CLERK_JS_URL') || getValue('CLERK_JS'),
clerkJsVersion: getValue('CLERK_JS_VERSION'),
clerkUIUrl: getValue('CLERK_UI_URL'),
clerkUIVersion: getValue('CLERK_UI_VERSION'),
prefetchUI: getValue('CLERK_PREFETCH_UI') === 'false' ? false : undefined,
telemetryDisabled: isTruthy(getValue('CLERK_TELEMETRY_DISABLED')),
telemetryDebug: isTruthy(getValue('CLERK_TELEMETRY_DEBUG')),
Expand Down
Loading