From ae2c44b9c54f8841ea3e749d0768251a74a2bc54 Mon Sep 17 00:00:00 2001 From: John Cub Date: Sat, 18 Jun 2022 22:59:25 +0300 Subject: [PATCH 1/4] chore: revert linking changes --- packages/abi-coder/package.json | 19 +++++++++++-------- packages/constants/package.json | 19 +++++++++++-------- packages/contract/package.json | 19 +++++++++++-------- packages/fuels/package.json | 19 +++++++++++-------- packages/hasher/package.json | 19 +++++++++++-------- packages/hdwallet/package.json | 19 +++++++++++-------- packages/interfaces/package.json | 19 +++++++++++-------- packages/keystore/package.json | 19 +++++++++++-------- packages/math/package.json | 19 +++++++++++-------- packages/merkle-shared/package.json | 19 +++++++++++-------- packages/merkle/package.json | 19 +++++++++++-------- packages/merklesum/package.json | 19 +++++++++++-------- packages/mnemonic/package.json | 19 +++++++++++-------- packages/providers/package.json | 19 +++++++++++-------- packages/script/package.json | 19 +++++++++++-------- packages/signer/package.json | 19 +++++++++++-------- packages/sparsemerkle/package.json | 19 +++++++++++-------- packages/transactions/package.json | 19 +++++++++++-------- packages/wallet-manager/package.json | 19 +++++++++++-------- packages/wallet/package.json | 19 +++++++++++-------- packages/wordlists/package.json | 19 +++++++++++-------- pnpm-workspace.yaml | 1 - 22 files changed, 231 insertions(+), 169 deletions(-) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index 48e75b33c6..b4ed2f14c7 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/constants/package.json b/packages/constants/package.json index a0b2d303d0..7358e316e7 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/contract/package.json b/packages/contract/package.json index 30ba2ae6b1..381e94997c 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/fuels/package.json b/packages/fuels/package.json index ec278c7204..30f74c5924 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/hasher/package.json b/packages/hasher/package.json index 8d89ef81a8..5a657519d2 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -4,14 +4,17 @@ "description": "Sha256 hash utility for Fuel", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "./src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index c1d9532b27..ac30f61d29 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -4,14 +4,17 @@ "description": "The Hierarchal Desterministic (HD) Wallet", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "./src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index a8b12efafe..c0be1a4e19 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/keystore/package.json b/packages/keystore/package.json index 90cbae002c..7989a34efc 100644 --- a/packages/keystore/package.json +++ b/packages/keystore/package.json @@ -4,14 +4,17 @@ "description": "Utilities for encrypting and decrypting data", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "./src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/math/package.json b/packages/math/package.json index d7588344be..9f82219c67 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/merkle-shared/package.json b/packages/merkle-shared/package.json index 4b40b10da9..93b3faa45d 100644 --- a/packages/merkle-shared/package.json +++ b/packages/merkle-shared/package.json @@ -3,14 +3,17 @@ "version": "0.7.0", "description": "", "author": "Fuel Labs (https://fuel.network/)", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/merkle/package.json b/packages/merkle/package.json index 9d73730a3e..2e554da279 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/merklesum/package.json b/packages/merklesum/package.json index a89bac2df5..eef17bfc33 100644 --- a/packages/merklesum/package.json +++ b/packages/merklesum/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index 2125df8194..1576ea6672 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -4,14 +4,17 @@ "description": "Mnemonic implementation from BIP39", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "./src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/providers/package.json b/packages/providers/package.json index 8a12e2b66a..42b1bcf08d 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "./src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/script/package.json b/packages/script/package.json index b2a3ab5959..3720648747 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/signer/package.json b/packages/signer/package.json index 276846a49a..eebee4cef2 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -4,14 +4,17 @@ "description": "Secp256k1 signer for the Fuel Network", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "./src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/sparsemerkle/package.json b/packages/sparsemerkle/package.json index 8978c0302a..2e019fd94c 100644 --- a/packages/sparsemerkle/package.json +++ b/packages/sparsemerkle/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/transactions/package.json b/packages/transactions/package.json index 65079f9392..710eed9ac2 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "./src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index 2e51a2f151..5f3338f068 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "./src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/wallet/package.json b/packages/wallet/package.json index d0897ecbe4..7b73a7c26d 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -4,14 +4,17 @@ "description": "", "author": "Fuel Labs (https://fuel.network/)", "typedocMain": "./src/index.ts", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index a953c2f0ea..f4830caae7 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -3,14 +3,17 @@ "version": "0.7.0", "description": "", "author": "Fuel Labs (https://fuel.network/)", - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", - "typings": "dist/index.d.ts", - "exports": { - ".": { - "require": "./dist/index.js", - "default": "./dist/index.mjs" + "main": "src/index.ts", + "publishConfig": { + "main": "dist/index.js", + "module": "dist/index.mjs.js", + "types": "dist/index.d.ts", + "typings": "dist/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "default": "./dist/index.mjs.js" + } } }, "files": [ diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index d9e7c0d1f8..dee51e928d 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,2 @@ -link-workspace-packages: deep packages: - "packages/*" From cc2813804f3afa3fb5223c44ae2e7a664c59fd9e Mon Sep 17 00:00:00 2001 From: John Cub Date: Sun, 19 Jun 2022 02:48:34 +0300 Subject: [PATCH 2/4] chore: fix test launch config --- .vscode/launch.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 840742c2b6..7b10da99fa 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,14 +2,21 @@ "configurations": [ { "type": "node", - "name": "vscode-jest-tests", + "name": "vscode-jest-tests.v2", "request": "launch", "console": "integratedTerminal", "internalConsoleOptions": "neverOpen", "disableOptimisticBPs": true, - "program": "node_modules/.bin/jest", + "program": "${workspaceFolder}/node_modules/jest/bin/jest.js", "cwd": "${workspaceFolder}", - "args": ["--runInBand", "--watchAll=false"] + "args": [ + "--runInBand", + "--watchAll=false", + "--testNamePattern", + "${jest.testNamePattern}", + "--runTestsByPath", + "${jest.testFile}" + ] } ] } From 22280f81e59105cbcd5ef3285ef90b50755a9909 Mon Sep 17 00:00:00 2001 From: John Cub Date: Thu, 23 Jun 2022 17:14:03 +0300 Subject: [PATCH 3/4] chore: simplify `contract` package `.gitignore` --- packages/contract/.gitignore | 1 - packages/contract/scripts/process-multicall.ts | 2 +- packages/contract/src/scripts.ts | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/contract/.gitignore b/packages/contract/.gitignore index 3c293168ab..f94080337d 100644 --- a/packages/contract/.gitignore +++ b/packages/contract/.gitignore @@ -1,3 +1,2 @@ # Forc **/out/debug/** -/src/multicall/index.ts diff --git a/packages/contract/scripts/process-multicall.ts b/packages/contract/scripts/process-multicall.ts index 897faca694..9115d74d51 100644 --- a/packages/contract/scripts/process-multicall.ts +++ b/packages/contract/scripts/process-multicall.ts @@ -8,4 +8,4 @@ const srcPath = path.join(__dirname, '../src'); const binPath = path.join(srcPath, './multicall/out/debug/multicall.bin'); const bytes = fs.readFileSync(binPath); const indexTs = `export default '${hexlify(bytes)}';\n`; -fs.writeFileSync(path.join(srcPath, './multicall/index.ts'), indexTs); +fs.writeFileSync(path.join(srcPath, './multicall/out/debug/multicall-bin.ts'), indexTs); diff --git a/packages/contract/src/scripts.ts b/packages/contract/src/scripts.ts index 9f5ee341aa..502db3dfde 100644 --- a/packages/contract/src/scripts.ts +++ b/packages/contract/src/scripts.ts @@ -7,8 +7,8 @@ import type { BigNumberish } from '@fuel-ts/math'; import { ReceiptType } from '@fuel-ts/providers'; import { Script } from '@fuel-ts/script'; -import contractCallScriptBin from './multicall'; import contractCallScriptAbi from './multicall/out/debug/multicall-abi.json'; +import contractCallScriptBin from './multicall/out/debug/multicall-bin'; export type ContractCall = { contractId: BytesLike; From e73ead14d181a850d3fe87202e02422e89c5d8b2 Mon Sep 17 00:00:00 2001 From: John Cub Date: Thu, 23 Jun 2022 17:14:07 +0300 Subject: [PATCH 4/4] chore: cleanup --- packages/script/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/script/.gitignore b/packages/script/.gitignore index 345d8f7c27..f94080337d 100644 --- a/packages/script/.gitignore +++ b/packages/script/.gitignore @@ -1,3 +1,2 @@ # Forc **/out/debug/** -/src/call-test-script/index.ts