expo-router 1.7.6 → 1.7.7

package/babel.js

@@ -94,6 +94,19 @@ function getExpoRouterAppRoot(projectRoot) {
   }
   const routerEntry = resolveFrom.silent(projectRoot, "expo-router/entry");
 
+  // It doesn't matter if the app folder exists.
+  const appFolder = getExpoRouterAbsoluteAppRoot(projectRoot);
+  const appRoot = nodePath.relative(nodePath.dirname(routerEntry), appFolder);
+  debug("routerEntry", routerEntry, appFolder, appRoot);
+
+  process.env.EXPO_ROUTER_APP_ROOT_2 = appRoot;
+  return appRoot;
+}
+
+function getExpoRouterAbsoluteAppRoot(projectRoot) {
+  if (process.env.EXPO_ROUTER_ABS_APP_ROOT) {
+    return process.env.EXPO_ROUTER_ABS_APP_ROOT;
+  }
   const { exp } = getConfigMemo(projectRoot);
   const customSrc =
     exp.extra?.router?.unstable_src || getRouterDirectory(projectRoot);
@@ -102,10 +115,10 @@ function getExpoRouterAppRoot(projectRoot) {
   const appFolder = isAbsolute
     ? customSrc
     : nodePath.join(projectRoot, customSrc);
-  const appRoot = nodePath.relative(nodePath.dirname(routerEntry), appFolder);
-  debug("routerEntry", routerEntry, appFolder, appRoot);
+  const appRoot = appFolder;
+  debug("absolute router entry", appFolder, appRoot);
 
-  process.env.EXPO_ROUTER_APP_ROOT_2 = appRoot;
+  process.env.EXPO_ROUTER_ABS_APP_ROOT = appFolder;
   return appRoot;
 }
 // TODO: Strip the function `generateStaticParams` when bundling for node.js environments.
@@ -161,13 +174,10 @@ module.exports = function (api) {
           !parent.parentPath.isAssignmentExpression()
         ) {
           parent.replaceWith(t.stringLiteral(projectRoot));
-          return;
-        }
-
-        // Enable static rendering
-        // TODO: Use a serializer or something to ensure this changes without
-        // needing to clear the cache.
-        if (
+        } else if (
+          // Enable static rendering
+          // TODO: Use a serializer or something to ensure this changes without
+          // needing to clear the cache.
           t.isIdentifier(parent.node.property, {
             name: "EXPO_PUBLIC_USE_STATIC",
           }) &&
@@ -177,12 +187,9 @@ module.exports = function (api) {
           parent.replaceWith(
             t.stringLiteral(process.env.EXPO_PUBLIC_USE_STATIC)
           );
-          return;
-        }
-
-        // Surfaces the `app.json` (config) as an environment variable which is then parsed by
-        // `expo-constants` https://docs.expo.dev/versions/latest/sdk/constants/
-        if (
+        } else if (
+          // Surfaces the `app.json` (config) as an environment variable which is then parsed by
+          // `expo-constants` https://docs.expo.dev/versions/latest/sdk/constants/
           t.isIdentifier(parent.node.property, {
             name: "APP_MANIFEST",
           }) &&
@@ -190,11 +197,31 @@ module.exports = function (api) {
         ) {
           const manifest = getExpoAppManifest(projectRoot);
           parent.replaceWith(t.stringLiteral(manifest));
-          return;
-        }
-
-        // Expose the app route import mode.
-        if (
+        } else if (
+          process.env.NODE_ENV !== "test" &&
+          t.isIdentifier(parent.node.property, {
+            name: "EXPO_ROUTER_ABS_APP_ROOT",
+          }) &&
+          !parent.parentPath.isAssignmentExpression()
+        ) {
+          parent.replaceWith(
+            t.stringLiteral(getExpoRouterAbsoluteAppRoot(projectRoot))
+          );
+        } else if (
+          // Skip loading the app root in tests.
+          // This is handled by the testing-library utils
+          process.env.NODE_ENV !== "test" &&
+          t.isIdentifier(parent.node.property, {
+            name: "EXPO_ROUTER_APP_ROOT",
+          }) &&
+          !parent.parentPath.isAssignmentExpression()
+        ) {
+          parent.replaceWith(
+            // This is defined in Expo CLI when using Metro. It points to the relative path for the project app directory.
+            t.stringLiteral(getExpoRouterAppRoot(projectRoot))
+          );
+        } else if (
+          // Expose the app route import mode.
           platform &&
           t.isIdentifier(parent.node.property, {
             name: "EXPO_ROUTER_IMPORT_MODE_" + platform.toUpperCase(),
@@ -204,31 +231,7 @@ module.exports = function (api) {
           parent.replaceWith(
             t.stringLiteral(getExpoRouterImportMode(projectRoot, platform))
           );
-          return;
         }
-
-        if (
-          !t.isIdentifier(parent.node.property, {
-            name: "EXPO_ROUTER_APP_ROOT",
-          })
-        ) {
-          return;
-        }
-
-        if (parent.parentPath.isAssignmentExpression()) {
-          return;
-        }
-
-        // Skip loading the app root in tests.
-        // This is handled by the testing-library utils
-        if (process.env.NODE_ENV === "test") {
-          return;
-        }
-
-        parent.replaceWith(
-          // This is defined in Expo CLI when using Metro. It points to the relative path for the project app directory.
-          t.stringLiteral(getExpoRouterAppRoot(projectRoot))
-        );
       },
     },
   };

package/build/matchers.d.ts

@@ -8,6 +8,7 @@ export declare function getNameFromFilePath(name: string): string;
 export declare function getContextKey(name: string): string;
 /** Remove `.js`, `.ts`, `.jsx`, `.tsx` */
 export declare function removeSupportedExtensions(name: string): string;
+export declare function removeFileSystemDots(filePath: string): string;
 export declare function stripGroupSegmentsFromPath(path: string): string;
 export declare function stripInvisibleSegmentsFromPath(path: string): string;
 //# sourceMappingURL=matchers.d.ts.map

package/build/matchers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../src/matchers.tsx"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAIjE;AAED,kCAAkC;AAClC,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQlD;AAED,0CAA0C;AAC1C,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAOD,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU/D;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnE"}
+{"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../src/matchers.tsx"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAIjE;AAED,kCAAkC;AAClC,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQlD;AAED,0CAA0C;AAC1C,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAGD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU/D;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnE"}

package/build/onboard/createEntryFile.d.ts

@@ -1,3 +1,4 @@
 /** Middleware for creating an entry file in the project. */
 export declare function createEntryFileAsync(): Promise<Response> | undefined;
+export declare function getAbsolutePath(): string;
 //# sourceMappingURL=createEntryFile.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createEntryFile.d.ts","sourceRoot":"","sources":["../../src/onboard/createEntryFile.ts"],"names":[],"mappings":"AAEA,4DAA4D;AAC5D,wBAAgB,oBAAoB,kCAuBnC"}
+{"version":3,"file":"createEntryFile.d.ts","sourceRoot":"","sources":["../../src/onboard/createEntryFile.ts"],"names":[],"mappings":"AAEA,4DAA4D;AAC5D,wBAAgB,oBAAoB,kCAkBnC;AAED,wBAAgB,eAAe,WAE9B"}

package/build/useScreens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../src/useScreens.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAIL,SAAS,EAGV,MAAM,SAAS,CAAC;AAOjB,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IACxD;IACF,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACvC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAGnB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB,CAAC;AA8DF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAUxE;AA6BD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,kIAuE1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;;sCA0B5C"}
+{"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../src/useScreens.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAIL,SAAS,EAGV,MAAM,SAAS,CAAC;AAOjB,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IACxD;IACF,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACvC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAGnB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB,CAAC;AA8DF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAUxE;AAsCD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,kIAuE1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC;;sCA0B5C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",
   "files": [
@@ -104,12 +104,12 @@
   },
   "dependencies": {
     "@bacons/react-views": "^1.1.3",
-    "@expo/metro-runtime": "2.1.5",
+    "@expo/metro-runtime": "2.1.6",
     "@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.7",
+    "expo-head": "0.0.8",
     "expo-splash-screen": "*",
     "query-string": "7.1.3",
     "react-helmet-async": "^1.3.0",

package/src/ExpoRoot.tsx

@@ -66,9 +66,14 @@ function ContextNavigator({
   const store = useInitializeExpoRouter(context, initialLocation);
 
   if (store.shouldShowTutorial()) {
-    const Tutorial = require("./onboard/Tutorial").Tutorial;
     SplashScreen.hideAsync();
-    return <Tutorial />;
+    if (process.env.NODE_ENV === "development") {
+      const Tutorial = require("./onboard/Tutorial").Tutorial;
+      return <Tutorial />;
+    } else {
+      // Ensure tutorial styles are stripped in production.
+      return null;
+    }
   }
 
   const Component = store.rootComponent;

package/src/matchers.tsx

@@ -35,7 +35,7 @@ export function removeSupportedExtensions(name: string): string {
 }
 
 // Remove any amount of `./` and `../` from the start of the string
-function removeFileSystemDots(filePath: string): string {
+export function removeFileSystemDots(filePath: string): string {
   return filePath.replace(/^(?:\.\.?\/)+/g, "");
 }
 

package/src/onboard/Tutorial.tsx

@@ -79,7 +79,7 @@ export function Tutorial() {
 }
 
 function getRootDir() {
-  const dir = process.env.EXPO_ROUTER_APP_ROOT!;
+  const dir = process.env.EXPO_ROUTER_ABS_APP_ROOT!;
   if (dir.match(/\/src\/app$/)) {
     return "src/app";
   } else if (dir.match(/\/app$/)) {
@@ -141,7 +141,8 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundImage:
       "radial-gradient(circle at 1px 1px, rgba(255,255,255,0.15) 1px, transparent 0)",
-    backgroundPosition: "-3px -3px",
+    backgroundPositionX: -3,
+    backgroundPositionY: -3,
     backgroundSize: "40px 40px",
   },
   safeArea: {

package/src/onboard/createEntryFile.ts

@@ -16,16 +16,15 @@ export function createEntryFileAsync() {
       // Legacy
       path: "./app/index.js",
       // New
-      absolutePath:
-        process.env.EXPO_PROJECT_ROOT +
-        "/" +
-        process.env.EXPO_ROUTER_APP_ROOT +
-        "/" +
-        "./index.js",
+      absolutePath: getAbsolutePath(),
     }),
   });
 }
 
+export function getAbsolutePath() {
+  return process.env.EXPO_ROUTER_ABS_APP_ROOT + "/index.js";
+}
+
 const TEMPLATE = `import { StyleSheet, Text, View } from "react-native";
 
 export default function Page() {

package/src/useScreens.tsx

@@ -118,6 +118,15 @@ function fromImport({ ErrorBoundary, ...component }: LoadedRoute) {
       }),
     };
   }
+  if (process.env.NODE_ENV !== "production") {
+    if (
+      typeof component.default === "object" &&
+      component.default &&
+      Object.keys(component.default).length === 0
+    ) {
+      return { default: EmptyRoute };
+    }
+  }
   return { default: component.default || EmptyRoute };
 }