solve all the various path prefix issues (this should be investigated more, a better solution might be possible)

Author: dario-piotrowicz

apps/site/.cloudflare/node/fs.mjs

@@ -6,8 +6,9 @@ export function readdir(params, cb) {
 }
 
 export function exists(path, cb) {
-  console.log('fs#exists', path, files.includes(path));
-  cb(files.includes(path));
+  const result = files.includes(path) || files.includes(path.replace(/^\//, ''));
+  console.log('fs#exists', path, result);
+  cb(result);
 }
 
 // export function createReadStream(path) {

apps/site/next.dynamic.mjs

@@ -104,8 +104,10 @@ const getDynamicRouter = async () => {
 
     // This verifies if the given pathname actually exists on our Map
     // meaning that the route exists on the website and can be rendered
-    if (pathnameToFilename.has(normalizedPathname)) {
-      const filename = pathnameToFilename.get(normalizedPathname);
+    if (pathnameToFilename.has(normalizedPathname) || pathnameToFilename.has(`pages/${locale}/` + normalizedPathname)) {
+      const filename = (pathnameToFilename.get(normalizedPathname) ?? pathnameToFilename.get(`pages/${locale}/` + normalizedPathname)).replace(
+        new RegExp(`^pages/${locale}/`), ''
+      );
 
       let filePath = join(process.cwd(), 'pages');
 
@@ -120,8 +122,9 @@ const getDynamicRouter = async () => {
         return { source: fileContent, filename };
       }
 
-      const existsPromise = path =>
-        new Promise(resolve => exists(path, resolve));
+      const existsPromise = path => {
+        return new Promise(resolve => exists(path, resolve));
+      }
 
       // No cache hit exists, so we check if the localized file actually
       // exists within our file system and if it does we set it on the cache

apps/site/next.helpers.mjs

@@ -40,13 +40,15 @@ export const getMarkdownFiles = async (root, cwd, ignore = []) => {
   const cacheKey = `${root}${cwd}${ignore.join('')}`;
 
   if (!globCacheByPath.has(cacheKey)) {
+    const keyFiles = files
+      .filter(file => file.startsWith(cwd) || file.startsWith(cwd.replace(/^\//, '')))
+      .map(file => file.replace(`${cwd}/`, '/'));
+
     //globCacheByPath.set(cacheKey, glob('**/*.{md,mdx}', { root, cwd, ignore }));
     globCacheByPath.set(
       cacheKey,
       Promise.resolve(
-        files
-          .filter(file => file.startsWith(cwd))
-          .map(file => file.replace(`${cwd}/`, '/'))
+        keyFiles
       )
     );
   }

apps/site/package.json

@@ -19,6 +19,7 @@
     "scripts:release-post": "cross-env NODE_NO_WARNINGS=1 node scripts/release-post/index.mjs",
     "dev": "cross-env NODE_NO_WARNINGS=1 next dev --turbo",
     "serve": "npm run dev",
+    "predev": "node scripts/prebuild.generator.mjs",
     "prebuild": "node scripts/prebuild.generator.mjs",
     "build": "cross-env NODE_NO_WARNINGS=1 next build",
     "start": "cross-env NODE_NO_WARNINGS=1 next start",