expo-router 1.7.7 → 2.0.0-rc.2

package/_entry.tsx

@@ -6,13 +6,14 @@ import React from "react";
 
 import { ctx } from "./_ctx";
 import { ExpoRoot } from "./src";
+import { ExpoRootProps } from "./src/ExpoRoot";
 import { getNavigationConfig } from "./src/getLinkingConfig";
 import { getRoutes } from "./src/getRoutes";
 import { loadStaticParamsAsync } from "./src/loadStaticParamsAsync";
 
 // Must be exported or Fast Refresh won't update the context >:[
-export default function ExpoRouterRoot({ location }: { location: URL }) {
-  return <ExpoRoot context={ctx} location={location} />;
+export default function ExpoRouterRoot(props: Omit<ExpoRootProps, "context">) {
+  return <ExpoRoot context={ctx} {...props} />;
 }
 
 /** Get the linking manifest from a Node.js process. */

package/babel.js

@@ -59,7 +59,7 @@ function getExpoRouterImportMode(projectRoot, platform) {
   }
 
   // NOTE: This is a temporary workaround for static rendering on web.
-  if (platform === "web" && process.env.EXPO_USE_STATIC) {
+  if (platform === "web" && (exp.web || {}).output === "static") {
     mode = "sync";
   }
 

package/build/ExpoRoot.d.ts

@@ -1,8 +1,11 @@
-/// <reference types="react" />
+import { FunctionComponent, ReactNode } from "react";
 import { RequireContext } from "./types";
 export type ExpoRootProps = {
     context: RequireContext;
     location?: URL;
+    wrapper?: FunctionComponent<{
+        children: ReactNode;
+    }>;
 };
-export declare function ExpoRoot({ context, location }: ExpoRootProps): JSX.Element;
+export declare function ExpoRoot({ wrapper: ParentWrapper, ...props }: ExpoRootProps): JSX.Element;
 //# sourceMappingURL=ExpoRoot.d.ts.map

package/build/ExpoRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoRoot.d.ts","sourceRoot":"","sources":["../src/ExpoRoot.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGzC,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,cAAc,CAAC;IACxB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC;AA4BF,wBAAgB,QAAQ,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,aAAa,eAa5D"}
+{"version":3,"file":"ExpoRoot.d.ts","sourceRoot":"","sources":["../src/ExpoRoot.tsx"],"names":[],"mappings":"AACA,OAAc,EAAE,iBAAiB,EAAE,SAAS,EAAY,MAAM,OAAO,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGzC,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,cAAc,CAAC;IACxB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC,CAAC;CACtD,CAAC;AAgCF,wBAAgB,QAAQ,CAAC,EACvB,OAAO,EAAE,aAAwB,EACjC,GAAG,KAAK,EACT,EAAE,aAAa,eAyBf"}

package/build/global-state/router-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router-store.d.ts","sourceRoot":"","sources":["../../src/global-state/router-store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,EAGlC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAiC,aAAa,EAAY,MAAM,OAAO,CAAC;AAE/E,OAAO,EAAE,SAAS,EAAyB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAoB,MAAM,qBAAqB,CAAC;AAE3E,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAM1C;;;;GAIG;AACH,qBAAa,WAAW;IACtB,SAAS,EAAG,SAAS,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAG,aAAa,CAAC;IAC9B,OAAO,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACxC,OAAO,EAAE,OAAO,CAAS;IAEzB,YAAY,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;IACnC,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAElC,aAAa,EAAG,iCAAiC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;IACjF,yBAAyB,EAAG,MAAM,IAAI,CAAC;IAEvC,oBAAoB,YAAiB,IAAI,EAAI;IAC7C,gBAAgB,YAAiB,IAAI,EAAI;IAEzC,MAAM,qDAAqB;IAC3B,eAAe,oBAA8B;IAC7C,MAAM,aAAqB;IAC3B,IAAI,6CAAmB;IACvB,OAAO,6CAAsB;IAC7B,SAAS,gEAAwB;IAEjC,UAAU,CACR,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,iCAAiC,CAAC,eAAe,CAAC,aAAa,CAAC,EAC/E,eAAe,CAAC,EAAE,GAAG;IA2EvB,YAAY,CAAC,KAAK,EAAE,WAAW;IAgB/B,kBAAkB;IAIlB,uEAAuE;IACvE,OAAO,aAKL;IACF,oBAAoB,eAAgB,MAAM,IAAI,mBAG5C;IACF,gBAAgB,eAAgB,MAAM,IAAI,mBAGxC;IACF,QAAQ,aAEN;IACF,iBAAiB,oBAEf;IACF,iBAAiB,kBAEf;CACH;AAED,eAAO,MAAM,KAAK,aAAoB,CAAC;AAEvC,wBAAgB,aAAa,gBAM5B;AAED,wBAAgB,iBAAiB,gBAMhC;AAED,wBAAgB,iBAAiB,cAMhC;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,GAAG,GAAG,SAAS,eASjC"}
+{"version":3,"file":"router-store.d.ts","sourceRoot":"","sources":["../../src/global-state/router-store.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,EAGlC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAiC,aAAa,EAAY,MAAM,OAAO,CAAC;AAE/E,OAAO,EAAE,SAAS,EAAyB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAoB,MAAM,qBAAqB,CAAC;AAE3E,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAM1C;;;;GAIG;AACH,qBAAa,WAAW;IACtB,SAAS,EAAG,SAAS,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAG,aAAa,CAAC;IAC9B,OAAO,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACxC,OAAO,EAAE,OAAO,CAAS;IAEzB,YAAY,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;IACnC,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAElC,aAAa,EAAG,iCAAiC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;IACjF,yBAAyB,EAAG,MAAM,IAAI,CAAC;IAEvC,oBAAoB,YAAiB,IAAI,EAAI;IAC7C,gBAAgB,YAAiB,IAAI,EAAI;IAEzC,MAAM,qDAAqB;IAC3B,eAAe,oBAA8B;IAC7C,MAAM,aAAqB;IAC3B,IAAI,6CAAmB;IACvB,OAAO,6CAAsB;IAC7B,SAAS,gEAAwB;IAEjC,UAAU,CACR,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,iCAAiC,CAAC,eAAe,CAAC,aAAa,CAAC,EAC/E,eAAe,CAAC,EAAE,GAAG;IA6EvB,YAAY,CAAC,KAAK,EAAE,WAAW;IAgB/B,kBAAkB;IAIlB,uEAAuE;IACvE,OAAO,aAKL;IACF,oBAAoB,eAAgB,MAAM,IAAI,mBAG5C;IACF,gBAAgB,eAAgB,MAAM,IAAI,mBAGxC;IACF,QAAQ,aAEN;IACF,iBAAiB,oBAEf;IACF,iBAAiB,kBAEf;CACH;AAED,eAAO,MAAM,KAAK,aAAoB,CAAC;AAEvC,wBAAgB,aAAa,gBAM5B;AAED,wBAAgB,iBAAiB,gBAMhC;AAED,wBAAgB,iBAAiB,cAMhC;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,GAAG,GAAG,SAAS,eASjC"}

package/build/testing-library/context-stubs.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 import requireContext from "./require-context-ponyfill";
 export type ReactComponent = () => React.ReactElement<any, any> | null;
-export type FileStub = {
+export type FileStub = (Record<string, unknown> & {
     default: ReactComponent;
-} | ReactComponent;
+}) | ReactComponent;
 export { requireContext };
 export declare function inMemoryContext(context: Record<string, FileStub>): ((id: string) => ReactComponent | {
     default: FileStub;

package/build/testing-library/context-stubs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-stubs.d.ts","sourceRoot":"","sources":["../../src/testing-library/context-stubs.ts"],"names":[],"mappings":";AAEA,OAAO,cAAc,MAAM,4BAA4B,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;AACvE,MAAM,MAAM,QAAQ,GAAG;IAAE,OAAO,EAAE,cAAc,CAAA;CAAE,GAAG,cAAc,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,SAE/C,MAAM;;;;mBAQH,MAAM;;EAI1B;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,SAKnB,MAAM;;mBAUH,MAAM;;EAI1B"}
+{"version":3,"file":"context-stubs.d.ts","sourceRoot":"","sources":["../../src/testing-library/context-stubs.ts"],"names":[],"mappings":";AAEA,OAAO,cAAc,MAAM,4BAA4B,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;AACvE,MAAM,MAAM,QAAQ,GAChB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,OAAO,EAAE,cAAc,CAAA;CAAE,CAAC,GACvD,cAAc,CAAC;AAEnB,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,SAE/C,MAAM;;;;mBAQH,MAAM;;EAI1B;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,SAKnB,MAAM;;mBAUH,MAAM;;EAI1B"}

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

@@ -7,7 +7,8 @@ type RenderRouterOptions = Parameters<typeof render>[1] & {
 };
 type Result = ReturnType<typeof render> & {
     getPathname(): string;
-    getSearchParams(): URLSearchParams;
+    getSegments(): string[];
+    getSearchParams(): Record<string, string | string[]>;
 };
 export declare function renderRouter(context?: string, options?: RenderRouterOptions): Result;
 export declare function renderRouter(context: Record<string, FileStub>, options?: RenderRouterOptions): Result;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing-library/index.tsx"],"names":[],"mappings":"AACA,OAAO,UAAU,CAAC;AAGlB,OAAO,EAAE,MAAM,EAAgB,MAAM,+BAA+B,CAAC;AAQrE,OAAO,EACL,QAAQ,EAIT,MAAM,iBAAiB,CAAC;AAIzB,cAAc,+BAA+B,CAAC;AAE9C,KAAK,mBAAmB,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG;IACxD,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,GAAG;IACxC,WAAW,IAAI,MAAM,CAAC;IACtB,eAAe,IAAI,eAAe,CAAC;CACpC,CAAC;AAQF,wBAAgB,YAAY,CAC1B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,MAAM,CAAC;AACV,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EACjC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,MAAM,CAAC;AACV,wBAAgB,YAAY,CAC1B,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CAAE,EAChE,OAAO,CAAC,EAAE,mBAAmB,GAC5B,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing-library/index.tsx"],"names":[],"mappings":"AACA,OAAO,UAAU,CAAC;AAElB,OAAO,EAAE,MAAM,EAAgB,MAAM,+BAA+B,CAAC;AAQrE,OAAO,EACL,QAAQ,EAIT,MAAM,iBAAiB,CAAC;AAIzB,cAAc,+BAA+B,CAAC;AAE9C,KAAK,mBAAmB,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG;IACxD,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,GAAG;IACxC,WAAW,IAAI,MAAM,CAAC;IACtB,WAAW,IAAI,MAAM,EAAE,CAAC;IACxB,eAAe,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;CACtD,CAAC;AAQF,wBAAgB,YAAY,CAC1B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,MAAM,CAAC;AACV,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EACjC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,MAAM,CAAC;AACV,wBAAgB,YAAY,CAC1B,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CAAE,EAChE,OAAO,CAAC,EAAE,mBAAmB,GAC5B,MAAM,CAAC"}

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "1.7.7",
+  "version": "2.0.0-rc.2",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",
   "files": [
@@ -104,12 +104,12 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "2.1.6",
+    "@expo/metro-runtime": "2.1.8",
     "@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.8",
+    "expo-head": "0.0.10",
     "expo-splash-screen": "*",
     "query-string": "7.1.3",
     "react-helmet-async": "^1.3.0",

package/plugin/build/index.d.ts

@@ -1,7 +1,7 @@
 import { ConfigPlugin } from "expo/config-plugins";
 declare const withRouter: ConfigPlugin<{
     /** Production origin URL where assets in the public folder are hosted. The fetch function is polyfilled to support relative requests from this origin in production, development origin is inferred using the Expo CLI development server. */
-    origin: string;
+    origin?: string;
     /** A more specific origin URL used in the `expo-router/head` module for iOS handoff. Defaults to `origin`. */
     headOrigin?: string;
     /** Changes the routes directory from `app` to another value. Defaults to `app`. Avoid using this property. */

package/plugin/build/index.js

@@ -24,6 +24,7 @@ const withRouter = (config, props) => {
         extra: {
             ...config.extra,
             router: {
+                origin: false,
                 ...config.extra?.router,
                 ...props,
             },

package/plugin/options.json

@@ -67,7 +67,6 @@
                     ]
                 }
             },
-            "required": ["origin"],
             "additionalProperties": false
         }
     }

package/plugin/src/index.ts

@@ -21,7 +21,7 @@ const withExpoHeadIos: ConfigPlugin = (config) => {
 
 const withRouter: ConfigPlugin<{
   /** Production origin URL where assets in the public folder are hosted. The fetch function is polyfilled to support relative requests from this origin in production, development origin is inferred using the Expo CLI development server. */
-  origin: string;
+  origin?: string;
   /** A more specific origin URL used in the `expo-router/head` module for iOS handoff. Defaults to `origin`. */
   headOrigin?: string;
   /** Changes the routes directory from `app` to another value. Defaults to `app`. Avoid using this property. */
@@ -40,6 +40,7 @@ const withRouter: ConfigPlugin<{
     extra: {
       ...config.extra,
       router: {
+        origin: false,
         ...config.extra?.router,
         ...props,
       },

package/src/ExpoRoot.tsx

@@ -1,5 +1,5 @@
 import { StatusBar } from "expo-status-bar";
-import React from "react";
+import React, { FunctionComponent, ReactNode, Fragment } from "react";
 import { Platform } from "react-native";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 
@@ -11,6 +11,7 @@ import { SplashScreen } from "./views/Splash";
 export type ExpoRootProps = {
   context: RequireContext;
   location?: URL;
+  wrapper?: FunctionComponent<{ children: ReactNode }>;
 };
 
 function getGestureHandlerRootView() {
@@ -18,6 +19,10 @@ function getGestureHandlerRootView() {
     const { GestureHandlerRootView } =
       require("react-native-gesture-handler") as typeof import("react-native-gesture-handler");
 
+    if (!GestureHandlerRootView) {
+      return React.Fragment;
+    }
+
     // eslint-disable-next-line no-inner-declarations
     function GestureHandler(props: any) {
       return <GestureHandlerRootView style={{ flex: 1 }} {...props} />;
@@ -39,19 +44,34 @@ const INITIAL_METRICS = {
   insets: { top: 0, left: 0, right: 0, bottom: 0 },
 };
 
-export function ExpoRoot({ context, location }: ExpoRootProps) {
-  return (
-    <GestureHandlerRootView>
-      <SafeAreaProvider
-        // SSR support
-        initialMetrics={INITIAL_METRICS}
-      >
-        <ContextNavigator context={context} location={location} />
-        {/* Users can override this by adding another StatusBar element anywhere higher in the component tree. */}
-        <StatusBar style="auto" />
-      </SafeAreaProvider>
-    </GestureHandlerRootView>
-  );
+export function ExpoRoot({
+  wrapper: ParentWrapper = Fragment,
+  ...props
+}: ExpoRootProps) {
+  /*
+   * Due to static rendering we need to wrap these top level views in second wrapper
+   * View's like <GestureHandlerRootView /> generate a <div> so if the parent wrapper
+   * is a HTML document, we need to ensure its inside the <body>
+   */
+  const wrapper: ExpoRootProps["wrapper"] = ({ children }) => {
+    return (
+      <ParentWrapper>
+        <GestureHandlerRootView>
+          <SafeAreaProvider
+            // SSR support
+            initialMetrics={INITIAL_METRICS}
+          >
+            {children}
+
+            {/* Users can override this by adding another StatusBar element anywhere higher in the component tree. */}
+            <StatusBar style="auto" />
+          </SafeAreaProvider>
+        </GestureHandlerRootView>
+      </ParentWrapper>
+    );
+  };
+
+  return <ContextNavigator {...props} wrapper={wrapper} />;
 }
 
 const initialUrl =
@@ -62,6 +82,7 @@ const initialUrl =
 function ContextNavigator({
   context,
   location: initialLocation = initialUrl,
+  wrapper: WrapperComponent = Fragment,
 }: ExpoRootProps) {
   const store = useInitializeExpoRouter(context, initialLocation);
 
@@ -83,9 +104,10 @@ function ContextNavigator({
       ref={store.navigationRef}
       initialState={store.initialState}
       linking={store.linking}
-      onReady={store.onReady}
     >
-      <Component />
+      <WrapperComponent>
+        <Component />
+      </WrapperComponent>
     </UpstreamNavigationContainer>
   );
 }

package/src/global-state/{router-store.ts → router-store.tsx}

@@ -61,6 +61,7 @@ export class RouterStore {
     this.storeSubscribers.clear();
 
     this.routeNode = getRoutes(context);
+
     this.rootComponent = this.routeNode
       ? getQualifiedRouteComponent(this.routeNode)
       : Fragment;
@@ -76,6 +77,7 @@ export class RouterStore {
       this.linking = getLinkingConfig(this.routeNode!);
 
       if (initialLocation) {
+        this.linking.getInitialURL = () => initialLocation.toString();
         this.initialState = this.linking.getStateFromPath?.(
           initialLocation.pathname + initialLocation.search,
           this.linking.config

package/src/static/renderStaticContent.tsx

@@ -41,28 +41,28 @@ export function getStaticContent(location: URL): string {
 
   const Root = getRootComponent();
 
-  const out = React.createElement(Root, {
-    // TODO: Use RNW view after they fix hydration for React 18
-    // https://github.com/necolas/react-native-web/blob/e8098fd029102d7801c32c1ede792bce01808c00/packages/react-native-web/src/exports/render/index.js#L10
-    // Otherwise this wraps the app with two extra divs
-    children:
-      // Inject the root tag using createElement to prevent any transforms like the ones in `@expo/html-elements`.
-      React.createElement(
-        "div",
-        {
-          id: "root",
-        },
-        <App location={location} />
-      ),
-  });
-
   // This MUST be run before `ReactDOMServer.renderToString` to prevent
   // "Warning: Detected multiple renderers concurrently rendering the same context provider. This is currently unsupported."
   resetReactNavigationContexts();
 
   const html = ReactDOMServer.renderToString(
     <Head.Provider context={headContext}>
-      <ServerContainer ref={ref}>{out}</ServerContainer>
+      <ServerContainer ref={ref}>
+        <App
+          location={location}
+          wrapper={({ children }) => {
+            return React.createElement(Root, {
+              children: React.createElement(
+                "div",
+                {
+                  id: "root",
+                },
+                children
+              ),
+            });
+          }}
+        />
+      </ServerContainer>
     </Head.Provider>
   );
 

package/src/testing-library/context-stubs.ts

@@ -3,7 +3,9 @@ import path from "path";
 import requireContext from "./require-context-ponyfill";
 
 export type ReactComponent = () => React.ReactElement<any, any> | null;
-export type FileStub = { default: ReactComponent } | ReactComponent;
+export type FileStub =
+  | (Record<string, unknown> & { default: ReactComponent })
+  | ReactComponent;
 
 export { requireContext };
 

package/src/testing-library/expect.ts

@@ -6,10 +6,10 @@ expect.extend({
   toHavePathname(screen, expected) {
     return matchers.toEqual(screen.getPathname(), expected);
   },
+  toHaveSegments(screen, expected) {
+    return matchers.toEqual(screen.getSegments(), expected);
+  },
   toHaveSearchParams(screen, expected) {
-    return matchers.toEqual(
-      Object.fromEntries(screen.getSearchParams().entries()),
-      expected
-    );
+    return matchers.toEqual(screen.getSearchParams(), expected);
   },
 });

package/src/testing-library/index.tsx

@@ -1,14 +1,13 @@
-/// <reference types="../../types/jest.d.ts" />
+/// <reference types="../../types/jest" />
 import "./expect";
 
-import { BaseNavigationContainer } from "@react-navigation/core";
 import { render, RenderResult } from "@testing-library/react-native";
-import { findAll } from "@testing-library/react-native/build/helpers/findAll";
 import path from "path";
 import React from "react";
 
 import { ExpoRoot } from "../ExpoRoot";
 import { stateCache } from "../getLinkingConfig";
+import { store } from "../global-state/router-store";
 import { RequireContext } from "../types";
 import {
   FileStub,
@@ -27,7 +26,8 @@ type RenderRouterOptions = Parameters<typeof render>[1] & {
 
 type Result = ReturnType<typeof render> & {
   getPathname(): string;
-  getSearchParams(): URLSearchParams;
+  getSegments(): string[];
+  getSearchParams(): Record<string, string | string[]>;
 };
 
 function isOverrideContext(
@@ -80,7 +80,7 @@ export function renderRouter(
   let location: URL | undefined;
 
   if (typeof initialUrl === "string") {
-    location = new URL(initialUrl, "test://test");
+    location = new URL(initialUrl, "test://");
   } else if (initialUrl instanceof URL) {
     location = initialUrl;
   }
@@ -91,29 +91,13 @@ export function renderRouter(
 
   return Object.assign(result, {
     getPathname(this: RenderResult): string {
-      const containers = findAll(this.root, (node) => {
-        return node.type === BaseNavigationContainer;
-      });
-
-      return (
-        "/" +
-        containers
-          .flatMap((route) => {
-            return route.props.initialState.routes.map((r: any) => r.name);
-          })
-          .join("/")
-      );
+      return store.routeInfoSnapshot().pathname;
     },
-    getSearchParams(this: RenderResult): URLSearchParams {
-      const containers = findAll(this.root, (node) => {
-        return node.type === BaseNavigationContainer;
-      });
-
-      const params = containers.reduce<Record<string, string>>((acc, route) => {
-        return { ...acc, ...route.props.initialState.routes[0].params };
-      }, {});
-
-      return new URLSearchParams(params);
+    getSegments(this: RenderResult): string[] {
+      return store.routeInfoSnapshot().segments;
+    },
+    getSearchParams(this: RenderResult): Record<string, string | string[]> {
+      return store.routeInfoSnapshot().params;
     },
   });
 }

package/src/views/Toast.tsx

@@ -80,7 +80,7 @@ const styles = StyleSheet.create({
     borderWidth: 1,
     borderColor: "rgba(255,255,255,0.2)",
     flexDirection: "row",
-    position: "absolute",
+    position: "fixed",
     bottom: 8,
     left: 8,
     paddingVertical: 8,

package/src/views/Unmatched.tsx

@@ -9,6 +9,19 @@ import { useNavigation } from "../useNavigation";
 const useLayoutEffect =
   typeof window !== "undefined" ? React.useLayoutEffect : function () {};
 
+function NoSSR({ children }: { children: React.ReactNode }) {
+  const [render, setRender] = React.useState(false);
+  React.useEffect(() => {
+    setRender(true);
+  }, []);
+
+  if (!render) {
+    return null;
+  }
+
+  return <>{children}</>;
+}
+
 /** Default screen for unmatched routes. */
 export function Unmatched() {
   const router = useRouter();
@@ -51,9 +64,11 @@ export function Unmatched() {
         </Text>
       </Text>
 
-      <Link href={pathname} replace style={styles.link}>
-        {url}
-      </Link>
+      <NoSSR>
+        <Link href={pathname} replace style={styles.link}>
+          {url}
+        </Link>
+      </NoSSR>
 
       <Link href="/_sitemap" replace style={[styles.link, { marginTop: 8 }]}>
         Sitemap

package/types/jest.d.ts

@@ -3,6 +3,7 @@ declare global {
   namespace jest {
     interface Matchers<R> {
       toHavePathname(pathname: string): R;
+      toHaveSegments(segments: string[]): R;
       toHaveSearchParams(params: Record<string, string>): R;
     }
   }