expo-router 1.7.0 → 1.7.1

package/app.plugin.js

@@ -0,0 +1 @@
+module.exports = require("./plugin/build");

package/babel.js

@@ -41,7 +41,7 @@ function getExpoRouterImportMode(projectRoot, platform) {
 
   if (env === "production" && mode === "lazy") {
     throw new Error(
-      "Async routes are not supported in production yet. Set `extra.router.asyncRoutes` to `development`, `false`, or `undefined`."
+      "Async routes are not supported in production yet. Set the `expo-router` Config Plugin prop `asyncRoutes` to `development`, `false`, or `undefined`."
     );
   }
 

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

@@ -1 +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;AAG1B,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;AAG1C,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/navigationStore/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,eAAe,EACf,aAAa,EACb,YAAY,EAIb,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,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;AAG1C,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",
   "files": [
@@ -21,6 +21,8 @@
     "stack.ts",
     "tabs.ts",
     "types",
+    "plugin",
+    "app.plugin.js",
     "!**/__tests__"
   ],
   "repository": {
@@ -101,10 +103,11 @@
     "@react-navigation/bottom-tabs": "~6.5.7",
     "@react-navigation/native": "~6.1.6",
     "@react-navigation/native-stack": "~6.9.12",
-    "expo-head": "0.0.1",
+    "expo-head": "0.0.2",
     "expo-splash-screen": "*",
     "query-string": "7.1.3",
     "react-helmet-async": "^1.3.0",
+    "schema-utils": "^4.0.1",
     "url": "^0.11.0"
   }
 }

package/plugin/build/index.d.ts

@@ -0,0 +1,12 @@
+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;
+    /** 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. */
+    unstable_src?: string;
+    /** Should Async Routes be enabled, currently only `development` is supported. */
+    asyncRoutes?: string;
+}>;
+export default withRouter;

package/plugin/build/index.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_utils_1 = require("schema-utils");
+const schema = require("../options.json");
+const withRouter = (config, props) => {
+    (0, schema_utils_1.validate)(schema, props);
+    return {
+        ...config,
+        extra: {
+            ...config.extra,
+            router: {
+                ...config.extra?.router,
+                ...props,
+            },
+        },
+    };
+};
+exports.default = withRouter;

package/plugin/options.json

@@ -0,0 +1,48 @@
+{
+    "title": "expo-router config plugin options",
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$ref": "#/definitions/Props",
+    "definitions": {
+        "Props": {
+            "type": "object",
+            "properties": {
+                "origin": {
+                    "description": "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.",
+                    "oneOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "boolean"
+                        }
+                    ]
+                },
+                "headOrigin": {
+                    "description": "A more specific origin URL used in the `expo-router/head` module for iOS handoff. Defaults to `origin`.",
+                    "type": "string"
+                },
+                "unstable_src": {
+                    "description": "Changes the routes directory from `app` to another value. Defaults to `app`. Avoid using this property.",
+                    "type": "string"
+                },
+                "asyncRoutes": {
+                    "description": "Should Async Routes be enabled, currently only `development` is supported.",
+                    "oneOf": [
+                        {
+                            "type": "string",
+                            "enum": [
+                                "development",
+                                "production"
+                            ]
+                        },
+                        {
+                            "type": "boolean"
+                        }
+                    ]
+                }
+            },
+            "required": ["origin"],
+            "additionalProperties": false
+        }
+    }
+}

package/plugin/src/index.ts

@@ -0,0 +1,30 @@
+import { ConfigPlugin } from "expo/config-plugins";
+import { validate } from "schema-utils";
+
+const schema = require("../options.json");
+
+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;
+  /** 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. */
+  unstable_src?: string;
+  /** Should Async Routes be enabled, currently only `development` is supported. */
+  asyncRoutes?: string;
+}> = (config, props) => {
+  validate(schema, props);
+
+  return {
+    ...config,
+    extra: {
+      ...config.extra,
+      router: {
+        ...config.extra?.router,
+        ...props,
+      },
+    },
+  };
+};
+
+export default withRouter;

package/plugin/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "expo-module-scripts/tsconfig.plugin",
+  "compilerOptions": {
+    "outDir": "build",
+    "rootDir": "src"
+  },
+  "include": ["./src"],
+  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+}

package/src/navigationStore/index.ts

@@ -4,7 +4,8 @@ import {
   ParamListBase,
   PartialState,
   createNavigationContainerRef,
-  useRoute,
+  NavigationRouteContext,
+  RouteProp,
 } from "@react-navigation/native";
 import React from "react";
 
@@ -211,5 +212,12 @@ export function useSearchParams() {
 export function useLocalSearchParams<
   TParams extends SearchParams = SearchParams
 >(): Partial<TParams> {
-  return (useRoute()?.params ?? ({} as any)) as Partial<TParams>;
+  return (useOptionalLocalRoute()?.params ?? ({} as any)) as Partial<TParams>;
+}
+
+function useOptionalLocalRoute<T extends RouteProp<ParamListBase>>():
+  | T
+  | undefined {
+  const route = React.useContext(NavigationRouteContext);
+  return route as T | undefined;
 }