feat(cache): use cache more often (#8238)

* feat(cache): `use cache` more often

* fixup!

* fixup!

Author: avivkeller

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

@@ -2,8 +2,8 @@ import { notFound, redirect } from 'next/navigation';
 import type { FC } from 'react';
 
 import provideReleaseData from '#site/next-data/providers/releaseData';
+import provideReleaseVersions from '#site/next-data/providers/releaseVersions';
 import { ENABLE_STATIC_EXPORT } from '#site/next.constants.mjs';
-import { ARCHIVE_DYNAMIC_ROUTES } from '#site/next.dynamic.constants.mjs';
 import * as basePage from '#site/next.dynamic.page.mjs';
 import { defaultLocale } from '#site/next.locales.mjs';
 import type { DynamicParams } from '#site/types';
@@ -29,7 +29,9 @@ export const generateStaticParams = async () => {
     return [];
   }
 
-  return ARCHIVE_DYNAMIC_ROUTES.map(version => ({
+  const versions = await provideReleaseVersions();
+
+  return versions.map(version => ({
     locale: defaultLocale.code,
     version,
   }));
@@ -53,8 +55,10 @@ const getPage: FC<PageParams> = async props => {
     redirect(`/${locale}/download/archive/${release?.versionWithPrefix}`);
   }
 
+  const versions = await provideReleaseVersions();
+
   // Verifies if the current route is a dynamic route
-  const isDynamicRoute = ARCHIVE_DYNAMIC_ROUTES.some(r => r.includes(pathname));
+  const isDynamicRoute = versions.some(r => r.includes(pathname));
 
   // Gets the Markdown content and context for Download Archive pages
   const [content, context] = await basePage.getMarkdownContext({

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

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

apps/site/components/withSupporters.tsx

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

apps/site/next-data/generators/supportersData.mjs

@@ -25,4 +25,4 @@ async function fetchOpenCollectiveData() {
   return members;
 }
 
-export { fetchOpenCollectiveData };
+export default fetchOpenCollectiveData;

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

@@ -1,7 +1,5 @@
 'use cache';
 
-import generateReleaseData from '#site/next-data/generators/releaseData.mjs';
-
-const provideReleaseData = async () => generateReleaseData();
+import provideReleaseData from '#site/next-data/generators/releaseData.mjs';
 
 export default provideReleaseData;

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

@@ -1,9 +1,5 @@
-import { cache } from 'react';
+'use cache';
 
-import generateAllVersionsData from '#site/next-data/generators/releaseVersions.mjs';
-
-const releaseVersions = await generateAllVersionsData();
-
-const provideReleaseVersions = cache(() => releaseVersions);
+import provideReleaseVersions from '#site/next-data/generators/releaseVersions.mjs';
 
 export default provideReleaseVersions;

apps/site/next-data/providers/supportersData.mjs

@@ -0,0 +1,5 @@
+'use cache';
+
+import provideSupporters from '#site/next-data/generators/supportersData.mjs';
+
+export default provideSupporters;

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

@@ -1,9 +1,5 @@
-import { cache } from 'react';
+'use cache';
 
-import generateVulnerabilities from '#site/next-data/generators/vulnerabilities.mjs';
-
-const vulnerabilities = await generateVulnerabilities();
-
-const provideVulnerabilities = cache(() => vulnerabilities);
+import provideVulnerabilities from '#site/next-data/generators/vulnerabilities.mjs';
 
 export default provideVulnerabilities;

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

@@ -1,7 +1,6 @@
 'use strict';
 
 import { provideBlogPosts } from '#site/next-data/providers/blogData';
-import provideReleaseVersions from '#site/next-data/providers/releaseVersions';
 import { blogData } from '#site/next.json.mjs';
 
 import { BASE_PATH, BASE_URL } from './next.constants.mjs';
@@ -28,19 +27,6 @@ export const BLOG_DYNAMIC_ROUTES = [
     .flat(),
 ];
 
-/**
- * This constant is used to create static routes on-the-fly that do not have a file-system
- * counterpart route. This is useful for providing routes with matching Layout Names
- * but that do not have Markdown content and a matching file for the route
- *
- * @type {Array<string>} A Map of pathname and Layout Name
- */
-export const ARCHIVE_DYNAMIC_ROUTES = [
-  // Creates dynamic routes for downloads archive pages for each version
-  // (e.g., /download/archive/v18.20.8, /download/archive/v20.19.2)
-  ...provideReleaseVersions(),
-];
-
 /**
  * This is the default Next.js Page Metadata for all pages
  *