Skip to content

Move the frontend to @clerk/react (Clerk Core 3) #116

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

Open
jayypatel18 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move the frontend to @clerk/react (Clerk Core 3) #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@clerk/backend": "^3.12.0",
"@clerk/clerk-react": "^5.61.9",
"@clerk/react": "^6.0.0",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
Expand Down
66 changes: 19 additions & 47 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/app/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ async function render() {
let content: ReactNode;
if (CLERK_KEY) {
// Dynamic import keeps Clerk out of the initial bundle for self-hosted installs
const { ClerkProvider } = await import("@clerk/clerk-react");
const { ClerkProvider } = await import("@clerk/react");
content = (
// ClerkErrorBoundary catches invalid keys, network failures, or any other
// Clerk init error and falls back to local-only mode automatically.
<ClerkErrorBoundary fallback={<ClerkUnavailableProvider>{routes}</ClerkUnavailableProvider>}>
<ClerkProvider
publishableKey={CLERK_KEY}
afterSignInUrl="/#/"
afterSignUpUrl="/#/"
signInFallbackRedirectUrl="/#/"
signUpFallbackRedirectUrl="/#/"
appearance={clerkAppearance}
>
{routes}
Expand Down
2 changes: 1 addition & 1 deletion src/features/auth/AccountButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, type ReactNode } from "react";
import { useAuth, useClerk, useUser } from "@clerk/clerk-react";
import { useAuth, useClerk, useUser } from "@clerk/react";
import {
HiOutlineUser,
HiOutlineCloud,
Expand Down
2 changes: 1 addition & 1 deletion src/features/auth/AuthBridge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect } from "react";
import { useAuth, useUser } from "@clerk/clerk-react";
import { useAuth, useUser } from "@clerk/react";
import { useAuthStore } from "@/features/auth/stores";
import { useSettingsStore } from "@/features/settings/stores";
import { syncSettingsFromCloud } from "@/lib/settings";
Expand Down
2 changes: 1 addition & 1 deletion src/features/auth/UpgradeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from "react";
import { useAuth } from "@clerk/clerk-react";
import { useAuth } from "@clerk/react";
import {
Dialog,
DialogContent,
Expand Down
10 changes: 5 additions & 5 deletions src/features/auth/clerkAppearance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
export const clerkAppearance = {
variables: {
colorPrimary: "var(--primary)",
colorTextOnPrimaryBackground: "var(--primary-foreground)",
colorPrimaryForeground: "var(--primary-foreground)",
colorBackground: "var(--background)",
colorInputBackground: "var(--background)",
colorInputText: "var(--foreground)",
colorText: "var(--foreground)",
colorTextSecondary: "var(--muted-foreground)",
colorInput: "var(--background)",
colorInputForeground: "var(--foreground)",
colorForeground: "var(--foreground)",
colorMutedForeground: "var(--muted-foreground)",
colorDanger: "var(--destructive)",
colorNeutral: "var(--foreground)",
colorShimmer: "var(--muted)",
Expand Down