@baeckerherz/expo-mapbox-navigation 0.1.21 → 0.1.23

package/ios/ExpoMapboxNavigation.podspec

@@ -24,4 +24,9 @@ Pod::Spec.new do |s|
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
   }
 
+  # Mapbox Navigation SDK v3 binary xcframeworks must be linked by the app
+  # target (static pods can't link dynamic frameworks).
+  s.user_target_xcconfig = {
+    'OTHER_LDFLAGS' => '$(inherited) -framework "MapboxNavigationNative" -framework "MapboxCommon" -framework "MapboxCoreMaps"',
+  }
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baeckerherz/expo-mapbox-navigation",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "Expo module wrapping Mapbox Navigation SDK v3 for iOS and Android",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/plugin/build/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
-const withMapboxNavSPM_1 = require("./withMapboxNavSPM");
 const withMapboxNavPodfile_1 = require("./withMapboxNavPodfile");
 const withMapboxNavGradle_1 = require("./withMapboxNavGradle");
 const withMapboxNavGradleProperties_1 = require("./withMapboxNavGradleProperties");
+const withMapboxArchiveFix_1 = require("./withMapboxArchiveFix");
 const withMapboxNavigation = (config, { mapboxAccessToken, mapboxSecretToken, navigationSdkVersion = "3.5.0", }) => {
     if (!mapboxAccessToken) {
         throw new Error("[@baeckerherz/expo-mapbox-navigation] mapboxAccessToken is required.");
@@ -25,14 +25,12 @@ const withMapboxNavigation = (config, { mapboxAccessToken, mapboxSecretToken, na
     config.ios.infoPlist.NSLocationAlwaysAndWhenInUseUsageDescription =
         config.ios.infoPlist.NSLocationAlwaysAndWhenInUseUsageDescription ||
             "This app needs your location for turn-by-turn navigation, including in the background.";
-    // iOS: Add Mapbox Navigation SPM to the app Xcode project. This is the
-    // single source of truth for SPM — handles resolution, linking, and
-    // embedding of all binary xcframeworks. Keeping SPM out of the Pods
-    // project avoids duplicate xcframework signatures during archiving.
-    config = (0, withMapboxNavSPM_1.withMapboxNavSPM)(config, { navigationSdkVersion });
-    // iOS: Set framework search paths on the ExpoMapboxNavigation pod so it
-    // can find SPM-built modules (including PackageFrameworks directory).
-    config = (0, withMapboxNavPodfile_1.withMapboxNavPodfile)(config);
+    // iOS: Adds Mapbox Navigation SPM to the Pods project and sets search paths
+    // so ExpoMapboxNavigation can import Mapbox modules.
+    config = (0, withMapboxNavPodfile_1.withMapboxNavPodfile)(config, { navigationSdkVersion });
+    // iOS: Workaround for Xcode 17 bug — duplicate xcframework .signature files
+    // during archive creation. Strips them from BUILD_DIR before the archive step.
+    config = (0, withMapboxArchiveFix_1.withMapboxArchiveFix)(config);
     // Android: Mapbox Maven repository and optional token for SDK download
     config = (0, withMapboxNavGradle_1.withMapboxNavGradle)(config);
     config = (0, withMapboxNavGradleProperties_1.withMapboxNavGradleProperties)(config, { mapboxSecretToken });

package/plugin/build/withMapboxArchiveFix.d.ts

@@ -0,0 +1,14 @@
+import { ConfigPlugin } from "@expo/config-plugins";
+/**
+ * Adds a Run Script build phase to the app target that removes xcframework
+ * .signature files from the build directory before the archive step.
+ *
+ * Xcode 17 has a bug where SPM binary xcframeworks that appear in multiple
+ * transitive dependency paths (e.g. MapboxCommon, used by both
+ * MapboxNavigationNative and MapboxCoreMaps) cause duplicate .signature
+ * file copies during archive creation, failing with "item already exists".
+ *
+ * These .signature files are package integrity checks (not code signing)
+ * and are not required for App Store distribution.
+ */
+export declare const withMapboxArchiveFix: ConfigPlugin;

package/plugin/build/withMapboxArchiveFix.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withMapboxArchiveFix = void 0;
+const config_plugins_1 = require("@expo/config-plugins");
+const SCRIPT_NAME = "[Mapbox] Strip xcframework signatures";
+/**
+ * Adds a Run Script build phase to the app target that removes xcframework
+ * .signature files from the build directory before the archive step.
+ *
+ * Xcode 17 has a bug where SPM binary xcframeworks that appear in multiple
+ * transitive dependency paths (e.g. MapboxCommon, used by both
+ * MapboxNavigationNative and MapboxCoreMaps) cause duplicate .signature
+ * file copies during archive creation, failing with "item already exists".
+ *
+ * These .signature files are package integrity checks (not code signing)
+ * and are not required for App Store distribution.
+ */
+const withMapboxArchiveFix = (config) => {
+    return (0, config_plugins_1.withXcodeProject)(config, (config) => {
+        const project = config.modResults;
+        const nativeTargetKey = Object.keys(project.hash.project.objects["PBXNativeTarget"]).find((key) => !key.includes("_comment"));
+        if (!nativeTargetKey)
+            return config;
+        const target = project.hash.project.objects["PBXNativeTarget"][nativeTargetKey];
+        const alreadyAdded = (target.buildPhases || []).some((uuid) => {
+            const comment = project.hash.project.objects["PBXShellScriptBuildPhase"]?.[`${uuid}_comment`];
+            return comment === SCRIPT_NAME;
+        });
+        if (alreadyAdded)
+            return config;
+        if (!project.hash.project.objects["PBXShellScriptBuildPhase"]) {
+            project.hash.project.objects["PBXShellScriptBuildPhase"] = {};
+        }
+        const uuid = project.generateUuid();
+        project.hash.project.objects["PBXShellScriptBuildPhase"][uuid] = {
+            isa: "PBXShellScriptBuildPhase",
+            buildActionMask: 2147483647,
+            files: [],
+            inputPaths: [],
+            name: SCRIPT_NAME,
+            outputPaths: [],
+            runOnlyForDeploymentPostprocessing: 0,
+            shellPath: "/bin/sh",
+            shellScript: 'find "${BUILD_DIR}" -name "*.xcframework-*.signature" -delete 2>/dev/null\\nexit 0\\n',
+        };
+        project.hash.project.objects["PBXShellScriptBuildPhase"][`${uuid}_comment`] = SCRIPT_NAME;
+        if (!target.buildPhases)
+            target.buildPhases = [];
+        target.buildPhases.push(uuid);
+        return config;
+    });
+};
+exports.withMapboxArchiveFix = withMapboxArchiveFix;

package/plugin/build/withMapboxNavPodfile.d.ts

@@ -1,12 +1,16 @@
 import { ConfigPlugin } from "@expo/config-plugins";
+interface PodfileOptions {
+    navigationSdkVersion: string;
+}
 /**
- * Patches the Podfile post_install so ExpoMapboxNavigation can find
- * SPM-built Mapbox frameworks (added to the app .xcodeproj by withMapboxNavSPM).
- *
- * Search paths cover all locations where SPM places built modules:
- *  - PackageFrameworks (SPM framework products)
- *  - BUILT_PRODUCTS_DIR and parent (loose modules and shared products)
- *
- * Also enables BUILD_LIBRARY_FOR_DISTRIBUTION on Mapbox/Turf pod targets.
+ * Injects a post_install hook that:
+ *  1. Adds Mapbox Navigation SDK as an SPM dependency in the Pods project,
+ *     linking only MapboxNavigationUIKit to ExpoMapboxNavigation. Using a
+ *     single top-level product avoids duplicate xcframework signature copies
+ *     during archiving (MapboxCommon appears in multiple transitive chains).
+ *  2. Sets FRAMEWORK_SEARCH_PATHS / SWIFT_INCLUDE_PATHS so the pod can find
+ *     all SPM-built modules (including transitive deps like MapboxDirections).
+ *  3. Enables BUILD_LIBRARY_FOR_DISTRIBUTION on Mapbox/Turf targets.
  */
-export declare const withMapboxNavPodfile: ConfigPlugin;
+export declare const withMapboxNavPodfile: ConfigPlugin<PodfileOptions>;
+export {};

package/plugin/build/withMapboxNavPodfile.js

@@ -37,25 +37,28 @@ exports.withMapboxNavPodfile = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const MAPBOX_NAV_URL = "https://github.com/mapbox/mapbox-navigation-ios.git";
 const PLUGIN_MARKER = "# @baeckerherz/expo-mapbox-navigation:";
 /**
- * Patches the Podfile post_install so ExpoMapboxNavigation can find
- * SPM-built Mapbox frameworks (added to the app .xcodeproj by withMapboxNavSPM).
- *
- * Search paths cover all locations where SPM places built modules:
- *  - PackageFrameworks (SPM framework products)
- *  - BUILT_PRODUCTS_DIR and parent (loose modules and shared products)
- *
- * Also enables BUILD_LIBRARY_FOR_DISTRIBUTION on Mapbox/Turf pod targets.
+ * Injects a post_install hook that:
+ *  1. Adds Mapbox Navigation SDK as an SPM dependency in the Pods project,
+ *     linking only MapboxNavigationUIKit to ExpoMapboxNavigation. Using a
+ *     single top-level product avoids duplicate xcframework signature copies
+ *     during archiving (MapboxCommon appears in multiple transitive chains).
+ *  2. Sets FRAMEWORK_SEARCH_PATHS / SWIFT_INCLUDE_PATHS so the pod can find
+ *     all SPM-built modules (including transitive deps like MapboxDirections).
+ *  3. Enables BUILD_LIBRARY_FOR_DISTRIBUTION on Mapbox/Turf targets.
  */
-const withMapboxNavPodfile = (config) => {
+const withMapboxNavPodfile = (config, { navigationSdkVersion }) => {
     return (0, config_plugins_1.withDangerousMod)(config, [
         "ios",
         async (config) => {
             const podfilePath = path.join(config.modRequest.platformProjectRoot, "Podfile");
             let contents = fs.readFileSync(podfilePath, "utf8");
+            const versionEscaped = navigationSdkVersion.replace(/'/g, "\\\\'");
             const hook = `
-    ${PLUGIN_MARKER} framework search paths + BUILD_LIBRARY_FOR_DISTRIBUTION
+    ${PLUGIN_MARKER} SPM in Pods + search paths + BUILD_LIBRARY_FOR_DISTRIBUTION
+    mapbox_nav_version = '${versionEscaped}'
     installer.pods_project.targets.each do |target|
       if target.name.start_with?('Mapbox') || target.name == 'Turf'
         target.build_configurations.each do |cfg|
@@ -69,6 +72,29 @@ const withMapboxNavPodfile = (config) => {
           cfg.build_settings['SWIFT_INCLUDE_PATHS'] = paths
         end
       end
+    end
+    emn_target = installer.pods_project.targets.find { |t| t.name == 'ExpoMapboxNavigation' }
+    if emn_target
+      project = installer.pods_project
+      root = project.root_object
+      pkg_ref = root.package_references&.find { |r| r.respond_to?(:repositoryURL) && r.repositoryURL == '${MAPBOX_NAV_URL}' }
+      unless pkg_ref
+        pkg_ref = project.new(Xcodeproj::Project::Object::XCRemoteSwiftPackageReference)
+        pkg_ref.repositoryURL = '${MAPBOX_NAV_URL}'
+        pkg_ref.requirement = { 'kind' => 'exactVersion', 'version' => mapbox_nav_version }
+        root.package_references << pkg_ref
+      end
+      unless emn_target.package_product_dependencies.any? { |d| d.product_name == 'MapboxNavigationUIKit' }
+        dep = project.new(Xcodeproj::Project::Object::XCSwiftPackageProductDependency)
+        dep.package = pkg_ref
+        dep.product_name = 'MapboxNavigationUIKit'
+        emn_target.package_product_dependencies << dep
+        if emn_target.frameworks_build_phases
+          bf = project.new(Xcodeproj::Project::Object::PBXBuildFile)
+          bf.product_ref = dep
+          emn_target.frameworks_build_phases.files << bf
+        end
+      end
     end`;
             const escapedMarker = PLUGIN_MARKER.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
             // Remove any previously injected hook (handles upgrades from older plugin versions)

package/plugin/src/index.ts

@@ -1,8 +1,8 @@
 import { ConfigPlugin, createRunOncePlugin } from "@expo/config-plugins";
-import { withMapboxNavSPM } from "./withMapboxNavSPM";
 import { withMapboxNavPodfile } from "./withMapboxNavPodfile";
 import { withMapboxNavGradle } from "./withMapboxNavGradle";
 import { withMapboxNavGradleProperties } from "./withMapboxNavGradleProperties";
+import { withMapboxArchiveFix } from "./withMapboxArchiveFix";
 
 interface PluginConfig {
   /** Mapbox public access token (pk.xxx). Required for the native SDK. */
@@ -44,15 +44,13 @@ const withMapboxNavigation: ConfigPlugin<PluginConfig> = (
     config.ios.infoPlist.NSLocationAlwaysAndWhenInUseUsageDescription ||
     "This app needs your location for turn-by-turn navigation, including in the background.";
 
-  // iOS: Add Mapbox Navigation SPM to the app Xcode project. This is the
-  // single source of truth for SPM — handles resolution, linking, and
-  // embedding of all binary xcframeworks. Keeping SPM out of the Pods
-  // project avoids duplicate xcframework signatures during archiving.
-  config = withMapboxNavSPM(config, { navigationSdkVersion });
+  // iOS: Adds Mapbox Navigation SPM to the Pods project and sets search paths
+  // so ExpoMapboxNavigation can import Mapbox modules.
+  config = withMapboxNavPodfile(config, { navigationSdkVersion });
 
-  // iOS: Set framework search paths on the ExpoMapboxNavigation pod so it
-  // can find SPM-built modules (including PackageFrameworks directory).
-  config = withMapboxNavPodfile(config);
+  // iOS: Workaround for Xcode 17 bug — duplicate xcframework .signature files
+  // during archive creation. Strips them from BUILD_DIR before the archive step.
+  config = withMapboxArchiveFix(config);
 
   // Android: Mapbox Maven repository and optional token for SDK download
   config = withMapboxNavGradle(config);

package/plugin/src/withMapboxArchiveFix.ts

@@ -0,0 +1,65 @@
+import { withXcodeProject, ConfigPlugin } from "@expo/config-plugins";
+
+const SCRIPT_NAME = "[Mapbox] Strip xcframework signatures";
+
+/**
+ * Adds a Run Script build phase to the app target that removes xcframework
+ * .signature files from the build directory before the archive step.
+ *
+ * Xcode 17 has a bug where SPM binary xcframeworks that appear in multiple
+ * transitive dependency paths (e.g. MapboxCommon, used by both
+ * MapboxNavigationNative and MapboxCoreMaps) cause duplicate .signature
+ * file copies during archive creation, failing with "item already exists".
+ *
+ * These .signature files are package integrity checks (not code signing)
+ * and are not required for App Store distribution.
+ */
+export const withMapboxArchiveFix: ConfigPlugin = (config) => {
+  return withXcodeProject(config, (config) => {
+    const project = config.modResults;
+
+    const nativeTargetKey = Object.keys(
+      project.hash.project.objects["PBXNativeTarget"]
+    ).find((key) => !key.includes("_comment"));
+
+    if (!nativeTargetKey) return config;
+
+    const target =
+      project.hash.project.objects["PBXNativeTarget"][nativeTargetKey];
+
+    const alreadyAdded = (target.buildPhases || []).some((uuid: string) => {
+      const comment =
+        project.hash.project.objects["PBXShellScriptBuildPhase"]?.[
+          `${uuid}_comment`
+        ];
+      return comment === SCRIPT_NAME;
+    });
+    if (alreadyAdded) return config;
+
+    if (!project.hash.project.objects["PBXShellScriptBuildPhase"]) {
+      project.hash.project.objects["PBXShellScriptBuildPhase"] = {};
+    }
+
+    const uuid = project.generateUuid();
+    project.hash.project.objects["PBXShellScriptBuildPhase"][uuid] = {
+      isa: "PBXShellScriptBuildPhase",
+      buildActionMask: 2147483647,
+      files: [],
+      inputPaths: [],
+      name: SCRIPT_NAME,
+      outputPaths: [],
+      runOnlyForDeploymentPostprocessing: 0,
+      shellPath: "/bin/sh",
+      shellScript:
+        'find "${BUILD_DIR}" -name "*.xcframework-*.signature" -delete 2>/dev/null\\nexit 0\\n',
+    };
+    project.hash.project.objects["PBXShellScriptBuildPhase"][
+      `${uuid}_comment`
+    ] = SCRIPT_NAME;
+
+    if (!target.buildPhases) target.buildPhases = [];
+    target.buildPhases.push(uuid);
+
+    return config;
+  });
+};

package/plugin/src/withMapboxNavPodfile.ts

@@ -2,19 +2,28 @@ import { withDangerousMod, ConfigPlugin } from "@expo/config-plugins";
 import * as fs from "fs";
 import * as path from "path";
 
+const MAPBOX_NAV_URL = "https://github.com/mapbox/mapbox-navigation-ios.git";
+
 const PLUGIN_MARKER = "# @baeckerherz/expo-mapbox-navigation:";
 
+interface PodfileOptions {
+  navigationSdkVersion: string;
+}
+
 /**
- * Patches the Podfile post_install so ExpoMapboxNavigation can find
- * SPM-built Mapbox frameworks (added to the app .xcodeproj by withMapboxNavSPM).
- *
- * Search paths cover all locations where SPM places built modules:
- *  - PackageFrameworks (SPM framework products)
- *  - BUILT_PRODUCTS_DIR and parent (loose modules and shared products)
- *
- * Also enables BUILD_LIBRARY_FOR_DISTRIBUTION on Mapbox/Turf pod targets.
+ * Injects a post_install hook that:
+ *  1. Adds Mapbox Navigation SDK as an SPM dependency in the Pods project,
+ *     linking only MapboxNavigationUIKit to ExpoMapboxNavigation. Using a
+ *     single top-level product avoids duplicate xcframework signature copies
+ *     during archiving (MapboxCommon appears in multiple transitive chains).
+ *  2. Sets FRAMEWORK_SEARCH_PATHS / SWIFT_INCLUDE_PATHS so the pod can find
+ *     all SPM-built modules (including transitive deps like MapboxDirections).
+ *  3. Enables BUILD_LIBRARY_FOR_DISTRIBUTION on Mapbox/Turf targets.
  */
-export const withMapboxNavPodfile: ConfigPlugin = (config) => {
+export const withMapboxNavPodfile: ConfigPlugin<PodfileOptions> = (
+  config,
+  { navigationSdkVersion }
+) => {
   return withDangerousMod(config, [
     "ios",
     async (config) => {
@@ -24,8 +33,11 @@ export const withMapboxNavPodfile: ConfigPlugin = (config) => {
       );
       let contents = fs.readFileSync(podfilePath, "utf8");
 
+      const versionEscaped = navigationSdkVersion.replace(/'/g, "\\\\'");
+
       const hook = `
-    ${PLUGIN_MARKER} framework search paths + BUILD_LIBRARY_FOR_DISTRIBUTION
+    ${PLUGIN_MARKER} SPM in Pods + search paths + BUILD_LIBRARY_FOR_DISTRIBUTION
+    mapbox_nav_version = '${versionEscaped}'
     installer.pods_project.targets.each do |target|
       if target.name.start_with?('Mapbox') || target.name == 'Turf'
         target.build_configurations.each do |cfg|
@@ -39,6 +51,29 @@ export const withMapboxNavPodfile: ConfigPlugin = (config) => {
           cfg.build_settings['SWIFT_INCLUDE_PATHS'] = paths
         end
       end
+    end
+    emn_target = installer.pods_project.targets.find { |t| t.name == 'ExpoMapboxNavigation' }
+    if emn_target
+      project = installer.pods_project
+      root = project.root_object
+      pkg_ref = root.package_references&.find { |r| r.respond_to?(:repositoryURL) && r.repositoryURL == '${MAPBOX_NAV_URL}' }
+      unless pkg_ref
+        pkg_ref = project.new(Xcodeproj::Project::Object::XCRemoteSwiftPackageReference)
+        pkg_ref.repositoryURL = '${MAPBOX_NAV_URL}'
+        pkg_ref.requirement = { 'kind' => 'exactVersion', 'version' => mapbox_nav_version }
+        root.package_references << pkg_ref
+      end
+      unless emn_target.package_product_dependencies.any? { |d| d.product_name == 'MapboxNavigationUIKit' }
+        dep = project.new(Xcodeproj::Project::Object::XCSwiftPackageProductDependency)
+        dep.package = pkg_ref
+        dep.product_name = 'MapboxNavigationUIKit'
+        emn_target.package_product_dependencies << dep
+        if emn_target.frameworks_build_phases
+          bf = project.new(Xcodeproj::Project::Object::PBXBuildFile)
+          bf.product_ref = dep
+          emn_target.frameworks_build_phases.files << bf
+        end
+      end
     end`;
 
       const escapedMarker = PLUGIN_MARKER.replace(