From 578e532edf8904c388cfaffb24276b21c2ea77f7 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Wed, 8 Nov 2023 07:12:32 -0300 Subject: [PATCH 1/6] Removing `pnpm` configs from all `package.json`, except the root one --- packages/abi-coder/package.json | 4 +--- packages/abi-typegen/package.json | 4 +--- packages/address/package.json | 4 +--- packages/contract/package.json | 4 +--- packages/crypto/package.json | 4 +--- packages/errors/package.json | 4 +--- packages/fuels/package.json | 4 +--- packages/hasher/package.json | 4 +--- packages/hdwallet/package.json | 4 +--- packages/interfaces/package.json | 4 +--- packages/math/package.json | 4 +--- packages/merkle/package.json | 4 +--- packages/mnemonic/package.json | 4 +--- packages/predicate/package.json | 4 +--- packages/program/package.json | 4 +--- packages/providers/package.json | 4 +--- packages/script/package.json | 4 +--- packages/signer/package.json | 4 +--- packages/transactions/package.json | 4 +--- packages/utils/package.json | 4 +--- packages/versions/package.json | 4 +--- packages/wallet-manager/package.json | 4 +--- packages/wallet/package.json | 4 +--- packages/wordlists/package.json | 4 +--- 24 files changed, 24 insertions(+), 72 deletions(-) diff --git a/packages/abi-coder/package.json b/packages/abi-coder/package.json index dd925254005..3f6044ee3e0 100644 --- a/packages/abi-coder/package.json +++ b/packages/abi-coder/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/abi-typegen/package.json b/packages/abi-typegen/package.json index 47b180faadc..f89f7e3f725 100644 --- a/packages/abi-typegen/package.json +++ b/packages/abi-typegen/package.json @@ -10,10 +10,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/address/package.json b/packages/address/package.json index c98d225e8c0..c19fb131bae 100644 --- a/packages/address/package.json +++ b/packages/address/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/contract/package.json b/packages/contract/package.json index fb245c809ab..6f5d7004f71 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/crypto/package.json b/packages/crypto/package.json index aca91a955c2..b6d01fb8e01 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "browser": { "./dist/index.mjs": "./dist/index.browser.mjs" }, diff --git a/packages/errors/package.json b/packages/errors/package.json index 19f53110af0..fe280297cc8 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/fuels/package.json b/packages/fuels/package.json index e1bad858189..602d645df8b 100644 --- a/packages/fuels/package.json +++ b/packages/fuels/package.json @@ -10,10 +10,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/hasher/package.json b/packages/hasher/package.json index 8bfdf9f3d2b..1682c43d79f 100644 --- a/packages/hasher/package.json +++ b/packages/hasher/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/hdwallet/package.json b/packages/hdwallet/package.json index d27e04c0ad2..c03d05ebd74 100644 --- a/packages/hdwallet/package.json +++ b/packages/hdwallet/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json index 6e68c5e646a..4c03ac8854c 100644 --- a/packages/interfaces/package.json +++ b/packages/interfaces/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/math/package.json b/packages/math/package.json index 9ab2832934e..5461fc27efe 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/merkle/package.json b/packages/merkle/package.json index 4b7d09d25de..70ef0d3efa5 100644 --- a/packages/merkle/package.json +++ b/packages/merkle/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/mnemonic/package.json b/packages/mnemonic/package.json index 9392bf28c5f..d18ed125d52 100644 --- a/packages/mnemonic/package.json +++ b/packages/mnemonic/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/predicate/package.json b/packages/predicate/package.json index fada3396c60..307c8e0814e 100644 --- a/packages/predicate/package.json +++ b/packages/predicate/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/program/package.json b/packages/program/package.json index d664983b4f0..280a3015fcf 100644 --- a/packages/program/package.json +++ b/packages/program/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/providers/package.json b/packages/providers/package.json index f48288c09b0..7c4a09a3aa7 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/script/package.json b/packages/script/package.json index f5e2afef95c..1f5af4bcc86 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/signer/package.json b/packages/signer/package.json index cc0a7315f61..73374e58c5e 100644 --- a/packages/signer/package.json +++ b/packages/signer/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/transactions/package.json b/packages/transactions/package.json index fdc0c0063ce..0b5a06a93e7 100644 --- a/packages/transactions/package.json +++ b/packages/transactions/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index d479115455c..1b89b1ee7db 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/versions/package.json b/packages/versions/package.json index f94b69ab6cd..6d2aed07f2b 100644 --- a/packages/versions/package.json +++ b/packages/versions/package.json @@ -10,10 +10,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/wallet-manager/package.json b/packages/wallet-manager/package.json index 9ed91d13245..016986cce65 100644 --- a/packages/wallet-manager/package.json +++ b/packages/wallet-manager/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 1ea081e49a3..92ca9534a86 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -7,10 +7,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", diff --git a/packages/wordlists/package.json b/packages/wordlists/package.json index 82e63decbe6..67aa15bbd79 100644 --- a/packages/wordlists/package.json +++ b/packages/wordlists/package.json @@ -8,10 +8,8 @@ "module": "dist/index.mjs", "types": "dist/index.d.ts", "engines": { - "node": "^18.14.1", - "pnpm": "^8.9.0" + "node": "^18.14.1" }, - "packageManager": "pnpm@8.9.0", "exports": { ".": { "require": "./dist/index.js", From 8ec8d3b9da42a4c7b601c95e5ec70caa3e9cf7cd Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Wed, 8 Nov 2023 07:12:38 -0300 Subject: [PATCH 2/6] Adjusting linter --- scripts/lint-package-jsons.ts | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/lint-package-jsons.ts b/scripts/lint-package-jsons.ts index d9a6d7ce03c..01a9a91fa65 100644 --- a/scripts/lint-package-jsons.ts +++ b/scripts/lint-package-jsons.ts @@ -7,15 +7,12 @@ interface PackageJson { author: string; engines: { node: string; - pnpm: string; }; - packageManager: string; } const { author, - engines: { node, pnpm }, - packageManager, + engines: { node }, } = JSON.parse(readFileSync('package.json', 'utf-8')) as PackageJson; const expectedAuthor = 'Fuel Labs (https://fuel.network/)'; @@ -29,19 +26,13 @@ const faultyPackageJsons = globSync(`{packages,apps}/*/package.json`) .filter((path) => !/\/forc|fuel-core\//.test(path)) .filter((path) => { const json = JSON.parse(readFileSync(path, 'utf-8')) as PackageJson; - return json.private - ? false - : json.author !== author || - json.engines.node !== node || - json.packageManager !== packageManager || - json.engines.pnpm !== pnpm; + return json.private ? false : json.author !== author || json.engines.node !== node; }); if (faultyPackageJsons.length) { const expectedConfigs = { author, - engines: { node, pnpm }, - packageManager, + engines: { node }, }; error( From f1bc7fa6ee88d97f22f63e7b7f4c160e942e1068 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Wed, 8 Nov 2023 07:12:48 -0300 Subject: [PATCH 3/6] Adding [empty] changeset --- .changeset/afraid-carrots-grow.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changeset/afraid-carrots-grow.md diff --git a/.changeset/afraid-carrots-grow.md b/.changeset/afraid-carrots-grow.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/afraid-carrots-grow.md @@ -0,0 +1,2 @@ +--- +--- From 9e4f4dbdae53d0be8a800627934d6f1e574b9145 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Wed, 8 Nov 2023 07:12:54 -0300 Subject: [PATCH 4/6] Enabling PR auto-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 9b48fc2352a..34ad25146b1 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 81abc6b2f0049ac2c1489b962d718c9faa1c95b3 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Wed, 8 Nov 2023 08:55:27 -0300 Subject: [PATCH 5/6] Disabling PR auto-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 34ad25146b1..9b48fc2352a 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 7d54c56a2b608f1ff5f5377c3cd64a54baa262e3 Mon Sep 17 00:00:00 2001 From: Anderson Arboleya Date: Wed, 8 Nov 2023 09:20:29 -0300 Subject: [PATCH 6/6] Re-generating proper changeset --- .changeset/afraid-carrots-grow.md | 2 -- .changeset/tough-pots-wave.md | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) delete mode 100644 .changeset/afraid-carrots-grow.md create mode 100644 .changeset/tough-pots-wave.md diff --git a/.changeset/afraid-carrots-grow.md b/.changeset/afraid-carrots-grow.md deleted file mode 100644 index a845151cc84..00000000000 --- a/.changeset/afraid-carrots-grow.md +++ /dev/null @@ -1,2 +0,0 @@ ---- ---- diff --git a/.changeset/tough-pots-wave.md b/.changeset/tough-pots-wave.md new file mode 100644 index 00000000000..ed041c2bec6 --- /dev/null +++ b/.changeset/tough-pots-wave.md @@ -0,0 +1,28 @@ +--- +"@fuel-ts/abi-coder": patch +"@fuel-ts/abi-typegen": patch +"@fuel-ts/address": patch +"@fuel-ts/contract": patch +"@fuel-ts/crypto": patch +"@fuel-ts/errors": patch +"fuels": patch +"@fuel-ts/hasher": patch +"@fuel-ts/hdwallet": patch +"@fuel-ts/interfaces": patch +"@fuel-ts/math": patch +"@fuel-ts/merkle": patch +"@fuel-ts/mnemonic": patch +"@fuel-ts/predicate": patch +"@fuel-ts/program": patch +"@fuel-ts/providers": patch +"@fuel-ts/script": patch +"@fuel-ts/signer": patch +"@fuel-ts/transactions": patch +"@fuel-ts/utils": patch +"@fuel-ts/versions": patch +"@fuel-ts/wallet": patch +"@fuel-ts/wallet-manager": patch +"@fuel-ts/wordlists": patch +--- + +Adjusting package manager configs