diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9172d80a68..fdfc200159 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,6 @@ on: push: branches: - main - - canary merge_group: env: diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 10506e878a..4c3c646cbe 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -8,7 +8,6 @@ on: push: branches: - main - - canary env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 9aaa8d8cb0..b03fe42b8f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1,7 +1,7 @@ name: E2E on: push: - branches: [ main, canary ] + branches: [ main ] merge_group: pull_request: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df238101d6..c4b47f89af 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -206,7 +206,7 @@ pnpm lint:fix 8. Push your branch to your fork -9. Open a pull request against the **canary** branch. In your PR description: +9. Open a pull request against the **main** branch. In your PR description: * Clearly describe what changes you made and why * Include any relevant context or background * List any breaking changes or deprecations diff --git a/docs/content/docs/concepts/plugins.mdx b/docs/content/docs/concepts/plugins.mdx index 6be3eeff74..d36d7273bc 100644 --- a/docs/content/docs/concepts/plugins.mdx +++ b/docs/content/docs/concepts/plugins.mdx @@ -129,7 +129,7 @@ Create Auth endpoints wraps around `createEndpoint` from Better Call. Inside the - `trustedOrigins`: This is the list of trusted origins that you specified via `options.trustedOrigins`. - `isTrustedOrigin`: This is a helper function that allows you to quickly check whether a given url or path is trusted based on the trusted origins configuration. -For other properties, you can check the Better Call documentation and the source code . +For other properties, you can check the Better Call documentation and the source code . **Rules for Endpoints** diff --git a/docs/content/docs/guides/next-auth-migration-guide.mdx b/docs/content/docs/guides/next-auth-migration-guide.mdx index 2d0bfd4364..d04cc2a2e9 100644 --- a/docs/content/docs/guides/next-auth-migration-guide.mdx +++ b/docs/content/docs/guides/next-auth-migration-guide.mdx @@ -763,6 +763,6 @@ You may have extended the database models or implemented additional logic in Aut ## Wrapping Up -Now you're ready to migrate from Auth.js to Better Auth. For a complete implementation with multiple authentication methods, check out the [Next.js Demo App](https://github.com/better-auth/better-auth/tree/canary/demo/nextjs). Better Auth offers greater flexibility and more features, so be sure to explore the [documentation](/docs) to unlock its full potential. +Now you're ready to migrate from Auth.js to Better Auth. For a complete implementation with multiple authentication methods, check out the [Next.js Demo App](https://github.com/better-auth/better-auth/tree/main/demo/nextjs). Better Auth offers greater flexibility and more features, so be sure to explore the [documentation](/docs) to unlock its full potential. If you need help with migration, join our [community](/community) or reach out to [contact@better-auth.com](mailto:contact@better-auth.com). \ No newline at end of file diff --git a/docs/content/docs/reference/contributing.mdx b/docs/content/docs/reference/contributing.mdx index 93f5297592..878e930dd5 100644 --- a/docs/content/docs/reference/contributing.mdx +++ b/docs/content/docs/reference/contributing.mdx @@ -77,11 +77,11 @@ Once you have an idea of what you want to contribute, you can start making chang # Add upstream remote (if not already added) git remote add upstream https://github.com/better-auth/better-auth.git - # Make sure you're on canary - git checkout canary + # Make sure you're on main + git checkout main # Pull latest changes - git pull upstream canary + git pull upstream main # Create and switch to a new branch git checkout -b feature/your-feature-name diff --git a/docs/content/docs/reference/telemetry.mdx b/docs/content/docs/reference/telemetry.mdx index 4c7a7e53d3..15a36f8d92 100644 --- a/docs/content/docs/reference/telemetry.mdx +++ b/docs/content/docs/reference/telemetry.mdx @@ -49,7 +49,7 @@ All collected data is fully anonymous and only useful in aggregate. It cannot be - **No PII or secrets**: We do not collect emails, usernames, tokens, secrets, client IDs, client secrets, or database URLs. - **No full config**: We never send your full `betterAuth` configuration. Instead we send a reduced, redacted snapshot of non‑sensitive toggles and counts. -- **Redaction by design**: See [detect-auth-config.ts](https://github.com/better-auth/better-auth/blob/canary/packages/telemetry/src/detectors/detect-auth-config.ts) in the Better Auth source for the exact shape of what is included. It purposely converts sensitive values to booleans, counts, or generic identifiers. +- **Redaction by design**: See [detect-auth-config.ts](https://github.com/better-auth/better-auth/blob/main/packages/telemetry/src/detectors/detect-auth-config.ts) in the Better Auth source for the exact shape of what is included. It purposely converts sensitive values to booleans, counts, or generic identifiers. ## How can I enable it? diff --git a/landing/app/docs/[[...slug]]/page.tsx b/landing/app/docs/[[...slug]]/page.tsx index ee3bc53196..0ed164c64d 100644 --- a/landing/app/docs/[[...slug]]/page.tsx +++ b/landing/app/docs/[[...slug]]/page.tsx @@ -25,20 +25,16 @@ import { } from "@/components/docs/mdx-components"; import { Callout } from "@/components/ui/callout"; import { createMetadata } from "@/lib/metadata"; -import { getSource } from "@/lib/source"; +import { source } from "@/lib/source"; import { cn } from "@/lib/utils"; import { LLMCopyButton, ViewOptions } from "./page.client"; export default async function Page({ params, - searchParams, }: { params: Promise<{ slug?: string[] }>; - searchParams: Promise<{ branch?: string }>; }) { const { slug } = await params; - const { branch } = await searchParams; - const source = getSource(branch); const page = source.getPage(slug); if (!page) { @@ -46,7 +42,6 @@ export default async function Page({ } const { body: MDX, toc } = await page.data.load(); - const gitBranch = branch === "canary" ? "canary" : "main"; return ( @@ -67,11 +62,11 @@ export default async function Page({ {page.data.title}
@@ -142,20 +137,15 @@ export default async function Page({ } export async function generateStaticParams() { - const source = getSource(); return source.generateParams(); } export async function generateMetadata({ params, - searchParams, }: { params: Promise<{ slug?: string[] }>; - searchParams: Promise<{ branch?: string }>; }) { const { slug } = await params; - const { branch } = await searchParams; - const source = getSource(branch); const page = source.getPage(slug); if (!page) return notFound(); diff --git a/landing/components/docs/docs-sidebar.tsx b/landing/components/docs/docs-sidebar.tsx index 90120a9f62..74b0d1ed30 100644 --- a/landing/components/docs/docs-sidebar.tsx +++ b/landing/components/docs/docs-sidebar.tsx @@ -2,9 +2,9 @@ import { AnimatePresence, MotionConfig, motion } from "framer-motion"; import { useSearchContext } from "fumadocs-ui/contexts/search"; -import { ChevronDownIcon, GitBranch, Search } from "lucide-react"; +import { ChevronDownIcon, Search } from "lucide-react"; import Link from "next/link"; -import { usePathname, useRouter, useSearchParams } from "next/navigation"; +import { usePathname } from "next/navigation"; import type { ReactNode } from "react"; import { useEffect, useRef, useState } from "react"; import type { ListItem } from "@/components/sidebar-content"; @@ -17,14 +17,10 @@ type Section = (typeof contents)[number]; export function DocsSidebar() { const pathname = usePathname(); - const searchParams = useSearchParams(); - const branch = searchParams.get("branch"); const { setOpenSearch } = useSearchContext(); const [currentOpen, setCurrentOpen] = useState(0); const navRef = useRef(null); - const branchQuery = branch === "canary" ? "?branch=canary" : ""; - const getDefaultOpen = (sections: Section[]) => { const defaultValue = sections.findIndex((item) => item.list.some( @@ -73,12 +69,9 @@ export function DocsSidebar() { transition={{ duration: 0.28, ease: "easeOut" }} className="fixed left-0 top-(--landing-topbar-height) bottom-0 w-[22vw] max-w-[300px] hidden lg:flex flex-col z-30 bg-background border-r border-foreground/5 transition-[width] duration-300 ease-out" > - {/* Branch switcher */} - - - - - {open && ( - - - - - )} - - - ); -} - // ─── Collapsible Section ────────────────────────────────────────────────────── function SidebarSection({ section, pathname, - branchQuery, }: { section: Section; pathname: string; - branchQuery: string; }) { return (
{section.href && ( - + Overview )} @@ -344,7 +224,6 @@ function SidebarSection({ item={item} active={active} pathname={pathname} - branchQuery={branchQuery} hasSubpages={hasSubpages} /> ); @@ -359,13 +238,11 @@ function SidebarItemWithSubpages({ item, active, pathname, - branchQuery, hasSubpages, }: { item: ListItem; active: boolean; pathname: string; - branchQuery: string; hasSubpages: boolean | undefined; }) { const showSubpages = hasSubpages && active; @@ -373,7 +250,7 @@ function SidebarItemWithSubpages({ return (
@@ -412,7 +289,7 @@ function SidebarItemWithSubpages({ return (