fixup! module: fix sync resolve hooks for require with node: prefixes

Author: joyeecheung

lib/internal/modules/cjs/loader.js

@@ -1170,9 +1170,9 @@ function getDefaultLoad(url, filename) {
  * @param {string} id The module ID (without the node: prefix)
  * @param {string} url The module URL (with the node: prefix)
  * @param {string} format Format from resolution.
- * @returns {{builtinExports?: any, resultFromHook?: any}} If there are no load hooks or the load hooks do not
- *   override the format of the builtin, load and return the exports of the builtin module.
- *   Otherwise, return the loadResult for the caller to continue loading.
+ * @returns {{builtinExports: any, resultFromHook: undefined|ModuleLoadResult}} If there are no load
+ *   hooks or the load hooks do not override the format of the builtin, load and return the exports
+ *   of the builtin module. Otherwise, return the loadResult for the caller to continue loading.
  */
 function loadBuiltinWithHooks(id, url, format) {
   let resultFromHook;
@@ -1184,14 +1184,15 @@ function loadBuiltinWithHooks(id, url, format) {
                                    getCjsConditionsArray(), getDefaultLoad(url, id), validateLoadStrict);
     if (resultFromHook.format && resultFromHook.format !== 'builtin') {
       debug('loadBuiltinWithHooks overriding module', id, url, resultFromHook);
-      return { resultFromHook };  // Format has been overridden, return result for the caller to continue loading.
+      // Format has been overridden, return result for the caller to continue loading.
+      return { builtinExports: undefined, resultFromHook };
     }
   }
 
   // No hooks or the hooks have not overridden the format. Load it as a builtin module and return the
   // exports.
   const mod = loadBuiltinModule(id);
-  return { builtinExports: mod.exports };
+  return { builtinExports: mod.exports, resultFromHook: undefined };
 }
 
 /**

test/module-hooks/test-module-hooks-resolve-load-builtin-redirect.js

@@ -4,7 +4,6 @@
 const common = require('../common');
 const assert = require('assert');
 const { registerHooks } = require('module');
-const fixtures = require('../common/fixtures');
 
 // Pick a builtin that's unlikely to be loaded already - like zlib or dns.
 assert(!process.moduleLoadList.includes('NativeModule zlib'));