Skip to content
This repository has been archived by the owner on Oct 18, 2023. It is now read-only.

fix: support node:test in node 18 #15

Merged
merged 4 commits into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"test": "node --require ./dist/index.js tests/index.ts"
},
"dependencies": {
"@esbuild-kit/core-utils": "^2.0.2",
"@esbuild-kit/core-utils": "^2.1.0",
"get-tsconfig": "^4.1.0"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
resolveTsPath,
transformDynamicImport,
applySourceMap,
compareNodeVersion,
} from '@esbuild-kit/core-utils';
import {
getTsconfig,
Expand All @@ -32,15 +33,14 @@ const tsconfigPathsMatcher = tsconfig && createPathsMatcher(tsconfig);

const sourcemaps = installSourceMapSupport();

const nodeVersion = process.versions.node.split('.').map(Number);
const nodeSupportsImport = (
// v13.2.0 and higher
(nodeVersion[0] >= 13 && nodeVersion[1] >= 2)
compareNodeVersion([13, 2, 0]) >= 0

// 12.20.0 ~ 13.0.0
|| (
(nodeVersion[0] >= 12 && nodeVersion[1] >= 20)
&& (nodeVersion[0] < 13 && nodeVersion[1] < 0)
compareNodeVersion([12, 20, 0]) >= 0
&& compareNodeVersion([13, 0, 0]) < 0
)
);

Expand Down Expand Up @@ -115,12 +115,17 @@ Object.defineProperty(extensions, '.mjs', {
enumerable: false,
});

const supportsNodePrefix = (
compareNodeVersion([16, 0, 0]) >= 0
|| compareNodeVersion([14, 18, 0]) >= 0
);

// Add support for "node:" protocol
const resolveFilename = Module._resolveFilename;
Module._resolveFilename = function (request, parent, isMain, options) {
// Added in v12.20.0
// https://nodejs.org/api/esm.html#esm_node_imports
if (request.startsWith('node:')) {
if (!supportsNodePrefix && request.startsWith('node:')) {
request = request.slice(5);
}

Expand Down
72 changes: 53 additions & 19 deletions tests/fixtures/lib/cjs-ext-cjs/index.cjs
Original file line number Diff line number Diff line change
@@ -1,22 +1,56 @@
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',
);

// esbuild uses import.meta as a signal for ESM
// test(
// 'import.meta.url',
// () => Boolean(import.meta.url),
// );

test(
'name in error',
() => {
let nameInError;
try {
nameInError();
} catch (error) {
return error.message.includes('nameInError');
}
},
);

test(
'sourcemaps',
() => new Error().stack.includes(':38:'),
);

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;
72 changes: 53 additions & 19 deletions tests/fixtures/lib/cjs-ext-js/index.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,56 @@
const fs = require('node:fs');

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'),
};
}
})(),
}),
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');

test(
'has CJS context',
() => typeof require !== 'undefined' || typeof module !== 'undefined',
);

// esbuild uses import.meta as a signal for ESM
// test(
// 'import.meta.url',
// () => Boolean(import.meta.url),
// );

test(
'name in error',
() => {
let nameInError;
try {
nameInError();
} catch (error) {
return error.message.includes('nameInError');
}
},
);

test(
'sourcemaps',
() => new Error().stack.includes(':38:'),
);

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;
72 changes: 52 additions & 20 deletions tests/fixtures/lib/esm-ext-js/index.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,55 @@
import fs from 'node:fs';

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'),
};
}
})(),
'import.meta.url': Boolean(import.meta.url),
}),
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');

test(
'has CJS context',
() => typeof require !== 'undefined' || typeof module !== 'undefined',
);

test(
'import.meta.url',
() => Boolean(import.meta.url),
);

test(
'name in error',
() => {
let nameInError;
try {
nameInError();
} catch (error) {
return error.message.includes('nameInError');
}
},
);

test(
'sourcemaps',
() => new Error().stack.includes(':37:'),
);

test(
'has dynamic import',
() => import('fs').then(Boolean),
);

test(
'resolves optional node prefix',
() => import('node:fs').then(Boolean),
);

test(
'resolves required node prefix',
() => import('node:test').then(Boolean),
);

export default 1234;
72 changes: 52 additions & 20 deletions tests/fixtures/lib/esm-ext-mjs/index.mjs
Original file line number Diff line number Diff line change
@@ -1,23 +1,55 @@
import fs from 'node:fs';

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'),
};
}
})(),
'import.meta.url': Boolean(import.meta.url),
}),
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');

test(
'has CJS context',
() => typeof require !== 'undefined' || typeof module !== 'undefined',
);

test(
'import.meta.url',
() => Boolean(import.meta.url),
);

test(
'name in error',
() => {
let nameInError;
try {
nameInError();
} catch (error) {
return error.message.includes('nameInError');
}
},
);

test(
'sourcemaps',
() => new Error().stack.includes(':37:'),
);

test(
'has dynamic import',
() => import('fs').then(Boolean),
);

test(
'resolves optional node prefix',
() => import('node:fs').then(Boolean),
);

test(
'resolves required node prefix',
() => import('node:test').then(Boolean),
);

export default 1234;
Loading