Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(www): render partner catalog without js (#51950)

Pamela Chiad2650ffa3293
diff --git a/apps/www/app/partners/catalog/IntegrationsContent.tsx b/apps/www/app/partners/catalog/IntegrationsContent.tsx
index 64ea647745e..151c3f89bb3 100644
--- a/apps/www/app/partners/catalog/IntegrationsContent.tsx
+++ b/apps/www/app/partners/catalog/IntegrationsContent.tsx
@@ -451,6 +451,18 @@ export default function IntegrationsContent({
<Loader size={16} className="animate-spin text-foreground-lighter" />
</div>
)}
+ <noscript>
+ <ul className="divide-y rounded-xl border bg-background">
+ {listPartners.slice(PARTNERS_PAGE_SIZE).map((partner) => (
+ <li key={partner.slug} className="px-5 py-4">
+ <a href={`/partners/catalog/${partner.slug}`} className="block space-y-1">
+ <h3 className="text-sm font-medium text-foreground">{partner.title}</h3>
+ <p className="text-sm text-foreground-lighter">{partner.description}</p>
+ </a>
+ </li>
+ ))}
+ </ul>
+ </noscript>
</div>
</div>
</SectionContainer>
diff --git a/apps/www/app/partners/catalog/[slug]/PartnerCatalogDetail.tsx b/apps/www/app/partners/catalog/[slug]/PartnerCatalogDetail.tsx
index 577520bf67a..7469e814e3c 100644
--- a/apps/www/app/partners/catalog/[slug]/PartnerCatalogDetail.tsx
+++ b/apps/www/app/partners/catalog/[slug]/PartnerCatalogDetail.tsx
@@ -166,11 +166,11 @@ export default function PartnerCatalogDetail({ partner, serializedListings }: Pr
{/* Listings tabs */}
<div className="flex">
{allListings.map((listing, i) => (
- <button
- tabIndex={0}
+ <Link
key={listing.slug}
- type="button"
- onClick={() => {
+ href={`?tab=${encodeURIComponent(listing.slug)}`}
+ onNavigate={(event) => {
+ event.preventDefault()
setActiveSlug(listing.slug)
setFocusedImage(null)
}}
@@ -182,7 +182,7 @@ export default function PartnerCatalogDetail({ partner, serializedListings }: Pr
)}
>
{listing.label}
- </button>
+ </Link>
))}
</div>
</SectionContainerWithCn>
diff --git a/apps/www/app/partners/catalog/[slug]/page.tsx b/apps/www/app/partners/catalog/[slug]/page.tsx
index a3030cdd9d6..8ee0f44ea71 100644
--- a/apps/www/app/partners/catalog/[slug]/page.tsx
+++ b/apps/www/app/partners/catalog/[slug]/page.tsx
@@ -3,9 +3,11 @@ import { getCatalogPartner, listCatalogPartnerSlugs } from '~/lib/marketplaceDb'
import type { ListingDetail } from '~/types/partners'
import codeHikeTheme from 'config/code-hike.theme.json' with { type: 'json' }
import type { Metadata } from 'next'
+import { unstable_cache } from 'next/cache'
import { serialize } from 'next-mdx-remote-client/serialize'
import { notFound } from 'next/navigation'
-import { cache, Suspense } from 'react'
+import { connection } from 'next/server'
+import { cache } from 'react'
import remarkGfm from 'remark-gfm'
import PartnerCatalogDetail from './PartnerCatalogDetail'
@@ -14,8 +16,35 @@ export const revalidate = 1800
type Params = { slug: string }
-// Deduplicate the DB call across generateMetadata and the page component.
-const getPartner = cache(getCatalogPartner)
+const getPartner = cache(
+ unstable_cache(getCatalogPartner, ['partner-catalog-partner'], { revalidate })
+)
+
+const serializeListing = unstable_cache(
+ async (source: string) => {
+ const codeHikeOptions: CodeHikeConfig = {
+ theme: codeHikeTheme,
+ lineNumbers: true,
+ showCopyButton: true,
+ skipLanguages: [],
+ autoImport: false,
+ }
+ const result = await serialize({
+ source,
+ options: {
+ mdxOptions: {
+ remarkPlugins: [remarkGfm, [remarkCodeHike, codeHikeOptions]],
+ },
+ },
+ })
+
+ return 'error' in result
+ ? { ...result, error: { name: result.error.name, message: result.error.message } }
+ : result
+ },
+ ['partner-catalog-mdx', JSON.stringify(codeHikeTheme)],
+ { revalidate }
+)
export async function generateStaticParams() {
const slugs = await listCatalogPartnerSlugs()
@@ -39,18 +68,11 @@ export async function generateMetadata({ params }: { params: Promise<Params> }):
}
export default async function PartnerCatalogPage({ params }: { params: Promise<Params> }) {
+ await connection()
const { slug } = await params
const partner = await getPartner(slug)
if (!partner) notFound()
- const codeHikeOptions: CodeHikeConfig = {
- theme: codeHikeTheme,
- lineNumbers: true,
- showCopyButton: true,
- skipLanguages: [],
- autoImport: false,
- }
-
const listingsForTabs: ListingDetail[] = partner.listings?.length
? partner.listings
: [
@@ -67,21 +89,8 @@ export default async function PartnerCatalogPage({ params }: { params: Promise<P
]
const serializedListings = await Promise.all(
- listingsForTabs.map((listing) =>
- serialize({
- source: listing.content,
- options: {
- mdxOptions: {
- remarkPlugins: [remarkGfm, [remarkCodeHike, codeHikeOptions]],
- },
- },
- })
- )
+ listingsForTabs.map((listing) => serializeListing(listing.content))
)
- return (
- <Suspense>
- <PartnerCatalogDetail partner={partner} serializedListings={serializedListings} />
- </Suspense>
- )
+ return <PartnerCatalogDetail partner={partner} serializedListings={serializedListings} />
}
diff --git a/apps/www/app/partners/catalog/page.tsx b/apps/www/app/partners/catalog/page.tsx
index 50b630a3814..9463efce5af 100644
--- a/apps/www/app/partners/catalog/page.tsx
+++ b/apps/www/app/partners/catalog/page.tsx
@@ -1,10 +1,13 @@
import { listCatalogPartners } from '~/lib/marketplaceDb'
import type { Metadata } from 'next'
-import { Suspense } from 'react'
+import { unstable_cache } from 'next/cache'
+import { connection } from 'next/server'
import IntegrationsContent from './IntegrationsContent'
-export const revalidate = 1800 // 30 minutes
+export const revalidate = 1800
+
+const getPartners = unstable_cache(listCatalogPartners, ['partner-catalog'], { revalidate })
const META_TITLE = 'Partners building with Supabase'
const META_DESCRIPTION =
@@ -22,15 +25,14 @@ export const metadata: Metadata = {
}
export default async function IntegrationPartnersPage() {
- const partners = await listCatalogPartners()
+ await connection()
+ const partners = await getPartners()
return (
- <Suspense>
- <IntegrationsContent
- initialPartners={partners}
- metaTitle={META_TITLE}
- metaDescription={META_DESCRIPTION}
- />
- </Suspense>
+ <IntegrationsContent
+ initialPartners={partners}
+ metaTitle={META_TITLE}
+ metaDescription={META_DESCRIPTION}
+ />
)
}