fixup! async caching

Author: avivkeller

apps/site/app/[locale]/download/archive/[version]/page.tsx

@@ -30,7 +30,7 @@ export const generateStaticParams = async () => {
     return [];
   }
 
-  const versions = provideReleaseVersions();
+  const versions = await provideReleaseVersions();
 
   return versions.map(version => ({
     locale: defaultLocale.code,
@@ -49,14 +49,14 @@ const getPage: FC<PageParams> = async props => {
   const [locale, pathname] = basePage.getLocaleAndPath(version, routeLocale);
 
   if (version === 'current') {
-    const releaseData = provideReleaseData();
+    const releaseData = await provideReleaseData();
 
     const release = releaseData.find(release => release.status === 'Current');
 
     redirect(`/${locale}/download/archive/${release?.versionWithPrefix}`);
   }
 
-  const versions = provideReleaseVersions();
+  const versions = await provideReleaseVersions();
 
   // Verifies if the current route is a dynamic route
   const isDynamicRoute = versions.some(r => r.includes(pathname));

apps/site/components/EOL/EOLReleaseTable/index.tsx

@@ -12,8 +12,8 @@ import EOLReleaseTableBody from './TableBody';
 import styles from './index.module.css';
 
 const EOLReleaseTable: FC = async () => {
-  const releaseData = provideReleaseData();
-  const vulnerabilities = provideVulnerabilities();
+  const releaseData = await provideReleaseData();
+  const vulnerabilities = await provideVulnerabilities();
 
   const eolReleases = releaseData.filter(
     release => release.status === EOL_VERSION_IDENTIFIER

apps/site/components/Releases/PreviousReleasesTable/index.tsx

@@ -7,7 +7,7 @@ import type { FC } from 'react';
 import PreviousReleasesTableBody from './TableBody';
 
 const PreviousReleasesTable: FC = async () => {
-  const releaseData = provideReleaseData();
+  const releaseData = await provideReleaseData();
 
   const t = await getTranslations();
 

apps/site/components/withDownloadArchive.tsx

@@ -19,7 +19,7 @@ type WithDownloadArchiveProps = {
  * Higher-order component that extracts version from pathname,
  * fetches release data, and provides download artifacts to child component
  */
-const WithDownloadArchive: FC<WithDownloadArchiveProps> = ({
+const WithDownloadArchive: FC<WithDownloadArchiveProps> = async ({
   children: Component,
 }) => {
   const { pathname } = getClientContext();
@@ -28,7 +28,7 @@ const WithDownloadArchive: FC<WithDownloadArchiveProps> = ({
   const version = extractVersionFromPath(pathname);
 
   // Find the release data for the given version
-  const releaseData = provideReleaseData();
+  const releaseData = await provideReleaseData();
   const release = releaseData.find(release =>
     // Match major version only (e.g., v22.x.x for release.major v22)
     version.startsWith(`v${release.major}`)

apps/site/components/withDownloadSection.tsx

@@ -22,19 +22,21 @@ const WithDownloadSection: FC<WithDownloadSectionProps> = async ({
 }) => {
   const locale = await getLocale();
 
-  const snippets = provideDownloadSnippets(locale);
+  const snippets = await provideDownloadSnippets();
+
+  const localeSnippets = snippets.get(locale) ?? [];
 
   // By default the translated languages do not contain all the download snippets
   // Hence we always merge any translated snippet with the fallbacks for missing snippets
-  const fallbackSnippets = provideDownloadSnippets(defaultLocale.code);
+  const fallbackSnippets = snippets.get(defaultLocale.code) ?? [];
 
   const { pathname } = getClientContext();
 
   // Some available translations do not have download snippets translated or have them partially translated
   // This aims to merge the available translated snippets with the fallback snippets
   const memoizedSnippets = fallbackSnippets
-    .filter(snippet => !snippets.some(s => s.name === snippet.name))
-    .concat(snippets);
+    .filter(snippet => !localeSnippets.some(s => s.name === snippet.name))
+    .concat(localeSnippets);
 
   // Decides which initial release to use based on the current pathname
   const initialRelease = pathname.endsWith('/current')

apps/site/components/withNodeRelease.tsx

@@ -10,11 +10,11 @@ type WithNodeReleaseProps = {
 
 // This is a React Server Component
 // Note that Hooks cannot be used in a React Server Component
-const WithNodeRelease: FC<WithNodeReleaseProps> = ({
+const WithNodeRelease: FC<WithNodeReleaseProps> = async ({
   status: statuses,
   children: Component,
 }) => {
-  const releases = provideReleaseData();
+  const releases = await provideReleaseData();
 
   const matchingRelease = [statuses]
     .flat()

apps/site/components/withReleaseSelect.tsx

@@ -41,8 +41,8 @@ type WithReleaseSelectProps = Omit<
   'values' | 'as'
 >;
 
-const WithReleaseSelect: FC<WithReleaseSelectProps> = ({ ...props }) => {
-  const releaseData = provideReleaseData();
+const WithReleaseSelect: FC<WithReleaseSelectProps> = async ({ ...props }) => {
+  const releaseData = await provideReleaseData();
   const navigation = groupReleasesByStatus(releaseData);
 
   return (

apps/site/components/withSupporters.tsx

@@ -4,8 +4,8 @@ import type { FC, PropsWithChildren } from 'react';
 
 import SupportersList from './Common/Supporters';
 
-const WithSupporters: FC<PropsWithChildren> = () => {
-  const supporters = provideSupporters();
+const WithSupporters: FC<PropsWithChildren> = async () => {
+  const supporters = await provideSupporters();
 
   return (
     <div className="flex max-w-full flex-wrap items-center gap-1">

apps/site/layouts/Download.tsx

@@ -8,10 +8,10 @@ import type { FC, PropsWithChildren } from 'react';
 
 import styles from './layouts.module.css';
 
-const DownloadLayout: FC<PropsWithChildren> = ({ children }) => {
+const DownloadLayout: FC<PropsWithChildren> = async ({ children }) => {
   const { frontmatter } = getClientContext();
 
-  const releases = provideReleaseData();
+  const releases = await provideReleaseData();
 
   return (
     <>

apps/site/next-data/providers/downloadSnippets.ts

@@ -2,14 +2,4 @@ import { cache } from 'react';
 
 import generateDownloadSnippets from '#site/next-data/generators/downloadSnippets.mjs';
 
-const downloadSnippets = await generateDownloadSnippets();
-
-const provideDownloadSnippets = cache((language: string) => {
-  if (downloadSnippets.has(language)) {
-    return downloadSnippets.get(language)!;
-  }
-
-  return [];
-});
-
-export default provideDownloadSnippets;
+export default cache(generateDownloadSnippets);