expo-router 1.4.2 → 1.4.3

package/build/loadStaticParamsAsync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadStaticParamsAsync.d.ts","sourceRoot":"","sources":["../src/loadStaticParamsAsync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAWzC,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,SAAS,CAAC,CAWpB"}
+{"version":3,"file":"loadStaticParamsAsync.d.ts","sourceRoot":"","sources":["../src/loadStaticParamsAsync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,SAAS,EAAE,MAAM,SAAS,CAAC;AAW5D,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,SAAS,CAAC,CAWpB"}

package/build/static/renderStaticContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderStaticContent.d.ts","sourceRoot":"","sources":["../../src/static/renderStaticContent.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAUtD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CA6CtD;AA0BD,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"renderStaticContent.d.ts","sourceRoot":"","sources":["../../src/static/renderStaticContent.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,OAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAUtD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CA6CtD;AA0BD,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/build/static/useServerState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useServerState.d.ts","sourceRoot":"","sources":["../../src/static/useServerState.ts"],"names":[],"mappings":"AA8BA,wBAAgB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAO7B"}
+{"version":3,"file":"useServerState.d.ts","sourceRoot":"","sources":["../../src/static/useServerState.ts"],"names":[],"mappings":"AAiCA,wBAAgB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAO7B"}

package/build/views/Screen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Screen.d.ts","sourceRoot":"","sources":["../../src/views/Screen.tsx"],"names":[],"mappings":"AAIA,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IACxD;IACF;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACvC,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,sEAAsE;AACtE,wBAAgB,MAAM,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAAE,EACvD,IAAI,EACJ,QAAQ,EACR,OAAO,GACR,EAAE,WAAW,CAAC,QAAQ,CAAC,QAmBvB"}
+{"version":3,"file":"Screen.d.ts","sourceRoot":"","sources":["../../src/views/Screen.tsx"],"names":[],"mappings":"AAIA,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IACxD;IACF;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACvC,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB,CAAC;AAKF,sEAAsE;AACtE,wBAAgB,MAAM,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAAE,EACvD,IAAI,EACJ,QAAQ,EACR,OAAO,GACR,EAAE,WAAW,CAAC,QAAQ,CAAC,QAmBvB"}

package/build/views/Unmatched.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Unmatched.d.ts","sourceRoot":"","sources":["../../src/views/Unmatched.tsx"],"names":[],"mappings":";AAQA,2CAA2C;AAC3C,wBAAgB,SAAS,gBAwCxB"}
+{"version":3,"file":"Unmatched.d.ts","sourceRoot":"","sources":["../../src/views/Unmatched.tsx"],"names":[],"mappings":";AAYA,2CAA2C;AAC3C,wBAAgB,SAAS,gBAkDxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",
   "files": [
@@ -19,7 +19,8 @@
     "src",
     "stack.ts",
     "tabs.ts",
-    "types"
+    "types",
+    "!**/__tests__"
   ],
   "repository": {
     "url": "https://github.com/expo/router.git",
@@ -56,7 +57,7 @@
     "expo-constants": "*",
     "expo-linking": "*",
     "expo-status-bar": "*",
-    "metro": "~0.73.7",
+    "metro": "~0.76.0",
     "react-native-gesture-handler": "*",
     "react-native-reanimated": "*",
     "react-native-safe-area-context": "*",
@@ -91,7 +92,7 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "2.0.2",
+    "@expo/metro-runtime": "2.0.3",
     "@radix-ui/react-slot": "^1.0.0",
     "@react-navigation/bottom-tabs": "~6.5.7",
     "@react-navigation/native": "~6.1.6",

package/src/loadStaticParamsAsync.ts

@@ -1,4 +1,4 @@
-import type { RouteNode } from "./Route";
+import type { DynamicConvention, RouteNode } from "./Route";
 
 async function recurseAndFlattenNodes<
   T,
@@ -24,7 +24,10 @@ export async function loadStaticParamsAsync(
   return route;
 }
 
-function assertStaticParams(route: RouteNode, params: any) {
+function assertStaticParams(
+  route: RouteNode,
+  params: Record<string, string | string[]>
+) {
   const matches = route.dynamic!.every((dynamic) => {
     const value = params[dynamic.name];
     return value !== undefined && value !== null;
@@ -37,20 +40,44 @@ function assertStaticParams(route: RouteNode, params: any) {
     );
   }
 
+  const validateSingleParam = (
+    dynamic: DynamicConvention,
+    value: any,
+    allowMultipleSegments?: boolean
+  ) => {
+    if (typeof value !== "string") {
+      throw new Error(
+        `generateStaticParams() for route "${
+          route.contextKey
+        }" expected param "${
+          dynamic.name
+        }" to be of type string, instead found "${typeof value}" while parsing "${value}".`
+      );
+    }
+    const parts = value.split("/").filter(Boolean);
+    if (parts.length > 1 && !allowMultipleSegments) {
+      throw new Error(
+        `generateStaticParams() for route "${route.contextKey}" expected param "${dynamic.name}" to not contain "/" (multiple segments) while parsing "${value}".`
+      );
+    }
+    if (parts.length === 0) {
+      throw new Error(
+        `generateStaticParams() for route "${route.contextKey}" expected param "${dynamic.name}" not to be empty while parsing "${value}".`
+      );
+    }
+  };
+
   route.dynamic!.forEach((dynamic) => {
     const value = params[dynamic.name];
     if (dynamic.deep) {
+      // TODO: We could split strings by `/` and use that too.
       if (!Array.isArray(value)) {
-        throw new Error(
-          `generateStaticParams() for route "${route.contextKey}" expected param "${dynamic.name}" to be of type Array.`
-        );
+        validateSingleParam(dynamic, value, true);
+      } else {
+        validateSingleParam(dynamic, value.filter(Boolean).join("/"), true);
       }
     } else {
-      if (Array.isArray(value)) {
-        throw new Error(
-          `generateStaticParams() for route "${route.contextKey}" expected param "${dynamic.name}" to not be of type Array.`
-        );
-      }
+      validateSingleParam(dynamic, value);
     }
     return value !== undefined && value !== null;
   });
@@ -73,27 +100,27 @@ async function loadStaticParamsRecursive(
   route: RouteNode,
   props: { parentParams: any }
 ): Promise<RouteNode[]> {
-  if (!route?.dynamic) {
+  if (!route?.dynamic && !route?.children?.length) {
     return [route];
   }
 
   const loaded = await route.loadRoute();
-  if (!loaded.generateStaticParams) {
-    return [route];
-  }
 
-  const staticParams = await loaded.generateStaticParams({
-    params: props.parentParams || {},
-  });
+  let staticParams: Record<string, string | string[]>[] = [];
 
-  if (!Array.isArray(staticParams)) {
-    throw new Error(
-      `generateStaticParams() must return an array of params, received ${staticParams}`
-    );
-  }
+  if (loaded.generateStaticParams) {
+    staticParams = await loaded.generateStaticParams({
+      params: props.parentParams || {},
+    });
+    if (!Array.isArray(staticParams)) {
+      throw new Error(
+        `generateStaticParams() must return an array of params, received ${staticParams}`
+      );
+    }
 
-  // Assert that at least one param from each matches the dynamic route.
-  staticParams.forEach((params) => assertStaticParams(route, params));
+    // Assert that at least one param from each matches the dynamic route.
+    staticParams.forEach((params) => assertStaticParams(route, params));
+  }
 
   route.children = uniqBy(
     (

package/src/static/renderStaticContent.tsx

@@ -6,7 +6,11 @@
  */
 
 import { ServerContainerRef } from "@react-navigation/native";
-import ServerContainer from "@react-navigation/native/src/ServerContainer";
+// We use the value from `main` in the `package.json` since this
+// should only be accessed from processes that are running in Node.js and
+// conform to using `mainFields: ['main']` in their bundler config.
+// @ts-expect-error
+import ServerContainer from "@react-navigation/native/lib/commonjs/ServerContainer";
 import App, { getManifest } from "expo-router/_entry";
 import React from "react";
 import ReactDOMServer from "react-dom/server";

package/src/static/useServerState.ts

@@ -6,7 +6,10 @@ import { useLinkingContext } from "../link/useLinkingContext";
 function useServerStateNode() {
   // TODO: Expose this from React Navigation
   const ServerContext =
-    require("@react-navigation/native/src/ServerContext").default;
+    // We use the value from `main` in the `package.json` since this
+    // should only be accessed from processes that are running in Node.js and
+    // conform to using `mainFields: ['main']` in their bundler config.
+    require("@react-navigation/native/lib/commonjs/ServerContext").default;
   const getStateFromPath = useGetStateFromPath();
   const server = React.useContext<any>(ServerContext);
   const pathname = React.useMemo<string>(() => {

package/src/views/Screen.tsx

@@ -21,6 +21,9 @@ export type ScreenProps<
   options?: TOptions;
 };
 
+const useLayoutEffect =
+  typeof window !== "undefined" ? React.useLayoutEffect : function () {};
+
 /** Component for setting the current screen's options dynamically. */
 export function Screen<TOptions extends object = object>({
   name,
@@ -29,7 +32,7 @@ export function Screen<TOptions extends object = object>({
 }: ScreenProps<TOptions>) {
   const navigation = useNavigation(name);
 
-  React.useLayoutEffect(() => {
+  useLayoutEffect(() => {
     navigation.setOptions(options ?? {});
   }, [navigation, options]);
 

package/src/views/Unmatched.tsx

@@ -4,15 +4,20 @@ import React from "react";
 
 import { usePathname } from "../LocationProvider";
 import { Link } from "../link/Link";
+import { useRouter } from "../link/useRouter";
 import { useNavigation } from "../useNavigation";
 
+const useLayoutEffect =
+  typeof window !== "undefined" ? React.useLayoutEffect : function () {};
+
 /** Default screen for unmatched routes. */
 export function Unmatched() {
+  const router = useRouter();
   const navigation = useNavigation();
   const pathname = usePathname();
   const url = createURL(pathname);
 
-  React.useLayoutEffect(() => {
+  useLayoutEffect(() => {
     navigation.setOptions({
       title: "Not Found",
     });
@@ -33,9 +38,18 @@ export function Unmatched() {
         style={styles.subtitle}
       >
         Page could not be found.{" "}
-        <Link href="/" replace style={styles.link}>
+        <Text
+          onPress={() => {
+            if (navigation.canGoBack()) {
+              navigation.goBack();
+            } else {
+              router.replace("/");
+            }
+          }}
+          style={styles.link}
+        >
           Go back.
-        </Link>
+        </Text>
       </Text>
 
       <Link href={pathname} replace style={styles.link}>

package/src/__tests__/LocationProvider.test.node.ts

@@ -1,55 +0,0 @@
-import {
-  getNormalizedStatePath,
-  compareUrlSearchParams,
-} from "../LocationProvider";
-
-describe(getNormalizedStatePath, () => {
-  // Ensure all values are correctly decoded
-  it(`returns the normalized path`, () => {
-    expect(
-      getNormalizedStatePath({
-        path: "/foo/bar%20baz?alpha=beta",
-        params: {
-          alpha: "beta other",
-          beta: "gamma",
-          charlie: "delta%20echo",
-          delta: ["evan", "foxtrot%20gamma", "hotel india"],
-        },
-      })
-    ).toEqual({
-      segments: ["foo", "bar baz"],
-      params: {
-        alpha: "beta other",
-        beta: "gamma",
-        charlie: "delta echo",
-        // Ensure arrays are preserved (rest params).
-        delta: ["evan", "foxtrot gamma", "hotel india"],
-      },
-    });
-  });
-});
-
-describe(compareUrlSearchParams, () => {
-  it("compares search params", () => {
-    expect(
-      compareUrlSearchParams(
-        { one: "two", three: ["four"] },
-        { one: "two", three: ["four"] }
-      )
-    ).toBe(true);
-
-    expect(
-      compareUrlSearchParams(
-        { one: "two", three: ["four"], five: "six", seven: "eight" },
-        { one: "two", three: ["four"], five: "six", seven: "eight" }
-      )
-    ).toBe(true);
-
-    expect(
-      compareUrlSearchParams(
-        { six: "seven", eight: ["nine"] },
-        { one: "two", three: ["four"] }
-      )
-    ).toBe(false);
-  });
-});

package/src/__tests__/Route.test.node.ts

@@ -1,70 +0,0 @@
-import { RouteNode, sortRoutes } from "../Route";
-import { generateDynamic } from "../getRoutes";
-
-const asRouteNode = (route: string) =>
-  ({
-    children: [],
-    dynamic: generateDynamic(route),
-    loadRoute(): any {
-      return {
-        default() {
-          return null;
-        },
-      };
-    },
-    route,
-    contextKey: "INVALID_TEST_VALUE",
-  } as RouteNode);
-
-describe(sortRoutes, () => {
-  it(`sorts index routes by priority`, () => {
-    // Index before deep dynamic
-    expect(sortRoutes(asRouteNode("index"), asRouteNode("[...a]"))).toBe(-1);
-    // Index before dynamic
-    expect(sortRoutes(asRouteNode("index"), asRouteNode("[a]"))).toBe(-1);
-    // Index before named
-    expect(sortRoutes(asRouteNode("index"), asRouteNode("a"))).toBe(-1);
-    expect(sortRoutes(asRouteNode("index"), asRouteNode("z"))).toBe(-1);
-
-    // Index tied with group
-    expect(sortRoutes(asRouteNode("index"), asRouteNode("(z)"))).toBe(2);
-  });
-  it(`sorts group routes by priority`, () => {
-    expect(sortRoutes(asRouteNode("(zzz)"), asRouteNode("[...a]"))).toBe(-1);
-    expect(sortRoutes(asRouteNode("(zzz)"), asRouteNode("[a]"))).toBe(-1);
-    expect(sortRoutes(asRouteNode("(zzz)"), asRouteNode("a"))).toBe(-1);
-    expect(sortRoutes(asRouteNode("(zzz)"), asRouteNode("z"))).toBe(-1);
-    expect(sortRoutes(asRouteNode("(zzz)"), asRouteNode("index"))).toBe(0);
-  });
-  it(`sorts multiple dynamic routes higher than a single deep dynamic route`, () => {
-    // dynamic before deep dynamic
-    expect(sortRoutes(asRouteNode("[a]/[b]"), asRouteNode("[...a]"))).toBe(-1);
-    expect(sortRoutes(asRouteNode("[...a]"), asRouteNode("[a]/[b]"))).toBe(1);
-  });
-
-  it(`sorts dynamic routes by priority`, () => {
-    // dynamic before deep dynamic
-    expect(sortRoutes(asRouteNode("[a]"), asRouteNode("[...a]"))).toBe(-1);
-    // tied with two dynamic routes
-    expect(sortRoutes(asRouteNode("[a]"), asRouteNode("[b]"))).toBe(0);
-    expect(sortRoutes(asRouteNode("[a]/[b]"), asRouteNode("[b]/[a]"))).toBe(0);
-    // Lower priority
-    expect(sortRoutes(asRouteNode("[a]"), asRouteNode("index"))).toBe(1);
-    expect(sortRoutes(asRouteNode("[a]"), asRouteNode("a"))).toBe(1);
-    expect(sortRoutes(asRouteNode("[a]"), asRouteNode("(a)"))).toBe(1);
-  });
-  it(`sorts deep dynamic routes by priority`, () => {
-    expect(sortRoutes(asRouteNode("[...a]"), asRouteNode("[...beta]"))).toBe(0);
-    expect(
-      sortRoutes(asRouteNode("[...a]/[b]"), asRouteNode("[...beta]/[c]"))
-    ).toBe(0);
-    // Lower priority
-    expect(sortRoutes(asRouteNode("[...a]"), asRouteNode("[b]"))).toBe(1);
-    expect(sortRoutes(asRouteNode("[...a]/[a]"), asRouteNode("[b]/[c]"))).toBe(
-      1
-    );
-    expect(sortRoutes(asRouteNode("[...a]"), asRouteNode("index"))).toBe(1);
-    expect(sortRoutes(asRouteNode("[...a]"), asRouteNode("a"))).toBe(1);
-    expect(sortRoutes(asRouteNode("[...a]"), asRouteNode("(a)"))).toBe(1);
-  });
-});

package/src/__tests__/getReactNavigationConfig.test.node.ts

@@ -1,138 +0,0 @@
-import { getReactNavigationScreensConfig } from "../getReactNavigationConfig";
-
-const mockRoutes = [
-  {
-    children: [
-      {
-        children: [],
-        dynamic: null,
-        route: "people",
-        contextKey: "./(second-group)/people.tsx",
-      },
-    ],
-    dynamic: null,
-    route: "(second-group)",
-    contextKey: "./(second-group)/_layout.tsx",
-  },
-  {
-    children: [
-      {
-        children: [],
-        dynamic: [
-          {
-            name: "deep",
-            deep: true,
-          },
-        ],
-        route: "[...deep]",
-        contextKey: "./(group)/[...deep].tsx",
-      },
-      {
-        children: [],
-        dynamic: [
-          {
-            name: "dynamic",
-            deep: false,
-          },
-        ],
-        route: "[dynamic]",
-        contextKey: "./(group)/[dynamic].tsx",
-      },
-      {
-        children: [],
-        dynamic: null,
-        route: "index",
-        contextKey: "./(group)/index.tsx",
-      },
-    ],
-    dynamic: null,
-    route: "(group)",
-    contextKey: "./(group)/_layout.tsx",
-  },
-  {
-    children: [],
-    dynamic: [
-      {
-        name: "screen",
-        deep: true,
-      },
-    ],
-    route: "other/nested/[...screen]",
-    contextKey: "./other/nested/[...screen].js",
-  },
-  {
-    children: [],
-    dynamic: null,
-    route: "_sitemap",
-    contextKey: "./_sitemap.tsx",
-    generated: true,
-    internal: true,
-  },
-];
-
-describe(getReactNavigationScreensConfig, () => {
-  it("should return a valid linking config", () => {
-    expect(
-      getReactNavigationScreensConfig(
-        // @ts-expect-error
-        mockRoutes,
-        true
-      )
-    ).toEqual({
-      "(group)": {
-        initialRouteName: undefined,
-        path: "(group)",
-        screens: { "[...deep]": "*deep", "[dynamic]": ":dynamic", index: "" },
-      },
-      "(second-group)": {
-        initialRouteName: undefined,
-        path: "(second-group)",
-        screens: { people: "people" },
-      },
-      _sitemap: "_sitemap",
-      "other/nested/[...screen]": "other/nested/*screen",
-    });
-  });
-  it("should return a valid linking config with route nodes", () => {
-    expect(
-      getReactNavigationScreensConfig(
-        // @ts-expect-error
-        mockRoutes,
-        false
-      )
-    ).toEqual({
-      "(group)": {
-        initialRouteName: undefined,
-        path: "(group)",
-        _route: expect.anything(),
-        screens: {
-          "[...deep]": {
-            path: "*deep",
-            screens: {},
-            _route: expect.anything(),
-          },
-          "[dynamic]": {
-            path: ":dynamic",
-            screens: {},
-            _route: expect.anything(),
-          },
-          index: { path: "", screens: {}, _route: expect.anything() },
-        },
-      },
-      "(second-group)": {
-        initialRouteName: undefined,
-        path: "(second-group)",
-        _route: expect.anything(),
-        screens: {
-          people: { path: "people", screens: {}, _route: expect.anything() },
-        },
-      },
-      _sitemap: { path: "_sitemap", screens: {}, _route: expect.anything() },
-      "other/nested/[...screen]": {
-        path: "other/nested/*screen",
-        screens: {},
-        _route: expect.anything(),
-      },
-    });
-  });
-});