fix(nextjs): Avoid calling safeParseClerkFile before checking if ke…

…yless is allowed (#4981)
clerk · Jan 23, 2025 · 9867924 · 9867924
1 parent 4f36624
commit 9867924
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/.changeset/weak-monkeys-approve.md b/.changeset/weak-monkeys-approve.md
@@ -0,0 +1,5 @@
+---
+'@clerk/nextjs': patch
+---
+
+Avoid calling `safeParseClerkFile` before checking if keyless is allowed.
diff --git a/packages/nextjs/src/app-router/server/ClerkProvider.tsx b/packages/nextjs/src/app-router/server/ClerkProvider.tsx
@@ -4,7 +4,6 @@ import React from 'react';
 
 import { PromisifiedAuthProvider } from '../../client-boundary/PromisifiedAuthProvider';
 import { getDynamicAuthData } from '../../server/buildClerkProps';
-import { safeParseClerkFile } from '../../server/keyless-node';
 import type { NextClerkProviderProps } from '../../types';
 import { canUseKeyless } from '../../utils/feature-flags';
 import { mergeNextClerkPropsWithEnv } from '../../utils/mergeNextClerkPropsWithEnv';
@@ -80,8 +79,16 @@ export async function ClerkProvider(
     </ClientClerkProvider>
   );
 
-  const runningWithClaimedKeys = propsWithEnvs.publishableKey === safeParseClerkFile()?.publishableKey;
-  const shouldRunAsKeyless = (!propsWithEnvs.publishableKey || runningWithClaimedKeys) && canUseKeyless;
+  let [shouldRunAsKeyless, runningWithClaimedKeys] = [false, false];
+  if (canUseKeyless) {
+    const locallyStorePublishableKey = await import('../../server/keyless-node.js')
+      .then(mod => mod.safeParseClerkFile()?.publishableKey)
+      .catch(() => undefined);
+
+    runningWithClaimedKeys =
+      Boolean(propsWithEnvs.publishableKey) && propsWithEnvs.publishableKey === locallyStorePublishableKey;
+    shouldRunAsKeyless = !propsWithEnvs.publishableKey || runningWithClaimedKeys;
+  }
 
   if (shouldRunAsKeyless) {
     // NOTE: Create or read keys on every render. Usually this means only on hard refresh or hard navigations.