From 64035df4d15334fffe66b55d81f475449bc7839e Mon Sep 17 00:00:00 2001 From: "Matheus P. Silva" Date: Wed, 5 Feb 2025 12:19:48 -0300 Subject: [PATCH] fix: align ts versions (#2673) ## What's the purpose of this pull request? - Align typescript versions - Remove husky from core --- package.json | 2 +- packages/core/.husky/_/husky.sh | 30 ------------------------------ packages/core/package.json | 6 +++--- yarn.lock | 13 ++++--------- 4 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 packages/core/.husky/_/husky.sh diff --git a/package.json b/package.json index 013c75a77d..2032b625f8 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "stylelint-order": "^5.0.0", "stylelint-scss": "^4.0.1", "turbo": "^2.3.4", - "typescript": "^5.3.2" + "typescript": "5.3.2" }, "version": "0.0.0", "volta": { diff --git a/packages/core/.husky/_/husky.sh b/packages/core/.husky/_/husky.sh deleted file mode 100644 index ca2720e08a..0000000000 --- a/packages/core/.husky/_/husky.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -if [ -z "$husky_skip_init" ]; then - debug () { - [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1" - } - - readonly hook_name="$(basename "$0")" - debug "starting $hook_name..." - - if [ "$HUSKY" = "0" ]; then - debug "HUSKY env variable is set to 0, skipping hook" - exit 0 - fi - - if [ -f ~/.huskyrc ]; then - debug "sourcing ~/.huskyrc" - . ~/.huskyrc - fi - - export readonly husky_skip_init=1 - sh -e "$0" "$@" - exitCode="$?" - - if [ $exitCode != 0 ]; then - echo "husky - $hook_name hook exited with code $exitCode (error)" - exit $exitCode - fi - - exit 0 -fi diff --git a/packages/core/package.json b/packages/core/package.json index 883fb936c8..d8a081745e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -81,8 +81,7 @@ "sharp": "^0.32.6", "style-loader": "^3.3.1", "swr": "^2.2.5", - "tsx": "^4.6.2", - "typescript": "4.7.3" + "tsx": "^4.6.2" }, "devDependencies": { "@cypress/code-coverage": "^3.12.1", @@ -100,6 +99,7 @@ "dotenv": "^8.2.0", "is-ci": "^3.0.0", "jest": "^29.7.0", - "ts-jest": "29.1.1" + "ts-jest": "29.1.1", + "typescript": "5.3.2" } } diff --git a/yarn.lock b/yarn.lock index 7fbac90935..17621be1c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18539,21 +18539,16 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@4.7.3: - version "4.7.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" - integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== +typescript@5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43" + integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ== "typescript@>=3 < 6": version "5.4.5" resolved "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz" integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== -typescript@^5.3.2: - version "5.3.2" - resolved "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz" - integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ== - typeson-registry@^1.0.0-alpha.20: version "1.0.0-alpha.39" resolved "https://registry.npmjs.org/typeson-registry/-/typeson-registry-1.0.0-alpha.39.tgz"