From ee562b99e5794c652dd67e89839b969e14e6c8a9 Mon Sep 17 00:00:00 2001 From: yyyyaaa Date: Tue, 11 Jun 2024 12:10:12 +0700 Subject: [PATCH 1/4] chore: add some yarn4 config files --- examples/asset-list/.yarnrc.yml | 1 + examples/asset-list/package.json | 5 +++-- examples/authz/.yarnrc.yml | 1 + examples/authz/package.json | 3 ++- examples/ibc-transfer/.yarnrc.yml | 1 + examples/ibc-transfer/package.json | 3 ++- examples/nft/.yarnrc.yml | 1 + examples/nft/package.json | 3 ++- examples/stake-tokens/.yarnrc.yml | 1 + examples/stake-tokens/package.json | 3 ++- examples/swap-tokens/.yarnrc.yml | 1 + examples/swap-tokens/package.json | 3 ++- examples/telescope/.yarnrc.yml | 1 + examples/telescope/package.json | 3 ++- examples/vote-proposal/.yarnrc.yml | 1 + examples/vote-proposal/package.json | 3 ++- templates/connect-chain/.yarnrc.yml | 1 + templates/connect-chain/package.json | 3 ++- templates/connect-multi-chain/.yarnrc.yml | 1 + templates/connect-multi-chain/package.json | 3 ++- 20 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 examples/asset-list/.yarnrc.yml create mode 100644 examples/authz/.yarnrc.yml create mode 100644 examples/ibc-transfer/.yarnrc.yml create mode 100644 examples/nft/.yarnrc.yml create mode 100644 examples/stake-tokens/.yarnrc.yml create mode 100644 examples/swap-tokens/.yarnrc.yml create mode 100644 examples/telescope/.yarnrc.yml create mode 100644 examples/vote-proposal/.yarnrc.yml create mode 100644 templates/connect-chain/.yarnrc.yml create mode 100644 templates/connect-multi-chain/.yarnrc.yml diff --git a/examples/asset-list/.yarnrc.yml b/examples/asset-list/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/examples/asset-list/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/examples/asset-list/package.json b/examples/asset-list/package.json index 7743d2b9b..5fa3c9f13 100644 --- a/examples/asset-list/package.json +++ b/examples/asset-list/package.json @@ -52,5 +52,6 @@ "eslint-config-next": "^14.1.0", "generate-lockfile": "0.0.12", "typescript": "^5.1.6" - } -} + }, + "packageManager": "yarn@4.3.0" +} \ No newline at end of file diff --git a/examples/authz/.yarnrc.yml b/examples/authz/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/examples/authz/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/examples/authz/package.json b/examples/authz/package.json index bc072b4b9..c58f2df2a 100644 --- a/examples/authz/package.json +++ b/examples/authz/package.json @@ -80,5 +80,6 @@ "sinon": "17.0.1", "ts-jest": "^29.1.0", "typescript": "^5.1.6" - } + }, + "packageManager": "yarn@4.3.0" } diff --git a/examples/ibc-transfer/.yarnrc.yml b/examples/ibc-transfer/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/examples/ibc-transfer/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/examples/ibc-transfer/package.json b/examples/ibc-transfer/package.json index 65dfc9cb2..afc70c31c 100644 --- a/examples/ibc-transfer/package.json +++ b/examples/ibc-transfer/package.json @@ -52,5 +52,6 @@ "eslint-config-next": "^14.1.0", "generate-lockfile": "0.0.12", "typescript": "^5.1.6" - } + }, + "packageManager": "yarn@4.3.0" } diff --git a/examples/nft/.yarnrc.yml b/examples/nft/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/examples/nft/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/examples/nft/package.json b/examples/nft/package.json index 347e975f2..1d7cc7213 100644 --- a/examples/nft/package.json +++ b/examples/nft/package.json @@ -53,5 +53,6 @@ "eslint-config-next": "14.1.0", "generate-lockfile": "0.0.12", "typescript": "^5.1.6" - } + }, + "packageManager": "yarn@4.3.0" } diff --git a/examples/stake-tokens/.yarnrc.yml b/examples/stake-tokens/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/examples/stake-tokens/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/examples/stake-tokens/package.json b/examples/stake-tokens/package.json index 8a4d243d6..103416467 100644 --- a/examples/stake-tokens/package.json +++ b/examples/stake-tokens/package.json @@ -38,5 +38,6 @@ "eslint-config-next": "14.1.0", "generate-lockfile": "0.0.12", "typescript": "^5.1.6" - } + }, + "packageManager": "yarn@4.3.0" } diff --git a/examples/swap-tokens/.yarnrc.yml b/examples/swap-tokens/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/examples/swap-tokens/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/examples/swap-tokens/package.json b/examples/swap-tokens/package.json index d7a90f114..a6a47596f 100644 --- a/examples/swap-tokens/package.json +++ b/examples/swap-tokens/package.json @@ -50,5 +50,6 @@ "eslint-config-next": "13.0.5", "generate-lockfile": "0.0.12", "typescript": "^5.1.6" - } + }, + "packageManager": "yarn@4.3.0" } diff --git a/examples/telescope/.yarnrc.yml b/examples/telescope/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/examples/telescope/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/examples/telescope/package.json b/examples/telescope/package.json index 9d4f42c38..3637234f3 100644 --- a/examples/telescope/package.json +++ b/examples/telescope/package.json @@ -63,5 +63,6 @@ "eslint-config-next": "13.0.5", "generate-lockfile": "0.0.12", "typescript": "^5.1.6" - } + }, + "packageManager": "yarn@4.3.0" } diff --git a/examples/vote-proposal/.yarnrc.yml b/examples/vote-proposal/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/examples/vote-proposal/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/examples/vote-proposal/package.json b/examples/vote-proposal/package.json index de10236a8..61bfea1ec 100644 --- a/examples/vote-proposal/package.json +++ b/examples/vote-proposal/package.json @@ -45,5 +45,6 @@ "eslint-config-next": "13.0.5", "generate-lockfile": "0.0.12", "typescript": "^5.1.6" - } + }, + "packageManager": "yarn@4.3.0" } diff --git a/templates/connect-chain/.yarnrc.yml b/templates/connect-chain/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/templates/connect-chain/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/templates/connect-chain/package.json b/templates/connect-chain/package.json index 9295c745f..1caa95df3 100644 --- a/templates/connect-chain/package.json +++ b/templates/connect-chain/package.json @@ -41,5 +41,6 @@ "eslint-config-next": "13.0.5", "generate-lockfile": "0.0.12", "typescript": "^5.1.6" - } + }, + "packageManager": "yarn@4.3.0" } diff --git a/templates/connect-multi-chain/.yarnrc.yml b/templates/connect-multi-chain/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/templates/connect-multi-chain/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/templates/connect-multi-chain/package.json b/templates/connect-multi-chain/package.json index 8c66a5575..93846d6b4 100644 --- a/templates/connect-multi-chain/package.json +++ b/templates/connect-multi-chain/package.json @@ -44,5 +44,6 @@ "eslint-config-next": "13.0.5", "generate-lockfile": "0.0.12", "typescript": "^5.1.6" - } + }, + "packageManager": "yarn@4.3.0" } From 4140a3b79baa5eb7aa6ef2459d0f3370c2618a02 Mon Sep 17 00:00:00 2001 From: yyyyaaa Date: Tue, 11 Jun 2024 12:10:39 +0700 Subject: [PATCH 2/4] ci: use yarn 4 for testing --- .github/workflows/run-tests.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 885f8e3e3..8335e9d35 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -11,15 +11,14 @@ jobs: runs-on: ubuntu-latest steps: - # TODO: build global from the repo itself - # - name: Checkout Repository 🛎️ - # uses: actions/checkout@v4 - - name: Setup Node.js uses: actions/setup-node@v4 with: node-version: '20.x' + - name: Set up Yarn + uses: threeal/setup-yarn-action@v2.0.0 + - name: Install Dependencies run: npm install -g create-cosmos-app @@ -35,11 +34,11 @@ jobs: cd vote-proposal yarn build - # - name: ibc-transfer - # run: | - # cca --example ibc-transfer --name ibc-transfer - # cd ibc-transfer - # yarn build + - name: ibc-transfer + run: | + cca --example ibc-transfer --name ibc-transfer + cd ibc-transfer + yarn build - name: swap-tokens run: | From b16c04c3a920ce744796fd251afaeb0f9224251b Mon Sep 17 00:00:00 2001 From: yyyyaaa Date: Tue, 11 Jun 2024 12:40:00 +0700 Subject: [PATCH 3/4] chore: generate lockfile --- examples/authz/yarn.lock | 4 ++-- examples/ibc-transfer/yarn.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/authz/yarn.lock b/examples/authz/yarn.lock index 84c0ec8f2..7da1d8c94 100644 --- a/examples/authz/yarn.lock +++ b/examples/authz/yarn.lock @@ -15978,11 +15978,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard diff --git a/examples/ibc-transfer/yarn.lock b/examples/ibc-transfer/yarn.lock index 83bce7f7c..ee954c3e7 100644 --- a/examples/ibc-transfer/yarn.lock +++ b/examples/ibc-transfer/yarn.lock @@ -10590,11 +10590,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard From 48708d26ae11515e7c1b78d7e005a706d90cc98f Mon Sep 17 00:00:00 2001 From: yyyyaaa Date: Tue, 11 Jun 2024 12:45:20 +0700 Subject: [PATCH 4/4] chore: lockfile --- examples/asset-list/package.json | 2 +- examples/asset-list/yarn.lock | 4 ++-- examples/nft/yarn.lock | 4 ++-- examples/stake-tokens/yarn.lock | 4 ++-- examples/swap-tokens/yarn.lock | 4 ++-- examples/telescope/yarn.lock | 4 ++-- examples/vote-proposal/yarn.lock | 4 ++-- templates/connect-chain/yarn.lock | 4 ++-- templates/connect-multi-chain/yarn.lock | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/asset-list/package.json b/examples/asset-list/package.json index 5fa3c9f13..c5d0a06d9 100644 --- a/examples/asset-list/package.json +++ b/examples/asset-list/package.json @@ -54,4 +54,4 @@ "typescript": "^5.1.6" }, "packageManager": "yarn@4.3.0" -} \ No newline at end of file +} diff --git a/examples/asset-list/yarn.lock b/examples/asset-list/yarn.lock index 1b5ed1f9c..e9621f400 100644 --- a/examples/asset-list/yarn.lock +++ b/examples/asset-list/yarn.lock @@ -10513,11 +10513,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard diff --git a/examples/nft/yarn.lock b/examples/nft/yarn.lock index 92ac0426d..fc7ab3cfb 100644 --- a/examples/nft/yarn.lock +++ b/examples/nft/yarn.lock @@ -13463,11 +13463,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard diff --git a/examples/stake-tokens/yarn.lock b/examples/stake-tokens/yarn.lock index d8463d0da..d7b50eb21 100644 --- a/examples/stake-tokens/yarn.lock +++ b/examples/stake-tokens/yarn.lock @@ -10086,11 +10086,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard diff --git a/examples/swap-tokens/yarn.lock b/examples/swap-tokens/yarn.lock index dac1a1a3a..3ed79c23d 100644 --- a/examples/swap-tokens/yarn.lock +++ b/examples/swap-tokens/yarn.lock @@ -12343,11 +12343,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard diff --git a/examples/telescope/yarn.lock b/examples/telescope/yarn.lock index 24d8be2b9..727cf8122 100644 --- a/examples/telescope/yarn.lock +++ b/examples/telescope/yarn.lock @@ -15832,11 +15832,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard diff --git a/examples/vote-proposal/yarn.lock b/examples/vote-proposal/yarn.lock index 4efc1156a..17d5137df 100644 --- a/examples/vote-proposal/yarn.lock +++ b/examples/vote-proposal/yarn.lock @@ -11279,11 +11279,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard diff --git a/templates/connect-chain/yarn.lock b/templates/connect-chain/yarn.lock index de296e715..951af5e3e 100644 --- a/templates/connect-chain/yarn.lock +++ b/templates/connect-chain/yarn.lock @@ -10190,11 +10190,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard diff --git a/templates/connect-multi-chain/yarn.lock b/templates/connect-multi-chain/yarn.lock index 44860d2dc..dd805c207 100644 --- a/templates/connect-multi-chain/yarn.lock +++ b/templates/connect-multi-chain/yarn.lock @@ -10250,11 +10250,11 @@ __metadata: "typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217 + checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 languageName: node linkType: hard