chore(nextjs): Remove cyclic module dependency (#4689)

.changeset/moody-chicken-kneel.md

@@ -0,0 +1,2 @@
+---
+---

packages/nextjs/src/server/clerkClient.ts

@@ -1,41 +1,10 @@
-import { createClerkClient } from '@clerk/backend';
 import { constants } from '@clerk/backend/internal';
 
 import { buildRequestLike, isPrerenderingBailout } from '../app-router/server/utils';
-import { clerkMiddlewareRequestDataStorage } from './clerkMiddleware';
-import {
-  API_URL,
-  API_VERSION,
-  DOMAIN,
-  IS_SATELLITE,
-  PROXY_URL,
-  PUBLISHABLE_KEY,
-  SDK_METADATA,
-  SECRET_KEY,
-  TELEMETRY_DEBUG,
-  TELEMETRY_DISABLED,
-} from './constants';
+import { createClerkClientWithOptions } from './createClerkClient';
+import { clerkMiddlewareRequestDataStorage } from './middleware-storage';
 import { decryptClerkRequestData, getHeader } from './utils';
 
-const clerkClientDefaultOptions = {
-  secretKey: SECRET_KEY,
-  publishableKey: PUBLISHABLE_KEY,
-  apiUrl: API_URL,
-  apiVersion: API_VERSION,
-  userAgent: `${PACKAGE_NAME}@${PACKAGE_VERSION}`,
-  proxyUrl: PROXY_URL,
-  domain: DOMAIN,
-  isSatellite: IS_SATELLITE,
-  sdkMetadata: SDK_METADATA,
-  telemetry: {
-    disabled: TELEMETRY_DISABLED,
-    debug: TELEMETRY_DEBUG,
-  },
-};
-
-const createClerkClientWithOptions: typeof createClerkClient = options =>
-  createClerkClient({ ...clerkClientDefaultOptions, ...options });
-
 /**
  * Constructs a BAPI client that accesses request data within the runtime.
  * Necessary if middleware dynamic keys are used.

packages/nextjs/src/server/clerkMiddleware.ts

@@ -1,5 +1,3 @@
-import { AsyncLocalStorage } from 'node:async_hooks';
-
 import type { AuthObject, ClerkClient } from '@clerk/backend';
 import type { AuthenticateRequestOptions, ClerkRequest, RedirectFun, RequestState } from '@clerk/backend/internal';
 import { AuthStatus, constants, createClerkRequest, createRedirect } from '@clerk/backend/internal';
@@ -12,6 +10,7 @@ import { withLogger } from '../utils/debugLogger';
 import { clerkClient } from './clerkClient';
 import { PUBLISHABLE_KEY, SECRET_KEY, SIGN_IN_URL, SIGN_UP_URL } from './constants';
 import { errorThrower } from './errorThrower';
+import { clerkMiddlewareRequestDataStorage, clerkMiddlewareRequestDataStore } from './middleware-storage';
 import {
   isNextjsNotFoundError,
   isNextjsRedirectError,
@@ -80,9 +79,6 @@ interface ClerkMiddleware {
   (request: NextMiddlewareRequestParam, event: NextMiddlewareEvtParam): NextMiddlewareReturn;
 }
 
-const clerkMiddlewareRequestDataStore = new Map<'requestData', AuthenticateRequestOptions>();
-export const clerkMiddlewareRequestDataStorage = new AsyncLocalStorage<typeof clerkMiddlewareRequestDataStore>();
-
 // @ts-expect-error TS is not happy here. Will dig into it
 export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]) => {
   const [request, event] = parseRequestAndEvent(args);

packages/nextjs/src/server/createClerkClient.ts

@@ -0,0 +1,33 @@
+import { createClerkClient } from '@clerk/backend';
+
+import {
+  API_URL,
+  API_VERSION,
+  DOMAIN,
+  IS_SATELLITE,
+  PROXY_URL,
+  PUBLISHABLE_KEY,
+  SDK_METADATA,
+  SECRET_KEY,
+  TELEMETRY_DEBUG,
+  TELEMETRY_DISABLED,
+} from './constants';
+
+const clerkClientDefaultOptions = {
+  secretKey: SECRET_KEY,
+  publishableKey: PUBLISHABLE_KEY,
+  apiUrl: API_URL,
+  apiVersion: API_VERSION,
+  userAgent: `${PACKAGE_NAME}@${PACKAGE_VERSION}`,
+  proxyUrl: PROXY_URL,
+  domain: DOMAIN,
+  isSatellite: IS_SATELLITE,
+  sdkMetadata: SDK_METADATA,
+  telemetry: {
+    disabled: TELEMETRY_DISABLED,
+    debug: TELEMETRY_DEBUG,
+  },
+};
+
+export const createClerkClientWithOptions: typeof createClerkClient = options =>
+  createClerkClient({ ...clerkClientDefaultOptions, ...options });

packages/nextjs/src/server/middleware-storage.ts

@@ -0,0 +1,6 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+
+import type { AuthenticateRequestOptions } from '@clerk/backend/internal';
+
+export const clerkMiddlewareRequestDataStore = new Map<'requestData', AuthenticateRequestOptions>();
+export const clerkMiddlewareRequestDataStorage = new AsyncLocalStorage<typeof clerkMiddlewareRequestDataStore>();