Merge branch 'master' of https://github.com/fleet-sdk/fleet

fleet-sdk · Dec 8, 2023 · 9613f03 · 9613f03
2 parents 41d68e1 + 9f02ca0
commit 9613f03
Show file tree

Hide file tree

Showing 13 changed files with 145 additions and 55 deletions.
diff --git a/.changeset/hungry-dodos-kick.md b/.changeset/hungry-dodos-kick.md
@@ -0,0 +1,14 @@
+---
+"@fleet-sdk/blockchain-providers": patch
+"@fleet-sdk/mock-chain": patch
+"@fleet-sdk/serializer": patch
+"@fleet-sdk/babel-fees-plugin": patch
+"@fleet-sdk/compiler": patch
+"@fleet-sdk/common": patch
+"@fleet-sdk/crypto": patch
+"@fleet-sdk/wallet": patch
+"@fleet-sdk/ageusd-plugin": patch
+"@fleet-sdk/core": patch
+---
+
+Fix ESM and CJS modules export
diff --git a/packages/blockchain-providers/CHANGELOG.md b/packages/blockchain-providers/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @fleet-sdk/blockchain-providers
 
+## 0.3.3
+
+### Patch Changes
+
+- 227c888: Fix type exporting
+
 ## 0.3.2
 
 ### Patch Changes

diff --git a/packages/blockchain-providers/package.json b/packages/blockchain-providers/package.json
@@ -1,15 +1,23 @@
 {
   "name": "@fleet-sdk/blockchain-providers",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Blockchain data providers",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
-  "sideEffects": true,
+  "sideEffects": false,
   "repository": "fleet-sdk/fleet",
   "license": "MIT",
   "publishConfig": {

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -2,15 +2,22 @@
   "name": "@fleet-sdk/common",
   "version": "0.3.2",
   "description": "Internal utility functions, constants and types shared across @fleet-sdk packages.",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "types": "./dist/index.d.ts",
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
-  "sideEffects": true,
+  "sideEffects": false,
   "repository": "fleet-sdk/fleet",
   "license": "MIT",
   "publishConfig": {

diff --git a/packages/compiler/package.json b/packages/compiler/package.json
@@ -2,13 +2,20 @@
   "name": "@fleet-sdk/compiler",
   "version": "0.3.2",
   "description": "Sigma.JS powered ErgoScript compiler.",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "types": "./dist/index.d.ts",
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
   "sideEffects": false,
   "repository": "fleet-sdk/fleet",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -2,13 +2,20 @@
   "name": "@fleet-sdk/core",
   "version": "0.3.2",
   "description": "Fleet SDK core library",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "types": "./dist/index.d.ts",
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
   "sideEffects": false,
   "repository": "fleet-sdk/fleet",

diff --git a/packages/crypto/package.json b/packages/crypto/package.json
@@ -2,15 +2,22 @@
   "name": "@fleet-sdk/crypto",
   "version": "0.3.2",
   "description": "Ergo blockchain crypto primitives.",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "types": "./dist/index.d.ts",
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
-  "sideEffects": true,
+  "sideEffects": false,
   "repository": "fleet-sdk/fleet",
   "license": "MIT",
   "publishConfig": {

diff --git a/packages/mock-chain/package.json b/packages/mock-chain/package.json
@@ -2,13 +2,20 @@
   "name": "@fleet-sdk/mock-chain",
   "version": "0.3.2",
   "description": "Mock chain for Ergo Smart Contracts testing.",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "types": "./dist/index.d.ts",
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
   "sideEffects": false,
   "repository": "fleet-sdk/fleet",

diff --git a/packages/serializer/package.json b/packages/serializer/package.json
@@ -2,13 +2,20 @@
   "name": "@fleet-sdk/serializer",
   "version": "0.3.2",
   "description": "Ergo constant serializer and parser.",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "types": "./dist/index.d.ts",
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
   "sideEffects": false,
   "repository": "fleet-sdk/fleet",

diff --git a/packages/wallet/package.json b/packages/wallet/package.json
@@ -2,13 +2,20 @@
   "name": "@fleet-sdk/wallet",
   "version": "0.3.2",
   "description": "Key management and signature for Ergo Platform.",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "types": "./dist/index.d.ts",
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
   "sideEffects": false,
   "repository": "fleet-sdk/fleet",

diff --git a/plugins/ageusd/package.json b/plugins/ageusd/package.json
@@ -2,12 +2,20 @@
   "name": "@fleet-sdk/ageusd-plugin",
   "version": "0.1.6",
   "description": "AgeUSD protocol plugin for Fleet SDK.",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
   "sideEffects": false,
   "repository": "fleet-sdk/fleet",

diff --git a/plugins/babel-fees/package.json b/plugins/babel-fees/package.json
@@ -2,12 +2,20 @@
   "name": "@fleet-sdk/babel-fees-plugin",
   "version": "0.1.9",
   "description": "Babel Fees plugin for Fleet SDK.",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
-    "require": "./dist/index.cjs.js",
-    "import": "./dist/index.esm.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
   },
   "sideEffects": false,
   "repository": "fleet-sdk/fleet",

diff --git a/tsup.config.ts b/tsup.config.ts
@@ -8,8 +8,5 @@ export default defineConfig({
   sourcemap: true,
   clean: true,
   dts: { resolve: true },
-  format: ["esm", "cjs"],
-  outExtension({ format }) {
-    return { js: `.${format}.js` };
-  }
+  format: ["esm", "cjs"]
 });