expo-router 1.7.4 → 1.7.6

package/_app.tsx

@@ -0,0 +1,17 @@
+// The entry component (one that uses context modules) cannot be in the same file as the
+// entry side-effects, otherwise they'll be updated when files are added/removed from the
+// app directory. This will cause a lot of unfortunate errors regarding HMR and Fast Refresh.
+// This is because Fast Refresh is sending the entire file containing an updated component.
+import { ExpoRoot } from "expo-router";
+import Head from "expo-router/head";
+
+import { ctx } from "./_ctx";
+
+// Must be exported or Fast Refresh won't update the context
+export function App() {
+  return (
+    <Head.Provider>
+      <ExpoRoot context={ctx} />
+    </Head.Provider>
+  );
+}

package/build/fork/expo/registerRootComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerRootComponent.d.ts","sourceRoot":"","sources":["../../../src/fork/expo/registerRootComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,oBAAoB,CAAC;AAG5B,OAAO,qBAAqB,CAAC;AAI7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE;QACH,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,CAAC,SAAS,YAAY,EAClE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,GAChC,IAAI,CA6CN"}
+{"version":3,"file":"registerRootComponent.d.ts","sourceRoot":"","sources":["../../../src/fork/expo/registerRootComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,oBAAoB,CAAC;AAG5B,OAAO,qBAAqB,CAAC;AAI7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE;QACH,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAKF,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,CAAC,SAAS,YAAY,EAClE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,GAChC,IAAI,CA6CN"}

package/entry.js

@@ -1,19 +1,11 @@
 // `@expo/metro-runtime` MUST be the first import to ensure Fast Refresh works
 // on web.
 import "@expo/metro-runtime";
-import { ExpoRoot } from "expo-router";
-import Head from "expo-router/head";
-import { renderRootComponent } from "expo-router/src/renderRootComponent";
 
-import { ctx } from "./_ctx";
+// This file should only import and register the root. No components or exports
+// should be added here.
+import { renderRootComponent } from "expo-router/src/renderRootComponent";
 
-// Must be exported or Fast Refresh won't update the context
-export function App() {
-  return (
-    <Head.Provider>
-      <ExpoRoot context={ctx} />
-    </Head.Provider>
-  );
-}
+import { App } from "./_app";
 
 renderRootComponent(App);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",
   "files": [
@@ -24,7 +24,8 @@
     "plugin",
     "app.plugin.js",
     "!**/__tests__",
-    "_ctx.*"
+    "_ctx.*",
+    "_app.tsx"
   ],
   "repository": {
     "url": "https://github.com/expo/router.git",
@@ -103,12 +104,12 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "2.1.3",
-    "@radix-ui/react-slot": "^1.0.0",
+    "@expo/metro-runtime": "2.1.5",
+    "@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.5",
+    "expo-head": "0.0.7",
     "expo-splash-screen": "*",
     "query-string": "7.1.3",
     "react-helmet-async": "^1.3.0",

package/src/fork/expo/registerRootComponent.tsx

@@ -24,6 +24,9 @@ type InitialProps = {
   [key: string]: any;
 };
 
+// Web root tag is preserved for re-use between refreshes.
+let rootTag: import("react-dom/client").Root | null = null;
+
 export default function registerRootComponent<P extends InitialProps>(
   component: React.ComponentType<P>
 ): void {
@@ -67,7 +70,7 @@ export default function registerRootComponent<P extends InitialProps>(
     if (process.env.EXPO_PUBLIC_USE_STATIC) {
       hydrateRoot(tag, React.createElement(qualifiedComponent));
     } else {
-      const rootTag = createRoot(tag);
+      rootTag ??= createRoot(tag);
       rootTag.render(React.createElement(qualifiedComponent));
     }
   }