@jacques_gordon/expo-mapbox-navigation 2.2.17 → 2.2.19

package/app.plugin.js

@@ -318,19 +318,34 @@ def _expo_mapbox_nav_add_spm(installer)
 end
 `;
 
-      // Find the last post_install block and add our call inside it,
-      // or add a new post_install block if none exists.
-      if (podfile.includes('post_install do |installer|')) {
-        // Add our helper def before the first post_install
-        // and our call inside the existing post_install
+      // Find the last post_integrate block and add our call inside it,
+      // or add a new post_integrate block if none exists.
+      //
+      // WHY post_integrate INSTEAD OF post_install:
+      // React Native/Expo's own CocoaPods post_install logic runs a step
+      // that re-derives and regenerates each pod target's SPM package
+      // product dependencies (visible in the pod install log as
+      // "[SPM] Cleaning old SPM dependencies from Pods project" / "[SPM]
+      // Adding SPM dependencies to Pods project"). Since our hook was
+      // previously injected at the START of the existing post_install
+      // block, it ran BEFORE that RN/Expo step — which then silently
+      // dropped our manually-added MapboxNavigationNative product
+      // dependency (while, by chance, preserving MapboxNavigationCore and
+      // MapboxNavigationUIKit, since something in RN/Expo's own derivation
+      // logic happens to recognize those two but not a product that's
+      // needed only transitively). CocoaPods' post_integrate hook is
+      // documented to run strictly after all post_install hooks AND after
+      // the Pods project has already been saved to disk, specifically so
+      // that later hooks can alter it after the fact. Injecting here
+      // guarantees our changes are applied last and are not overwritten.
+      if (podfile.includes('post_integrate do |installer|')) {
         podfile = spmHook + podfile.replace(
-          'post_install do |installer|',
-          'post_install do |installer|\n  _expo_mapbox_nav_add_spm(installer)'
+          'post_integrate do |installer|',
+          'post_integrate do |installer|\n  _expo_mapbox_nav_add_spm(installer)'
         );
       } else {
-        // No post_install block — add both the helper and a new block
         podfile = podfile + spmHook + `
-post_install do |installer|
+post_integrate do |installer|
   _expo_mapbox_nav_add_spm(installer)
 end
 `;

package/ios/ExpoMapboxNavigationView.swift

@@ -5,18 +5,6 @@ import CoreLocation
 // re-exported by MapboxNavigationCore in Navigation SDK v3.
 import MapboxNavigationCore
 import MapboxNavigationUIKit
-// IMPORTANT: MapboxNavigationCore depends internally on MapboxNavigationNative
-// (native ObjC classes like MBNNAmenity), but we never call its APIs
-// directly, so no code in this module naturally references it by name.
-// React Native/Expo's CocoaPods post_install SPM step re-derives which
-// package products a pod target actually needs (independently of our own
-// config-plugin hook that explicitly registers it), and that derivation
-// appears to work off of literal `import` statements in Swift source. Without
-// this explicit import, that step silently drops the MapboxNavigationNative
-// product dependency after our hook adds it, causing "Undefined symbols"
-// for MBNN* classes at the final app link step even though the package
-// resolves and MapboxNavigationCore itself compiles fine.
-import MapboxNavigationNative
 
 public class ExpoMapboxNavigationView: ExpoView {
 

package/ios/_MapboxNavigationNativeImportShim.swift

@@ -0,0 +1,22 @@
+// MapboxNavigationCore depends internally on MapboxNavigationNative (native
+// ObjC classes such as MBNNAmenity), but no file in this module calls its
+// APIs directly. React Native/Expo's CocoaPods post_install SPM step
+// re-derives which package products a pod target actually needs
+// (independently of our own config-plugin hook that explicitly registers it
+// via Xcodeproj manipulation), and that derivation appears to work off of
+// literal `import` statements found in Swift source files. Without an
+// explicit import somewhere in this module, that step silently drops the
+// MapboxNavigationNative product dependency after our hook adds it, causing
+// "Undefined symbols" for MBNN* classes at the final app link step — even
+// though the package resolves correctly and MapboxNavigationCore itself
+// compiles fine.
+//
+// This import is isolated in its own file (rather than placed in
+// ExpoMapboxNavigationView.swift) because MapboxNavigationNative exposes raw
+// types that collide by name with types MapboxNavigationCore re-exports at a
+// higher level (e.g. Waypoint, and enum cases like .automobile, .walking,
+// .cycling, .automobileAvoidingTraffic). Importing both modules in the same
+// file makes those symbols ambiguous to the compiler. Keeping this import in
+// its own compilation unit, with nothing else in the file, satisfies the
+// SPM auto-detection step without affecting name resolution anywhere else.
+import MapboxNavigationNative

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacques_gordon/expo-mapbox-navigation",
-  "version": "2.2.17",
+  "version": "2.2.19",
   "description": "Expo module for Mapbox Navigation SDK with 16KB page size support, NDK27, and Mapbox Maps v11.11.0+",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/src/index.js

@@ -318,19 +318,34 @@ def _expo_mapbox_nav_add_spm(installer)
 end
 `;
 
-      // Find the last post_install block and add our call inside it,
-      // or add a new post_install block if none exists.
-      if (podfile.includes('post_install do |installer|')) {
-        // Add our helper def before the first post_install
-        // and our call inside the existing post_install
+      // Find the last post_integrate block and add our call inside it,
+      // or add a new post_integrate block if none exists.
+      //
+      // WHY post_integrate INSTEAD OF post_install:
+      // React Native/Expo's own CocoaPods post_install logic runs a step
+      // that re-derives and regenerates each pod target's SPM package
+      // product dependencies (visible in the pod install log as
+      // "[SPM] Cleaning old SPM dependencies from Pods project" / "[SPM]
+      // Adding SPM dependencies to Pods project"). Since our hook was
+      // previously injected at the START of the existing post_install
+      // block, it ran BEFORE that RN/Expo step — which then silently
+      // dropped our manually-added MapboxNavigationNative product
+      // dependency (while, by chance, preserving MapboxNavigationCore and
+      // MapboxNavigationUIKit, since something in RN/Expo's own derivation
+      // logic happens to recognize those two but not a product that's
+      // needed only transitively). CocoaPods' post_integrate hook is
+      // documented to run strictly after all post_install hooks AND after
+      // the Pods project has already been saved to disk, specifically so
+      // that later hooks can alter it after the fact. Injecting here
+      // guarantees our changes are applied last and are not overwritten.
+      if (podfile.includes('post_integrate do |installer|')) {
         podfile = spmHook + podfile.replace(
-          'post_install do |installer|',
-          'post_install do |installer|\n  _expo_mapbox_nav_add_spm(installer)'
+          'post_integrate do |installer|',
+          'post_integrate do |installer|\n  _expo_mapbox_nav_add_spm(installer)'
         );
       } else {
-        // No post_install block — add both the helper and a new block
         podfile = podfile + spmHook + `
-post_install do |installer|
+post_integrate do |installer|
   _expo_mapbox_nav_add_spm(installer)
 end
 `;