expo-router 2.0.8 → 2.0.9

package/build/useDeprecated.d.ts

@@ -1,3 +1,9 @@
 export declare function useWarnOnce(message: string, guard?: unknown, key?: string): void;
-export declare function useDeprecated(message: string, guard?: unknown, key?: string): void;
+export declare function useDeprecated(
+/** The deprecated message to display */
+message: string, 
+/** The guard to cause the warning to being displayed */
+guard?: unknown, 
+/** The key to use for the warning. Used to detect if the warning has already been shown. */
+key?: string): void;
 //# sourceMappingURL=useDeprecated.d.ts.map

package/build/useDeprecated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDeprecated.d.ts","sourceRoot":"","sources":["../src/useDeprecated.ts"],"names":[],"mappings":"AAaA,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,EACf,KAAK,GAAE,OAAc,EACrB,GAAG,SAAU,QAUd;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,KAAK,GAAE,OAAc,EACrB,GAAG,SAAU,QAGd"}
+{"version":3,"file":"useDeprecated.d.ts","sourceRoot":"","sources":["../src/useDeprecated.ts"],"names":[],"mappings":"AAaA,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,EACf,KAAK,GAAE,OAAc,EACrB,GAAG,SAAU,QAUd;AAED,wBAAgB,aAAa;AAC3B,wCAAwC;AACxC,OAAO,EAAE,MAAM;AACf,wDAAwD;AACxD,KAAK,GAAE,OAAc;AACrB,4FAA4F;AAC5F,GAAG,SAAU,QAGd"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",
   "files": [
@@ -105,12 +105,12 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "2.2.10",
+    "@expo/metro-runtime": "2.2.11",
     "@radix-ui/react-slot": "1.0.1",
     "@react-navigation/bottom-tabs": "~6.5.7",
     "@react-navigation/native": "~6.1.6",
     "@react-navigation/native-stack": "~6.9.12",
-    "expo-head": "0.0.14",
+    "expo-head": "0.0.15",
     "expo-splash-screen": "~0.20.2",
     "query-string": "7.1.3",
     "react-helmet-async": "^1.3.0",

package/src/global-state/routing.ts

@@ -75,9 +75,11 @@ export function linkTo(this: RouterStore, href: string, event?: string) {
     return;
   }
 
+  const rootState = navigationRef.getRootState();
+
   if (href.startsWith(".")) {
     let base =
-      this.linking.getPathFromState?.(navigationRef.getRootState(), {
+      this.linking.getPathFromState?.(rootState, {
         screens: [],
         preserveGroups: true,
       }) ?? "";
@@ -99,11 +101,9 @@ export function linkTo(this: RouterStore, href: string, event?: string) {
 
   switch (event) {
     case "REPLACE":
-      return navigationRef.dispatch(
-        getNavigateReplaceAction(state, navigationRef.getRootState())
-      );
+      return navigationRef.dispatch(getNavigateReplaceAction(state, rootState));
     default:
-      return navigationRef.dispatch(getNavigatePushAction(state));
+      return navigationRef.dispatch(getNavigatePushAction(state, rootState));
   }
 }
 
@@ -132,10 +132,11 @@ function rewriteNavigationStateToParams(
   return JSON.parse(JSON.stringify(params));
 }
 
-function getNavigatePushAction(state: ResultState) {
+function getNavigatePushAction(state: ResultState, rootState: NavigationState) {
   const { screen, params } = rewriteNavigationStateToParams(state);
   return {
     type: "NAVIGATE",
+    target: rootState.key,
     payload: {
       name: screen,
       params,
@@ -144,12 +145,12 @@ function getNavigatePushAction(state: ResultState) {
 }
 
 function getNavigateReplaceAction(
-  previousState: ResultState,
+  state: ResultState,
   parentState: NavigationState,
   lastNavigatorSupportingReplace: NavigationState = parentState
 ): NavigationAction {
   // We should always have at least one route in the state
-  const state = previousState.routes.at(-1)!;
+  const route = state.routes.at(-1)!;
 
   // Only these navigators support replace
   if (parentState.type === "stack" || parentState.type === "tab") {
@@ -157,29 +158,29 @@ function getNavigateReplaceAction(
   }
 
   const currentRoute = parentState.routes.find(
-    (route) => route.name === state.name
+    (parentRoute) => parentRoute.name === route.name
   );
   const routesAreEqual = parentState.routes[parentState.index] === currentRoute;
 
   // If there is nested state and the routes are equal, we should keep going down the tree
-  if (state.state && routesAreEqual && currentRoute.state) {
+  if (route.state && routesAreEqual && currentRoute.state) {
     return getNavigateReplaceAction(
-      state.state,
+      route.state,
       currentRoute.state as any,
       lastNavigatorSupportingReplace
     );
   }
 
   // Either we reached the bottom of the state or the point where the routes diverged
-  const { screen, params } = rewriteNavigationStateToParams(previousState);
+  const { screen, params } = rewriteNavigationStateToParams(state);
+
   return {
     type:
       lastNavigatorSupportingReplace.type === "stack" ? "REPLACE" : "JUMP_TO",
+    target: lastNavigatorSupportingReplace?.key,
     payload: {
       name: screen,
       params,
-      // Ensure that the last navigator supporting replace is the one that handles the action
-      source: lastNavigatorSupportingReplace?.key,
     },
   };
 }

package/src/useDeprecated.ts

@@ -17,7 +17,7 @@ export function useWarnOnce(
   key = message
 ) {
   // useLayoutEffect typically doesn't run in node environments.
-  // Combined with skipWarn, this should prevent unwanted warnings
+  // Combined with skipWarn, this should prevent unwanted warnings during SSR rendering
   useLayoutEffect(() => {
     if (guard && canWarn && !warned.has(key)) {
       warned.add(key);
@@ -27,8 +27,11 @@ export function useWarnOnce(
 }
 
 export function useDeprecated(
+  /** The deprecated message to display */
   message: string,
+  /** The guard to cause the warning to being displayed */
   guard: unknown = true,
+  /** The key to use for the warning. Used to detect if the warning has already been shown. */
   key = message
 ) {
   return useWarnOnce(key, guard, `Expo Router: ${message}`);

package/src/views/Screen.tsx

@@ -48,7 +48,7 @@ export function Screen<TOptions extends object = object>({
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useDeprecated(
       "The `redirect` prop on <Screen /> is deprecated and will be removed. Please use `router.redirect` instead",
-      redirect
+      Boolean(redirect)
     );
   }