Skip to content

Commit ed8dc4d

Browse files
authored
feat(*): Wire clerkUIVersion through all framework packages (#7740)
1 parent 9751cfb commit ed8dc4d

16 files changed

Lines changed: 31 additions & 2 deletions

File tree

.changeset/eager-baboons-sink.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"@clerk/astro": patch
3+
"@clerk/express": patch
4+
"@clerk/nextjs": patch
5+
"@clerk/nuxt": patch
6+
"@clerk/react-router": patch
7+
"@clerk/tanstack-react-start": patch
8+
---
9+
10+
Wire `clerkUIVersion` option through all framework packages

packages/astro/src/integration/create-integration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ function createClerkEnvSchema() {
174174
PUBLIC_CLERK_DOMAIN: envField.string({ context: 'client', access: 'public', optional: true, url: true }),
175175
PUBLIC_CLERK_JS_URL: envField.string({ context: 'client', access: 'public', optional: true, url: true }),
176176
PUBLIC_CLERK_JS_VERSION: envField.string({ context: 'client', access: 'public', optional: true }),
177+
PUBLIC_CLERK_UI_URL: envField.string({ context: 'client', access: 'public', optional: true, url: true }),
177178
PUBLIC_CLERK_UI_VERSION: envField.string({ context: 'client', access: 'public', optional: true }),
178179
PUBLIC_CLERK_PREFETCH_UI: envField.string({ context: 'client', access: 'public', optional: true }),
179-
PUBLIC_CLERK_UI_URL: envField.string({ context: 'client', access: 'public', optional: true, url: true }),
180180
PUBLIC_CLERK_TELEMETRY_DISABLED: envField.boolean({ context: 'client', access: 'public', optional: true }),
181181
PUBLIC_CLERK_TELEMETRY_DEBUG: envField.boolean({ context: 'client', access: 'public', optional: true }),
182182
CLERK_SECRET_KEY: envField.string({ context: 'server', access: 'secret' }),

packages/express/src/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export const loadClientEnv = () => {
1313
clerkJSUrl: process.env.CLERK_JS || process.env.CLERK_JS_URL || '',
1414
clerkJSVersion: process.env.CLERK_JS_VERSION || '',
1515
clerkUIUrl: process.env.CLERK_UI_URL || '',
16+
clerkUIVersion: process.env.CLERK_UI_VERSION || '',
1617
prefetchUI: process.env.CLERK_PREFETCH_UI === 'false' ? false : undefined,
1718
};
1819
};

packages/nextjs/src/server/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { isTruthy } from '@clerk/shared/underscore';
33

44
export const CLERK_JS_VERSION = process.env.NEXT_PUBLIC_CLERK_JS_VERSION || '';
55
export const CLERK_JS_URL = process.env.NEXT_PUBLIC_CLERK_JS_URL || '';
6+
export const CLERK_UI_VERSION = process.env.NEXT_PUBLIC_CLERK_UI_VERSION || '';
67
export const CLERK_UI_URL = process.env.NEXT_PUBLIC_CLERK_UI_URL || '';
78
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
89
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';

packages/nextjs/src/utils/clerk-script.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ function ClerkScript(props: ClerkScriptProps) {
3838
}
3939

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

4445
if (!publishableKey) {
@@ -50,6 +51,7 @@ export function ClerkScripts({ router }: { router: ClerkScriptProps['router'] })
5051
clerkJSUrl,
5152
clerkJSVersion,
5253
clerkUIUrl,
54+
clerkUIVersion,
5355
nonce,
5456
domain,
5557
proxyUrl,

packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
2525
clerkJSUrl: props.clerkJSUrl || process.env.NEXT_PUBLIC_CLERK_JS_URL,
2626
clerkJSVersion: props.clerkJSVersion || process.env.NEXT_PUBLIC_CLERK_JS_VERSION,
2727
clerkUIUrl: props.clerkUIUrl || process.env.NEXT_PUBLIC_CLERK_UI_URL,
28+
clerkUIVersion: props.clerkUIVersion || process.env.NEXT_PUBLIC_CLERK_UI_VERSION,
2829
prefetchUI: getPrefetchUIFromEnvAndProps(props.prefetchUI),
2930
proxyUrl: props.proxyUrl || process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '',
3031
domain: props.domain || process.env.NEXT_PUBLIC_CLERK_DOMAIN || '',

packages/nuxt/src/module.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ export default defineNuxtModule<ModuleOptions>({
6969
jsUrl: options.clerkJSUrl,
7070
uiUrl: options.clerkUIUrl,
7171
clerkJSVersion: options.clerkJSVersion,
72+
clerkUIVersion: options.clerkUIVersion,
7273
// prefetchUI config: can be false or undefined
7374
prefetchUI: options.prefetchUI,
7475
isSatellite: options.isSatellite,

packages/react-router/src/client/ReactRouterClerkProvider.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ function ClerkProviderBase<TUi extends Ui = Ui>({ children, ...rest }: ClerkProv
6464
__clerkJSUrl,
6565
__clerkJSVersion,
6666
__clerkUIUrl,
67+
__clerkUIVersion,
6768
__prefetchUI,
6869
__telemetryDisabled,
6970
__telemetryDebug,
@@ -95,6 +96,7 @@ function ClerkProviderBase<TUi extends Ui = Ui>({ children, ...rest }: ClerkProv
9596
clerkJSUrl: __clerkJSUrl,
9697
clerkJSVersion: __clerkJSVersion,
9798
clerkUIUrl: __clerkUIUrl,
99+
clerkUIVersion: __clerkUIVersion,
98100
prefetchUI: __prefetchUI,
99101
telemetry: {
100102
disabled: __telemetryDisabled,

packages/react-router/src/client/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export type ClerkState = {
2121
__clerkJSUrl: string | undefined;
2222
__clerkJSVersion: string | undefined;
2323
__clerkUIUrl: string | undefined;
24+
__clerkUIVersion: string | undefined;
2425
__prefetchUI: boolean | undefined;
2526
__telemetryDisabled: boolean | undefined;
2627
__telemetryDebug: boolean | undefined;

packages/react-router/src/server/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ export function getResponseClerkState(requestState: RequestStateWithRedirectUrls
9898
__clerkJSUrl: envVars.clerkJsUrl,
9999
__clerkJSVersion: envVars.clerkJsVersion,
100100
__clerkUIUrl: envVars.clerkUIUrl,
101+
__clerkUIVersion: envVars.clerkUIVersion,
101102
__prefetchUI: envVars.prefetchUI,
102103
__telemetryDisabled: envVars.telemetryDisabled,
103104
__telemetryDebug: envVars.telemetryDebug,

0 commit comments

Comments
 (0)