expo-router 2.0.13 → 2.0.15

package/build/utils/url.d.ts

@@ -3,4 +3,6 @@
  * NOTE: Additional strictness added to ensure URLs sent in query parameters for in-app navigation are not matched.
  */
 export declare function hasUrlProtocolPrefix(href: string): boolean;
+export declare function isWellKnownUri(href: string): boolean;
+export declare function shouldLinkExternally(href: string): boolean;
 //# sourceMappingURL=url.d.ts.map

package/build/utils/url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D"}
+{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOpD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAK1D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -64,10 +64,6 @@
   "peerDependencies": {
     "@react-navigation/drawer": "^6.5.8",
     "expo": "^49.0.0",
-    "expo-constants": "*",
-    "expo-linking": "*",
-    "expo-status-bar": "*",
-    "metro": "~0.76.7",
     "react-native-gesture-handler": "*",
     "react-native-reanimated": "*",
     "react-native-safe-area-context": "*",
@@ -106,12 +102,12 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "2.2.15",
+    "@expo/metro-runtime": "2.2.16",
     "@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.19",
+    "expo-head": "0.0.20",
     "expo-splash-screen": "~0.20.2",
     "query-string": "7.1.3",
     "react-helmet-async": "^1.3.0",

package/src/global-state/routing.ts

@@ -7,7 +7,7 @@ import * as Linking from "expo-linking";
 import { ResultState } from "../fork/getStateFromPath";
 import { Href, resolveHref } from "../link/href";
 import { resolve } from "../link/path";
-import { hasUrlProtocolPrefix } from "../utils/url";
+import { shouldLinkExternally } from "../utils/url";
 import type { RouterStore } from "./router-store";
 
 function assertIsReady(store: RouterStore) {
@@ -52,7 +52,7 @@ export function setParams(
 }
 
 export function linkTo(this: RouterStore, href: string, event?: string) {
-  if (hasUrlProtocolPrefix(href)) {
+  if (shouldLinkExternally(href)) {
     Linking.openURL(href);
     return;
   }
@@ -135,7 +135,7 @@ function rewriteNavigationStateToParams(
 ) {
   if (!state) return params;
   // We Should always have at least one route in the state
-  const lastRoute = state.routes.at(-1)!;
+  const lastRoute = state.routes[state.routes.length - 1]!;
   params.screen = lastRoute.name;
   // Weirdly, this always needs to be an object. If it's undefined, it won't work.
   params.params = lastRoute.params
@@ -167,7 +167,7 @@ function getNavigateReplaceAction(
   lastNavigatorSupportingReplace: NavigationState = parentState
 ): NavigationAction {
   // We should always have at least one route in the state
-  const route = state.routes.at(-1)!;
+  const route = state.routes[state.routes.length - 1]!;
 
   // Only these navigators support replace
   if (parentState.type === "stack" || parentState.type === "tab") {

package/src/utils/url.ts

@@ -5,3 +5,19 @@
 export function hasUrlProtocolPrefix(href: string): boolean {
   return /^[\w\d_+.-]+:\/\//.test(href);
 }
+
+export function isWellKnownUri(href: string): boolean {
+  // This is a hack and we should change this to work like the web in the future where we have full confidence in the
+  // ability to match URLs and send anything unmatched to the OS. The main difference between this and `hasUrlProtocolPrefix` is
+  // that we don't require `//`, e.g. `mailto:` is valid and common, and `mailto://bacon` is invalid.
+  return /^(https?|mailto|tel|sms|geo|maps|market|itmss?|itms-apps|content|file):/.test(
+    href
+  );
+}
+
+export function shouldLinkExternally(href: string): boolean {
+  // Cheap check first to avoid regex if the href is not a path fragment.
+  return (
+    !/^[./]/.test(href) && (hasUrlProtocolPrefix(href) || isWellKnownUri(href))
+  );
+}