More cleanup (#3)

Author: brophdawg11

app/lib/http.server.ts

@@ -1,21 +1,6 @@
 import { redirect } from "react-router";
 import redirectsFileContents from "../../_redirects?raw";
 
-export const CACHE_CONTROL = {
-  /**
-   * Keep it in the browser (and CDN) for 5 minutes so when they click
-   * back/forward/etc. it's super fast. SWR for 1 week on CDN so it stays fast,
-   * but people get typos/fixes and stuff too.
-   */
-  DEFAULT: "max-age=300, stale-while-revalidate=604800",
-  /**
-   * Keep it in the browser (and CDN) for 1 day, we won't be updating these as
-   * often until the conf is a bit closer, and we can prevent over-fetching from
-   * Sessionize which is pretty slow.
-   */
-  conf: `max-age=${60 * 60 * 24}, stale-while-revalidate=604800`,
-};
-
 // relative to where we're built, build/index.js
 type Redirect = [string, string, number?];
 let redirects: null | Redirect[] = null;
@@ -66,10 +51,6 @@ export function removeTrailingSlashes(request: Request) {
   }
 }
 
-export function isProductionHost(request: Request) {
-  return "remix.run" === request.headers.get("host");
-}
-
 function getValidRedirectCode(code: string | number | undefined) {
   let defaultCode = 302;
   if (!code) return defaultCode;

app/root.tsx

@@ -18,11 +18,7 @@ import {
 } from "fathom-client";
 import "~/styles/tailwind.css";
 import "~/styles/bailwind.css";
-import {
-  removeTrailingSlashes,
-  isProductionHost,
-  handleRedirects,
-} from "~/lib/http.server";
+import { removeTrailingSlashes, handleRedirects } from "~/lib/http.server";
 import { ColorSchemeScript, useColorScheme } from "~/lib/color-scheme";
 import iconsHref from "~/icons.svg";
 import cx from "clsx";
@@ -38,17 +34,14 @@ export const unstable_middleware: Route.unstable_MiddlewareFunction[] = [
 
 export async function loader({ request }: LoaderFunctionArgs) {
   removeTrailingSlashes(request);
-  let isDevHost = !isProductionHost(request);
   let url = new URL(request.url);
 
   let siteUrl = "https://v2.remix.run";
 
   return data({
     host: url.host,
     siteUrl,
-    isProductionHost: !isDevHost,
     noIndex:
-      isDevHost ||
       url.pathname === "/docs/en/v1/api/remix" ||
       url.pathname === "/docs/en/v1/api/conventions",
   });

app/routes/_extras.tsx

@@ -1,16 +1,8 @@
-import type { HeadersFunction } from "react-router";
 import { Outlet } from "react-router";
-import { CACHE_CONTROL } from "~/lib/http.server";
 import { DocSearchModal } from "~/ui/docsearch";
 import { Footer } from "~/ui/footer";
 import { Header } from "~/ui/header";
 
-export const headers: HeadersFunction = () => {
-  return {
-    "Cache-Control": CACHE_CONTROL.DEFAULT,
-  };
-};
-
 export default function ExtrasLayout() {
   return (
     <div className="flex h-full flex-1 flex-col">

app/routes/_marketing._index.tsx

@@ -1,4 +1,4 @@
-import { type HeadersFunction, data } from "react-router";
+import { data } from "react-router";
 import { OutlineButtonLink, PrimaryButtonLink } from "~/ui/buttons";
 import { getMarkdownTutPage, type Prose } from "~/lib/mdtut.server";
 import "~/styles/index.css";
@@ -8,7 +8,6 @@ import { ScrollExperience } from "~/ui/homepage-scroll-experience";
 import invariant from "tiny-invariant";
 import { Fragment } from "react";
 import { getMeta } from "~/lib/meta";
-import { CACHE_CONTROL } from "~/lib/http.server";
 import type { Route } from "./+types/_marketing._index";
 
 export function meta({ matches }: Route.MetaArgs) {
@@ -34,20 +33,12 @@ export const loader = async () => {
   invariant(mutations.type === "sequence", "mutations.md should be a sequence");
   invariant(errors.type === "sequence", "errors.md should be a sequence");
 
-  return data(
-    {
-      sample,
-      sampleSm,
-      mutations,
-      errors,
-    },
-    { headers: { "Cache-Control": CACHE_CONTROL.DEFAULT } },
-  );
-};
-
-export const headers: HeadersFunction = ({ loaderHeaders }) => {
-  // Inherit the caching headers from the loader so we don't cache 404s
-  return loaderHeaders;
+  return data({
+    sample,
+    sampleSm,
+    mutations,
+    errors,
+  });
 };
 
 export default function Index({ loaderData }: Route.ComponentProps) {

app/routes/docs.$.tsx

@@ -8,8 +8,6 @@ import {
   data,
   useLoaderData,
 } from "react-router";
-import type { HeadersFunction } from "react-router";
-import { CACHE_CONTROL } from "~/lib/http.server";
 import invariant from "tiny-invariant";
 import type { Doc } from "~/lib/docs";
 import { getDoc } from "~/lib/docs";
@@ -27,27 +25,17 @@ export async function loader({ params }: Route.LoaderArgs) {
       : `docs/${params["*"] || "index"}`;
     let doc = await getDoc(slug);
     if (!doc) throw null;
-    return data(
-      { doc },
-      { headers: { "Cache-Control": CACHE_CONTROL.DEFAULT } },
-    );
+    return data({ doc });
   } catch (error) {
     console.error("Caught error in docs.$ loader", error);
     throw data(null, { status: 404 });
   }
 }
 
-export const headers: HeadersFunction = ({ loaderHeaders }) => {
-  // Inherit the caching headers from the loader so we don't cache 404s
-  let headers = new Headers(loaderHeaders);
-  headers.set("Vary", "Cookie");
-  return headers;
-};
-
 export function meta({ loaderData, matches }: Route.MetaArgs) {
   let rootData = matches[0].loaderData;
-  invariant(rootData && "isProductionHost" in rootData, "No root data found");
-  let { siteUrl, isProductionHost } = rootData;
+  invariant(rootData, "No root data found");
+  let { siteUrl } = rootData;
   let ogImageUrl = siteUrl + "/img/og.1.jpg";
 
   if (!loaderData) {
@@ -56,9 +44,6 @@ export function meta({ loaderData, matches }: Route.MetaArgs) {
 
   let { doc } = loaderData;
 
-  let robots = isProductionHost ? "index,follow" : "noindex,nofollow";
-  robots = "index,follow";
-
   return getMeta({
     title: `${doc.attrs.title} | Remix`,
     // TODO: add a description
@@ -70,8 +55,8 @@ export function meta({ loaderData, matches }: Route.MetaArgs) {
       { name: "og:site_name", content: "Remix" },
       { name: "docsearch:language", content: "en" },
       { name: "docsearch:version", content: "main" },
-      { name: "robots", content: robots },
-      { name: "googlebot", content: robots },
+      { name: "robots", content: "index,follow" },
+      { name: "googlebot", content: "index,follow" },
     ],
   });
 }

app/routes/docs.tsx

@@ -11,7 +11,6 @@ import {
   useNavigate,
   href,
 } from "react-router";
-import type { HeadersFunction } from "react-router";
 import cx from "clsx";
 import { DocSearch } from "~/ui/docsearch";
 
@@ -25,17 +24,9 @@ import {
   setColorScheme,
   type ColorScheme,
 } from "~/lib/color-scheme";
-import { CACHE_CONTROL } from "~/lib/http.server";
 import { Doc, getMenu } from "~/lib/docs";
 import { useHydrated } from "~/ui/primitives/utils";
 
-export const headers: HeadersFunction = () => {
-  return {
-    "Cache-Control": CACHE_CONTROL.DEFAULT,
-    Vary: "Cookie",
-  };
-};
-
 export const loader = async () => {
   return {
     menu: await getMenu(),