Output types for ESM and CJS separately

.github/workflows/build-lint-test.yml

@@ -62,6 +62,7 @@ jobs:
           cache: 'yarn'
       - run: yarn --immutable --immutable-cache
       - run: yarn lint
+      - run: yarn lint:types
       - name: Validate RC changelog
         if: ${{ startsWith(github.head_ref, 'release/') }}
         run: yarn auto-changelog validate --rc

constraints.pro

@@ -65,17 +65,18 @@ gen_enforced_field(WorkspaceCwd, 'repository.url', 'https://github.com/MetaMask/
 % The license for the package must be specified.
 gen_enforced_field(WorkspaceCwd, 'license').
 
-% The type definitions entrypoint the package must be `./dist/types/index.d.ts`.
-gen_enforced_field(WorkspaceCwd, 'types', './dist/types/index.d.ts').
-gen_enforced_field(WorkspaceCwd, 'exports["."].types', './dist/types/index.d.ts').
+% The type definitions entrypoint the package must be `./dist/index.d.ts`.
+gen_enforced_field(WorkspaceCwd, 'types', './dist/index.d.ts').
 
 % The entrypoint for the package must be `./dist/index.js`.
 gen_enforced_field(WorkspaceCwd, 'main', './dist/index.js').
-gen_enforced_field(WorkspaceCwd, 'exports["."].require', './dist/index.js').
+gen_enforced_field(WorkspaceCwd, 'exports["."].require.types', './dist/index.d.ts').
+gen_enforced_field(WorkspaceCwd, 'exports["."].require.default', './dist/index.js').
 
-% The module entrypoint for the package must be `./dist/esm/index.js`.
+% The module entrypoint for the package must be `./dist/index.js`.
 gen_enforced_field(WorkspaceCwd, 'module', './dist/index.mjs').
-gen_enforced_field(WorkspaceCwd, 'exports["."].import', './dist/index.mjs').
+gen_enforced_field(WorkspaceCwd, 'exports["."].import.types', './dist/index.d.mts').
+gen_enforced_field(WorkspaceCwd, 'exports["."].import.default', './dist/index.mjs').
 
 gen_enforced_field(WorkspaceCwd, 'exports["./package.json"]', './package.json').
 

package.json

@@ -14,34 +14,44 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "types": "./dist/types/index.d.ts"
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     },
     "./node": {
-      "import": "./dist/node.mjs",
-      "require": "./dist/node.js",
-      "types": "./dist/types/node.d.ts"
+      "import": {
+        "types": "./dist/node.d.mts",
+        "default": "./dist/node.mjs"
+      },
+      "require": {
+        "types": "./dist/node.d.ts",
+        "default": "./dist/node.js"
+      }
     },
     "./package.json": "./package.json"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
-  "types": "./dist/types/index.d.ts",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup && yarn build:types",
+    "build": "tsup --clean",
     "build:docs": "typedoc",
-    "build:types": "tsc --project tsconfig.build.json",
     "lint": "yarn lint:eslint && yarn lint:constraints && yarn lint:misc --check && yarn lint:dependencies --check && yarn lint:changelog",
     "lint:changelog": "auto-changelog validate",
     "lint:constraints": "yarn constraints",
     "lint:dependencies": "depcheck && yarn dedupe",
     "lint:eslint": "eslint . --cache --ext js,ts",
     "lint:fix": "yarn lint:eslint --fix && yarn lint:constraints --fix && yarn lint:misc --write && yarn lint:dependencies && yarn lint:changelog",
     "lint:misc": "prettier '**/*.json' '**/*.md' '!CHANGELOG.md' '**/*.yml' '!.yarnrc.yml' --ignore-path .gitignore --no-error-on-unmatched-pattern",
+    "lint:types": "yarn pack && attw package.tgz",
     "prepack": "./scripts/prepack.sh",
     "test": "yarn test:source && yarn test:types",
     "test:source": "jest && jest-it-up",
@@ -62,6 +72,7 @@
     "superstruct": "^1.0.3"
   },
   "devDependencies": {
+    "@arethetypeswrong/cli": "^0.15.0",
     "@lavamoat/allow-scripts": "^2.3.1",
     "@lavamoat/preinstall-always-fail": "^1.0.0",
     "@metamask/auto-changelog": "^3.1.0",

scripts/prepack.sh

@@ -8,4 +8,4 @@ if [[ -n $SKIP_PREPACK ]]; then
   exit 0
 fi
 
-yarn build:clean
+yarn build

tsup.config.ts

@@ -30,6 +30,8 @@ export default defineConfig({
   // https://tsup.egoist.dev/#inject-cjs-and-esm-shims
   shims: true,
 
+  dts: true,
+
   // Hide unnecessary logs from the console. Warnings and errors will still be
   // shown.
   silent: true,