From d7943629a43ab1677618356c4341be61273b9666 Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Wed, 1 Nov 2023 16:38:15 +0000 Subject: [PATCH 1/2] chore: script tools --- apps/wallet-mobile/package.json | 8 ++++---- scripts/bump-pkgs.sh | 26 +++++++++++++++++++++++++ scripts/install-pkgs.sh | 34 +++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 scripts/bump-pkgs.sh create mode 100644 scripts/install-pkgs.sh diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json index bedd9df657..ca6e1f57cd 100644 --- a/apps/wallet-mobile/package.json +++ b/apps/wallet-mobile/package.json @@ -25,9 +25,9 @@ "release:ios:nightly": "bundle exec fastlane ios release --env nightly", "prerelease:ios:production": "bundle install && ./scripts/update-commit.sh && npx pod-install", "release:ios:production": "bundle exec fastlane ios release --env production", + "reset": "yarn reset:android && yarn reset:ios", "reset:android": "cd android && ./gradlew clean && cd ..", "reset:ios": "yarn pod-install", - "reset": "yarn reset:android && yarn reset:ios", "run:android:dev:debug": "ENVFILE=.env react-native run-android --mode=devDebug --appIdSuffix=dev --verbose", "run:android:nightly:debug": "ENVFILE=.env.nightly react-native run-android --mode=nightlyDebug --appIdSuffix=nightly --verbose", "run:android:nightly:release": "ENVFILE=.env.nightly react-native run-android --mode=nightlyRelease --appIdSuffix=nightly --verbose", @@ -56,11 +56,11 @@ }, "jest": { "cacheDirectory": ".jest/cache", + "collectCoverage": true, "collectCoverageFrom": [ "src/**/*.{js,jsx,ts,tsx}", "!src/**/*.d.ts" ], - "collectCoverage": true, "coverageReporters": [ "text-summary", "html" @@ -119,8 +119,8 @@ "@sentry/react-native": "^5.8.0", "@shopify/flash-list": "^1.4.1", "@unstoppabledomains/resolution": "6.0.3", - "@yoroi/banxa": "1.2.0", "@yoroi/api": "1.2.0", + "@yoroi/banxa": "1.2.0", "@yoroi/common": "1.2.0", "@yoroi/swap": "1.2.0", "add": "2.0.6", @@ -287,4 +287,4 @@ "module": "commonjs" } } -} \ No newline at end of file +} diff --git a/scripts/bump-pkgs.sh b/scripts/bump-pkgs.sh new file mode 100644 index 0000000000..2f24584df4 --- /dev/null +++ b/scripts/bump-pkgs.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# Verify the presence of the packages directory in the current path +if [[ ! -d "packages" ]]; then + echo "Error: 'packages' directory not found in the current path." + return 1 +fi + +# Verify argument +if [[ "$1" != "--patch" && "$1" != "--minor" && "$1" != "--major" ]]; then + echo "Usage: $0 [--patch | --minor | --major]" + return 1 +fi + +# Iterate over each package and bump its version +for pkg in packages/*; do + if [[ -d "$pkg" && ! -L "$pkg" && -f "$pkg/package.json" ]]; then + echo "Bumping version for $pkg..." + ( + cd "$pkg" + yarn version "$1" + ) + fi +done + +echo "Version bump complete." \ No newline at end of file diff --git a/scripts/install-pkgs.sh b/scripts/install-pkgs.sh new file mode 100644 index 0000000000..c0a0439f82 --- /dev/null +++ b/scripts/install-pkgs.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# Verify the presence of the packages directory in the current path +if [[ ! -d "packages" ]]; then + echo "Error: 'packages' directory not found in the current path." + return 1 +fi + +# Verify argument +if [[ -z "$1" ]]; then + echo "Usage: $0 1.20.0" + return 1 +fi + +# common +yarn workspace @yoroi/common add -D @yoroi/types@"$1" + +# api +yarn workspace @yoroi/api add -D @yoroi/types@"$1" +yarn workspace @yoroi/api add @yoroi/common@"$1" + +# swap +yarn workspace @yoroi/swap add -D @yoroi/types@"$1" +yarn workspace @yoroi/swap add @yoroi/api@"$1" +yarn workspace @yoroi/swap add @yoroi/openswap@"$1" + +# wallet-mobile +yarn workspace @yoroi/wallet-mobile add -D @yoroi/types@"$1" +yarn workspace @yoroi/wallet-mobile add @yoroi/banxa@"$1" +yarn workspace @yoroi/wallet-mobile add @yoroi/api@"$1" +yarn workspace @yoroi/wallet-mobile add @yoroi/common@"$1" +yarn workspace @yoroi/wallet-mobile add @yoroi/swap@"$1" + +echo "Using new packages..." \ No newline at end of file From c6e7049301dad7a69891e0d45b072448a1d383a7 Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Wed, 1 Nov 2023 17:40:05 +0000 Subject: [PATCH 2/2] chore: bump pkgs version 1.3.0 --- apps/wallet-mobile/package.json | 10 +++++----- packages/api/package.json | 6 +++--- packages/banxa/package.json | 2 +- packages/common/package.json | 4 ++-- packages/openswap/package.json | 2 +- packages/swap/package.json | 8 ++++---- packages/types/package.json | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json index ca6e1f57cd..c145c9ed22 100644 --- a/apps/wallet-mobile/package.json +++ b/apps/wallet-mobile/package.json @@ -119,10 +119,10 @@ "@sentry/react-native": "^5.8.0", "@shopify/flash-list": "^1.4.1", "@unstoppabledomains/resolution": "6.0.3", - "@yoroi/api": "1.2.0", - "@yoroi/banxa": "1.2.0", - "@yoroi/common": "1.2.0", - "@yoroi/swap": "1.2.0", + "@yoroi/api": "1.3.0", + "@yoroi/banxa": "1.3.0", + "@yoroi/common": "1.3.0", + "@yoroi/swap": "1.3.0", "add": "2.0.6", "assert": "^2.0.0", "base-64": "^1.0.0", @@ -236,7 +236,7 @@ "@wdio/mocha-framework": "^7.16.6", "@wdio/selenium-standalone-service": "^7.25.1", "@wdio/spec-reporter": "^7.16.4", - "@yoroi/types": "1.2.0", + "@yoroi/types": "1.3.0", "babel-eslint": "^10.1.0", "babel-jest": "^29.2.1", "babel-loader": "8.2.2", diff --git a/packages/api/package.json b/packages/api/package.json index 0f189d77ee..26fb8c4da6 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@yoroi/api", - "version": "1.2.0", + "version": "1.3.0", "description": "The API package of Yoroi SDK", "keywords": [ "yoroi", @@ -133,7 +133,7 @@ }, "dependencies": { "@emurgo/cip14-js": "^3.0.1", - "@yoroi/common": "1.2.0", + "@yoroi/common": "1.3.0", "axios": "^1.5.0", "zod": "^3.22.1" }, @@ -149,7 +149,7 @@ "@types/jest": "^28.1.2", "@types/react": "18.2.0", "@types/react-native": "0.71.6", - "@yoroi/types": "1.2.0", + "@yoroi/types": "1.3.0", "axios-mock-adapter": "^1.21.5", "commitlint": "^17.0.2", "del-cli": "^5.0.0", diff --git a/packages/banxa/package.json b/packages/banxa/package.json index 6d7b64812e..36640fae9b 100644 --- a/packages/banxa/package.json +++ b/packages/banxa/package.json @@ -1,6 +1,6 @@ { "name": "@yoroi/banxa", - "version": "1.2.0", + "version": "1.3.0", "description": "The Banxa integration package of Yoroi SDK", "keywords": [ "yoroi", diff --git a/packages/common/package.json b/packages/common/package.json index 5d9329e733..e2733cbb8b 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@yoroi/common", - "version": "1.2.0", + "version": "1.3.0", "description": "The Common package of Yoroi SDK", "keywords": [ "yoroi", @@ -147,7 +147,7 @@ "@types/jest": "^28.1.2", "@types/react": "18.2.0", "@types/react-native": "0.71.6", - "@yoroi/types": "1.2.0", + "@yoroi/types": "1.3.0", "axios-mock-adapter": "^1.21.5", "commitlint": "^17.0.2", "del-cli": "^5.0.0", diff --git a/packages/openswap/package.json b/packages/openswap/package.json index a20f46ad02..4b5a5878cc 100644 --- a/packages/openswap/package.json +++ b/packages/openswap/package.json @@ -1,6 +1,6 @@ { "name": "@yoroi/openswap", - "version": "1.2.0", + "version": "1.3.0", "repository": { "type": "github", "url": "https://github.com/Emurgo/yoroi.git", diff --git a/packages/swap/package.json b/packages/swap/package.json index 6f0b7d440f..304e8f5dfa 100644 --- a/packages/swap/package.json +++ b/packages/swap/package.json @@ -1,6 +1,6 @@ { "name": "@yoroi/swap", - "version": "1.2.0", + "version": "1.3.0", "description": "The Swap package of Yoroi SDK", "keywords": [ "yoroi", @@ -135,8 +135,8 @@ }, "dependencies": { "@emurgo/cip14-js": "^3.0.1", - "@yoroi/api": "1.2.0", - "@yoroi/openswap": "1.2.0", + "@yoroi/api": "1.3.0", + "@yoroi/openswap": "1.3.0", "immer": "^10.0.2" }, "devDependencies": { @@ -149,7 +149,7 @@ "@types/jest": "^28.1.2", "@types/react": "18.2.0", "@types/react-native": "0.71.6", - "@yoroi/types": "1.2.0", + "@yoroi/types": "1.3.0", "commitlint": "^17.0.2", "del-cli": "^5.0.0", "dependency-cruiser": "^13.1.1", diff --git a/packages/types/package.json b/packages/types/package.json index e528448b99..2601df2917 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@yoroi/types", - "version": "1.2.0", + "version": "1.3.0", "description": "The Yoroi Types package of Yoroi SDK", "keywords": [ "yoroi",