Dependency updates

* Fix reference to chalk's color level

* Upgrade XO and reformat

* Update dev dependencies

* Update production dependencies

* Rebuild lockfile

* CI: Continue when 'npm ls' errors in TypeScript compatibility job

.github/workflows/ci.yml

@@ -58,6 +58,7 @@ jobs:
         env:
           TS_VERSION: ${{ matrix.ts-version }}
       - run: npm ls typescript
+        continue-on-error: true
       - run: npx tsd
 
   lockfile_churn:

.xo-config.cjs

@@ -40,6 +40,15 @@ module.exports = {
 				'unicorn/prefer-module': 'off',
 			},
 		},
+		{
+			files: [
+				'test/**/fixtures/**',
+				'test-tap/**fixture/**',
+			],
+			rules: {
+				'unicorn/no-empty-file': 'off',
+			},
+		},
 		{
 			// TODO: Update tests.
 			files: 'test/**',

entrypoints/main.mjs

@@ -1,3 +1 @@
-import test from '../lib/worker/main.cjs';
-
-export default test;
+export {default} from '../lib/worker/main.cjs';

lib/api.js

@@ -232,10 +232,13 @@ export default class Api extends Emittery {
 				}
 			});
 
-			const providerStates = (await Promise.all(providers.map(async ({type, main}) => {
+			const providerStates = [];
+			await Promise.all(providers.map(async ({type, main}) => {
 				const state = await main.compile({cacheDir: this._createCacheDir(), files: testFiles});
-				return state === null ? null : {type, state};
-			}))).filter(state => state !== null);
+				if (state !== null) {
+					providerStates.push({type, state});
+				}
+			}));
 
 			// Resolve the correct concurrency value.
 			let concurrency = Math.min(os.cpus().length, isCi ? 2 : Number.POSITIVE_INFINITY);

lib/chalk.js

@@ -1,9 +1,8 @@
-import chalk from 'chalk';
+import {Chalk} from 'chalk'; // eslint-disable-line unicorn/import-style
 
-let instance = new chalk.Instance(); // eslint-disable-line import/no-mutable-exports
-export default instance;
+let chalk = new Chalk(); // eslint-disable-line import/no-mutable-exports
 
-export {instance as chalk};
+export {chalk};
 
 let configured = false;
 export function set(options) {
@@ -12,5 +11,5 @@ export function set(options) {
 	}
 
 	configured = true;
-	instance = new chalk.Instance(options);
+	chalk = new Chalk(options);
 }

lib/cli.js

@@ -231,7 +231,12 @@ export default async function loadCli() { // eslint-disable-line complexity
 		}
 	}
 
-	const chalkOptions = {level: combined.color === false ? 0 : (await import('chalk')).level}; // eslint-disable-line node/no-unsupported-features/es-syntax
+	const chalkOptions = {level: 0};
+	if (combined.color !== false) {
+		const {supportsColor: {level}} = await import('chalk'); // eslint-disable-line node/no-unsupported-features/es-syntax, unicorn/import-style
+		chalkOptions.level = level;
+	}
+
 	const {set: setChalk} = await import('./chalk.js'); // eslint-disable-line node/no-unsupported-features/es-syntax
 	setChalk(chalkOptions);
 

lib/concordance-options.js

@@ -1,11 +1,12 @@
 import {inspect} from 'node:util';
 
 import ansiStyles from 'ansi-styles';
+import {Chalk} from 'chalk'; // eslint-disable-line unicorn/import-style
 import stripAnsi from 'strip-ansi';
 
 import {chalk} from './chalk.js';
 
-const forceColor = new chalk.Instance({level: Math.max(chalk.level, 1)});
+const forceColor = new Chalk({level: Math.max(chalk.level, 1)});
 
 const colorTheme = {
 	boolean: ansiStyles.yellow,

lib/fork.js

@@ -4,7 +4,7 @@ import {fileURLToPath} from 'node:url';
 import {Worker} from 'node:worker_threads';
 
 import Emittery from 'emittery';
-import pEvent from 'p-event';
+import {pEvent} from 'p-event';
 
 import {controlFlow} from './ipc-flow-control.cjs';
 import serializeError from './serialize-error.js';

lib/globs.js

@@ -4,27 +4,23 @@ import path from 'node:path';
 import {globby, globbySync} from 'globby';
 
 import {
-	classify,
 	defaultIgnorePatterns,
 	hasExtension,
-	isHelperish,
-	matches,
 	normalizeFileForMatching,
-	normalizePattern,
 	normalizePatterns,
 	processMatchingPatterns,
 } from './glob-helpers.cjs';
 
 export {
 	classify,
-	defaultIgnorePatterns,
-	hasExtension,
 	isHelperish,
 	matches,
-	normalizeFileForMatching,
 	normalizePattern,
+	defaultIgnorePatterns,
+	hasExtension,
+	normalizeFileForMatching,
 	normalizePatterns,
-};
+} from './glob-helpers.cjs';
 
 const defaultIgnoredByWatcherPatterns = [
 	'**/*.snap.md', // No need to rerun tests when the Markdown files change.
@@ -120,11 +116,13 @@ const globDirectoriesSync = (cwd, patterns) => {
 };
 
 export async function findFiles({cwd, extensions, filePatterns}) {
-	return (await globFiles(cwd, filePatterns)).filter(file => hasExtension(extensions, file));
+	const files = await globFiles(cwd, filePatterns);
+	return files.filter(file => hasExtension(extensions, file));
 }
 
 export async function findTests({cwd, extensions, filePatterns}) {
-	return (await findFiles({cwd, extensions, filePatterns})).filter(file => !path.basename(file).startsWith('_'));
+	const files = await findFiles({cwd, extensions, filePatterns});
+	return files.filter(file => !path.basename(file).startsWith('_'));
 }
 
 export function getChokidarIgnorePatterns({ignoredByWatcherPatterns}) {

lib/load-config.js

@@ -86,11 +86,13 @@ export async function loadConfig({configFile, resolveFrom = process.cwd(), defau
 		let searchDir = projectDir;
 		const stopAt = path.dirname(repoRoot);
 		do {
-			[{config: fileConf, fileForErrorMessage, configFile} = {config: NO_SUCH_FILE, fileForErrorMessage: undefined}, ...conflicting] = (await Promise.all([ // eslint-disable-line no-await-in-loop
+			const results = await Promise.all([ // eslint-disable-line no-await-in-loop
 				loadConfigFile({projectDir, configFile: path.join(searchDir, 'ava.config.js')}),
 				loadConfigFile({projectDir, configFile: path.join(searchDir, 'ava.config.cjs')}),
 				loadConfigFile({projectDir, configFile: path.join(searchDir, 'ava.config.mjs')}),
-			])).filter(result => result !== null);
+			]);
+
+			[{config: fileConf, fileForErrorMessage, configFile} = {config: NO_SUCH_FILE, fileForErrorMessage: undefined}, ...conflicting] = results.filter(result => result !== null);
 
 			searchDir = path.dirname(searchDir);
 		} while (fileConf === NO_SUCH_FILE && searchDir !== stopAt);

lib/worker/base.js

@@ -123,13 +123,13 @@ const run = async options => {
 	// Install before processing options.require, so if helpers are added to the
 	// require configuration the *compiled* helper will be loaded.
 	const {projectDir, providerStates = []} = options;
-	const providers = (await Promise.all(providerStates.map(async ({type, state}) => {
+	const providers = [];
+	await Promise.all(providerStates.map(async ({type, state}) => {
 		if (type === 'typescript') {
-			return (await providerManager.typescript(projectDir)).worker({extensionsToLoadAsModules, state});
+			const provider = await providerManager.typescript(projectDir);
+			providers.push(provider.worker({extensionsToLoadAsModules, state}));
 		}
-
-		return null;
-	}))).filter(provider => provider !== null);
+	}));
 
 	const require = createRequire(import.meta.url);
 	const load = async ref => {

lib/worker/channel.cjs

@@ -3,12 +3,44 @@ const events = require('events');
 const process = require('process');
 const {MessageChannel, threadId} = require('worker_threads');
 
-const pEvent = require('p-event');
-
 const timers = require('../now-and-timers.cjs');
 
 const {isRunningInChildProcess, isRunningInThread} = require('./utils.cjs');
 
+let pEvent = async (emitter, event, options) => {
+	// We need to import p-event, but import() is asynchronous. Buffer any events
+	// emitted in the meantime. Don't handle errors.
+	const buffer = [];
+	const addToBuffer = (...args) => buffer.push(args);
+	emitter.on(event, addToBuffer);
+
+	try {
+		({pEvent} = await import('p-event')); // eslint-disable-line node/no-unsupported-features/es-syntax
+	} finally {
+		emitter.off(event, addToBuffer);
+	}
+
+	if (buffer.length === 0) {
+		return pEvent(emitter, event, options);
+	}
+
+	// Now replay buffered events.
+	const replayEmitter = new events.EventEmitter();
+	const promise = pEvent(replayEmitter, event, options);
+	for (const args of buffer) {
+		replayEmitter.emit(event, ...args);
+	}
+
+	const replay = (...args) => replayEmitter.emit(event, ...args);
+	emitter.on(event, replay);
+
+	try {
+		return await promise;
+	} finally {
+		emitter.off(event, replay);
+	}
+};
+
 const selectAvaMessage = type => message => message.ava && message.ava.type === type;
 
 class RefCounter {

lib/worker/guard-environment.cjs

@@ -6,12 +6,11 @@ const {isRunningInThread, isRunningInChildProcess} = require('./utils.cjs');
 
 // Check if the test is being run without AVA cli
 if (!isRunningInChildProcess && !isRunningInThread) {
-	const chalk = require('chalk'); // Use default Chalk instance.
 	if (process.argv[1]) {
 		const fp = path.relative('.', process.argv[1]);
 
 		console.log();
-		console.error(`Test files must be run with the AVA CLI:\n\n    ${chalk.grey.dim('$')} ${chalk.cyan('ava ' + fp)}\n`);
+		console.error(`Test files must be run with the AVA CLI:\n\n    $ ava ${fp}\n`);
 
 		process.exit(1); // eslint-disable-line unicorn/no-process-exit
 	} else {