Merge pull request #10 from nodejs/commonjs-resolution-loader

Author: GeoffreyBooth

commonjs-extension-resolution-loader/loader.js

@@ -1,27 +1,34 @@
-import { existsSync } from 'fs';
-import { createRequire } from 'module';
+import { builtinModules } from 'node:module';
 import { dirname } from 'path';
-import { URL, fileURLToPath, pathToFileURL } from 'url';
+import { cwd } from 'process';
+import { fileURLToPath, pathToFileURL } from 'url';
+import { promisify } from 'util';
 
-const require = createRequire(import.meta.url);
-const baseURL = pathToFileURL(process.cwd() + '/').href;
+import resolveCallback from 'resolve/async.js';
 
-export function resolve(specifier, context, defaultResolve) {
+const resolveAsync = promisify(resolveCallback);
+
+const baseURL = pathToFileURL(cwd() + '/').href;
+
+
+export async function resolve(specifier, context, next) {
   const { parentURL = baseURL } = context;
 
-  // `require.resolve` works with paths, not URLs, so convert to and from
+  if (specifier.startsWith('node:') || builtinModules.includes(specifier)) {
+    return next(specifier, context);
+  }
+
+  // `resolveAsync` works with paths, not URLs
   if (specifier.startsWith('file://')) {
     specifier = fileURLToPath(specifier);
   }
-  const basePath = dirname(fileURLToPath(parentURL));
-  const resolvedPath = require.resolve(specifier, {paths: [basePath]});
+  const parentPath = fileURLToPath(parentURL);
 
-  if (existsSync(resolvedPath)) {
-    return {
-      url: pathToFileURL(resolvedPath).href
-    };
-  }
+  const resolution = await resolveAsync(specifier, {
+    basedir: dirname(parentPath),
+    extensions: ['.js', '.json', '.node'],
+  });
+  const url = pathToFileURL(resolution).href;
 
-  // Let Node.js handle all other specifiers, such as package names
-  return defaultResolve(specifier, context, defaultResolve);
+  return next(url, context);
 }

commonjs-extension-resolution-loader/package-lock.json

@@ -8,6 +8,9 @@
     "start": "npm test",
     "test": "node test.js"
   },
-  "author": "Geoffrey Booth <webmaster@geoffreybooth.com>",
-  "license": "MIT"
+  "author": "Geoffrey Booth <webadmin@geoffreybooth.com>",
+  "license": "MIT",
+  "dependencies": {
+    "resolve": "^1.22.1"
+  }
 }

commonjs-extension-resolution-loader/package.json

@@ -1,25 +1,25 @@
-import { ok } from 'assert';
+import { match } from 'assert';
 import { spawn } from 'child_process';
 import { execPath } from 'process';
 
 
 // Run this test yourself with debugging mode via:
-// node --inspect-brk --experimental-loader ./loader.js ./fixtures/index.js
+// node --inspect-brk --loader ./loader.js ./fixtures/index.js
 
 const child = spawn(execPath, [
-  '--experimental-loader',
+  '--loader',
   './loader.js',
   './fixtures/index.js'
 ]);
 
 let stdout = '';
 child.stdout.setEncoding('utf8');
-child.stdout.on('data', (data) => {
+child.stdout.on('data', data => {
   stdout += data;
 });
 
-child.on('close', (code, signal) => {
-	stdout = stdout.toString();
-  ok(stdout.includes('hello from file.js'));
-  ok(stdout.includes('hello from folder/index.js'));
+child.on('close', (_code, _signal) => {
+  stdout = stdout.toString();
+  match(stdout, /hello from file\.js/);
+  match(stdout, /hello from folder\/index\.js/);
 });