expo-beacon 0.7.12 → 0.7.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-beacon",
-  "version": "0.7.12",
+  "version": "0.7.13",
   "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/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;AAoQF,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;
@@ -135,8 +140,16 @@ function removePBXFileReferences(xcodeProject, fileReferences) {
     }
 }
 function ensureIOSPluginSourceFile(xcodeProject, projectName) {
-    var _a;
+    var _a, _b, _c;
     const groupKey = (_a = findPBXGroupKeyByName(xcodeProject, projectName)) !== null && _a !== void 0 ? _a : undefined;
+    // A virtual (name-only) PBXGroup has no `path`. Files added to it with
+    // `<group>` sourceTree resolve relative to the group's *parent*, not the
+    // group itself, so `BeaconGeoPlugin.swift` would land at `ios/` not
+    // `ios/<AppName>/`. Only treat the group as a physical directory group when
+    // its `path` actually equals the project name.
+    const pbxGroups = (_b = xcodeProject.hash.project.objects['PBXGroup']) !== null && _b !== void 0 ? _b : {};
+    const groupHasPhysicalPath = groupKey != null &&
+        normalizePBXValue((_c = pbxGroups[groupKey]) === null || _c === void 0 ? void 0 : _c.path) === projectName;
     const existingFileReferences = findPBXFileReferences(xcodeProject, IOS_PLUGIN_FILENAME);
     const existingBuildFileKeys = findPBXBuildFileKeys(xcodeProject, existingFileReferences.map(({ key }) => key), IOS_PLUGIN_FILENAME);
     if (existingFileReferences.length === 1 &&
@@ -150,7 +163,11 @@ function ensureIOSPluginSourceFile(xcodeProject, projectName) {
                 fileRef: existingFileReference.key,
                 basename: IOS_PLUGIN_FILENAME,
             }, groupKey);
-            existingFileReference.ref.path = `"${IOS_PLUGIN_FILENAME}"`;
+            // If the group is virtual (no path), the file reference path must include
+            // the project name so Xcode resolves it to ios/<AppName>/BeaconGeoPlugin.swift.
+            existingFileReference.ref.path = groupHasPhysicalPath
+                ? `"${IOS_PLUGIN_FILENAME}"`
+                : `"${projectName}/${IOS_PLUGIN_FILENAME}"`;
             return;
         }
         existingFileReference.ref.path = `"${projectName}/${IOS_PLUGIN_FILENAME}"`;
@@ -162,10 +179,14 @@ function ensureIOSPluginSourceFile(xcodeProject, projectName) {
         removeFileReferenceFromAllGroups(xcodeProject, existingFileReferences.map(({ key }) => key));
         removePBXFileReferences(xcodeProject, existingFileReferences);
     }
-    if (groupKey) {
+    if (groupKey && groupHasPhysicalPath) {
+        // Physical group (path = projectName): add with just the filename; Xcode
+        // resolves it through the group's directory chain to ios/<AppName>/file.
         xcodeProject.addSourceFile(IOS_PLUGIN_FILENAME, null, groupKey);
         return;
     }
+    // Virtual group (name-only, no path) or no group found: use an explicit
+    // SOURCE_ROOT-relative path so Xcode always finds ios/<AppName>/file.
     xcodeProject.addSourceFile(`${projectName}/${IOS_PLUGIN_FILENAME}`);
 }
 function modifySwiftAppDelegate(contents) {