expo-router 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": "src/index.tsx",
   "types": "src/index.tsx",
   "files": [
@@ -62,6 +62,7 @@
   },
   "devDependencies": {
     "@react-navigation/drawer": "^6.6.2",
+    "@types/url-parse": "^1.4.8",
     "expo-splash-screen": "~0.18.1",
     "expo-status-bar": "~1.4.4",
     "react-native-gesture-handler": "~2.9.0",
@@ -71,7 +72,7 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "1.0.0",
+    "@expo/metro-runtime": "1.0.1",
     "@radix-ui/react-slot": "^1.0.0",
     "@react-navigation/bottom-tabs": "~6.5.7",
     "@react-navigation/native": "~6.1.6",

package/src/LocationProvider.tsx

@@ -156,7 +156,7 @@ export function getNormalizedStatePath({
         prev[key] = decodeURIComponent(value as string);
       }
       return prev;
-    }, {}),
+    }, {} as SearchParams),
   };
 }
 

package/src/fork/getPathFromState.ts

@@ -515,7 +515,7 @@ function getParamsWithConventionsCollapsed({
   routeName: string;
   params: object;
 }): Record<string, string> {
-  const processedParams = { ...params };
+  const processedParams: Record<string, string> = { ...params };
 
   // Remove the params present in the pattern since we'll only use the rest for query string
 

package/src/fork/getStateFromPath.ts

@@ -472,6 +472,7 @@ const createNormalizedConfigs = (
 
   parentScreens.push(screen);
 
+  // @ts-expect-error
   const config = routeConfig[screen];
 
   if (typeof config === "string") {

package/src/fork/useLinking.ts

@@ -1,3 +1,4 @@
+// @ts-expect-error
 import useLinking from "@react-navigation/native/lib/module/useLinking";
 
 export default useLinking as typeof import("./useLinking.native").default;

package/src/link/path.ts

@@ -21,7 +21,7 @@
 
 // https://github.com/browserify/path-browserify/blob/master/index.js
 
-function assertPath(path) {
+function assertPath(path: string) {
   if (typeof path !== "string") {
     throw new TypeError(
       "Path must be a string. Received " + JSON.stringify(path)
@@ -30,7 +30,7 @@ function assertPath(path) {
 }
 
 // Resolves . and .. elements in a path with directory names
-function normalizeStringPosix(path, allowAboveRoot) {
+function normalizeStringPosix(path: string, allowAboveRoot?: boolean) {
   let res = "";
   let lastSegmentLength = 0;
   let lastSlash = -1;
@@ -98,7 +98,7 @@ function normalizeStringPosix(path, allowAboveRoot) {
 }
 
 // path.resolve([from ...], to)
-export function resolve(...segments) {
+export function resolve(...segments: string[]) {
   let resolvedPath = "";
   let resolvedAbsolute = false;
 

package/src/link/stateOperations.ts

@@ -36,7 +36,7 @@ export function isMovingToSiblingRoute(
   let currentRoot: InitialState | undefined = rootState;
 
   while (current?.routes?.[current?.routes?.length - 1].state != null) {
-    const nextRoute = current?.routes?.[current?.routes?.length - 1];
+    const nextRoute: any = current?.routes?.[current?.routes?.length - 1];
 
     if (
       // Has more
@@ -74,9 +74,9 @@ export function getQualifiedStateForTopOfTargetState(
   let currentRoot: InitialState | undefined = rootState;
 
   while (current?.routes?.[current?.routes?.length - 1].state != null) {
-    const nextRoute = current?.routes?.[current?.routes?.length - 1];
+    const nextRoute: any = current?.routes?.[current?.routes?.length - 1];
 
-    const nextCurrentRoot = currentRoot?.routes?.find(
+    const nextCurrentRoot: InitialState | undefined = currentRoot?.routes?.find(
       (route) => route.name === nextRoute.name
     )?.state;
 

package/src/renderRootComponent.tsx

@@ -4,7 +4,7 @@ import { Platform, View } from "react-native";
 import registerRootComponent from "./fork/expo/registerRootComponent";
 import { SplashScreen } from "./views/Splash";
 
-function isBaseObject(obj) {
+function isBaseObject(obj: any) {
   if (Object.prototype.toString.call(obj) !== "[object Object]") {
     return false;
   }
@@ -15,7 +15,7 @@ function isBaseObject(obj) {
   return proto === Object.prototype;
 }
 
-function isErrorShaped(error) {
+function isErrorShaped(error: any): error is Error {
   return (
     error &&
     typeof error === "object" &&
@@ -28,7 +28,7 @@ function isErrorShaped(error) {
  * After we throw this error, any number of tools could handle it.
  * This check ensures the error is always in a reason state before surfacing it to the runtime.
  */
-function convertError(error) {
+function convertError(error: any) {
   if (isErrorShaped(error)) {
     return error;
   }

package/src/static/renderStaticContent.tsx

@@ -8,6 +8,7 @@ import { ServerContainer, ServerContainerRef } from "@react-navigation/native";
 import App, { getManifest } from "expo-router/_root";
 import React from "react";
 import ReactDOMServer from "react-dom/server";
+// @ts-expect-error
 import { AppRegistry } from "react-native-web";
 
 import Head from "../head/Head";
@@ -113,7 +114,7 @@ function StyleReset() {
 }
 
 // TODO(EvanBacon): Expose this to the developer
-export function Root({ children }) {
+export function Root({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en" style={{ height: "100%" }}>
       <head>

package/src/static/useServerState.ts

@@ -1,4 +1,5 @@
 //  TODO: This is fragile and only works on web
+// @ts-expect-error
 import ServerContext from "@react-navigation/native/lib/module/ServerContext";
 import React from "react";
 

package/src/useScreens.tsx

@@ -165,7 +165,7 @@ export function createGetIdForRoute(
   if (!route.dynamic?.length) {
     return undefined;
   }
-  return ({ params }) => {
+  return ({ params }: { params?: Record<string, any> }) => {
     const getPreferredId = (segment: DynamicConvention) => {
       // Params can be undefined when there are no params in the route.
       const preferredId = params?.[segment.name];

package/src/views/Navigator.tsx

@@ -10,12 +10,14 @@ import { useContextKey } from "../Route";
 import { useFilterScreenChildren } from "../layouts/withLayoutContext";
 import { useSortedScreens } from "../useScreens";
 
+type NavigatorTypes = ReturnType<typeof useNavigationBuilder>;
+
 // TODO: This might already exist upstream, maybe something like `useCurrentRender` ?
 export const NavigatorContext = React.createContext<{
   contextKey: string;
-  state: any;
-  navigation: any;
-  descriptors: any;
+  state: NavigatorTypes["state"];
+  navigation: NavigatorTypes["navigation"];
+  descriptors: NavigatorTypes["descriptors"];
   router: RouterFactory<any, any, any>;
 } | null>(null);