Merged
5 changes: 5 additions & 0 deletions .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
7 changes: 7 additions & 0 deletions .changeset/unlucky-emus-greet.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/nextjs': minor
'@clerk/shared': minor
---

Add the `use client` directive in `@clerk/shared` to make the package compatible with an RSC environment.
Remove several helpers from `@clerk/nextjs` and import them from `@clerk/shared` instead.
23 changes: 6 additions & 17 deletions packages/nextjs/src/server/clerkClient.ts
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { Clerk } from '@clerk/backend';

/**
* @deprecated
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
export const API_KEY = process.env.CLERK_API_KEY || '';
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
import { API_KEY, API_URL, API_VERSION, DOMAIN, IS_SATELLITE, PROXY_URL, SECRET_KEY } from './constants';

const clerkClient = Clerk({
apiKey: API_KEY,
Expand All@@ -36,3 +20,8 @@ const createClerkClient = Clerk;
export { clerkClient, createClerkClient, Clerk };

export * from '@clerk/backend';

/**
* @deprecated Don't export the constants. Should be marked as internal
*/
export * from './constants';
34 changes: 34 additions & 0 deletions packages/nextjs/src/server/constants.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { deprecated } from '@clerk/shared';

/**
* @deprecated Use `CLERK_JS_VERSION` instead.
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
if (JS_VERSION) {
deprecated('CLERK_JS_VERSION', 'Use `NEXT_PUBLIC_CLERK_JS_VERSION` environment variable instead.');
}
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
/**
* @deprecated Use `CLERK_SECRET_KEY` instead.
*/
export const API_KEY = process.env.CLERK_API_KEY || '';
if (API_KEY) {
deprecated('CLERK_API_KEY', 'Use `CLERK_SECRET_KEY` environment variable instead.');
}
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
/**
* @deprecated Use `PUBLISHABLE_KEY` instead.
*/
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
if (FRONTEND_API) {
deprecated('NEXT_PUBLIC_CLERK_FRONTEND_API', 'Use `NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY` environment variable instead.');
}
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
27 changes: 1 addition & 26 deletions packages/nextjs/src/server/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { buildRequestUrl, constants } from '@clerk/backend';
import { handleValueOrFn, isHttpOrHttps } from '@clerk/shared';
Comment thread
dimkl marked this conversation as resolved.
import type { NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -147,32 +148,6 @@ export const injectSSRStateIntoObject = <O, T>(obj: O, authObject: T) => {
return { ...obj, __clerk_ssr_state };
};

// TODO: Use the same function defined in @clerk/shared once the package is tree shakeable
type VOrFnReturnsV<T> = T | undefined | ((v: URL) => T);

export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL): T | undefined;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue: T): T;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue?: unknown): unknown {
if (typeof value === 'function') {
return (value as (v: URL) => T)(url);
}

if (typeof value !== 'undefined') {
return value;
}

if (typeof defaultValue !== 'undefined') {
return defaultValue;
}

return undefined;
}

// TODO: use @clerk/shared once it is tree-shakeable
export function isHttpOrHttps(key: string | undefined) {
return /^http(s)?:\/\//.test(key || '');
}

export function isDevelopmentFromApiKey(apiKey: string): boolean {
return apiKey.startsWith('test_') || apiKey.startsWith('sk_test_');
}
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/src/server/withClerkMiddleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -36,6 +37,11 @@ export const withClerkMiddleware: WithClerkMiddleware = (...args: unknown[]) =>
const noop = () => undefined;
const [handler = noop, opts = {}] = args as [NextMiddleware, WithAuthOptions] | [];

deprecated(
'withClerkMiddleware',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

return async (req: NextRequest, event: NextFetchEvent) => {
const { isSatellite, domain, signInUrl, proxyUrl } = handleMultiDomainAndProxy(req, opts);

Expand Down
5 changes: 5 additions & 0 deletions packages/nextjs/src/ssr/withServerSideAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { ServerResponse } from 'http';
import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';

Expand DownExpand Up@@ -43,6 +44,10 @@ const decorateResponseWithObservabilityHeaders = (res: ServerResponse, requestSt
export const withServerSideAuth: WithServerSideAuth = (cbOrOptions: any, options?: any): any => {
const cb = typeof cbOrOptions === 'function' ? cbOrOptions : undefined;
const opts = (options ? options : typeof cbOrOptions !== 'function' ? cbOrOptions : {}) || {};
deprecated(
'withServerSideAuth',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

// Support both loadOrganization and the older loadOrg option without breaking changes
// TODO: Remove pre v5
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/hooks/clerk-swr.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
'use client';
export * from 'swr';
export { default as useSWR } from 'swr';
export { default as useSWRInfinite } from 'swr/infinite';
2 changes: 2 additions & 0 deletions packages/shared/src/hooks/usePagesOrInfinite.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
'use client';

import { useCallback, useMemo, useRef, useState } from 'react';

import { useSWR, useSWRInfinite } from './clerk-swr';
Expand Down
21 changes: 20 additions & 1 deletion turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,26 @@
"tsconfig.json",
"tsconfig.*.json"
],
"globalEnv": ["NODE_VERSION", "NPM_VERSION", "NODE_ENV", "VERCEL"],
"globalEnv": [
"NODE_VERSION",
"NPM_VERSION",
"NODE_ENV",
"VERCEL",
"CLERK_JS_VERSION",
"CLERK_API_URL",
"CLERK_API_VERSION",
"CLERK_API_KEY",
"CLERK_SECRET_KEY",
"NEXT_PUBLIC_CLERK_JS_VERSION",
"NEXT_PUBLIC_CLERK_JS",
"NEXT_PUBLIC_CLERK_FRONTEND_API",
"NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
"NEXT_PUBLIC_CLERK_DOMAIN",
"NEXT_PUBLIC_CLERK_PROXY_URL",
"NEXT_PUBLIC_CLERK_IS_SATELLITE",
"NEXT_PUBLIC_CLERK_SIGN_IN_URL",
"NEXT_PUBLIC_CLERK_SIGN_UP_URL"
],
"pipeline": {
"build": {
"dependsOn": ["^build"],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
5 changes: 5 additions & 0 deletions .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
7 changes: 7 additions & 0 deletions .changeset/unlucky-emus-greet.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/nextjs': minor
'@clerk/shared': minor
---

Add the `use client` directive in `@clerk/shared` to make the package compatible with an RSC environment.
Remove several helpers from `@clerk/nextjs` and import them from `@clerk/shared` instead.
23 changes: 6 additions & 17 deletions packages/nextjs/src/server/clerkClient.ts
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { Clerk } from '@clerk/backend';

/**
* @deprecated
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
export const API_KEY = process.env.CLERK_API_KEY || '';
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
import { API_KEY, API_URL, API_VERSION, DOMAIN, IS_SATELLITE, PROXY_URL, SECRET_KEY } from './constants';

const clerkClient = Clerk({
apiKey: API_KEY,
Expand All@@ -36,3 +20,8 @@ const createClerkClient = Clerk;
export { clerkClient, createClerkClient, Clerk };

export * from '@clerk/backend';

/**
* @deprecated Don't export the constants. Should be marked as internal
*/
export * from './constants';
34 changes: 34 additions & 0 deletions packages/nextjs/src/server/constants.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { deprecated } from '@clerk/shared';

/**
* @deprecated Use `CLERK_JS_VERSION` instead.
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
if (JS_VERSION) {
deprecated('CLERK_JS_VERSION', 'Use `NEXT_PUBLIC_CLERK_JS_VERSION` environment variable instead.');
}
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
/**
* @deprecated Use `CLERK_SECRET_KEY` instead.
*/
export const API_KEY = process.env.CLERK_API_KEY || '';
if (API_KEY) {
deprecated('CLERK_API_KEY', 'Use `CLERK_SECRET_KEY` environment variable instead.');
}
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
/**
* @deprecated Use `PUBLISHABLE_KEY` instead.
*/
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
if (FRONTEND_API) {
deprecated('NEXT_PUBLIC_CLERK_FRONTEND_API', 'Use `NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY` environment variable instead.');
}
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
27 changes: 1 addition & 26 deletions packages/nextjs/src/server/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { buildRequestUrl, constants } from '@clerk/backend';
import { handleValueOrFn, isHttpOrHttps } from '@clerk/shared';
Comment thread
dimkl marked this conversation as resolved.
import type { NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -147,32 +148,6 @@ export const injectSSRStateIntoObject = <O, T>(obj: O, authObject: T) => {
return { ...obj, __clerk_ssr_state };
};

// TODO: Use the same function defined in @clerk/shared once the package is tree shakeable
type VOrFnReturnsV<T> = T | undefined | ((v: URL) => T);

export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL): T | undefined;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue: T): T;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue?: unknown): unknown {
if (typeof value === 'function') {
return (value as (v: URL) => T)(url);
}

if (typeof value !== 'undefined') {
return value;
}

if (typeof defaultValue !== 'undefined') {
return defaultValue;
}

return undefined;
}

// TODO: use @clerk/shared once it is tree-shakeable
export function isHttpOrHttps(key: string | undefined) {
return /^http(s)?:\/\//.test(key || '');
}

export function isDevelopmentFromApiKey(apiKey: string): boolean {
return apiKey.startsWith('test_') || apiKey.startsWith('sk_test_');
}
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/src/server/withClerkMiddleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -36,6 +37,11 @@ export const withClerkMiddleware: WithClerkMiddleware = (...args: unknown[]) =>
const noop = () => undefined;
const [handler = noop, opts = {}] = args as [NextMiddleware, WithAuthOptions] | [];

deprecated(
'withClerkMiddleware',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

return async (req: NextRequest, event: NextFetchEvent) => {
const { isSatellite, domain, signInUrl, proxyUrl } = handleMultiDomainAndProxy(req, opts);

Expand Down
5 changes: 5 additions & 0 deletions packages/nextjs/src/ssr/withServerSideAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { ServerResponse } from 'http';
import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';

Expand DownExpand Up@@ -43,6 +44,10 @@ const decorateResponseWithObservabilityHeaders = (res: ServerResponse, requestSt
export const withServerSideAuth: WithServerSideAuth = (cbOrOptions: any, options?: any): any => {
const cb = typeof cbOrOptions === 'function' ? cbOrOptions : undefined;
const opts = (options ? options : typeof cbOrOptions !== 'function' ? cbOrOptions : {}) || {};
deprecated(
'withServerSideAuth',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

// Support both loadOrganization and the older loadOrg option without breaking changes
// TODO: Remove pre v5
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/hooks/clerk-swr.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
'use client';
export * from 'swr';
export { default as useSWR } from 'swr';
export { default as useSWRInfinite } from 'swr/infinite';
2 changes: 2 additions & 0 deletions packages/shared/src/hooks/usePagesOrInfinite.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
'use client';

import { useCallback, useMemo, useRef, useState } from 'react';

import { useSWR, useSWRInfinite } from './clerk-swr';
Expand Down
21 changes: 20 additions & 1 deletion turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,26 @@
"tsconfig.json",
"tsconfig.*.json"
],
"globalEnv": ["NODE_VERSION", "NPM_VERSION", "NODE_ENV", "VERCEL"],
"globalEnv": [
"NODE_VERSION",
"NPM_VERSION",
"NODE_ENV",
"VERCEL",
"CLERK_JS_VERSION",
"CLERK_API_URL",
"CLERK_API_VERSION",
"CLERK_API_KEY",
"CLERK_SECRET_KEY",
"NEXT_PUBLIC_CLERK_JS_VERSION",
"NEXT_PUBLIC_CLERK_JS",
"NEXT_PUBLIC_CLERK_FRONTEND_API",
"NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
"NEXT_PUBLIC_CLERK_DOMAIN",
"NEXT_PUBLIC_CLERK_PROXY_URL",
"NEXT_PUBLIC_CLERK_IS_SATELLITE",
"NEXT_PUBLIC_CLERK_SIGN_IN_URL",
"NEXT_PUBLIC_CLERK_SIGN_UP_URL"
],
"pipeline": {
"build": {
"dependsOn": ["^build"],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
5 changes: 5 additions & 0 deletions .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
7 changes: 7 additions & 0 deletions .changeset/unlucky-emus-greet.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/nextjs': minor
'@clerk/shared': minor
---

Add the `use client` directive in `@clerk/shared` to make the package compatible with an RSC environment.
Remove several helpers from `@clerk/nextjs` and import them from `@clerk/shared` instead.
23 changes: 6 additions & 17 deletions packages/nextjs/src/server/clerkClient.ts
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { Clerk } from '@clerk/backend';

/**
* @deprecated
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
export const API_KEY = process.env.CLERK_API_KEY || '';
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
import { API_KEY, API_URL, API_VERSION, DOMAIN, IS_SATELLITE, PROXY_URL, SECRET_KEY } from './constants';

const clerkClient = Clerk({
apiKey: API_KEY,
Expand All@@ -36,3 +20,8 @@ const createClerkClient = Clerk;
export { clerkClient, createClerkClient, Clerk };

export * from '@clerk/backend';

/**
* @deprecated Don't export the constants. Should be marked as internal
*/
export * from './constants';
34 changes: 34 additions & 0 deletions packages/nextjs/src/server/constants.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { deprecated } from '@clerk/shared';

/**
* @deprecated Use `CLERK_JS_VERSION` instead.
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
if (JS_VERSION) {
deprecated('CLERK_JS_VERSION', 'Use `NEXT_PUBLIC_CLERK_JS_VERSION` environment variable instead.');
}
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
/**
* @deprecated Use `CLERK_SECRET_KEY` instead.
*/
export const API_KEY = process.env.CLERK_API_KEY || '';
if (API_KEY) {
deprecated('CLERK_API_KEY', 'Use `CLERK_SECRET_KEY` environment variable instead.');
}
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
/**
* @deprecated Use `PUBLISHABLE_KEY` instead.
*/
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
if (FRONTEND_API) {
deprecated('NEXT_PUBLIC_CLERK_FRONTEND_API', 'Use `NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY` environment variable instead.');
}
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
27 changes: 1 addition & 26 deletions packages/nextjs/src/server/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { buildRequestUrl, constants } from '@clerk/backend';
import { handleValueOrFn, isHttpOrHttps } from '@clerk/shared';
Comment thread
dimkl marked this conversation as resolved.
import type { NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -147,32 +148,6 @@ export const injectSSRStateIntoObject = <O, T>(obj: O, authObject: T) => {
return { ...obj, __clerk_ssr_state };
};

// TODO: Use the same function defined in @clerk/shared once the package is tree shakeable
type VOrFnReturnsV<T> = T | undefined | ((v: URL) => T);

export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL): T | undefined;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue: T): T;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue?: unknown): unknown {
if (typeof value === 'function') {
return (value as (v: URL) => T)(url);
}

if (typeof value !== 'undefined') {
return value;
}

if (typeof defaultValue !== 'undefined') {
return defaultValue;
}

return undefined;
}

// TODO: use @clerk/shared once it is tree-shakeable
export function isHttpOrHttps(key: string | undefined) {
return /^http(s)?:\/\//.test(key || '');
}

export function isDevelopmentFromApiKey(apiKey: string): boolean {
return apiKey.startsWith('test_') || apiKey.startsWith('sk_test_');
}
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/src/server/withClerkMiddleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -36,6 +37,11 @@ export const withClerkMiddleware: WithClerkMiddleware = (...args: unknown[]) =>
const noop = () => undefined;
const [handler = noop, opts = {}] = args as [NextMiddleware, WithAuthOptions] | [];

deprecated(
'withClerkMiddleware',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

return async (req: NextRequest, event: NextFetchEvent) => {
const { isSatellite, domain, signInUrl, proxyUrl } = handleMultiDomainAndProxy(req, opts);

Expand Down
5 changes: 5 additions & 0 deletions packages/nextjs/src/ssr/withServerSideAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { ServerResponse } from 'http';
import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';

Expand DownExpand Up@@ -43,6 +44,10 @@ const decorateResponseWithObservabilityHeaders = (res: ServerResponse, requestSt
export const withServerSideAuth: WithServerSideAuth = (cbOrOptions: any, options?: any): any => {
const cb = typeof cbOrOptions === 'function' ? cbOrOptions : undefined;
const opts = (options ? options : typeof cbOrOptions !== 'function' ? cbOrOptions : {}) || {};
deprecated(
'withServerSideAuth',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

// Support both loadOrganization and the older loadOrg option without breaking changes
// TODO: Remove pre v5
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/hooks/clerk-swr.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
'use client';
export * from 'swr';
export { default as useSWR } from 'swr';
export { default as useSWRInfinite } from 'swr/infinite';
2 changes: 2 additions & 0 deletions packages/shared/src/hooks/usePagesOrInfinite.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
'use client';

import { useCallback, useMemo, useRef, useState } from 'react';

import { useSWR, useSWRInfinite } from './clerk-swr';
Expand Down
21 changes: 20 additions & 1 deletion turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,26 @@
"tsconfig.json",
"tsconfig.*.json"
],
"globalEnv": ["NODE_VERSION", "NPM_VERSION", "NODE_ENV", "VERCEL"],
"globalEnv": [
"NODE_VERSION",
"NPM_VERSION",
"NODE_ENV",
"VERCEL",
"CLERK_JS_VERSION",
"CLERK_API_URL",
"CLERK_API_VERSION",
"CLERK_API_KEY",
"CLERK_SECRET_KEY",
"NEXT_PUBLIC_CLERK_JS_VERSION",
"NEXT_PUBLIC_CLERK_JS",
"NEXT_PUBLIC_CLERK_FRONTEND_API",
"NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
"NEXT_PUBLIC_CLERK_DOMAIN",
"NEXT_PUBLIC_CLERK_PROXY_URL",
"NEXT_PUBLIC_CLERK_IS_SATELLITE",
"NEXT_PUBLIC_CLERK_SIGN_IN_URL",
"NEXT_PUBLIC_CLERK_SIGN_UP_URL"
],
"pipeline": {
"build": {
"dependsOn": ["^build"],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
5 changes: 5 additions & 0 deletions .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
7 changes: 7 additions & 0 deletions .changeset/unlucky-emus-greet.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/nextjs': minor
'@clerk/shared': minor
---

Add the `use client` directive in `@clerk/shared` to make the package compatible with an RSC environment.
Remove several helpers from `@clerk/nextjs` and import them from `@clerk/shared` instead.
23 changes: 6 additions & 17 deletions packages/nextjs/src/server/clerkClient.ts
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { Clerk } from '@clerk/backend';

/**
* @deprecated
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
export const API_KEY = process.env.CLERK_API_KEY || '';
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
import { API_KEY, API_URL, API_VERSION, DOMAIN, IS_SATELLITE, PROXY_URL, SECRET_KEY } from './constants';

const clerkClient = Clerk({
apiKey: API_KEY,
Expand All@@ -36,3 +20,8 @@ const createClerkClient = Clerk;
export { clerkClient, createClerkClient, Clerk };

export * from '@clerk/backend';

/**
* @deprecated Don't export the constants. Should be marked as internal
*/
export * from './constants';
34 changes: 34 additions & 0 deletions packages/nextjs/src/server/constants.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { deprecated } from '@clerk/shared';

/**
* @deprecated Use `CLERK_JS_VERSION` instead.
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
if (JS_VERSION) {
deprecated('CLERK_JS_VERSION', 'Use `NEXT_PUBLIC_CLERK_JS_VERSION` environment variable instead.');
}
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
/**
* @deprecated Use `CLERK_SECRET_KEY` instead.
*/
export const API_KEY = process.env.CLERK_API_KEY || '';
if (API_KEY) {
deprecated('CLERK_API_KEY', 'Use `CLERK_SECRET_KEY` environment variable instead.');
}
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
/**
* @deprecated Use `PUBLISHABLE_KEY` instead.
*/
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
if (FRONTEND_API) {
deprecated('NEXT_PUBLIC_CLERK_FRONTEND_API', 'Use `NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY` environment variable instead.');
}
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
27 changes: 1 addition & 26 deletions packages/nextjs/src/server/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { buildRequestUrl, constants } from '@clerk/backend';
import { handleValueOrFn, isHttpOrHttps } from '@clerk/shared';
Comment thread
dimkl marked this conversation as resolved.
import type { NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -147,32 +148,6 @@ export const injectSSRStateIntoObject = <O, T>(obj: O, authObject: T) => {
return { ...obj, __clerk_ssr_state };
};

// TODO: Use the same function defined in @clerk/shared once the package is tree shakeable
type VOrFnReturnsV<T> = T | undefined | ((v: URL) => T);

export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL): T | undefined;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue: T): T;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue?: unknown): unknown {
if (typeof value === 'function') {
return (value as (v: URL) => T)(url);
}

if (typeof value !== 'undefined') {
return value;
}

if (typeof defaultValue !== 'undefined') {
return defaultValue;
}

return undefined;
}

// TODO: use @clerk/shared once it is tree-shakeable
export function isHttpOrHttps(key: string | undefined) {
return /^http(s)?:\/\//.test(key || '');
}

export function isDevelopmentFromApiKey(apiKey: string): boolean {
return apiKey.startsWith('test_') || apiKey.startsWith('sk_test_');
}
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/src/server/withClerkMiddleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -36,6 +37,11 @@ export const withClerkMiddleware: WithClerkMiddleware = (...args: unknown[]) =>
const noop = () => undefined;
const [handler = noop, opts = {}] = args as [NextMiddleware, WithAuthOptions] | [];

deprecated(
'withClerkMiddleware',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

return async (req: NextRequest, event: NextFetchEvent) => {
const { isSatellite, domain, signInUrl, proxyUrl } = handleMultiDomainAndProxy(req, opts);

Expand Down
5 changes: 5 additions & 0 deletions packages/nextjs/src/ssr/withServerSideAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { ServerResponse } from 'http';
import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';

Expand DownExpand Up@@ -43,6 +44,10 @@ const decorateResponseWithObservabilityHeaders = (res: ServerResponse, requestSt
export const withServerSideAuth: WithServerSideAuth = (cbOrOptions: any, options?: any): any => {
const cb = typeof cbOrOptions === 'function' ? cbOrOptions : undefined;
const opts = (options ? options : typeof cbOrOptions !== 'function' ? cbOrOptions : {}) || {};
deprecated(
'withServerSideAuth',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

// Support both loadOrganization and the older loadOrg option without breaking changes
// TODO: Remove pre v5
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/hooks/clerk-swr.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
'use client';
export * from 'swr';
export { default as useSWR } from 'swr';
export { default as useSWRInfinite } from 'swr/infinite';
2 changes: 2 additions & 0 deletions packages/shared/src/hooks/usePagesOrInfinite.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
'use client';

import { useCallback, useMemo, useRef, useState } from 'react';

import { useSWR, useSWRInfinite } from './clerk-swr';
Expand Down
21 changes: 20 additions & 1 deletion turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,26 @@
"tsconfig.json",
"tsconfig.*.json"
],
"globalEnv": ["NODE_VERSION", "NPM_VERSION", "NODE_ENV", "VERCEL"],
"globalEnv": [
"NODE_VERSION",
"NPM_VERSION",
"NODE_ENV",
"VERCEL",
"CLERK_JS_VERSION",
"CLERK_API_URL",
"CLERK_API_VERSION",
"CLERK_API_KEY",
"CLERK_SECRET_KEY",
"NEXT_PUBLIC_CLERK_JS_VERSION",
"NEXT_PUBLIC_CLERK_JS",
"NEXT_PUBLIC_CLERK_FRONTEND_API",
"NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
"NEXT_PUBLIC_CLERK_DOMAIN",
"NEXT_PUBLIC_CLERK_PROXY_URL",
"NEXT_PUBLIC_CLERK_IS_SATELLITE",
"NEXT_PUBLIC_CLERK_SIGN_IN_URL",
"NEXT_PUBLIC_CLERK_SIGN_UP_URL"
],
"pipeline": {
"build": {
"dependsOn": ["^build"],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
5 changes: 5 additions & 0 deletions .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
7 changes: 7 additions & 0 deletions .changeset/unlucky-emus-greet.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/nextjs': minor
'@clerk/shared': minor
---

Add the `use client` directive in `@clerk/shared` to make the package compatible with an RSC environment.
Remove several helpers from `@clerk/nextjs` and import them from `@clerk/shared` instead.
23 changes: 6 additions & 17 deletions packages/nextjs/src/server/clerkClient.ts
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { Clerk } from '@clerk/backend';

/**
* @deprecated
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
export const API_KEY = process.env.CLERK_API_KEY || '';
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
import { API_KEY, API_URL, API_VERSION, DOMAIN, IS_SATELLITE, PROXY_URL, SECRET_KEY } from './constants';

const clerkClient = Clerk({
apiKey: API_KEY,
Expand All@@ -36,3 +20,8 @@ const createClerkClient = Clerk;
export { clerkClient, createClerkClient, Clerk };

export * from '@clerk/backend';

/**
* @deprecated Don't export the constants. Should be marked as internal
*/
export * from './constants';
34 changes: 34 additions & 0 deletions packages/nextjs/src/server/constants.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { deprecated } from '@clerk/shared';

/**
* @deprecated Use `CLERK_JS_VERSION` instead.
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
if (JS_VERSION) {
deprecated('CLERK_JS_VERSION', 'Use `NEXT_PUBLIC_CLERK_JS_VERSION` environment variable instead.');
}
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
/**
* @deprecated Use `CLERK_SECRET_KEY` instead.
*/
export const API_KEY = process.env.CLERK_API_KEY || '';
if (API_KEY) {
deprecated('CLERK_API_KEY', 'Use `CLERK_SECRET_KEY` environment variable instead.');
}
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
/**
* @deprecated Use `PUBLISHABLE_KEY` instead.
*/
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
if (FRONTEND_API) {
deprecated('NEXT_PUBLIC_CLERK_FRONTEND_API', 'Use `NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY` environment variable instead.');
}
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
27 changes: 1 addition & 26 deletions packages/nextjs/src/server/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { buildRequestUrl, constants } from '@clerk/backend';
import { handleValueOrFn, isHttpOrHttps } from '@clerk/shared';
Comment thread
dimkl marked this conversation as resolved.
import type { NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -147,32 +148,6 @@ export const injectSSRStateIntoObject = <O, T>(obj: O, authObject: T) => {
return { ...obj, __clerk_ssr_state };
};

// TODO: Use the same function defined in @clerk/shared once the package is tree shakeable
type VOrFnReturnsV<T> = T | undefined | ((v: URL) => T);

export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL): T | undefined;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue: T): T;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue?: unknown): unknown {
if (typeof value === 'function') {
return (value as (v: URL) => T)(url);
}

if (typeof value !== 'undefined') {
return value;
}

if (typeof defaultValue !== 'undefined') {
return defaultValue;
}

return undefined;
}

// TODO: use @clerk/shared once it is tree-shakeable
export function isHttpOrHttps(key: string | undefined) {
return /^http(s)?:\/\//.test(key || '');
}

export function isDevelopmentFromApiKey(apiKey: string): boolean {
return apiKey.startsWith('test_') || apiKey.startsWith('sk_test_');
}
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/src/server/withClerkMiddleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -36,6 +37,11 @@ export const withClerkMiddleware: WithClerkMiddleware = (...args: unknown[]) =>
const noop = () => undefined;
const [handler = noop, opts = {}] = args as [NextMiddleware, WithAuthOptions] | [];

deprecated(
'withClerkMiddleware',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

return async (req: NextRequest, event: NextFetchEvent) => {
const { isSatellite, domain, signInUrl, proxyUrl } = handleMultiDomainAndProxy(req, opts);

Expand Down
5 changes: 5 additions & 0 deletions packages/nextjs/src/ssr/withServerSideAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { ServerResponse } from 'http';
import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';

Expand DownExpand Up@@ -43,6 +44,10 @@ const decorateResponseWithObservabilityHeaders = (res: ServerResponse, requestSt
export const withServerSideAuth: WithServerSideAuth = (cbOrOptions: any, options?: any): any => {
const cb = typeof cbOrOptions === 'function' ? cbOrOptions : undefined;
const opts = (options ? options : typeof cbOrOptions !== 'function' ? cbOrOptions : {}) || {};
deprecated(
'withServerSideAuth',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

// Support both loadOrganization and the older loadOrg option without breaking changes
// TODO: Remove pre v5
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/hooks/clerk-swr.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
'use client';
export * from 'swr';
export { default as useSWR } from 'swr';
export { default as useSWRInfinite } from 'swr/infinite';
2 changes: 2 additions & 0 deletions packages/shared/src/hooks/usePagesOrInfinite.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
'use client';

import { useCallback, useMemo, useRef, useState } from 'react';

import { useSWR, useSWRInfinite } from './clerk-swr';
Expand Down
21 changes: 20 additions & 1 deletion turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,26 @@
"tsconfig.json",
"tsconfig.*.json"
],
"globalEnv": ["NODE_VERSION", "NPM_VERSION", "NODE_ENV", "VERCEL"],
"globalEnv": [
"NODE_VERSION",
"NPM_VERSION",
"NODE_ENV",
"VERCEL",
"CLERK_JS_VERSION",
"CLERK_API_URL",
"CLERK_API_VERSION",
"CLERK_API_KEY",
"CLERK_SECRET_KEY",
"NEXT_PUBLIC_CLERK_JS_VERSION",
"NEXT_PUBLIC_CLERK_JS",
"NEXT_PUBLIC_CLERK_FRONTEND_API",
"NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
"NEXT_PUBLIC_CLERK_DOMAIN",
"NEXT_PUBLIC_CLERK_PROXY_URL",
"NEXT_PUBLIC_CLERK_IS_SATELLITE",
"NEXT_PUBLIC_CLERK_SIGN_IN_URL",
"NEXT_PUBLIC_CLERK_SIGN_UP_URL"
],
"pipeline": {
"build": {
"dependsOn": ["^build"],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
5 changes: 5 additions & 0 deletions .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
7 changes: 7 additions & 0 deletions .changeset/unlucky-emus-greet.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/nextjs': minor
'@clerk/shared': minor
---

Add the `use client` directive in `@clerk/shared` to make the package compatible with an RSC environment.
Remove several helpers from `@clerk/nextjs` and import them from `@clerk/shared` instead.
23 changes: 6 additions & 17 deletions packages/nextjs/src/server/clerkClient.ts
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { Clerk } from '@clerk/backend';

/**
* @deprecated
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
export const API_KEY = process.env.CLERK_API_KEY || '';
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
import { API_KEY, API_URL, API_VERSION, DOMAIN, IS_SATELLITE, PROXY_URL, SECRET_KEY } from './constants';

const clerkClient = Clerk({
apiKey: API_KEY,
Expand All@@ -36,3 +20,8 @@ const createClerkClient = Clerk;
export { clerkClient, createClerkClient, Clerk };

export * from '@clerk/backend';

/**
* @deprecated Don't export the constants. Should be marked as internal
*/
export * from './constants';
34 changes: 34 additions & 0 deletions packages/nextjs/src/server/constants.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { deprecated } from '@clerk/shared';

/**
* @deprecated Use `CLERK_JS_VERSION` instead.
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
if (JS_VERSION) {
deprecated('CLERK_JS_VERSION', 'Use `NEXT_PUBLIC_CLERK_JS_VERSION` environment variable instead.');
}
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
/**
* @deprecated Use `CLERK_SECRET_KEY` instead.
*/
export const API_KEY = process.env.CLERK_API_KEY || '';
if (API_KEY) {
deprecated('CLERK_API_KEY', 'Use `CLERK_SECRET_KEY` environment variable instead.');
}
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
/**
* @deprecated Use `PUBLISHABLE_KEY` instead.
*/
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
if (FRONTEND_API) {
deprecated('NEXT_PUBLIC_CLERK_FRONTEND_API', 'Use `NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY` environment variable instead.');
}
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
27 changes: 1 addition & 26 deletions packages/nextjs/src/server/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { buildRequestUrl, constants } from '@clerk/backend';
import { handleValueOrFn, isHttpOrHttps } from '@clerk/shared';
Comment thread
dimkl marked this conversation as resolved.
import type { NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -147,32 +148,6 @@ export const injectSSRStateIntoObject = <O, T>(obj: O, authObject: T) => {
return { ...obj, __clerk_ssr_state };
};

// TODO: Use the same function defined in @clerk/shared once the package is tree shakeable
type VOrFnReturnsV<T> = T | undefined | ((v: URL) => T);

export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL): T | undefined;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue: T): T;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue?: unknown): unknown {
if (typeof value === 'function') {
return (value as (v: URL) => T)(url);
}

if (typeof value !== 'undefined') {
return value;
}

if (typeof defaultValue !== 'undefined') {
return defaultValue;
}

return undefined;
}

// TODO: use @clerk/shared once it is tree-shakeable
export function isHttpOrHttps(key: string | undefined) {
return /^http(s)?:\/\//.test(key || '');
}

export function isDevelopmentFromApiKey(apiKey: string): boolean {
return apiKey.startsWith('test_') || apiKey.startsWith('sk_test_');
}
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/src/server/withClerkMiddleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -36,6 +37,11 @@ export const withClerkMiddleware: WithClerkMiddleware = (...args: unknown[]) =>
const noop = () => undefined;
const [handler = noop, opts = {}] = args as [NextMiddleware, WithAuthOptions] | [];

deprecated(
'withClerkMiddleware',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

return async (req: NextRequest, event: NextFetchEvent) => {
const { isSatellite, domain, signInUrl, proxyUrl } = handleMultiDomainAndProxy(req, opts);

Expand Down
5 changes: 5 additions & 0 deletions packages/nextjs/src/ssr/withServerSideAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { ServerResponse } from 'http';
import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';

Expand DownExpand Up@@ -43,6 +44,10 @@ const decorateResponseWithObservabilityHeaders = (res: ServerResponse, requestSt
export const withServerSideAuth: WithServerSideAuth = (cbOrOptions: any, options?: any): any => {
const cb = typeof cbOrOptions === 'function' ? cbOrOptions : undefined;
const opts = (options ? options : typeof cbOrOptions !== 'function' ? cbOrOptions : {}) || {};
deprecated(
'withServerSideAuth',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

// Support both loadOrganization and the older loadOrg option without breaking changes
// TODO: Remove pre v5
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/hooks/clerk-swr.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
'use client';
export * from 'swr';
export { default as useSWR } from 'swr';
export { default as useSWRInfinite } from 'swr/infinite';
2 changes: 2 additions & 0 deletions packages/shared/src/hooks/usePagesOrInfinite.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
'use client';

import { useCallback, useMemo, useRef, useState } from 'react';

import { useSWR, useSWRInfinite } from './clerk-swr';
Expand Down
21 changes: 20 additions & 1 deletion turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,26 @@
"tsconfig.json",
"tsconfig.*.json"
],
"globalEnv": ["NODE_VERSION", "NPM_VERSION", "NODE_ENV", "VERCEL"],
"globalEnv": [
"NODE_VERSION",
"NPM_VERSION",
"NODE_ENV",
"VERCEL",
"CLERK_JS_VERSION",
"CLERK_API_URL",
"CLERK_API_VERSION",
"CLERK_API_KEY",
"CLERK_SECRET_KEY",
"NEXT_PUBLIC_CLERK_JS_VERSION",
"NEXT_PUBLIC_CLERK_JS",
"NEXT_PUBLIC_CLERK_FRONTEND_API",
"NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
"NEXT_PUBLIC_CLERK_DOMAIN",
"NEXT_PUBLIC_CLERK_PROXY_URL",
"NEXT_PUBLIC_CLERK_IS_SATELLITE",
"NEXT_PUBLIC_CLERK_SIGN_IN_URL",
"NEXT_PUBLIC_CLERK_SIGN_UP_URL"
],
"pipeline": {
"build": {
"dependsOn": ["^build"],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
5 changes: 5 additions & 0 deletions .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
7 changes: 7 additions & 0 deletions .changeset/unlucky-emus-greet.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/nextjs': minor
'@clerk/shared': minor
---

Add the `use client` directive in `@clerk/shared` to make the package compatible with an RSC environment.
Remove several helpers from `@clerk/nextjs` and import them from `@clerk/shared` instead.
23 changes: 6 additions & 17 deletions packages/nextjs/src/server/clerkClient.ts
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { Clerk } from '@clerk/backend';

/**
* @deprecated
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
export const API_KEY = process.env.CLERK_API_KEY || '';
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
import { API_KEY, API_URL, API_VERSION, DOMAIN, IS_SATELLITE, PROXY_URL, SECRET_KEY } from './constants';

const clerkClient = Clerk({
apiKey: API_KEY,
Expand All@@ -36,3 +20,8 @@ const createClerkClient = Clerk;
export { clerkClient, createClerkClient, Clerk };

export * from '@clerk/backend';

/**
* @deprecated Don't export the constants. Should be marked as internal
*/
export * from './constants';
34 changes: 34 additions & 0 deletions packages/nextjs/src/server/constants.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { deprecated } from '@clerk/shared';

/**
* @deprecated Use `CLERK_JS_VERSION` instead.
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
if (JS_VERSION) {
deprecated('CLERK_JS_VERSION', 'Use `NEXT_PUBLIC_CLERK_JS_VERSION` environment variable instead.');
}
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
/**
* @deprecated Use `CLERK_SECRET_KEY` instead.
*/
export const API_KEY = process.env.CLERK_API_KEY || '';
if (API_KEY) {
deprecated('CLERK_API_KEY', 'Use `CLERK_SECRET_KEY` environment variable instead.');
}
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
/**
* @deprecated Use `PUBLISHABLE_KEY` instead.
*/
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
if (FRONTEND_API) {
deprecated('NEXT_PUBLIC_CLERK_FRONTEND_API', 'Use `NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY` environment variable instead.');
}
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
27 changes: 1 addition & 26 deletions packages/nextjs/src/server/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { buildRequestUrl, constants } from '@clerk/backend';
import { handleValueOrFn, isHttpOrHttps } from '@clerk/shared';
Comment thread
dimkl marked this conversation as resolved.
import type { NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -147,32 +148,6 @@ export const injectSSRStateIntoObject = <O, T>(obj: O, authObject: T) => {
return { ...obj, __clerk_ssr_state };
};

// TODO: Use the same function defined in @clerk/shared once the package is tree shakeable
type VOrFnReturnsV<T> = T | undefined | ((v: URL) => T);

export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL): T | undefined;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue: T): T;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue?: unknown): unknown {
if (typeof value === 'function') {
return (value as (v: URL) => T)(url);
}

if (typeof value !== 'undefined') {
return value;
}

if (typeof defaultValue !== 'undefined') {
return defaultValue;
}

return undefined;
}

// TODO: use @clerk/shared once it is tree-shakeable
export function isHttpOrHttps(key: string | undefined) {
return /^http(s)?:\/\//.test(key || '');
}

export function isDevelopmentFromApiKey(apiKey: string): boolean {
return apiKey.startsWith('test_') || apiKey.startsWith('sk_test_');
}
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/src/server/withClerkMiddleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -36,6 +37,11 @@ export const withClerkMiddleware: WithClerkMiddleware = (...args: unknown[]) =>
const noop = () => undefined;
const [handler = noop, opts = {}] = args as [NextMiddleware, WithAuthOptions] | [];

deprecated(
'withClerkMiddleware',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

return async (req: NextRequest, event: NextFetchEvent) => {
const { isSatellite, domain, signInUrl, proxyUrl } = handleMultiDomainAndProxy(req, opts);

Expand Down
5 changes: 5 additions & 0 deletions packages/nextjs/src/ssr/withServerSideAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { ServerResponse } from 'http';
import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';

Expand DownExpand Up@@ -43,6 +44,10 @@ const decorateResponseWithObservabilityHeaders = (res: ServerResponse, requestSt
export const withServerSideAuth: WithServerSideAuth = (cbOrOptions: any, options?: any): any => {
const cb = typeof cbOrOptions === 'function' ? cbOrOptions : undefined;
const opts = (options ? options : typeof cbOrOptions !== 'function' ? cbOrOptions : {}) || {};
deprecated(
'withServerSideAuth',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

// Support both loadOrganization and the older loadOrg option without breaking changes
// TODO: Remove pre v5
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/hooks/clerk-swr.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
'use client';
export * from 'swr';
export { default as useSWR } from 'swr';
export { default as useSWRInfinite } from 'swr/infinite';
2 changes: 2 additions & 0 deletions packages/shared/src/hooks/usePagesOrInfinite.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
'use client';

import { useCallback, useMemo, useRef, useState } from 'react';

import { useSWR, useSWRInfinite } from './clerk-swr';
Expand Down
21 changes: 20 additions & 1 deletion turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,26 @@
"tsconfig.json",
"tsconfig.*.json"
],
"globalEnv": ["NODE_VERSION", "NPM_VERSION", "NODE_ENV", "VERCEL"],
"globalEnv": [
"NODE_VERSION",
"NPM_VERSION",
"NODE_ENV",
"VERCEL",
"CLERK_JS_VERSION",
"CLERK_API_URL",
"CLERK_API_VERSION",
"CLERK_API_KEY",
"CLERK_SECRET_KEY",
"NEXT_PUBLIC_CLERK_JS_VERSION",
"NEXT_PUBLIC_CLERK_JS",
"NEXT_PUBLIC_CLERK_FRONTEND_API",
"NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
"NEXT_PUBLIC_CLERK_DOMAIN",
"NEXT_PUBLIC_CLERK_PROXY_URL",
"NEXT_PUBLIC_CLERK_IS_SATELLITE",
"NEXT_PUBLIC_CLERK_SIGN_IN_URL",
"NEXT_PUBLIC_CLERK_SIGN_UP_URL"
],
"pipeline": {
"build": {
"dependsOn": ["^build"],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
5 changes: 5 additions & 0 deletions .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
7 changes: 7 additions & 0 deletions .changeset/unlucky-emus-greet.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/nextjs': minor
'@clerk/shared': minor
---

Add the `use client` directive in `@clerk/shared` to make the package compatible with an RSC environment.
Remove several helpers from `@clerk/nextjs` and import them from `@clerk/shared` instead.
23 changes: 6 additions & 17 deletions packages/nextjs/src/server/clerkClient.ts
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
/* eslint-disable turbo/no-undeclared-env-vars */
import { Clerk } from '@clerk/backend';

/**
* @deprecated
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
export const API_KEY = process.env.CLERK_API_KEY || '';
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
import { API_KEY, API_URL, API_VERSION, DOMAIN, IS_SATELLITE, PROXY_URL, SECRET_KEY } from './constants';

const clerkClient = Clerk({
apiKey: API_KEY,
Expand All@@ -36,3 +20,8 @@ const createClerkClient = Clerk;
export { clerkClient, createClerkClient, Clerk };

export * from '@clerk/backend';

/**
* @deprecated Don't export the constants. Should be marked as internal
*/
export * from './constants';
34 changes: 34 additions & 0 deletions packages/nextjs/src/server/constants.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
import { deprecated } from '@clerk/shared';

/**
* @deprecated Use `CLERK_JS_VERSION` instead.
*/
export const JS_VERSION = process.env.CLERK_JS_VERSION || '';
if (JS_VERSION) {
deprecated('CLERK_JS_VERSION', 'Use `NEXT_PUBLIC_CLERK_JS_VERSION` environment variable instead.');
}
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 API_URL = process.env.CLERK_API_URL || 'https://api.clerk.dev';
export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
/**
* @deprecated Use `CLERK_SECRET_KEY` instead.
*/
export const API_KEY = process.env.CLERK_API_KEY || '';
if (API_KEY) {
deprecated('CLERK_API_KEY', 'Use `CLERK_SECRET_KEY` environment variable instead.');
}
export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
/**
* @deprecated Use `PUBLISHABLE_KEY` instead.
*/
export const FRONTEND_API = process.env.NEXT_PUBLIC_CLERK_FRONTEND_API || '';
if (FRONTEND_API) {
deprecated('NEXT_PUBLIC_CLERK_FRONTEND_API', 'Use `NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY` environment variable instead.');
}
export const PUBLISHABLE_KEY = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY || '';
export const DOMAIN = process.env.NEXT_PUBLIC_CLERK_DOMAIN || '';
export const PROXY_URL = process.env.NEXT_PUBLIC_CLERK_PROXY_URL || '';
export const IS_SATELLITE = process.env.NEXT_PUBLIC_CLERK_IS_SATELLITE === 'true' || false;
export const SIGN_IN_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL || '';
export const SIGN_UP_URL = process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '';
27 changes: 1 addition & 26 deletions packages/nextjs/src/server/utils.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { buildRequestUrl, constants } from '@clerk/backend';
import { handleValueOrFn, isHttpOrHttps } from '@clerk/shared';
Comment thread
dimkl marked this conversation as resolved.
import type { NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -147,32 +148,6 @@ export const injectSSRStateIntoObject = <O, T>(obj: O, authObject: T) => {
return { ...obj, __clerk_ssr_state };
};

// TODO: Use the same function defined in @clerk/shared once the package is tree shakeable
type VOrFnReturnsV<T> = T | undefined | ((v: URL) => T);

export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL): T | undefined;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue: T): T;
export function handleValueOrFn<T>(value: VOrFnReturnsV<T>, url: URL, defaultValue?: unknown): unknown {
if (typeof value === 'function') {
return (value as (v: URL) => T)(url);
}

if (typeof value !== 'undefined') {
return value;
}

if (typeof defaultValue !== 'undefined') {
return defaultValue;
}

return undefined;
}

// TODO: use @clerk/shared once it is tree-shakeable
export function isHttpOrHttps(key: string | undefined) {
return /^http(s)?:\/\//.test(key || '');
}

export function isDevelopmentFromApiKey(apiKey: string): boolean {
return apiKey.startsWith('test_') || apiKey.startsWith('sk_test_');
}
Expand Down
6 changes: 6 additions & 0 deletions packages/nextjs/src/server/withClerkMiddleware.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

Expand DownExpand Up@@ -36,6 +37,11 @@ export const withClerkMiddleware: WithClerkMiddleware = (...args: unknown[]) =>
const noop = () => undefined;
const [handler = noop, opts = {}] = args as [NextMiddleware, WithAuthOptions] | [];

deprecated(
'withClerkMiddleware',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

return async (req: NextRequest, event: NextFetchEvent) => {
const { isSatellite, domain, signInUrl, proxyUrl } = handleMultiDomainAndProxy(req, opts);

Expand Down
5 changes: 5 additions & 0 deletions packages/nextjs/src/ssr/withServerSideAuth.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { RequestState } from '@clerk/backend';
import { constants, debugRequestState } from '@clerk/backend';
import { deprecated } from '@clerk/shared';
import type { ServerResponse } from 'http';
import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';

Expand DownExpand Up@@ -43,6 +44,10 @@ const decorateResponseWithObservabilityHeaders = (res: ServerResponse, requestSt
export const withServerSideAuth: WithServerSideAuth = (cbOrOptions: any, options?: any): any => {
const cb = typeof cbOrOptions === 'function' ? cbOrOptions : undefined;
const opts = (options ? options : typeof cbOrOptions !== 'function' ? cbOrOptions : {}) || {};
deprecated(
'withServerSideAuth',
'Use `authMiddleware` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

// Support both loadOrganization and the older loadOrg option without breaking changes
// TODO: Remove pre v5
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/hooks/clerk-swr.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
'use client';
export * from 'swr';
export { default as useSWR } from 'swr';
export { default as useSWRInfinite } from 'swr/infinite';
2 changes: 2 additions & 0 deletions packages/shared/src/hooks/usePagesOrInfinite.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
'use client';

import { useCallback, useMemo, useRef, useState } from 'react';

import { useSWR, useSWRInfinite } from './clerk-swr';
Expand Down
21 changes: 20 additions & 1 deletion turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,26 @@
"tsconfig.json",
"tsconfig.*.json"
],
"globalEnv": ["NODE_VERSION", "NPM_VERSION", "NODE_ENV", "VERCEL"],
"globalEnv": [
"NODE_VERSION",
"NPM_VERSION",
"NODE_ENV",
"VERCEL",
"CLERK_JS_VERSION",
"CLERK_API_URL",
"CLERK_API_VERSION",
"CLERK_API_KEY",
"CLERK_SECRET_KEY",
"NEXT_PUBLIC_CLERK_JS_VERSION",
"NEXT_PUBLIC_CLERK_JS",
"NEXT_PUBLIC_CLERK_FRONTEND_API",
"NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
"NEXT_PUBLIC_CLERK_DOMAIN",
"NEXT_PUBLIC_CLERK_PROXY_URL",
"NEXT_PUBLIC_CLERK_IS_SATELLITE",
"NEXT_PUBLIC_CLERK_SIGN_IN_URL",
"NEXT_PUBLIC_CLERK_SIGN_UP_URL"
],
"pipeline": {
"build": {
"dependsOn": ["^build"],
Expand Down