apply suggestions from code review

Co-authored-by: Matt Brophy <matt@brophy.org>
remix-run · Jan 13, 2024 · e998cd0 · e998cd0
1 parent 24b3c4e
commit e998cd0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/packages/remix-dev/config/defaults/entry.server.spa.tsx b/packages/remix-dev/config/defaults/entry.server.spa.tsx
@@ -1,4 +1,4 @@
-import type { AppLoadContext, EntryContext } from "@remix-run/node";
+import type { EntryContext } from "@remix-run/node";
 import { RemixServer } from "@remix-run/react";
 import * as React from "react";
 import { renderToString } from "react-dom/server";
@@ -9,9 +9,12 @@ export default function handleRequest(
   responseHeaders: Headers,
   remixContext: EntryContext
 ) {
-  let html =
-    "<!DOCTYPE html>\n" +
-    renderToString(<RemixServer context={remixContext} url={request.url} />);
+  let html = renderToString(
+    <RemixServer context={remixContext} url={request.url} />
+  );
+  if (html.startsWith("<html")) {
+    html = "<!DOCTYPE html>\n" + html;
+  }
   return new Response(html, {
     headers: { "Content-Type": "text/html" },
     status: responseStatusCode,

diff --git a/templates/spa/app/entry.server.tsx b/templates/spa/app/entry.server.tsx
@@ -8,9 +8,12 @@ export default function handleRequest(
   responseHeaders: Headers,
   remixContext: EntryContext
 ) {
-  const html =
-    "<!DOCTYPE html>\n" +
-    renderToString(<RemixServer context={remixContext} url={request.url} />);
+  let html = renderToString(
+    <RemixServer context={remixContext} url={request.url} />
+  );
+  if (html.startsWith("<html")) {
+    html = "<!DOCTYPE html>\n" + html;
+  }
   return new Response(html, {
     headers: { "Content-Type": "text/html" },
     status: responseStatusCode,