Test more node versions

bjornstar · bjornstar · commit 5d07f002cb92 · 2022-03-26T19:33:59.000+01:00
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: ["12.10", "12.16", "12.x", "14.x", "16.x", "17.x"]
 
     steps:
     - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: ["12.10", "12.16", "12.x", "14.x", "16.x", "17.x"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/lib/index.js b/lib/index.js
@@ -1,5 +1,6 @@
 const { fork } = require('child_process');
 const filewatcher = require('filewatcher');
+const { join } = require('path');
 const semver = require('semver');
 const { pathToFileURL } = require('url');
 
@@ -94,18 +95,24 @@ module.exports = function (
     const args = nodeArgs.slice();
 
     args.push(`--require=${resolveMain(localPath('wrap'))}`);
-    const loaderPath = semver.satisfies(process.version, '<16.12.0')
-      ? 'loader-legacy.mjs'
-      : 'loader.mjs';
-    const loader = pathToFileURL(resolveMain(localPath(loaderPath)));
+
     if (semver.satisfies(process.version, '<12.17.0')) {
       args.push('--experimental-modules');
     }
-    if (semver.satisfies(process.version, '<12.11.1')) {
-      args.push(`--loader=${loader.href}`);
-    } else {
-      args.push(`--experimental-loader=${loader.href}`);
-    }
+
+    const loaderName = semver.satisfies(process.version, '>=16.12.0')
+      ? 'load'
+      : semver.satisfies(process.version, '>=12.11.1')
+      ? 'get-format'
+      : 'resolve';
+
+    const loaderURL = pathToFileURL(resolveMain(localPath(join('loaders', `${loaderName}.mjs`))));
+
+    const experimentalPrefix = semver.satisfies(process.version, '>=12.11.1')
+      ? 'experimental-'
+      : '';
+
+    args.push(`--${experimentalPrefix}loader=${loaderURL.href}`);
 
     child = fork(script, scriptArgs, {
       cwd: process.cwd(),
diff --git a/lib/ipc.js b/lib/ipc.js
@@ -1,9 +1,5 @@
 const cmd = 'NODE_DEV';
 
-exports.send = m => {
-  if (process.connected) process.send({ ...m, cmd });
-};
-
 exports.on = (src, prop, cb) => {
   src.on('internalMessage', m => {
     if (m.cmd === cmd && prop in m) cb(m);
@@ -15,3 +11,7 @@ exports.relay = src => {
     if (process.connected && m.cmd === cmd) process.send(m);
   });
 };
+
+exports.send = m => {
+  if (process.connected) process.send({ ...m, cmd });
+};
diff --git a/lib/ipc.mjs b/lib/ipc.mjs
diff --git a/lib/loaders/get-format.mjs b/lib/loaders/get-format.mjs
@@ -5,16 +5,14 @@ import { send } from './ipc.mjs';
 const require = createRequire(import.meta.url);
 
 export async function getFormat(url, context, defaultGetFormat) {
-  const getPackageType = require('get-package-type');
   const filePath = fileURLToPath(url);
 
   send({ required: filePath });
+
   try {
     return await defaultGetFormat(url, context, defaultGetFormat);
-  } catch (err) {
-    if (err.code === 'ERR_UNKNOWN_FILE_EXTENSION') {
-      return { format: await getPackageType(filePath) };
-    }
-    throw err;
+  } catch (error) {
+    if (error.code !== 'ERR_UNKNOWN_FILE_EXTENSION') throw error;
+    return require('get-package-type')(filePath).then(format => ({ format }));
   }
 }
diff --git a/lib/loaders/ipc.mjs b/lib/loaders/ipc.mjs
@@ -0,0 +1,5 @@
+const cmd = 'NODE_DEV';
+
+export const send = m => {
+  if (process.connected) process.send({ ...m, cmd });
+};
diff --git a/lib/loaders/load.mjs b/lib/loaders/load.mjs
@@ -5,16 +5,14 @@ import { send } from './ipc.mjs';
 const require = createRequire(import.meta.url);
 
 export async function load(url, context, defaultLoad) {
-  const getPackageType = require('get-package-type');
   const filePath = fileURLToPath(url);
 
   send({ required: filePath });
+
   try {
     return await defaultLoad(url, context, defaultLoad);
-  } catch (err) {
-    if (err.code === 'ERR_UNKNOWN_FILE_EXTENSION') {
-      return { format: await getPackageType(filePath), source: null };
-    }
-    throw err;
+  } catch (error) {
+    if (error.code !== 'ERR_UNKNOWN_FILE_EXTENSION') throw error;
+    return require('get-package-type')(filePath).then(format => ({ format, source: null }));
   }
 }
diff --git a/lib/loaders/resolve.mjs b/lib/loaders/resolve.mjs
@@ -0,0 +1,12 @@
+import { fileURLToPath } from 'url';
+import { send } from './ipc.mjs';
+
+export function resolve(specifier, parentModule, defaultResolve) {
+  const resolved = defaultResolve(specifier, parentModule);
+
+  if (parentModule) {
+    send({ required: fileURLToPath(resolved.url) });
+  }
+
+  return resolved;
+}
diff --git a/lib/suppress-experimental-warnings.js b/lib/suppress-experimental-warnings.js
@@ -0,0 +1,17 @@
+// Source: https://github.com/nodejs/node/issues/30810#issue-533506790
+
+module.exports = p => {
+  const { emitWarning } = p;
+
+  p.emitWarning = (warning, ...args) => {
+    if (args[0] === 'ExperimentalWarning') {
+      return;
+    }
+
+    if (args[0] && typeof args[0] === 'object' && args[0].type === 'ExperimentalWarning') {
+      return;
+    }
+
+    return emitWarning(warning, ...args);
+  };
+};
diff --git a/lib/suppress-experimental.js b/lib/suppress-experimental.js
diff --git a/lib/wrap.js b/lib/wrap.js
@@ -6,14 +6,16 @@ const { getConfig } = require('./cfg');
 const hook = require('./hook');
 const { relay, send } = require('./ipc');
 const resolveMain = require('./resolve-main');
+const suppressExperimentalWarnings = require('./suppress-experimental-warnings');
 
 const script = process.argv[1];
 const { extensions, fork, vm } = getConfig(script);
 
 if (process.env.NODE_DEV_PRELOAD) {
   require(process.env.NODE_DEV_PRELOAD);
 }
-require('./suppress-experimental');
+
+suppressExperimentalWarnings(process);
 
 // We want to exit on SIGTERM, but defer to existing SIGTERM handlers.
 process.once('SIGTERM', () => process.listenerCount('SIGTERM') || process.exit(0));
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "typescript": "^4.1.5"
   },
   "lint-staged": {
-    "*.js": "eslint --cache --fix",
+    "*.{js,mjs}": "eslint --cache --fix",
     "*.{js,md}": "prettier --write"
   }
 }
diff --git a/test/fixture/modify-extensions.js b/test/fixture/modify-extensions.js
@@ -1 +1,3 @@
 require.extensions.bogus = undefined;
+
+console.log('extensions modified');
diff --git a/test/spawn/argv.js b/test/spawn/argv.js
@@ -4,10 +4,18 @@ const { spawn } = require('../utils');
 
 tap.test('should not show up in argv', t => {
   spawn('argv.js foo', out => {
-    const argv = JSON.parse(out.replace(/'/g, '"'));
-    t.match(argv[0], /.*?node(js|\.exe)?$/);
-    t.match(argv[1], /.*[\\/]argv\.js$/);
-    t.equal(argv[2], 'foo');
-    return { exit: t.end.bind(t) };
+    let argv;
+    try {
+      argv = JSON.parse(out.replace(/'/g, '"'));
+    } catch (e) {
+      // failed to parse, that's ok.
+    }
+    if (argv) {
+      t.match(argv[0], /.*?node(js|\.exe)?$/);
+      t.match(argv[1], /.*[\\/]argv\.js$/);
+      t.equal(argv[2], 'foo');
+
+      return { exit: t.end.bind(t) };
+    }
   });
 });
diff --git a/test/spawn/caught.js b/test/spawn/caught.js
@@ -4,7 +4,6 @@ const { spawn } = require('../utils');
 
 tap.test('should ignore caught errors', t => {
   spawn('catch-no-such-module.js', out => {
-    t.match(out, /Caught/);
-    return { exit: t.end.bind(t) };
+    if (out.match(/^Caught Error/)) return { exit: t.end.bind(t) };
   });
 });
diff --git a/test/spawn/expose-gc.js b/test/spawn/expose-gc.js
@@ -4,7 +4,6 @@ const { spawn } = require('../utils');
 
 tap.test('should pass unknown args to node binary', t => {
   spawn('--expose_gc gc.js foo', out => {
-    t.equal(out.trim(), 'foo function');
-    return { exit: t.end.bind(t) };
+    if (out.trim() === 'foo function') return { exit: t.end.bind(t) };
   });
 });
diff --git a/test/spawn/kill-fork.js b/test/spawn/kill-fork.js
@@ -5,17 +5,19 @@ const { spawn } = require('../utils');
 tap.test('should kill the forked processes', t => {
   spawn('pid.js', out => {
     const pid = parseInt(out, 10);
-    return {
-      exit: () => {
-        setTimeout(() => {
-          try {
-            process.kill(pid);
-            t.fail('child must no longer run');
-          } catch (e) {
-            t.end();
-          }
-        }, 500);
-      }
-    };
+
+    if (!Number.isNaN(pid))
+      return {
+        exit: () => {
+          setTimeout(() => {
+            try {
+              process.kill(pid);
+              t.fail('child must no longer run');
+            } catch (e) {
+              t.end();
+            }
+          }, 500);
+        }
+      };
   });
 });
diff --git a/test/spawn/node-env.js b/test/spawn/node-env.js
@@ -4,7 +4,9 @@ const { spawn } = require('../utils');
 
 tap.test('should *not* set NODE_ENV', t => {
   spawn('env.js', out => {
-    t.notMatch(out, /development/);
-    return { exit: t.end.bind(t) };
+    if (out.startsWith('NODE_ENV:')) {
+      t.notMatch(out, /development/);
+      return { exit: t.end.bind(t) };
+    }
   });
 });
diff --git a/test/spawn/relay-stdin.js b/test/spawn/relay-stdin.js
@@ -4,7 +4,6 @@ const { spawn } = require('../utils');
 
 tap.test('should relay stdin', t => {
   spawn('echo.js', out => {
-    t.equal(out, 'foo');
-    return { exit: t.end.bind(t) };
+    if (out === 'foo') return { exit: t.end.bind(t) };
   }).stdin.write('foo');
 });
diff --git a/test/spawn/require-extensions.js b/test/spawn/require-extensions.js
@@ -5,6 +5,6 @@ const { spawn } = require('../utils');
 tap.test('should be resistant to breaking `require.extensions`', t => {
   spawn('modify-extensions.js', out => {
     t.notOk(/TypeError/.test(out));
+    if (out.match('extensions modified')) return { exit: t.end.bind(t) };
   });
-  setTimeout(t.end.bind(t), 0);
 });
diff --git a/test/utils.js b/test/utils.js
@@ -9,7 +9,9 @@ const dir = join(__dirname, 'fixture');
 
 const reClear = new RegExp(control);
 
-exports.spawn = (cmd, cb) => {
+const noop = () => {/**/};
+
+exports.spawn = (cmd, cb = noop) => {
   const ps = spawn('node', [bin].concat(cmd.split(' ')), { cwd: dir });
   let err = '';
 
