esm: fix relative imports for https

PR-URL: #42119 Reviewed-By: Geoffrey Booth <[email protected]> Reviewed-By: Guy Bedford <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: Ricky Zhou <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
nodejs · Mar 7, 2022 · 2bc136d · 2bc136d
1 parent cad7dde
commit 2bc136d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/internal/modules/esm/resolve.js b/lib/internal/modules/esm/resolve.js
@@ -1125,7 +1125,7 @@ async function defaultResolve(specifier, context = {}, defaultResolveUnused) {
         )
       )
     ) {
-      return { url: specifier };
+      return { url: parsed.href };
     }
   } catch {
     // Ignore exception

diff --git a/test/es-module/test-http-imports.mjs b/test/es-module/test-http-imports.mjs
@@ -61,6 +61,10 @@ for (const { protocol, createServer } of [
     const host = new URL(base);
     host.protocol = protocol;
     host.hostname = hostname;
+    // /not-found is a 404
+    // ?redirect causes a redirect, no body. JSON.parse({status:number,location:string})
+    // ?mime sets the content-type, string
+    // ?body sets the body, string
     const server = createServer(function(_req, res) {
       const url = new URL(_req.url, host);
       const redirect = url.searchParams.get('redirect');
@@ -133,6 +137,14 @@ for (const { protocol, createServer } of [
     assert.strict.equal(depsNS.data, 1);
     assert.strict.equal(depsNS.http, ns);
 
+    const relativeDeps = new URL(url.href);
+    relativeDeps.searchParams.set('body', `
+      import * as http from "./";
+      export {http};
+    `);
+    const relativeDepsNS = await import(relativeDeps.href);
+    assert.strict.deepStrictEqual(Object.keys(relativeDepsNS), ['http']);
+    assert.strict.equal(relativeDepsNS.http, ns);
     const fileDep = new URL(url.href);
     const { href } = pathToFileURL(path('/es-modules/message.mjs'));
     fileDep.searchParams.set('body', `