Update token-swap js build

token-swap/js/.eslintignore

@@ -1 +1 @@
-/dist
+/lib

token-swap/js/.gitignore

@@ -1,2 +1,2 @@
 test-ledger/
-dist/
+lib/

token-swap/js/package.json

@@ -3,6 +3,7 @@
   "version": "0.4.0",
   "description": "SPL Token Swap JavaScript API",
   "license": "MIT",
+  "type": "module",
   "author": "Solana Labs Maintainers <[email protected]>",
   "homepage": "https://solana.com/",
   "repository": {
@@ -15,23 +16,23 @@
   "publishConfig": {
     "access": "public"
   },
-  "main": "dist/cjs/index.js",
-  "types": "dist/types/index.d.ts",
-  "module": "dist/esm/index.js",
+  "main": "lib/cjs/index.js",
+  "types": "lib/types/index.d.ts",
+  "module": "lib/esm/index.js",
   "sideEffects": false,
   "exports": {
-    "types": "./dist/types/index.d.ts",
-    "import": "./dist/esm/index.js",
-    "require": "./dist/cjs/index.js"
+    "types": "./lib/types/index.d.ts",
+    "import": "./lib/esm/index.js",
+    "require": "./lib/cjs/index.js"
   },
   "files": [
-    "dist",
+    "lib",
     "src",
     "README.md"
   ],
   "scripts": {
-    "build": "tsc -p tsconfig.json && tsc-esm -p tsconfig.json && tsc -p tsconfig.cjs.json",
-    "postbuild": "echo '{\"type\":\"commonjs\"}' > dist/cjs/package.json && echo '{\"type\":\"module\"}' > dist/esm/package.json",
+    "build": "tsc --build --verbose tsconfig.all.json",
+    "postbuild": "echo '{\"type\":\"commonjs\"}' > lib/cjs/package.json && echo '{\"type\":\"module\"}' > lib/esm/package.json",
     "test": "mocha test",
     "start-with-test-validator": "start-server-and-test 'solana-test-validator --bpf-program SwapsVeCiPHMUAtzQWZw7RjsKjgCjhwU55QGu4U1Szw ../../target/deploy/spl_token_swap.so --reset --quiet' http://127.0.0.1:8899/health test",
     "lint": "npm run pretty && eslint --max-warnings 0 .",
@@ -43,11 +44,14 @@
   "keywords": [],
   "dependencies": {
     "@solana/buffer-layout": "^4.0.0",
-    "@solana/buffer-layout-utils": "^0.2.0",
+    "@solana/buffer-layout-utils": "^0.2.0"
+  },
+  "peerDependencies": {
     "@solana/web3.js": "^1.42.0"
   },
   "devDependencies": {
     "@solana/spl-token": "workspace:*",
+    "@solana/web3.js": "^1.42.0",
     "@types/bn.js": "^5.1.0",
     "@types/chai-as-promised": "^7.1.4",
     "@types/chai": "^4.3.3",
@@ -60,7 +64,6 @@
     "prettier": "^3.0.0",
     "start-server-and-test": "^2.0.0",
     "ts-node": "^10.0.0",
-    "typescript": "^5.0.4",
-    "typescript-esm": "^2.0.0"
+    "typescript": "^5.0.4"
   }
 }

token-swap/js/tsconfig.all.json

@@ -0,0 +1,11 @@
+{
+    "extends": "./tsconfig.root.json",
+    "references": [
+        {
+            "path": "./tsconfig.cjs.json"
+        },
+        {
+            "path": "./tsconfig.esm.json"
+        }
+    ]
+}

token-swap/js/tsconfig.base.json

@@ -0,0 +1,14 @@
+{
+    "include": [],
+    "compilerOptions": {
+        "target": "ESNext",
+        "module": "ESNext",
+        "moduleResolution": "Node",
+        "esModuleInterop": true,
+        "isolatedModules": true,
+        "noEmitOnError": true,
+        "resolveJsonModule": true,
+        "strict": true,
+        "stripInternal": true
+    }
+}

token-swap/js/tsconfig.cjs.json

@@ -1,10 +1,10 @@
 {
-    "extends": "./tsconfig.json",
+    "extends": "./tsconfig.base.json",
+    "include": ["src"],
     "compilerOptions": {
-        "target": "es6",
-        "module": "commonjs",
-        "outDir": "dist/cjs",
-        "declarationDir": null,
-        "declaration": false
+        "outDir": "lib/cjs",
+        "target": "ES2016",
+        "module": "CommonJS",
+        "sourceMap": true
     }
 }

token-swap/js/tsconfig.esm.json

@@ -0,0 +1,13 @@
+{
+    "extends": "./tsconfig.base.json",
+    "include": ["src"],
+    "compilerOptions": {
+        "outDir": "lib/esm",
+        "declarationDir": "lib/types",
+        "target": "ES2020",
+        "module": "ES2020",
+        "sourceMap": true,
+        "declaration": true,
+        "declarationMap": true
+    }
+}