From 52162ede89ead8a7be954778d81ed4ddc2bb4768 Mon Sep 17 00:00:00 2001
From: DR497 <47689875+dr497@users.noreply.github.com>
Date: Tue, 6 Aug 2024 12:17:31 +0800
Subject: [PATCH] js: fix cjs build

---
 js/package.json      | 14 +++++++-------
 js/rollup.config.mjs | 21 ++++++++++++++++++---
 js/tsconfig.json     |  4 +++-
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/js/package.json b/js/package.json
index e5a2eaf..ee91cb2 100644
--- a/js/package.json
+++ b/js/package.json
@@ -6,14 +6,14 @@
     "dist"
   ],
   "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/types/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/esm/index.mjs",
+      "require": "./dist/cjs/index.cjs",
+      "types": "./dist/types/index.d.ts"
     }
   },
   "repository": {
@@ -23,7 +23,7 @@
   "homepage": "https://sns.guide",
   "scripts": {
     "dev": "tsc && node --trace-warnings dist/test.js",
-    "build": "rm -rf dist && rollup -c",
+    "build": "rm -rf dist && rollup -c && tsc --emitDeclarationOnly --outDir dist/types",
     "prepublish": "rm -rf dist && rollup -c",
     "prepack": "rm -rf dist && rollup -c",
     "lint": "yarn pretty && eslint .",
diff --git a/js/rollup.config.mjs b/js/rollup.config.mjs
index 79561bf..11a04d7 100644
--- a/js/rollup.config.mjs
+++ b/js/rollup.config.mjs
@@ -25,13 +25,23 @@ export default {
   ],
   output: [
     {
-      dir: "dist/",
+      dir: "dist/esm",
       format: "esm",
       sourcemap: true,
       entryFileNames: "[name].mjs",
       exports: "named",
+      preserveModules: true,
+      preserveModulesRoot: "src",
+    },
+    {
+      dir: "dist/cjs",
+      format: "cjs",
+      sourcemap: true,
+      entryFileNames: "[name].cjs",
+      exports: "named",
+      preserveModules: true,
+      preserveModulesRoot: "src",
     },
-    { dir: "dist/", format: "cjs", sourcemap: true },
   ],
   external: ["@solana/web3.js"],
   plugins: [
@@ -42,7 +52,12 @@ export default {
       dedupe: ["borsh", "@solana/spl-token", "bn.js", "buffer"],
     }),
     commonjs(),
-    typescript(),
+    typescript({
+      tsconfig: "./tsconfig.json",
+      declaration: false,
+      outDir: null,
+      declarationDir: null,
+    }),
     babel({ babelHelpers: "bundled" }),
     json(),
     replace({
diff --git a/js/tsconfig.json b/js/tsconfig.json
index f42a8e7..4283516 100644
--- a/js/tsconfig.json
+++ b/js/tsconfig.json
@@ -14,9 +14,11 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "target": "es2019",
-    "outDir": "dist",
+    "outDir": "./dist",
     "rootDir": "./src",
     "declaration": true,
+    "declarationDir": "dist/types",
+    "emitDeclarationOnly": true,
     "noImplicitAny": false,
     "moduleResolution": "node",
     "sourceMap": true,