From 6174e3bde11a453bccf0cf684c012b7c2da0b6de Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Fri, 29 Jul 2022 19:54:35 -0400
Subject: [PATCH 1/2] fix(@remix-run/react): undefinedoptionals should preserve
 `null` types

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

diff --git a/packages/remix-react/components.tsx b/packages/remix-react/components.tsx
index 0c3f7eae6a0..3adb0c6546b 100644
--- a/packages/remix-react/components.tsx
+++ b/packages/remix-react/components.tsx
@@ -1364,12 +1364,20 @@ type SerializeObject<T> = {
   >;
 };
 
-type UndefinedOptionals<T> = Merge<
+/*
+ * For an object T, if it has any properties that are a union with `undefined`,
+ * make those into optional properties instead.
+ * 
+ * Example: { a: string | undefined} --> { a?: string}
+ */
+type UndefinedOptionals<T extends object> = Merge<
   {
-    [k in keyof T as undefined extends T[k] ? never : k]: NonNullable<T[k]>;
+    // Property is not a union with `undefined`, keep as-is
+    [k in keyof T as undefined extends T[k] ? never : k]: T[k];
   },
   {
-    [k in keyof T as undefined extends T[k] ? k : never]?: NonNullable<T[k]>;
+    // Property _is_ a union with `defined`. Set as optional (via `?`) and remove `undefined` from the union
+    [k in keyof T as undefined extends T[k] ? k : never]?: Exclude<T[k], undefined>;
   }
 >;
 

From 170c40ac8bf69f70376b15be782a2269a1b0941c Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Fri, 29 Jul 2022 20:18:34 -0400
Subject: [PATCH 2/2] Create nervous-walls-sing.md

---
 .changeset/nervous-walls-sing.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .changeset/nervous-walls-sing.md

diff --git a/.changeset/nervous-walls-sing.md b/.changeset/nervous-walls-sing.md
new file mode 100644
index 00000000000..96ba17a3aef
--- /dev/null
+++ b/.changeset/nervous-walls-sing.md
@@ -0,0 +1,10 @@
+---
+"remix": patch
+"@remix-run/react": patch
+---
+
+Fix inferred types for `useLoaderData` and `useActionData` to preserve `null`s.
+
+Previously, `null`s were being replaced by `never`s due to usage of `NonNullable` in `UndefinedOptionals`.
+Properties that aren't unions with `undefined` are now kept as-is, while properties that _do_ include `undefined`
+are still made optional, but _only_ remove `undefined` from the property type whereas `NonNullable` also removed `null`s.