Merge branch 'main' into austinmerrick/upgrade-vercel-nft

TooTallNate · web-flow · commit f9da912c5ccc · 2025-01-02T18:57:19.000-08:00
diff --git a/.changeset/vercel-remix-run-dev-2-15-2.md b/.changeset/vercel-remix-run-dev-2-15-2.md
@@ -0,0 +1,5 @@
+---
+'@vercel/remix-builder': patch
+---
+
+Update `@remix-run/dev` fork to v2.15.2
diff --git a/.changeset/witty-bulldogs-attend.md b/.changeset/witty-bulldogs-attend.md
@@ -0,0 +1,6 @@
+---
+'@vercel/next': patch
+'vercel': patch
+---
+
+Fix bug where when page doesn't postpone it still generates a correct fallback
diff --git a/packages/next/src/utils.ts b/packages/next/src/utils.ts
@@ -2243,12 +2243,14 @@ export const onPrerenderRoute =
     // If enabled, try to get the postponed route information from the file
     // system and use it to assemble the prerender.
     let postponedPrerender: string | undefined;
+    let didPostpone = false;
     if (renderingMode === RenderingMode.PARTIALLY_STATIC && appDir) {
       const htmlPath = path.join(appDir, `${routeFileNoExt}.html`);
       const metaPath = path.join(appDir, `${routeFileNoExt}.meta`);
       if (fs.existsSync(htmlPath) && fs.existsSync(metaPath)) {
         const meta = JSON.parse(await fs.readFile(metaPath, 'utf8'));
         if ('postponed' in meta && typeof meta.postponed === 'string') {
+          didPostpone = true;
           postponedPrerender = meta.postponed;
 
           // Assign the headers Content-Type header to the prerendered type.
@@ -2259,6 +2261,14 @@ export const onPrerenderRoute =
           // Read the HTML file and append it to the prerendered content.
           const html = await fs.readFileSync(htmlPath, 'utf8');
           postponedPrerender += html;
+        } else {
+          // Set the content type to text/html; charset=utf-8.
+          initialHeaders ??= {};
+          initialHeaders['content-type'] = 'text/html; charset=utf-8';
+
+          // Read the HTML file and set it to the prerendered content.
+          const html = await fs.readFileSync(htmlPath, 'utf8');
+          postponedPrerender = html;
         }
       }
 
@@ -2698,7 +2708,7 @@ export const onPrerenderRoute =
                         'content-type': rscContentTypeHeader,
                       }
                     : {}),
-                  ...(postponedPrerender && rscDidPostponeHeader && !isFallback
+                  ...(didPostpone && rscDidPostponeHeader && !isFallback
                     ? { [rscDidPostponeHeader]: '1' }
                     : {}),
                 },
diff --git a/packages/next/test/fixtures/00-app-dir-ppr/app/static/[slug]/page.js b/packages/next/test/fixtures/00-app-dir-ppr/app/static/[slug]/page.js
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>static page</p>;
+}
diff --git a/packages/remix/package.json b/packages/remix/package.json
@@ -39,5 +39,5 @@
     "semver": "7.5.2",
     "vitest": "2.0.1"
   },
-  "VERCEL_REMIX_RUN_DEV_MAX_VERSION": "2.15.1"
+  "VERCEL_REMIX_RUN_DEV_MAX_VERSION": "2.15.2"
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@vercel/remix-builder': patch
 +---
++
 +Update `@remix-run/dev` fork to v2.15.2
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default function Page() {`
	`2`	`+ return <p>static page</p>;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@`
`39`	`39`	`"semver": "7.5.2",`
`40`	`40`	`"vitest": "2.0.1"`
`41`	`41`	`},`
`42`		`- "VERCEL_REMIX_RUN_DEV_MAX_VERSION": "2.15.1"`
	`42`	`+ "VERCEL_REMIX_RUN_DEV_MAX_VERSION": "2.15.2"`
`43`	`43`	`}`