Files
supabase/apps/studio/components/layouts/Navigation/LayoutHeader/LocalVersionPopover.tsx
Alaister Young ca2b50a0a7 chore(ui-patterns): collapse the admonition shim into ui-patterns/Admonition (#48377)
Follow-up to #48344: collapses the two resolution paths for the
Admonition module into one.

`src/admonition.tsx` was a back-compat shim re-exporting
`src/Admonition/`. Two ways to resolve one module is exactly what
produced the macOS self-import bug fixed in #48344, and the local
typecheck errors that #48374 worked around. This removes the shim and
standardizes on the PascalCase subpath, matching every other export in
the package.

**Changed:**

- Codemodded all 246 `ui-patterns/admonition` imports to
`ui-patterns/Admonition` (240 `.tsx`, 5 `.mdx`, 1 `.ts` across studio,
docs, www, design-system, and lite-studio)
- Pointed the 5 internal `'../admonition'` imports back at the
`'../Admonition'` directory

**Removed:**

- `packages/ui-patterns/src/admonition.tsx`, and its `./admonition`
entry in the exports map (regenerated with `pnpm gen:exports`)

## To test

- `grep -r "ui-patterns/admonition" --include='*.ts*'` → no hits
- `pnpm test:case-hazards` → passes
- `pnpm typecheck` → all 15 tasks green
- `pnpm --filter studio run lint:ratchet` → passes
- `pnpm --filter ui-patterns vitest run src/Admonition` → 11 tests pass

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **Bug Fixes**
* Standardized Admonition component imports across the application and
documentation.
* Improved compatibility with case-sensitive environments by using the
canonical component path.
  * Removed the legacy Admonition import entry point.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com>
2026-07-29 00:48:56 +08:00

204 lines
8.0 KiB
TypeScript

import dayjs from 'dayjs'
import {
Badge,
Button,
Dialog,
DialogContent,
DialogHeader,
DialogSection,
DialogTitle,
DialogTrigger,
Popover,
PopoverContent,
PopoverSeparator,
PopoverTrigger,
Tabs,
TabsContent,
TabsList,
TabsTrigger,
} from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import { SimpleCodeBlock } from 'ui-patterns/SimpleCodeBlock'
import { getSemver, semverGte, semverLte } from './LocalVersionPopover.utils'
import { DocsButton } from '@/components/ui/DocsButton'
import { InlineLink } from '@/components/ui/InlineLink'
import { useCLIReleaseVersionQuery } from '@/data/misc/cli-release-version-query'
import { useDeploymentMode } from '@/hooks/misc/useDeploymentMode'
import { DOCS_URL } from '@/lib/constants'
import { useTrack } from '@/lib/telemetry/track'
export const LocalVersionPopover = () => {
const track = useTrack()
const { isCli } = useDeploymentMode()
const { data, isSuccess } = useCLIReleaseVersionQuery({ enabled: isCli })
const { current: currentCliVersion, latest: latestCliVersion } = data || {}
const hasLatestCLIVersion = isSuccess && !!latestCliVersion
const current = getSemver(currentCliVersion)
const latest = getSemver(latestCliVersion)
const hasUpdate =
!!current && !!latest
? currentCliVersion !== latestCliVersion && semverLte(current, latest)
: false
const isBeta =
!!current && !!latest && currentCliVersion !== latestCliVersion && semverGte(current, latest)
const approximateNextRelease = !!data?.published_at
? dayjs(data?.published_at).utc().add(14, 'day').format('DD MMM YYYY')
: undefined
if (!isSuccess || !currentCliVersion) return null
return (
<Popover
onOpenChange={(open) => {
if (open) track('header_local_version_popover_opened')
}}
>
<PopoverTrigger className="flex items-center">
<Badge variant={isBeta ? 'warning' : hasUpdate ? 'success' : 'default'}>
{isBeta ? 'Beta' : hasUpdate ? 'Update available' : 'Latest'}
</Badge>
</PopoverTrigger>
<PopoverContent align="end" className="w-80 px-0">
{hasLatestCLIVersion ? (
!isBeta && hasUpdate ? (
<div className="px-4 mb-3">
<p className="text-sm mb-2">A new version of Supabase CLI is available:</p>
<Tabs defaultValue="macos">
<TabsList className="mt-2">
<TabsTrigger className="px-2 text-xs" value="macos">
macOS
</TabsTrigger>
<TabsTrigger className="px-2 text-xs" value="windows">
Windows
</TabsTrigger>
<TabsTrigger className="px-2 text-xs" value="linux">
Linux
</TabsTrigger>
<TabsTrigger className="px-2 text-xs" value="npm">
npm / Bun
</TabsTrigger>
</TabsList>
<TabsContent className="mt-2 text-xs" value="macos">
<SimpleCodeBlock parentClassName="bg-selection rounded-sm px-2!">
brew upgrade supabase
</SimpleCodeBlock>
</TabsContent>
<TabsContent className="mt-2 text-xs" value="windows">
<SimpleCodeBlock parentClassName="bg-selection rounded-sm px-2!">
scoop update supabase
</SimpleCodeBlock>
</TabsContent>
<TabsContent className="mt-2 text-xs" value="linux">
<SimpleCodeBlock parentClassName="bg-selection rounded-sm px-2!">
brew upgrade supabase
</SimpleCodeBlock>
</TabsContent>
<TabsContent className="mt-2 text-xs" value="npm">
<SimpleCodeBlock parentClassName="bg-selection rounded-sm px-2!">
npm update supabase --save-dev
</SimpleCodeBlock>
</TabsContent>
</Tabs>
</div>
) : (
<div className="px-4 mb-3">
{isBeta ? (
<p className="text-sm">You're on the Beta version of Supabase CLI</p>
) : (
<p className="text-sm">You're on the latest version of Supabase CLI</p>
)}
</div>
)
) : null}
<div className="flex flex-col gap-y-2 px-4">
<p className="text-xs text-foreground-lighter">
All available release versions of the CLI can be found on our{' '}
<InlineLink href="https://github.com/supabase/cli/releases">
GitHub repository
</InlineLink>
.
</p>
</div>
<div className="flex items-center gap-x-2 mt-3 px-4">
<Dialog>
<DialogTrigger asChild>
<Button variant="default">Release schedule</Button>
</DialogTrigger>
<DialogContent>
<DialogHeader className="border-b">
<DialogTitle>Stable release schedule</DialogTitle>
</DialogHeader>
<DialogSection className="flex flex-col gap-y-3">
<div className="flex flex-col gap-y-2">
<p className="text-foreground-lighter text-xs font-mono uppercase">
Approximate next release: {approximateNextRelease}
</p>
<p className="text-sm">
Supabase CLI releases follows a two-week schedule, with stable updates available
through the{' '}
<InlineLink
href={`${DOCS_URL}/guides/local-development/cli/getting-started?queryGroups=platform&platform=linux#updating-the-supabase-cli`}
>
CLI
</InlineLink>
.
</p>
</div>
<Admonition
type="default"
title="Beta Releases"
description="Beta releases are also available between stable releases through the Beta version of the CLI, which might be helpful if you are waiting for a specific fix."
>
<p className="mt-2!">If you'd like to try, we recommend doing so via npm:</p>
<div className="flex items-center bg-surface-200 py-1 px-2 rounded-sm mt-2 mb-1">
<SimpleCodeBlock parentClassName="bg-surface-200">
npm i supabase@beta --save-dev
</SimpleCodeBlock>
</div>
{
<p className="text-sm text-foreground-lighter">
Latest Beta version: <span>{data.beta}</span>
</p>
}
<DocsButton
href={`${DOCS_URL}/guides/local-development/cli/getting-started?queryGroups=platform&platform=linux#using-beta-version`}
className="no-underline! mt-2"
/>
</Admonition>
</DialogSection>
</DialogContent>
</Dialog>
<Button variant="default" asChild>
<a
target="_blank"
rel="noreferrer noopener"
href={`${DOCS_URL}/guides/local-development/cli/getting-started?queryGroups=platform&platform=linux`}
>
CLI Docs
</a>
</Button>
</div>
<PopoverSeparator className="my-4" />
<div className="flex items-center gap-x-4 px-4">
<div className="flex flex-col gap-y-1">
<p className="text-xs">Current version:</p>
<p className="text-sm font-mono">{currentCliVersion}</p>
</div>
{hasLatestCLIVersion && hasUpdate && !isBeta && (
<div className="flex flex-col gap-y-1">
<p className="text-xs">Available version:</p>
<p className="text-sm font-mono">{latestCliVersion}</p>
</div>
)}
</div>
</PopoverContent>
</Popover>
)
}