Pass default host to resolvers

holepunchto · Nov 2, 2024 · 00e0e35 · 00e0e35
1 parent d8a50b0
commit 00e0e35
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/lib/resolve/bare.js b/lib/resolve/bare.js
@@ -7,7 +7,8 @@ module.exports = function (entry, parentURL, opts = {}) {
   const {
     platform = runtime.platform,
     arch = runtime.arch,
-    simulator = false
+    simulator = false,
+    host = `${platform}-${arch}${simulator ? '-simulator' : ''}`
   } = opts
 
   let extensions
@@ -19,7 +20,7 @@ module.exports = function (entry, parentURL, opts = {}) {
     extensions = ['.bare', '.node']
     conditions = ['addon', ...conditions]
 
-    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, ...opts })
+    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, host, ...opts })
   }
 
   if (entry.type & lex.constants.ASSET) {

diff --git a/lib/resolve/node.js b/lib/resolve/node.js
@@ -1,14 +1,26 @@
 const lex = require('bare-module-lexer')
 const resolve = require('../resolve')
 
-module.exports = function (entry, parentURL, opts) {
+module.exports = function (entry, parentURL, opts = {}) {
+  const runtime = require('#runtime')
+
+  const {
+    platform = runtime.platform,
+    arch = runtime.arch,
+    simulator = false,
+    host = `${platform}-${arch}${simulator ? '-simulator' : ''}`
+  } = opts
+
   let extensions
-  let conditions
+  let conditions = ['node', platform, arch]
+
+  if (simulator) conditions = [...conditions, 'simulator']
 
   if (entry.type & lex.constants.ADDON) {
     extensions = ['.node']
+    conditions = ['addon', ...conditions]
 
-    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, ...opts })
+    return resolve.addon(entry.specifier || '.', parentURL, { extensions, conditions, host, ...opts })
   }
 
   if (entry.type & lex.constants.REQUIRE) {