Explicit and separate CJS and ESM entrypoints

Fixes #2671.

AVA now only has a default export: the test() function.

ava.config.cjs

@@ -0,0 +1,7 @@
+// 👉 Due to the package exports, XO's use of our ESLint plugin loads this
+// file using the AVA code in the repository, but our self-hosted tests use the
+// installed "test-ava" version.
+module.exports = {
+	files: ['test/**', '!test/**/{fixtures,helpers}/**'],
+	ignoredByWatcher: ['{coverage,docs,media,test-d,test-tap}/**']
+};

entrypoints/cli.mjs

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+import * as cli from '../lib/cli.js'; // eslint-disable-line import/extensions
+cli.run();

eslint-plugin-helper.js → entrypoints/eslint-plugin-helper.cjs

@@ -2,7 +2,7 @@
 const v8 = require('v8');
 const {Worker} = require('worker_threads');
 
-const {classify, hasExtension, isHelperish, matches, normalizeFileForMatching, normalizePatterns} = require('./lib/globs');
+const {classify, hasExtension, isHelperish, matches, normalizeFileForMatching, normalizePatterns} = require('../lib/globs');
 
 const MAX_DATA_LENGTH_EXCLUSIVE = 100 * 1024; // Allocate 100 KiB to exchange globs.
 

entrypoints/main.cjs

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

entrypoints/main.mjs

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

entrypoints/plugin.cjs

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

entrypoints/plugin.mjs

@@ -0,0 +1,4 @@
+'use strict';
+import * as plugin from '../lib/worker/plugin.js'; // eslint-disable-line import/extensions
+const {registerSharedWorker} = plugin;
+export {registerSharedWorker};

index.d.ts

@@ -683,33 +683,3 @@ declare const test: TestInterface;
 
 /** Call to declare a test, or chain to declare hooks or test modifiers */
 export default test;
-
-/** Call to declare a hook that is run once, after all tests have passed, or chain to declare modifiers. */
-export const after: AfterInterface;
-
-/** Call to declare a hook that is run after each passing test, or chain to declare modifiers. */
-export const afterEach: AfterInterface;
-
-/** Call to declare a hook that is run once, before all tests, or chain to declare modifiers. */
-export const before: BeforeInterface;
-
-/** Call to declare a hook that is run before each test, or chain to declare modifiers. */
-export const beforeEach: BeforeInterface;
-
-/** Call to declare a test that is expected to fail, or chain to declare modifiers. */
-export const failing: FailingInterface;
-
-/** Call to declare a test that is run exclusively, along with other tests declared with `.only()`. */
-export const only: OnlyInterface;
-
-/** Call to declare a serial test, or chain to declare serial hooks or test modifiers. */
-export const serial: SerialInterface;
-
-/** Skip this test. */
-export const skip: SkipInterface;
-
-/** Declare a test that should be implemented later. */
-export const todo: TodoDeclaration;
-
-/** Meta data associated with the current process. */
-export const meta: MetaInterface;

lib/worker/main.js

@@ -1,20 +1,3 @@
 'use strict';
 const runner = require('./base').getRunner();
-const makeCjsExport = () => {
-	function test(...args) {
-		return runner.chain(...args);
-	}
-
-	return Object.assign(test, runner.chain);
-};
-
-// Support CommonJS modules by exporting a test function that can be fully
-// chained. Also support ES module loaders by exporting __esModule and a
-// default. Support `import * as ava from 'ava'` use cases by exporting a
-// `test` member. Do all this whilst preventing `test.test.test() or
-// `test.default.test()` chains, though in CommonJS `test.test()` is
-// unavoidable.
-module.exports = Object.assign(makeCjsExport(), {
-	__esModule: true,
-	default: runner.chain
-});
+module.exports = runner.chain;

package.json

@@ -6,7 +6,18 @@
 	"repository": "avajs/ava",
 	"homepage": "https://avajs.dev",
 	"bin": {
-		"ava": "cli.js"
+		"ava": "./entrypoints/cli.mjs"
+	},
+	"exports": {
+		".": {
+			"import": "./entrypoints/main.mjs",
+			"require": "./entrypoints/main.cjs"
+		},
+		"./eslint-plugin-helper": "./entrypoints/eslint-plugin-helper.cjs",
+		"./plugin": {
+			"import": "./entrypoints/plugin.mjs",
+			"require": "./entrypoints/plugin.cjs"
+		}
 	},
 	"engines": {
 		"node": ">=12.20 <13 || >=14.15 <15 || >=15"
@@ -16,10 +27,8 @@
 		"test": "xo && tsd && npm run -s cover"
 	},
 	"files": [
+		"entrypoints",
 		"lib",
-		"*.js",
-		"!*.config.js",
-		"index.d.ts",
 		"*.d.ts"
 	],
 	"keywords": [

test-d/assertions-as-type-guards.ts

@@ -1,5 +1,5 @@
 import {expectType} from 'tsd';
-import test from '..';
+import test from '..'; // eslint-disable-line import/no-unresolved
 
 type Expected = {foo: 'bar'};
 const expected: Expected = {foo: 'bar'};

test-d/context.ts

@@ -1,5 +1,5 @@
 import {expectError, expectType} from 'tsd';
-import anyTest, {Macro, TestInterface} from '..';
+import anyTest, {Macro, TestInterface} from '..'; // eslint-disable-line import/no-unresolved
 
 interface Context {
 	foo: string;

test-d/like.ts

@@ -1,4 +1,4 @@
-import test from '..';
+import test from '..'; // eslint-disable-line import/no-unresolved
 
 test('like', t => {
 	t.like({

test-d/macros.ts

@@ -1,5 +1,5 @@
 import {expectType} from 'tsd';
-import test, {ExecutionContext, Macro} from '..';
+import test, {ExecutionContext, Macro} from '..'; // eslint-disable-line import/no-unresolved
 
 // Explicitly type as a macro.
 {

test-d/plugin.ts

@@ -1,5 +1,5 @@
 import {expectType} from 'tsd';
-import * as plugin from '../plugin';
+import * as plugin from '../plugin'; // eslint-disable-line import/no-unresolved
 
 expectType<plugin.SharedWorker.Plugin.Experimental.Protocol>(plugin.registerSharedWorker({filename: '', supportedProtocols: ['experimental']}));
 

test-d/snapshot.ts

@@ -1,5 +1,5 @@
 import {expectError} from 'tsd';
-import test from '..';
+import test from '..'; // eslint-disable-line import/no-unresolved
 
 test('snapshot', t => {
 	t.snapshot({foo: 'bar'});

test-d/throws.ts

@@ -1,5 +1,5 @@
 import {expectType} from 'tsd';
-import test from '..';
+import test from '..'; // eslint-disable-line import/no-unresolved
 
 class CustomError extends Error {
 	foo: string;

test-d/try-commit.ts

@@ -1,5 +1,5 @@
 import {expectType} from 'tsd';
-import test, {ExecutionContext, Macro} from '..';
+import test, {ExecutionContext, Macro} from '..'; // eslint-disable-line import/no-unresolved
 
 test('attempt', async t => {
 	const attempt = await t.try(

test-tap/api.js

@@ -43,7 +43,7 @@ for (const opt of opts) {
 		});
 		return api.run({files: [path.join(__dirname, 'fixture', 'meta.js')]})
 			.then(runStatus => {
-				t.is(runStatus.stats.passedTests, 3);
+				t.is(runStatus.stats.passedTests, 2);
 			});
 	});
 

test-tap/eslint-plugin-helper.js

@@ -2,7 +2,7 @@
 const path = require('path');
 const {test} = require('tap');
 
-const {load} = require('../eslint-plugin-helper');
+const {load} = require('../entrypoints/eslint-plugin-helper.cjs');
 
 const projectDir = path.join(__dirname, 'fixture/eslint-plugin-helper');
 const overrideDir = path.join(__dirname, 'fixture/eslint-plugin-helper/for-overriding');

test-tap/fixture/_generate-source-map-initial.js

@@ -5,7 +5,7 @@ const babel = require('@babel/core');
 
 const transformed = babel.transform(`
 import {mapFile} from 'source-map-fixtures';
-import test from '../../';
+import test from '../../entrypoints/main.cjs';
 
 const fixture = mapFile('throws').require();
 

test-tap/fixture/caching/test.js

@@ -1,4 +1,4 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('test', t => {
 	t.true(2 + 2 === 4);

test-tap/fixture/cjs.cjs

@@ -1,4 +1,4 @@
-const test = require('../..');
+const test = require('../../entrypoints/main.cjs');
 
 test('pass', t => {
 	t.pass();

test-tap/fixture/enhanced-assertion-formatting.js

@@ -1,4 +1,4 @@
-const test = require('../..');
+const test = require('../../entrypoints/main.cjs');
 
 const foo = 'foo';
 

test-tap/fixture/error-in-anonymous-function.js

@@ -1,4 +1,4 @@
-const test = require('../..');
+const test = require('../../entrypoints/main.cjs');
 
 const getAnonymousFn = () => () => {
 	throw new Error();

test-tap/fixture/es2015.js

@@ -1,4 +1,4 @@
-const test = require('../..');
+const test = require('../../entrypoints/main.cjs');
 
 test('test', t => {
 	t.pass();

test-tap/fixture/extensions/test.foo.bar

@@ -1,4 +1,4 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 const one = {one: 1};
 const two = {two: 2};

test-tap/fixture/fail-fast/crash/crashes.js

@@ -1,3 +1,3 @@
-require('../../../..'); // eslint-disable-line import/no-unassigned-import
+require('../../../../entrypoints/main.cjs'); // eslint-disable-line import/no-unassigned-import
 
 process.exit(1); // eslint-disable-line unicorn/no-process-exit

test-tap/fixture/fail-fast/crash/passes.js

@@ -1,4 +1,4 @@
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 test('first pass', t => {
 	t.pass();

test-tap/fixture/fail-fast/multiple-files/fails.js

@@ -1,4 +1,4 @@
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 test('first pass', t => {
 	t.pass();

test-tap/fixture/fail-fast/multiple-files/passes-slow.js

@@ -1,6 +1,6 @@
 const {parentPort} = require('worker_threads');
 const pEvent = require('p-event');
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 test.serial('first pass', async t => {
 	t.pass();

test-tap/fixture/fail-fast/multiple-files/passes.js

@@ -1,4 +1,4 @@
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 test('first pass', t => {
 	t.pass();

test-tap/fixture/fail-fast/single-file/test.js

@@ -1,4 +1,4 @@
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 test('first pass', t => {
 	t.pass();

test-tap/fixture/fail-fast/timeout/fails.js

@@ -1,5 +1,5 @@
 const delay = require('delay');
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 test('slow pass', async t => {
 	await delay(1000);

test-tap/fixture/fail-fast/timeout/passes.js

@@ -1,4 +1,4 @@
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 test('first pass', t => {
 	t.pass();

test-tap/fixture/fail-fast/without-error/a.js

@@ -1,3 +1,3 @@
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 test('pass', t => t.pass());

test-tap/fixture/fail-fast/without-error/b.js

@@ -1,4 +1,4 @@
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 setTimeout(() => {
 	test.serial('pass', t => t.pass());

test-tap/fixture/formatting-color.js

@@ -1,4 +1,4 @@
-const test = require('../..');
+const test = require('../../entrypoints/main.cjs');
 
 test('test', t => {
 	t.deepEqual({foo: 1}, {foo: 2});

test-tap/fixture/hooks-skipped.js

@@ -1,4 +1,4 @@
-const test = require('../..');
+const test = require('../../entrypoints/main.cjs');
 
 test.before(() => {
 	throw new Error('should not run');

test-tap/fixture/ignored-dirs/helpers/test.js

@@ -1,4 +1,4 @@
-const test = require('../../../..');
+const test = require('../../../../entrypoints/main.cjs');
 
 test('test', t => {
 	t.pass();

test-tap/fixture/ignored-dirs/test.js

@@ -1,3 +1,3 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('pass', t => t.pass());

test-tap/fixture/improper-t-throws/caught-and-leaked-slowly.js

@@ -1,4 +1,4 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('test', t => {
 	try {

test-tap/fixture/improper-t-throws/caught-and-leaked-too-slowly.js

@@ -1,4 +1,4 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('test', t => {
 	try {

test-tap/fixture/improper-t-throws/caught-and-leaked.js

@@ -1,4 +1,4 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('test', t => {
 	try {

test-tap/fixture/improper-t-throws/caught.js

@@ -1,4 +1,4 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('test', t => {
 	try {

test-tap/fixture/improper-t-throws/leaked-from-promise.js

@@ -1,4 +1,4 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('test', t => {
 	try {

test-tap/fixture/improper-t-throws/promise.js

@@ -1,4 +1,4 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('test', t => {
 	return Promise.resolve().then(() => {

test-tap/fixture/improper-t-throws/throws.js

@@ -1,4 +1,4 @@
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('test', t => {
 	t.throws(throwSync());

test-tap/fixture/improper-t-throws/unhandled-rejection.js

@@ -1,5 +1,5 @@
 const delay = require('delay');
-const test = require('../../..');
+const test = require('../../../entrypoints/main.cjs');
 
 test('test', async t => {
 	Promise.resolve().then(() => {