fix

Author: reggi

.github/workflows/ci-release.yml

@@ -87,20 +87,17 @@ jobs:
             os: windows-latest
             shell: cmd
         node-version:
-          - 18.17.0
-          - 18.x
-          - 20.5.0
+          - 20.17.0
           - 20.x
+          - 22.9.0
           - 22.x
         exclude:
           - platform: { name: macOS, os: macos-13, shell: bash }
-            node-version: 18.17.0
-          - platform: { name: macOS, os: macos-13, shell: bash }
-            node-version: 18.x
-          - platform: { name: macOS, os: macos-13, shell: bash }
-            node-version: 20.5.0
+            node-version: 20.17.0
           - platform: { name: macOS, os: macos-13, shell: bash }
             node-version: 20.x
+          - platform: { name: macOS, os: macos-13, shell: bash }
+            node-version: 22.9.0
           - platform: { name: macOS, os: macos-13, shell: bash }
             node-version: 22.x
     runs-on: ${{ matrix.platform.os }}

.github/workflows/ci.yml

@@ -68,20 +68,17 @@ jobs:
             os: windows-latest
             shell: cmd
         node-version:
-          - 18.17.0
-          - 18.x
-          - 20.5.0
+          - 20.17.0
           - 20.x
+          - 22.9.0
           - 22.x
         exclude:
           - platform: { name: macOS, os: macos-13, shell: bash }
-            node-version: 18.17.0
-          - platform: { name: macOS, os: macos-13, shell: bash }
-            node-version: 18.x
-          - platform: { name: macOS, os: macos-13, shell: bash }
-            node-version: 20.5.0
+            node-version: 20.17.0
           - platform: { name: macOS, os: macos-13, shell: bash }
             node-version: 20.x
+          - platform: { name: macOS, os: macos-13, shell: bash }
+            node-version: 22.9.0
           - platform: { name: macOS, os: macos-13, shell: bash }
             node-version: 22.x
     runs-on: ${{ matrix.platform.os }}

lib/util/import-or-require.js

@@ -3,7 +3,6 @@
 // then subsequent requires for the same path would return an empty object. Not
 // sure if a bug or I'm doing something wrong but since the require/imports here
 // are short lived, it is safe to create our own cache and use that.
-const { pathToFileURL } = require('url')
 
 const importOrRequireCache = new Map()
 
@@ -14,21 +13,12 @@ const importOrRequire = async path => {
   let content = {}
   try {
     content = require(path)
-    // this is for node 22+
-    // istanbul ignore next
     if (content.__esModule) {
-      return content.default
+      content = content.default
     }
   } catch {
-    try {
-      // this is for node under 18
-      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
-    }
+    // its ok if this fails since the content dir might only be to provide
+    // other files. the index.js is optional
   }
   importOrRequireCache.set(path, content)
   return content

package.json

@@ -94,7 +94,7 @@
     "prettier": true
   },
   "engines": {
-    "node": "^18.17.0 || >=20.5.0"
+    "node": "^20.17.0 || >=22.9.0"
   },
   "workspaces": [
     "workspace/test-workspace"

test/apply/import-or-require.js

@@ -20,13 +20,8 @@ t.test('importOrRequire', async t => {
   const typeModule = await importOrRequire(path.join(dir, 'esm/index.js'))
   t.same(typeModule, 'type module')
 
-  if (process.version.replace('v', '').split('.')[0] >= '22') {
-    const results = await importOrRequire(path.join(dir, 'esm.js'))
-    t.same(results, 'esm')
-  } else {
-    const results = await importOrRequire(path.join(dir, 'esm.js'))
-    t.same(results, {})
-  }
+  const results = await importOrRequire(path.join(dir, 'esm.js'))
+  t.same(results, 'esm')
 
   await Promise.all(
     // double 'js' triggers the cache