Fix types for unstable_data (#9811)

remix-run · Jul 31, 2024 · c8f308f · c8f308f
1 parent ce01ef1
commit c8f308f
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 34 deletions.
diff --git a/.changeset/mighty-needles-destroy.md b/.changeset/mighty-needles-destroy.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+[REMOVE] Fix typings for unstable_data and useLoaderData
diff --git a/integration/package.json b/integration/package.json
@@ -14,7 +14,7 @@
     "@remix-run/dev": "workspace:*",
     "@remix-run/express": "workspace:*",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.19.0-pre.0",
+    "@remix-run/router": "1.19.0-pre.1",
     "@remix-run/server-runtime": "workspace:*",
     "@types/express": "^4.17.9",
     "@vanilla-extract/css": "^1.10.0",

diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -32,7 +32,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.19.0-pre.0",
+    "@remix-run/router": "1.19.0-pre.1",
     "@remix-run/server-runtime": "workspace:*",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",

diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
@@ -19,10 +19,10 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.19.0-pre.0",
+    "@remix-run/router": "1.19.0-pre.1",
     "@remix-run/server-runtime": "workspace:*",
-    "react-router": "6.26.0-pre.0",
-    "react-router-dom": "6.26.0-pre.0",
+    "react-router": "6.26.0-pre.1",
+    "react-router-dom": "6.26.0-pre.1",
     "turbo-stream": "2.2.0"
   },
   "devDependencies": {

diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
@@ -19,7 +19,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.19.0-pre.0",
+    "@remix-run/router": "1.19.0-pre.1",
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.6.0",

diff --git a/packages/remix-server-runtime/single-fetch.ts b/packages/remix-server-runtime/single-fetch.ts
@@ -2,6 +2,7 @@ import type {
   StaticHandler,
   unstable_DataStrategyFunctionArgs as DataStrategyFunctionArgs,
   unstable_DataStrategyFunction as DataStrategyFunction,
+  UNSAFE_DataWithResponseInit as DataWithResponseInit,
 } from "@remix-run/router";
 import {
   isRouteErrorResponse,
@@ -335,7 +336,10 @@ export function encodeViaTurboStream(
   });
 }
 
-export function data(value: Serializable, init?: number | ResponseInit) {
+export function data<D extends Serializable>(
+  value: D,
+  init?: number | ResponseInit
+) {
   return routerData(value, init);
 }
 
@@ -361,6 +365,7 @@ type Serializable =
 
 type DataFunctionReturnValue =
   | Serializable
+  | DataWithResponseInit<Serializable>
   | TypedDeferredData<Record<string, unknown>>
   | TypedResponse<Record<string, unknown>>;
 
@@ -372,6 +377,7 @@ type DataFunctionReturnValue =
 export type Serialize<T extends Loader | Action> =
   Awaited<ReturnType<T>> extends TypedDeferredData<infer D> ? D :
   Awaited<ReturnType<T>> extends TypedResponse<Record<string, unknown>> ? SerializeFrom<T> :
+  Awaited<ReturnType<T>> extends DataWithResponseInit<infer D> ? D :
   Awaited<ReturnType<T>>;
 
 export type Loader = (

diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@remix-run/node": "workspace:*",
     "@remix-run/react": "workspace:*",
-    "@remix-run/router": "1.19.0-pre.0",
-    "react-router-dom": "6.26.0-pre.0"
+    "@remix-run/router": "1.19.0-pre.1",
+    "react-router-dom": "6.26.0-pre.1"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "workspace:*",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml