fixup!

Author: avivkeller

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

@@ -23,6 +23,7 @@ import { joinNested } from '#site/util/array';
 import type { PageParams } from '#site/router/page';
 import type { FC } from 'react';
 
+
 // Generates all possible static paths based on the locales and environment configuration
 // - Returns an empty array if static export is disabled (`ENABLE_STATIC_EXPORT` is false)
 // - If `ENABLE_STATIC_EXPORT_LOCALE` is true, generates paths for all available locales

apps/site/next.helpers.mjs

@@ -1,16 +1,10 @@
 'use strict';
 
 import { glob } from 'node:fs/promises';
+import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-/**
- * We create a locale cache of Glob Promises
- * to avoid reading the file system multiple times
- * this is done since we don't need to constantly re-run the glob
- * query as it is only needed once
- *
- * @type {Map<string, Promise<string>>} */
-const globCacheByPath = new Map();
+import { defaultLocale } from '@node-core/website-i18n/index.mjs';
 
 /**
  * This gets the relative path from `import.meta.url`
@@ -20,28 +14,27 @@ const globCacheByPath = new Map();
  */
 export const getRelativePath = path => fileURLToPath(new URL('.', path));
 
+// TODO(@avivkeller): Turbopack doesn't support `import.meta.resolve`-ing this path
+export const contentBase = join(
+  process.cwd(),
+  `../../packages/content/src/${defaultLocale.code}/`
+);
+
 /**
  * This method is responsible for retrieving a glob of all files that exist
  * within a given language directory
  *
  * Note that we ignore the blog directory for static builds as otherwise generating
  * that many pages would be too much for the build process to handle.
  *
- * @param {string} root the root directory to search from
- * @param {string} cwd the given locale code
- * @param {Array<string>} exclude an array of glob patterns to ignore
+ * @param {import('node:fs').GlobOptions} options
  * @returns {Promise<Array<string>>} a promise containing an array of paths
  */
-export const getMarkdownFiles = async (root, cwd, exclude = []) => {
-  const cacheKey = `${root}${cwd}${exclude.join('')}`;
-
-  if (!globCacheByPath.has(cacheKey)) {
-    const result = Array.fromAsync(
-      glob('**/*.{md,mdx}', { root, cwd, exclude })
-    );
-
-    globCacheByPath.set(cacheKey, result);
-  }
-
-  return globCacheByPath.get(cacheKey);
+export const getMarkdownFiles = async (options = {}) => {
+  return Array.fromAsync(
+    glob('**/*.{md,mdx}', {
+      cwd: contentBase,
+      ...options,
+    })
+  );
 };

apps/site/router/index.ts

@@ -18,7 +18,6 @@ import { PAGE_METADATA } from './constants';
 
 // Constants
 const BASE_URL_PATH = `${BASE_URL}${BASE_PATH}`;
-const MARKDOWN_EXTENSIONS = ['.mdx', '.md', '/index.mdx', '/index.md'] as const;
 const INDEX_PATTERN = /((\/)?(index))?\.mdx?$/i;
 
 // Cache for pathname to filename mappings
@@ -28,7 +27,9 @@ const pathnameToFilename = new Map<string, string>();
  * Normalizes a path to always use forward slashes
  */
 const normalizePath = (path: string): string =>
-  normalize(path).replace(/\\/g, '/');
+  normalize(path)
+    .replace(/\\/g, '/')
+    .replace(/^\. \//, '');
 
 /**
  * Normalizes a filename into a pathname by removing file extensions and index suffixes
@@ -41,29 +42,26 @@ const normalizePathname = (filename: string): string => {
     pathname = pathname.slice(0, -1);
   }
 
-  return normalizePath(pathname).replace(/^\. \//, '');
+  return normalizePath(pathname);
 };
 
 /**
- * Constructs the import path for a markdown file
- */
-const buildImportPath = (
-  locale: string,
-  pathname: string,
-  extension: string
-): string => `../../../packages/content/src/${locale}/${pathname}${extension}`;
-
-/**
- * Attempts to import a markdown file with a specific extension
+ * Attempts to import a markdown file for a given locale and pathname
  */
-const tryImportWithExtension = async (
+const tryImportMarkdown = async (
   locale: string,
-  normalizedPath: string,
-  extension: string
+  pathname: string
 ): Promise<MarkdownFile | null> => {
+  const normalizedPath = normalizePath(pathname);
+  const filename = pathnameToFilename.get(normalizedPath.replace(/^\.\//, ''));
+
+  if (!filename) {
+    return null;
+  }
+
   try {
     const mod = await import(
-      buildImportPath(locale, normalizedPath, extension)
+      `../../../packages/content/src/${locale}/${filename}`
     );
 
     return {
@@ -72,37 +70,13 @@ const tryImportWithExtension = async (
       readingTime: mod.readingTime,
       headings: mod.headings,
       pathname: `/${normalizedPath}`,
-      filename: pathnameToFilename.get(normalizedPath.replace(/^\.\//, ''))!,
+      filename,
     };
   } catch {
     return null;
   }
 };
 
-/**
- * Attempts to import a markdown file for a given locale and pathname
- * Tries multiple file extensions in order of preference
- */
-const tryImportMarkdown = async (
-  locale: string,
-  pathname: string
-): Promise<MarkdownFile | null> => {
-  const normalizedPath = normalizePath(pathname);
-
-  for (const extension of MARKDOWN_EXTENSIONS) {
-    const result = await tryImportWithExtension(
-      locale,
-      normalizedPath,
-      extension
-    );
-    if (result) {
-      return result;
-    }
-  }
-
-  return null;
-};
-
 /**
  * Retrieves a markdown file with locale fallback support
  * Tries the requested locale first, then falls back to the default locale
@@ -207,9 +181,7 @@ export const getPageMetadata = cache(async (locale: string, path: string) => {
 /**
  * All available routes in the application
  */
-export const allRoutes = (
-  await getMarkdownFiles(process.cwd(), `pages/${defaultLocale.code}`)
-)
+export const allRoutes = (await getMarkdownFiles())
   .map(filename => {
     const pathname = normalizePathname(filename);
     pathnameToFilename.set(pathname, filename);

apps/site/scripts/blog-data/generate.mjs

@@ -6,10 +6,9 @@ import readline from 'node:readline';
 
 import graymatter from 'gray-matter';
 
-import { getMarkdownFiles } from '#site/next.helpers.mjs';
+import { contentBase, getMarkdownFiles } from '#site/next.helpers.mjs';
 
-// gets the current blog path based on local module path
-const blogPath = join(process.cwd(), 'pages/en/blog');
+const blogBase = join(contentBase, 'blog');
 
 /**
  * This method parses the source (raw) Markdown content into Frontmatter
@@ -55,9 +54,10 @@ const getFrontMatter = (filename, source) => {
  */
 const generateBlogData = async () => {
   // We retrieve the full pathnames of all Blog Posts to read each file individually
-  const filenames = await getMarkdownFiles(process.cwd(), 'pages/en/blog', [
-    '**/index.md',
-  ]);
+  const filenames = await getMarkdownFiles({
+    cwd: blogBase,
+    exclude: ['**/index.md'],
+  });
 
   /**
    * This contains the metadata of all available blog categories
@@ -69,7 +69,7 @@ const generateBlogData = async () => {
       filename =>
         new Promise(resolve => {
           // We create a stream for reading a file instead of reading the files
-          const _stream = createReadStream(join(blogPath, filename));
+          const _stream = createReadStream(join(blogBase, filename));
 
           // We create a readline interface to read the file line-by-line
           const _readLine = readline.createInterface({ input: _stream });