fixup! make site work with the Cloudflare OpenNext adapter

remove all changes related to async context

Author: dario-piotrowicz

apps/site/app/[locale]/feed/[feed]/route.ts

@@ -14,7 +14,7 @@ export const GET = async (_: Request, props: StaticParams) => {
   const params = await props.params;
 
   // Generate the Feed for the given feed type (blog, releases, etc)
-  const websiteFeed = await provideWebsiteFeeds(params.feed);
+  const websiteFeed = provideWebsiteFeeds(params.feed);
 
   return new NextResponse(websiteFeed, {
     headers: { 'Content-Type': 'application/xml' },

apps/site/app/[locale]/next-data/api-data/route.ts

@@ -21,7 +21,7 @@ const getPathnameForApiFile = (name: string, version: string) =>
 // for a digest and metadata of all API pages from the Node.js Website
 // @see https://nextjs.org/docs/app/building-your-application/routing/router-handlers
 export const GET = async () => {
-  const releases = await provideReleaseData();
+  const releases = provideReleaseData();
 
   const { versionWithPrefix } = releases.find(
     release => release.status === 'LTS'

apps/site/app/[locale]/next-data/blog-data/[category]/[page]/route.ts

@@ -20,11 +20,12 @@ export const GET = async (_: Request, props: StaticParams) => {
 
   const requestedPage = Number(params.page);
 
-  const data = await (requestedPage >= 1
-    ? // This allows us to blindly get all blog posts from a given category
-      // if the page number is 0 or something smaller than 1
-      providePaginatedBlogPosts(params.category, requestedPage)
-    : provideBlogPosts(params.category));
+  const data =
+    requestedPage >= 1
+      ? // This allows us to blindly get all blog posts from a given category
+        // if the page number is 0 or something smaller than 1
+        providePaginatedBlogPosts(params.category, requestedPage)
+      : provideBlogPosts(params.category);
 
   return Response.json(data, { status: data.posts.length ? 200 : 404 });
 };

apps/site/app/[locale]/next-data/download-snippets/route.tsx

@@ -11,7 +11,7 @@ export const GET = async (_: Request, props: StaticParams) => {
   const params = await props.params;
 
   // Retrieve all available Download snippets for a given locale if available
-  const snippets = await provideDownloadSnippets(params.locale);
+  const snippets = provideDownloadSnippets(params.locale);
 
   // We append always the default/fallback snippets when a result is found
   return Response.json(snippets, {

apps/site/app/[locale]/next-data/release-data/route.ts

@@ -5,7 +5,7 @@ import { defaultLocale } from '@/next.locales.mjs';
 // for generating static data related to the Node.js Release Data
 // @see https://nextjs.org/docs/app/building-your-application/routing/router-handlers
 export const GET = async () => {
-  const releaseData = await provideReleaseData();
+  const releaseData = provideReleaseData();
 
   return Response.json(releaseData);
 };

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

@@ -92,7 +92,7 @@ const getPage: FC<DynamicParams> = async props => {
   // Gets the current full pathname for a given path
   const pathname = dynamicRouter.getPathname(path);
 
-  const staticGeneratedLayout = (await DYNAMIC_ROUTES()).get(pathname);
+  const staticGeneratedLayout = DYNAMIC_ROUTES.get(pathname);
 
   // If the current pathname is a statically generated route
   // it means it does not have a Markdown file nor exists under the filesystem

apps/site/components/withDownloadSection.tsx

@@ -7,15 +7,12 @@ import getDownloadSnippets from '@/next-data/downloadSnippets';
 import getReleaseData from '@/next-data/releaseData';
 import { defaultLocale } from '@/next.locales.mjs';
 import { ReleaseProvider, ReleasesProvider } from '@/providers/releaseProvider';
-import type { DownloadSnippet } from '@/types';
 
 // 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
-let fallbackSnippets: Array<DownloadSnippet>;
+const fallbackSnippets = await getDownloadSnippets(defaultLocale.code);
 
 const WithDownloadSection: FC<PropsWithChildren> = async ({ children }) => {
-  fallbackSnippets ??= await getDownloadSnippets(defaultLocale.code);
-
   const locale = await getLocale();
   const releases = await getReleaseData();
   const snippets = await getDownloadSnippets(locale);

apps/site/next-data/downloadSnippets.ts

@@ -29,7 +29,7 @@ export default async function getDownloadSnippets(
     const { default: provideDownloadSnippets } = await import(
       '@/next-data/providers/downloadSnippets'
     );
-    return (await provideDownloadSnippets(lang))!;
+    return provideDownloadSnippets(lang)!;
   }
 
   // Applies the language to the URL, since this content is actually localized

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

@@ -2,22 +2,15 @@ import { cache } from 'react';
 
 import generateBlogData from '@/next-data/generators/blogData.mjs';
 import { BLOG_POSTS_PER_PAGE } from '@/next.constants.mjs';
-import type { BlogCategory, BlogPostsRSC, BlogPost } from '@/types';
+import type { BlogCategory, BlogPostsRSC } from '@/types';
 
-let blogData: {
-  categories: Array<BlogCategory>;
-  posts: Array<BlogPost>;
-};
+const { categories, posts } = await generateBlogData();
 
-export const provideBlogCategories = cache(async () => {
-  blogData ??= await generateBlogData();
-  return blogData.categories;
-});
+export const provideBlogCategories = cache(() => categories);
 
 export const provideBlogPosts = cache(
-  async (category: BlogCategory): Promise<BlogPostsRSC> => {
-    blogData ??= await generateBlogData();
-    const categoryPosts = blogData.posts
+  (category: BlogCategory): BlogPostsRSC => {
+    const categoryPosts = posts
       .filter(post => post.categories.includes(category))
       .sort((a, b) => b.date.getTime() - a.date.getTime());
 
@@ -39,8 +32,8 @@ export const provideBlogPosts = cache(
 );
 
 export const providePaginatedBlogPosts = cache(
-  async (category: BlogCategory, page: number): Promise<BlogPostsRSC> => {
-    const { posts, pagination } = await provideBlogPosts(category);
+  (category: BlogCategory, page: number): BlogPostsRSC => {
+    const { posts, pagination } = provideBlogPosts(category);
 
     // This autocorrects if invalid numbers are given to only allow
     // actual valid numbers to be provided

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

@@ -2,9 +2,9 @@ import { cache } from 'react';
 
 import generateDownloadSnippets from '@/next-data/generators/downloadSnippets.mjs';
 
-const provideDownloadSnippets = cache(async (language: string) => {
-  const downloadSnippets = await generateDownloadSnippets();
+const downloadSnippets = await generateDownloadSnippets();
 
+const provideDownloadSnippets = cache((language: string) => {
   if (downloadSnippets.has(language)) {
     return downloadSnippets.get(language)!;
   }

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

@@ -2,6 +2,8 @@ import { cache } from 'react';
 
 import generateReleaseData from '@/next-data/generators/releaseData.mjs';
 
-const provideReleaseData = cache(() => generateReleaseData());
+const releaseData = await generateReleaseData();
+
+const provideReleaseData = cache(() => releaseData);
 
 export default provideReleaseData;

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

@@ -3,13 +3,9 @@ import { cache } from 'react';
 import generateWebsiteFeeds from '@/next-data/generators/websiteFeeds.mjs';
 import { provideBlogPosts } from '@/next-data/providers/blogData';
 
-const getWebsiteFeeds = cache(async () =>
-  generateWebsiteFeeds(await provideBlogPosts('all'))
-);
-
-const provideWebsiteFeeds = cache(async (feed: string) => {
-  const websiteFeeds = await getWebsiteFeeds();
+const websiteFeeds = generateWebsiteFeeds(provideBlogPosts('all'));
 
+const provideWebsiteFeeds = cache((feed: string) => {
   if (feed.includes('.xml') && websiteFeeds.has(feed)) {
     return websiteFeeds.get(feed)!.rss2();
   }

apps/site/next.dynamic.constants.mjs

@@ -27,31 +27,23 @@ export const IGNORED_ROUTES = [
  * 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 {() => Promise<Map<string, import('./types').Layouts>>} A Map of pathname and Layout Name
+ * @type {Map<string, import('./types').Layouts>} A Map of pathname and Layout Name
  */
-export const DYNAMIC_ROUTES = async () => {
-  const blogCategories = await provideBlogCategories();
-
-  const pages = [];
-  for (const c of blogCategories) {
-    const categoryPages = (await provideBlogPosts(c)).pagination.pages;
-    pages.push([c, categoryPages]);
-  }
-
-  return new Map([
-    // Provides Routes for all Blog Categories
-    ...blogCategories.map(c => [`blog/${c}`, 'blog-category']),
-    // Provides Routes for all Blog Categories w/ Pagination
-    ...pages
-      // creates a numeric array for each page and define a pathname for
-      // each page for a category (i.e. blog/all/page/1)
-      .map(([c, t]) => [...Array(t).keys()].map(p => `blog/${c}/page/${p + 1}`))
-      // creates a tuple of each pathname and layout for the route
-      .map(paths => paths.map(path => [path, 'blog-category']))
-      // flattens the array since we have a .map inside another .map
-      .flat(),
-  ]);
-};
+export const DYNAMIC_ROUTES = new Map([
+  // Provides Routes for all Blog Categories
+  ...provideBlogCategories().map(c => [`blog/${c}`, 'blog-category']),
+  // Provides Routes for all Blog Categories w/ Pagination
+  ...provideBlogCategories()
+    // retrieves the amount of pages for each blog category
+    .map(c => [c, provideBlogPosts(c).pagination.pages])
+    // creates a numeric array for each page and define a pathname for
+    // each page for a category (i.e. blog/all/page/1)
+    .map(([c, t]) => [...Array(t).keys()].map(p => `blog/${c}/page/${p + 1}`))
+    // creates a tuple of each pathname and layout for the route
+    .map(paths => paths.map(path => [path, 'blog-category']))
+    // flattens the array since we have a .map inside another .map
+    .flat(),
+]);
 
 /**
  * This is the default Next.js Page Metadata for all pages

apps/site/next.dynamic.mjs

@@ -93,7 +93,7 @@ const getDynamicRouter = async () => {
 
     return [...pathnameToFilename.keys()]
       .filter(shouldIgnoreStaticRoute)
-      .concat([...(await DYNAMIC_ROUTES()).keys()]);
+      .concat([...DYNAMIC_ROUTES.keys()]);
   };
 
   /**

apps/site/package.json

@@ -21,7 +21,7 @@
     "test": "turbo test:unit",
     "build:worker": "npx opennextjs-cloudflare build",
     "postbuild:worker": "node ./.cloudflare/prepare-build.mjs",
-    "cf:preview": "npm run build:worker && npx wrangler dev",
+    "cf:preview": "npm run build:worker && sleep 3 && npx wrangler dev",
     "cf:deploy": "npx wrangler deploy"
   },
   "dependencies": {