Merge branch 'main' into release-next

remix-run · Feb 21, 2024 · 5b0c8ca · 5b0c8ca
2 parents e775fd0 + 91af129
commit 5b0c8ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/contributors.yml b/contributors.yml
@@ -74,6 +74,7 @@
 - bmac
 - bmarvinb
 - bmontalvo
+- bobziroll
 - bogas04
 - BogdanDevBst
 - bolchowka

diff --git a/docs/guides/client-data.md b/docs/guides/client-data.md
@@ -14,7 +14,7 @@ These new exports are a bit of a sharp knife and are not recommended as your _pr
 - **Client Cache:** Cache server loader data in the client and avoid some server calls
 - **Migration:** Ease your migration from React Router -> Remix SPA -> Remix SSR (once Remix supports [SPA Mode][rfc-spa])
 
-Please use these new exports with caution! If you're not careful - it's easy to get your UI out of sync. Remix out of the box tries _very_ hard to ensure that this doesn't happen - but once you take control over your own client-side cache, and potentially prevent Remix from performing it's normal server `fetch` calls - then Remix can no longer guarantee your UI remains in sync.
+Please use these new exports with caution! If you're not careful - it's easy to get your UI out of sync. Remix out of the box tries _very_ hard to ensure that this doesn't happen - but once you take control over your own client-side cache, and potentially prevent Remix from performing its normal server `fetch` calls - then Remix can no longer guarantee your UI remains in sync.
 
 ## Skip the Hop