Allow parentURL to be protocol-relative

holepunchto · Oct 15, 2024 · 3394e10 · 3394e10
1 parent 2e38c59
commit 3394e10
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -308,7 +308,7 @@ const Module = module.exports = exports = class Module {
     meta.asset = asset
 
     function resolve (specifier, parentURL = referrer._url) {
-      const resolved = self.resolve(specifier, toURL(parentURL), { referrer })
+      const resolved = self.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
 
       switch (resolved.protocol) {
         case 'builtin:': return resolved.pathname
@@ -317,15 +317,15 @@ const Module = module.exports = exports = class Module {
     }
 
     function addon (specifier = '.', parentURL = referrer._url) {
-      const resolved = Bare.Addon.resolve(specifier, toURL(parentURL), { referrer })
+      const resolved = Bare.Addon.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
 
       const addon = Bare.Addon.load(resolved, { referrer })
 
       return addon._exports
     }
 
     function asset (specifier, parentURL = referrer._url) {
-      return self.asset(specifier, toURL(parentURL), { referrer }).href
+      return self.asset(specifier, toURL(parentURL, referrer._url), { referrer }).href
     }
   }
 
@@ -646,7 +646,7 @@ const createRequire = exports.createRequire = function createRequire (parentURL,
   }
 
   function resolve (specifier, parentURL = referrer._url) {
-    const resolved = self.resolve(specifier, toURL(parentURL), { referrer })
+    const resolved = self.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
 
     switch (resolved.protocol) {
       case 'builtin:': return resolved.pathname
@@ -655,15 +655,15 @@ const createRequire = exports.createRequire = function createRequire (parentURL,
   }
 
   function addon (specifier = '.', parentURL = referrer._url) {
-    const resolved = Bare.Addon.resolve(specifier, toURL(parentURL), { referrer })
+    const resolved = Bare.Addon.resolve(specifier, toURL(parentURL, referrer._url), { referrer })
 
     const addon = Bare.Addon.load(resolved, { referrer })
 
     return addon._exports
   }
 
   function asset (specifier, parentURL = referrer._url) {
-    return urlToPath(self.asset(specifier, toURL(parentURL), { referrer }))
+    return urlToPath(self.asset(specifier, toURL(parentURL, referrer._url), { referrer }))
   }
 }
 
@@ -867,14 +867,14 @@ Bare
     binding.destroy(Module._handle)
   })
 
-function toURL (value) {
+function toURL (value, base) {
   if (isURL(value)) return value
 
   if (startsWithWindowsDriveLetter(value)) {
     return pathToFileURL(value)
   }
 
-  return URL.parse(value) || pathToFileURL(value)
+  return URL.parse(value, base) || pathToFileURL(value)
 }
 
 function urlToPath (url) {