Ensure 'ava' can be imported in a CJS environment

Author: novemberborn

entrypoints/main.cjs

@@ -1,2 +1,2 @@
 'use strict';
-module.exports = require('../lib/worker/main');
+module.exports = require('../lib/worker/main.cjs');

entrypoints/main.mjs

@@ -1,2 +1,2 @@
-import test from '../lib/worker/main.js'; // eslint-disable-line import/extensions
+import test from '../lib/worker/main.cjs';
 export default test;

lib/worker/base.js

@@ -21,7 +21,7 @@ const run = async options => {
 	const dependencyTracking = require('./dependency-tracker');
 	const lineNumberSelection = require('./line-numbers');
 
-	const {sharedWorkerTeardowns} = require('./state.cjs');
+	const {flags, refs, sharedWorkerTeardowns} = require('./state.cjs');
 
 	async function exit(code) {
 		if (!process.exitCode) {
@@ -61,6 +61,8 @@ const run = async options => {
 		updateSnapshots: options.updateSnapshots
 	});
 
+	refs.runnerChain = runner.chain;
+
 	channel.peerFailed.then(() => { // eslint-disable-line promise/prefer-await-to-then
 		runner.interrupt();
 	});
@@ -118,12 +120,6 @@ const run = async options => {
 		exit(1);
 	});
 
-	let accessedRunner = false;
-	exports.getRunner = () => {
-		accessedRunner = true;
-		return runner;
-	};
-
 	// Store value to prevent required modules from modifying it.
 	const testPath = options.file;
 
@@ -195,7 +191,7 @@ const run = async options => {
 
 		await load(testPath);
 
-		if (accessedRunner) {
+		if (flags.loadedMain) {
 			// Unreference the channel if the test file required AVA. This stops it
 			// from keeping the event loop busy, which means the `beforeExit` event can be
 			// used to detect when tests stall.

lib/worker/main.cjs

@@ -0,0 +1,10 @@
+'use strict';
+require('./guard-environment.cjs'); // eslint-disable-line import/no-unassigned-import
+
+const assert = require('assert');
+const {flags, refs} = require('./state.cjs');
+assert(refs.runnerChain);
+
+flags.loadedMain = true;
+
+module.exports = refs.runnerChain;

lib/worker/main.js

@@ -1,3 +1,5 @@
 'use strict';
+exports.flags = {loadedMain: false};
+exports.refs = {runnerChain: null};
 exports.sharedWorkerTeardowns = [];
 exports.waitForReady = [];