expo-router 2.0.10 → 2.0.11

package/build/global-state/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/global-state/routing.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAe,MAAM,cAAc,CAAC;AAGjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAUlD,wBAAgB,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,QAEhD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,QAEnD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,WAAW,QAGvC;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAUpD;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,WAAW,EACjB,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAM,OAI7C;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,QAsDrE"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/global-state/routing.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAe,MAAM,cAAc,CAAC;AAGjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAUlD,wBAAgB,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,QAEhD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,QAEnD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,WAAW,QAGvC;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAUpD;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,WAAW,EACjB,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAM,OAI7C;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,QAkErE"}

package/build/testing-library/mocks.d.ts

@@ -1,5 +1,3 @@
 import "@testing-library/jest-native/extend-expect";
-export declare const initialUrlRef: {
-    value: string | Promise<string>;
-};
+export declare function setInitialUrl(value: string): void;
 //# sourceMappingURL=mocks.d.ts.map

package/build/testing-library/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/testing-library/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,4CAA4C,CAAC;AAgBpD,eAAO,MAAM,aAAa,EAAE;IAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CAE5D,CAAC"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/testing-library/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,4CAA4C,CAAC;AAkBpD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,QAE1C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "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.12",
+    "@expo/metro-runtime": "2.2.13",
     "@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.16",
+    "expo-head": "0.0.17",
     "expo-splash-screen": "~0.20.2",
     "query-string": "7.1.3",
     "react-helmet-async": "^1.3.0",

package/src/global-state/routing.ts

@@ -78,16 +78,28 @@ export function linkTo(this: RouterStore, href: string, event?: string) {
   const rootState = navigationRef.getRootState();
 
   if (href.startsWith(".")) {
-    let base =
-      this.linking.getPathFromState?.(rootState, {
-        screens: [],
-        preserveGroups: true,
-      }) ?? "";
-
-    if (base && !base.endsWith("/")) {
-      base += "/..";
-    }
-    href = resolve(base, href);
+    const base =
+      this.routeInfo?.segments
+        ?.map((segment) => {
+          if (!segment.startsWith("[")) return segment;
+
+          if (segment.startsWith("[...")) {
+            segment = segment.slice(4, -1);
+            const params = this.routeInfo?.params?.[segment];
+            if (Array.isArray(params)) {
+              return params.join("/");
+            } else {
+              return params?.split(",")?.join("/") ?? "";
+            }
+          } else {
+            segment = segment.slice(1, -1);
+            return this.routeInfo?.params?.[segment];
+          }
+        })
+        .filter(Boolean)
+        .join("/") ?? "/";
+
+    href = resolve(base + "/..", href);
   }
 
   const state = this.linking.getStateFromPath!(href, this.linking.config);

package/src/testing-library/index.tsx

@@ -15,7 +15,7 @@ import {
   requireContext,
   requireContextWithOverrides,
 } from "./context-stubs";
-import { initialUrlRef } from "./mocks";
+import { setInitialUrl } from "./mocks";
 
 // re-export everything
 export * from "@testing-library/react-native";
@@ -60,7 +60,8 @@ export function renderRouter(
   let ctx: RequireContext;
 
   // Reset the initial URL
-  initialUrlRef.value = initialUrl as any;
+
+  setInitialUrl(initialUrl);
 
   // Force the render to be synchronous
   process.env.EXPO_ROUTER_IMPORT_MODE_WEB = "sync";

package/src/testing-library/mocks.ts

@@ -14,9 +14,11 @@ jest.mock("react-native-reanimated", () => {
 // Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing
 jest.mock("react-native/Libraries/Animated/NativeAnimatedHelper");
 
-export const initialUrlRef: { value: string | Promise<string> } = {
-  value: "",
-};
+let mockInitialUrl: string | Promise<string> = "";
+
+export function setInitialUrl(value: string) {
+  mockInitialUrl = value;
+}
 
 jest.mock("expo-linking", () => {
   const module: typeof import("expo-linking") = {
@@ -31,7 +33,7 @@ jest.mock("expo-linking", () => {
       return { remove() {} } as any;
     },
     async getInitialURL() {
-      return initialUrlRef.value;
+      return mockInitialUrl;
     },
   };