import-in-the-middle 1.4.2 → 1.6.0

package/hook.js

@@ -14,7 +14,8 @@ const NODE_MINOR = Number(NODE_VERSION[1])
 
 let entrypoint
 
-if (NODE_MAJOR >= 20) {
+let getExports
+if (NODE_MAJOR >= 20 || (NODE_MAJOR == 18 && NODE_MINOR >= 19)) {
   getExports = require('./lib/get-exports.js')
 } else {
   getExports = (url) => import(url).then(Object.keys)
@@ -100,7 +101,11 @@ function createHook (meta) {
       return url
     }
 
-    if (context.importAssertions && context.importAssertions.type === 'json') {
+    // Node.js v21 renames importAssertions to importAttributes
+    if (
+      (context.importAssertions && context.importAssertions.type === 'json') ||
+      (context.importAttributes && context.importAttributes.type === 'json')
+    ) {
       return url
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "import-in-the-middle",
-  "version": "1.4.2",
+  "version": "1.6.0",
   "description": "Intercept imports in Node.js",
   "main": "index.js",
   "scripts": {

package/test/get-esm-exports/v18.19-get-esm-exports.js

@@ -0,0 +1,3 @@
+// v18.19.0 backported ESM hook execution to a separate thread,
+// thus being equivalent to >=v20.
+require('./v20-get-esm-exports')

package/test/other/import-executable.mjs

@@ -4,6 +4,14 @@
 
 import { rejects } from 'assert'
 (async () => {
+  const [processMajor, processMinor] = process.versions.node.split('.').map(Number)
+  const extensionlessSupported = processMajor >= 21 ||
+    (processMajor === 20 && processMinor >= 10) ||
+    (processMajor === 18 && processMinor >= 19)
+  if (extensionlessSupported) {
+    // Files without extension are supported in Node.js ^21, ^20.10.0, and ^18.19.0
+    return
+  }
   await rejects(() => import('./executable'), {
     name: 'TypeError',
     code: 'ERR_UNKNOWN_FILE_EXTENSION'

package/test/runtest

@@ -16,14 +16,19 @@ const args = [
   ...process.argv.slice(2)
 ]
 
-const [processMajor] = process.versions.node.split('.').map(Number)
+const [processMajor, processMinor] = process.versions.node.split('.').map(Number)
 
-const match = filename.match(/v([0-9]+)/)
+const match = filename.match(/v([0-9]+)(?:\.([0-9]+))?/)
 
-const versionRequirement = match ? match[1] : 0;
+const majorRequirement = match ? match[1] : 0;
+const minorRequirement = match && match[2];
 
-if (processMajor < versionRequirement) {
-  console.log(`skipping ${filename} as this is Node.js v${processMajor} and test wants v${versionRequirement}`);
+if (processMajor < majorRequirement && minorRequirement === undefined) {
+  console.log(`skipping ${filename} as this is Node.js v${processMajor} and test wants v${majorRequirement}`);
+  process.exit(0);
+}
+if (processMajor < majorRequirement && processMinor < minorRequirement) {
+  console.log(`skipping ${filename} as this is Node.js v${processMajor}.${processMinor} and test wants >=v${majorRequirement}.${minorRequirement}`);
   process.exit(0);
 }