kyle-johnson · kyle-johnson · Nov 7, 2022 · Nov 7, 2022 · Nov 7, 2022 · Nov 7, 2022
diff --git a/.changeset/gold-papayas-collect.md b/.changeset/gold-papayas-collect.md
@@ -0,0 +1,6 @@
+---
+"abortcontroller-chain": major
+"abortcontroller-deadline": major
+---
+
+Add ESM support. CommonJS support is retained, but this is treated as a BREAKING CHANGE since `"main"` is replaced with `"exports"` in `package.json`.
diff --git a/.gitignore b/.gitignore
@@ -230,3 +230,6 @@ tags
 Network Trash Folder
 Temporary Items
 .apdisk
+
+
+dist-esm/
diff --git a/packages/chain/.eslintignore b/packages/chain/.eslintignore
@@ -1,5 +1,6 @@
 node_modules
 dist
+dist-esm
 .eslintrc.js
 coverage
 src/global.d.ts
diff --git a/packages/chain/.prettierignore b/packages/chain/.prettierignore
@@ -1,3 +1,4 @@
 dist/
+dist-esm/
 coverage/
 CHANGELOG.md
diff --git a/packages/chain/package.json b/packages/chain/package.json
@@ -16,28 +16,37 @@
     "type": "git",
     "url": "https://github.com/kyle-johnson/abortcontroller-utils.git"
   },
-  "main": "dist/index.js",
+  "exports": {
+    "import": "./dist-esm/index.mjs",
+    "require": "./dist/index.js"
+  },
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "dist-esm"
   ],
   "scripts": {
-    "type-check": "tsc --noEmit",
-    "lint": "eslint .",
-    "test": "jest",
-    "test:web": "jest --env=jsdom",
-    "test:ci": "jest --coverage --ci",
-    "build": "rm -rf dist && tsc -p tsconfig.dist.json",
-    "format": "prettier --write .",
-    "format:check": "prettier --check ."
+    "type-check": "scripty",
+    "lint": "scripty",
+    "test": "scripty",
+    "test:web": "scripty",
+    "test:ci": "scripty",
+    "build:esm": "scripty",
+    "build:cjs": "scripty",
+    "build": "SCRIPTY_PARALLEL=true scripty",
+    "format": "scripty",
+    "format:check": "scripty"
+  },
+  "config": {
+    "scripty": {
+      "logLevel": "warn",
+      "path": "../../scripts"
+    }
   },
   "jest": {
     "coverageDirectory": "coverage",
     "testEnvironment": "node",
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {}
-    }
+    "preset": "ts-jest"
   },
   "devDependencies": {
     "@tsconfig/node14": "1.0.3",
@@ -52,6 +61,7 @@
     "jest": "29.2.2",
     "jest-environment-jsdom": "29.2.2",
     "prettier": "2.7.1",
+    "scripty": "2.1.1",
     "ts-jest": "29.0.3",
     "typescript": "4.8.4"
   }

diff --git a/packages/chain/tsconfig.dist-esm.json b/packages/chain/tsconfig.dist-esm.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.dist.json",
+
+  "compilerOptions": {
+    "outDir": "dist-esm",
+    "module": "es2022",
+    "sourceMap": false,
+    "inlineSourceMap": true,
+    "declaration": false,
+    "declarationMap": false
+  }
+}
diff --git a/packages/deadline/.eslintignore b/packages/deadline/.eslintignore
@@ -1,5 +1,6 @@
 node_modules
 dist
+dist-esm
 .eslintrc.js
 coverage
 src/global.d.ts
diff --git a/packages/deadline/.prettierignore b/packages/deadline/.prettierignore
@@ -1,3 +1,4 @@
 dist/
+dist-esm/
 coverage/
 CHANGELOG.md
diff --git a/packages/deadline/package.json b/packages/deadline/package.json
@@ -18,28 +18,37 @@
     "type": "git",
     "url": "https://github.com/kyle-johnson/abortcontroller-utils.git"
   },
-  "main": "dist/index.js",
+  "exports": {
+    "require": "./dist/index.js",
+    "import": "./dist-esm/index.mjs"
+  },
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "dist-esm"
   ],
   "scripts": {
-    "type-check": "tsc --noEmit",
-    "lint": "eslint .",
-    "test": "jest",
-    "test:web": "jest --env=jsdom",
-    "test:ci": "jest --coverage --ci",
-    "build": "rm -rf dist && tsc -p tsconfig.dist.json",
-    "format": "prettier --write .",
-    "format:check": "prettier --check ."
+    "type-check": "scripty",
+    "lint": "scripty",
+    "test": "scripty",
+    "test:web": "scripty",
+    "test:ci": "scripty",
+    "build:esm": "scripty",
+    "build:cjs": "scripty",
+    "build": "SCRIPTY_PARALLEL=true scripty",
+    "format": "scripty",
+    "format:check": "scripty"
+  },
+  "config": {
+    "scripty": {
+      "logLevel": "warn",
+      "path": "../../scripts"
+    }
   },
   "jest": {
     "coverageDirectory": "coverage",
     "testEnvironment": "node",
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {}
-    }
+    "preset": "ts-jest"
   },
   "dependencies": {
     "abortcontroller-chain": "workspace:^1.0.2"
@@ -57,6 +66,7 @@
     "jest": "29.2.2",
     "jest-environment-jsdom": "29.2.2",
     "prettier": "2.7.1",
+    "scripty": "2.1.1",
     "ts-jest": "29.0.3",
     "typescript": "4.8.4"
   }

diff --git a/packages/deadline/tsconfig.dist-esm.json b/packages/deadline/tsconfig.dist-esm.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.dist.json",
+
+  "compilerOptions": {
+    "outDir": "dist-esm",
+    "module": "es2022",
+    "sourceMap": false,
+    "inlineSourceMap": true,
+    "declaration": false,
+    "declarationMap": false
+  }
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/build/cjs b/scripts/build/cjs
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rm -rf dist && tsc -p tsconfig.dist.json
diff --git a/scripts/build/esm b/scripts/build/esm
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+rm -rf dist-esm && \
+  tsc -p tsconfig.dist-esm.json && \
+  find dist-esm -name '*.js' -exec sh -c 'mv "$0" "${0%.js}.mjs"' {} \;
diff --git a/scripts/format/check b/scripts/format/check
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+prettier --check .
diff --git a/scripts/format/index b/scripts/format/index
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+prettier --write .
diff --git a/scripts/lint b/scripts/lint
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+eslint .
diff --git a/scripts/test/ci b/scripts/test/ci
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+jest --coverage --ci
diff --git a/scripts/test/index b/scripts/test/index
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+jest
diff --git a/scripts/test/web b/scripts/test/web
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+jest --env=jsdom
diff --git a/scripts/type-check b/scripts/type-check
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+tsc --noEmit
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/sh

		rm -rf dist && tsc -p tsconfig.dist.json