Skip to content

feat(*): wire clerkUIVersion through all framework packages #7715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nikosdouvlis wants to merge 1 commit into from
Closed

feat(*): wire clerkUIVersion through all framework packages #7715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/astro/src/env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ interface InternalEnv {
readonly PUBLIC_CLERK_JS_URL?: string;
readonly PUBLIC_CLERK_JS_VERSION?: string;
readonly PUBLIC_CLERK_UI_URL?: string;
readonly PUBLIC_CLERK_UI_VERSION?: string;
readonly PUBLIC_CLERK_PREFETCH_UI?: string;
readonly CLERK_API_KEY?: string;
readonly CLERK_API_URL?: string;
Expand Down
3 changes: 3 additions & 0 deletions packages/astro/src/integration/create-integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
// These are not provided when the "bundled" integration is used
const clerkJSUrl = (params as any)?.clerkJSUrl as string | undefined;
const clerkJSVersion = (params as any)?.clerkJSVersion as string | undefined;
const clerkUIVersion = (params as any)?.clerkUIVersion as string | undefined;
const prefetchUI = (params as any)?.prefetchUI as boolean | undefined;

return {
Expand Down Expand Up @@ -57,6 +58,7 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
...buildEnvVarFromOption(domain, 'PUBLIC_CLERK_DOMAIN'),
...buildEnvVarFromOption(clerkJSUrl, 'PUBLIC_CLERK_JS_URL'),
...buildEnvVarFromOption(clerkJSVersion, 'PUBLIC_CLERK_JS_VERSION'),
...buildEnvVarFromOption(clerkUIVersion, 'PUBLIC_CLERK_UI_VERSION'),
...buildEnvVarFromOption(prefetchUI === false ? 'false' : undefined, 'PUBLIC_CLERK_PREFETCH_UI'),
},

Expand Down Expand Up @@ -167,6 +169,7 @@ function createClerkEnvSchema() {
PUBLIC_CLERK_JS_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_UI_VERSION: envField.string({ context: 'client', access: 'public', optional: 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
2 changes: 2 additions & 0 deletions packages/astro/src/internal/merge-env-vars-with-params.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const mergeEnvVarsWithParams = (params?: AstroClerkIntegrationParams & { publish
clerkJSUrl: paramClerkJSUrl,
clerkJSVersion: paramClerkJSVersion,
clerkUIUrl: paramClerkUiUrl,
clerkUIVersion: paramClerkUIVersion,
prefetchUI: paramPrefetchUI,
...rest
} = params || {};
Expand All @@ -51,6 +52,7 @@ const mergeEnvVarsWithParams = (params?: AstroClerkIntegrationParams & { publish
clerkJSUrl: paramClerkJSUrl || import.meta.env.PUBLIC_CLERK_JS_URL,
clerkJSVersion: paramClerkJSVersion || import.meta.env.PUBLIC_CLERK_JS_VERSION,
clerkUIUrl: paramClerkUiUrl || import.meta.env.PUBLIC_CLERK_UI_URL,
clerkUIVersion: paramClerkUIVersion || import.meta.env.PUBLIC_CLERK_UI_VERSION,
prefetchUI: mergePrefetchUIConfig(paramPrefetchUI),
telemetry: paramTelemetry || {
disabled: isTruthy(import.meta.env.PUBLIC_CLERK_TELEMETRY_DISABLED),
Expand Down
1 change: 1 addition & 0 deletions packages/astro/src/server/get-safe-env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ function getSafeEnv(context: ContextOrLocals) {
clerkJsUrl: getContextEnvVar('PUBLIC_CLERK_JS_URL', context),
clerkJsVersion: getContextEnvVar('PUBLIC_CLERK_JS_VERSION', context),
clerkUIUrl: getContextEnvVar('PUBLIC_CLERK_UI_URL', context),
clerkUIVersion: getContextEnvVar('PUBLIC_CLERK_UI_VERSION', context),
prefetchUI: getContextEnvVar('PUBLIC_CLERK_PREFETCH_UI', context) === 'false' ? false : undefined,
apiVersion: getContextEnvVar('CLERK_API_VERSION', context),
apiUrl: getContextEnvVar('CLERK_API_URL', context),
Expand Down
1 change: 1 addition & 0 deletions packages/express/src/utils.ts
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 } = useClerkNextOptions();
const { publishableKey, clerkJSUrl, clerkJSVersion, clerkUIUrl, clerkUIVersion, nonce, prefetchUI } =
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions packages/tanstack-react-start/src/client/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export type ClerkState = {
__clerk_debug: any;
__clerkJSUrl: string | undefined;
__clerkJSVersion: string | undefined;
__clerkUIUrl: string | undefined;
__clerkUIVersion: string | undefined;
__prefetchUI: boolean | undefined;
__telemetryDisabled: boolean | undefined;
__telemetryDebug: boolean | undefined;
Expand Down
6 changes: 6 additions & 0 deletions packages/tanstack-react-start/src/client/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export const pickFromClerkInitState = (
__signUpUrl,
__clerkJSUrl,
__clerkJSVersion,
__clerkUIUrl,
__clerkUIVersion,
__telemetryDisabled,
__telemetryDebug,
__signInForceRedirectUrl,
Expand All @@ -41,6 +43,8 @@ export const pickFromClerkInitState = (
signUpUrl: __signUpUrl,
clerkJSUrl: __clerkJSUrl,
clerkJSVersion: __clerkJSVersion,
clerkUIUrl: __clerkUIUrl,
clerkUIVersion: __clerkUIVersion,
prefetchUI: __prefetchUI,
telemetry: {
disabled: __telemetryDisabled,
Expand All @@ -66,6 +70,8 @@ export const mergeWithPublicEnvs = (restInitState: any) => {
signUpUrl: restInitState.signUpUrl || envVars.signUpUrl,
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
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions packages/tanstack-react-start/src/server/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ export function getResponseClerkState(requestState: RequestState, additionalStat
__clerk_debug: debugRequestState(requestState),
__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
View file
Open in desktop
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