babel-preset-expo 54.1.0-canary-20260114-d8e19f5 → 54.1.0-canary-20260120-bb71700

package/build/expo-router-plugin.js

@@ -5,22 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoRouterBabelPlugin = expoRouterBabelPlugin;
 const node_path_1 = __importDefault(require("node:path"));
-const resolve_from_1 = __importDefault(require("resolve-from"));
 const common_1 = require("./common");
 const debug = require('debug')('expo:babel:router');
-// Cache for getExpoRouterAppRoot results (projectRoot -> appRoot)
-const appRootCache = new Map();
-function getExpoRouterAppRoot(projectRoot, appFolder) {
-    const cacheKey = `${projectRoot}:${appFolder}`;
-    const cached = appRootCache.get(cacheKey);
-    if (cached !== undefined) {
-        return cached;
-    }
-    // TODO: We should have cache invalidation if the expo-router/entry file location changes.
-    const routerEntry = (0, resolve_from_1.default)(projectRoot, 'expo-router/entry');
-    const appRoot = node_path_1.default.relative(node_path_1.default.dirname(routerEntry), appFolder);
-    debug('routerEntry', routerEntry, appFolder, appRoot);
-    appRootCache.set(cacheKey, appRoot);
+/**
+ * Compute the relative path from the current file to the app folder.
+ *
+ * Previously this was computed relative to `expo-router/entry`, but that breaks
+ * when packages are hoisted to unexpected locations (e.g., with Bun in monorepos).
+ * By using the actual file being transformed, the relative path is always correct
+ * regardless of where the package is installed.
+ */
+function getExpoRouterAppRoot(currentFile, appFolder) {
+    const appRoot = node_path_1.default.relative(node_path_1.default.dirname(currentFile), appFolder);
+    debug('getExpoRouterAppRoot', currentFile, appFolder, appRoot);
     return appRoot;
 }
 /**
@@ -83,8 +80,15 @@ function expoRouterBabelPlugin(api) {
                     case 'EXPO_ROUTER_ABS_APP_ROOT':
                         path.replaceWith(t.stringLiteral(routerAbsoluteRoot));
                         return;
-                    case 'EXPO_ROUTER_APP_ROOT':
-                        path.replaceWith(t.stringLiteral(getExpoRouterAppRoot(state.projectRoot, routerAbsoluteRoot)));
+                    case 'EXPO_ROUTER_APP_ROOT': {
+                        // Use the actual file being transformed to compute the relative path.
+                        // This ensures the path is correct regardless of package hoisting.
+                        const filename = state.filename || state.file.opts.filename;
+                        if (!filename) {
+                            throw new Error('babel-preset-expo: Unable to determine filename for EXPO_ROUTER_APP_ROOT transformation');
+                        }
+                        path.replaceWith(t.stringLiteral(getExpoRouterAppRoot(filename, routerAbsoluteRoot)));
+                    }
                 }
             },
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-expo",
-  "version": "54.1.0-canary-20260114-d8e19f5",
+  "version": "54.1.0-canary-20260120-bb71700",
   "description": "The Babel preset for Expo projects",
   "main": "build/index.js",
   "files": [
@@ -43,7 +43,7 @@
   "peerDependencies": {
     "@babel/runtime": "^7.20.0",
     "react-refresh": ">=0.14.0 <1.0.0",
-    "expo": "55.0.0-canary-20260114-d8e19f5"
+    "expo": "55.0.0-canary-20260120-bb71700"
   },
   "peerDependenciesMeta": {
     "@babel/runtime": {
@@ -81,7 +81,7 @@
     "@babel/core": "^7.26.0",
     "@types/babel__core": "^7.20.5",
     "@expo/metro": "~54.2.0",
-    "expo-module-scripts": "5.1.0-canary-20260114-d8e19f5",
+    "expo-module-scripts": "5.1.0-canary-20260120-bb71700",
     "jest": "^29.2.1",
     "react-refresh": "^0.14.2"
   }