expo-router 1.5.3 → 1.6.0

package/_entry.tsx

@@ -1,4 +1,4 @@
-/// <reference path="metro-require.d.ts" />
+/// <reference types="./index" />
 
 import "@expo/metro-runtime";
 

package/_error.js

@@ -0,0 +1,6 @@
+// import "@expo/metro-runtime";
+
+import { LogBoxInspectorContainer } from "@expo/metro-runtime/build/error-overlay/ErrorOverlay";
+import { registerRootComponent } from "expo";
+
+registerRootComponent(LogBoxInspectorContainer);

package/_html-ctx.tsx

@@ -1,4 +1,4 @@
-/// <reference path="metro-require.d.ts" />
+/// <reference types="./index" />
 
 /** Optionally import `app/+html.js` file. */
 export const ctx = require.context(

package/build/ExpoRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoRoot.d.ts","sourceRoot":"","sources":["../src/ExpoRoot.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AA6BzC,wBAAgB,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,cAAc,CAAA;CAAE,eAahE"}
+{"version":3,"file":"ExpoRoot.d.ts","sourceRoot":"","sources":["../src/ExpoRoot.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAwBzC,wBAAgB,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,cAAc,CAAA;CAAE,eAahE"}

package/build/LocationProvider.d.ts

@@ -1,25 +1,19 @@
-import React from "react";
+import { State } from "./fork/getPathFromState";
 type SearchParams = Record<string, string | string[]>;
 type UrlObject = {
     pathname: string;
     readonly params: SearchParams;
     segments: string[];
 };
+export declare function getRouteInfoFromState(getPathFromState: (state: State, asPath: boolean) => {
+    path: string;
+    params: any;
+}, state: State): UrlObject;
+export declare function compareRouteInfo(a: UrlObject, b: UrlObject): boolean;
 export declare function compareUrlSearchParams(a: SearchParams, b: SearchParams): boolean;
 export declare function getNormalizedStatePath({ path: statePath, params, }: {
     path: string;
     params: any;
 }): Omit<UrlObject, "pathname">;
-export declare function LocationProvider({ children }: {
-    children: React.ReactNode;
-}): JSX.Element;
-/** @returns Currently selected route as a normalized string without search parameters. e.g. `/acme?foo=bar` -> `/acme`. Segments will be normalized: `/[id]?id=normal` -> `/normal` */
-export declare function usePathname(): string;
-/** @returns Current URL Search Parameters. */
-export declare function useSearchParams<TParams extends SearchParams = SearchParams>(): Partial<TParams>;
-/** @returns Current URL Search Parameters that only update when the path matches the current route. */
-export declare function useLocalSearchParams<TParams extends SearchParams = SearchParams>(): Partial<TParams>;
-/** @returns Array of selected segments. */
-export declare function useSegments(): string[];
 export {};
 //# sourceMappingURL=LocationProvider.d.ts.map

package/build/LocationProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocationProvider.d.ts","sourceRoot":"","sources":["../src/LocationProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAY1B,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAEtD,KAAK,SAAS,GAAG;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AA0BF,wBAAgB,sBAAsB,CACpC,CAAC,EAAE,YAAY,EACf,CAAC,EAAE,YAAY,GACd,OAAO,CAET;AAwFD,wBAAgB,sBAAsB,CAAC,EACrC,IAAI,EAAE,SAAS,EACf,MAAM,GACP,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;CACb,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAgB9B;AAQD,wBAAgB,gBAAgB,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,eAM3E;AAcD,uLAAuL;AACvL,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED,8CAA8C;AAC9C,wBAAgB,eAAe,CAC7B,OAAO,SAAS,YAAY,GAAG,YAAY,KACxC,OAAO,CAAC,OAAO,CAAC,CAEpB;AAED,uGAAuG;AACvG,wBAAgB,oBAAoB,CAClC,OAAO,SAAS,YAAY,GAAG,YAAY,KACxC,OAAO,CAAC,OAAO,CAAC,CAEpB;AAED,2CAA2C;AAC3C,wBAAgB,WAAW,IAAI,MAAM,EAAE,CAEtC"}
+{"version":3,"file":"LocationProvider.d.ts","sourceRoot":"","sources":["../src/LocationProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAa,MAAM,yBAAyB,CAAC;AAE3D,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAEtD,KAAK,SAAS,GAAG;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,CAChB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,OAAO,KACZ;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,GAAG,CAAA;CAAE,EAClC,KAAK,EAAE,KAAK,GACX,SAAS,CAOX;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,WAO1D;AAED,wBAAgB,sBAAsB,CACpC,CAAC,EAAE,YAAY,EACf,CAAC,EAAE,YAAY,GACd,OAAO,CAET;AAGD,wBAAgB,sBAAsB,CAAC,EACrC,IAAI,EAAE,SAAS,EACf,MAAM,GACP,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;CACb,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAgB9B"}

package/build/exports.d.ts

@@ -1,6 +1,6 @@
 import { Navigator, Slot } from "./views/Navigator";
 export { useRouter } from "./link/useRouter";
-export { usePathname, useLocalSearchParams, useSearchParams, useSegments, } from "./LocationProvider";
+export { usePathname, useLocalSearchParams, useSearchParams, useSegments, useRootNavigation, useRootNavigationState, } from "./navigationStore";
 export { Link, Redirect } from "./link/Link";
 export { withLayoutContext } from "./layouts/withLayoutContext";
 export { Navigator, Slot };
@@ -10,6 +10,5 @@ export { ErrorBoundaryProps } from "./views/Try";
 export { ErrorBoundary } from "./views/ErrorBoundary";
 export { SplashScreen } from "./views/Splash";
 export { useNavigation } from "./useNavigation";
-export { useRootNavigation, useRootNavigationState } from "./useRootNavigation";
 export { useFocusEffect } from "./useFocusEffect";
 //# sourceMappingURL=exports.d.ts.map

package/build/exports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,eAAe,EACf,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AAG3B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,sBAAsB,GACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AAG3B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC"}

package/build/fork/findFocusedRoute.d.ts

@@ -16,7 +16,7 @@ export declare function findFocusedRoute(state: InitialState): (Omit<import("@re
         })[];
         type: string;
         stale: false;
-    }>, "routes" | "stale">> & {
+    }>, "stale" | "routes">> & {
         routes: (Omit<import("@react-navigation/routers").Route<string, object | undefined>, "key"> & any)[];
     }> | undefined;
 }) | undefined;

package/build/fork/useLinking.native.d.ts

@@ -19,7 +19,7 @@ export default function useLinking(ref: React.RefObject<NavigationContainerRef<P
         })[];
         type: string;
         stale: false;
-    }>, "routes" | "stale">> & Readonly<{
+    }>, "stale" | "routes">> & Readonly<{
         stale?: true | undefined;
         routes: import("@react-navigation/core").PartialRoute<import("@react-navigation/core").Route<string, object | undefined>>[];
     }> & {
@@ -39,7 +39,7 @@ export default function useLinking(ref: React.RefObject<NavigationContainerRef<P
             })[];
             type: string;
             stale: false;
-        }>, "routes" | "stale">> & Readonly<{
+        }>, "stale" | "routes">> & Readonly<{
             stale?: true | undefined;
             routes: import("@react-navigation/core").PartialRoute<import("@react-navigation/core").Route<string, object | undefined>>[];
         }> & any) | undefined;

package/build/link/stateOperations.d.ts

@@ -30,7 +30,7 @@ export declare function findTopRouteForTarget(state: ResultState): Omit<import("
         })[];
         type: string;
         stale: false;
-    }>, "routes" | "stale">> & {
+    }>, "stale" | "routes">> & {
         routes: (Omit<import("@react-navigation/native").Route<string, object | undefined>, "key"> & any)[];
     }> | undefined;
 };
@@ -52,7 +52,7 @@ export declare function getQualifiedStateForTopOfTargetState(rootState: InitialS
     })[];
     type: string;
     stale: false;
-}>, "routes" | "stale">> & {
+}>, "stale" | "routes">> & {
     routes: (Omit<import("@react-navigation/native").Route<string, object | undefined>, "key"> & {
         state?: Readonly<Partial<Omit<Readonly<{
             key: string;
@@ -70,7 +70,7 @@ export declare function getQualifiedStateForTopOfTargetState(rootState: InitialS
             })[];
             type: string;
             stale: false;
-        }>, "routes" | "stale">> & any> | undefined;
+        }>, "stale" | "routes">> & any> | undefined;
     })[];
 }>;
 export declare function getEarliestMismatchedRoute<T extends ParamListBase>(rootState: NavigationState<T> | undefined, actionParams: NavigateActionParams): {

package/build/link/useLinkToPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLinkToPath.d.ts","sourceRoot":"","sources":["../../src/link/useLinkToPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAGnB,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAKL,cAAc,EACf,MAAM,mBAAmB,CAAC;AAe3B,wBAAgB,aAAa,WAKlB,MAAM,UAAU,MAAM,UAmHhC;AAED,uGAAuG;AACvG,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,GAC5C,MAAM,IAAI,cAAc,CAqB1B"}
+{"version":3,"file":"useLinkToPath.d.ts","sourceRoot":"","sources":["../../src/link/useLinkToPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAEnB,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAKL,cAAc,EACf,MAAM,mBAAmB,CAAC;AAe3B,wBAAgB,aAAa,WAIlB,MAAM,UAAU,MAAM,UAmHhC;AAED,uGAAuG;AACvG,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,GAC5C,MAAM,IAAI,cAAc,CAqB1B"}

package/build/link/useRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRouter.d.ts","sourceRoot":"","sources":["../../src/link/useRouter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAe,MAAM,QAAQ,CAAC;AAM3C,wBAAgB,OAAO,WAGtB;AAED,KAAK,MAAM,GAAG;IACZ,qCAAqC;IACrC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAC3B,0DAA0D;IAC1D,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAC9B,8BAA8B;IAC9B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,6CAA6C;IAC7C,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;CACtD,CAAC;AAEF,wBAAgB,SAAS,IAAI,MAAM,CA+BlC"}
+{"version":3,"file":"useRouter.d.ts","sourceRoot":"","sources":["../../src/link/useRouter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAe,MAAM,QAAQ,CAAC;AAM3C,wBAAgB,OAAO,WAGtB;AAED,KAAK,MAAM,GAAG;IACZ,qCAAqC;IACrC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAC3B,0DAA0D;IAC1D,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAC9B,8BAA8B;IAC9B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,6CAA6C;IAC7C,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;CACtD,CAAC;AAEF,wBAAgB,SAAS,IAAI,MAAM,CA6BlC"}

package/build/navigationStore/index.d.ts

@@ -0,0 +1,82 @@
+import { LinkingOptions, NavigationState, ParamListBase, PartialState } from "@react-navigation/native";
+import React from "react";
+import { RouteNode } from "../Route";
+import getPathFromState from "../fork/getPathFromState";
+import { ResultState } from "../fork/getStateFromPath";
+import { RequireContext } from "../types";
+export declare const navigationRef: import("@react-navigation/native").NavigationContainerRefWithCurrent<Record<string, unknown>>;
+type SearchParams = Record<string, string | string[]>;
+type UrlObject = {
+    pathname: string;
+    readonly params: SearchParams;
+    segments: string[];
+};
+export declare class NavigationStore {
+    subscriptionMap: Map<string, Set<() => void>>;
+    ssrLocation: URL | undefined;
+    navigationRef: import("@react-navigation/native").NavigationContainerRefWithCurrent<Record<string, unknown>>;
+    routeNode: RouteNode;
+    linking: LinkingOptions<object>;
+    rootState: NavigationState | PartialState<NavigationState> | undefined;
+    initialRootState: ResultState | undefined;
+    url: URL;
+    routeInfo: UrlObject;
+    shouldShowTutorial: boolean;
+    _onReady?: () => void;
+    constructor(ssrLocation?: URL);
+    initialise: (context: RequireContext, onReady: () => void) => void;
+    handleRouteInfoChange: (data?: NavigationState | PartialState<NavigationState>) => void;
+    onReady: () => void;
+    notifiySubscribers: (topic: string) => void;
+    subscribeFactory: (key: string) => (callback: () => void) => () => void;
+    subscribeRouteInfo: (callback: () => void) => () => void;
+    subscribeRootState: (callback: () => void) => () => void;
+}
+export declare const NavigationStoreContext: React.Context<NavigationStore>;
+export declare function useNavigationStore(context: RequireContext): NavigationStore & {
+    shouldShowSplash: boolean;
+};
+export declare function useRootNavigation(): import("@react-navigation/native").NavigationContainerRefWithCurrent<Record<string, unknown>>;
+export declare function useLinkingContext(): Required<Omit<LinkingOptions<ParamListBase>, "filter" | "enabled">> & {
+    getPathFromState: typeof getPathFromState;
+};
+export declare function useRootNavigationState(): Readonly<{
+    key: string;
+    index: number;
+    routeNames: string[];
+    history?: unknown[] | undefined;
+    routes: (Readonly<{
+        key: string;
+        name: string;
+        path?: string | undefined;
+    }> & Readonly<{
+        params?: Readonly<object | undefined>;
+    }> & {
+        state?: Readonly<any> | PartialState<Readonly<any>> | undefined;
+    })[];
+    type: string;
+    stale: false;
+}> | PartialState<Readonly<{
+    key: string;
+    index: number;
+    routeNames: string[];
+    history?: unknown[] | undefined;
+    routes: (Readonly<{
+        key: string;
+        name: string;
+        path?: string | undefined;
+    }> & Readonly<{
+        params?: Readonly<object | undefined>;
+    }> & {
+        state?: Readonly<any> | PartialState<Readonly<any>> | undefined;
+    })[];
+    type: string;
+    stale: false;
+}>> | undefined;
+export declare function useRouteInfo(): UrlObject;
+export declare function useSegments(): string[];
+export declare function usePathname(): string;
+export declare function useSearchParams(): SearchParams;
+export declare function useLocalSearchParams<TParams extends SearchParams = SearchParams>(): Partial<TParams>;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/build/navigationStore/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/navigationStore/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,eAAe,EACf,aAAa,EACb,YAAY,EAGb,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,gBAEN,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,eAAO,MAAM,aAAa,+FAC+B,CAAC;AAE1D,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAEtD,KAAK,SAAS,GAAG;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,qBAAa,eAAe;IAC1B,eAAe,wBAA6B,IAAI,GAI7C;IAEH,WAAW,EAAE,GAAG,GAAG,SAAS,CAAC;IAE7B,aAAa,gGAAiB;IAC9B,SAAS,EAAG,SAAS,CAAC;IACtB,OAAO,EAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,SAAS,EAAE,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;IACvE,gBAAgB,EAAE,WAAW,GAAG,SAAS,CAAC;IAC1C,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IAEtB,kBAAkB,UAAS;IAC3B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;gBAEV,WAAW,CAAC,EAAE,GAAG;IAI7B,UAAU,YAAa,cAAc,WAAW,MAAM,IAAI,UAoBxD;IAEF,qBAAqB,UACZ,eAAe,GAAG,aAAa,eAAe,CAAC,UA6BtD;IAEF,OAAO,aAWL;IAEF,kBAAkB,UAAW,MAAM,UAIjC;IAEF,gBAAgB,QAAS,MAAM,gBACX,MAAM,IAAI,gBAM5B;IAEF,kBAAkB,aARE,MAAM,IAAI,gBAQ0B;IACxD,kBAAkB,aATE,MAAM,IAAI,gBAS0B;CACzD;AAED,eAAO,MAAM,sBAAsB,gCAElC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc;;EAezD;AAED,wBAAgB,iBAAiB,kGAEhC;AAED,wBAAgB,iBAAiB;sBASX,uBAAuB;EAE5C;AAED,wBAAgB,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAOrC;AAED,wBAAgB,YAAY,cAO3B;AAED,wBAAgB,WAAW,aAE1B;AAED,wBAAgB,WAAW,WAE1B;AAED,wBAAgB,eAAe,iBAE9B;AAED,wBAAgB,oBAAoB,CAClC,OAAO,SAAS,YAAY,GAAG,YAAY,KACxC,OAAO,CAAC,OAAO,CAAC,CAEpB"}

package/build/{static/useServerState.d.ts → navigationStore/initialState.d.ts}

@@ -1,4 +1,5 @@
-export declare function useServerState(): (Partial<Omit<Readonly<{
+import { LinkingOptions } from "@react-navigation/native";
+export declare function getInitialState(linking: LinkingOptions<object>, ssrLocation?: URL): (Partial<Omit<Readonly<{
     key: string;
     index: number;
     routeNames: string[];
@@ -10,13 +11,13 @@ export declare function useServerState(): (Partial<Omit<Readonly<{
     }> & Readonly<{
         params?: Readonly<object | undefined>;
     }> & {
-        state?: Readonly<any> | import("@react-navigation/routers").PartialState<Readonly<any>> | undefined;
+        state?: Readonly<any> | import("@react-navigation/native").PartialState<Readonly<any>> | undefined;
     })[];
     type: string;
     stale: false;
-}>, "routes" | "stale">> & Readonly<{
+}>, "stale" | "routes">> & Readonly<{
     stale?: true | undefined;
-    routes: import("@react-navigation/routers").PartialRoute<import("@react-navigation/routers").Route<string, object | undefined>>[];
+    routes: import("@react-navigation/native").PartialRoute<import("@react-navigation/native").Route<string, object | undefined>>[];
 }> & {
     state?: (Partial<Omit<Readonly<{
         key: string;
@@ -30,13 +31,13 @@ export declare function useServerState(): (Partial<Omit<Readonly<{
         }> & Readonly<{
             params?: Readonly<object | undefined>;
         }> & {
-            state?: Readonly<any> | import("@react-navigation/routers").PartialState<Readonly<any>> | undefined;
+            state?: Readonly<any> | import("@react-navigation/native").PartialState<Readonly<any>> | undefined;
         })[];
         type: string;
         stale: false;
-    }>, "routes" | "stale">> & Readonly<{
+    }>, "stale" | "routes">> & Readonly<{
         stale?: true | undefined;
-        routes: import("@react-navigation/routers").PartialRoute<import("@react-navigation/routers").Route<string, object | undefined>>[];
+        routes: import("@react-navigation/native").PartialRoute<import("@react-navigation/native").Route<string, object | undefined>>[];
     }> & any) | undefined;
 }) | undefined;
-//# sourceMappingURL=useServerState.d.ts.map
+//# sourceMappingURL=initialState.d.ts.map

package/build/navigationStore/initialState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initialState.d.ts","sourceRoot":"","sources":["../../src/navigationStore/initialState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,wBAAgB,eAAe,CAC7B,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,EAC/B,WAAW,CAAC,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAkBlB"}

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;AAQH,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;AAGH,OAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAWtD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CA+CtD;AA0BD,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/build/useScreens.d.ts

@@ -19,7 +19,7 @@ export type ScreenProps<TOptions extends Record<string, any> = Record<string, an
  */
 export declare function useSortedScreens(order: ScreenProps[]): React.ReactNode[];
 /** Wrap the component with various enhancements and add access to child routes. */
-export declare function getQualifiedRouteComponent(value: RouteNode): React.ComponentType<any> | React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<unknown>>;
+export declare function getQualifiedRouteComponent(value: RouteNode): React.ComponentType<any> | React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 /** @returns a function which provides a screen id that matches the dynamic route name in params. */
 export declare function createGetIdForRoute(route: Pick<RouteNode, "dynamic" | "route">): (({ params }: {
     params?: Record<string, any> | undefined;

package/build/useScreens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../src/useScreens.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAIL,SAAS,EAGV,MAAM,SAAS,CAAC;AAMjB,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IACxD;IACF,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACvC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAGnB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB,CAAC;AA8DF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAUxE;AA6BD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,kIA2E1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;;sCA0B5C"}
+{"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../src/useScreens.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAIL,SAAS,EAGV,MAAM,SAAS,CAAC;AAMjB,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IACxD;IACF,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACvC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAGnB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB,CAAC;AA8DF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAUxE;AA6BD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,+GAuE1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;;sCA0B5C"}

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

@@ -1 +1 @@
-{"version":3,"file":"Sitemap.d.ts","sourceRoot":"","sources":["../../src/views/Sitemap.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AA2B9E,wBAAgB,aAAa,IAAI,4BAA4B,CAqB5D;AAED,wBAAgB,OAAO,gBA6BtB"}
+{"version":3,"file":"Sitemap.d.ts","sourceRoot":"","sources":["../../src/views/Sitemap.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAsC9E,wBAAgB,aAAa,IAAI,4BAA4B,CAqB5D;AAED,wBAAgB,OAAO,gBA6BtB"}

package/index.d.ts

@@ -1 +1,3 @@
-/// <reference types="./types/react-native" />
+/// <reference types="./types/global" />
+/// <reference types="./types/react-native-web" />
+/// <reference types="./types/metro-require" />

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "expo-router",
-  "version": "1.5.3",
+  "version": "1.6.0",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",
   "files": [
+    "_error.js",
     "_entry.tsx",
     "_html-ctx.tsx",
     "assets",
@@ -92,7 +93,7 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "2.0.6",
+    "@expo/metro-runtime": "2.1.0",
     "@radix-ui/react-slot": "^1.0.0",
     "@react-navigation/bottom-tabs": "~6.5.7",
     "@react-navigation/native": "~6.1.6",

package/src/ExpoRoot.tsx

@@ -2,14 +2,9 @@ import { StatusBar } from "expo-status-bar";
 import React from "react";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 
-import { NavigationContainer } from "./NavigationContainer";
-import { useTutorial } from "./onboard/useTutorial";
+import UpstreamNavigationContainer from "./fork/NavigationContainer";
+import { useNavigationStore } from "./navigationStore";
 import { RequireContext } from "./types";
-import { InitialRootStateProvider } from "./useInitialRootStateContext";
-import {
-  RootRouteNodeProvider,
-  useRootRouteNodeContext,
-} from "./useRootRouteNodeContext";
 import { getQualifiedRouteComponent } from "./useScreens";
 import { SplashScreen } from "./views/Splash";
 
@@ -49,27 +44,33 @@ export function ExpoRoot({ context }: { context: RequireContext }) {
 }
 
 function ContextNavigator({ context }: { context: RequireContext }) {
-  if (process.env.NODE_ENV !== "production") {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const Tutorial = useTutorial(context);
-    if (Tutorial) {
-      SplashScreen.hideAsync();
-      return <Tutorial />;
-    }
+  const {
+    shouldShowTutorial,
+    shouldShowSplash,
+    linking,
+    navigationRef,
+    onReady,
+    routeNode,
+  } = useNavigationStore(context);
+
+  if (shouldShowTutorial) {
+    const Tutorial = require("./onboard/Tutorial").Tutorial;
+    SplashScreen.hideAsync();
+    return <Tutorial />;
   }
 
+  const Component = getQualifiedRouteComponent(routeNode);
+
   return (
-    <RootRouteNodeProvider context={context}>
-      <NavigationContainer>
-        <InitialRootStateProvider>
-          <RootRoute />
-        </InitialRootStateProvider>
-      </NavigationContainer>
-    </RootRouteNodeProvider>
+    <>
+      {shouldShowSplash && <SplashScreen />}
+      <UpstreamNavigationContainer
+        linking={linking}
+        ref={navigationRef}
+        onReady={onReady}
+      >
+        <Component />
+      </UpstreamNavigationContainer>
+    </>
   );
 }
-
-function RootRoute() {
-  const Component = getQualifiedRouteComponent(useRootRouteNodeContext());
-  return <Component />;
-}

package/src/LocationProvider.tsx

@@ -1,15 +1,4 @@
-import { useRoute } from "@react-navigation/native";
-import React from "react";
-
-import { getNavigationContainerRef } from "./NavigationContainer";
-import getPathFromState, {
-  deepEqual,
-  getPathDataFromState,
-  State,
-} from "./fork/getPathFromState";
-import { useLinkingContext } from "./link/useLinkingContext";
-import { useServerState } from "./static/useServerState";
-import { useInitialRootStateContext } from "./useInitialRootStateContext";
+import { State, deepEqual } from "./fork/getPathFromState";
 
 type SearchParams = Record<string, string | string[]>;
 
@@ -19,7 +8,7 @@ type UrlObject = {
   segments: string[];
 };
 
-function getRouteInfoFromState(
+export function getRouteInfoFromState(
   getPathFromState: (
     state: State,
     asPath: boolean
@@ -34,7 +23,7 @@ function getRouteInfoFromState(
   };
 }
 
-function compareRouteInfo(a: UrlObject, b: UrlObject) {
+export function compareRouteInfo(a: UrlObject, b: UrlObject) {
   return (
     a.segments.length === b.segments.length &&
     a.segments.every((segment, index) => segment === b.segments[index]) &&
@@ -50,91 +39,6 @@ export function compareUrlSearchParams(
   return deepEqual(a, b);
 }
 
-function useSafeInitialRootState() {
-  const serverState = useServerState();
-  const initialRootState = useInitialRootStateContext();
-
-  return React.useMemo(() => {
-    if (serverState) {
-      return serverState;
-    }
-
-    // Check if "is ready" to prevent `console.error`s
-    if (getNavigationContainerRef().isReady()) {
-      return getNavigationContainerRef().getRootState() ?? initialRootState;
-    }
-
-    return initialRootState;
-  }, []);
-}
-
-function useUrlObject(): UrlObject {
-  const getPathFromState = useGetPathFromState();
-
-  const [routeInfo, setRouteInfo] = React.useState<UrlObject>(
-    getRouteInfoFromState(
-      getPathFromState,
-      // If the root state (from upstream) is not ready, use the hacky initial state.
-      // Initial state can be generate because it assumes the linking configuration never changes.
-      useSafeInitialRootState()
-    )
-  );
-
-  const routeInfoRef = React.useRef(routeInfo);
-
-  React.useEffect(() => {
-    routeInfoRef.current = routeInfo;
-  }, [routeInfo]);
-
-  const maybeUpdateRouteInfo = React.useCallback(
-    (state: State) => {
-      // The state can be undefined when hot reloading a Layout Route on native.
-      if (!state) {
-        return;
-      }
-      // Prevent unnecessary updates
-      const newRouteInfo = getRouteInfoFromState(getPathFromState, state);
-      if (!compareRouteInfo(routeInfoRef.current, newRouteInfo)) {
-        setRouteInfo(newRouteInfo);
-      }
-    },
-    [
-      // TODO: This probably never changes
-      getPathFromState,
-    ]
-  );
-
-  React.useEffect(() => {
-    const rootNavigation = getNavigationContainerRef();
-
-    return rootNavigation.addListener("state", ({ data }) => {
-      // Attempt to use the complete state from the root, otherwise this will default to
-      // sending events from the nearest layout.
-      const navigationState =
-        rootNavigation.getRootState() ?? (data.state as unknown as State);
-      // NOTE(EvanBacon): It's probably worth asserting if the root state is missing here.
-      maybeUpdateRouteInfo(navigationState);
-    });
-  }, [maybeUpdateRouteInfo]);
-
-  return routeInfo;
-}
-
-function useGetPathFromState() {
-  const linking = useLinkingContext();
-
-  return React.useCallback(
-    (state: Parameters<typeof getPathFromState>[0], asPath: boolean) => {
-      return getPathDataFromState(state, {
-        ...linking.config,
-        preserveDynamicRoutes: asPath,
-        preserveGroups: asPath,
-      });
-    },
-    [linking]
-  );
-}
-
 // TODO: Split up getPathFromState to return all this info at once.
 export function getNormalizedStatePath({
   path: statePath,
@@ -159,53 +63,3 @@ export function getNormalizedStatePath({
     }, {} as SearchParams),
   };
 }
-
-const LocationContext = React.createContext<UrlObject | undefined>(undefined);
-
-if (process.env.NODE_ENV !== "production") {
-  LocationContext.displayName = "LocationContext";
-}
-
-export function LocationProvider({ children }: { children: React.ReactNode }) {
-  return (
-    <LocationContext.Provider value={useUrlObject()}>
-      {children}
-    </LocationContext.Provider>
-  );
-}
-
-function useLocation() {
-  const location = React.useContext(LocationContext);
-
-  if (!location) {
-    throw new Error(
-      "Location context is missing. Make sure you are rendering a <LocationProvider />."
-    );
-  }
-
-  return location;
-}
-
-/** @returns Currently selected route as a normalized string without search parameters. e.g. `/acme?foo=bar` -> `/acme`. Segments will be normalized: `/[id]?id=normal` -> `/normal` */
-export function usePathname(): string {
-  return useLocation().pathname;
-}
-
-/** @returns Current URL Search Parameters. */
-export function useSearchParams<
-  TParams extends SearchParams = SearchParams
->(): Partial<TParams> {
-  return useLocation().params as Partial<TParams>;
-}
-
-/** @returns Current URL Search Parameters that only update when the path matches the current route. */
-export function useLocalSearchParams<
-  TParams extends SearchParams = SearchParams
->(): Partial<TParams> {
-  return (useRoute()?.params ?? ({} as any)) as Partial<TParams>;
-}
-
-/** @returns Array of selected segments. */
-export function useSegments(): string[] {
-  return useLocation().segments;
-}

package/src/exports.ts

@@ -7,7 +7,9 @@ export {
   useLocalSearchParams,
   useSearchParams,
   useSegments,
-} from "./LocationProvider";
+  useRootNavigation,
+  useRootNavigationState,
+} from "./navigationStore";
 export { Link, Redirect } from "./link/Link";
 
 export { withLayoutContext } from "./layouts/withLayoutContext";
@@ -24,5 +26,4 @@ export { SplashScreen } from "./views/Splash";
 
 // React Navigation
 export { useNavigation } from "./useNavigation";
-export { useRootNavigation, useRootNavigationState } from "./useRootNavigation";
 export { useFocusEffect } from "./useFocusEffect";

package/src/link/useHref.ts

@@ -1,5 +1,5 @@
 import { HrefObject } from "./href";
-import { usePathname, useSearchParams, useSegments } from "../LocationProvider";
+import { usePathname, useSearchParams, useSegments } from "../navigationStore";
 
 /** @deprecated */
 type RouteInfo = Omit<Required<HrefObject>, "query"> & {