Use ts-bridge for building

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.cts`.
+gen_enforced_field(WorkspaceCwd, 'types', './dist/index.d.cts').
 
-% 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').
+% The entrypoint for the package must be `./dist/index.cjs`.
+gen_enforced_field(WorkspaceCwd, 'main', './dist/index.cjs').
+gen_enforced_field(WorkspaceCwd, 'exports["."].require.types', './dist/index.d.cts').
+gen_enforced_field(WorkspaceCwd, 'exports["."].require.default', './dist/index.cjs').
 
 % The module entrypoint for the package must be `./dist/index.mjs`.
 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,22 +14,26 @@
   "author": "kumavis",
   "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.cts",
+        "default": "./dist/index.cjs"
+      }
     },
     "./package.json": "./package.json"
   },
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
-  "types": "./dist/types/index.d.ts",
+  "types": "./dist/index.d.cts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup && yarn build:types",
+    "build": "ts-bridge --project tsconfig.build.json --clean",
     "build:docs": "typedoc",
-    "build:types": "tsc --project tsconfig.build.json",
     "generate-vectors": "ts-node scripts/generate-vectors.ts > ./test/vectors/derivation.json",
     "lint": "yarn lint:eslint && yarn lint:constraints && yarn lint:misc --check && yarn lint:dependencies --check && yarn lint:changelog",
     "lint:changelog": "auto-changelog validate",
@@ -57,6 +61,7 @@
     "@metamask/eslint-config-jest": "^12.0.0",
     "@metamask/eslint-config-nodejs": "^12.0.0",
     "@metamask/eslint-config-typescript": "^12.0.0",
+    "@ts-bridge/cli": "^0.1.4",
     "@types/jest": "^28.1.6",
     "@types/node": "^16.18.38",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
@@ -76,7 +81,6 @@
     "prettier-plugin-packagejson": "^2.3.0",
     "ts-jest": "^28.0.7",
     "ts-node": "^10.9.1",
-    "tsup": "^7.2.0",
     "typedoc": "^0.23.19",
     "typescript": "~4.8.4"
   },
@@ -90,8 +94,7 @@
   },
   "lavamoat": {
     "allowScripts": {
-      "@lavamoat/preinstall-always-fail": false,
-      "tsup>esbuild": true
+      "@lavamoat/preinstall-always-fail": false
     }
   }
 }

tsconfig.build.json

@@ -6,7 +6,7 @@
     "emitDeclarationOnly": true,
     "inlineSources": true,
     "noEmit": false,
-    "outDir": "dist/types",
+    "outDir": "dist",
     "rootDir": "src",
     "sourceMap": true
   },