From b5643a5f4c76451b693cf1614d7336e72fd26ec0 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 03:11:28 +0000 Subject: [PATCH 1/7] chore: update pre-commit to use pnpm fix:format Co-Authored-By: Jayant Krishnamurthy --- .pre-commit-config.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 19ed0e39df..b1c929a03e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,16 +23,13 @@ repos: target_chains/sui/vendor/| patches/ ) - # Hook to format many type of files in the repo - # including solidity contracts. - - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v2.7.1" + - repo: local hooks: - - id: prettier - additional_dependencies: - - "prettier@2.7.1" - - "prettier-plugin-solidity@1.0.0-rc.1" - exclude: target_chains/sui/vendor/ + - id: pnpm-fix-format + name: Format files using pnpm fix:format + entry: pnpm turbo fix:format + language: system + pass_filenames: false - repo: local hooks: # Hooks for the remote executor From c8c7c8f7d5af09cf09d0c584d6dbcbd6a540b584 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 03:14:39 +0000 Subject: [PATCH 2/7] fix: ensure pnpm is available for pre-commit hook Co-Authored-By: Jayant Krishnamurthy --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b1c929a03e..6a6d175e4b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: hooks: - id: pnpm-fix-format name: Format files using pnpm fix:format - entry: pnpm turbo fix:format + entry: bash -c 'npm i -g pnpm && pnpm install && pnpm turbo fix:format' language: system pass_filenames: false - repo: local From 4b06bf8f60601ecaa3f7066ff7441e011b9a50c1 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 03:27:33 +0000 Subject: [PATCH 3/7] ci: trigger new build Co-Authored-By: Jayant Krishnamurthy From 7c137fce85ee2e50f09960b6c6f918145f3f8fb5 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 03:29:42 +0000 Subject: [PATCH 4/7] fix: use pre-commit node version management Co-Authored-By: Jayant Krishnamurthy --- .pre-commit-config.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6a6d175e4b..5334b8a231 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,9 +27,11 @@ repos: hooks: - id: pnpm-fix-format name: Format files using pnpm fix:format - entry: bash -c 'npm i -g pnpm && pnpm install && pnpm turbo fix:format' - language: system + entry: bash -c 'npm install -g pnpm@9.15.4 && pnpm install && pnpm turbo fix:format' + language: node + language_version: "22.11.0" pass_filenames: false + additional_dependencies: [] - repo: local hooks: # Hooks for the remote executor From fc8940137826053354504cb7840394334b10f5ec Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 03:38:14 +0000 Subject: [PATCH 5/7] fix: use pre-commit additional_dependencies for package management Co-Authored-By: Jayant Krishnamurthy --- .pre-commit-config.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5334b8a231..69bee038c4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,11 +27,13 @@ repos: hooks: - id: pnpm-fix-format name: Format files using pnpm fix:format - entry: bash -c 'npm install -g pnpm@9.15.4 && pnpm install && pnpm turbo fix:format' + entry: pnpm turbo fix:format language: node language_version: "22.11.0" pass_filenames: false - additional_dependencies: [] + additional_dependencies: + - "pnpm@9.15.4" + - "turbo@2.2.3" - repo: local hooks: # Hooks for the remote executor From f0394812257cd29a9d1c3ed85c8a619ad1fa890d Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 03:42:20 +0000 Subject: [PATCH 6/7] fix: restore prettier configuration with pnpm exec Co-Authored-By: Jayant Krishnamurthy --- .pre-commit-config.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 69bee038c4..d165676c52 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,13 +27,21 @@ repos: hooks: - id: pnpm-fix-format name: Format files using pnpm fix:format - entry: pnpm turbo fix:format + entry: bash -c 'pnpm install && pnpm exec prettier --write .' language: node language_version: "22.11.0" pass_filenames: false additional_dependencies: - "pnpm@9.15.4" - - "turbo@2.2.3" + - "prettier@2.7.1" + - "prettier-plugin-solidity@1.0.0-rc.1" + files: \.(js|jsx|ts|tsx|json|md|mdx|sol)$ + exclude: > + (?x)^( + target_chains/sui/vendor/| + patches/| + apps/hermes/server/proto/vendor/ + ) - repo: local hooks: # Hooks for the remote executor From 1f63cb31e9b53a4fd9c2bd4b48aa1504550c033c Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 03:46:05 +0000 Subject: [PATCH 7/7] fix: use turbo filter to skip fonts package Co-Authored-By: Jayant Krishnamurthy --- .pre-commit-config.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d165676c52..c1353d3b56 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,15 +27,13 @@ repos: hooks: - id: pnpm-fix-format name: Format files using pnpm fix:format - entry: bash -c 'pnpm install && pnpm exec prettier --write .' + entry: bash -c 'cd $(git rev-parse --show-toplevel) && pnpm install --no-frozen-lockfile && pnpm turbo run fix:format --filter=!./packages/fonts' language: node language_version: "22.11.0" pass_filenames: false additional_dependencies: - "pnpm@9.15.4" - - "prettier@2.7.1" - - "prettier-plugin-solidity@1.0.0-rc.1" - files: \.(js|jsx|ts|tsx|json|md|mdx|sol)$ + - "turbo@2.2.3" exclude: > (?x)^( target_chains/sui/vendor/|