Merge pull request #405 from toddbluhm/feat-update-node-versions

Remove Nodejs 18 & <20.10 support, add Nodejs 24.x support.

Author: toddbluhm

.github/workflows/linux-tests.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [20.10.0, 20.x, 22.x, 24.x]
 
     steps:
     - name: Checkout Project

.github/workflows/windows-tests.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [20.10.0, 20.x, 22.x, 24.x]
 
     steps:
     - name: Checkout Project

dist/parse-args.js

@@ -1,9 +1,6 @@
-import { createRequire } from 'node:module';
 import { Command } from '@commander-js/extra-typings';
 import { parseArgList } from './utils.js';
-// TODO: once we drop support for node <v20.10, this can be converted to
-// a normal import statement
-const packageJson = createRequire(import.meta.url)('../package.json');
+import packageJson from '../package.json' with { type: 'json' };
 /**
 * Parses the arguments passed into the cli
 */

dist/parse-env-file.js

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { extname } from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise, importAttributesKeyword } from './utils.js';
+import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise } from './utils.js';
 /**
  * Gets the environment vars from an env file
  */
@@ -19,7 +19,7 @@ export async function getEnvFileVars(envFilePath) {
         // For some reason in ES Modules, only JSON file types need to be specifically delinated when importing them
         let attributeTypes = {};
         if (ext === '.json') {
-            attributeTypes = { [importAttributesKeyword]: { type: 'json' } };
+            attributeTypes = { with: { type: 'json' } };
         }
         const res = await import(pathToFileURL(absolutePath).href, attributeTypes);
         if (typeof res === 'object' && res && 'default' in res) {

dist/parse-rc-file.js

@@ -2,7 +2,7 @@ import { stat, readFile } from 'node:fs';
 import { promisify } from 'node:util';
 import { extname } from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise, importAttributesKeyword } from './utils.js';
+import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise } from './utils.js';
 const statAsync = promisify(stat);
 const readFileAsync = promisify(readFile);
 /**
@@ -26,7 +26,7 @@ export async function getRCFileVars({ environments, filePath }) {
             // For some reason in ES Modules, only JSON file types need to be specifically delinated when importing them
             let attributeTypes = {};
             if (ext === '.json') {
-                attributeTypes = { [importAttributesKeyword]: { type: 'json' } };
+                attributeTypes = { with: { type: 'json' } };
             }
             const res = await import(pathToFileURL(absolutePath).href, attributeTypes);
             if ('default' in res) {

dist/utils.d.ts

@@ -11,4 +11,3 @@ export declare function parseArgList(list: string): string[];
  * A simple function to test if the value is a promise/thenable
  */
 export declare function isPromise<T>(value?: T | PromiseLike<T>): value is PromiseLike<T>;
-export declare const importAttributesKeyword: string;

dist/utils.js

@@ -29,9 +29,3 @@ export function isPromise(value) {
         && 'then' in value
         && typeof value.then === 'function';
 }
-// "Import Attributes" are only supported since node v18.20 and v20.10.
-// For older node versions, we have to use "Import Assertions".
-// TODO: remove this check when we drop support for node v20
-const [major, minor] = process.version.slice(1).split('.').map(Number);
-const legacyImportAssertions = (major === 18 && minor < 20) || (major === 20 && minor < 10);
-export const importAttributesKeyword = legacyImportAssertions ? 'assert' : 'with';

package.json

@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "type": "module",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.10.0"
   },
   "bin": {
     "env-cmd": "bin/env-cmd.js"

src/parse-args.ts

@@ -1,13 +1,7 @@
-import { createRequire } from 'node:module'
 import { Command } from '@commander-js/extra-typings'
 import type { EnvCmdOptions, CommanderOptions, EnvFileOptions, RCFileOptions } from './types.ts'
 import { parseArgList } from './utils.js'
-
-// TODO: once we drop support for node <v20.10, this can be converted to
-// a normal import statement
-const packageJson = createRequire(import.meta.url)('../package.json') as {
-  version: string;
-}
+import packageJson from '../package.json' with { type: 'json' }
 
 /**
 * Parses the arguments passed into the cli

src/parse-env-file.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs'
 import { extname } from 'node:path'
 import { pathToFileURL } from 'node:url'
-import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise, importAttributesKeyword } from './utils.js'
+import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise } from './utils.js'
 import type { Environment } from './types.ts'
 
 /**
@@ -22,7 +22,7 @@ export async function getEnvFileVars(envFilePath: string): Promise<Environment>
     // For some reason in ES Modules, only JSON file types need to be specifically delinated when importing them
     let attributeTypes = {}
     if (ext === '.json') {
-      attributeTypes = { [importAttributesKeyword]: { type: 'json' } }
+      attributeTypes = { with: { type: 'json' } }
     }
     const res: unknown = await import(pathToFileURL(absolutePath).href, attributeTypes)
     if (typeof res === 'object' && res && 'default' in res) {