@maplibre/maplibre-react-native 10.0.0-beta.14 → 10.0.0-beta.16

package/README.md

@@ -27,7 +27,7 @@ diverged, it has become necessary to separate the projects into specific wrapper
 
 ## Documentation
 
-- [Getting Started](/docs/guides/setup/Getting-Started)
+- [Getting Started](/docs/guides/setup/Getting-Started.md)
 - Installation
   - [Expo](/docs/guides/setup/Expo.md)
   - [React Native](/docs/guides/setup/React-Native.md)
@@ -80,4 +80,4 @@ set up your local development environment.
 
 ## Community
 
-Join the `#maplibre-react-native` or `#maplibre` [Slack channels at OSMUS](https://slack.openstreetmap.us/).
+Join the `#maplibre-react-native` or `#maplibre` [on the Open Street Map Slack](https://slack.openstreetmap.us/).

package/android/src/main/java/org/maplibre/reactnative/utils/GeoJSONUtils.java

@@ -6,6 +6,8 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.google.gson.JsonObject;
+
 import org.maplibre.geojson.Feature;
 import org.maplibre.geojson.FeatureCollection;
 import org.maplibre.geojson.Geometry;
@@ -19,23 +21,34 @@ import org.maplibre.geojson.Polygon;
 import org.maplibre.android.geometry.LatLng;
 import org.maplibre.android.geometry.LatLngBounds;
 import org.maplibre.android.geometry.LatLngQuad;
-import org.maplibre.android.style.light.Position;
+import org.maplibre.android.log.Logger;
 import org.maplibre.turf.TurfMeasurement;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class GeoJSONUtils {
+    public static final String LOG_TAG = "GeoJSONUtils";
+
     public static WritableMap fromFeature(Feature feature) {
         WritableMap map = Arguments.createMap();
         map.putString("type", "Feature");
         map.putString("id", feature.id());
 
-        WritableMap geometry = fromGeometry(feature.geometry());
-        map.putMap("geometry", geometry);
+        Geometry geometry = feature.geometry();
+        if (geometry == null) {
+            map.putNull("geometry");
+        } else {
+            map.putMap("geometry", fromGeometry(geometry));
+        }
 
-        WritableMap properties = ConvertUtils.toWritableMap(feature.properties());
-        map.putMap("properties", properties);
+        JsonObject properties = feature.properties();
+        if(properties == null) {
+            map.putNull("properties");
+        } else {
+            map.putMap("properties", ConvertUtils.toWritableMap(properties));
+        }
 
         return map;
     }
@@ -43,22 +56,20 @@ public class GeoJSONUtils {
     public static WritableMap fromGeometry(Geometry geometry) {
         final String type = geometry.type();
 
-        switch (type) {
-            case "Point":
-                return fromPoint((Point) geometry);
-            case "LineString":
-                return fromLineString((LineString) geometry);
-            case "Polygon":
-                return fromPolygon((Polygon) geometry);
-            case "MultiPoint":
-                return fromMultiPoint((MultiPoint) geometry);
-            case "MultiLineString":
-                return fromMultiLineString((MultiLineString) geometry);
-            case "MultiPolygon":
-                return fromMultiPolygon((MultiPolygon) geometry);
-            default:
-                return null;
-        }
+        return switch (type) {
+            case "Point" -> fromPoint((Point) geometry);
+            case "LineString" -> fromLineString((LineString) geometry);
+            case "Polygon" -> fromPolygon((Polygon) geometry);
+            case "MultiPoint" -> fromMultiPoint((MultiPoint) geometry);
+            case "MultiLineString" -> fromMultiLineString((MultiLineString) geometry);
+            case "MultiPolygon" -> fromMultiPolygon((MultiPolygon) geometry);
+            case "GeometryCollection" -> fromGeometryCollection((GeometryCollection) geometry);
+            default -> {
+                Logger.w(LOG_TAG, "GeoJSONUtils.fromGeometry unsupported type: \"" + type + "\"");
+
+                yield null;
+            }
+        };
     }
 
     public static WritableMap fromPoint(Point point) {
@@ -103,6 +114,23 @@ public class GeoJSONUtils {
         return map;
     }
 
+    public static WritableMap fromGeometryCollection(GeometryCollection geometryCollection) {
+        WritableMap map = Arguments.createMap();
+        map.putString("type", "GeometryCollection");
+
+        map.putArray("geometries",
+                Arguments.fromList(
+                        geometryCollection
+                                .geometries()
+                                .stream()
+                                .map(GeoJSONUtils::fromGeometry)
+                                .collect(Collectors.toList())
+                )
+        );
+
+        return map;
+    }
+
     public static WritableArray getCoordinates(Point point) {
         return Arguments.fromArray(pointToDoubleArray(point));
     }
@@ -122,9 +150,6 @@ public class GeoJSONUtils {
         WritableArray array = Arguments.createArray();
 
         List<List<Point>> points = polygon.coordinates();
-        if (points == null) {
-            return array;
-        }
 
         for (List<Point> curPoint : points) {
             WritableArray innerArray = Arguments.createArray();

package/lib/commonjs/plugin/ios.js

@@ -0,0 +1,97 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applyPodfilePostInstall = applyPodfilePostInstall;
+exports.ios = void 0;
+var _configPlugins = require("@expo/config-plugins");
+var _generateCode = require("@expo/config-plugins/build/utils/generateCode");
+/**
+ * Only the post-install block is required, the post installer block is used for SPM (Swift Package Manager) which Expo
+ * doesn't currently support.
+ */
+function applyPodfilePostInstall(contents) {
+  const result = (0, _generateCode.mergeContents)({
+    tag: `@maplibre/maplibre-react-native-post_installer`,
+    src: contents,
+    newSrc: `    $MLRN.post_install(installer)`,
+    anchor: new RegExp(`post_install do \\|installer\\|`),
+    offset: 1,
+    comment: "#"
+  });
+  if (result.didMerge || result.didClear) {
+    return result.contents;
+  }
+  return contents;
+}
+const withPodfilePostInstall = config => {
+  return (0, _configPlugins.withPodfile)(config, c => {
+    c.modResults.contents = applyPodfilePostInstall(c.modResults.contents);
+    return c;
+  });
+};
+
+/**
+ * Exclude building for arm64 on simulator devices in the pbxproj project.
+ * Without this, production builds targeting simulators will fail.
+ */
+function setExcludedArchitectures(project) {
+  const configurations = project.pbxXCBuildConfigurationSection();
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  for (const {
+    name,
+    buildSettings
+  } of Object.values(configurations || {})) {
+    // Guessing that this is the best way to emulate Xcode.
+    // Using `project.addToBuildSettings` modifies too many targets.
+    if (name === "Release" && typeof buildSettings?.PRODUCT_NAME !== "undefined") {
+      buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
+    }
+  }
+  return project;
+}
+const withoutSignatures = config => {
+  return (0, _configPlugins.withXcodeProject)(config, async c => {
+    c.modResults.addBuildPhase([], "PBXShellScriptBuildPhase", "Remove signature files (Xcode workaround)", null, {
+      shellPath: "/bin/sh",
+      shellScript: `
+          echo "Remove signature files (Xcode workaround)";
+          rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
+        `
+    });
+    return c;
+  });
+};
+
+/**
+ *  Set the Debug Information Format to DWARF with dSYM File during EAS Build for Managed App
+ *  https://github.com/expo/eas-cli/issues/968
+ *
+ *  Set `artifactPath` in `eas.json`:
+ *  ```json
+ *  "ios": {
+ *    "artifactPath": "ios/build/*"
+ *  }
+ *  ```
+ */
+const withDwarfDsym = config => {
+  return (0, _configPlugins.withXcodeProject)(config, async c => {
+    c.modResults.debugInformationFormat = "dwarf-with-dsym";
+    return c;
+  });
+};
+const withExcludedSimulatorArchitectures = config => {
+  return (0, _configPlugins.withXcodeProject)(config, c => {
+    c.modResults = setExcludedArchitectures(c.modResults);
+    return c;
+  });
+};
+const ios = exports.ios = {
+  withPodfilePostInstall,
+  withoutSignatures,
+  withDwarfDsym,
+  withExcludedSimulatorArchitectures
+};
+//# sourceMappingURL=ios.js.map

package/lib/commonjs/plugin/ios.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_configPlugins","require","_generateCode","applyPodfilePostInstall","contents","result","mergeContents","tag","src","newSrc","anchor","RegExp","offset","comment","didMerge","didClear","withPodfilePostInstall","config","withPodfile","c","modResults","setExcludedArchitectures","project","configurations","pbxXCBuildConfigurationSection","name","buildSettings","Object","values","PRODUCT_NAME","withoutSignatures","withXcodeProject","addBuildPhase","shellPath","shellScript","withDwarfDsym","debugInformationFormat","withExcludedSimulatorArchitectures","ios","exports"],"sourceRoot":"../../../src","sources":["plugin/ios.ts"],"mappings":";;;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAMA,IAAAC,aAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACO,SAASE,uBAAuBA,CAACC,QAAgB,EAAU;EAChE,MAAMC,MAAM,GAAG,IAAAC,2BAAa,EAAC;IAC3BC,GAAG,EAAE,gDAAgD;IACrDC,GAAG,EAAEJ,QAAQ;IACbK,MAAM,EAAE,mCAAmC;IAC3CC,MAAM,EAAE,IAAIC,MAAM,CAAC,iCAAiC,CAAC;IACrDC,MAAM,EAAE,CAAC;IACTC,OAAO,EAAE;EACX,CAAC,CAAC;EAEF,IAAIR,MAAM,CAACS,QAAQ,IAAIT,MAAM,CAACU,QAAQ,EAAE;IACtC,OAAOV,MAAM,CAACD,QAAQ;EACxB;EAEA,OAAOA,QAAQ;AACjB;AAEA,MAAMY,sBAAoC,GAAIC,MAAM,IAAK;EACvD,OAAO,IAAAC,0BAAW,EAACD,MAAM,EAAGE,CAAC,IAAK;IAChCA,CAAC,CAACC,UAAU,CAAChB,QAAQ,GAAGD,uBAAuB,CAACgB,CAAC,CAACC,UAAU,CAAChB,QAAQ,CAAC;IAEtE,OAAOe,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA,SAASE,wBAAwBA,CAACC,OAAqB,EAAgB;EACrE,MAAMC,cAAc,GAAGD,OAAO,CAACE,8BAA8B,CAAC,CAAC;EAC/D;EACA;EACA,KAAK,MAAM;IAAEC,IAAI;IAAEC;EAAc,CAAC,IAAIC,MAAM,CAACC,MAAM,CAACL,cAAc,IAAI,CAAC,CAAC,CAAC,EAAE;IACzE;IACA;IACA,IACEE,IAAI,KAAK,SAAS,IAClB,OAAOC,aAAa,EAAEG,YAAY,KAAK,WAAW,EAClD;MACAH,aAAa,CAAC,wCAAwC,CAAC,GAAG,SAAS;IACrE;EACF;EAEA,OAAOJ,OAAO;AAChB;AAEA,MAAMQ,iBAA+B,GAAIb,MAAM,IAAK;EAClD,OAAO,IAAAc,+BAAgB,EAACd,MAAM,EAAE,MAAOE,CAAC,IAAK;IAC3CA,CAAC,CAACC,UAAU,CAACY,aAAa,CACxB,EAAE,EACF,0BAA0B,EAC1B,2CAA2C,EAC3C,IAAI,EACJ;MACEC,SAAS,EAAE,SAAS;MACpBC,WAAW,EAAE;AACrB;AACA;AACA;IACM,CACF,CAAC;IAED,OAAOf,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMgB,aAA2B,GAAIlB,MAAM,IAAK;EAC9C,OAAO,IAAAc,+BAAgB,EAACd,MAAM,EAAE,MAAOE,CAAC,IAAK;IAC3CA,CAAC,CAACC,UAAU,CAACgB,sBAAsB,GAAG,iBAAiB;IAEvD,OAAOjB,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,MAAMkB,kCAAgD,GAAIpB,MAAM,IAAK;EACnE,OAAO,IAAAc,+BAAgB,EAACd,MAAM,EAAGE,CAAC,IAAK;IACrCA,CAAC,CAACC,UAAU,GAAGC,wBAAwB,CAACF,CAAC,CAACC,UAAU,CAAC;IAErD,OAAOD,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAEM,MAAMmB,GAAG,GAAAC,OAAA,CAAAD,GAAA,GAAG;EACjBtB,sBAAsB;EACtBc,iBAAiB;EACjBK,aAAa;EACbE;AACF,CAAC","ignoreList":[]}

package/lib/commonjs/plugin/withMapLibre.js

@@ -3,16 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.addInstallerBlock = addInstallerBlock;
-exports.addMapLibreInstallerBlock = addMapLibreInstallerBlock;
-exports.applyCocoaPodsModifications = applyCocoaPodsModifications;
 exports.default = void 0;
-exports.setExcludedArchitectures = setExcludedArchitectures;
 var _configPlugins = require("@expo/config-plugins");
-var _generateCode = require("@expo/config-plugins/build/utils/generateCode");
-var _nodeFs = require("node:fs");
-var _nodePath = _interopRequireDefault(require("node:path"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _ios = require("./ios.js");
 let pkg = {
   name: "@maplibre/maplibre-react-native"
 };
@@ -21,129 +14,13 @@ try {
 } catch {
   // empty catch block
 }
-/**
- * Dangerously adds the custom installer hooks to the Podfile.
- * In the future this should be removed in favor of some custom hooks provided by Expo autolinking.
- *
- * https://github.com/maplibre/maplibre-react-native/blob/main/docs/guides/setup/iOS.md
- */
-const withCocoaPodsInstallerBlocks = c => {
-  return (0, _configPlugins.withDangerousMod)(c, ["ios",
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-  async config => {
-    const file = _nodePath.default.join(config.modRequest.platformProjectRoot, "Podfile");
-    const contents = await _nodeFs.promises.readFile(file, "utf8");
-    await _nodeFs.promises.writeFile(file, applyCocoaPodsModifications(contents), "utf-8");
-    return config;
-  }]);
-};
-
-// Only the post-install block is required, the post installer block is
-// used for spm (swift package manager) which Expo doesn't currently support.
-function applyCocoaPodsModifications(contents) {
-  // Ensure installer blocks exist
-  let src = addInstallerBlock(contents, "post");
-  src = addMapLibreInstallerBlock(src, "post");
-  return src;
-}
-function addInstallerBlock(src, blockName) {
-  const matchBlock = new RegExp(`${blockName}_install do \\|installer\\|`);
-  const tag = `${blockName}_installer`;
-  for (const line of src.split("\n")) {
-    const contents = line.trim();
-    // Ignore comments
-    if (!contents.startsWith("#")) {
-      // Prevent adding the block if it exists outside of comments.
-      if (contents.match(matchBlock)) {
-        // This helps to still allow revisions, since we enabled the block previously.
-        // Only continue if the generated block exists...
-        const modified = (0, _generateCode.removeGeneratedContents)(src, tag);
-        if (!modified) {
-          return src;
-        }
-      }
-    }
-  }
-  return (0, _generateCode.mergeContents)({
-    tag,
-    src,
-    newSrc: [`  ${blockName}_install do |installer|`, "  end"].join("\n"),
-    anchor: /use_react_native/,
-    // We can't go after the use_react_native block because it might have parameters, causing it to be multi-line (see react-native template).
-    offset: 0,
-    comment: "#"
-  }).contents;
-}
-function addMapLibreInstallerBlock(src, blockName) {
-  return (0, _generateCode.mergeContents)({
-    tag: `@maplibre/maplibre-react-native-${blockName}_installer`,
-    src,
-    newSrc: `    $MLRN.${blockName}_install(installer)`,
-    anchor: new RegExp(`${blockName}_install do \\|installer\\|`),
-    offset: 1,
-    comment: "#"
-  }).contents;
-}
-
-/**
- * Exclude building for arm64 on simulator devices in the pbxproj project.
- * Without this, production builds targeting simulators will fail.
- */
-function setExcludedArchitectures(project) {
-  const configurations = project.pbxXCBuildConfigurationSection();
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  for (const {
-    name,
-    buildSettings
-  } of Object.values(configurations || {})) {
-    // Guessing that this is the best way to emulate Xcode.
-    // Using `project.addToBuildSettings` modifies too many targets.
-    if (name === "Release" && typeof buildSettings?.PRODUCT_NAME !== "undefined") {
-      buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
-    }
-  }
-  return project;
-}
-const withoutSignatures = config => {
-  const shellScript = `
-    echo "Remove signature files (Xcode workaround)";
-    rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
-  `;
-  return (0, _configPlugins.withXcodeProject)(config, async config => {
-    const xcodeProject = config.modResults;
-    xcodeProject.addBuildPhase([], "PBXShellScriptBuildPhase", "Remove signature files (Xcode workaround)", null, {
-      shellPath: "/bin/sh",
-      shellScript
-    });
-    return config;
-  });
-};
-
-/**
- *  Set the Debug Information Format to DWARF with dSYM File during EAS Build for Managed App
- *  https://github.com/expo/eas-cli/issues/968
- *  // Set artifactPath in eas.json
- *  "ios": {
- *    "artifactPath": "ios/build/*"
- *  }
- */
-const withDwarfDsym = config => {
-  return (0, _configPlugins.withXcodeProject)(config, async config => {
-    const xcodeProject = config.modResults;
-    xcodeProject.debugInformationFormat = "dwarf-with-dsym";
-    return config;
-  });
-};
-const withExcludedSimulatorArchitectures = c => {
-  return (0, _configPlugins.withXcodeProject)(c, config => {
-    config.modResults = setExcludedArchitectures(config.modResults);
-    return config;
-  });
-};
 const withMapLibre = config => {
-  config = withoutSignatures(withDwarfDsym(withExcludedSimulatorArchitectures(config)));
-  return withCocoaPodsInstallerBlocks(config);
+  // iOS
+  config = _ios.ios.withExcludedSimulatorArchitectures(config);
+  config = _ios.ios.withDwarfDsym(config);
+  config = _ios.ios.withoutSignatures(config);
+  config = _ios.ios.withPodfilePostInstall(config);
+  return config;
 };
 var _default = exports.default = (0, _configPlugins.createRunOncePlugin)(withMapLibre, pkg.name, pkg.version);
 //# sourceMappingURL=withMapLibre.js.map

package/lib/commonjs/plugin/withMapLibre.js.map

@@ -1 +1 @@
-{"version":3,"names":["_configPlugins","require","_generateCode","_nodeFs","_nodePath","_interopRequireDefault","e","__esModule","default","pkg","name","withCocoaPodsInstallerBlocks","c","withDangerousMod","config","file","path","join","modRequest","platformProjectRoot","contents","promises","readFile","writeFile","applyCocoaPodsModifications","src","addInstallerBlock","addMapLibreInstallerBlock","blockName","matchBlock","RegExp","tag","line","split","trim","startsWith","match","modified","removeGeneratedContents","mergeContents","newSrc","anchor","offset","comment","setExcludedArchitectures","project","configurations","pbxXCBuildConfigurationSection","buildSettings","Object","values","PRODUCT_NAME","withoutSignatures","shellScript","withXcodeProject","xcodeProject","modResults","addBuildPhase","shellPath","withDwarfDsym","debugInformationFormat","withExcludedSimulatorArchitectures","withMapLibre","_default","exports","createRunOncePlugin","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_configPlugins","require","_ios","pkg","name","withMapLibre","config","ios","withExcludedSimulatorArchitectures","withDwarfDsym","withoutSignatures","withPodfilePostInstall","_default","exports","default","createRunOncePlugin","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAEA,IAAAC,IAAA,GAAAD,OAAA;AAEA,IAAIE,GAAuC,GAAG;EAC5CC,IAAI,EAAE;AACR,CAAC;AACD,IAAI;EACFD,GAAG,GAAGF,OAAO,CAAC,8CAA8C,CAAC;AAC/D,CAAC,CAAC,MAAM;EACN;AAAA;AAGF,MAAMI,YAA0B,GAAIC,MAAM,IAAK;EAC7C;EACAA,MAAM,GAAGC,QAAG,CAACC,kCAAkC,CAACF,MAAM,CAAC;EACvDA,MAAM,GAAGC,QAAG,CAACE,aAAa,CAACH,MAAM,CAAC;EAClCA,MAAM,GAAGC,QAAG,CAACG,iBAAiB,CAACJ,MAAM,CAAC;EACtCA,MAAM,GAAGC,QAAG,CAACI,sBAAsB,CAACL,MAAM,CAAC;EAE3C,OAAOA,MAAM;AACf,CAAC;AAAC,IAAAM,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEa,IAAAC,kCAAmB,EAACV,YAAY,EAAEF,GAAG,CAACC,IAAI,EAAED,GAAG,CAACa,OAAO,CAAC","ignoreList":[]}

package/lib/module/plugin/ios.js

@@ -0,0 +1,93 @@
+"use strict";
+
+import { withPodfile, withXcodeProject } from "@expo/config-plugins";
+import { mergeContents } from "@expo/config-plugins/build/utils/generateCode";
+
+/**
+ * Only the post-install block is required, the post installer block is used for SPM (Swift Package Manager) which Expo
+ * doesn't currently support.
+ */
+export function applyPodfilePostInstall(contents) {
+  const result = mergeContents({
+    tag: `@maplibre/maplibre-react-native-post_installer`,
+    src: contents,
+    newSrc: `    $MLRN.post_install(installer)`,
+    anchor: new RegExp(`post_install do \\|installer\\|`),
+    offset: 1,
+    comment: "#"
+  });
+  if (result.didMerge || result.didClear) {
+    return result.contents;
+  }
+  return contents;
+}
+const withPodfilePostInstall = config => {
+  return withPodfile(config, c => {
+    c.modResults.contents = applyPodfilePostInstall(c.modResults.contents);
+    return c;
+  });
+};
+
+/**
+ * Exclude building for arm64 on simulator devices in the pbxproj project.
+ * Without this, production builds targeting simulators will fail.
+ */
+function setExcludedArchitectures(project) {
+  const configurations = project.pbxXCBuildConfigurationSection();
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  for (const {
+    name,
+    buildSettings
+  } of Object.values(configurations || {})) {
+    // Guessing that this is the best way to emulate Xcode.
+    // Using `project.addToBuildSettings` modifies too many targets.
+    if (name === "Release" && typeof buildSettings?.PRODUCT_NAME !== "undefined") {
+      buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
+    }
+  }
+  return project;
+}
+const withoutSignatures = config => {
+  return withXcodeProject(config, async c => {
+    c.modResults.addBuildPhase([], "PBXShellScriptBuildPhase", "Remove signature files (Xcode workaround)", null, {
+      shellPath: "/bin/sh",
+      shellScript: `
+          echo "Remove signature files (Xcode workaround)";
+          rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
+        `
+    });
+    return c;
+  });
+};
+
+/**
+ *  Set the Debug Information Format to DWARF with dSYM File during EAS Build for Managed App
+ *  https://github.com/expo/eas-cli/issues/968
+ *
+ *  Set `artifactPath` in `eas.json`:
+ *  ```json
+ *  "ios": {
+ *    "artifactPath": "ios/build/*"
+ *  }
+ *  ```
+ */
+const withDwarfDsym = config => {
+  return withXcodeProject(config, async c => {
+    c.modResults.debugInformationFormat = "dwarf-with-dsym";
+    return c;
+  });
+};
+const withExcludedSimulatorArchitectures = config => {
+  return withXcodeProject(config, c => {
+    c.modResults = setExcludedArchitectures(c.modResults);
+    return c;
+  });
+};
+export const ios = {
+  withPodfilePostInstall,
+  withoutSignatures,
+  withDwarfDsym,
+  withExcludedSimulatorArchitectures
+};
+//# sourceMappingURL=ios.js.map

package/lib/module/plugin/ios.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["withPodfile","withXcodeProject","mergeContents","applyPodfilePostInstall","contents","result","tag","src","newSrc","anchor","RegExp","offset","comment","didMerge","didClear","withPodfilePostInstall","config","c","modResults","setExcludedArchitectures","project","configurations","pbxXCBuildConfigurationSection","name","buildSettings","Object","values","PRODUCT_NAME","withoutSignatures","addBuildPhase","shellPath","shellScript","withDwarfDsym","debugInformationFormat","withExcludedSimulatorArchitectures","ios"],"sourceRoot":"../../../src","sources":["plugin/ios.ts"],"mappings":";;AAAA,SAEEA,WAAW,EACXC,gBAAgB,QAEX,sBAAsB;AAC7B,SAASC,aAAa,QAAQ,+CAA+C;;AAE7E;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAACC,QAAgB,EAAU;EAChE,MAAMC,MAAM,GAAGH,aAAa,CAAC;IAC3BI,GAAG,EAAE,gDAAgD;IACrDC,GAAG,EAAEH,QAAQ;IACbI,MAAM,EAAE,mCAAmC;IAC3CC,MAAM,EAAE,IAAIC,MAAM,CAAC,iCAAiC,CAAC;IACrDC,MAAM,EAAE,CAAC;IACTC,OAAO,EAAE;EACX,CAAC,CAAC;EAEF,IAAIP,MAAM,CAACQ,QAAQ,IAAIR,MAAM,CAACS,QAAQ,EAAE;IACtC,OAAOT,MAAM,CAACD,QAAQ;EACxB;EAEA,OAAOA,QAAQ;AACjB;AAEA,MAAMW,sBAAoC,GAAIC,MAAM,IAAK;EACvD,OAAOhB,WAAW,CAACgB,MAAM,EAAGC,CAAC,IAAK;IAChCA,CAAC,CAACC,UAAU,CAACd,QAAQ,GAAGD,uBAAuB,CAACc,CAAC,CAACC,UAAU,CAACd,QAAQ,CAAC;IAEtE,OAAOa,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA,SAASE,wBAAwBA,CAACC,OAAqB,EAAgB;EACrE,MAAMC,cAAc,GAAGD,OAAO,CAACE,8BAA8B,CAAC,CAAC;EAC/D;EACA;EACA,KAAK,MAAM;IAAEC,IAAI;IAAEC;EAAc,CAAC,IAAIC,MAAM,CAACC,MAAM,CAACL,cAAc,IAAI,CAAC,CAAC,CAAC,EAAE;IACzE;IACA;IACA,IACEE,IAAI,KAAK,SAAS,IAClB,OAAOC,aAAa,EAAEG,YAAY,KAAK,WAAW,EAClD;MACAH,aAAa,CAAC,wCAAwC,CAAC,GAAG,SAAS;IACrE;EACF;EAEA,OAAOJ,OAAO;AAChB;AAEA,MAAMQ,iBAA+B,GAAIZ,MAAM,IAAK;EAClD,OAAOf,gBAAgB,CAACe,MAAM,EAAE,MAAOC,CAAC,IAAK;IAC3CA,CAAC,CAACC,UAAU,CAACW,aAAa,CACxB,EAAE,EACF,0BAA0B,EAC1B,2CAA2C,EAC3C,IAAI,EACJ;MACEC,SAAS,EAAE,SAAS;MACpBC,WAAW,EAAE;AACrB;AACA;AACA;IACM,CACF,CAAC;IAED,OAAOd,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMe,aAA2B,GAAIhB,MAAM,IAAK;EAC9C,OAAOf,gBAAgB,CAACe,MAAM,EAAE,MAAOC,CAAC,IAAK;IAC3CA,CAAC,CAACC,UAAU,CAACe,sBAAsB,GAAG,iBAAiB;IAEvD,OAAOhB,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,MAAMiB,kCAAgD,GAAIlB,MAAM,IAAK;EACnE,OAAOf,gBAAgB,CAACe,MAAM,EAAGC,CAAC,IAAK;IACrCA,CAAC,CAACC,UAAU,GAAGC,wBAAwB,CAACF,CAAC,CAACC,UAAU,CAAC;IAErD,OAAOD,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAMkB,GAAG,GAAG;EACjBpB,sBAAsB;EACtBa,iBAAiB;EACjBI,aAAa;EACbE;AACF,CAAC","ignoreList":[]}

package/lib/module/plugin/withMapLibre.js

@@ -1,9 +1,7 @@
 "use strict";
 
-import { createRunOncePlugin, withDangerousMod, withXcodeProject } from "@expo/config-plugins";
-import { mergeContents, removeGeneratedContents } from "@expo/config-plugins/build/utils/generateCode";
-import { promises } from "node:fs";
-import path from "node:path";
+import { createRunOncePlugin } from "@expo/config-plugins";
+import { ios } from "./ios.js";
 let pkg = {
   name: "@maplibre/maplibre-react-native"
 };
@@ -12,129 +10,13 @@ try {
 } catch {
   // empty catch block
 }
-/**
- * Dangerously adds the custom installer hooks to the Podfile.
- * In the future this should be removed in favor of some custom hooks provided by Expo autolinking.
- *
- * https://github.com/maplibre/maplibre-react-native/blob/main/docs/guides/setup/iOS.md
- */
-const withCocoaPodsInstallerBlocks = c => {
-  return withDangerousMod(c, ["ios",
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-  async config => {
-    const file = path.join(config.modRequest.platformProjectRoot, "Podfile");
-    const contents = await promises.readFile(file, "utf8");
-    await promises.writeFile(file, applyCocoaPodsModifications(contents), "utf-8");
-    return config;
-  }]);
-};
-
-// Only the post-install block is required, the post installer block is
-// used for spm (swift package manager) which Expo doesn't currently support.
-export function applyCocoaPodsModifications(contents) {
-  // Ensure installer blocks exist
-  let src = addInstallerBlock(contents, "post");
-  src = addMapLibreInstallerBlock(src, "post");
-  return src;
-}
-export function addInstallerBlock(src, blockName) {
-  const matchBlock = new RegExp(`${blockName}_install do \\|installer\\|`);
-  const tag = `${blockName}_installer`;
-  for (const line of src.split("\n")) {
-    const contents = line.trim();
-    // Ignore comments
-    if (!contents.startsWith("#")) {
-      // Prevent adding the block if it exists outside of comments.
-      if (contents.match(matchBlock)) {
-        // This helps to still allow revisions, since we enabled the block previously.
-        // Only continue if the generated block exists...
-        const modified = removeGeneratedContents(src, tag);
-        if (!modified) {
-          return src;
-        }
-      }
-    }
-  }
-  return mergeContents({
-    tag,
-    src,
-    newSrc: [`  ${blockName}_install do |installer|`, "  end"].join("\n"),
-    anchor: /use_react_native/,
-    // We can't go after the use_react_native block because it might have parameters, causing it to be multi-line (see react-native template).
-    offset: 0,
-    comment: "#"
-  }).contents;
-}
-export function addMapLibreInstallerBlock(src, blockName) {
-  return mergeContents({
-    tag: `@maplibre/maplibre-react-native-${blockName}_installer`,
-    src,
-    newSrc: `    $MLRN.${blockName}_install(installer)`,
-    anchor: new RegExp(`${blockName}_install do \\|installer\\|`),
-    offset: 1,
-    comment: "#"
-  }).contents;
-}
-
-/**
- * Exclude building for arm64 on simulator devices in the pbxproj project.
- * Without this, production builds targeting simulators will fail.
- */
-export function setExcludedArchitectures(project) {
-  const configurations = project.pbxXCBuildConfigurationSection();
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  for (const {
-    name,
-    buildSettings
-  } of Object.values(configurations || {})) {
-    // Guessing that this is the best way to emulate Xcode.
-    // Using `project.addToBuildSettings` modifies too many targets.
-    if (name === "Release" && typeof buildSettings?.PRODUCT_NAME !== "undefined") {
-      buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
-    }
-  }
-  return project;
-}
-const withoutSignatures = config => {
-  const shellScript = `
-    echo "Remove signature files (Xcode workaround)";
-    rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
-  `;
-  return withXcodeProject(config, async config => {
-    const xcodeProject = config.modResults;
-    xcodeProject.addBuildPhase([], "PBXShellScriptBuildPhase", "Remove signature files (Xcode workaround)", null, {
-      shellPath: "/bin/sh",
-      shellScript
-    });
-    return config;
-  });
-};
-
-/**
- *  Set the Debug Information Format to DWARF with dSYM File during EAS Build for Managed App
- *  https://github.com/expo/eas-cli/issues/968
- *  // Set artifactPath in eas.json
- *  "ios": {
- *    "artifactPath": "ios/build/*"
- *  }
- */
-const withDwarfDsym = config => {
-  return withXcodeProject(config, async config => {
-    const xcodeProject = config.modResults;
-    xcodeProject.debugInformationFormat = "dwarf-with-dsym";
-    return config;
-  });
-};
-const withExcludedSimulatorArchitectures = c => {
-  return withXcodeProject(c, config => {
-    config.modResults = setExcludedArchitectures(config.modResults);
-    return config;
-  });
-};
 const withMapLibre = config => {
-  config = withoutSignatures(withDwarfDsym(withExcludedSimulatorArchitectures(config)));
-  return withCocoaPodsInstallerBlocks(config);
+  // iOS
+  config = ios.withExcludedSimulatorArchitectures(config);
+  config = ios.withDwarfDsym(config);
+  config = ios.withoutSignatures(config);
+  config = ios.withPodfilePostInstall(config);
+  return config;
 };
 export default createRunOncePlugin(withMapLibre, pkg.name, pkg.version);
 //# sourceMappingURL=withMapLibre.js.map

package/lib/module/plugin/withMapLibre.js.map

@@ -1 +1 @@
-{"version":3,"names":["createRunOncePlugin","withDangerousMod","withXcodeProject","mergeContents","removeGeneratedContents","promises","path","pkg","name","require","withCocoaPodsInstallerBlocks","c","config","file","join","modRequest","platformProjectRoot","contents","readFile","writeFile","applyCocoaPodsModifications","src","addInstallerBlock","addMapLibreInstallerBlock","blockName","matchBlock","RegExp","tag","line","split","trim","startsWith","match","modified","newSrc","anchor","offset","comment","setExcludedArchitectures","project","configurations","pbxXCBuildConfigurationSection","buildSettings","Object","values","PRODUCT_NAME","withoutSignatures","shellScript","xcodeProject","modResults","addBuildPhase","shellPath","withDwarfDsym","debugInformationFormat","withExcludedSimulatorArchitectures","withMapLibre","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createRunOncePlugin","ios","pkg","name","require","withMapLibre","config","withExcludedSimulatorArchitectures","withDwarfDsym","withoutSignatures","withPodfilePostInstall","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":";;AAAA,SAA4BA,mBAAmB,QAAQ,sBAAsB;AAE7E,SAASC,GAAG,QAAQ,UAAO;AAE3B,IAAIC,GAAuC,GAAG;EAC5CC,IAAI,EAAE;AACR,CAAC;AACD,IAAI;EACFD,GAAG,GAAGE,OAAO,CAAC,8CAA8C,CAAC;AAC/D,CAAC,CAAC,MAAM;EACN;AAAA;AAGF,MAAMC,YAA0B,GAAIC,MAAM,IAAK;EAC7C;EACAA,MAAM,GAAGL,GAAG,CAACM,kCAAkC,CAACD,MAAM,CAAC;EACvDA,MAAM,GAAGL,GAAG,CAACO,aAAa,CAACF,MAAM,CAAC;EAClCA,MAAM,GAAGL,GAAG,CAACQ,iBAAiB,CAACH,MAAM,CAAC;EACtCA,MAAM,GAAGL,GAAG,CAACS,sBAAsB,CAACJ,MAAM,CAAC;EAE3C,OAAOA,MAAM;AACf,CAAC;AAED,eAAeN,mBAAmB,CAACK,YAAY,EAAEH,GAAG,CAACC,IAAI,EAAED,GAAG,CAACS,OAAO,CAAC","ignoreList":[]}

package/lib/typescript/commonjs/src/plugin/ios.d.ts

@@ -0,0 +1,13 @@
+import { type ConfigPlugin } from "@expo/config-plugins";
+/**
+ * Only the post-install block is required, the post installer block is used for SPM (Swift Package Manager) which Expo
+ * doesn't currently support.
+ */
+export declare function applyPodfilePostInstall(contents: string): string;
+export declare const ios: {
+    withPodfilePostInstall: ConfigPlugin;
+    withoutSignatures: ConfigPlugin;
+    withDwarfDsym: ConfigPlugin;
+    withExcludedSimulatorArchitectures: ConfigPlugin;
+};
+//# sourceMappingURL=ios.d.ts.map

package/lib/typescript/commonjs/src/plugin/ios.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAG9B;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AA+ED,eAAO,MAAM,GAAG;;;;;CAKf,CAAC"}

package/lib/typescript/commonjs/src/plugin/withMapLibre.d.ts

@@ -1,13 +1,4 @@
-import { type ConfigPlugin, type XcodeProject } from "@expo/config-plugins";
-type InstallerBlockName = "pre" | "post";
-export declare function applyCocoaPodsModifications(contents: string): string;
-export declare function addInstallerBlock(src: string, blockName: InstallerBlockName): string;
-export declare function addMapLibreInstallerBlock(src: string, blockName: InstallerBlockName): string;
-/**
- * Exclude building for arm64 on simulator devices in the pbxproj project.
- * Without this, production builds targeting simulators will fail.
- */
-export declare function setExcludedArchitectures(project: XcodeProject): XcodeProject;
+import { type ConfigPlugin } from "@expo/config-plugins";
 declare const _default: ConfigPlugin<void>;
 export default _default;
 //# sourceMappingURL=withMapLibre.d.ts.map

package/lib/typescript/commonjs/src/plugin/withMapLibre.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAIjB,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAiB9B,KAAK,kBAAkB,GAAG,KAAK,GAAG,MAAM,CAAC;AA8BzC,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMpE;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,kBAAkB,GAC5B,MAAM,CA4BR;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,kBAAkB,GAC5B,MAAM,CASR;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,YAAY,CAe5E;;AAqDD,wBAAwE"}
+{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;;AAuB9E,wBAAwE"}

package/lib/typescript/module/src/plugin/ios.d.ts

@@ -0,0 +1,13 @@
+import { type ConfigPlugin } from "@expo/config-plugins";
+/**
+ * Only the post-install block is required, the post installer block is used for SPM (Swift Package Manager) which Expo
+ * doesn't currently support.
+ */
+export declare function applyPodfilePostInstall(contents: string): string;
+export declare const ios: {
+    withPodfilePostInstall: ConfigPlugin;
+    withoutSignatures: ConfigPlugin;
+    withDwarfDsym: ConfigPlugin;
+    withExcludedSimulatorArchitectures: ConfigPlugin;
+};
+//# sourceMappingURL=ios.d.ts.map

package/lib/typescript/module/src/plugin/ios.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAG9B;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AA+ED,eAAO,MAAM,GAAG;;;;;CAKf,CAAC"}

package/lib/typescript/module/src/plugin/withMapLibre.d.ts

@@ -1,13 +1,4 @@
-import { type ConfigPlugin, type XcodeProject } from "@expo/config-plugins";
-type InstallerBlockName = "pre" | "post";
-export declare function applyCocoaPodsModifications(contents: string): string;
-export declare function addInstallerBlock(src: string, blockName: InstallerBlockName): string;
-export declare function addMapLibreInstallerBlock(src: string, blockName: InstallerBlockName): string;
-/**
- * Exclude building for arm64 on simulator devices in the pbxproj project.
- * Without this, production builds targeting simulators will fail.
- */
-export declare function setExcludedArchitectures(project: XcodeProject): XcodeProject;
+import { type ConfigPlugin } from "@expo/config-plugins";
 declare const _default: ConfigPlugin<void>;
 export default _default;
 //# sourceMappingURL=withMapLibre.d.ts.map

package/lib/typescript/module/src/plugin/withMapLibre.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAIjB,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAiB9B,KAAK,kBAAkB,GAAG,KAAK,GAAG,MAAM,CAAC;AA8BzC,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMpE;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,kBAAkB,GAC5B,MAAM,CA4BR;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,kBAAkB,GAC5B,MAAM,CASR;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,YAAY,CAe5E;;AAqDD,wBAAwE"}
+{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;;AAuB9E,wBAAwE"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "React Native library for creating maps with MapLibre Native for Android & iOS",
-  "version": "10.0.0-beta.14",
+  "version": "10.0.0-beta.16",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -165,6 +165,7 @@
     "react-native-builder-bob": "^0.34.0",
     "react-test-renderer": "18.3.1",
     "semantic-release": "^24.2.0",
+    "snapshot-diff": "^0.10.0",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.2",
     "typescript": "^5.7.2"

package/src/plugin/ios.ts

@@ -0,0 +1,112 @@
+import {
+  type ConfigPlugin,
+  withPodfile,
+  withXcodeProject,
+  type XcodeProject,
+} from "@expo/config-plugins";
+import { mergeContents } from "@expo/config-plugins/build/utils/generateCode";
+
+/**
+ * Only the post-install block is required, the post installer block is used for SPM (Swift Package Manager) which Expo
+ * doesn't currently support.
+ */
+export function applyPodfilePostInstall(contents: string): string {
+  const result = mergeContents({
+    tag: `@maplibre/maplibre-react-native-post_installer`,
+    src: contents,
+    newSrc: `    $MLRN.post_install(installer)`,
+    anchor: new RegExp(`post_install do \\|installer\\|`),
+    offset: 1,
+    comment: "#",
+  });
+
+  if (result.didMerge || result.didClear) {
+    return result.contents;
+  }
+
+  return contents;
+}
+
+const withPodfilePostInstall: ConfigPlugin = (config) => {
+  return withPodfile(config, (c) => {
+    c.modResults.contents = applyPodfilePostInstall(c.modResults.contents);
+
+    return c;
+  });
+};
+
+/**
+ * Exclude building for arm64 on simulator devices in the pbxproj project.
+ * Without this, production builds targeting simulators will fail.
+ */
+function setExcludedArchitectures(project: XcodeProject): XcodeProject {
+  const configurations = project.pbxXCBuildConfigurationSection();
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  for (const { name, buildSettings } of Object.values(configurations || {})) {
+    // Guessing that this is the best way to emulate Xcode.
+    // Using `project.addToBuildSettings` modifies too many targets.
+    if (
+      name === "Release" &&
+      typeof buildSettings?.PRODUCT_NAME !== "undefined"
+    ) {
+      buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
+    }
+  }
+
+  return project;
+}
+
+const withoutSignatures: ConfigPlugin = (config) => {
+  return withXcodeProject(config, async (c) => {
+    c.modResults.addBuildPhase(
+      [],
+      "PBXShellScriptBuildPhase",
+      "Remove signature files (Xcode workaround)",
+      null,
+      {
+        shellPath: "/bin/sh",
+        shellScript: `
+          echo "Remove signature files (Xcode workaround)";
+          rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
+        `,
+      },
+    );
+
+    return c;
+  });
+};
+
+/**
+ *  Set the Debug Information Format to DWARF with dSYM File during EAS Build for Managed App
+ *  https://github.com/expo/eas-cli/issues/968
+ *
+ *  Set `artifactPath` in `eas.json`:
+ *  ```json
+ *  "ios": {
+ *    "artifactPath": "ios/build/*"
+ *  }
+ *  ```
+ */
+const withDwarfDsym: ConfigPlugin = (config) => {
+  return withXcodeProject(config, async (c) => {
+    c.modResults.debugInformationFormat = "dwarf-with-dsym";
+
+    return c;
+  });
+};
+
+const withExcludedSimulatorArchitectures: ConfigPlugin = (config) => {
+  return withXcodeProject(config, (c) => {
+    c.modResults = setExcludedArchitectures(c.modResults);
+
+    return c;
+  });
+};
+
+export const ios = {
+  withPodfilePostInstall,
+  withoutSignatures,
+  withDwarfDsym,
+  withExcludedSimulatorArchitectures,
+};

package/src/plugin/withMapLibre.ts

@@ -1,16 +1,6 @@
-import {
-  type ConfigPlugin,
-  createRunOncePlugin,
-  withDangerousMod,
-  withXcodeProject,
-  type XcodeProject,
-} from "@expo/config-plugins";
-import {
-  mergeContents,
-  removeGeneratedContents,
-} from "@expo/config-plugins/build/utils/generateCode";
-import { promises } from "node:fs";
-import path from "node:path";
+import { type ConfigPlugin, createRunOncePlugin } from "@expo/config-plugins";
+
+import { ios } from "./ios";
 
 let pkg: { name: string; version?: string } = {
   name: "@maplibre/maplibre-react-native",
@@ -21,161 +11,14 @@ try {
   // empty catch block
 }
 
-type InstallerBlockName = "pre" | "post";
-
-/**
- * Dangerously adds the custom installer hooks to the Podfile.
- * In the future this should be removed in favor of some custom hooks provided by Expo autolinking.
- *
- * https://github.com/maplibre/maplibre-react-native/blob/main/docs/guides/setup/iOS.md
- */
-const withCocoaPodsInstallerBlocks: ConfigPlugin = (c) => {
-  return withDangerousMod(c, [
-    "ios",
-    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-    async (config) => {
-      const file = path.join(config.modRequest.platformProjectRoot, "Podfile");
-
-      const contents = await promises.readFile(file, "utf8");
-
-      await promises.writeFile(
-        file,
-        applyCocoaPodsModifications(contents),
-        "utf-8",
-      );
-
-      return config;
-    },
-  ]);
-};
-
-// Only the post-install block is required, the post installer block is
-// used for spm (swift package manager) which Expo doesn't currently support.
-export function applyCocoaPodsModifications(contents: string): string {
-  // Ensure installer blocks exist
-  let src = addInstallerBlock(contents, "post");
-  src = addMapLibreInstallerBlock(src, "post");
-
-  return src;
-}
-
-export function addInstallerBlock(
-  src: string,
-  blockName: InstallerBlockName,
-): string {
-  const matchBlock = new RegExp(`${blockName}_install do \\|installer\\|`);
-  const tag = `${blockName}_installer`;
-  for (const line of src.split("\n")) {
-    const contents = line.trim();
-    // Ignore comments
-    if (!contents.startsWith("#")) {
-      // Prevent adding the block if it exists outside of comments.
-      if (contents.match(matchBlock)) {
-        // This helps to still allow revisions, since we enabled the block previously.
-        // Only continue if the generated block exists...
-        const modified = removeGeneratedContents(src, tag);
-        if (!modified) {
-          return src;
-        }
-      }
-    }
-  }
-
-  return mergeContents({
-    tag,
-    src,
-    newSrc: [`  ${blockName}_install do |installer|`, "  end"].join("\n"),
-    anchor: /use_react_native/,
-    // We can't go after the use_react_native block because it might have parameters, causing it to be multi-line (see react-native template).
-    offset: 0,
-    comment: "#",
-  }).contents;
-}
-
-export function addMapLibreInstallerBlock(
-  src: string,
-  blockName: InstallerBlockName,
-): string {
-  return mergeContents({
-    tag: `@maplibre/maplibre-react-native-${blockName}_installer`,
-    src,
-    newSrc: `    $MLRN.${blockName}_install(installer)`,
-    anchor: new RegExp(`${blockName}_install do \\|installer\\|`),
-    offset: 1,
-    comment: "#",
-  }).contents;
-}
-
-/**
- * Exclude building for arm64 on simulator devices in the pbxproj project.
- * Without this, production builds targeting simulators will fail.
- */
-export function setExcludedArchitectures(project: XcodeProject): XcodeProject {
-  const configurations = project.pbxXCBuildConfigurationSection();
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  for (const { name, buildSettings } of Object.values(configurations || {})) {
-    // Guessing that this is the best way to emulate Xcode.
-    // Using `project.addToBuildSettings` modifies too many targets.
-    if (
-      name === "Release" &&
-      typeof buildSettings?.PRODUCT_NAME !== "undefined"
-    ) {
-      buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
-    }
-  }
-  return project;
-}
-
-const withoutSignatures: ConfigPlugin = (config) => {
-  const shellScript = `
-    echo "Remove signature files (Xcode workaround)";
-    rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
-  `;
-  return withXcodeProject(config, async (config) => {
-    const xcodeProject = config.modResults;
-    xcodeProject.addBuildPhase(
-      [],
-      "PBXShellScriptBuildPhase",
-      "Remove signature files (Xcode workaround)",
-      null,
-      {
-        shellPath: "/bin/sh",
-        shellScript,
-      },
-    );
-    return config;
-  });
-};
-
-/**
- *  Set the Debug Information Format to DWARF with dSYM File during EAS Build for Managed App
- *  https://github.com/expo/eas-cli/issues/968
- *  // Set artifactPath in eas.json
- *  "ios": {
- *    "artifactPath": "ios/build/*"
- *  }
- */
-const withDwarfDsym: ConfigPlugin = (config) => {
-  return withXcodeProject(config, async (config) => {
-    const xcodeProject = config.modResults;
-    xcodeProject.debugInformationFormat = "dwarf-with-dsym";
-    return config;
-  });
-};
-
-const withExcludedSimulatorArchitectures: ConfigPlugin = (c) => {
-  return withXcodeProject(c, (config) => {
-    config.modResults = setExcludedArchitectures(config.modResults);
-    return config;
-  });
-};
-
 const withMapLibre: ConfigPlugin = (config) => {
-  config = withoutSignatures(
-    withDwarfDsym(withExcludedSimulatorArchitectures(config)),
-  );
-  return withCocoaPodsInstallerBlocks(config);
+  // iOS
+  config = ios.withExcludedSimulatorArchitectures(config);
+  config = ios.withDwarfDsym(config);
+  config = ios.withoutSignatures(config);
+  config = ios.withPodfilePostInstall(config);
+
+  return config;
 };
 
 export default createRunOncePlugin(withMapLibre, pkg.name, pkg.version);