Add native ESM support (#71)

wojtekmaj · web-flow · commit 283975d9c956 · 2023-07-27T16:58:59.000Z
diff --git a/package.json b/package.json
@@ -2,15 +2,21 @@
   "name": "@wojtekmaj/async-array-utils",
   "version": "1.7.0",
   "description": "A collection of array-related async utilities.",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "source": "src/index.ts",
-  "types": "dist/cjs/index.d.ts",
+  "type": "module",
   "sideEffects": false,
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "source": "./src/index.ts",
+  "types": "./dist/cjs/index.d.ts",
+  "exports": {
+    "import": "./dist/esm/index.js",
+    "require": "./dist/cjs/index.js"
+  },
   "scripts": {
-    "build": "yarn build-esm && yarn build-cjs",
+    "build": "yarn build-esm && yarn build-cjs && yarn build-cjs-package",
     "build-esm": "tsc --project tsconfig.build.json --outDir dist/esm --module esnext",
     "build-cjs": "tsc --project tsconfig.build.json --outDir dist/cjs --module commonjs",
+    "build-cjs-package": "echo '{\n  \"type\": \"commonjs\"\n}' > dist/cjs/package.json",
     "clean": "rimraf dist",
     "lint": "eslint .",
     "postinstall": "husky install",
diff --git a/src/every.spec.ts b/src/every.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncEvery from './every';
+import asyncEvery from './every.js';
 
 import {
   getTimer,
@@ -8,7 +8,7 @@ import {
   largerThanOneHundredInRandomTime,
   makeDelayed,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 function largerOrEqualThanZero(x: number) {
   return x >= 0;
diff --git a/src/every.ts b/src/every.ts
@@ -1,4 +1,4 @@
-import asyncForEach from './forEach';
+import asyncForEach from './forEach.js';
 
 function asyncEvery<T>(
   arr: T[],
diff --git a/src/every_strict.spec.ts b/src/every_strict.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncEveryStrict from './every_strict';
+import asyncEveryStrict from './every_strict.js';
 
 import {
   doubleInputArr,
@@ -11,7 +11,7 @@ import {
   makePushDuplicate,
   makePushDuplicateInRandomTime,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 function largerOrEqualThanZero(x: number) {
   return x >= 0;
diff --git a/src/every_strict.ts b/src/every_strict.ts
@@ -1,4 +1,4 @@
-import asyncForEachStrict from './forEach_strict';
+import asyncForEachStrict from './forEach_strict.js';
 
 function asyncEveryStrict<T>(
   arr: T[],
diff --git a/src/filter.spec.ts b/src/filter.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncFilter from './filter';
+import asyncFilter from './filter.js';
 
 import {
   getTimer,
@@ -8,7 +8,7 @@ import {
   largerThanTwoInRandomTime,
   makeDelayed,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 describe('asyncFilter()', () => {
   it('example from README works as described', async () => {
diff --git a/src/filter.ts b/src/filter.ts
@@ -1,4 +1,4 @@
-import asyncForEach from './forEach';
+import asyncForEach from './forEach.js';
 
 function asyncFilter<T>(
   arr: T[],
diff --git a/src/filter_strict.spec.ts b/src/filter_strict.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncFilterStrict from './filter_strict';
+import asyncFilterStrict from './filter_strict.js';
 
 import {
   doubleInputArr,
@@ -11,7 +11,7 @@ import {
   makePushDuplicate,
   makePushDuplicateInRandomTime,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 describe('asyncFilterStrict()', () => {
   it('example from README works as described', async () => {
diff --git a/src/filter_strict.ts b/src/filter_strict.ts
@@ -1,4 +1,4 @@
-import asyncForEachStrict from './forEach_strict';
+import asyncForEachStrict from './forEach_strict.js';
 
 function asyncFilterStrict<T>(
   arr: T[],
diff --git a/src/find.spec.ts b/src/find.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncFind from './find';
+import asyncFind from './find.js';
 
 import {
   getTimer,
@@ -10,7 +10,7 @@ import {
   largerThanTwoInRandomTime,
   makeDelayed,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 const firstElementLargerThanTwo = inputArr.findIndex(largerThanTwo);
 
diff --git a/src/find.ts b/src/find.ts
@@ -1,4 +1,4 @@
-import asyncForEachStrict from './forEach_strict';
+import asyncForEachStrict from './forEach_strict.js';
 
 function asyncFind<T>(
   arr: T[],
diff --git a/src/findIndex.spec.ts b/src/findIndex.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncFindIndex from './findIndex';
+import asyncFindIndex from './findIndex.js';
 
 import {
   getTimer,
@@ -10,7 +10,7 @@ import {
   largerThanTwoInRandomTime,
   makeDelayed,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 const firstElementLargerThanTwo = inputArr.findIndex(largerThanTwo);
 
diff --git a/src/findIndex.ts b/src/findIndex.ts
@@ -1,4 +1,4 @@
-import asyncForEachStrict from './forEach_strict';
+import asyncForEachStrict from './forEach_strict.js';
 
 function asyncFindIndex<T>(
   arr: T[],
diff --git a/src/forEach.spec.ts b/src/forEach.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncForEach from './forEach';
+import asyncForEach from './forEach.js';
 
 import {
   getTimer,
@@ -8,7 +8,7 @@ import {
   makePushDuplicate,
   makePushDuplicateInRandomTime,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 describe('asyncForEach()', () => {
   it('example from README works as described', async () => {
diff --git a/src/forEach.ts b/src/forEach.ts
@@ -1,4 +1,4 @@
-import asyncMap from './map';
+import asyncMap from './map.js';
 
 export default function asyncForEach<T, U>(
   arr: T[],
diff --git a/src/forEach_strict.spec.ts b/src/forEach_strict.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncForEachStrict from './forEach_strict';
+import asyncForEachStrict from './forEach_strict.js';
 import {
   doubleInputArr,
   getTimer,
@@ -8,7 +8,7 @@ import {
   makePushDuplicate,
   makePushDuplicateInRandomTime,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 describe('asyncForEachStrict()', () => {
   it('example from README works as described', async () => {
diff --git a/src/forEach_strict.ts b/src/forEach_strict.ts
@@ -1,4 +1,4 @@
-import asyncMapStrict from './map_strict';
+import asyncMapStrict from './map_strict.js';
 
 export default function asyncForEachStrict<T, U>(
   arr: T[],
diff --git a/src/index.spec.ts b/src/index.spec.ts
@@ -13,7 +13,7 @@ import {
   asyncReduce,
   asyncSome,
   asyncSomeStrict,
-} from './index';
+} from './index.js';
 
 describe('index', () => {
   it('has asyncFilter exported properly', () => {
diff --git a/src/index.ts b/src/index.ts
@@ -1,16 +1,16 @@
-import asyncFilter from './filter';
-import asyncFilterStrict from './filter_strict';
-import asyncFind from './find';
-import asyncFindIndex from './findIndex';
-import asyncForEach from './forEach';
-import asyncForEachStrict from './forEach_strict';
-import asyncEvery from './every';
-import asyncEveryStrict from './every_strict';
-import asyncMap from './map';
-import asyncMapStrict from './map_strict';
-import asyncReduce from './reduce';
-import asyncSome from './some';
-import asyncSomeStrict from './some_strict';
+import asyncFilter from './filter.js';
+import asyncFilterStrict from './filter_strict.js';
+import asyncFind from './find.js';
+import asyncFindIndex from './findIndex.js';
+import asyncForEach from './forEach.js';
+import asyncForEachStrict from './forEach_strict.js';
+import asyncEvery from './every.js';
+import asyncEveryStrict from './every_strict.js';
+import asyncMap from './map.js';
+import asyncMapStrict from './map_strict.js';
+import asyncReduce from './reduce.js';
+import asyncSome from './some.js';
+import asyncSomeStrict from './some_strict.js';
 
 export {
   asyncFilter,
diff --git a/src/map.spec.ts b/src/map.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncMap from './map';
+import asyncMap from './map.js';
 
 import {
   doubleInputArr,
@@ -9,7 +9,7 @@ import {
   inputArr,
   makeDelayed,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 describe('asyncMap()', () => {
   it('example from README works as described', async () => {
diff --git a/src/map_strict.spec.ts b/src/map_strict.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncMapStrict from './map_strict';
+import asyncMapStrict from './map_strict.js';
 
 import {
   doubleInputArr,
@@ -11,7 +11,7 @@ import {
   makePushDuplicate,
   makePushDuplicateInRandomTime,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 describe('asyncMapStrict()', () => {
   it('example from README works as described', async () => {
diff --git a/src/reduce.spec.ts b/src/reduce.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncReduce from './reduce';
+import asyncReduce from './reduce.js';
 
-import { getTimer, makeDelayed, throws } from '../test-utils';
+import { getTimer, makeDelayed, throws } from '../test-utils.js';
 
 describe('asyncReduce()', () => {
   it('example from README works as described', async () => {
diff --git a/src/reduce.ts b/src/reduce.ts
@@ -1,4 +1,4 @@
-import asyncForEachStrict from './forEach_strict';
+import asyncForEachStrict from './forEach_strict.js';
 
 function asyncReduce<T>(
   arr: T[],
diff --git a/src/some.spec.ts b/src/some.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncSome from './some';
+import asyncSome from './some.js';
 
 import {
   inputArr,
@@ -10,7 +10,7 @@ import {
   getTimer,
   makeDelayed,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 const firstElementLargerThanTwo = inputArr.findIndex(largerThanTwo);
 
diff --git a/src/some.ts b/src/some.ts
@@ -1,4 +1,4 @@
-import asyncForEach from './forEach';
+import asyncForEach from './forEach.js';
 
 function asyncSome<T>(
   arr: T[],
diff --git a/src/some_strict.spec.ts b/src/some_strict.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import asyncSomeStrict from './some_strict';
+import asyncSomeStrict from './some_strict.js';
 
 import {
   doubleInputArr,
@@ -13,7 +13,7 @@ import {
   makeDelayed,
   getTimer,
   throws,
-} from '../test-utils';
+} from '../test-utils.js';
 
 const firstElementLargerThanTwo = inputArr.findIndex(largerThanTwo);
 
diff --git a/src/some_strict.ts b/src/some_strict.ts
@@ -1,4 +1,4 @@
-import asyncForEachStrict from './forEach_strict';
+import asyncForEachStrict from './forEach_strict.js';
 
 function asyncSomeStrict<T>(
   arr: T[],

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import asyncForEach from './forEach';`
	`1`	`+import asyncForEach from './forEach.js';`
`2`	`2`
`3`	`3`	`function asyncEvery<T>(`
`4`	`4`	`arr: T[],`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import asyncForEachStrict from './forEach_strict';`
	`1`	`+import asyncForEachStrict from './forEach_strict.js';`
`2`	`2`
`3`	`3`	`function asyncEveryStrict<T>(`
`4`	`4`	`arr: T[],`