Skip to content

feat: use Node's --experimental-detect-module #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
privatenumber wants to merge 1 commit into from
Closed

feat: use Node's --experimental-detect-module #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { StdioOptions } from 'child_process';
import { pathToFileURL } from 'url';
import spawn from 'cross-spawn';
import { supportsModuleRegister } from './utils/node-features';
import { supportsModuleRegister, detectModule } from './utils/node-features';

export function run(
argv: string[],
Expand Down Expand Up @@ -32,9 +32,14 @@ export function run(
return spawn(
process.execPath,
[
'--require',
require.resolve('./preflight.cjs'),

...(
detectModule
? ['--experimental-detect-module']
: [
'--require',
require.resolve('./preflight.cjs'),
]
),
supportsModuleRegister ? '--import' : '--loader',
pathToFileURL(require.resolve('./loader.mjs')).toString(),

Expand Down
2 changes: 2 additions & 0 deletions src/utils/node-features.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ export const isolatedLoader = compareNodeVersion([20, 0, 0]) >= 0;
export const supportsModuleRegister = compareNodeVersion([20, 6, 0]) >= 0;

export const importAttributes = compareNodeVersion([21, 0, 0]) >= 0;

export const detectModule = compareNodeVersion([21, 1, 0]) >= 0;
5 changes: 3 additions & 2 deletions tests/specs/smoke.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,16 +315,17 @@ const files = {
};

const packageTypes = [
undefined,
'module',
'commonjs',
] as const;

export default testSuite(async ({ describe }, { tsx }: NodeApis) => {
describe('Smoke', ({ describe }) => {
for (const packageType of packageTypes) {
const isCommonJs = packageType === 'commonjs';
const isCommonJs = packageType !== 'module';

describe(packageType, ({ test, describe }) => {
describe(packageType || 'Ambiguious', ({ test, describe }) => {
test('from .js', async ({ onTestFinish, onTestFail }) => {
const fixture = await createFixture({
...files,
Expand Down