mirror of
https://github.com/supabase/supabase.git
synced 2026-09-06 09:59:03 +08:00
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>
98 lines
2.8 KiB
TypeScript
98 lines
2.8 KiB
TypeScript
import Link from 'next/link'
|
|
import { Button, HoverCard, HoverCardContent, HoverCardTrigger } from 'ui'
|
|
import { Admonition } from 'ui-patterns/Admonition'
|
|
|
|
import { ENV_VAR_RAW_KEYS } from './Integrations-Vercel.constants'
|
|
import { LogoPair, PartnerLogo, SupabaseLogo } from '@/components/layouts/InterstitialLayout'
|
|
import { BASE_PATH } from '@/lib/constants'
|
|
|
|
const VERCEL_ENV_VAR_COUNT = ENV_VAR_RAW_KEYS.length
|
|
const VERCEL_ICON_SRC = `${BASE_PATH}/img/icons/vercel-icon.svg`
|
|
|
|
export const VERCEL_INTEGRATION_ICON = <img src={VERCEL_ICON_SRC} alt="Vercel" className="w-4" />
|
|
|
|
export function VercelIntegrationLogo() {
|
|
return (
|
|
<LogoPair
|
|
left={
|
|
<PartnerLogo
|
|
src={VERCEL_ICON_SRC}
|
|
alt="Vercel"
|
|
className="bg-surface-75"
|
|
imageClassName="size-7 object-contain dark:invert"
|
|
/>
|
|
}
|
|
right={<SupabaseLogo />}
|
|
/>
|
|
)
|
|
}
|
|
|
|
export function VercelIntegrationFooter() {
|
|
return (
|
|
<p className="text-xs text-foreground-lighter">
|
|
You can remove this integration at any time from Vercel or the Supabase dashboard.
|
|
</p>
|
|
)
|
|
}
|
|
|
|
export function VercelEnvVarsSyncDescription() {
|
|
return (
|
|
<>
|
|
<HoverCard openDelay={200}>
|
|
<HoverCardTrigger asChild>
|
|
<Button
|
|
type="button"
|
|
variant="link"
|
|
className="h-auto p-0 text-sm font-normal text-foreground-lighter underline decoration-dotted underline-offset-2"
|
|
>
|
|
{VERCEL_ENV_VAR_COUNT} environment variables
|
|
</Button>
|
|
</HoverCardTrigger>
|
|
<HoverCardContent align="center" className="w-80">
|
|
<div className="space-y-2">
|
|
<h4 className="text-sm font-medium text-foreground">Environment variables</h4>
|
|
<ul className="max-h-52 space-y-1 overflow-y-auto">
|
|
{ENV_VAR_RAW_KEYS.map((key) => (
|
|
<li key={key} className="font-mono text-xs text-foreground-lighter">
|
|
{key}
|
|
</li>
|
|
))}
|
|
</ul>
|
|
</div>
|
|
</HoverCardContent>
|
|
</HoverCard>{' '}
|
|
will be synced to your Vercel project.
|
|
</>
|
|
)
|
|
}
|
|
|
|
interface VercelIntegrationInterstitialErrorStateProps {
|
|
title: string
|
|
errorMessage?: string | null
|
|
}
|
|
|
|
export function VercelIntegrationInterstitialErrorState({
|
|
title,
|
|
errorMessage,
|
|
}: VercelIntegrationInterstitialErrorStateProps) {
|
|
return (
|
|
<div className="flex flex-col gap-3">
|
|
<Admonition
|
|
type="warning"
|
|
title={title}
|
|
description={
|
|
<>
|
|
Retry the installation request from Vercel.
|
|
{errorMessage && (
|
|
<span className="mt-1 block text-foreground-lighter">Error: {errorMessage}</span>
|
|
)}
|
|
</>
|
|
}
|
|
/>
|
|
<Button variant="default" block asChild>
|
|
<Link href="/">Back to dashboard</Link>
|
|
</Button>
|
|
</div>
|
|
)
|
|
}
|