fixup! module: fix conditions override in synchronous resolve hooks

Author: joyeecheung

lib/internal/modules/cjs/loader.js

@@ -1320,7 +1320,7 @@ Module._load = function(request, parent, isMain) {
  * @param {ResolveFilenameOptions} options Options object
  * @typedef {object} ResolveFilenameOptions
  * @property {string[]} paths Paths to search for modules in
- * @param {Set<string>} conditions The conditions to use for resolution.
+ * @property {Set<string>?} conditions The conditions to use for resolution.
  * @returns {void|string}
  */
 Module._resolveFilename = function(request, parent, isMain, options) {

lib/internal/modules/esm/loader.js

@@ -761,7 +761,7 @@ class ModuleLoader {
    * from module.register() which are run in a blocking fashion for it to be synchronous.
    * @param {string|URL} specifier See {@link resolveSync}.
    * @param {{ parentURL?: string, importAttributes: ImportAttributes, conditions?: string[]}} context
-   * See {@link resolveSync}.
+   *   See {@link resolveSync}.
    * @returns {{ format: string, url: string }}
    */
   #resolveAndMaybeBlockOnLoaderThread(specifier, context) {

test/module-hooks/test-module-hooks-custom-conditions-cjs.js

@@ -54,4 +54,4 @@ const { cjs, esm } = require('../fixtures/es-modules/custom-condition/load.cjs')
     assert.strictEqual((await esm('foo/fourth')).result, 'foo');
     hooks.deregister();
   }
-})().catch(common.mustNotCall());
+})().then(common.mustCall());

test/module-hooks/test-module-hooks-custom-conditions-special-values.js

@@ -67,4 +67,4 @@ const { cjs, esm } = require('../fixtures/es-modules/custom-condition/load.cjs')
     });
     hooks.deregister();
   }
-})().catch(common.mustNotCall());
+})().then(common.mustCall());