Look for .framework libraries on macOS/iOS (#2)

holepunchto · Sep 6, 2024 · 7110029 · 7110029
1 parent 4c95264
commit 7110029
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -242,12 +242,24 @@ exports.linked = function * (name, version = null, opts = {}) {
 
   if (linked === false || host === null) return false
 
-  if (host.startsWith('darwin-') || host.startsWith('ios-')) {
+  if (host.startsWith('darwin-')) {
     if (version !== null) {
       yield { resolution: new URL(linkedProtocol + 'lib' + name + '.' + version + '.dylib') }
+      yield { resolution: new URL(linkedProtocol + name + '.' + version + '.framework/' + name + '.' + version) }
     }
 
     yield { resolution: new URL(linkedProtocol + 'lib' + name + '.dylib') }
+    yield { resolution: new URL(linkedProtocol + name + '.framework/' + name) }
+
+    return true
+  }
+
+  if (host.startsWith('ios-')) {
+    if (version !== null) {
+      yield { resolution: new URL(linkedProtocol + name + '.' + version + '.framework/' + name + '.' + version) }
+    }
+
+    yield { resolution: new URL(linkedProtocol + name + '.framework/' + name) }
 
     return true
   }

diff --git a/test.js b/test.js
@@ -403,7 +403,9 @@ test('linked module, darwin', (t) => {
 
   t.alike(result, [
     'linked:libe.1.2.3.dylib',
-    'linked:libe.dylib'
+    'linked:e.1.2.3.framework/e.1.2.3',
+    'linked:libe.dylib',
+    'linked:e.framework/e'
   ])
 })
 
@@ -427,8 +429,8 @@ test('linked module, ios', (t) => {
   }
 
   t.alike(result, [
-    'linked:libe.1.2.3.dylib',
-    'linked:libe.dylib'
+    'linked:e.1.2.3.framework/e.1.2.3',
+    'linked:e.framework/e'
   ])
 })