fix

Author: reggi

lib/util/import-or-require.js

@@ -14,15 +14,23 @@ const importOrRequire = async path => {
   let content = {}
   try {
     content = require(path)
+    // this is for node 22+
+    // istanbul ignore next
+    /* c8 ignore start */
+    if (content.__esModule) {
+      return content.default
+    }
+    /* c8 ignore end */
   } catch {
     try {
-      content = await import(pathToFileURL(path)).then(r => r.default)
-      /* c8 ignore start */
+      // this is for node under 20
+      const results = await import(pathToFileURL(path))
+      // istanbul ignore next
+      return results.default
     } catch {
       // its ok if this fails since the content dir might only be to provide
       // other files. the index.js is optional
     }
-    /* c8 ignore end */
   }
   importOrRequireCache.set(path, content)
   return content

test/apply/import-or-require.js

@@ -0,0 +1,27 @@
+const t = require('tap')
+const importOrRequire = require('../../lib/util/import-or-require.js')
+const path = require('path')
+
+t.test('importOrRequire', async t => {
+  const dir = t.testdir({
+    esm: {
+      'package.json': JSON.stringify({
+        type: 'module',
+      }),
+      'index.js': 'export default "type module";',
+    },
+    'esm.js': 'export default "esm";',
+    'mjs.mjs': 'export default "mjs";',
+    'cjs.cjs': 'module.exports = "cjs";',
+    'js.js': 'module.exports = "js";',
+    'invalid.js': 'invalid',
+  })
+
+  await Promise.all(
+    // double 'js' triggers the cache
+    ['mjs', 'cjs', 'js', 'js'].map(async type => {
+      const output = await importOrRequire(path.join(dir, `${type}.${type}`))
+      t.same(output, type)
+    }),
+  )
+})