expo-beacon 0.7.12 → 0.7.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-beacon",
-  "version": "0.7.12",
+  "version": "0.7.14",
   "description": "Expo module for scanning, pairing, and monitoring iBeacons on Android and iOS",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/build/withBeaconAndroid.js

@@ -17,13 +17,13 @@ class BeaconGeoPlugin(ctx: Context) : BeaconEventPlugin {
     private val bgGeo = BackgroundGeolocation.getInstance(ctx, null)
 
     override fun onBeaconEnter(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) =
-        bgGeo.start(null)
+        bgGeo.start()
     override fun onBeaconExit(identifier: String, uuid: String, major: Int, minor: Int, distance: Double) =
-        bgGeo.stop(null)
+        bgGeo.stop()
     override fun onEddystoneEnter(identifier: String, namespace: String, instance: String, distance: Double) =
-        bgGeo.start(null)
+        bgGeo.start()
     override fun onEddystoneExit(identifier: String, namespace: String, instance: String, distance: Double) =
-        bgGeo.stop(null)
+        bgGeo.stop()
 }
 `;
 }

package/plugin/build/withBeaconIOS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAM9B,eAAO,MAAM,gBAAgB,mvBAkB5B,CAAC;AA8OF,QAAA,MAAM,aAAa,EAAE,YAkCpB,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"withBeaconIOS.d.ts","sourceRoot":"","sources":["../src/withBeaconIOS.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAM9B,eAAO,MAAM,gBAAgB,mvBAkB5B,CAAC;AA2RF,QAAA,MAAM,aAAa,EAAE,YAkCpB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/plugin/build/withBeaconIOS.js

@@ -36,16 +36,21 @@ function normalizePBXValue(value) {
 function findPBXGroupKeyByName(xcodeProject, name) {
     var _a;
     const pbxGroups = (_a = xcodeProject.hash.project.objects['PBXGroup']) !== null && _a !== void 0 ? _a : {};
+    // Prefer a group whose `path` equals the name — that group IS the filesystem
+    // directory. A group matched only by `name` may be a virtual (path-less)
+    // container whose children resolve relative to its parent, not itself.
+    let nameMatch = null;
     for (const key of Object.keys(pbxGroups)) {
         if (key.endsWith('_comment'))
             continue;
         const group = pbxGroups[key];
-        if (normalizePBXValue(group.name) === name ||
-            normalizePBXValue(group.path) === name) {
+        if (normalizePBXValue(group.path) === name)
             return key;
+        if (normalizePBXValue(group.name) === name && nameMatch === null) {
+            nameMatch = key;
         }
     }
-    return null;
+    return nameMatch;
 }
 function findPBXFileReferences(xcodeProject, filename) {
     var _a;
@@ -134,39 +139,76 @@ function removePBXFileReferences(xcodeProject, fileReferences) {
         delete refs[`${key}_comment`];
     }
 }
-function ensureIOSPluginSourceFile(xcodeProject, projectName) {
+/**
+ * Returns the key of the project's mainGroup — the root PBXGroup that is
+ * always present in every Xcode project.
+ */
+function getMainGroupKey(xcodeProject) {
     var _a;
-    const groupKey = (_a = findPBXGroupKeyByName(xcodeProject, projectName)) !== null && _a !== void 0 ? _a : undefined;
+    const pbxProjects = (_a = xcodeProject.hash.project.objects['PBXProject']) !== null && _a !== void 0 ? _a : {};
+    for (const key of Object.keys(pbxProjects)) {
+        if (key.endsWith('_comment'))
+            continue;
+        const proj = pbxProjects[key];
+        if (proj === null || proj === void 0 ? void 0 : proj.mainGroup)
+            return proj.mainGroup;
+    }
+    return undefined;
+}
+function ensureIOSPluginSourceFile(xcodeProject, projectName) {
+    var _a, _b, _c;
+    const pbxGroups = (_a = xcodeProject.hash.project.objects['PBXGroup']) !== null && _a !== void 0 ? _a : {};
+    const groupKey = (_b = findPBXGroupKeyByName(xcodeProject, projectName)) !== null && _b !== void 0 ? _b : undefined;
+    // A physical group has `path` equal to the project name; its children resolve
+    // relative to ios/<AppName>/. A virtual (name-only) group has no `path`, so
+    // its children resolve relative to its parent — typically SOURCE_ROOT (ios/).
+    const groupHasPhysicalPath = groupKey != null &&
+        normalizePBXValue((_c = pbxGroups[groupKey]) === null || _c === void 0 ? void 0 : _c.path) === projectName;
+    // The PBXFileReference `path` that makes Xcode resolve ios/<AppName>/file:
+    // • physical group → just the basename (the group chain supplies the dir)
+    // • virtual / no group → SOURCE_ROOT-relative path
+    const fileRefPath = groupHasPhysicalPath
+        ? IOS_PLUGIN_FILENAME
+        : `${projectName}/${IOS_PLUGIN_FILENAME}`;
+    // IMPORTANT: xcodeProject.addSourceFile() MUST always receive a group key.
+    // Without one it calls addPluginFile() which looks up a "Plugins" PBXGroup
+    // that may not exist, dereferencing null and crashing prebuild.
+    // Fall back to the project's mainGroup, which is guaranteed to be present.
+    const effectiveGroupKey = groupKey !== null && groupKey !== void 0 ? groupKey : getMainGroupKey(xcodeProject);
     const existingFileReferences = findPBXFileReferences(xcodeProject, IOS_PLUGIN_FILENAME);
     const existingBuildFileKeys = findPBXBuildFileKeys(xcodeProject, existingFileReferences.map(({ key }) => key), IOS_PLUGIN_FILENAME);
     if (existingFileReferences.length === 1 &&
         existingBuildFileKeys.length === 1) {
+        // Repair the single existing entry in-place.
         const [existingFileReference] = existingFileReferences;
         existingFileReference.ref.name = `"${IOS_PLUGIN_FILENAME}"`;
         existingFileReference.ref.sourceTree = '"<group>"';
-        if (groupKey) {
+        existingFileReference.ref.path = `"${fileRefPath}"`;
+        if (effectiveGroupKey) {
             removeFileReferenceFromAllGroups(xcodeProject, [existingFileReference.key]);
-            xcodeProject.addToPbxGroup({
-                fileRef: existingFileReference.key,
-                basename: IOS_PLUGIN_FILENAME,
-            }, groupKey);
-            existingFileReference.ref.path = `"${IOS_PLUGIN_FILENAME}"`;
-            return;
+            xcodeProject.addToPbxGroup({ fileRef: existingFileReference.key, basename: IOS_PLUGIN_FILENAME }, effectiveGroupKey);
         }
-        existingFileReference.ref.path = `"${projectName}/${IOS_PLUGIN_FILENAME}"`;
         return;
     }
+    // Remove any stale/duplicate entries before re-adding.
     if (existingFileReferences.length > 0 || existingBuildFileKeys.length > 0) {
         removePBXSourcesBuildPhaseEntries(xcodeProject, existingBuildFileKeys, IOS_PLUGIN_FILENAME);
         removePBXBuildFiles(xcodeProject, existingBuildFileKeys);
         removeFileReferenceFromAllGroups(xcodeProject, existingFileReferences.map(({ key }) => key));
         removePBXFileReferences(xcodeProject, existingFileReferences);
     }
-    if (groupKey) {
-        xcodeProject.addSourceFile(IOS_PLUGIN_FILENAME, null, groupKey);
-        return;
+    // Always pass effectiveGroupKey so the xcode library never falls through to
+    // its addPluginFile / Plugins-group lookup path.
+    xcodeProject.addSourceFile(IOS_PLUGIN_FILENAME, null, effectiveGroupKey);
+    // For non-physical groups the file reference path defaults to the bare
+    // filename; patch it to the SOURCE_ROOT-relative path so Xcode finds the
+    // file at ios/<AppName>/BeaconGeoPlugin.swift.
+    if (!groupHasPhysicalPath) {
+        const newRefs = findPBXFileReferences(xcodeProject, IOS_PLUGIN_FILENAME);
+        for (const { ref } of newRefs) {
+            ref.path = `"${fileRefPath}"`;
+        }
     }
-    xcodeProject.addSourceFile(`${projectName}/${IOS_PLUGIN_FILENAME}`);
 }
 function modifySwiftAppDelegate(contents) {
     // Insert `import ExpoBeacon` after the last existing import line.