@jacques_gordon/expo-mapbox-navigation 2.2.18 → 2.2.20

package/app.plugin.js

@@ -275,6 +275,39 @@ def _expo_mapbox_nav_add_spm(installer)
         puts "[ExpoMapboxNavigation] Added PODS_CONFIGURATION_BUILD_DIR to SWIFT_INCLUDE_PATHS (#{config.name})"
       end
     end
+
+    # ── FRAMEWORK_SEARCH_PATHS / OTHER_LDFLAGS fix for MapboxNavigationNative ───
+    # React Native's own SPM manager (react-native/scripts/cocoapods/spm.rb,
+    # SPMManager#apply_on_post_install) unconditionally deletes ALL
+    # XCRemoteSwiftPackageReference/XCLocalSwiftPackageReference entries not
+    # registered through its own official spm_dependency() API, then only
+    # re-adds the ones it knows about. Since we don't use that API (to avoid
+    # the static-linking duplicate-symbol issues it's known to cause with
+    # Expo modules), our manually-added package_product_dependency for
+    # MapboxNavigationNative keeps getting wiped. Running this whole hook
+    # from post_integrate (see bottom of file) works around the *timing* of
+    # that wipe, but as a second, independent line of defense that doesn't
+    # depend on hook ordering at all, we also force-link the actual compiled
+    # MapboxNavigationNativeWrapper.framework directly via raw build
+    # settings. clean_spm_dependencies_from_target only ever touches
+    # package_references - it never touches FRAMEWORK_SEARCH_PATHS or
+    # OTHER_LDFLAGS, so this survives regardless of what wipes the package
+    # graph entries.
+    expo_target.build_configurations.each do |config|
+      existing_fsp = config.build_settings['FRAMEWORK_SEARCH_PATHS'] || '$(inherited)'
+      unless existing_fsp.to_s.include?('PackageFrameworks')
+        config.build_settings['FRAMEWORK_SEARCH_PATHS'] =
+          "#{existing_fsp} \\"${podsBuildDir}/PackageFrameworks\\""
+        puts "[ExpoMapboxNavigation] Added PackageFrameworks to FRAMEWORK_SEARCH_PATHS (#{config.name})"
+      end
+
+      existing_ldflags = config.build_settings['OTHER_LDFLAGS'] || '$(inherited)'
+      unless existing_ldflags.to_s.include?('MapboxNavigationNativeWrapper')
+        config.build_settings['OTHER_LDFLAGS'] =
+          "#{existing_ldflags} -framework MapboxNavigationNativeWrapper"
+        puts "[ExpoMapboxNavigation] Added -framework MapboxNavigationNativeWrapper to OTHER_LDFLAGS (#{config.name})"
+      end
+    end
   else
     puts '[ExpoMapboxNavigation] WARNING: ExpoMapboxNavigation target not found!'
     puts '[ExpoMapboxNavigation] Available targets:'
@@ -318,19 +351,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacques_gordon/expo-mapbox-navigation",
-  "version": "2.2.18",
+  "version": "2.2.20",
   "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

@@ -275,6 +275,39 @@ def _expo_mapbox_nav_add_spm(installer)
         puts "[ExpoMapboxNavigation] Added PODS_CONFIGURATION_BUILD_DIR to SWIFT_INCLUDE_PATHS (#{config.name})"
       end
     end
+
+    # ── FRAMEWORK_SEARCH_PATHS / OTHER_LDFLAGS fix for MapboxNavigationNative ───
+    # React Native's own SPM manager (react-native/scripts/cocoapods/spm.rb,
+    # SPMManager#apply_on_post_install) unconditionally deletes ALL
+    # XCRemoteSwiftPackageReference/XCLocalSwiftPackageReference entries not
+    # registered through its own official spm_dependency() API, then only
+    # re-adds the ones it knows about. Since we don't use that API (to avoid
+    # the static-linking duplicate-symbol issues it's known to cause with
+    # Expo modules), our manually-added package_product_dependency for
+    # MapboxNavigationNative keeps getting wiped. Running this whole hook
+    # from post_integrate (see bottom of file) works around the *timing* of
+    # that wipe, but as a second, independent line of defense that doesn't
+    # depend on hook ordering at all, we also force-link the actual compiled
+    # MapboxNavigationNativeWrapper.framework directly via raw build
+    # settings. clean_spm_dependencies_from_target only ever touches
+    # package_references - it never touches FRAMEWORK_SEARCH_PATHS or
+    # OTHER_LDFLAGS, so this survives regardless of what wipes the package
+    # graph entries.
+    expo_target.build_configurations.each do |config|
+      existing_fsp = config.build_settings['FRAMEWORK_SEARCH_PATHS'] || '$(inherited)'
+      unless existing_fsp.to_s.include?('PackageFrameworks')
+        config.build_settings['FRAMEWORK_SEARCH_PATHS'] =
+          "#{existing_fsp} \\"${podsBuildDir}/PackageFrameworks\\""
+        puts "[ExpoMapboxNavigation] Added PackageFrameworks to FRAMEWORK_SEARCH_PATHS (#{config.name})"
+      end
+
+      existing_ldflags = config.build_settings['OTHER_LDFLAGS'] || '$(inherited)'
+      unless existing_ldflags.to_s.include?('MapboxNavigationNativeWrapper')
+        config.build_settings['OTHER_LDFLAGS'] =
+          "#{existing_ldflags} -framework MapboxNavigationNativeWrapper"
+        puts "[ExpoMapboxNavigation] Added -framework MapboxNavigationNativeWrapper to OTHER_LDFLAGS (#{config.name})"
+      end
+    end
   else
     puts '[ExpoMapboxNavigation] WARNING: ExpoMapboxNavigation target not found!'
     puts '[ExpoMapboxNavigation] Available targets:'
@@ -318,19 +351,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
 `;