expo-router 2.0.0 → 2.0.1

package/build/ExpoRoot.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"ExpoRoot.d.ts","sourceRoot":"","sources":["../src/ExpoRoot.tsx"],"names":[],"mappings":"AAEA,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;AAqCF,wBAAgB,QAAQ,CAAC,EACvB,OAAO,EAAE,aAAwB,EACjC,GAAG,KAAK,EACT,EAAE,aAAa,eA2Bf"}

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

@@ -15,6 +15,7 @@ export declare class RouterStore {
     rootComponent: ComponentType;
     linking: ExpoLinkingOptions | undefined;
     isReady: boolean;
+    private hasAttemptedToHideSplash;
     initialState: ResultState | undefined;
     rootState: ResultState | undefined;
     nextState: ResultState | undefined;

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.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,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,SAAS,gBAAwB;IACjC,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;IAgGvB,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,cAAQ;IAWjD,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;AAaD,wBAAgB,iBAAiB,gBAOhC;AAED,wBAAgB,iBAAiB,cAOhC;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;IACzB,OAAO,CAAC,wBAAwB,CAAkB;IAElD,YAAY,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;IACnC,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,SAAS,gBAAwB;IACjC,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;IAwGvB,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,cAAQ;IAWjD,YAAY,CAAC,KAAK,EAAE,WAAW;IAgB/B,kBAAkB;IAIlB,uEAAuE;IACvE,OAAO,aAEL;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;AAaD,wBAAgB,iBAAiB,gBAOhC;AAED,wBAAgB,iBAAiB,cAOhC;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,GAAG,GAAG,SAAS,eASjC"}

package/build/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAEtD,wBAAgB,sBAAsB,kDAErC;AAED,wBAAgB,YAAY,2CAE3B;AAED,wBAAgB,iBAAiB,oGAEhC;AAGD,wBAAgB,OAAO,WAGtB;AAED,wBAAgB,SAAS,IAAI,MAAM,CASlC;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,WAAW,CACzB,SAAS,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,KAClC,SAAS,CAEb;AAED,kEAAkE;AAClE,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,SAAS,YAAY,GAAG,YAAY,KACxC,OAAO,CAAC,OAAO,CAAC,CAEpB;AAED,qDAAqD;AACrD,wBAAgB,eAAe,CAC7B,OAAO,SAAS,YAAY,GAAG,YAAY,KACxC,OAAO,CAAC,OAAO,CAAC,CAEpB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,SAAS,YAAY,GAAG,YAAY,KACxC,OAAO,CAAC,OAAO,CAAC,CAEpB"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAEtD,wBAAgB,sBAAsB,kDAErC;AAED,wBAAgB,YAAY,2CAE3B;AAED,wBAAgB,iBAAiB,oGAEhC;AAGD,wBAAgB,OAAO,WAGtB;AAED,wBAAgB,SAAS,IAAI,MAAM,CAYlC;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,WAAW,CACzB,SAAS,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,KAClC,SAAS,CAEb;AAED,kEAAkE;AAClE,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,SAAS,YAAY,GAAG,YAAY,KACxC,OAAO,CAAC,OAAO,CAAC,CAEpB;AAED,qDAAqD;AACrD,wBAAgB,eAAe,CAC7B,OAAO,SAAS,YAAY,GAAG,YAAY,KACxC,OAAO,CAAC,OAAO,CAAC,CAEpB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,SAAS,YAAY,GAAG,YAAY,KACxC,OAAO,CAAC,OAAO,CAAC,CAEpB"}

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

@@ -1 +1 @@
-{"version":3,"file":"href.d.ts","sourceRoot":"","sources":["../../src/link/href.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC;AAEvC,MAAM,WAAW,UAAU;IACzB,oDAAoD;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B;AAED,oEAAoE;AACpE,eAAO,MAAM,WAAW,SAAU,IAAI,KAAG,MAexC,CAAC"}
+{"version":3,"file":"href.d.ts","sourceRoot":"","sources":["../../src/link/href.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC;AAEvC,MAAM,WAAW,UAAU;IACzB,oDAAoD;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B;AAED,oEAAoE;AACpE,eAAO,MAAM,WAAW,SAAU,IAAI,KAAG,MAaxC,CAAC"}

package/build/onboard/Tutorial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tutorial.d.ts","sourceRoot":"","sources":["../../src/onboard/Tutorial.tsx"],"names":[],"mappings":";AAqCA,wBAAgB,QAAQ,gBAyCvB"}
+{"version":3,"file":"Tutorial.d.ts","sourceRoot":"","sources":["../../src/onboard/Tutorial.tsx"],"names":[],"mappings":";AAqCA,wBAAgB,QAAQ,gBAqCvB"}

package/build/useDeprecated.d.ts

@@ -0,0 +1,3 @@
+export declare function useWarnOnce(message: string, guard?: unknown, key?: string): void;
+export declare function useDeprecated(message: string, guard?: unknown, key?: string): void;
+//# sourceMappingURL=useDeprecated.d.ts.map

package/build/useDeprecated.d.ts.map

@@ -0,0 +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"}

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

@@ -1 +1 @@
-{"version":3,"file":"ErrorBoundary.d.ts","sourceRoot":"","sources":["../../src/views/ErrorBoundary.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAmC3C,wBAAgB,aAAa,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,kBAAkB,eA2DjE"}
+{"version":3,"file":"ErrorBoundary.d.ts","sourceRoot":"","sources":["../../src/views/ErrorBoundary.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAmC3C,wBAAgB,aAAa,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,kBAAkB,eAuDjE"}

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;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"}
+{"version":3,"file":"Screen.d.ts","sourceRoot":"","sources":["../../src/views/Screen.tsx"],"names":[],"mappings":"AAKA,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,QAkCvB"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"Splash.d.ts","sourceRoot":"","sources":["../../src/views/Splash.tsx"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,SAQ3B;yBARe,YAAY;;;;;;AAqC5B,eAAO,MAAM,8BAA8B,YAe1C,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAOpC,CAAC"}
+{"version":3,"file":"Splash.d.ts","sourceRoot":"","sources":["../../src/views/Splash.tsx"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,SAM3B;yBANe,YAAY;;;;;;AAmC5B,eAAO,MAAM,8BAA8B,YAe1C,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAOpC,CAAC"}

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",
   "files": [
@@ -61,7 +61,7 @@
   },
   "peerDependencies": {
     "@react-navigation/drawer": "^6.5.8",
-    "expo": "^49.0.0-alpha.6",
+    "expo": "^49.0.0",
     "expo-constants": "*",
     "expo-linking": "*",
     "expo-status-bar": "*",
@@ -104,7 +104,7 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "2.2.3",
+    "@expo/metro-runtime": "2.2.4",
     "@radix-ui/react-slot": "1.0.1",
     "@react-navigation/bottom-tabs": "~6.5.7",
     "@react-navigation/native": "~6.1.6",

package/src/ExpoRoot.tsx

@@ -1,3 +1,4 @@
+import Constants from "expo-constants";
 import { StatusBar } from "expo-status-bar";
 import React, { FunctionComponent, ReactNode, Fragment } from "react";
 import { Platform } from "react-native";
@@ -44,6 +45,11 @@ const INITIAL_METRICS = {
   insets: { top: 0, left: 0, right: 0, bottom: 0 },
 };
 
+const hasViewControllerBasedStatusBarAppearance =
+  Platform.OS === "ios" &&
+  !!Constants.expoConfig?.ios?.infoPlist
+    ?.UIViewControllerBasedStatusBarAppearance;
+
 export function ExpoRoot({
   wrapper: ParentWrapper = Fragment,
   ...props
@@ -64,7 +70,9 @@ export function ExpoRoot({
             {children}
 
             {/* Users can override this by adding another StatusBar element anywhere higher in the component tree. */}
-            <StatusBar style="auto" />
+            {!hasViewControllerBasedStatusBarAppearance && (
+              <StatusBar style="auto" />
+            )}
           </SafeAreaProvider>
         </GestureHandlerRootView>
       </ParentWrapper>
@@ -90,7 +98,11 @@ function ContextNavigator({
     SplashScreen.hideAsync();
     if (process.env.NODE_ENV === "development") {
       const Tutorial = require("./onboard/Tutorial").Tutorial;
-      return <Tutorial />;
+      return (
+        <WrapperComponent>
+          <Tutorial />
+        </WrapperComponent>
+      );
     } else {
       // Ensure tutorial styles are stripped in production.
       return null;

package/src/global-state/router-store.tsx

@@ -27,6 +27,7 @@ export class RouterStore {
   rootComponent!: ComponentType;
   linking: ExpoLinkingOptions | undefined;
   isReady: boolean = false;
+  private hasAttemptedToHideSplash: boolean = false;
 
   initialState: ResultState | undefined;
   rootState: ResultState | undefined;
@@ -118,8 +119,16 @@ export class RouterStore {
       (data) => {
         const state = data.data.state as ResultState;
 
-        if (navigationRef.isReady()) {
-          this.onReady();
+        if (!this.isReady) {
+          if (!this.hasAttemptedToHideSplash) {
+            this.hasAttemptedToHideSplash = true;
+            // NOTE(EvanBacon): `navigationRef.isReady` is sometimes not true when state is called initially.
+            requestAnimationFrame(() => _internal_maybeHideAsync());
+          }
+
+          if (navigationRef.isReady()) {
+            this.onReady();
+          }
         }
 
         let shouldUpdateSubscribers = this.nextState === state;
@@ -179,9 +188,6 @@ export class RouterStore {
 
   /** Make sure these are arrow functions so `this` is correctly bound */
   onReady = () => {
-    if (!this.isReady) {
-      requestAnimationFrame(() => _internal_maybeHideAsync());
-    }
     this.isReady = true;
   };
   subscribeToRootState = (subscriber: () => void) => {

package/src/hooks.ts

@@ -11,6 +11,7 @@ import {
   useStoreRouteInfo,
 } from "./global-state/router-store";
 import { Router } from "./types";
+import { useDeprecated } from "./useDeprecated";
 
 type SearchParams = Record<string, string | string[]>;
 
@@ -28,19 +29,22 @@ export function useRootNavigation() {
 
 // Wraps useLinkTo to provide an API which is similar to the Link component.
 export function useLink() {
-  console.warn("`useLink()` is deprecated in favor of `useRouter()`");
+  useDeprecated("`useLink()` is deprecated in favor of `useRouter()`");
   return useRouter();
 }
 
 export function useRouter(): Router {
-  return {
-    push: store.push,
-    back: store.goBack,
-    replace: store.replace,
-    setParams: store.setParams,
-    canGoBack: store.canGoBack,
-    // TODO(EvanBacon): add `reload`
-  };
+  return React.useMemo(
+    () => ({
+      push: store.push,
+      back: store.goBack,
+      replace: store.replace,
+      setParams: store.setParams,
+      canGoBack: store.canGoBack,
+      // TODO(EvanBacon): add `reload`
+    }),
+    []
+  );
 }
 
 /**

package/src/link/href.ts

@@ -19,10 +19,8 @@ export const resolveHref = (href: Href): string => {
   const { pathname, params } = createQualifiedPathname(path, {
     ...href.params,
   });
-  return (
-    pathname +
-    (Object.keys(params).length ? `?${createQueryParams(params)}` : "")
-  );
+  const paramsString = createQueryParams(params);
+  return pathname + (paramsString ? `?${paramsString}` : "");
 };
 
 function createQualifiedPathname(
@@ -54,7 +52,11 @@ function encodeParam(param: any): string {
 }
 
 function createQueryParams(params: Record<string, any>): string {
-  return Object.entries(params)
-    .map(([key, value]) => `${key}=${encodeURIComponent(value.toString())}`)
-    .join("&");
+  return (
+    Object.entries(params)
+      // Allow nullish params
+      .filter(([, value]) => value != null)
+      .map(([key, value]) => `${key}=${encodeURIComponent(value.toString())}`)
+      .join("&")
+  );
 }

package/src/onboard/Tutorial.tsx

@@ -11,8 +11,8 @@ function Header() {
     <Pressable>
       {({ hovered }) => (
         <Text
-          accessibilityRole="header"
-          accessibilityLevel={1}
+          role="heading"
+          aria-level={1}
           style={[styles.title, Platform.OS !== "web" && { textAlign: "left" }]}
         >
           Welcome to{" "}
@@ -62,11 +62,7 @@ export function Tutorial() {
       <SafeAreaView style={styles.safeArea}>
         <View style={styles.container}>
           <Header />
-          <Text
-            accessibilityRole="header"
-            accessibilityLevel={2}
-            style={styles.subtitle}
-          >
+          <Text role="heading" aria-level={2} style={styles.subtitle}>
             Start by creating a file{"\n"}in the{" "}
             <Text style={{ fontWeight: "bold" }}>{getRootDir()}</Text>{" "}
             directory.
@@ -122,10 +118,7 @@ function Button() {
             },
           ]}
         >
-          <Text
-            selectable={false}
-            style={[styles.code, hovered && { color: "black" }]}
-          >
+          <Text style={[styles.code, hovered && { color: "black" }]}>
             <Text style={{ color: "#BCC3CD" }}>$</Text> touch {getRootDir()}
             /index.js
           </Text>
@@ -179,6 +172,7 @@ const styles = StyleSheet.create({
     color: "black",
   },
   code: {
+    userSelect: "none",
     fontSize: 18,
     transitionDuration: "200ms",
     fontWeight: "bold",

package/src/static/html.tsx

@@ -14,7 +14,7 @@ export function ScrollViewStyleReset() {
     <style
       id="expo-reset"
       dangerouslySetInnerHTML={{
-        __html: `#root,body,html{height:100%}body{overflow:hidden}#root{display:flex}`,
+        __html: `#root,body{display:flex}#root,body,html{width:100%;-webkit-overflow-scrolling:touch;margin:0;padding:0;min-height:100%}#root{flex-shrink:0;flex-basis:auto;flex-grow:1;flex:1}html{scroll-behavior:smooth;-webkit-text-size-adjust:100%;height:calc(100% + env(safe-area-inset-top))}body{overflow-y:auto;overscroll-behavior-y:none;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-ms-overflow-style:scrollbar}`,
       }}
     />
   );

package/src/useDeprecated.ts

@@ -0,0 +1,35 @@
+import { useLayoutEffect } from "react";
+import { Platform } from "react-native";
+
+// Node environment may render in multiple processes causing the warning to log mutiple times
+// Hence we skip the warning in these environments.
+const canWarn = Platform.select({
+  native: process.env.NODE_ENV !== "production",
+  default:
+    process.env.NODE_ENV !== "production" && typeof window !== "undefined",
+});
+
+const warned = new Set<string>();
+
+export function useWarnOnce(
+  message: string,
+  guard: unknown = true,
+  key = message
+) {
+  // useLayoutEffect typically doesn't run in node environments.
+  // Combined with skipWarn, this should prevent unwanted warnings
+  useLayoutEffect(() => {
+    if (guard && canWarn && !warned.has(key)) {
+      warned.add(key);
+      console.warn(message);
+    }
+  }, [guard]);
+}
+
+export function useDeprecated(
+  message: string,
+  guard: unknown = true,
+  key = message
+) {
+  return useWarnOnce(key, guard, `Expo Router: ${message}`);
+}

package/src/views/ErrorBoundary.tsx

@@ -62,11 +62,7 @@ export function ErrorBoundary({ error, retry }: ErrorBoundaryProps) {
             alignItems: "center",
           }}
         >
-          <Text
-            accessibilityRole="header"
-            accessibilityLevel={1}
-            style={styles.title}
-          >
+          <Text role="heading" aria-level={1} style={styles.title}>
             Something went wrong
           </Text>
         </View>

package/src/views/Screen.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 
+import { useDeprecated } from "../useDeprecated";
 import { useNavigation } from "../useNavigation";
 
 export type ScreenProps<
@@ -33,9 +34,24 @@ export function Screen<TOptions extends object = object>({
   const navigation = useNavigation(name);
 
   useLayoutEffect(() => {
-    navigation.setOptions(options ?? {});
+    if (
+      options &&
+      // React Navigation will infinitely loop in some cases if an empty object is passed to setOptions.
+      // https://github.com/expo/router/issues/452
+      Object.keys(options).length
+    ) {
+      navigation.setOptions(options);
+    }
   }, [navigation, options]);
 
+  if (process.env.NODE_ENV === "development") {
+    // 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
+    );
+  }
+
   if (process.env.NODE_ENV !== "production") {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     React.useEffect(() => {

package/src/views/Sitemap.tsx

@@ -27,7 +27,6 @@ export function getNavOptions(): NativeStackNavigationOptions {
     headerTitleStyle: {
       color: "white",
     },
-
     headerTintColor: "white",
     headerLargeTitleStyle: {
       color: "white",

package/src/views/Splash.tsx

@@ -3,6 +3,8 @@ import { nanoid } from "nanoid/non-secure";
 import * as React from "react";
 import { Platform } from "react-native";
 
+import { useDeprecated } from "../useDeprecated";
+
 const globalStack: string[] = [];
 
 /**
@@ -25,11 +27,9 @@ const globalStack: string[] = [];
  */
 export function SplashScreen() {
   useGlobalSplash();
-  React.useEffect(() => {
-    console.warn(
-      "The <SplashScreen /> component is deprecated. Use `SplashScreen.preventAutoHideAsync()` and `SplashScreen.hideAsync` from `expo-router` instead."
-    );
-  }, []);
+  useDeprecated(
+    "The <SplashScreen /> component is deprecated. Use `SplashScreen.preventAutoHideAsync()` and `SplashScreen.hideAsync` from `expo-router` instead."
+  );
   return null;
 }
 

package/src/views/Unmatched.tsx

@@ -37,18 +37,10 @@ export function Unmatched() {
 
   return (
     <View style={styles.container}>
-      <Text
-        accessibilityRole="header"
-        accessibilityLevel={1}
-        style={styles.title}
-      >
+      <Text role="heading" aria-level={1} style={styles.title}>
         Unmatched Route
       </Text>
-      <Text
-        accessibilityRole="header"
-        accessibilityLevel={2}
-        style={styles.subtitle}
-      >
+      <Text role="heading" aria-level={2} style={styles.subtitle}>
         Page could not be found.{" "}
         <Text
           onPress={() => {

package/types/react-native-web.d.ts

@@ -127,8 +127,6 @@ declare module "react-native" {
     /** @platform web */
     tabIndex?: number;
     /** @platform web */
-    accessibilityLevel?: number;
-    /** @platform web */
     lang?: string;
   }