@maplibre/maplibre-react-native 10.0.0-beta.15 → 10.0.0-beta.17

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.15",
+  "version": "10.0.0-beta.17",
   "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);