esm: import.meta.resolve with nodejs: builtins

PR-URL: https://github.com/nodejs/node/pull/31032
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>

3 files changed, 5 insertions, 6 deletions

diff --git a/test/fixtures/es-module-loaders/example-loader.mjs b/test/fixtures/es-module-loaders/example-loader.mjs
index 70f9f28f08..1ed18bda51 100644
--- a/test/fixtures/es-module-loaders/example-loader.mjs
+++ b/test/fixtures/es-module-loaders/example-loader.mjs
@@ -11,7 +11,7 @@ baseURL.pathname = process.cwd() + '/';
 export function resolve(specifier, { parentURL = baseURL }, defaultResolve) {
   if (builtinModules.includes(specifier)) {
     return {
-      url: specifier
+      url: 'nodejs:' + specifier
     };
   }
   if (/^\.{1,2}[/]/.test(specifier) !== true && !specifier.startsWith('file:')) {
@@ -27,7 +27,7 @@ export function resolve(specifier, { parentURL = baseURL }, defaultResolve) {
 }
 
 export function getFormat(url, context, defaultGetFormat) {
-  if (builtinModules.includes(url)) {
+  if (url.startsWith('nodejs:') && builtinModules.includes(url.slice(7))) {
     return {
       format: 'builtin'
     };
diff --git a/test/fixtures/es-module-loaders/loader-unknown-builtin-module.mjs b/test/fixtures/es-module-loaders/loader-unknown-builtin-module.mjs
index 1a48231966..e976343e47 100644
--- a/test/fixtures/es-module-loaders/loader-unknown-builtin-module.mjs
+++ b/test/fixtures/es-module-loaders/loader-unknown-builtin-module.mjs
@@ -1,14 +1,14 @@
 export async function resolve(specifier, { parentURL }, defaultResolve) {
   if (specifier === 'unknown-builtin-module') {
     return {
-      url: 'unknown-builtin-module'
+      url: 'nodejs:unknown-builtin-module'
     };
   }
   return defaultResolve(specifier, {parentURL}, defaultResolve);
 }
 
 export async function getFormat(url, context, defaultGetFormat) {
-  if (url === 'unknown-builtin-module') {
+  if (url === 'nodejs:unknown-builtin-module') {
     return {
       format: 'builtin'
     };
diff --git a/test/fixtures/es-module-loaders/not-found-assert-loader.mjs b/test/fixtures/es-module-loaders/not-found-assert-loader.mjs
index 7b1d176e45..2130bad5f5 100644
--- a/test/fixtures/es-module-loaders/not-found-assert-loader.mjs
+++ b/test/fixtures/es-module-loaders/not-found-assert-loader.mjs
@@ -14,8 +14,7 @@ export async function resolve(specifier, { parentURL }, defaultResolve) {
   catch (e) {
     assert.strictEqual(e.code, 'ERR_MODULE_NOT_FOUND');
     return {
-      format: 'builtin',
-      url: 'fs'
+      url: 'nodejs:fs'
     };
   }
   assert.fail(`Module resolution for ${specifier} should be throw ERR_MODULE_NOT_FOUND`);