fix tests

remix-run · Sep 18, 2024 · 6a420aa · 6a420aa
1 parent 02428fb
commit 6a420aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/integration/vite-prerender-test.ts b/integration/vite-prerender-test.ts
@@ -125,6 +125,7 @@ test.describe("Prerendering", () => {
     let clientDir = path.join(fixture.projectDir, "build", "client");
     expect(fs.readdirSync(clientDir).sort()).toEqual([
       ".vite",
+      "__manifest",
       "_root.data",
       "about",
       "about.data",
@@ -178,6 +179,7 @@ test.describe("Prerendering", () => {
     let clientDir = path.join(fixture.projectDir, "build", "client");
     expect(fs.readdirSync(clientDir).sort()).toEqual([
       ".vite",
+      "__manifest",
       "_root.data",
       "about",
       "about.data",

diff --git a/packages/react-router/lib/dom/ssr/single-fetch.tsx b/packages/react-router/lib/dom/ssr/single-fetch.tsx
@@ -412,10 +412,15 @@ export function singleFetchUrl(reqUrl: URL | string) {
 
 async function fetchAndDecode(url: URL, init: RequestInit) {
   let res = await fetch(url, init);
-  if (res.status === 404) {
+
+  // If this 404'd without hitting the running server (most likely in a
+  // pre-rendered app using a CDN), then bubble a standard 404 ErrorResponse
+  if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
     throw new ErrorResponseImpl(404, "Not Found", true);
   }
+
   invariant(res.body, "No response body to decode");
+
   try {
     let decoded = await decodeViaTurboStream(res.body, window);
     return { status: res.status, data: decoded.value };