fixup! chore(clerk-js): Simplify dev browser handling

clerk · Dec 14, 2023 · c16d653 · c16d653
1 parent a954168
commit c16d653
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/packages/clerk-js/src/core/devBrowser.ts b/packages/clerk-js/src/core/devBrowser.ts
@@ -44,6 +44,21 @@ export function createDevBrowser({ frontendApi, fapiClient }: CreateDevBrowserOp
       return;
     }
 
+    // 1. Set network interceptors to Pass dev
+    fapiClient.onBeforeRequest(request => {
+      const devBrowserJWT = getDevBrowserJWT();
+      if (devBrowserJWT && request?.url) {
+        request.url = setDevBrowserJWTInURL(request.url, devBrowserJWT, true);
+      }
+    });
+
+    fapiClient.onAfterResponse((_, response) => {
+      const newDevBrowserJWT = response?.headers?.get('Clerk-Db-Jwt');
+      if (newDevBrowserJWT) {
+        setDevBrowserJWT(newDevBrowserJWT);
+      }
+    });
+
     // 1. If a cookie already exists, it might have SameSite=Strict. Re-set it to make sure it has SameSite=Lax
     const existingDevBrowserCookie = getDevBrowserCookie();
     if (existingDevBrowserCookie) {
@@ -78,21 +93,6 @@ export function createDevBrowser({ frontendApi, fapiClient }: CreateDevBrowserOp
 
     const data = await resp.json();
     setDevBrowserJWT(data?.token);
-
-    fapiClient.onBeforeRequest(request => {
-      const devBrowserJWT = getDevBrowserJWT();
-      if (devBrowserJWT && request?.url) {
-        request.url = setDevBrowserJWTInURL(request.url, devBrowserJWT, true);
-      }
-    });
-
-    fapiClient.onAfterResponse((_, response) => {
-      // TODO: Rename header to Clerk-DB-JWT in FAPI
-      const newDevBrowserJWT = response?.headers?.get('Clerk-Cookie');
-      if (newDevBrowserJWT) {
-        setDevBrowserJWT(newDevBrowserJWT);
-      }
-    });
   }
 
   return {

diff --git a/packages/clerk-js/src/ui/customizables/parseVariables.ts b/packages/clerk-js/src/ui/customizables/parseVariables.ts
@@ -73,7 +73,7 @@ export const createFontSizeScale = (theme: Theme): Record<keyof typeof fontSizes
   return {
     xs: (numericValue * 0.6875).toString() + unit,
     sm: (numericValue * 0.75).toString() + unit,
-    md: (numericValue * 0.8125).toString() + unit,
+    md: (numericValue * 1).toString() + unit,
     lg: (numericValue * 1.0625).toString() + unit,
     xl: (numericValue * 1.5).toString() + unit,
   };

diff --git a/packages/nextjs/src/server/constants.ts b/packages/nextjs/src/server/constants.ts
@@ -2,7 +2,7 @@ import { apiUrlFromPublishableKey } from '@clerk/shared/apiUrlFromPublishableKey
 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 || '';
+export const CLERK_JS_URL = process.env.NEXT_PUBLIC_CLERK_JS_URL || '';
 export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
 export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
 export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';

diff --git a/packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts b/packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts
@@ -8,7 +8,7 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
   return {
     ...props,
     publishableKey: props.publishableKey || process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '',
-    clerkJSUrl: props.clerkJSUrl || process.env.NEXT_PUBLIC_CLERK_JS,
+    clerkJSUrl: props.clerkJSUrl || process.env.NEXT_PUBLIC_CLERK_JS_URL,
     clerkJSVersion: props.clerkJSVersion || process.env.NEXT_PUBLIC_CLERK_JS_VERSION,
     proxyUrl: props.proxyUrl || process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '',
     domain: props.domain || process.env.NEXT_PUBLIC_CLERK_DOMAIN || '',