expo-router 2.0.8 → 2.0.10

package/build/getRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAW5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,GAAG,WAAW,CAAC,GAAG;IACnE,yBAAyB;IACzB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,8CAA8C;IAC9C,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,oEAAoE;AACpE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,QAAQ,CA+C5D;AAyBD,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,GACX,iBAAiB,GAAG,IAAI,CAK1B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,CAMlE;AAsND;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,QAiBxD;AAED,sEAAsE;AACtE,wBAAgB,SAAS,CACvB,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,OAAO,GAChB,SAAS,GAAG,IAAI,CAclB;AAED,wBAAsB,cAAc,CAClC,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAY3B;AAUD,+CAA+C;AAC/C,wBAAgB,cAAc,CAC5B,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,OAAO,GAChB,SAAS,GAAG,IAAI,CAIlB;AAYD,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAI3B;AA4CD;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,SAAS,GAChB,SAAS,GAAG,IAAI,CAkBlB"}
+{"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAW5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,GAAG,WAAW,CAAC,GAAG;IACnE,yBAAyB;IACzB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,8CAA8C;IAC9C,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,oEAAoE;AACpE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,QAAQ,CA+C5D;AAyBD,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,GACX,iBAAiB,GAAG,IAAI,CAK1B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,CAMlE;AA+ND;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,QAiBxD;AAED,sEAAsE;AACtE,wBAAgB,SAAS,CACvB,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,OAAO,GAChB,SAAS,GAAG,IAAI,CAclB;AAED,wBAAsB,cAAc,CAClC,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAY3B;AAUD,+CAA+C;AAC/C,wBAAgB,cAAc,CAC5B,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,OAAO,GAChB,SAAS,GAAG,IAAI,CAIlB;AAYD,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,cAAc,EAC7B,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAI3B;AA4CD;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,SAAS,GAChB,SAAS,GAAG,IAAI,CAkBlB"}

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.10",
   "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.12",
     "@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.16",
     "expo-splash-screen": "~0.20.2",
     "query-string": "7.1.3",
     "react-helmet-async": "^1.3.0",

package/src/getRoutes.ts

@@ -169,21 +169,6 @@ function applyDefaultInitialRouteName(node: RouteNode): RouteNode {
   };
 }
 
-function cloneGroupRoute(
-  node: RouteNode,
-  { name: nextName }: { name: string }
-): RouteNode {
-  const groupName = `(${nextName})`;
-  const parts = node.contextKey.split("/");
-  parts[parts.length - 2] = groupName;
-
-  return {
-    ...node,
-    route: groupName,
-    contextKey: parts.join("/"),
-  };
-}
-
 function folderNodeToRouteNode({
   name,
   children,
@@ -212,25 +197,8 @@ function fileNodeToRouteNode(tree: TreeNode): RouteNode[] | null {
 
   const dynamic = generateDynamic(name);
 
-  const groupName = matchGroupName(name);
-  const multiGroup = groupName?.includes(",");
-
-  const clones = multiGroup
-    ? groupName!.split(",").map((v) => ({ name: v.trim() }))
-    : null;
-
-  // Assert duplicates:
-  if (clones) {
-    const names = new Set<string>();
-    for (const clone of clones) {
-      if (names.has(clone.name)) {
-        throw new Error(
-          `Array syntax cannot contain duplicate group name "${clone.name}" in "${node.contextKey}".`
-        );
-      }
-      names.add(clone.name);
-    }
-  }
+  const clones = extrapolateGroupRoutes(name, node.contextKey);
+  clones.delete(name);
 
   const output = {
     loadRoute: node.loadRoute,
@@ -240,9 +208,13 @@ function fileNodeToRouteNode(tree: TreeNode): RouteNode[] | null {
     dynamic,
   };
 
-  if (Array.isArray(clones)) {
-    return clones.map((clone) =>
-      applyDefaultInitialRouteName(cloneGroupRoute({ ...output }, clone))
+  if (clones.size) {
+    return [...clones].map((clone) =>
+      applyDefaultInitialRouteName({
+        ...output,
+        contextKey: node.contextKey.replace(output.route, clone),
+        route: clone,
+      })
     );
   }
 
@@ -257,6 +229,43 @@ function fileNodeToRouteNode(tree: TreeNode): RouteNode[] | null {
   ];
 }
 
+function extrapolateGroupRoutes(
+  route: string,
+  contextKey: string,
+  routes: Set<string> = new Set()
+): Set<string> {
+  const match = matchGroupName(route);
+
+  if (!match) {
+    routes.add(route);
+    return routes;
+  }
+
+  const groups = match?.split(",");
+  const groupsSet = new Set(groups);
+
+  if (groupsSet.size !== groups.length) {
+    throw new Error(
+      `Array syntax cannot contain duplicate group name "${groups}" in "${contextKey}".`
+    );
+  }
+
+  if (groups.length === 1) {
+    routes.add(route);
+    return routes;
+  }
+
+  for (const group of groups) {
+    extrapolateGroupRoutes(
+      route.replace(match, group.trim()),
+      contextKey,
+      routes
+    );
+  }
+
+  return routes;
+}
+
 function treeNodeToRouteNode(tree: TreeNode): RouteNode[] | null {
   if (tree.node) {
     return fileNodeToRouteNode(tree);

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/matchers.tsx

@@ -12,7 +12,7 @@ export function matchDeepDynamicRouteName(name: string): string | undefined {
 
 /** Match `(page)` -> `page` */
 export function matchGroupName(name: string): string | undefined {
-  return name.match(/^\(([^/]+?)\)$/)?.[1];
+  return name.match(/^(?:[^\\(\\)])*?\(([^\\/]+)\).*?$/)?.[1];
 }
 
 export function getNameFromFilePath(name: string): string {

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)
     );
   }