From f584efb5674bfecce125c89fb7411f3dd7fd7269 Mon Sep 17 00:00:00 2001
From: Bradley Farias <bradley.meck@gmail.com>
Date: Wed, 27 Oct 2021 12:36:13 -0500
Subject: [PATCH] fixup: rebase

---
 doc/api/esm.md                                     | 4 ++--
 lib/internal/modules/esm/initialize_import_meta.js | 9 +++++++--
 lib/internal/modules/esm/loader.js                 | 3 ++-
 lib/internal/modules/esm/translators.js            | 1 -
 test/es-module/test-esm-loader-mock.mjs            | 5 ++---
 test/parallel/test-bootstrap-modules.js            | 1 +
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/doc/api/esm.md b/doc/api/esm.md
index 055bfaedd09197..a1a91bc2e50332 100644
--- a/doc/api/esm.md
+++ b/doc/api/esm.md
@@ -815,11 +815,11 @@ normally.
 
 ```js
 /**
- * This example causes 
+ * This example causes
  * @param {object} utilities
  * @param {MessagePort} utilities.port
  */
-export function getGlobalPreloadCode({port}) {
+export function getGlobalPreloadCode({ port }) {
   port.onmessage = (evt) => {
     // ...
   };
diff --git a/lib/internal/modules/esm/initialize_import_meta.js b/lib/internal/modules/esm/initialize_import_meta.js
index fe3b9491bbda0c..322b4c59be1561 100644
--- a/lib/internal/modules/esm/initialize_import_meta.js
+++ b/lib/internal/modules/esm/initialize_import_meta.js
@@ -1,11 +1,16 @@
+'use strict';
+
 const { getOptionValue } = require('internal/options');
 const experimentalImportMetaResolve =
 getOptionValue('--experimental-import-meta-resolve');
+const { PromisePrototypeThen, PromiseReject } = primordials;
+const asyncESM = require('internal/process/esm_loader');
 
 function createImportMetaResolve(defaultParentUrl) {
   return async function resolve(specifier, parentUrl = defaultParentUrl) {
-    return PromisePrototypeCatch(
-      asyncESM.ESMLoader.resolve(specifier, parentUrl),
+    return PromisePrototypeThen(
+      asyncESM.esmLoader.resolve(specifier, parentUrl),
+      ({ url }) => url,
       (error) => (
         error.code === 'ERR_UNSUPPORTED_DIR_IMPORT' ?
           error.url : PromiseReject(error))
diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
index df14db5e1bab85..c50e976e699eef 100644
--- a/lib/internal/modules/esm/loader.js
+++ b/lib/internal/modules/esm/loader.js
@@ -18,6 +18,7 @@ const {
   SafeWeakMap,
   globalThis,
 } = primordials;
+const { MessageChannel } = require('internal/worker/io');
 
 const {
   ERR_INVALID_ARG_TYPE,
@@ -403,7 +404,7 @@ class ESMLoader {
           throw new ERR_INVALID_ARG_VALUE('builtinName', builtinName);
         }, insidePreload, (fn) => {
           if (finished || typeof fn !== 'function') {
-            throw new ERR_INVALID_ARG_TYPE('fn', fn)
+            throw new ERR_INVALID_ARG_TYPE('fn', fn);
           }
           replacedImportMetaInitializer = true;
           const parent = next;
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
index 920284d37cbfb2..0e9044c6a0e69d 100644
--- a/lib/internal/modules/esm/translators.js
+++ b/lib/internal/modules/esm/translators.js
@@ -50,7 +50,6 @@ const {
 const { maybeCacheSourceMap } = require('internal/source_map/source_map_cache');
 const moduleWrap = internalBinding('module_wrap');
 const { ModuleWrap } = moduleWrap;
-const { getOptionValue } = require('internal/options');
 const asyncESM = require('internal/process/esm_loader');
 const { emitWarningSync } = require('internal/process/warning');
 const { TextDecoder } = require('internal/encoding');
diff --git a/test/es-module/test-esm-loader-mock.mjs b/test/es-module/test-esm-loader-mock.mjs
index 0bc8959803f1ea..5172ea73c7d90c 100644
--- a/test/es-module/test-esm-loader-mock.mjs
+++ b/test/es-module/test-esm-loader-mock.mjs
@@ -1,5 +1,4 @@
-// Flags: --experimental-loader
-// ./test/fixtures/es-module-loaders/mock-loader.mjs
+// Flags: --loader ./test/fixtures/es-module-loaders/mock-loader.mjs
 import '../common/index.mjs';
 import assert from 'assert/strict';
 import mock from 'node:mock';
@@ -8,7 +7,7 @@ mock('node:events', {
   EventEmitter: 'This is mocked!'
 });
 
-// this resolves to node:events
+// This resolves to node:events
 assert.deepStrictEqual(await import('events'), Object.defineProperty({
   __proto__: null,
   EventEmitter: 'This is mocked!'
diff --git a/test/parallel/test-bootstrap-modules.js b/test/parallel/test-bootstrap-modules.js
index 9ed1b90e318e7e..9ed839a0bc70b0 100644
--- a/test/parallel/test-bootstrap-modules.js
+++ b/test/parallel/test-bootstrap-modules.js
@@ -76,6 +76,7 @@ const expectedModules = new Set([
   'NativeModule internal/modules/esm/module_job',
   'NativeModule internal/modules/esm/module_map',
   'NativeModule internal/modules/esm/resolve',
+  'NativeModule internal/modules/esm/initialize_import_meta',
   'NativeModule internal/modules/esm/translators',
   'NativeModule internal/process/esm_loader',
   'NativeModule internal/options',