meta: remove weird fetch/generator thingies, rely on next's internal revalidate api

Author: ovflowd

apps/site/app/[locale]/layout.tsx

@@ -14,7 +14,9 @@ import '#site/styles/index.css';
 
 const fontClasses = classNames(IBM_PLEX_MONO.variable, OPEN_SANS.variable);
 
-type RotLayoutProps = PropsWithChildren<{ params: { locale: string } }>;
+type RotLayoutProps = PropsWithChildren<{
+  params: Promise<{ locale: string }>;
+}>;
 
 const RootLayout: FC<RotLayoutProps> = async ({ children, params }) => {
   const { locale } = await params;

apps/site/app/[locale]/page.tsx

@@ -31,7 +31,7 @@ type DynamicParams = { params: Promise<DynamicStaticPaths> };
 
 // This is the default Viewport Metadata
 // @see https://nextjs.org/docs/app/api-reference/functions/generate-viewport#generateviewport-function
-export const generateViewport = async () => ({ ...PAGE_VIEWPORT });
+export const generateViewport = () => ({ ...PAGE_VIEWPORT });
 
 // This generates each page's HTML Metadata
 // @see https://nextjs.org/docs/app/api-reference/functions/generate-metadata

apps/site/components/Downloads/DownloadReleasesTable/index.tsx

@@ -1,10 +1,10 @@
 import Badge from '@node-core/ui-components/Common/Badge';
-import { getTranslations } from 'next-intl/server';
+import { useTranslations } from 'next-intl';
 import type { FC } from 'react';
 
 import FormattedTime from '#site/components/Common/FormattedTime';
 import DetailsButton from '#site/components/Downloads/DownloadReleasesTable/DetailsButton';
-import getReleaseData from '#site/next-data/releaseData';
+import provideReleaseData from '#site/next-data/providers/releaseData';
 
 const BADGE_KIND_MAP = {
   'End-of-life': 'warning',
@@ -14,10 +14,9 @@ const BADGE_KIND_MAP = {
   Pending: 'default',
 } as const;
 
-const DownloadReleasesTable: FC = async () => {
-  const releaseData = await getReleaseData();
-
-  const t = await getTranslations();
+const DownloadReleasesTable: FC = () => {
+  const releaseData = provideReleaseData();
+  const t = useTranslations();
 
   return (
     <table id="tbVersions" className="download-table full-width">

apps/site/components/withBlogCrossLinks.tsx

@@ -5,13 +5,13 @@ import CrossLink from '#site/components/Common/CrossLink';
 import getBlogData from '#site/next-data/blogData';
 import type { BlogCategory } from '#site/types';
 
-const WithBlogCrossLinks: FC = async () => {
+const WithBlogCrossLinks: FC = () => {
   const { pathname } = getClientContext();
 
   // Extracts from the static URL the components used for the Blog Post slug
   const [, , category, postname] = pathname.split('/');
 
-  const { posts } = await getBlogData(category as BlogCategory);
+  const { posts } = getBlogData(category as BlogCategory);
 
   const currentItem = posts.findIndex(
     ({ slug }) => slug === `/blog/${category}/${postname}`

apps/site/components/withDownloadSection.tsx

@@ -1,10 +1,10 @@
-import { getLocale } from 'next-intl/server';
+import { useLocale } from 'next-intl';
 import type { FC, PropsWithChildren } from 'react';
 
 import { getClientContext } from '#site/client-context';
 import WithNodeRelease from '#site/components/withNodeRelease';
-import getDownloadSnippets from '#site/next-data/downloadSnippets';
-import getReleaseData from '#site/next-data/releaseData';
+import provideDownloadSnippets from '#site/next-data/providers/downloadSnippets';
+import provideReleaseData from '#site/next-data/providers/releaseData';
 import { defaultLocale } from '#site/next.locales.mjs';
 import {
   ReleaseProvider,
@@ -13,12 +13,13 @@ import {
 
 // 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 = await getDownloadSnippets(defaultLocale.code);
+const fallbackSnippets = provideDownloadSnippets(defaultLocale.code);
 
-const WithDownloadSection: FC<PropsWithChildren> = async ({ children }) => {
-  const locale = await getLocale();
-  const releases = await getReleaseData();
-  const snippets = await getDownloadSnippets(locale);
+const WithDownloadSection: FC<PropsWithChildren> = ({ children }) => {
+  const locale = useLocale();
+  const releases = provideReleaseData();
+
+  const snippets = provideDownloadSnippets(locale);
   const { pathname } = getClientContext();
 
   // Some available translations do not have download snippets translated or have them partially translated

apps/site/components/withFooter.tsx

@@ -28,7 +28,7 @@ const WithFooter: FC = async () => {
   };
 
   const primary = (
-    <>
+    <div className="flex flex-row gap-2">
       <WithNodeRelease status="Active LTS">
         {({ release }) => (
           <BadgeGroup
@@ -53,7 +53,7 @@ const WithFooter: FC = async () => {
           </BadgeGroup>
         )}
       </WithNodeRelease>
-    </>
+    </div>
   );
 
   return (

apps/site/components/withNodeRelease.tsx

@@ -1,6 +1,6 @@
 import type { FC } from 'react';
 
-import getReleaseData from '#site/next-data/releaseData';
+import provideReleaseData from '#site/next-data/providers/releaseData';
 import type { NodeRelease, NodeReleaseStatus } from '#site/types';
 
 type WithNodeReleaseProps = {
@@ -11,11 +11,11 @@ type WithNodeReleaseProps = {
 // This is a React Async Server Component
 // Note that Hooks cannot be used in a RSC async component
 // Async Components do not get re-rendered at all.
-const WithNodeRelease: FC<WithNodeReleaseProps> = async ({
+const WithNodeRelease: FC<WithNodeReleaseProps> = ({
   status,
   children: Component,
 }) => {
-  const releaseData = await getReleaseData();
+  const releaseData = provideReleaseData();
 
   const matchingRelease = releaseData.find(release =>
     [status].flat().includes(release.status)

apps/site/layouts/Blog.tsx

@@ -1,4 +1,4 @@
-import { getTranslations } from 'next-intl/server';
+import { useTranslations } from 'next-intl';
 import type { FC } from 'react';
 
 import { getClientContext } from '#site/client-context';
@@ -17,12 +17,15 @@ const getBlogCategory = (pathname: string) => {
   // hence we attempt to interpolate the full /en/blog/{category}/page/{page}
   // and in case of course no page argument is provided we define it to 1
   // note that malformed routes can't happen as they are all statically generated
-  const [, , category = 'all', , page = 1] = pathname.split('/');
+  const [, , category = 'all', , page = 1] = pathname.split('/') as [
+    unknown,
+    unknown,
+    BlogCategory,
+    unknown,
+    number,
+  ];
 
-  const { posts, pagination } = getBlogData(
-    category as BlogCategory,
-    Number(page)
-  );
+  const { posts, pagination } = getBlogData(category, Number(page));
 
   return {
     category: category,
@@ -32,9 +35,9 @@ const getBlogCategory = (pathname: string) => {
   };
 };
 
-const BlogLayout: FC = async () => {
+const BlogLayout: FC = () => {
+  const t = useTranslations();
   const { pathname } = getClientContext();
-  const t = await getTranslations();
 
   const mapCategoriesToTabs = (categories: Array<BlogCategory>) =>
     categories.map(category => ({

apps/site/layouts/Download.tsx

@@ -7,7 +7,7 @@ import WithNavBar from '#site/components/withNavBar';
 
 import styles from './layouts.module.css';
 
-const DownloadLayout: FC<PropsWithChildren> = async ({ children }) => {
+const DownloadLayout: FC<PropsWithChildren> = ({ children }) => {
   const { frontmatter } = getClientContext();
 
   return (