expo-router 5.2.0-canary-20250722-599a28f → 5.2.0-canary-20250811-5c940c0

package/ios/LinkPreview/LinkPreviewNativeView.swift

@@ -1,10 +1,20 @@
 import ExpoModulesCore
 
-class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate, LinkPreviewModalDismissible {
+class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate,
+  LinkPreviewModalDismissible, LinkPreviewMenuUpdatable {
   private var trigger: NativeLinkPreviewTrigger?
   private var preview: NativeLinkPreviewContentView?
   private var interaction: UIContextMenuInteraction?
-  private var nextScreenId: String?
+  var nextScreenId: String? {
+    didSet {
+      performUpdateOfPreloadedView()
+    }
+  }
+  var tabPath: TabPathPayload? {
+    didSet {
+      performUpdateOfPreloadedView()
+    }
+  }
   private var actions: [LinkPreviewNativeActionView] = []
 
   private let linkPreviewNativeNavigation = LinkPreviewNativeNavigation()
@@ -15,7 +25,6 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate, LinkPre
   let onDidPreviewOpen = EventDispatcher()
   let onPreviewWillClose = EventDispatcher()
   let onPreviewDidClose = EventDispatcher()
-  let onActionSelected = EventDispatcher()
 
   required init(appContext: AppContext? = nil) {
     super.init(appContext: appContext)
@@ -30,55 +39,62 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate, LinkPre
 
   // MARK: - Props
 
-  func setNextScreenId(_ screenId: String) {
-    self.nextScreenId = screenId
-    linkPreviewNativeNavigation.updatePreloadedView(screenId, with: self)
+  func performUpdateOfPreloadedView() {
+    if nextScreenId == nil || tabPath?.path.isEmpty != false {
+      return
+    }
+      print("Perform update \(nextScreenId) \(tabPath) \(self)")
+    linkPreviewNativeNavigation.updatePreloadedView(
+      screenId: nextScreenId, tabPath: tabPath, responder: self)
   }
 
   // MARK: - Children
-
-  override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
-    if let triggerView = childComponentView as? NativeLinkPreviewTrigger {
-      trigger = triggerView
-      if let interaction = self.interaction, self.preview != nil {
-        trigger?.addInteraction(interaction)
-      }
-      super.mountChildComponentView(childComponentView, index: index)
-    } else if let previewView = childComponentView as? NativeLinkPreviewContentView {
-      preview = previewView
-      if let interaction = self.interaction, let trigger = self.trigger {
-        trigger.addInteraction(interaction)
+  #if RCT_NEW_ARCH_ENABLED
+    override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+      if let triggerView = childComponentView as? NativeLinkPreviewTrigger {
+        trigger = triggerView
+        if let interaction = self.interaction {
+          triggerView.addInteraction(interaction)
+        }
+        super.mountChildComponentView(childComponentView, index: index)
+      } else if let previewView = childComponentView as? NativeLinkPreviewContentView {
+        preview = previewView
+        if let interaction = self.interaction, let trigger = self.trigger {
+          trigger.addInteraction(interaction)
+        }
+      } else if let actionView = childComponentView as? LinkPreviewNativeActionView {
+        actionView.parentMenuUpdatable = self
+        actions.append(actionView)
+      } else {
+        print(
+          "ExpoRouter: Unknown child component view (\(childComponentView)) mounted to NativeLinkPreviewView"
+        )
       }
-    } else if let actionView = childComponentView as? LinkPreviewNativeActionView {
-      actions.append(actionView)
-    } else {
-      print(
-        "ExpoRouter: Unknown child component view (\(childComponentView)) mounted to NativeLinkPreviewView"
-      )
     }
-  }
 
-  override func unmountChildComponentView(_ child: UIView, index: Int) {
-    if child is NativeLinkPreviewTrigger {
-      if let interaction = self.interaction {
-        trigger?.removeInteraction(interaction)
+    override func unmountChildComponentView(_ child: UIView, index: Int) {
+      if child is NativeLinkPreviewTrigger {
+        if let interaction = self.interaction {
+          trigger?.removeInteraction(interaction)
+        }
+        trigger = nil
+        super.unmountChildComponentView(child, index: index)
+      } else if child is NativeLinkPreviewContentView {
+        preview = nil
+        if let interaction = self.interaction {
+          trigger?.removeInteraction(interaction)
+        }
+      } else if let actionView = child as? LinkPreviewNativeActionView {
+        actions.removeAll(where: {
+          $0 == actionView
+        })
+      } else {
+        print(
+          "ExpoRouter: Unknown child component view (\(child)) unmounted from NativeLinkPreviewView"
+        )
       }
-      trigger = nil
-      super.unmountChildComponentView(child, index: index)
-    } else if child is NativeLinkPreviewContentView {
-      preview = nil
-      if let interaction = self.interaction {
-        trigger?.removeInteraction(interaction)
-      }
-    } else if let actionView = child as? LinkPreviewNativeActionView {
-      actions.removeAll(where: {
-        $0 == actionView
-      })
-    } else {
-      print(
-        "ExpoRouter: Unknown child component view (\(child)) unmounted from NativeLinkPreviewView")
     }
-  }
+  #endif
 
   // MARK: - UIContextMenuInteractionDelegate
 
@@ -153,9 +169,9 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate, LinkPre
 
   // MARK: - Context Menu Helpers
 
-  private func createPreviewViewController() -> UIViewController {
+  private func createPreviewViewController() -> UIViewController? {
     guard let preview = preview else {
-      return UIViewController()
+      return nil
     }
 
     let vc = PreviewViewController(linkPreviewNativePreview: preview)
@@ -166,38 +182,23 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate, LinkPre
     return vc
   }
 
+  func updateMenu() {
+    self.interaction?.updateVisibleMenu { _ in
+      self.createContextMenu()
+    }
+  }
+
   private func createContextMenu() -> UIMenu {
-    if actions.count == 1, let menu = convertActionViewToUiAction(actions[0]) as? UIMenu {
+    if actions.count == 1, let menu = actions[0].uiAction as? UIMenu {
       return menu
     }
     return UIMenu(
       title: "",
       children: actions.map { action in
-        self.convertActionViewToUiAction(action)
+        action.uiAction
       }
     )
   }
-
-  private func convertActionViewToUiAction(_ action: LinkPreviewNativeActionView) -> UIMenuElement {
-    if !action.subActions.isEmpty {
-      let subActions = action.subActions.map { subAction in
-        self.convertActionViewToUiAction(subAction)
-      }
-      return UIMenu(
-        title: action.title,
-        image: action.icon.flatMap { UIImage(systemName: $0) },
-        children: subActions
-      )
-    }
-    return UIAction(
-      title: action.title,
-      image: action.icon.flatMap { UIImage(systemName: $0) }
-    ) { _ in
-      self.onActionSelected([
-        "id": action.id
-      ])
-    }
-  }
 }
 
 class PreviewViewController: UIViewController {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "5.2.0-canary-20250722-599a28f",
+  "version": "5.2.0-canary-20250811-5c940c0",
   "description": "Expo Router is a file-based router for React Native and web applications.",
   "author": "650 Industries, Inc.",
   "license": "MIT",
@@ -76,22 +76,45 @@
   ],
   "peerDependencies": {
     "@react-navigation/drawer": "^7.3.9",
-    "expo": "54.0.0-canary-20250722-599a28f",
-    "expo-constants": "17.1.8-canary-20250722-599a28f",
-    "expo-linking": "7.1.8-canary-20250722-599a28f",
+    "@testing-library/jest-native": ">= 5.0.0",
+    "@testing-library/react-native": ">= 12.0.0",
+    "expo": "54.0.0-canary-20250811-5c940c0",
+    "expo-constants": "17.1.8-canary-20250811-5c940c0",
+    "expo-linking": "7.1.8-canary-20250811-5c940c0",
+    "react": "*",
+    "react-dom": "*",
+    "react-native": "*",
+    "react-native-gesture-handler": "*",
     "react-native-reanimated": "*",
-    "react-native-safe-area-context": "*",
-    "react-native-screens": "*"
+    "react-native-safe-area-context": ">= 4.0.0",
+    "react-native-screens": "*",
+    "react-native-web": "*",
+    "react-server-dom-webpack": ">= 19.0.0"
   },
   "peerDependenciesMeta": {
+    "react-dom": {
+      "optional": true
+    },
+    "react-native-gesture-handler": {
+      "optional": true
+    },
     "react-native-reanimated": {
       "optional": true
     },
+    "react-native-web": {
+      "optional": true
+    },
+    "react-server-dom-webpack": {
+      "optional": true
+    },
     "@react-navigation/drawer": {
       "optional": true
     },
     "@testing-library/jest-native": {
       "optional": true
+    },
+    "@testing-library/react-native": {
+      "optional": true
     }
   },
   "devDependencies": {
@@ -105,21 +128,27 @@
     "tsd": "^0.28.1"
   },
   "dependencies": {
-    "@expo/metro-runtime": "6.0.0-canary-20250722-599a28f",
-    "@expo/server": "0.6.4-canary-20250722-599a28f",
+    "@expo/metro-runtime": "6.0.0-canary-20250811-5c940c0",
+    "@expo/server": "0.7.0-canary-20250811-5c940c0",
     "@radix-ui/react-slot": "1.2.0",
     "@react-navigation/bottom-tabs": "^7.3.10",
     "@react-navigation/native": "^7.1.6",
     "@react-navigation/native-stack": "^7.3.10",
     "client-only": "^0.0.1",
+    "debug": "^4.3.4",
+    "escape-string-regexp": "^4.0.0",
+    "fast-deep-equal": "^3.1.3",
     "invariant": "^2.2.4",
+    "nanoid": "^3.3.8",
     "react-fast-compare": "^3.2.2",
     "react-native-is-edge-to-edge": "^1.1.6",
+    "query-string": "^7.1.3",
     "schema-utils": "^4.0.1",
     "semver": "~7.6.3",
     "server-only": "^0.0.1",
     "sf-symbols-typescript": "^2.1.0",
     "shallowequal": "^1.1.0",
-    "vaul": "^0.9.0"
+    "use-latest-callback": "^0.2.1",
+    "vaul": "^1.1.2"
   }
 }

package/plugin/build/index.d.ts

@@ -17,5 +17,7 @@ declare const withRouter: ConfigPlugin<{
     sitemap?: boolean;
     /** Generate partial typed routes */
     partialTypedGroups?: boolean;
+    /** Enable experimental server middleware support with a `+middleware.ts` file. Requires `web.output: 'server'` to be set in app config. */
+    unstable_useServerMiddleware?: boolean;
 } | void>;
 export default withRouter;

package/plugin/options.json

@@ -135,6 +135,11 @@
               }
             }
           }
+        },
+        "unstable_useServerMiddleware": {
+          "description": "Enable experimental server middleware support with a `+middleware.ts` file. Requires `web.output: 'server'` to be set in app config.",
+          "type": "boolean",
+          "default": false
         }
       },
       "additionalProperties": false

package/plugin/src/index.ts

@@ -37,6 +37,8 @@ const withRouter: ConfigPlugin<
     sitemap?: boolean;
     /** Generate partial typed routes */
     partialTypedGroups?: boolean;
+    /** Enable experimental server middleware support with a `+middleware.ts` file. Requires `web.output: 'server'` to be set in app config. */
+    unstable_useServerMiddleware?: boolean;
   } | void
 > = (config, _props) => {
   const props = _props || {};

package/server.d.ts

@@ -1,4 +1,5 @@
-import { ExpoRequest, ExpoResponse } from '@expo/server/build/environment';
+import { ExpoRequest, ExpoResponse } from '@expo/server';
+export { MiddlewareFunction } from '@expo/server/build/types';
 
 export type RequestHandler = (
   request: Request,