esm: handle globalPreload hook returning a nullish value

PR-URL: nodejs/node#48249 Backport-PR-URL: nodejs/node#50669 Fixes: nodejs/node#48240 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Jacob Smith <jacob@frende.me>
sercher · Apr 24, 2024 · 5a7a9e0 · 5a7a9e0
1 parent d5f0a76
commit 5a7a9e0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/graal-nodejs/lib/internal/modules/esm/hooks.js b/graal-nodejs/lib/internal/modules/esm/hooks.js
@@ -168,7 +168,7 @@ class Hooks {
         port: insideLoader,
       });
 
-      if (preloaded == null) { return; }
+      if (preloaded == null) { continue; }
 
       if (typeof preloaded !== 'string') { // [2]
         throw new ERR_INVALID_RETURN_VALUE(

diff --git a/graal-nodejs/test/es-module/test-esm-loader-hooks.mjs b/graal-nodejs/test/es-module/test-esm-loader-hooks.mjs
@@ -348,6 +348,20 @@ describe('Loader hooks', { concurrency: true }, () => {
     });
   });
 
+  it('should handle globalPreload returning undefined', async () => {
+    const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
+      '--no-warnings',
+      '--experimental-loader',
+      'data:text/javascript,export function globalPreload(){}',
+      fixtures.path('empty.js'),
+    ]);
+
+    assert.strictEqual(stderr, '');
+    assert.strictEqual(stdout, '');
+    assert.strictEqual(code, 0);
+    assert.strictEqual(signal, null);
+  });
+
   it('should be fine to call `process.removeAllListeners("beforeExit")` from the main thread', async () => {
     const { code, signal, stdout, stderr } = await spawnPromisified(execPath, [
       '--no-warnings',