From 2f252f98fc79a048cc6397dd7194314ed652266a Mon Sep 17 00:00:00 2001
From: Jason Miller <jason@developit.ca>
Date: Wed, 17 Nov 2021 13:13:24 -0500
Subject: [PATCH 1/3] Make <Scripts> render nothing on the client

---
 packages/remix-react/components.tsx | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/remix-react/components.tsx b/packages/remix-react/components.tsx
index 6f2b5e4e2e2..7a1e44668da 100644
--- a/packages/remix-react/components.tsx
+++ b/packages/remix-react/components.tsx
@@ -672,15 +672,25 @@ type ScriptProps = Omit<
   | "suppressHydrationWarning"
 >;
 
+export const Scripts =
+  typeof document === "undefined" ? ServerScripts : ClientScripts;
+
+/**
+ * Browser implementation of <Scripts>, which does nothing.
+ */
+function ClientScripts(props: ScriptProps) {
+  return null;
+}
+
 /**
- * Renders the `<script>` tags needed for the initial render. Bundles for
- * additional routes are loaded later as needed.
+ * Server implementation of <Scripts>, which renders the `<script>` tags needed
+ * for the initial render. Bundles for additional routes are loaded later as needed.
  *
  * @param props Additional properties to add to each script tag that is rendered.
  * In addition to scripts, \<link rel="modulepreload"> tags receive the crossOrigin
  * property if provided.
  */
-export function Scripts(props: ScriptProps) {
+function ServerScripts(props: ScriptProps) {
   let {
     manifest,
     matches,
@@ -690,6 +700,8 @@ export function Scripts(props: ScriptProps) {
   } = useRemixEntryContext();
 
   let initialScripts = React.useMemo(() => {
+    // if (typeof document !== 'undefined') return null;
+
     let contextScript = serverHandoffString
       ? `window.__remixContext = ${serverHandoffString};`
       : "";

From f5f3f7464d0c232482dcf9d2a84e877519aa39b4 Mon Sep 17 00:00:00 2001
From: Jason Miller <developit@users.noreply.github.com>
Date: Wed, 17 Nov 2021 13:19:35 -0500
Subject: [PATCH 2/3] sign CLA

---
 contributors.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contributors.yml b/contributors.yml
index cc691be0c86..f84ada806e3 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -1 +1,2 @@
 - mcansh
+- developit

From 2facf6983c1ef402ed2feccad320ac817e8df30f Mon Sep 17 00:00:00 2001
From: Jason Miller <developit@users.noreply.github.com>
Date: Thu, 18 Nov 2021 10:36:52 -0500
Subject: [PATCH 3/3] use `typeof window`

---
 packages/remix-react/components.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/remix-react/components.tsx b/packages/remix-react/components.tsx
index 7a1e44668da..fc7c1d018f0 100644
--- a/packages/remix-react/components.tsx
+++ b/packages/remix-react/components.tsx
@@ -673,7 +673,7 @@ type ScriptProps = Omit<
 >;
 
 export const Scripts =
-  typeof document === "undefined" ? ServerScripts : ClientScripts;
+  typeof window === "undefined" ? ServerScripts : ClientScripts;
 
 /**
  * Browser implementation of <Scripts>, which does nothing.