fix: support node:test in node 18

package.json

@@ -31,7 +31,7 @@
 		"test": "node --loader @esbuild-kit/esm-loader tests"
 	},
 	"dependencies": {
-		"@esbuild-kit/core-utils": "^2.0.2",
+		"@esbuild-kit/core-utils": "^2.1.0",
 		"get-tsconfig": "^4.1.0"
 	},
 	"devDependencies": {

src/loaders-deprecated.ts

@@ -7,6 +7,7 @@ import {
 	transform,
 	transformDynamicImport,
 	applySourceMap,
+	compareNodeVersion,
 } from '@esbuild-kit/core-utils';
 import {
 	sourcemaps,
@@ -96,14 +97,7 @@ const _transformSource: transformSource = async function (
 	return result;
 };
 
-const loadersDeprecatedVersion = [16, 12, 0];
-const nodeVersion = process.version.slice(1).split('.').map(Number);
-
-const nodeSupportsDeprecatedLoaders = (
-	nodeVersion[0] - loadersDeprecatedVersion[0]
-	|| nodeVersion[1] - loadersDeprecatedVersion[1]
-	|| nodeVersion[2] - loadersDeprecatedVersion[2]
-) < 0;
+const nodeSupportsDeprecatedLoaders = compareNodeVersion([16, 12, 0]) < 0;
 
 export const getFormat = nodeSupportsDeprecatedLoaders ? _getFormat : undefined;
 export const transformSource = nodeSupportsDeprecatedLoaders ? _transformSource : undefined;

src/loaders.ts

@@ -5,6 +5,7 @@ import {
 	transformDynamicImport,
 	applySourceMap,
 	resolveTsPath,
+	compareNodeVersion,
 } from '@esbuild-kit/core-utils';
 import {
 	sourcemaps,
@@ -83,6 +84,11 @@ async function tryDirectory(
 const fileProtocol = 'file://';
 const isPathPattern = /^\.{0,2}\//;
 
+const supportsNodePrefix = (
+	compareNodeVersion([14, 13, 1]) >= 0
+	|| compareNodeVersion([12, 20, 0]) >= 0
+);
+
 export const resolve: resolve = async function (
 	specifier,
 	context,
@@ -91,7 +97,7 @@ export const resolve: resolve = async function (
 ) {
 	// Added in v12.20.0
 	// https://nodejs.org/api/esm.html#esm_node_imports
-	if (specifier.startsWith('node:')) {
+	if (!supportsNodePrefix && specifier.startsWith('node:')) {
 		specifier = specifier.slice(5);
 	}
 

tests/fixtures/package-module/lib/cjs-ext-cjs/index.cjs

@@ -1,22 +1,50 @@
-const fs = require('node:fs');
-
-console.log(
-	'loaded cjs-ext-cjs/index.cjs',
-	JSON.stringify({
-		nodePrefix: Boolean(fs),
-		hasDynamicImport: Boolean(import('fs')),
-		...(() => {
-			let nameInError;
-			try {
-				nameInError();
-			} catch (error) {
-				return {
-					nameInError: error.message.includes('nameInError'),
-					sourceMap: error.stack.includes(':11:5'),
-				};
-			}
-		})(),
-	}),
+async function test(description, testFunction) {
+	try {
+		const result = await testFunction();
+		if (!result) { throw result; }
+		console.log(`✔ ${description}`);
+	} catch (error) {
+		console.log(`✖ ${description}: ${error.toString().split('\n').shift()}`);
+	}
+}
+
+console.log('loaded cjs-ext-cjs/index.cjs');
+
+test(
+	'has CJS context',
+	() => typeof require !== 'undefined' || typeof module !== 'undefined',
+);
+
+test(
+	'name in error',
+	() => {
+		let nameInError;
+		try {
+			nameInError();
+		} catch (error) {
+			return error.message.includes('nameInError');
+		}
+	},
+);
+
+test(
+	'sourcemaps',
+	() => new Error().stack.includes(':32:'),
+);
+
+test(
+	'resolves optional node prefix',
+	() => Boolean(require('node:fs')),
+);
+
+test(
+	'resolves required node prefix',
+	() => Boolean(require('node:test')),
+);
+
+test(
+	'has dynamic import',
+	() => import('fs').then(Boolean),
 );
 
 module.exports = 1234;

tests/fixtures/package-module/lib/cjs-ext-js/index.js

@@ -1,22 +1,38 @@
-const fs = require('node:fs');
+async function test(description, testFunction) {
+	try {
+		const result = await testFunction();
+		if (!result) { throw result; }
+		console.log(`✔ ${description}`);
+	} catch (error) {
+		console.log(`✖ ${description}: ${error.toString().split('\n').shift()}`);
+	}
+}
 
-console.log(
-	'loaded cjs-ext-js/index.js',
-	JSON.stringify({
-		nodePrefix: Boolean(fs),
-		hasDynamicImport: Boolean(import('fs')),
-		...(() => {
-			let nameInError;
-			try {
-				nameInError();
-			} catch (error) {
-				return {
-					nameInError: error.message.includes('nameInError'),
-					sourceMap: error.stack.includes(':11:5'),
-				};
-			}
-		})(),
-	}),
+console.log('loaded cjs-ext-js/index.js');
+
+test(
+	'has CJS context',
+	() => typeof require !== 'undefined' || typeof module !== 'undefined',
+);
+
+test(
+	'name in error',
+	() => {
+		let nameInError;
+		try {
+			nameInError();
+		} catch (error) {
+			return error.message.includes('nameInError');
+		}
+	},
 );
 
-module.exports = 1234;
+test(
+	'sourcemaps',
+	() => new Error().stack.includes(':32:'),
+);
+
+test(
+	'has dynamic import',
+	() => import('fs').then(Boolean),
+);

tests/fixtures/package-module/lib/esm-ext-js/index.js

@@ -1,22 +1,45 @@
-import fs from 'node:fs';
+async function test(description, testFunction) {
+	try {
+		const result = await testFunction();
+		if (!result) { throw result; }
+		console.log(`✔ ${description}`);
+	} catch (error) {
+		console.log(`✖ ${description}: ${error.toString().split('\n').shift()}`);
+	}
+}
 
-console.log(
-	'loaded esm-ext-js/index.js',
-	JSON.stringify({
-		nodePrefix: Boolean(fs),
-		hasDynamicImport: Boolean(import('fs')),
-		...(() => {
-			let nameInError;
-			try {
-				nameInError();
-			} catch (error) {
-				return {
-					nameInError: error.message.includes('nameInError'),
-					sourceMap: error.stack.includes(':11:5'),
-				};
-			}
-		})(),
-	}),
+console.log('loaded esm-ext-js/index.js');
+
+test(
+	'has CJS context',
+	() => typeof require !== 'undefined' || typeof module !== 'undefined',
+);
+
+test(
+	'name in error',
+	() => {
+		let nameInError;
+		try {
+			nameInError();
+		} catch (error) {
+			return error.message.includes('nameInError');
+		}
+	},
+);
+
+test(
+	'sourcemaps',
+	() => new Error().stack.includes(':32:'),
+);
+
+test(
+	'resolves optional node prefix',
+	() => import('node:fs').then(Boolean),
+);
+
+test(
+	'resolves required node prefix',
+	() => import('node:test').then(Boolean),
 );
 
 export default 1234;

tests/fixtures/package-module/lib/esm-ext-mjs/index.mjs

@@ -1,22 +1,45 @@
-import fs from 'node:fs';
+async function test(description, testFunction) {
+	try {
+		const result = await testFunction();
+		if (!result) { throw result; }
+		console.log(`✔ ${description}`);
+	} catch (error) {
+		console.log(`✖ ${description}: ${error.toString().split('\n').shift()}`);
+	}
+}
 
-console.log(
-	'loaded esm-ext-mjs/index.mjs',
-	JSON.stringify({
-		nodePrefix: Boolean(fs),
-		hasDynamicImport: Boolean(import('fs')),
-		...(() => {
-			let nameInError;
-			try {
-				nameInError();
-			} catch (error) {
-				return {
-					nameInError: error.message.includes('nameInError'),
-					sourceMap: error.stack.includes(':11:5'),
-				};
-			}
-		})(),
-	}),
+console.log('loaded esm-ext-mjs/index.mjs');
+
+test(
+	'has CJS context',
+	() => typeof require !== 'undefined' || typeof module !== 'undefined',
+);
+
+test(
+	'name in error',
+	() => {
+		let nameInError;
+		try {
+			nameInError();
+		} catch (error) {
+			return error.message.includes('nameInError');
+		}
+	},
+);
+
+test(
+	'sourcemaps',
+	() => new Error().stack.includes(':32:'),
+);
+
+test(
+	'resolves optional node prefix',
+	() => import('node:fs').then(Boolean),
+);
+
+test(
+	'resolves required node prefix',
+	() => import('node:test').then(Boolean),
 );
 
 export default 1234;