Fix fallback-true pages

Author: better-salmon

.vscode/settings.json

@@ -39,5 +39,8 @@
   },
   "[typescriptreact]": {
     "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[html]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
 }

apps/cache-testing/package.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "@neshca/cache-handler": "workspace:*",
     "axios": "1.8.3",
-    "next": "15.2.2",
+    "next": "15.2.3",
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "redis": "4.7.0"
@@ -28,7 +28,7 @@
     "@repo/eslint-config": "workspace:*",
     "@repo/typescript-config": "workspace:*",
     "@types/node": "22.13.10",
-    "@types/react": "19.0.10",
+    "@types/react": "19.0.11",
     "@types/react-dom": "19.0.4",
     "dotenv-cli": "8.0.0",
     "eslint": "9.22.0",

apps/cache-testing/run-app-instances.ts

@@ -2,12 +2,7 @@
 
 import { scheduler } from 'node:timers/promises';
 import Fastify from 'fastify';
-// biome-ignore lint/style/noNamespaceImport: pm2 works only with namespace import
-import * as pm2Default from 'pm2';
-
-const { default: pm2 } = pm2Default as unknown as {
-  default: typeof import('pm2');
-};
+import pm2 from 'pm2';
 
 const args = process.argv
   .slice(2)

apps/cache-testing/tests/pages.spec.ts

@@ -3,10 +3,10 @@ import { expect, test } from '@playwright/test';
 
 const paths = [
   '/pages/with-paths/fallback-blocking/200',
-  // '/pages/with-paths/fallback-true/200',
+  '/pages/with-paths/fallback-true/200',
   '/pages/with-paths/fallback-false/200',
   '/pages/no-paths/fallback-blocking/200',
-  // '/pages/no-paths/fallback-true/200',
+  '/pages/no-paths/fallback-true/200',
   // '/pages/no-paths/fallback-false/200', // this fails with native next.js cache
 ];
 

docs/cache-handler-docs/package.json

@@ -12,7 +12,7 @@
     "start:docs": "serve out"
   },
   "dependencies": {
-    "next": "15.2.2",
+    "next": "15.2.3",
     "nextra": "4.2.16",
     "nextra-theme-docs": "4.2.16",
     "react": "19.0.0",
@@ -22,7 +22,7 @@
     "@repo/eslint-config": "workspace:*",
     "@repo/typescript-config": "workspace:*",
     "@types/node": "22.13.10",
-    "@types/react": "19.0.10",
+    "@types/react": "19.0.11",
     "@types/react-dom": "19.0.4",
     "eslint": "9.22.0",
     "pagefind": "1.3.0",

internal/eslint-config/package.json

@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@eslint/js": "9.22.0",
-    "@next/eslint-plugin-next": "15.2.2",
+    "@next/eslint-plugin-next": "15.2.3",
     "eslint": "9.22.0",
     "eslint-config-prettier": "10.1.1",
     "eslint-plugin-react": "7.37.4",

packages/cache-handler/src/cache-handler.ts

@@ -386,6 +386,7 @@ export class CacheHandler implements NextCacheHandler {
 
   static async #readPagesRouterPage(
     cacheKey: string,
+    isFallback: boolean,
   ): Promise<CacheHandlerValue | null> {
     let cacheHandlerValue: CacheHandlerValue | null = null;
     let pageHtmlHandle: fsPromises.FileHandle | null = null;
@@ -417,9 +418,11 @@ export class CacheHandler implements NextCacheHandler {
       const [pageHtmlFile, { mtimeMs }, pageData] = await Promise.all([
         pageHtmlHandle.readFile('utf-8'),
         pageHtmlHandle.stat(),
-        fsPromises
-          .readFile(pageDataPath, 'utf-8')
-          .then((data) => JSON.parse(data) as object),
+        isFallback
+          ? {}
+          : fsPromises
+              .readFile(pageDataPath, 'utf-8')
+              .then((data) => JSON.parse(data) as object),
       ]);
 
       if (CacheHandler.#debug) {
@@ -849,14 +852,21 @@ export class CacheHandler implements NextCacheHandler {
       });
 
     if (!cachedData && CacheHandler.#fallbackFalseRoutes.has(cacheKey)) {
-      cachedData = await CacheHandler.#readPagesRouterPage(cacheKey);
+      cachedData = await CacheHandler.#readPagesRouterPage(cacheKey, false);
 
       // if we have a value from the file system, we should set it to the cache store
       if (cachedData) {
         await CacheHandler.#mergedHandler.set(cacheKey, cachedData);
       }
     }
 
+    if (ctx.isFallback) {
+      cachedData = await CacheHandler.#readPagesRouterPage(
+        cacheKey,
+        ctx.isFallback,
+      );
+    }
+
     return cachedData ?? null;
   }
 

packages/cache-handler/src/use-cache/redis.ts

@@ -417,13 +417,6 @@ function createRedisCacheHandler(config: RedisConfig = {}) {
             errorRetryCount: 0,
           };
 
-          console.info(
-            'entry.expire, entry.revalidate, entry.stale',
-            entry.expire,
-            entry.revalidate,
-            entry.stale,
-          );
-
           // Store in Redis with an expiration
           await redisClient.set(
             getKey(cacheKey),