From 3f8dea1dbd31fec5a8c7fa195d190c55edfe1876 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sat, 15 Apr 2023 10:38:09 -0300 Subject: [PATCH 01/19] Removing types overrides from `publishConfig` --- packages/abi-coder/package.json | 1 - packages/abi-typegen/package.json | 1 - packages/address/package.json | 1 - packages/contract/package.json | 1 - packages/fuels/package.json | 1 - packages/hasher/package.json | 1 - packages/hdwallet/package.json | 1 - packages/interfaces/package.json | 1 - packages/keystore/package.json | 1 - packages/math/package.json | 1 - packages/merkle-shared/package.json | 1 - packages/merkle/package.json | 1 - packages/merklesum/package.json | 1 - packages/mnemonic/package.json | 1 - packages/predicate/package.json | 1 - packages/program/package.json | 1 - packages/providers/package.json | 1 - packages/script/package.json | 1 - packages/signer/package.json | 1 - packages/sparsemerkle/package.json | 1 - packages/transactions/package.json | 1 - packages/versions/package.json | 1 - packages/wallet-manager/package.json | 1 - packages/wallet/package.json | 1 - packages/wordlists/package.json | 1 - 25 files changed, 25 deletions(-) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index 0362706ef57..fef408bcc4f 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/abi-typegen/package.json b/packages/abi-typegen/package.json index eca72e40492..2b6829c98dc 100644 --- a/packages/abi-typegen/package.json +++ b/packages/abi-typegen/package.json @@ -27,7 +27,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "bin": { "fuels-typegen": "dist/bin.js" }, diff --git a/packages/address/package.json b/packages/address/package.json index 4127e977078..1a245c93aa2 100644 --- a/packages/address/package.json +++ b/packages/address/package.json @@ -20,7 +20,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/contract/package.json b/packages/contract/package.json index 92d144ae60d..8437c4510fb 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/fuels/package.json b/packages/fuels/package.json index af1b501bda5..b003844dd59 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -24,7 +24,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "bin": { "fuels": "dist/bin.js" }, diff --git a/packages/hasher/package.json b/packages/hasher/package.json index 3a603384f2c..4a0e67c4318 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index a8e1f7a1198..e96d5f4143c 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index c27fce71b46..05eaf3b388d 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/keystore/package.json b/packages/keystore/package.json index 02e4bf5ad5a..61125e9c654 100644 --- a/packages/keystore/package.json +++ b/packages/keystore/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/math/package.json b/packages/math/package.json index 366e7a49830..c4acc1b9ddb 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -20,7 +20,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merkle-shared/package.json b/packages/merkle-shared/package.json index f14445296eb..2503e723524 100644 --- a/packages/merkle-shared/package.json +++ b/packages/merkle-shared/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merkle/package.json b/packages/merkle/package.json index 66bc2021876..2d27da78428 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merklesum/package.json b/packages/merklesum/package.json index 5206abbea3e..45241c7963f 100644 --- a/packages/merklesum/package.json +++ b/packages/merklesum/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index 30dfcc6cded..3b2f4fbbc3f 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/predicate/package.json b/packages/predicate/package.json index d66e5366ab1..1405222364c 100644 --- a/packages/predicate/package.json +++ b/packages/predicate/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/program/package.json b/packages/program/package.json index 9b5e8280b03..f895b5e537b 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -20,7 +20,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/providers/package.json b/packages/providers/package.json index 2375461206b..dbc036e782b 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/script/package.json b/packages/script/package.json index a1b60f5dd71..6d806269fe4 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/signer/package.json b/packages/signer/package.json index b220c58d3d3..92b8760e4fe 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/sparsemerkle/package.json b/packages/sparsemerkle/package.json index d0c602da7e4..130036df635 100644 --- a/packages/sparsemerkle/package.json +++ b/packages/sparsemerkle/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/transactions/package.json b/packages/transactions/package.json index fd1ae4e2d73..e55dc94e2de 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -20,7 +20,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/versions/package.json b/packages/versions/package.json index ada377dc52e..fb14f4ca513 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -23,7 +23,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "bin": { "fuels-versions": "dist/bin.js" }, diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index 652b22f75e0..140acd512cc 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 36a7d539e9c..355eeb44631 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -24,7 +24,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index e7553142983..ff052bd0f51 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -16,7 +16,6 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", From 693a2c00993bc7368218c8885e56550677a61a70 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sat, 15 Apr 2023 10:41:09 -0300 Subject: [PATCH 02/19] Adding [empty] changeset --- .changeset/swift-jeans-melt.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changeset/swift-jeans-melt.md diff --git a/.changeset/swift-jeans-melt.md b/.changeset/swift-jeans-melt.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/swift-jeans-melt.md @@ -0,0 +1,2 @@ +--- +--- From b0807c88ce2efb18554fa545e2bfc3f7ae5d60da Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sat, 15 Apr 2023 10:41:14 -0300 Subject: [PATCH 03/19] Enabling PR release --- .github/workflows/pr-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-release.yaml b/.github/workflows/pr-release.yaml index dfb450b5430..d7291bad39f 100644 --- a/.github/workflows/pr-release.yaml +++ b/.github/workflows/pr-release.yaml @@ -8,7 +8,7 @@ jobs: name: "Release PR to npm" runs-on: ubuntu-latest # comment out if:false to enable release PR to npm - if: false + # if: false permissions: write-all steps: - name: Checkout From 4a84006330b6d9cfeb1f721a38bcf54e1967cc64 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sat, 15 Apr 2023 11:06:14 -0300 Subject: [PATCH 04/19] Adding types configs in `package.json` root --- packages/abi-coder/package.json | 1 + packages/abi-typegen/package.json | 1 + packages/address/package.json | 1 + packages/contract/package.json | 1 + packages/fuels/package.json | 1 + packages/hasher/package.json | 1 + packages/hdwallet/package.json | 1 + packages/interfaces/package.json | 1 + packages/keystore/package.json | 1 + packages/math/package.json | 1 + packages/merkle-shared/package.json | 1 + packages/merkle/package.json | 1 + packages/merklesum/package.json | 1 + packages/mnemonic/package.json | 1 + packages/predicate/package.json | 1 + packages/program/package.json | 1 + packages/providers/package.json | 1 + packages/script/package.json | 1 + packages/signer/package.json | 1 + packages/sparsemerkle/package.json | 1 + packages/transactions/package.json | 1 + packages/versions/package.json | 1 + packages/wallet-manager/package.json | 1 + packages/wallet/package.json | 1 + packages/wordlists/package.json | 1 + 25 files changed, 25 insertions(+) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index fef408bcc4f..d77f49d736b 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/abi-typegen/package.json b/packages/abi-typegen/package.json index 2b6829c98dc..519d9d3811e 100644 --- a/packages/abi-typegen/package.json +++ b/packages/abi-typegen/package.json @@ -24,6 +24,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/address/package.json b/packages/address/package.json index 1a245c93aa2..560aa26b7b2 100644 --- a/packages/address/package.json +++ b/packages/address/package.json @@ -17,6 +17,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/contract/package.json b/packages/contract/package.json index 8437c4510fb..049372a326f 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/fuels/package.json b/packages/fuels/package.json index b003844dd59..8e30563be90 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -21,6 +21,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/hasher/package.json b/packages/hasher/package.json index 4a0e67c4318..114403a6b45 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index e96d5f4143c..d6fee93e77a 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index 05eaf3b388d..38cb5db555f 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/keystore/package.json b/packages/keystore/package.json index 61125e9c654..65c4d288597 100644 --- a/packages/keystore/package.json +++ b/packages/keystore/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/math/package.json b/packages/math/package.json index c4acc1b9ddb..bb7613fcbf8 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -17,6 +17,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/merkle-shared/package.json b/packages/merkle-shared/package.json index 2503e723524..b15af1fe6b4 100644 --- a/packages/merkle-shared/package.json +++ b/packages/merkle-shared/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/merkle/package.json b/packages/merkle/package.json index 2d27da78428..1a163c18aa5 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/merklesum/package.json b/packages/merklesum/package.json index 45241c7963f..b309b99e789 100644 --- a/packages/merklesum/package.json +++ b/packages/merklesum/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index 3b2f4fbbc3f..09995688588 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/predicate/package.json b/packages/predicate/package.json index 1405222364c..fb75318f8de 100644 --- a/packages/predicate/package.json +++ b/packages/predicate/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/program/package.json b/packages/program/package.json index f895b5e537b..bf453a2d84b 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -17,6 +17,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/providers/package.json b/packages/providers/package.json index dbc036e782b..1b762f66c57 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/script/package.json b/packages/script/package.json index 6d806269fe4..5415467d038 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/signer/package.json b/packages/signer/package.json index 92b8760e4fe..dc6926c9813 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/sparsemerkle/package.json b/packages/sparsemerkle/package.json index 130036df635..d329bf9040c 100644 --- a/packages/sparsemerkle/package.json +++ b/packages/sparsemerkle/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/transactions/package.json b/packages/transactions/package.json index e55dc94e2de..2fc4acfb938 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -17,6 +17,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/versions/package.json b/packages/versions/package.json index fb14f4ca513..931e7101a7e 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -20,6 +20,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index 140acd512cc..4b81671f794 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 355eeb44631..2df3bd823e0 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -21,6 +21,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index ff052bd0f51..c11a92176ec 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -13,6 +13,7 @@ ] } }, + "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", From 6a8e57a12abb63ae8068b8423e4f1e55a28fc984 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 10:38:45 -0300 Subject: [PATCH 05/19] Removing `types` property, pointing `typesVersions` configs to `src/*` --- packages/abi-coder/package.json | 3 +-- packages/abi-typegen/package.json | 7 +++---- packages/address/package.json | 5 ++--- packages/contract/package.json | 3 +-- packages/fuels/package.json | 5 ++--- packages/hasher/package.json | 3 +-- packages/hdwallet/package.json | 3 +-- packages/interfaces/package.json | 3 +-- packages/keystore/package.json | 3 +-- packages/math/package.json | 5 ++--- packages/merkle-shared/package.json | 3 +-- packages/merkle/package.json | 3 +-- packages/merklesum/package.json | 3 +-- packages/mnemonic/package.json | 3 +-- packages/predicate/package.json | 3 +-- packages/program/package.json | 5 ++--- packages/providers/package.json | 3 +-- packages/script/package.json | 3 +-- packages/signer/package.json | 3 +-- packages/sparsemerkle/package.json | 3 +-- packages/transactions/package.json | 5 ++--- packages/versions/package.json | 5 ++--- packages/wallet-manager/package.json | 3 +-- packages/wallet/package.json | 15 +++++++-------- packages/wordlists/package.json | 3 +-- 25 files changed, 39 insertions(+), 64 deletions(-) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index d77f49d736b..2e3bc5a894e 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/abi-typegen/package.json b/packages/abi-typegen/package.json index 519d9d3811e..54b2aa1797e 100644 --- a/packages/abi-typegen/package.json +++ b/packages/abi-typegen/package.json @@ -14,17 +14,16 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ], "cli": [ - "./dist/cli.d.ts" + "./src/cli.ts" ], "runTypegen": [ - "./dist/runTypegen.d.ts" + "./src/runTypegen.ts" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/address/package.json b/packages/address/package.json index 560aa26b7b2..f97da5e67b1 100644 --- a/packages/address/package.json +++ b/packages/address/package.json @@ -10,14 +10,13 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ], "configs": [ - "./dist/configs.d.ts" + "./src/configs.ts" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/contract/package.json b/packages/contract/package.json index 049372a326f..6decb1f758a 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/fuels/package.json b/packages/fuels/package.json index 8e30563be90..7b840af6124 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -14,14 +14,13 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ], "cli": [ - "./dist/cli.d.ts" + "./src/cli.ts" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/hasher/package.json b/packages/hasher/package.json index 114403a6b45..85dcf179bbf 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index d6fee93e77a..b17b7ff97df 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index 38cb5db555f..6d241c570c1 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/keystore/package.json b/packages/keystore/package.json index 65c4d288597..bb688ca1b4a 100644 --- a/packages/keystore/package.json +++ b/packages/keystore/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/math/package.json b/packages/math/package.json index bb7613fcbf8..624949e23f6 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -10,14 +10,13 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ], "configs": [ - "./dist/configs.d.ts" + "./src/configs.ts" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/merkle-shared/package.json b/packages/merkle-shared/package.json index b15af1fe6b4..eb4cf368e7a 100644 --- a/packages/merkle-shared/package.json +++ b/packages/merkle-shared/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/merkle/package.json b/packages/merkle/package.json index 1a163c18aa5..2c4fb43f80f 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/merklesum/package.json b/packages/merklesum/package.json index b309b99e789..db111f36a20 100644 --- a/packages/merklesum/package.json +++ b/packages/merklesum/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index 09995688588..e61154e1529 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/predicate/package.json b/packages/predicate/package.json index fb75318f8de..42810094ac6 100644 --- a/packages/predicate/package.json +++ b/packages/predicate/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/program/package.json b/packages/program/package.json index bf453a2d84b..97f6fe2efa9 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -10,14 +10,13 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ], "configs": [ - "./dist/configs.d.ts" + "./src/configs.ts" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/providers/package.json b/packages/providers/package.json index 1b762f66c57..21f042debb3 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/script/package.json b/packages/script/package.json index 5415467d038..b74b07b1846 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/signer/package.json b/packages/signer/package.json index dc6926c9813..c20796227b7 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/sparsemerkle/package.json b/packages/sparsemerkle/package.json index d329bf9040c..303ed78d5d9 100644 --- a/packages/sparsemerkle/package.json +++ b/packages/sparsemerkle/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/transactions/package.json b/packages/transactions/package.json index 2fc4acfb938..206d14746a2 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -10,14 +10,13 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ], "configs": [ - "./dist/configs.d.ts" + "./src/configs.ts" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/versions/package.json b/packages/versions/package.json index 931e7101a7e..051d5de39ad 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -13,14 +13,13 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ], "cli": [ - "./dist/cli.d.ts" + "./src/cli.ts" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index 4b81671f794..eb457d2a6a6 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 2df3bd823e0..760e5f56a26 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -5,23 +5,22 @@ "author": "Fuel Labs (https://fuel.network/)", "exports": { ".": "./src/index.ts", - "./test-utils": "./test/utils/index.ts", - "./configs": "./src/configs.ts" + "./configs": "./src/configs.ts", + "./test-utils": "./test/utils/index.ts" }, "typesVersions": { "*": { "*": [ - "./dist/*" - ], - "test-utils": [ - "./dist/test-utils.d.ts" + "./src/*" ], "configs": [ - "./dist/configs.d.ts" + "./src/configs.ts" + ], + "test-utils": [ + "./test/utils/index.ts" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index c11a92176ec..d1615097b95 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -9,11 +9,10 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./src/*" ] } }, - "types": "index.d.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", From 3ea94f17a3f58b2ca522fdc353b7da9fc674146e Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 10:48:06 -0300 Subject: [PATCH 06/19] Adding `typesVersions` overrides in `publishConfig` --- packages/abi-coder/package.json | 7 +++++++ packages/abi-typegen/package.json | 13 +++++++++++++ packages/contract/package.json | 7 +++++++ packages/fuels/package.json | 10 ++++++++++ packages/hasher/package.json | 7 +++++++ packages/hdwallet/package.json | 7 +++++++ packages/interfaces/package.json | 7 +++++++ packages/keystore/package.json | 7 +++++++ packages/math/package.json | 10 ++++++++++ packages/merkle-shared/package.json | 7 +++++++ packages/merkle/package.json | 7 +++++++ packages/merklesum/package.json | 7 +++++++ packages/mnemonic/package.json | 7 +++++++ packages/predicate/package.json | 7 +++++++ packages/program/package.json | 10 ++++++++++ packages/providers/package.json | 7 +++++++ packages/script/package.json | 7 +++++++ packages/signer/package.json | 7 +++++++ packages/sparsemerkle/package.json | 7 +++++++ packages/transactions/package.json | 10 ++++++++++ packages/versions/package.json | 10 ++++++++++ packages/wallet-manager/package.json | 7 +++++++ packages/wallet/package.json | 13 +++++++++++++ packages/wordlists/package.json | 7 +++++++ 24 files changed, 195 insertions(+) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index 2e3bc5a894e..6a1d9ec1b92 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/abi-typegen/package.json b/packages/abi-typegen/package.json index 54b2aa1797e..9cfef17b6ef 100644 --- a/packages/abi-typegen/package.json +++ b/packages/abi-typegen/package.json @@ -30,6 +30,19 @@ "bin": { "fuels-typegen": "dist/bin.js" }, + "typesVersions": { + "*": { + "*": [ + "./dist/index.d.ts" + ], + "cli": [ + "./dist/cli.d.ts" + ], + "runTypegen": [ + "./dist/runTypegen.d.ts" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/contract/package.json b/packages/contract/package.json index 6decb1f758a..c8349efc2a0 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/fuels/package.json b/packages/fuels/package.json index 7b840af6124..12088643cee 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -27,6 +27,16 @@ "bin": { "fuels": "dist/bin.js" }, + "typesVersions": { + "*": { + "*": [ + "./dist/index.d.ts" + ], + "cli": [ + "./dist/cli.d.ts" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/hasher/package.json b/packages/hasher/package.json index 85dcf179bbf..ab4be43c960 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index b17b7ff97df..5f5669605f5 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index 6d241c570c1..0ba3f354397 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/keystore/package.json b/packages/keystore/package.json index bb688ca1b4a..7be2e0da187 100644 --- a/packages/keystore/package.json +++ b/packages/keystore/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/math/package.json b/packages/math/package.json index 624949e23f6..415e9c495e6 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -20,6 +20,16 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/index.d.ts" + ], + "configs": [ + "./dist/configs.d.ts" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merkle-shared/package.json b/packages/merkle-shared/package.json index eb4cf368e7a..3695c39ad70 100644 --- a/packages/merkle-shared/package.json +++ b/packages/merkle-shared/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merkle/package.json b/packages/merkle/package.json index 2c4fb43f80f..1fb7ea21e29 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merklesum/package.json b/packages/merklesum/package.json index db111f36a20..8d087992abd 100644 --- a/packages/merklesum/package.json +++ b/packages/merklesum/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index e61154e1529..ff771e6e210 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/predicate/package.json b/packages/predicate/package.json index 42810094ac6..f88bcf35d8e 100644 --- a/packages/predicate/package.json +++ b/packages/predicate/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/program/package.json b/packages/program/package.json index 97f6fe2efa9..1cb1d92c769 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -20,6 +20,16 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ], + "configs": [ + "./dist/configs.d.ts" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/providers/package.json b/packages/providers/package.json index 21f042debb3..61c67689ea3 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/script/package.json b/packages/script/package.json index b74b07b1846..ab15afe5243 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/signer/package.json b/packages/signer/package.json index c20796227b7..08573433dd8 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/sparsemerkle/package.json b/packages/sparsemerkle/package.json index 303ed78d5d9..16f3d187623 100644 --- a/packages/sparsemerkle/package.json +++ b/packages/sparsemerkle/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/transactions/package.json b/packages/transactions/package.json index 206d14746a2..ec4acb9b8e2 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -20,6 +20,16 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ], + "configs": [ + "./dist/configs.d.ts" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/versions/package.json b/packages/versions/package.json index 051d5de39ad..67dc54e297b 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -26,6 +26,16 @@ "bin": { "fuels-versions": "dist/bin.js" }, + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ], + "cli": [ + "./dist/cli.d.ts" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index eb457d2a6a6..58b25f27e5d 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 760e5f56a26..b9ee6fa5af9 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -24,6 +24,19 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ], + "configs": [ + "./dist/configs.d.ts" + ], + "test-utils": [ + "./dist/test-utils.d.ts" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index d1615097b95..d174f336792 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -16,6 +16,13 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/*" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", From 19da029cacf1d02ad5f98ac5c9740d62da47b4a8 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 10:49:48 -0300 Subject: [PATCH 07/19] Rolling back previous VSCode settings --- .vscode/settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 38080071d9b..1ed1ded9d5e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,7 +6,6 @@ "editor.codeActionsOnSave": { "source.fixAll.eslint": true }, - "typescript.preferences.autoImportFileExcludePatterns": ["index.ts"], "files.exclude": { "**/.git": true, "**/.DS_Store": true, From 036176ef696ab1c02d631af2b8567c511bfff2f9 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 11:46:43 -0300 Subject: [PATCH 08/19] Using full file path to published dts files --- packages/abi-coder/package.json | 2 +- packages/contract/package.json | 2 +- packages/hasher/package.json | 2 +- packages/hdwallet/package.json | 2 +- packages/interfaces/package.json | 2 +- packages/keystore/package.json | 2 +- packages/merkle-shared/package.json | 2 +- packages/merkle/package.json | 2 +- packages/merklesum/package.json | 2 +- packages/mnemonic/package.json | 2 +- packages/predicate/package.json | 2 +- packages/program/package.json | 2 +- packages/providers/package.json | 2 +- packages/script/package.json | 2 +- packages/signer/package.json | 2 +- packages/sparsemerkle/package.json | 2 +- packages/transactions/package.json | 2 +- packages/versions/package.json | 2 +- packages/wallet-manager/package.json | 2 +- packages/wallet/package.json | 2 +- packages/wordlists/package.json | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index 6a1d9ec1b92..8aa70aa3924 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/contract/package.json b/packages/contract/package.json index c8349efc2a0..ed25fa3659a 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/hasher/package.json b/packages/hasher/package.json index ab4be43c960..33d1c07fcdd 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index 5f5669605f5..ed3fc11936b 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index 0ba3f354397..321d2e2ca2f 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/keystore/package.json b/packages/keystore/package.json index 7be2e0da187..2e0375139f6 100644 --- a/packages/keystore/package.json +++ b/packages/keystore/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/merkle-shared/package.json b/packages/merkle-shared/package.json index 3695c39ad70..42bdb66a438 100644 --- a/packages/merkle-shared/package.json +++ b/packages/merkle-shared/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/merkle/package.json b/packages/merkle/package.json index 1fb7ea21e29..3572d2dcc30 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/merklesum/package.json b/packages/merklesum/package.json index 8d087992abd..35bd275fb43 100644 --- a/packages/merklesum/package.json +++ b/packages/merklesum/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index ff771e6e210..7bbb1a46551 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/predicate/package.json b/packages/predicate/package.json index f88bcf35d8e..3ff9796665a 100644 --- a/packages/predicate/package.json +++ b/packages/predicate/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/program/package.json b/packages/program/package.json index 1cb1d92c769..03c23154ce5 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -23,7 +23,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ], "configs": [ "./dist/configs.d.ts" diff --git a/packages/providers/package.json b/packages/providers/package.json index 61c67689ea3..cf1f83e6f23 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/script/package.json b/packages/script/package.json index ab15afe5243..3a5af8ab7b7 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/signer/package.json b/packages/signer/package.json index 08573433dd8..b1db08fde59 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/sparsemerkle/package.json b/packages/sparsemerkle/package.json index 16f3d187623..f90c2c9f7d7 100644 --- a/packages/sparsemerkle/package.json +++ b/packages/sparsemerkle/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/transactions/package.json b/packages/transactions/package.json index ec4acb9b8e2..5565166f8a3 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -23,7 +23,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ], "configs": [ "./dist/configs.d.ts" diff --git a/packages/versions/package.json b/packages/versions/package.json index 67dc54e297b..8ba48127be9 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -29,7 +29,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ], "cli": [ "./dist/cli.d.ts" diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index 58b25f27e5d..012c1cce2d9 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, diff --git a/packages/wallet/package.json b/packages/wallet/package.json index b9ee6fa5af9..1055de3ef32 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -27,7 +27,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ], "configs": [ "./dist/configs.d.ts" diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index d174f336792..89c42436aeb 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -19,7 +19,7 @@ "typesVersions": { "*": { "*": [ - "./dist/*" + "./dist/index.d.ts" ] } }, From afef7e37fb338a2ea47853a3d78a7615608998cd Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 11:47:27 -0300 Subject: [PATCH 09/19] Adding missing config overrides --- packages/address/package.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/address/package.json b/packages/address/package.json index f97da5e67b1..6ce983c4817 100644 --- a/packages/address/package.json +++ b/packages/address/package.json @@ -20,6 +20,16 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "typesVersions": { + "*": { + "*": [ + "./dist/index.d.ts" + ], + "configs": [ + "./dist/configs.ts" + ] + } + }, "exports": { ".": { "import": "./dist/index.mjs", From 467b8e78c1d4e9a00ac62b040269de9de2308c55 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 11:53:45 -0300 Subject: [PATCH 10/19] DRYing single-entry point packages --- packages/abi-coder/package.json | 8 +------- packages/contract/package.json | 8 +------- packages/hasher/package.json | 8 +------- packages/hdwallet/package.json | 8 +------- packages/interfaces/package.json | 8 +------- packages/keystore/package.json | 8 +------- packages/merkle-shared/package.json | 8 +------- packages/merkle/package.json | 8 +------- packages/merklesum/package.json | 8 +------- packages/mnemonic/package.json | 8 +------- packages/predicate/package.json | 8 +------- packages/providers/package.json | 8 +------- packages/script/package.json | 8 +------- packages/signer/package.json | 8 +------- packages/sparsemerkle/package.json | 8 +------- packages/wallet-manager/package.json | 8 +------- packages/wordlists/package.json | 8 +------- 17 files changed, 17 insertions(+), 119 deletions(-) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index 8aa70aa3924..f86fb36d9ed 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/contract/package.json b/packages/contract/package.json index ed25fa3659a..a747280b1db 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/hasher/package.json b/packages/hasher/package.json index 33d1c07fcdd..5b9d7e249cc 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index ed3fc11936b..745c9b0d69f 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index 321d2e2ca2f..d2993fda702 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/keystore/package.json b/packages/keystore/package.json index 2e0375139f6..f5029676acc 100644 --- a/packages/keystore/package.json +++ b/packages/keystore/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merkle-shared/package.json b/packages/merkle-shared/package.json index 42bdb66a438..41e570deb3f 100644 --- a/packages/merkle-shared/package.json +++ b/packages/merkle-shared/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merkle/package.json b/packages/merkle/package.json index 3572d2dcc30..1929eb980ef 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merklesum/package.json b/packages/merklesum/package.json index 35bd275fb43..be3e80cab2c 100644 --- a/packages/merklesum/package.json +++ b/packages/merklesum/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index 7bbb1a46551..cbdf1f1377a 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/predicate/package.json b/packages/predicate/package.json index 3ff9796665a..de7352714c7 100644 --- a/packages/predicate/package.json +++ b/packages/predicate/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/providers/package.json b/packages/providers/package.json index cf1f83e6f23..ebcce8a0875 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/script/package.json b/packages/script/package.json index 3a5af8ab7b7..8204619ed3a 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/signer/package.json b/packages/signer/package.json index b1db08fde59..7f4391f70c2 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/sparsemerkle/package.json b/packages/sparsemerkle/package.json index f90c2c9f7d7..2867263b193 100644 --- a/packages/sparsemerkle/package.json +++ b/packages/sparsemerkle/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index 012c1cce2d9..27acb9dd263 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index 89c42436aeb..f19867a8550 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -16,13 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "typesVersions": { - "*": { - "*": [ - "./dist/index.d.ts" - ] - } - }, + "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", From 834c0a48c4f33b24d5543800994d696858cbdab2 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 11:55:25 -0300 Subject: [PATCH 11/19] Cleaning up filepath --- packages/abi-coder/package.json | 2 +- packages/contract/package.json | 2 +- packages/hasher/package.json | 2 +- packages/hdwallet/package.json | 2 +- packages/interfaces/package.json | 2 +- packages/keystore/package.json | 2 +- packages/merkle-shared/package.json | 2 +- packages/merkle/package.json | 2 +- packages/merklesum/package.json | 2 +- packages/mnemonic/package.json | 2 +- packages/predicate/package.json | 2 +- packages/providers/package.json | 2 +- packages/script/package.json | 2 +- packages/signer/package.json | 2 +- packages/sparsemerkle/package.json | 2 +- packages/wallet-manager/package.json | 2 +- packages/wordlists/package.json | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index f86fb36d9ed..9ef9764e9bf 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/contract/package.json b/packages/contract/package.json index a747280b1db..0c39497df0e 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/hasher/package.json b/packages/hasher/package.json index 5b9d7e249cc..42c3fd0a409 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index 745c9b0d69f..163a7c14ba9 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index d2993fda702..ede7e5a18ec 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/keystore/package.json b/packages/keystore/package.json index f5029676acc..ef254ee695e 100644 --- a/packages/keystore/package.json +++ b/packages/keystore/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merkle-shared/package.json b/packages/merkle-shared/package.json index 41e570deb3f..7f288b924ab 100644 --- a/packages/merkle-shared/package.json +++ b/packages/merkle-shared/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merkle/package.json b/packages/merkle/package.json index 1929eb980ef..ef8fc5efc04 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/merklesum/package.json b/packages/merklesum/package.json index be3e80cab2c..d7ff646b52e 100644 --- a/packages/merklesum/package.json +++ b/packages/merklesum/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index cbdf1f1377a..064fbf2c99c 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/predicate/package.json b/packages/predicate/package.json index de7352714c7..ad173a2921f 100644 --- a/packages/predicate/package.json +++ b/packages/predicate/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/providers/package.json b/packages/providers/package.json index ebcce8a0875..a0d004cf76e 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/script/package.json b/packages/script/package.json index 8204619ed3a..3d73b92fbde 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/signer/package.json b/packages/signer/package.json index 7f4391f70c2..bbefe62b959 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/sparsemerkle/package.json b/packages/sparsemerkle/package.json index 2867263b193..cb9aaae34aa 100644 --- a/packages/sparsemerkle/package.json +++ b/packages/sparsemerkle/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index 27acb9dd263..b98c0a11269 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index f19867a8550..84a7ef89aed 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -16,7 +16,7 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "./dist/index.d.ts", + "types": "dist/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", From bd82858918ae9fde69dfa6f4eddab8b6b74c5be1 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 12:27:50 -0300 Subject: [PATCH 12/19] Removing `typesVersions` wildcards in favor of legacy `types` property --- packages/abi-coder/package.json | 8 +------- packages/abi-typegen/package.json | 8 ++------ packages/address/package.json | 8 ++------ packages/contract/package.json | 8 +------- packages/fuels/package.json | 8 ++------ packages/hasher/package.json | 8 +------- packages/hdwallet/package.json | 8 +------- packages/interfaces/package.json | 8 +------- packages/keystore/package.json | 8 +------- packages/math/package.json | 8 ++------ packages/merkle-shared/package.json | 8 +------- packages/merkle/package.json | 8 +------- packages/merklesum/package.json | 8 +------- packages/mnemonic/package.json | 8 +------- packages/predicate/package.json | 8 +------- packages/program/package.json | 8 ++------ packages/providers/package.json | 8 +------- packages/script/package.json | 8 +------- packages/signer/package.json | 8 +------- packages/sparsemerkle/package.json | 8 +------- packages/transactions/package.json | 8 ++------ packages/versions/package.json | 8 ++------ packages/wallet-manager/package.json | 8 +------- packages/wallet/package.json | 8 ++------ packages/wordlists/package.json | 8 +------- 25 files changed, 33 insertions(+), 167 deletions(-) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index 9ef9764e9bf..d02472a814f 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/abi-typegen/package.json b/packages/abi-typegen/package.json index 9cfef17b6ef..acad56cdd18 100644 --- a/packages/abi-typegen/package.json +++ b/packages/abi-typegen/package.json @@ -11,11 +11,9 @@ "./cli": "./src/cli.ts", "./runTypegen": "./src/runTypegen.ts" }, + "types": "src/index.ts", "typesVersions": { "*": { - "*": [ - "./src/*" - ], "cli": [ "./src/cli.ts" ], @@ -30,11 +28,9 @@ "bin": { "fuels-typegen": "dist/bin.js" }, + "types": "dist/index.d.ts", "typesVersions": { "*": { - "*": [ - "./dist/index.d.ts" - ], "cli": [ "./dist/cli.d.ts" ], diff --git a/packages/address/package.json b/packages/address/package.json index 6ce983c4817..5be38806927 100644 --- a/packages/address/package.json +++ b/packages/address/package.json @@ -7,11 +7,9 @@ ".": "./src/index.ts", "./configs": "./src/configs.ts" }, + "types": "src/index.ts", "typesVersions": { "*": { - "*": [ - "./src/*" - ], "configs": [ "./src/configs.ts" ] @@ -20,11 +18,9 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "types": "dist/index.d.ts", "typesVersions": { "*": { - "*": [ - "./dist/index.d.ts" - ], "configs": [ "./dist/configs.ts" ] diff --git a/packages/contract/package.json b/packages/contract/package.json index 0c39497df0e..2bcc97a0041 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/fuels/package.json b/packages/fuels/package.json index 12088643cee..35847744940 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -11,11 +11,9 @@ "./cli": "./src/cli.ts", "./runTypegen": "./src/runTypegen.ts" }, + "types": "src/index.ts", "typesVersions": { "*": { - "*": [ - "./src/*" - ], "cli": [ "./src/cli.ts" ] @@ -27,11 +25,9 @@ "bin": { "fuels": "dist/bin.js" }, + "types": "dist/index.d.ts", "typesVersions": { "*": { - "*": [ - "./dist/index.d.ts" - ], "cli": [ "./dist/cli.d.ts" ] diff --git a/packages/hasher/package.json b/packages/hasher/package.json index 42c3fd0a409..3728d33160c 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index 163a7c14ba9..84780f843bd 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index ede7e5a18ec..bec48bd77b2 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/keystore/package.json b/packages/keystore/package.json index ef254ee695e..ba45bfa9372 100644 --- a/packages/keystore/package.json +++ b/packages/keystore/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/math/package.json b/packages/math/package.json index 415e9c495e6..06ab7a9a342 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -7,11 +7,9 @@ ".": "./src/index.ts", "./configs": "./src/configs.ts" }, + "types": "src/index.ts", "typesVersions": { "*": { - "*": [ - "./src/*" - ], "configs": [ "./src/configs.ts" ] @@ -20,11 +18,9 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "types": "dist/index.d.ts", "typesVersions": { "*": { - "*": [ - "./dist/index.d.ts" - ], "configs": [ "./dist/configs.d.ts" ] diff --git a/packages/merkle-shared/package.json b/packages/merkle-shared/package.json index 7f288b924ab..8d6fb938785 100644 --- a/packages/merkle-shared/package.json +++ b/packages/merkle-shared/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/merkle/package.json b/packages/merkle/package.json index ef8fc5efc04..c313ddd5d2d 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/merklesum/package.json b/packages/merklesum/package.json index d7ff646b52e..c24517cfcfe 100644 --- a/packages/merklesum/package.json +++ b/packages/merklesum/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index 064fbf2c99c..da4deeb7f93 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/predicate/package.json b/packages/predicate/package.json index ad173a2921f..7dc604a19ec 100644 --- a/packages/predicate/package.json +++ b/packages/predicate/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/program/package.json b/packages/program/package.json index 03c23154ce5..9ae4bef773b 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -7,11 +7,9 @@ ".": "./src/index.ts", "./configs": "./src/configs.ts" }, + "types": "src/index.ts", "typesVersions": { "*": { - "*": [ - "./src/*" - ], "configs": [ "./src/configs.ts" ] @@ -20,11 +18,9 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "types": "dist/index.d.ts", "typesVersions": { "*": { - "*": [ - "./dist/index.d.ts" - ], "configs": [ "./dist/configs.d.ts" ] diff --git a/packages/providers/package.json b/packages/providers/package.json index a0d004cf76e..a8a21737947 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/script/package.json b/packages/script/package.json index 3d73b92fbde..38480e17e39 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/signer/package.json b/packages/signer/package.json index bbefe62b959..e70a4591d5a 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/sparsemerkle/package.json b/packages/sparsemerkle/package.json index cb9aaae34aa..4c94f85b1b3 100644 --- a/packages/sparsemerkle/package.json +++ b/packages/sparsemerkle/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/transactions/package.json b/packages/transactions/package.json index 5565166f8a3..8cf989166a8 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -7,11 +7,9 @@ ".": "./src/index.ts", "./configs": "./src/configs.ts" }, + "types": "src/index.ts", "typesVersions": { "*": { - "*": [ - "./src/*" - ], "configs": [ "./src/configs.ts" ] @@ -20,11 +18,9 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "types": "dist/index.d.ts", "typesVersions": { "*": { - "*": [ - "./dist/index.d.ts" - ], "configs": [ "./dist/configs.d.ts" ] diff --git a/packages/versions/package.json b/packages/versions/package.json index 8ba48127be9..497070ffda6 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -10,11 +10,9 @@ ".": "./src/index.ts", "./cli": "./src/cli.ts" }, + "types": "src/index.ts", "typesVersions": { "*": { - "*": [ - "./src/*" - ], "cli": [ "./src/cli.ts" ] @@ -26,11 +24,9 @@ "bin": { "fuels-versions": "dist/bin.js" }, + "types": "dist/index.d.ts", "typesVersions": { "*": { - "*": [ - "./dist/index.d.ts" - ], "cli": [ "./dist/cli.d.ts" ] diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index b98c0a11269..e648a362989 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 1055de3ef32..38b331fbd92 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -8,11 +8,9 @@ "./configs": "./src/configs.ts", "./test-utils": "./test/utils/index.ts" }, + "types": "src/index.ts", "typesVersions": { "*": { - "*": [ - "./src/*" - ], "configs": [ "./src/configs.ts" ], @@ -24,11 +22,9 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", + "types": "dist/index.d.ts", "typesVersions": { "*": { - "*": [ - "./dist/index.d.ts" - ], "configs": [ "./dist/configs.d.ts" ], diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index 84a7ef89aed..0076317257a 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -6,13 +6,7 @@ "exports": { ".": "./src/index.ts" }, - "typesVersions": { - "*": { - "*": [ - "./src/*" - ] - } - }, + "types": "src/index.ts", "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", From c7cd5418b5dcc07ec77a656dd2b5f9b765d02675 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 13:31:53 -0300 Subject: [PATCH 13/19] Injecting DTS imports for secondary-entry points --- packages/abi-typegen/package.json | 5 +++++ packages/address/package.json | 5 ++++- packages/fuels/package.json | 4 ++++ packages/math/package.json | 5 ++++- packages/program/package.json | 5 ++++- packages/transactions/package.json | 5 ++++- packages/versions/package.json | 6 +++++- packages/wallet/package.json | 6 +++++- 8 files changed, 35 insertions(+), 6 deletions(-) diff --git a/packages/abi-typegen/package.json b/packages/abi-typegen/package.json index acad56cdd18..cffd363b763 100644 --- a/packages/abi-typegen/package.json +++ b/packages/abi-typegen/package.json @@ -83,6 +83,11 @@ "scripts": { "build": "tsup --dts", "build:watch": "tsup --dts --watch", + "postbuild": "pnpm run inject:secondary:entrypoints", + "inject:secondary:entrypoints": "run-p inject:*", + "inject:configs": "echo \"import './configs.d.ts';\" >> ./dist/index.d.ts", + "inject:cli": "echo \"import './cli.d.ts';\" >> ./dist/index.d.ts", + "inject:runTypegen": "echo \"import './runTypegen.d.ts';\" >> ./dist/index.d.ts", "pretest": "pnpm forc build -p test/fixtures/forc-projects" } } diff --git a/packages/address/package.json b/packages/address/package.json index 5be38806927..44cf7ba6cd4 100644 --- a/packages/address/package.json +++ b/packages/address/package.json @@ -56,6 +56,9 @@ "@fuel-ts/testcases": "workspace:*" }, "scripts": { - "build": "tsup --dts" + "build": "tsup --dts", + "postbuild": "pnpm run inject:secondary:entrypoints", + "inject:secondary:entrypoints": "run-p inject:*", + "inject:configs": "echo \"import './configs.d.ts';\" >> ./dist/index.d.ts" } } diff --git a/packages/fuels/package.json b/packages/fuels/package.json index 35847744940..95a214e9ed0 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -82,6 +82,10 @@ "scripts": { "build": "tsup --dts", "build:watch": "tsup --dts --watch", + "postbuild": "pnpm run inject:secondary:entrypoints", + "inject:secondary:entrypoints": "run-p inject:*", + "inject:configs": "echo \"import './configs.d.ts';\" >> ./dist/index.d.ts", + "inject:cli": "echo \"import './cli.d.ts';\" >> ./dist/index.d.ts", "prepublishOnly": "cp ../../README.md ./README.md" } } diff --git a/packages/math/package.json b/packages/math/package.json index 06ab7a9a342..4180947db2b 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -44,7 +44,10 @@ ], "license": "Apache-2.0", "scripts": { - "build": "tsup --dts" + "build": "tsup --dts", + "postbuild": "pnpm run inject:secondary:entrypoints", + "inject:secondary:entrypoints": "run-p inject:*", + "inject:configs": "echo \"import './configs.d.ts';\" >> ./dist/index.d.ts" }, "dependencies": { "@types/bn.js": "^5.1.1", diff --git a/packages/program/package.json b/packages/program/package.json index 9ae4bef773b..001f44b2203 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -43,7 +43,10 @@ "dist" ], "scripts": { - "build": "tsup --dts" + "build": "tsup --dts", + "postbuild": "pnpm run inject:secondary:entrypoints", + "inject:secondary:entrypoints": "run-p inject:*", + "inject:configs": "echo \"import './configs.d.ts';\" >> ./dist/index.d.ts" }, "license": "Apache-2.0", "dependencies": { diff --git a/packages/transactions/package.json b/packages/transactions/package.json index 8cf989166a8..8528e122d72 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -51,6 +51,9 @@ "@fuel-ts/address": "workspace:*" }, "scripts": { - "build": "tsup --dts" + "build": "tsup --dts", + "postbuild": "pnpm run inject:secondary:entrypoints", + "inject:secondary:entrypoints": "run-p inject:*", + "inject:configs": "echo \"import './configs.d.ts';\" >> ./dist/index.d.ts" } } diff --git a/packages/versions/package.json b/packages/versions/package.json index 497070ffda6..f708642cb09 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -60,6 +60,10 @@ }, "scripts": { "prebuild": "ts-node ./scripts/rewriteVersions.ts", - "build": "tsup --dts" + "build": "tsup --dts", + "postbuild": "pnpm run inject:secondary:entrypoints", + "inject:secondary:entrypoints": "run-p inject:*", + "inject:configs": "echo \"import './configs.d.ts';\" >> ./dist/index.d.ts", + "inject:cli": "echo \"import './cli.d.ts';\" >> ./dist/index.d.ts" } } diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 38b331fbd92..518fc11dc75 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -74,6 +74,10 @@ "@fuel-ts/testcases": "workspace:*" }, "scripts": { - "build": "tsup --dts" + "build": "tsup --dts", + "postbuild": "pnpm run inject:secondary:entrypoints", + "inject:secondary:entrypoints": "run-p inject:*", + "inject:configs": "echo \"import './configs.d.ts';\" >> ./dist/index.d.ts", + "inject:test-utils": "echo \"import './test-utils.d.ts';\" >> ./dist/index.d.ts" } } From ac82474d0371d2645094f5527755df8e4c8ab1b2 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 13:39:15 -0300 Subject: [PATCH 14/19] Stop mixing `types` and `typesVersions` --- packages/abi-typegen/package.json | 8 ++++++-- packages/address/package.json | 8 ++++++-- packages/fuels/package.json | 8 ++++++-- packages/math/package.json | 8 ++++++-- packages/program/package.json | 8 ++++++-- packages/transactions/package.json | 8 ++++++-- packages/versions/package.json | 8 ++++++-- packages/wallet/package.json | 4 +++- 8 files changed, 45 insertions(+), 15 deletions(-) diff --git a/packages/abi-typegen/package.json b/packages/abi-typegen/package.json index cffd363b763..a5bdff3e10d 100644 --- a/packages/abi-typegen/package.json +++ b/packages/abi-typegen/package.json @@ -11,9 +11,11 @@ "./cli": "./src/cli.ts", "./runTypegen": "./src/runTypegen.ts" }, - "types": "src/index.ts", "typesVersions": { "*": { + "*": [ + "./src/*" + ], "cli": [ "./src/cli.ts" ], @@ -28,9 +30,11 @@ "bin": { "fuels-typegen": "dist/bin.js" }, - "types": "dist/index.d.ts", "typesVersions": { "*": { + "index.d.ts": [ + "./dist/index.d.ts" + ], "cli": [ "./dist/cli.d.ts" ], diff --git a/packages/address/package.json b/packages/address/package.json index 44cf7ba6cd4..6454571f6f8 100644 --- a/packages/address/package.json +++ b/packages/address/package.json @@ -7,9 +7,11 @@ ".": "./src/index.ts", "./configs": "./src/configs.ts" }, - "types": "src/index.ts", "typesVersions": { "*": { + "*": [ + "./src/*" + ], "configs": [ "./src/configs.ts" ] @@ -18,9 +20,11 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "typesVersions": { "*": { + "index.d.ts": [ + "./dist/index.d.ts" + ], "configs": [ "./dist/configs.ts" ] diff --git a/packages/fuels/package.json b/packages/fuels/package.json index 95a214e9ed0..11df3d565e2 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -11,9 +11,11 @@ "./cli": "./src/cli.ts", "./runTypegen": "./src/runTypegen.ts" }, - "types": "src/index.ts", "typesVersions": { "*": { + "*": [ + "./src/*" + ], "cli": [ "./src/cli.ts" ] @@ -25,9 +27,11 @@ "bin": { "fuels": "dist/bin.js" }, - "types": "dist/index.d.ts", "typesVersions": { "*": { + "index.d.ts": [ + "./dist/index.d.ts" + ], "cli": [ "./dist/cli.d.ts" ] diff --git a/packages/math/package.json b/packages/math/package.json index 4180947db2b..0f3aa4fcfc4 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -7,9 +7,11 @@ ".": "./src/index.ts", "./configs": "./src/configs.ts" }, - "types": "src/index.ts", "typesVersions": { "*": { + "*": [ + "./src/*" + ], "configs": [ "./src/configs.ts" ] @@ -18,9 +20,11 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "typesVersions": { "*": { + "index.d.ts": [ + "./dist/index.d.ts" + ], "configs": [ "./dist/configs.d.ts" ] diff --git a/packages/program/package.json b/packages/program/package.json index 001f44b2203..33819bdc571 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -7,9 +7,11 @@ ".": "./src/index.ts", "./configs": "./src/configs.ts" }, - "types": "src/index.ts", "typesVersions": { "*": { + "*": [ + "./src/*" + ], "configs": [ "./src/configs.ts" ] @@ -18,9 +20,11 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "typesVersions": { "*": { + "index.d.ts": [ + "./dist/index.d.ts" + ], "configs": [ "./dist/configs.d.ts" ] diff --git a/packages/transactions/package.json b/packages/transactions/package.json index 8528e122d72..d5b24fb5586 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -7,9 +7,11 @@ ".": "./src/index.ts", "./configs": "./src/configs.ts" }, - "types": "src/index.ts", "typesVersions": { "*": { + "*": [ + "./src/*" + ], "configs": [ "./src/configs.ts" ] @@ -18,9 +20,11 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "typesVersions": { "*": { + "index.d.ts": [ + "./dist/index.d.ts" + ], "configs": [ "./dist/configs.d.ts" ] diff --git a/packages/versions/package.json b/packages/versions/package.json index f708642cb09..2668d8945b1 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -10,9 +10,11 @@ ".": "./src/index.ts", "./cli": "./src/cli.ts" }, - "types": "src/index.ts", "typesVersions": { "*": { + "*": [ + "./src/*" + ], "cli": [ "./src/cli.ts" ] @@ -24,9 +26,11 @@ "bin": { "fuels-versions": "dist/bin.js" }, - "types": "dist/index.d.ts", "typesVersions": { "*": { + "index.d.ts": [ + "./dist/index.d.ts" + ], "cli": [ "./dist/cli.d.ts" ] diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 518fc11dc75..a3d4a19c395 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -22,9 +22,11 @@ "publishConfig": { "main": "dist/index.js", "module": "dist/index.mjs", - "types": "dist/index.d.ts", "typesVersions": { "*": { + "index.d.ts": [ + "./dist/index.d.ts" + ], "configs": [ "./dist/configs.d.ts" ], From 5af92a80dab4b6cab1b6f7d0b481ccf7cefbe102 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 14:43:39 -0300 Subject: [PATCH 15/19] Fine-tunning local `typesVersions` configs (ensuring valid paths) --- packages/abi-typegen/package.json | 4 ++-- packages/fuels/package.json | 4 ++-- packages/math/package.json | 4 ++-- packages/program/package.json | 4 ++-- packages/transactions/package.json | 4 ++-- packages/versions/package.json | 4 ++-- packages/wallet/package.json | 4 +++- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/abi-typegen/package.json b/packages/abi-typegen/package.json index a5bdff3e10d..c985b164a79 100644 --- a/packages/abi-typegen/package.json +++ b/packages/abi-typegen/package.json @@ -13,8 +13,8 @@ }, "typesVersions": { "*": { - "*": [ - "./src/*" + "index": [ + "./src/index.ts" ], "cli": [ "./src/cli.ts" diff --git a/packages/fuels/package.json b/packages/fuels/package.json index 11df3d565e2..34a6f62cfdc 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -13,8 +13,8 @@ }, "typesVersions": { "*": { - "*": [ - "./src/*" + "index": [ + "./src/index.ts" ], "cli": [ "./src/cli.ts" diff --git a/packages/math/package.json b/packages/math/package.json index 0f3aa4fcfc4..036c4277317 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -9,8 +9,8 @@ }, "typesVersions": { "*": { - "*": [ - "./src/*" + "index": [ + "./src/index.ts" ], "configs": [ "./src/configs.ts" diff --git a/packages/program/package.json b/packages/program/package.json index 33819bdc571..24ef57f008c 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -9,8 +9,8 @@ }, "typesVersions": { "*": { - "*": [ - "./src/*" + "index": [ + "./src/index.ts" ], "configs": [ "./src/configs.ts" diff --git a/packages/transactions/package.json b/packages/transactions/package.json index d5b24fb5586..6e672c4852e 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -9,8 +9,8 @@ }, "typesVersions": { "*": { - "*": [ - "./src/*" + "index": [ + "./src/index.ts" ], "configs": [ "./src/configs.ts" diff --git a/packages/versions/package.json b/packages/versions/package.json index 2668d8945b1..97b733ee66c 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -12,8 +12,8 @@ }, "typesVersions": { "*": { - "*": [ - "./src/*" + "index": [ + "./src/index.ts" ], "cli": [ "./src/cli.ts" diff --git a/packages/wallet/package.json b/packages/wallet/package.json index a3d4a19c395..c30d7beea35 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -8,9 +8,11 @@ "./configs": "./src/configs.ts", "./test-utils": "./test/utils/index.ts" }, - "types": "src/index.ts", "typesVersions": { "*": { + "index": [ + "./src/index.ts" + ], "configs": [ "./src/configs.ts" ], From d89c0332a782a9cf5c5fe48fe18534cae25225b4 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 15:03:24 -0300 Subject: [PATCH 16/19] Removing [apparently] obsolete type references --- packages/abi-typegen/src/index.ts | 8 -------- packages/address/src/index.ts | 7 ------- packages/fuels/src/index.ts | 7 ------- packages/math/src/index.ts | 7 ------- packages/program/src/index.ts | 7 ------- packages/providers/src/index.ts | 2 -- packages/transactions/src/index.ts | 7 ------- packages/versions/src/index.ts | 7 ------- packages/wallet/src/index.ts | 8 -------- 9 files changed, 60 deletions(-) diff --git a/packages/abi-typegen/src/index.ts b/packages/abi-typegen/src/index.ts index 0b9faf30765..b6da0abaa43 100644 --- a/packages/abi-typegen/src/index.ts +++ b/packages/abi-typegen/src/index.ts @@ -1,11 +1,3 @@ -/* eslint-disable @typescript-eslint/triple-slash-reference */ - -/** - * Referencing secondary entry-points - */ -/// -/// - export * from './AbiTypeGen'; export * from './types/interfaces/IFile'; diff --git a/packages/address/src/index.ts b/packages/address/src/index.ts index 7ca4eaba808..5be958e4314 100644 --- a/packages/address/src/index.ts +++ b/packages/address/src/index.ts @@ -1,9 +1,2 @@ -/* eslint-disable @typescript-eslint/triple-slash-reference */ - -/** - * Referencing secondary entry-points - */ -/// - export * from './utils'; export { default as Address } from './address'; diff --git a/packages/fuels/src/index.ts b/packages/fuels/src/index.ts index c53a0826c79..70afb7ffbc7 100644 --- a/packages/fuels/src/index.ts +++ b/packages/fuels/src/index.ts @@ -1,10 +1,3 @@ -/* eslint-disable @typescript-eslint/triple-slash-reference */ - -/** - * Referencing secondary entry-points - */ -/// - export * from '@ethersproject/bytes'; export * from '@fuel-ts/abi-coder'; export * from '@fuel-ts/address'; diff --git a/packages/math/src/index.ts b/packages/math/src/index.ts index 826dc79c756..2b3c119592e 100644 --- a/packages/math/src/index.ts +++ b/packages/math/src/index.ts @@ -1,10 +1,3 @@ -/* eslint-disable @typescript-eslint/triple-slash-reference */ - -/** - * Referencing secondary entry-points - */ -/// - export * from './bn'; export * from './decimal'; export * from './functional'; diff --git a/packages/program/src/index.ts b/packages/program/src/index.ts index 7d41884577c..7e7b56b318b 100644 --- a/packages/program/src/index.ts +++ b/packages/program/src/index.ts @@ -1,10 +1,3 @@ -/* eslint-disable @typescript-eslint/triple-slash-reference */ - -/** - * Referencing secondary entry-points - */ -/// - export * from './types'; export * from './utils'; export * from './errors'; diff --git a/packages/providers/src/index.ts b/packages/providers/src/index.ts index 1b1af88663d..7d46b0c8cd3 100644 --- a/packages/providers/src/index.ts +++ b/packages/providers/src/index.ts @@ -1,5 +1,3 @@ -/// - export * from './coin-quantity'; export * from './coin'; export * from './provider'; diff --git a/packages/transactions/src/index.ts b/packages/transactions/src/index.ts index 5363d15d0ab..c182a61a286 100644 --- a/packages/transactions/src/index.ts +++ b/packages/transactions/src/index.ts @@ -1,10 +1,3 @@ -/* eslint-disable @typescript-eslint/triple-slash-reference */ - -/** - * Referencing secondary entry-points - */ -/// - export * from './coders/input'; export * from './coders/output'; export * from './coders/receipt'; diff --git a/packages/versions/src/index.ts b/packages/versions/src/index.ts index 668dd56972c..3d0ed204664 100644 --- a/packages/versions/src/index.ts +++ b/packages/versions/src/index.ts @@ -1,10 +1,3 @@ -/* eslint-disable @typescript-eslint/triple-slash-reference */ - -/** - * Referencing secondary entry-points - */ -/// - /* 1) Variables ------------ diff --git a/packages/wallet/src/index.ts b/packages/wallet/src/index.ts index ef34430f241..9e755c6bed0 100644 --- a/packages/wallet/src/index.ts +++ b/packages/wallet/src/index.ts @@ -1,11 +1,3 @@ -/* eslint-disable @typescript-eslint/triple-slash-reference */ - -/** - * Referencing secondary entry-points - */ -/// -/// - export * from './base-unlocked-wallet'; export * from './account'; export * from './wallet'; From c78a950fc93fd629025d8c84add8b6ad85e29201 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 15:08:50 -0300 Subject: [PATCH 17/19] Re-adding [mistakenly deleted] graphql types --- packages/providers/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/providers/src/index.ts b/packages/providers/src/index.ts index 7d46b0c8cd3..f0d155ce863 100644 --- a/packages/providers/src/index.ts +++ b/packages/providers/src/index.ts @@ -1,3 +1,5 @@ +/// + export * from './coin-quantity'; export * from './coin'; export * from './provider'; From c1a483394b57e05b9bf613a798576ad9be4c3a0c Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 15:13:16 -0300 Subject: [PATCH 18/19] Tyop --- packages/providers/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/providers/src/index.ts b/packages/providers/src/index.ts index f0d155ce863..1b1af88663d 100644 --- a/packages/providers/src/index.ts +++ b/packages/providers/src/index.ts @@ -1,4 +1,4 @@ -/// +/// export * from './coin-quantity'; export * from './coin'; From 2051dabbca65aaa982ce064f21b41bfc6e471206 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Sun, 16 Apr 2023 16:23:10 -0300 Subject: [PATCH 19/19] Disabling PR release --- .github/workflows/pr-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-release.yaml b/.github/workflows/pr-release.yaml index d7291bad39f..dfb450b5430 100644 --- a/.github/workflows/pr-release.yaml +++ b/.github/workflows/pr-release.yaml @@ -8,7 +8,7 @@ jobs: name: "Release PR to npm" runs-on: ubuntu-latest # comment out if:false to enable release PR to npm - # if: false + if: false permissions: write-all steps: - name: Checkout