chore(nextjs): Add deprecation warning for app-beta subpath export#1829

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
dimkl merged 3 commits into from
Oct 6, 2023
Merged

chore(nextjs): Add deprecation warning for app-beta subpath export #1829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
946a397
chore(nextjs): Warn about `@clerk/nextjs/app-beta` deprecation
dimkl Oct 4, 2023
0a3f977
chore(nextjs): Add deprecation JSDoc for @clerk/nextjs/app-beta
dimkl Oct 4, 2023
78eb66f
Create stupid-jeans-flash.md
dimkl Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/stupid-jeans-flash.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": patch
---

Add deprecation warning for `@clerk/nextjs/app-beta` export. Use the `@clerk/nextjs` instead.
10 changes: 10 additions & 0 deletions packages/nextjs/src/app-beta/ClerkProvider.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
import { deprecated } from '@clerk/shared';

deprecated(
'@clerk/nextjs/app-beta',
'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
/* eslint-disable turbo/no-undeclared-env-vars */
import type { IsomorphicClerkOptions } from '@clerk/clerk-react';
import type { InitialState, PublishableKeyOrFrontendApi } from '@clerk/types';
Expand All@@ -11,6 +17,10 @@ type NextAppClerkProviderProps = {
} & Omit<IsomorphicClerkOptions, keyof PublishableKeyOrFrontendApi> &
Partial<PublishableKeyOrFrontendApi>;

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export function ClerkProvider(props: NextAppClerkProviderProps) {
const state = (initialState()?.__clerk_ssr_state || { sessionId: null, orgId: null, userId: null }) as InitialState;
return (
Expand Down
15 changes: 15 additions & 0 deletions packages/nextjs/src/app-beta/auth.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
import { deprecated } from '@clerk/shared';

deprecated(
'@clerk/nextjs/app-beta',
'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import { headers } from 'next/headers';
import { NextRequest } from 'next/server';

Expand All@@ -7,10 +14,18 @@ const buildRequestLike = () => {
return new NextRequest('https://placeholder.com', { headers: headers() });
};

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const auth = () => {
return getAuth(buildRequestLike());
};

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const initialState = () => {
return buildClerkProps(buildRequestLike());
};
14 changes: 13 additions & 1 deletion packages/nextjs/src/app-beta/clerkClient.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
export { clerkClient } from '../server/clerkClient';
import { deprecated } from '@clerk/shared';

deprecated(
'@clerk/nextjs/app-beta',
'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { clerkClient as _clerkClient } from '../server/clerkClient';

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const clerkClient = _clerkClient;
14 changes: 14 additions & 0 deletions packages/nextjs/src/app-beta/client/ClerkProvider.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
'use client';
import { deprecated } from '@clerk/shared';

deprecated(
'@clerk/nextjs/app-beta',
'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
// !!! Note the import from react
import type { ClerkProviderProps } from '@clerk/clerk-react';
import { ClerkProvider as ReactClerkProvider } from '@clerk/clerk-react';
Expand All@@ -12,6 +18,10 @@ declare global {
}
}

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useAwaitableNavigate = () => {
// eslint-disable-next-line @typescript-eslint/unbound-method
const { push, refresh } = useRouter();
Expand DownExpand Up@@ -43,6 +53,10 @@ export const useAwaitableNavigate = () => {
}, []);
};

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export function ClerkProvider(props: ClerkProviderProps) {
const navigate = useAwaitableNavigate();
return (
Expand Down
132 changes: 132 additions & 0 deletions packages/nextjs/src/app-beta/client/clerk-react.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
// HACK to show app-beta deprecation warning any of the below
// There seems to be some issue when adding the deprecation in the index.ts
import {
AuthenticateWithRedirectCallback as _AuthenticateWithRedirectCallback,
ClerkLoaded as _ClerkLoaded,
ClerkLoading as _ClerkLoading,
RedirectToCreateOrganization as _RedirectToCreateOrganization,
RedirectToOrganizationProfile as _RedirectToOrganizationProfile,
RedirectToSignIn as _RedirectToSignIn,
RedirectToSignUp as _RedirectToSignUp,
RedirectToUserProfile as _RedirectToUserProfile,
SignedIn as _SignedIn,
SignedOut as _SignedOut,
useAuth as _useAuth,
useClerk as _useClerk,
useMagicLink as _useMagicLink,
useOrganization as _useOrganization,
useOrganizationList as _useOrganizationList,
useOrganizations as _useOrganizations,
useSession as _useSession,
useSessionList as _useSessionList,
useSignIn as _useSignIn,
useSignUp as _useSignUp,
useUser as _useUser,
} from '@clerk/clerk-react';

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useUser = _useUser;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useAuth = _useAuth;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useClerk = _useClerk;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useMagicLink = _useMagicLink;

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useOrganization = _useOrganization;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useOrganizationList = _useOrganizationList;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useOrganizations = _useOrganizations;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useSession = _useSession;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useSessionList = _useSessionList;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useSignIn = _useSignIn;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const useSignUp = _useSignUp;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const SignedIn = _SignedIn;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const SignedOut = _SignedOut;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const ClerkLoaded = _ClerkLoaded;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const ClerkLoading = _ClerkLoading;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const RedirectToUserProfile = _RedirectToUserProfile;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const RedirectToSignIn = _RedirectToSignIn;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const RedirectToSignUp = _RedirectToSignUp;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const RedirectToCreateOrganization = _RedirectToCreateOrganization;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const RedirectToOrganizationProfile = _RedirectToOrganizationProfile;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const AuthenticateWithRedirectCallback = _AuthenticateWithRedirectCallback;
2 changes: 1 addition & 1 deletion packages/nextjs/src/app-beta/client/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ export {
RedirectToCreateOrganization,
RedirectToOrganizationProfile,
AuthenticateWithRedirectCallback,
} from '@clerk/clerk-react';
} from './clerk-react';

export {
SignIn,
Expand Down
58 changes: 50 additions & 8 deletions packages/nextjs/src/app-beta/client/ui-components.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,53 @@
'use client';
import { deprecated } from '@clerk/shared';

export {
CreateOrganization,
OrganizationProfile,
OrganizationSwitcher,
SignIn,
SignUp,
UserButton,
UserProfile,
deprecated(
'@clerk/nextjs/app-beta',
'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import {
CreateOrganization as _CreateOrganization,
OrganizationProfile as _OrganizationProfile,
OrganizationSwitcher as _OrganizationSwitcher,
SignIn as _SignIn,
SignUp as _SignUp,
UserButton as _UserButton,
UserProfile as _UserProfile,
} from '@clerk/clerk-react';

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const CreateOrganization = _CreateOrganization;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const OrganizationProfile = _OrganizationProfile;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const OrganizationSwitcher = _OrganizationSwitcher;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const SignIn = _SignIn;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const SignUp = _SignUp;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const UserButton = _UserButton;
/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export const UserProfile = _UserProfile;
13 changes: 13 additions & 0 deletions packages/nextjs/src/app-beta/control-components.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
import { deprecated } from '@clerk/shared';
import React from 'react';

deprecated(
'@clerk/nextjs/app-beta',
'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export function SignedIn(props: React.PropsWithChildren) {
const { children } = props;
const { userId } = auth();
return userId ? <>{children}</> : null;
}

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export function SignedOut(props: React.PropsWithChildren) {
const { children } = props;
const { userId } = auth();
Expand Down
9 changes: 9 additions & 0 deletions packages/nextjs/src/app-beta/currentUser.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
import type { User } from '@clerk/backend';
import { deprecated } from '@clerk/shared';

deprecated(
'@clerk/nextjs/app-beta',
'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';
import { clerkClient } from './clerkClient';

/**
* @deprecated Use imports from `@clerk/nextjs` instead.
* For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
*/
export async function currentUser(): Promise<User | null> {
const { userId } = auth();
return userId ? clerkClient.users.getUser(userId) : null;
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/src/app-router/server/currentUser.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { User } from '@clerk/backend';
import { clerkClient } from '../../server/clerkClient';
import { auth } from './auth';

// eslint-disable-next-line @typescript-eslint/require-await
export async function currentUser(): Promise<User | null> {
const { userId } = auth();
return userId ? clerkClient.users.getUser(userId) : null;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
chore(nextjs): Add deprecation warning for app-beta subpath export#1829

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 3 commits into

from

Oct 6, 2023
 Merged


chore(nextjs): Add deprecation warning for app-beta subpath export
#1829
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
946a397

chore(nextjs): Warn about `@clerk/nextjs/app-beta` deprecation


dimkl Oct 4, 2023
0a3f977

chore(nextjs): Add deprecation JSDoc for @clerk/nextjs/app-beta


dimkl Oct 4, 2023
78eb66f

Create stupid-jeans-flash.md


dimkl Oct 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/stupid-jeans-flash.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": patch
---

Add deprecation warning for `@clerk/nextjs/app-beta` export. Use the `@clerk/nextjs` instead.

10 changes: 10 additions & 0 deletions
packages/nextjs/src/app-beta/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
/* eslint-disable turbo/no-undeclared-env-vars */
import type { IsomorphicClerkOptions } from '@clerk/clerk-react';
import type { InitialState, PublishableKeyOrFrontendApi } from '@clerk/types';
Expand All@@ -11,6 +17,10 @@ type NextAppClerkProviderProps = {
} & Omit<IsomorphicClerkOptions, keyof PublishableKeyOrFrontendApi> &
 Partial<PublishableKeyOrFrontendApi>;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: NextAppClerkProviderProps) {
 const state = (initialState()?.__clerk_ssr_state || { sessionId: null, orgId: null, userId: null }) as InitialState;
 return (
Expand Down

15 changes: 15 additions & 0 deletions
packages/nextjs/src/app-beta/auth.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import { headers } from 'next/headers';
import { NextRequest } from 'next/server';

Expand All@@ -7,10 +14,18 @@ const buildRequestLike = () => {
 return new NextRequest('https://placeholder.com', { headers: headers() });
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const auth = () => {
 return getAuth(buildRequestLike());
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const initialState = () => {
 return buildClerkProps(buildRequestLike());
};

14 changes: 13 additions & 1 deletion
packages/nextjs/src/app-beta/clerkClient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
export { clerkClient } from '../server/clerkClient';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { clerkClient as _clerkClient } from '../server/clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const clerkClient = _clerkClient;

14 changes: 14 additions & 0 deletions
packages/nextjs/src/app-beta/client/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
'use client';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
// !!! Note the import from react
import type { ClerkProviderProps } from '@clerk/clerk-react';
import { ClerkProvider as ReactClerkProvider } from '@clerk/clerk-react';
Expand All@@ -12,6 +18,10 @@ declare global {
 }
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAwaitableNavigate = () => {
 // eslint-disable-next-line @typescript-eslint/unbound-method
 const { push, refresh } = useRouter();
Expand DownExpand Up@@ -43,6 +53,10 @@ export const useAwaitableNavigate = () => {
 }, []);
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: ClerkProviderProps) {
 const navigate = useAwaitableNavigate();
 return (
Expand Down

132 changes: 132 additions & 0 deletions
packages/nextjs/src/app-beta/client/clerk-react.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
// HACK to show app-beta deprecation warning any of the below
// There seems to be some issue when adding the deprecation in the index.ts
import {
 AuthenticateWithRedirectCallback as _AuthenticateWithRedirectCallback,
 ClerkLoaded as _ClerkLoaded,
 ClerkLoading as _ClerkLoading,
 RedirectToCreateOrganization as _RedirectToCreateOrganization,
 RedirectToOrganizationProfile as _RedirectToOrganizationProfile,
 RedirectToSignIn as _RedirectToSignIn,
 RedirectToSignUp as _RedirectToSignUp,
 RedirectToUserProfile as _RedirectToUserProfile,
 SignedIn as _SignedIn,
 SignedOut as _SignedOut,
 useAuth as _useAuth,
 useClerk as _useClerk,
 useMagicLink as _useMagicLink,
 useOrganization as _useOrganization,
 useOrganizationList as _useOrganizationList,
 useOrganizations as _useOrganizations,
 useSession as _useSession,
 useSessionList as _useSessionList,
 useSignIn as _useSignIn,
 useSignUp as _useSignUp,
 useUser as _useUser,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useUser = _useUser;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAuth = _useAuth;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useClerk = _useClerk;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useMagicLink = _useMagicLink;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganization = _useOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizationList = _useOrganizationList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizations = _useOrganizations;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSession = _useSession;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSessionList = _useSessionList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignIn = _useSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignUp = _useSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedIn = _SignedIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedOut = _SignedOut;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoaded = _ClerkLoaded;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoading = _ClerkLoading;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToUserProfile = _RedirectToUserProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignIn = _RedirectToSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignUp = _RedirectToSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToCreateOrganization = _RedirectToCreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToOrganizationProfile = _RedirectToOrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const AuthenticateWithRedirectCallback = _AuthenticateWithRedirectCallback;

2 changes: 1 addition & 1 deletion
packages/nextjs/src/app-beta/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ export {
 RedirectToCreateOrganization,
 RedirectToOrganizationProfile,
 AuthenticateWithRedirectCallback,
} from '@clerk/clerk-react';
} from './clerk-react';

export {
 SignIn,
Expand Down

58 changes: 50 additions & 8 deletions
packages/nextjs/src/app-beta/client/ui-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,53 @@
'use client';
import { deprecated } from '@clerk/shared';

export {
 CreateOrganization,
 OrganizationProfile,
 OrganizationSwitcher,
 SignIn,
 SignUp,
 UserButton,
 UserProfile,
deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import {
 CreateOrganization as _CreateOrganization,
 OrganizationProfile as _OrganizationProfile,
 OrganizationSwitcher as _OrganizationSwitcher,
 SignIn as _SignIn,
 SignUp as _SignUp,
 UserButton as _UserButton,
 UserProfile as _UserProfile,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const CreateOrganization = _CreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationProfile = _OrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationSwitcher = _OrganizationSwitcher;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignIn = _SignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignUp = _SignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserButton = _UserButton;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserProfile = _UserProfile;

13 changes: 13 additions & 0 deletions
packages/nextjs/src/app-beta/control-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
import { deprecated } from '@clerk/shared';
import React from 'react';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedIn(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
 return userId ? <>{children}</> : null;
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedOut(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/app-beta/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
import type { User } from '@clerk/backend';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';
import { clerkClient } from './clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

1 change: 1 addition & 0 deletions
packages/nextjs/src/app-router/server/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { User } from '@clerk/backend';
import { clerkClient } from '../../server/clerkClient';
import { auth } from './auth';

// eslint-disable-next-line @typescript-eslint/require-await
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(nextjs): Add deprecation warning for app-beta subpath export#1829

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 3 commits into

from

Oct 6, 2023
 Merged


chore(nextjs): Add deprecation warning for app-beta subpath export
#1829
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
946a397

chore(nextjs): Warn about `@clerk/nextjs/app-beta` deprecation


dimkl Oct 4, 2023
0a3f977

chore(nextjs): Add deprecation JSDoc for @clerk/nextjs/app-beta


dimkl Oct 4, 2023
78eb66f

Create stupid-jeans-flash.md


dimkl Oct 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/stupid-jeans-flash.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": patch
---

Add deprecation warning for `@clerk/nextjs/app-beta` export. Use the `@clerk/nextjs` instead.

10 changes: 10 additions & 0 deletions
packages/nextjs/src/app-beta/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
/* eslint-disable turbo/no-undeclared-env-vars */
import type { IsomorphicClerkOptions } from '@clerk/clerk-react';
import type { InitialState, PublishableKeyOrFrontendApi } from '@clerk/types';
Expand All@@ -11,6 +17,10 @@ type NextAppClerkProviderProps = {
} & Omit<IsomorphicClerkOptions, keyof PublishableKeyOrFrontendApi> &
 Partial<PublishableKeyOrFrontendApi>;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: NextAppClerkProviderProps) {
 const state = (initialState()?.__clerk_ssr_state || { sessionId: null, orgId: null, userId: null }) as InitialState;
 return (
Expand Down

15 changes: 15 additions & 0 deletions
packages/nextjs/src/app-beta/auth.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import { headers } from 'next/headers';
import { NextRequest } from 'next/server';

Expand All@@ -7,10 +14,18 @@ const buildRequestLike = () => {
 return new NextRequest('https://placeholder.com', { headers: headers() });
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const auth = () => {
 return getAuth(buildRequestLike());
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const initialState = () => {
 return buildClerkProps(buildRequestLike());
};

14 changes: 13 additions & 1 deletion
packages/nextjs/src/app-beta/clerkClient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
export { clerkClient } from '../server/clerkClient';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { clerkClient as _clerkClient } from '../server/clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const clerkClient = _clerkClient;

14 changes: 14 additions & 0 deletions
packages/nextjs/src/app-beta/client/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
'use client';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
// !!! Note the import from react
import type { ClerkProviderProps } from '@clerk/clerk-react';
import { ClerkProvider as ReactClerkProvider } from '@clerk/clerk-react';
Expand All@@ -12,6 +18,10 @@ declare global {
 }
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAwaitableNavigate = () => {
 // eslint-disable-next-line @typescript-eslint/unbound-method
 const { push, refresh } = useRouter();
Expand DownExpand Up@@ -43,6 +53,10 @@ export const useAwaitableNavigate = () => {
 }, []);
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: ClerkProviderProps) {
 const navigate = useAwaitableNavigate();
 return (
Expand Down

132 changes: 132 additions & 0 deletions
packages/nextjs/src/app-beta/client/clerk-react.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
// HACK to show app-beta deprecation warning any of the below
// There seems to be some issue when adding the deprecation in the index.ts
import {
 AuthenticateWithRedirectCallback as _AuthenticateWithRedirectCallback,
 ClerkLoaded as _ClerkLoaded,
 ClerkLoading as _ClerkLoading,
 RedirectToCreateOrganization as _RedirectToCreateOrganization,
 RedirectToOrganizationProfile as _RedirectToOrganizationProfile,
 RedirectToSignIn as _RedirectToSignIn,
 RedirectToSignUp as _RedirectToSignUp,
 RedirectToUserProfile as _RedirectToUserProfile,
 SignedIn as _SignedIn,
 SignedOut as _SignedOut,
 useAuth as _useAuth,
 useClerk as _useClerk,
 useMagicLink as _useMagicLink,
 useOrganization as _useOrganization,
 useOrganizationList as _useOrganizationList,
 useOrganizations as _useOrganizations,
 useSession as _useSession,
 useSessionList as _useSessionList,
 useSignIn as _useSignIn,
 useSignUp as _useSignUp,
 useUser as _useUser,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useUser = _useUser;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAuth = _useAuth;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useClerk = _useClerk;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useMagicLink = _useMagicLink;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganization = _useOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizationList = _useOrganizationList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizations = _useOrganizations;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSession = _useSession;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSessionList = _useSessionList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignIn = _useSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignUp = _useSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedIn = _SignedIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedOut = _SignedOut;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoaded = _ClerkLoaded;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoading = _ClerkLoading;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToUserProfile = _RedirectToUserProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignIn = _RedirectToSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignUp = _RedirectToSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToCreateOrganization = _RedirectToCreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToOrganizationProfile = _RedirectToOrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const AuthenticateWithRedirectCallback = _AuthenticateWithRedirectCallback;

2 changes: 1 addition & 1 deletion
packages/nextjs/src/app-beta/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ export {
 RedirectToCreateOrganization,
 RedirectToOrganizationProfile,
 AuthenticateWithRedirectCallback,
} from '@clerk/clerk-react';
} from './clerk-react';

export {
 SignIn,
Expand Down

58 changes: 50 additions & 8 deletions
packages/nextjs/src/app-beta/client/ui-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,53 @@
'use client';
import { deprecated } from '@clerk/shared';

export {
 CreateOrganization,
 OrganizationProfile,
 OrganizationSwitcher,
 SignIn,
 SignUp,
 UserButton,
 UserProfile,
deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import {
 CreateOrganization as _CreateOrganization,
 OrganizationProfile as _OrganizationProfile,
 OrganizationSwitcher as _OrganizationSwitcher,
 SignIn as _SignIn,
 SignUp as _SignUp,
 UserButton as _UserButton,
 UserProfile as _UserProfile,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const CreateOrganization = _CreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationProfile = _OrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationSwitcher = _OrganizationSwitcher;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignIn = _SignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignUp = _SignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserButton = _UserButton;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserProfile = _UserProfile;

13 changes: 13 additions & 0 deletions
packages/nextjs/src/app-beta/control-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
import { deprecated } from '@clerk/shared';
import React from 'react';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedIn(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
 return userId ? <>{children}</> : null;
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedOut(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/app-beta/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
import type { User } from '@clerk/backend';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';
import { clerkClient } from './clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

1 change: 1 addition & 0 deletions
packages/nextjs/src/app-router/server/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { User } from '@clerk/backend';
import { clerkClient } from '../../server/clerkClient';
import { auth } from './auth';

// eslint-disable-next-line @typescript-eslint/require-await
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(nextjs): Add deprecation warning for app-beta subpath export#1829

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 3 commits into

from

Oct 6, 2023
 Merged


chore(nextjs): Add deprecation warning for app-beta subpath export
#1829
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
946a397

chore(nextjs): Warn about `@clerk/nextjs/app-beta` deprecation


dimkl Oct 4, 2023
0a3f977

chore(nextjs): Add deprecation JSDoc for @clerk/nextjs/app-beta


dimkl Oct 4, 2023
78eb66f

Create stupid-jeans-flash.md


dimkl Oct 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/stupid-jeans-flash.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": patch
---

Add deprecation warning for `@clerk/nextjs/app-beta` export. Use the `@clerk/nextjs` instead.

10 changes: 10 additions & 0 deletions
packages/nextjs/src/app-beta/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
/* eslint-disable turbo/no-undeclared-env-vars */
import type { IsomorphicClerkOptions } from '@clerk/clerk-react';
import type { InitialState, PublishableKeyOrFrontendApi } from '@clerk/types';
Expand All@@ -11,6 +17,10 @@ type NextAppClerkProviderProps = {
} & Omit<IsomorphicClerkOptions, keyof PublishableKeyOrFrontendApi> &
 Partial<PublishableKeyOrFrontendApi>;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: NextAppClerkProviderProps) {
 const state = (initialState()?.__clerk_ssr_state || { sessionId: null, orgId: null, userId: null }) as InitialState;
 return (
Expand Down

15 changes: 15 additions & 0 deletions
packages/nextjs/src/app-beta/auth.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import { headers } from 'next/headers';
import { NextRequest } from 'next/server';

Expand All@@ -7,10 +14,18 @@ const buildRequestLike = () => {
 return new NextRequest('https://placeholder.com', { headers: headers() });
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const auth = () => {
 return getAuth(buildRequestLike());
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const initialState = () => {
 return buildClerkProps(buildRequestLike());
};

14 changes: 13 additions & 1 deletion
packages/nextjs/src/app-beta/clerkClient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
export { clerkClient } from '../server/clerkClient';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { clerkClient as _clerkClient } from '../server/clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const clerkClient = _clerkClient;

14 changes: 14 additions & 0 deletions
packages/nextjs/src/app-beta/client/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
'use client';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
// !!! Note the import from react
import type { ClerkProviderProps } from '@clerk/clerk-react';
import { ClerkProvider as ReactClerkProvider } from '@clerk/clerk-react';
Expand All@@ -12,6 +18,10 @@ declare global {
 }
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAwaitableNavigate = () => {
 // eslint-disable-next-line @typescript-eslint/unbound-method
 const { push, refresh } = useRouter();
Expand DownExpand Up@@ -43,6 +53,10 @@ export const useAwaitableNavigate = () => {
 }, []);
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: ClerkProviderProps) {
 const navigate = useAwaitableNavigate();
 return (
Expand Down

132 changes: 132 additions & 0 deletions
packages/nextjs/src/app-beta/client/clerk-react.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
// HACK to show app-beta deprecation warning any of the below
// There seems to be some issue when adding the deprecation in the index.ts
import {
 AuthenticateWithRedirectCallback as _AuthenticateWithRedirectCallback,
 ClerkLoaded as _ClerkLoaded,
 ClerkLoading as _ClerkLoading,
 RedirectToCreateOrganization as _RedirectToCreateOrganization,
 RedirectToOrganizationProfile as _RedirectToOrganizationProfile,
 RedirectToSignIn as _RedirectToSignIn,
 RedirectToSignUp as _RedirectToSignUp,
 RedirectToUserProfile as _RedirectToUserProfile,
 SignedIn as _SignedIn,
 SignedOut as _SignedOut,
 useAuth as _useAuth,
 useClerk as _useClerk,
 useMagicLink as _useMagicLink,
 useOrganization as _useOrganization,
 useOrganizationList as _useOrganizationList,
 useOrganizations as _useOrganizations,
 useSession as _useSession,
 useSessionList as _useSessionList,
 useSignIn as _useSignIn,
 useSignUp as _useSignUp,
 useUser as _useUser,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useUser = _useUser;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAuth = _useAuth;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useClerk = _useClerk;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useMagicLink = _useMagicLink;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganization = _useOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizationList = _useOrganizationList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizations = _useOrganizations;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSession = _useSession;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSessionList = _useSessionList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignIn = _useSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignUp = _useSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedIn = _SignedIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedOut = _SignedOut;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoaded = _ClerkLoaded;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoading = _ClerkLoading;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToUserProfile = _RedirectToUserProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignIn = _RedirectToSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignUp = _RedirectToSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToCreateOrganization = _RedirectToCreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToOrganizationProfile = _RedirectToOrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const AuthenticateWithRedirectCallback = _AuthenticateWithRedirectCallback;

2 changes: 1 addition & 1 deletion
packages/nextjs/src/app-beta/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ export {
 RedirectToCreateOrganization,
 RedirectToOrganizationProfile,
 AuthenticateWithRedirectCallback,
} from '@clerk/clerk-react';
} from './clerk-react';

export {
 SignIn,
Expand Down

58 changes: 50 additions & 8 deletions
packages/nextjs/src/app-beta/client/ui-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,53 @@
'use client';
import { deprecated } from '@clerk/shared';

export {
 CreateOrganization,
 OrganizationProfile,
 OrganizationSwitcher,
 SignIn,
 SignUp,
 UserButton,
 UserProfile,
deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import {
 CreateOrganization as _CreateOrganization,
 OrganizationProfile as _OrganizationProfile,
 OrganizationSwitcher as _OrganizationSwitcher,
 SignIn as _SignIn,
 SignUp as _SignUp,
 UserButton as _UserButton,
 UserProfile as _UserProfile,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const CreateOrganization = _CreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationProfile = _OrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationSwitcher = _OrganizationSwitcher;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignIn = _SignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignUp = _SignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserButton = _UserButton;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserProfile = _UserProfile;

13 changes: 13 additions & 0 deletions
packages/nextjs/src/app-beta/control-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
import { deprecated } from '@clerk/shared';
import React from 'react';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedIn(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
 return userId ? <>{children}</> : null;
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedOut(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/app-beta/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
import type { User } from '@clerk/backend';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';
import { clerkClient } from './clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

1 change: 1 addition & 0 deletions
packages/nextjs/src/app-router/server/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { User } from '@clerk/backend';
import { clerkClient } from '../../server/clerkClient';
import { auth } from './auth';

// eslint-disable-next-line @typescript-eslint/require-await
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} 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
chore(nextjs): Add deprecation warning for app-beta subpath export#1829

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 3 commits into

from

Oct 6, 2023
 Merged


chore(nextjs): Add deprecation warning for app-beta subpath export
#1829
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
946a397

chore(nextjs): Warn about `@clerk/nextjs/app-beta` deprecation


dimkl Oct 4, 2023
0a3f977

chore(nextjs): Add deprecation JSDoc for @clerk/nextjs/app-beta


dimkl Oct 4, 2023
78eb66f

Create stupid-jeans-flash.md


dimkl Oct 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/stupid-jeans-flash.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": patch
---

Add deprecation warning for `@clerk/nextjs/app-beta` export. Use the `@clerk/nextjs` instead.

10 changes: 10 additions & 0 deletions
packages/nextjs/src/app-beta/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
/* eslint-disable turbo/no-undeclared-env-vars */
import type { IsomorphicClerkOptions } from '@clerk/clerk-react';
import type { InitialState, PublishableKeyOrFrontendApi } from '@clerk/types';
Expand All@@ -11,6 +17,10 @@ type NextAppClerkProviderProps = {
} & Omit<IsomorphicClerkOptions, keyof PublishableKeyOrFrontendApi> &
 Partial<PublishableKeyOrFrontendApi>;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: NextAppClerkProviderProps) {
 const state = (initialState()?.__clerk_ssr_state || { sessionId: null, orgId: null, userId: null }) as InitialState;
 return (
Expand Down

15 changes: 15 additions & 0 deletions
packages/nextjs/src/app-beta/auth.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import { headers } from 'next/headers';
import { NextRequest } from 'next/server';

Expand All@@ -7,10 +14,18 @@ const buildRequestLike = () => {
 return new NextRequest('https://placeholder.com', { headers: headers() });
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const auth = () => {
 return getAuth(buildRequestLike());
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const initialState = () => {
 return buildClerkProps(buildRequestLike());
};

14 changes: 13 additions & 1 deletion
packages/nextjs/src/app-beta/clerkClient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
export { clerkClient } from '../server/clerkClient';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { clerkClient as _clerkClient } from '../server/clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const clerkClient = _clerkClient;

14 changes: 14 additions & 0 deletions
packages/nextjs/src/app-beta/client/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
'use client';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
// !!! Note the import from react
import type { ClerkProviderProps } from '@clerk/clerk-react';
import { ClerkProvider as ReactClerkProvider } from '@clerk/clerk-react';
Expand All@@ -12,6 +18,10 @@ declare global {
 }
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAwaitableNavigate = () => {
 // eslint-disable-next-line @typescript-eslint/unbound-method
 const { push, refresh } = useRouter();
Expand DownExpand Up@@ -43,6 +53,10 @@ export const useAwaitableNavigate = () => {
 }, []);
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: ClerkProviderProps) {
 const navigate = useAwaitableNavigate();
 return (
Expand Down

132 changes: 132 additions & 0 deletions
packages/nextjs/src/app-beta/client/clerk-react.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
// HACK to show app-beta deprecation warning any of the below
// There seems to be some issue when adding the deprecation in the index.ts
import {
 AuthenticateWithRedirectCallback as _AuthenticateWithRedirectCallback,
 ClerkLoaded as _ClerkLoaded,
 ClerkLoading as _ClerkLoading,
 RedirectToCreateOrganization as _RedirectToCreateOrganization,
 RedirectToOrganizationProfile as _RedirectToOrganizationProfile,
 RedirectToSignIn as _RedirectToSignIn,
 RedirectToSignUp as _RedirectToSignUp,
 RedirectToUserProfile as _RedirectToUserProfile,
 SignedIn as _SignedIn,
 SignedOut as _SignedOut,
 useAuth as _useAuth,
 useClerk as _useClerk,
 useMagicLink as _useMagicLink,
 useOrganization as _useOrganization,
 useOrganizationList as _useOrganizationList,
 useOrganizations as _useOrganizations,
 useSession as _useSession,
 useSessionList as _useSessionList,
 useSignIn as _useSignIn,
 useSignUp as _useSignUp,
 useUser as _useUser,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useUser = _useUser;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAuth = _useAuth;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useClerk = _useClerk;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useMagicLink = _useMagicLink;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganization = _useOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizationList = _useOrganizationList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizations = _useOrganizations;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSession = _useSession;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSessionList = _useSessionList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignIn = _useSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignUp = _useSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedIn = _SignedIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedOut = _SignedOut;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoaded = _ClerkLoaded;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoading = _ClerkLoading;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToUserProfile = _RedirectToUserProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignIn = _RedirectToSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignUp = _RedirectToSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToCreateOrganization = _RedirectToCreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToOrganizationProfile = _RedirectToOrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const AuthenticateWithRedirectCallback = _AuthenticateWithRedirectCallback;

2 changes: 1 addition & 1 deletion
packages/nextjs/src/app-beta/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ export {
 RedirectToCreateOrganization,
 RedirectToOrganizationProfile,
 AuthenticateWithRedirectCallback,
} from '@clerk/clerk-react';
} from './clerk-react';

export {
 SignIn,
Expand Down

58 changes: 50 additions & 8 deletions
packages/nextjs/src/app-beta/client/ui-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,53 @@
'use client';
import { deprecated } from '@clerk/shared';

export {
 CreateOrganization,
 OrganizationProfile,
 OrganizationSwitcher,
 SignIn,
 SignUp,
 UserButton,
 UserProfile,
deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import {
 CreateOrganization as _CreateOrganization,
 OrganizationProfile as _OrganizationProfile,
 OrganizationSwitcher as _OrganizationSwitcher,
 SignIn as _SignIn,
 SignUp as _SignUp,
 UserButton as _UserButton,
 UserProfile as _UserProfile,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const CreateOrganization = _CreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationProfile = _OrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationSwitcher = _OrganizationSwitcher;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignIn = _SignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignUp = _SignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserButton = _UserButton;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserProfile = _UserProfile;

13 changes: 13 additions & 0 deletions
packages/nextjs/src/app-beta/control-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
import { deprecated } from '@clerk/shared';
import React from 'react';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedIn(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
 return userId ? <>{children}</> : null;
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedOut(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/app-beta/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
import type { User } from '@clerk/backend';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';
import { clerkClient } from './clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

1 change: 1 addition & 0 deletions
packages/nextjs/src/app-router/server/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { User } from '@clerk/backend';
import { clerkClient } from '../../server/clerkClient';
import { auth } from './auth';

// eslint-disable-next-line @typescript-eslint/require-await
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(nextjs): Add deprecation warning for app-beta subpath export#1829

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 3 commits into

from

Oct 6, 2023
 Merged


chore(nextjs): Add deprecation warning for app-beta subpath export
#1829
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
946a397

chore(nextjs): Warn about `@clerk/nextjs/app-beta` deprecation


dimkl Oct 4, 2023
0a3f977

chore(nextjs): Add deprecation JSDoc for @clerk/nextjs/app-beta


dimkl Oct 4, 2023
78eb66f

Create stupid-jeans-flash.md


dimkl Oct 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/stupid-jeans-flash.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": patch
---

Add deprecation warning for `@clerk/nextjs/app-beta` export. Use the `@clerk/nextjs` instead.

10 changes: 10 additions & 0 deletions
packages/nextjs/src/app-beta/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
/* eslint-disable turbo/no-undeclared-env-vars */
import type { IsomorphicClerkOptions } from '@clerk/clerk-react';
import type { InitialState, PublishableKeyOrFrontendApi } from '@clerk/types';
Expand All@@ -11,6 +17,10 @@ type NextAppClerkProviderProps = {
} & Omit<IsomorphicClerkOptions, keyof PublishableKeyOrFrontendApi> &
 Partial<PublishableKeyOrFrontendApi>;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: NextAppClerkProviderProps) {
 const state = (initialState()?.__clerk_ssr_state || { sessionId: null, orgId: null, userId: null }) as InitialState;
 return (
Expand Down

15 changes: 15 additions & 0 deletions
packages/nextjs/src/app-beta/auth.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import { headers } from 'next/headers';
import { NextRequest } from 'next/server';

Expand All@@ -7,10 +14,18 @@ const buildRequestLike = () => {
 return new NextRequest('https://placeholder.com', { headers: headers() });
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const auth = () => {
 return getAuth(buildRequestLike());
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const initialState = () => {
 return buildClerkProps(buildRequestLike());
};

14 changes: 13 additions & 1 deletion
packages/nextjs/src/app-beta/clerkClient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
export { clerkClient } from '../server/clerkClient';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { clerkClient as _clerkClient } from '../server/clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const clerkClient = _clerkClient;

14 changes: 14 additions & 0 deletions
packages/nextjs/src/app-beta/client/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
'use client';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
// !!! Note the import from react
import type { ClerkProviderProps } from '@clerk/clerk-react';
import { ClerkProvider as ReactClerkProvider } from '@clerk/clerk-react';
Expand All@@ -12,6 +18,10 @@ declare global {
 }
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAwaitableNavigate = () => {
 // eslint-disable-next-line @typescript-eslint/unbound-method
 const { push, refresh } = useRouter();
Expand DownExpand Up@@ -43,6 +53,10 @@ export const useAwaitableNavigate = () => {
 }, []);
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: ClerkProviderProps) {
 const navigate = useAwaitableNavigate();
 return (
Expand Down

132 changes: 132 additions & 0 deletions
packages/nextjs/src/app-beta/client/clerk-react.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
// HACK to show app-beta deprecation warning any of the below
// There seems to be some issue when adding the deprecation in the index.ts
import {
 AuthenticateWithRedirectCallback as _AuthenticateWithRedirectCallback,
 ClerkLoaded as _ClerkLoaded,
 ClerkLoading as _ClerkLoading,
 RedirectToCreateOrganization as _RedirectToCreateOrganization,
 RedirectToOrganizationProfile as _RedirectToOrganizationProfile,
 RedirectToSignIn as _RedirectToSignIn,
 RedirectToSignUp as _RedirectToSignUp,
 RedirectToUserProfile as _RedirectToUserProfile,
 SignedIn as _SignedIn,
 SignedOut as _SignedOut,
 useAuth as _useAuth,
 useClerk as _useClerk,
 useMagicLink as _useMagicLink,
 useOrganization as _useOrganization,
 useOrganizationList as _useOrganizationList,
 useOrganizations as _useOrganizations,
 useSession as _useSession,
 useSessionList as _useSessionList,
 useSignIn as _useSignIn,
 useSignUp as _useSignUp,
 useUser as _useUser,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useUser = _useUser;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAuth = _useAuth;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useClerk = _useClerk;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useMagicLink = _useMagicLink;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganization = _useOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizationList = _useOrganizationList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizations = _useOrganizations;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSession = _useSession;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSessionList = _useSessionList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignIn = _useSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignUp = _useSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedIn = _SignedIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedOut = _SignedOut;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoaded = _ClerkLoaded;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoading = _ClerkLoading;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToUserProfile = _RedirectToUserProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignIn = _RedirectToSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignUp = _RedirectToSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToCreateOrganization = _RedirectToCreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToOrganizationProfile = _RedirectToOrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const AuthenticateWithRedirectCallback = _AuthenticateWithRedirectCallback;

2 changes: 1 addition & 1 deletion
packages/nextjs/src/app-beta/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ export {
 RedirectToCreateOrganization,
 RedirectToOrganizationProfile,
 AuthenticateWithRedirectCallback,
} from '@clerk/clerk-react';
} from './clerk-react';

export {
 SignIn,
Expand Down

58 changes: 50 additions & 8 deletions
packages/nextjs/src/app-beta/client/ui-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,53 @@
'use client';
import { deprecated } from '@clerk/shared';

export {
 CreateOrganization,
 OrganizationProfile,
 OrganizationSwitcher,
 SignIn,
 SignUp,
 UserButton,
 UserProfile,
deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import {
 CreateOrganization as _CreateOrganization,
 OrganizationProfile as _OrganizationProfile,
 OrganizationSwitcher as _OrganizationSwitcher,
 SignIn as _SignIn,
 SignUp as _SignUp,
 UserButton as _UserButton,
 UserProfile as _UserProfile,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const CreateOrganization = _CreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationProfile = _OrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationSwitcher = _OrganizationSwitcher;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignIn = _SignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignUp = _SignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserButton = _UserButton;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserProfile = _UserProfile;

13 changes: 13 additions & 0 deletions
packages/nextjs/src/app-beta/control-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
import { deprecated } from '@clerk/shared';
import React from 'react';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedIn(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
 return userId ? <>{children}</> : null;
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedOut(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/app-beta/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
import type { User } from '@clerk/backend';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';
import { clerkClient } from './clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

1 change: 1 addition & 0 deletions
packages/nextjs/src/app-router/server/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { User } from '@clerk/backend';
import { clerkClient } from '../../server/clerkClient';
import { auth } from './auth';

// eslint-disable-next-line @typescript-eslint/require-await
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(nextjs): Add deprecation warning for app-beta subpath export#1829

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 3 commits into

from

Oct 6, 2023
 Merged


chore(nextjs): Add deprecation warning for app-beta subpath export
#1829
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
946a397

chore(nextjs): Warn about `@clerk/nextjs/app-beta` deprecation


dimkl Oct 4, 2023
0a3f977

chore(nextjs): Add deprecation JSDoc for @clerk/nextjs/app-beta


dimkl Oct 4, 2023
78eb66f

Create stupid-jeans-flash.md


dimkl Oct 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/stupid-jeans-flash.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": patch
---

Add deprecation warning for `@clerk/nextjs/app-beta` export. Use the `@clerk/nextjs` instead.

10 changes: 10 additions & 0 deletions
packages/nextjs/src/app-beta/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
/* eslint-disable turbo/no-undeclared-env-vars */
import type { IsomorphicClerkOptions } from '@clerk/clerk-react';
import type { InitialState, PublishableKeyOrFrontendApi } from '@clerk/types';
Expand All@@ -11,6 +17,10 @@ type NextAppClerkProviderProps = {
} & Omit<IsomorphicClerkOptions, keyof PublishableKeyOrFrontendApi> &
 Partial<PublishableKeyOrFrontendApi>;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: NextAppClerkProviderProps) {
 const state = (initialState()?.__clerk_ssr_state || { sessionId: null, orgId: null, userId: null }) as InitialState;
 return (
Expand Down

15 changes: 15 additions & 0 deletions
packages/nextjs/src/app-beta/auth.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import { headers } from 'next/headers';
import { NextRequest } from 'next/server';

Expand All@@ -7,10 +14,18 @@ const buildRequestLike = () => {
 return new NextRequest('https://placeholder.com', { headers: headers() });
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const auth = () => {
 return getAuth(buildRequestLike());
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const initialState = () => {
 return buildClerkProps(buildRequestLike());
};

14 changes: 13 additions & 1 deletion
packages/nextjs/src/app-beta/clerkClient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
export { clerkClient } from '../server/clerkClient';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { clerkClient as _clerkClient } from '../server/clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const clerkClient = _clerkClient;

14 changes: 14 additions & 0 deletions
packages/nextjs/src/app-beta/client/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
'use client';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
// !!! Note the import from react
import type { ClerkProviderProps } from '@clerk/clerk-react';
import { ClerkProvider as ReactClerkProvider } from '@clerk/clerk-react';
Expand All@@ -12,6 +18,10 @@ declare global {
 }
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAwaitableNavigate = () => {
 // eslint-disable-next-line @typescript-eslint/unbound-method
 const { push, refresh } = useRouter();
Expand DownExpand Up@@ -43,6 +53,10 @@ export const useAwaitableNavigate = () => {
 }, []);
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: ClerkProviderProps) {
 const navigate = useAwaitableNavigate();
 return (
Expand Down

132 changes: 132 additions & 0 deletions
packages/nextjs/src/app-beta/client/clerk-react.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
// HACK to show app-beta deprecation warning any of the below
// There seems to be some issue when adding the deprecation in the index.ts
import {
 AuthenticateWithRedirectCallback as _AuthenticateWithRedirectCallback,
 ClerkLoaded as _ClerkLoaded,
 ClerkLoading as _ClerkLoading,
 RedirectToCreateOrganization as _RedirectToCreateOrganization,
 RedirectToOrganizationProfile as _RedirectToOrganizationProfile,
 RedirectToSignIn as _RedirectToSignIn,
 RedirectToSignUp as _RedirectToSignUp,
 RedirectToUserProfile as _RedirectToUserProfile,
 SignedIn as _SignedIn,
 SignedOut as _SignedOut,
 useAuth as _useAuth,
 useClerk as _useClerk,
 useMagicLink as _useMagicLink,
 useOrganization as _useOrganization,
 useOrganizationList as _useOrganizationList,
 useOrganizations as _useOrganizations,
 useSession as _useSession,
 useSessionList as _useSessionList,
 useSignIn as _useSignIn,
 useSignUp as _useSignUp,
 useUser as _useUser,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useUser = _useUser;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAuth = _useAuth;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useClerk = _useClerk;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useMagicLink = _useMagicLink;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganization = _useOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizationList = _useOrganizationList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizations = _useOrganizations;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSession = _useSession;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSessionList = _useSessionList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignIn = _useSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignUp = _useSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedIn = _SignedIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedOut = _SignedOut;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoaded = _ClerkLoaded;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoading = _ClerkLoading;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToUserProfile = _RedirectToUserProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignIn = _RedirectToSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignUp = _RedirectToSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToCreateOrganization = _RedirectToCreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToOrganizationProfile = _RedirectToOrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const AuthenticateWithRedirectCallback = _AuthenticateWithRedirectCallback;

2 changes: 1 addition & 1 deletion
packages/nextjs/src/app-beta/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ export {
 RedirectToCreateOrganization,
 RedirectToOrganizationProfile,
 AuthenticateWithRedirectCallback,
} from '@clerk/clerk-react';
} from './clerk-react';

export {
 SignIn,
Expand Down

58 changes: 50 additions & 8 deletions
packages/nextjs/src/app-beta/client/ui-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,53 @@
'use client';
import { deprecated } from '@clerk/shared';

export {
 CreateOrganization,
 OrganizationProfile,
 OrganizationSwitcher,
 SignIn,
 SignUp,
 UserButton,
 UserProfile,
deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import {
 CreateOrganization as _CreateOrganization,
 OrganizationProfile as _OrganizationProfile,
 OrganizationSwitcher as _OrganizationSwitcher,
 SignIn as _SignIn,
 SignUp as _SignUp,
 UserButton as _UserButton,
 UserProfile as _UserProfile,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const CreateOrganization = _CreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationProfile = _OrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationSwitcher = _OrganizationSwitcher;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignIn = _SignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignUp = _SignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserButton = _UserButton;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserProfile = _UserProfile;

13 changes: 13 additions & 0 deletions
packages/nextjs/src/app-beta/control-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
import { deprecated } from '@clerk/shared';
import React from 'react';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedIn(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
 return userId ? <>{children}</> : null;
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedOut(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/app-beta/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
import type { User } from '@clerk/backend';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';
import { clerkClient } from './clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

1 change: 1 addition & 0 deletions
packages/nextjs/src/app-router/server/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { User } from '@clerk/backend';
import { clerkClient } from '../../server/clerkClient';
import { auth } from './auth';

// eslint-disable-next-line @typescript-eslint/require-await
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
chore(nextjs): Add deprecation warning for app-beta subpath export#1829

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 3 commits into

from

Oct 6, 2023
 Merged


chore(nextjs): Add deprecation warning for app-beta subpath export
#1829
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
946a397

chore(nextjs): Warn about `@clerk/nextjs/app-beta` deprecation


dimkl Oct 4, 2023
0a3f977

chore(nextjs): Add deprecation JSDoc for @clerk/nextjs/app-beta


dimkl Oct 4, 2023
78eb66f

Create stupid-jeans-flash.md


dimkl Oct 5, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/stupid-jeans-flash.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": patch
---

Add deprecation warning for `@clerk/nextjs/app-beta` export. Use the `@clerk/nextjs` instead.

10 changes: 10 additions & 0 deletions
packages/nextjs/src/app-beta/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
/* eslint-disable turbo/no-undeclared-env-vars */
import type { IsomorphicClerkOptions } from '@clerk/clerk-react';
import type { InitialState, PublishableKeyOrFrontendApi } from '@clerk/types';
Expand All@@ -11,6 +17,10 @@ type NextAppClerkProviderProps = {
} & Omit<IsomorphicClerkOptions, keyof PublishableKeyOrFrontendApi> &
 Partial<PublishableKeyOrFrontendApi>;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: NextAppClerkProviderProps) {
 const state = (initialState()?.__clerk_ssr_state || { sessionId: null, orgId: null, userId: null }) as InitialState;
 return (
Expand Down

15 changes: 15 additions & 0 deletions
packages/nextjs/src/app-beta/auth.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import { headers } from 'next/headers';
import { NextRequest } from 'next/server';

Expand All@@ -7,10 +14,18 @@ const buildRequestLike = () => {
 return new NextRequest('https://placeholder.com', { headers: headers() });
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const auth = () => {
 return getAuth(buildRequestLike());
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const initialState = () => {
 return buildClerkProps(buildRequestLike());
};

14 changes: 13 additions & 1 deletion
packages/nextjs/src/app-beta/clerkClient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
export { clerkClient } from '../server/clerkClient';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { clerkClient as _clerkClient } from '../server/clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const clerkClient = _clerkClient;

14 changes: 14 additions & 0 deletions
packages/nextjs/src/app-beta/client/ClerkProvider.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
'use client';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
// !!! Note the import from react
import type { ClerkProviderProps } from '@clerk/clerk-react';
import { ClerkProvider as ReactClerkProvider } from '@clerk/clerk-react';
Expand All@@ -12,6 +18,10 @@ declare global {
 }
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAwaitableNavigate = () => {
 // eslint-disable-next-line @typescript-eslint/unbound-method
 const { push, refresh } = useRouter();
Expand DownExpand Up@@ -43,6 +53,10 @@ export const useAwaitableNavigate = () => {
 }, []);
};

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function ClerkProvider(props: ClerkProviderProps) {
 const navigate = useAwaitableNavigate();
 return (
Expand Down

132 changes: 132 additions & 0 deletions
packages/nextjs/src/app-beta/client/clerk-react.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
// HACK to show app-beta deprecation warning any of the below
// There seems to be some issue when adding the deprecation in the index.ts
import {
 AuthenticateWithRedirectCallback as _AuthenticateWithRedirectCallback,
 ClerkLoaded as _ClerkLoaded,
 ClerkLoading as _ClerkLoading,
 RedirectToCreateOrganization as _RedirectToCreateOrganization,
 RedirectToOrganizationProfile as _RedirectToOrganizationProfile,
 RedirectToSignIn as _RedirectToSignIn,
 RedirectToSignUp as _RedirectToSignUp,
 RedirectToUserProfile as _RedirectToUserProfile,
 SignedIn as _SignedIn,
 SignedOut as _SignedOut,
 useAuth as _useAuth,
 useClerk as _useClerk,
 useMagicLink as _useMagicLink,
 useOrganization as _useOrganization,
 useOrganizationList as _useOrganizationList,
 useOrganizations as _useOrganizations,
 useSession as _useSession,
 useSessionList as _useSessionList,
 useSignIn as _useSignIn,
 useSignUp as _useSignUp,
 useUser as _useUser,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useUser = _useUser;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useAuth = _useAuth;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useClerk = _useClerk;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useMagicLink = _useMagicLink;

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganization = _useOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizationList = _useOrganizationList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useOrganizations = _useOrganizations;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSession = _useSession;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSessionList = _useSessionList;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignIn = _useSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const useSignUp = _useSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedIn = _SignedIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignedOut = _SignedOut;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoaded = _ClerkLoaded;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const ClerkLoading = _ClerkLoading;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToUserProfile = _RedirectToUserProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignIn = _RedirectToSignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToSignUp = _RedirectToSignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToCreateOrganization = _RedirectToCreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const RedirectToOrganizationProfile = _RedirectToOrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const AuthenticateWithRedirectCallback = _AuthenticateWithRedirectCallback;

2 changes: 1 addition & 1 deletion
packages/nextjs/src/app-beta/client/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ export {
 RedirectToCreateOrganization,
 RedirectToOrganizationProfile,
 AuthenticateWithRedirectCallback,
} from '@clerk/clerk-react';
} from './clerk-react';

export {
 SignIn,
Expand Down

58 changes: 50 additions & 8 deletions
packages/nextjs/src/app-beta/client/ui-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,53 @@
'use client';
import { deprecated } from '@clerk/shared';

export {
 CreateOrganization,
 OrganizationProfile,
 OrganizationSwitcher,
 SignIn,
 SignUp,
 UserButton,
 UserProfile,
deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);

import {
 CreateOrganization as _CreateOrganization,
 OrganizationProfile as _OrganizationProfile,
 OrganizationSwitcher as _OrganizationSwitcher,
 SignIn as _SignIn,
 SignUp as _SignUp,
 UserButton as _UserButton,
 UserProfile as _UserProfile,
} from '@clerk/clerk-react';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const CreateOrganization = _CreateOrganization;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationProfile = _OrganizationProfile;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const OrganizationSwitcher = _OrganizationSwitcher;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignIn = _SignIn;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const SignUp = _SignUp;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserButton = _UserButton;
/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export const UserProfile = _UserProfile;

13 changes: 13 additions & 0 deletions
packages/nextjs/src/app-beta/control-components.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
import { deprecated } from '@clerk/shared';
import React from 'react';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedIn(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
 return userId ? <>{children}</> : null;
}

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export function SignedOut(props: React.PropsWithChildren) {
 const { children } = props;
 const { userId } = auth();
Expand Down

9 changes: 9 additions & 0 deletions
packages/nextjs/src/app-beta/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
import type { User } from '@clerk/backend';
import { deprecated } from '@clerk/shared';

deprecated(
 '@clerk/nextjs/app-beta',
 'Use imports from `@clerk/nextjs` instead.\nFor more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware',
);
import { auth } from './auth';
import { clerkClient } from './clerkClient';

/**
 * @deprecated Use imports from `@clerk/nextjs` instead.
 * For more details, consult the middleware documentation: https://clerk.com/docs/nextjs/middleware
 */
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down

1 change: 1 addition & 0 deletions
packages/nextjs/src/app-router/server/currentUser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { User } from '@clerk/backend';
import { clerkClient } from '../../server/clerkClient';
import { auth } from './auth';

// eslint-disable-next-line @typescript-eslint/require-await
export async function currentUser(): Promise<User | null> {
 const { userId } = auth();
 return userId ? clerkClient.users.getUser(userId) : null;
Expand Down