diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 52a539ac6..3dd33ebdb 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -44,11 +44,16 @@ jobs: - name: Identify changed packages run: | - CHANGED_PACKAGES=$(yarn lerna changed --json | jq -r '.[].name' || echo "Error parsing JSON") - echo $CHANGED_PACKAGES + CHANGED_PACKAGES=$(yarn lerna changed --json) + echo "Raw JSON output:" + echo "$CHANGED_PACKAGES" + + CHANGED_PACKAGES_NAMES=$(echo "$CHANGED_PACKAGES" | jq -r '.[].name' || echo "Error parsing JSON") + echo "Parsed package names:" + echo "$CHANGED_PACKAGES_NAMES" - name: Version packages - run: ./scripts/version-prerelease-packages.sh $CHANGED_PACKAGES + run: ./scripts/version-prerelease-packages.sh $CHANGED_PACKAGES_NAMES - name: Commit changes run: | diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index fffd42f0f..000000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - -yarn format:check && yarn lint-staged diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg deleted file mode 100755 index 09152284b..000000000 --- a/.husky/prepare-commit-msg +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - -if [ "$2" != "message" ];then - exec < /dev/tty && cz --hook "$1" "$2" "$3" || true -fi diff --git a/package.json b/package.json index 520e81be6..57727517b 100644 --- a/package.json +++ b/package.json @@ -9,24 +9,38 @@ "packages/*" ], "scripts": { - "prepare": "node -e \"try { require('husky').install() } catch (e) {if (e.code !== 'MODULE_NOT_FOUND') throw e}\"", - "commit:sign": "git cz -S", - "clean": "lerna clean -y", "build-all": "lerna run build", + "clean": "lerna clean -y", + "commit": "cz", + "commit:sign": "cz -s", + "commitlint": "commitlint --edit", "format:check": "prettier --check \"**/*.{ts,tsx,md}\" --config ./.prettierrc", "format:write": "prettier --write \"**/*.{ts,tsx,md}\" --config ./.prettierrc", "postinstall": "husky install", - "lint": "eslint ." + "lint": "eslint .", + "prepare": "node -e \"try { require('husky').install() } catch (e) {if (e.code !== 'MODULE_NOT_FOUND') throw e}\"" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged", + "prepare-commit-msg": "exec < /dev/tty && yarn cz --hook || true" + } }, "lint-staged": { "*.{ts,tsx,md}": [ - "eslint --fix", - "yarn format:write" + "prettier --write", + "eslint --fix" ] }, + "config": { + "commitizen": { + "path": "cz-conventional-changelog" + } + }, "devDependencies": { "@commitlint/cli": "^17.7.2", "@commitlint/config-conventional": "^17.7.0", + "commitizen": "^4.3.0", "cz-conventional-changelog": "^3.3.0", "eslint": "^8.49.0", "husky": "^8.0.0", @@ -37,10 +51,5 @@ "tsconfig": "workspace:^", "typescript": "^5.2.2" }, - "packageManager": "yarn@3.6.3", - "config": { - "commitizen": { - "path": "cz-conventional-changelog" - } - } + "packageManager": "yarn@3.6.3" } diff --git a/yarn.lock b/yarn.lock index 4b74d7d2a..d120dffba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3321,7 +3321,7 @@ __metadata: languageName: node linkType: hard -"commitizen@npm:^4.0.3": +"commitizen@npm:^4.0.3, commitizen@npm:^4.3.0": version: 4.3.0 resolution: "commitizen@npm:4.3.0" dependencies: @@ -9328,6 +9328,7 @@ __metadata: dependencies: "@commitlint/cli": ^17.7.2 "@commitlint/config-conventional": ^17.7.0 + commitizen: ^4.3.0 cz-conventional-changelog: ^3.3.0 eslint: ^8.49.0 husky: ^8.0.0