feat!: move to ESM

.gitignore

@@ -1,5 +1,4 @@
 node_modules
 lib
-es
 yarn-error.log
 .idea

package.json

@@ -14,20 +14,17 @@
   ],
   "repository": "deeplay-io/abort-controller-x",
   "sideEffects": false,
-  "main": "lib/index.js",
-  "module": "es/index.js",
-  "typings": "lib/index.d.ts",
+  "type": "module",
+  "exports": "./lib/index.js",
+  "typings": "./lib/index.d.ts",
   "files": [
     "src",
-    "lib",
-    "es"
+    "lib"
   ],
   "scripts": {
-    "clean": "rimraf lib es",
+    "clean": "rimraf lib",
     "test": "jest",
-    "build:lib": "tsc -P tsconfig.build.json",
-    "build:es": "tsc -P tsconfig.es.json",
-    "build": "npm run build:lib && npm run build:es",
+    "build": "tsc -P tsconfig.build.json",
     "prepublishOnly": "npm test && npm run clean && npm run build"
   },
   "author": "Daniel Lytkin <aikoven@deeplay.io>",

src/AbortError.test.ts

@@ -4,7 +4,7 @@ import {
   isAbortError,
   rethrowAbortError,
   throwIfAborted,
-} from './AbortError';
+} from './AbortError.js';
 
 test('isAbortError', () => {
   expect(isAbortError({})).toBe(false);

src/abortable.test.ts

@@ -1,5 +1,5 @@
-import {abortable} from './abortable';
-import {nextTick} from './utils/nextTick';
+import {abortable} from './abortable.js';
+import {nextTick} from './utils/nextTick.js';
 
 test('abortable endless promise', async () => {
   const abortController = new AbortController();

src/abortable.ts

@@ -1,4 +1,4 @@
-import {execute} from './execute';
+import {execute} from './execute.js';
 
 /**
  * Wrap a promise to reject with `AbortError` once `signal` is aborted.

src/all.test.ts

@@ -1,7 +1,7 @@
 import defer = require('defer-promise');
-import {AbortError} from './AbortError';
-import {all} from './all';
-import {nextTick} from './utils/nextTick';
+import {AbortError} from './AbortError.js';
+import {all} from './all.js';
+import {nextTick} from './utils/nextTick.js';
 
 test('external abort', async () => {
   const abortController = new AbortController();

src/all.ts

@@ -1,4 +1,4 @@
-import {AbortError, isAbortError} from './AbortError';
+import {AbortError, isAbortError} from './AbortError.js';
 
 /**
  * Abortable version of `Promise.all`.

src/delay.ts

@@ -1,4 +1,4 @@
-import {execute} from './execute';
+import {execute} from './execute.js';
 
 /**
  * Returns a promise that fulfills after delay and rejects with

src/execute.test.ts

@@ -1,6 +1,6 @@
 import defer = require('defer-promise');
-import {execute} from './execute';
-import {nextTick} from './utils/nextTick';
+import {execute} from './execute.js';
+import {nextTick} from './utils/nextTick.js';
 
 test('resolve immediately', async () => {
   const abortController = new AbortController();

src/execute.ts

@@ -1,4 +1,4 @@
-import {AbortError} from './AbortError';
+import {AbortError} from './AbortError.js';
 
 /**
  * Similar to `new Promise(executor)`, but allows executor to return abort

src/forever.test.ts

@@ -1,5 +1,5 @@
-import {forever} from './forever';
-import {nextTick} from './utils/nextTick';
+import {forever} from './forever.js';
+import {nextTick} from './utils/nextTick.js';
 
 test('forever', async () => {
   const abortController = new AbortController();

src/forever.ts

@@ -1,4 +1,4 @@
-import {execute} from './execute';
+import {execute} from './execute.js';
 
 /**
  * Return a promise that never fulfills and only rejects with `AbortError` once

src/index.ts

@@ -1,11 +1,11 @@
-export * from './abortable';
-export * from './AbortError';
-export * from './delay';
-export * from './execute';
-export * from './forever';
-export * from './waitForEvent';
-export * from './all';
-export * from './race';
-export * from './retry';
-export * from './spawn';
-export * from './run';
+export * from './abortable.js';
+export * from './AbortError.js';
+export * from './delay.js';
+export * from './execute.js';
+export * from './forever.js';
+export * from './waitForEvent.js';
+export * from './all.js';
+export * from './race.js';
+export * from './retry.js';
+export * from './spawn.js';
+export * from './run.js';

src/race.test.ts

@@ -1,7 +1,7 @@
 import defer = require('defer-promise');
-import {AbortError} from './AbortError';
-import {race} from './race';
-import {nextTick} from './utils/nextTick';
+import {AbortError} from './AbortError.js';
+import {race} from './race.js';
+import {nextTick} from './utils/nextTick.js';
 
 test('external abort', async () => {
   const abortController = new AbortController();

src/race.ts

@@ -1,4 +1,4 @@
-import {AbortError, isAbortError} from './AbortError';
+import {AbortError, isAbortError} from './AbortError.js';
 
 /**
  * Abortable version of `Promise.race`.

src/retry.ts

@@ -1,5 +1,5 @@
-import {delay} from './delay';
-import {rethrowAbortError} from './AbortError';
+import {delay} from './delay.js';
+import {rethrowAbortError} from './AbortError.js';
 
 export type RetryOptions = {
   /**

src/run.ts

@@ -1,4 +1,4 @@
-import {catchAbortError} from './AbortError';
+import {catchAbortError} from './AbortError.js';
 
 /**
  * Invokes an abortable function with implicitly created `AbortSignal`.

src/spawn.test.ts

@@ -1,6 +1,6 @@
-import {spawn} from './spawn';
-import {forever} from './forever';
-import {delay} from './delay';
+import {spawn} from './spawn.js';
+import {forever} from './forever.js';
+import {delay} from './delay.js';
 
 test('fork manual abort', async () => {
   const abortController = new AbortController();

src/spawn.ts

@@ -1,4 +1,4 @@
-import {AbortError, catchAbortError, isAbortError} from './AbortError';
+import {AbortError, catchAbortError, isAbortError} from './AbortError.js';
 
 export type SpawnEffects = {
   /**

src/waitForEvent.test.ts

@@ -1,5 +1,5 @@
-import {nextTick} from './utils/nextTick';
-import {waitForEvent} from './waitForEvent';
+import {nextTick} from './utils/nextTick.js';
+import {waitForEvent} from './waitForEvent.js';
 
 test('external abort', async () => {
   const abortController = new AbortController();

src/waitForEvent.ts

@@ -1,4 +1,4 @@
-import {execute} from './execute';
+import {execute} from './execute.js';
 
 export type EventTargetLike<T> =
   | EventTargetLike.HasEventTargetAddRemove<T>

tsconfig.json

@@ -2,15 +2,14 @@
   "compilerOptions": {
     "target": "es2020",
     "lib": ["es2020", "dom"],
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "outDir": "lib",
     "sourceMap": true,
     "declaration": true,
     "strict": true,
     "noImplicitReturns": true,
     "noUnusedLocals": true
   },
-  "files": ["src/index.ts"],
-  "include": ["src/**/*.test.ts"]
+  "include": ["src"]
 }