From 5c3c5cd35a2328e9b8b92925da02f7e88da2b2ef Mon Sep 17 00:00:00 2001 From: David Hadley Date: Tue, 17 Nov 2026 08:26:25 +0000 Subject: [PATCH 1/2] fix(ci): prevent race condition installing prettier in CI --- charts/prek.toml | 10 ++++++---- frontend/prek.toml | 5 +++-- prek.toml | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/charts/prek.toml b/charts/prek.toml index 2d25488dc..4d3d1145e 100644 --- a/charts/prek.toml +++ b/charts/prek.toml @@ -4,17 +4,19 @@ hooks = [ { id = "prettier", name = "prettier (charts yaml)", - language = "system", - entry = "npx --yes prettier@3.6.2 --write", + language = "node", + entry = "prettier --write", files = "^[^/]+/[^/]*\\.ya?ml$", pass_filenames = true, + additional_dependencies = ["prettier@3.6.2"], }, { id = "prettier-json", name = "prettier (json)", - language = "system", - entry = "npx --yes prettier@3.6.2 --write", + language = "node", + entry = "prettier --write", files = "\\.json$", pass_filenames = true, + additional_dependencies = ["prettier@3.6.2"], }, ] diff --git a/frontend/prek.toml b/frontend/prek.toml index 16ab7c492..b4e8f0ae4 100644 --- a/frontend/prek.toml +++ b/frontend/prek.toml @@ -4,9 +4,10 @@ hooks = [ { id = "prettier", name = "prettier", - language = "system", - entry = "npx --yes prettier@3.9.8 --config .prettierrc --ignore-path ../.gitignore --check \"**/*.{js,ts,tsx,json}\"", + language = "node", + entry = "prettier --config .prettierrc --ignore-path ../.gitignore --check \"**/*.{js,ts,tsx,json}\"", files = "\\.(js|ts|tsx|json)$", pass_filenames = false, + additional_dependencies = ["prettier@3.9.8"], }, ] diff --git a/prek.toml b/prek.toml index ab0c0e8ba..5464d56b2 100644 --- a/prek.toml +++ b/prek.toml @@ -32,9 +32,10 @@ hooks = [ { id = "prettier", name = "prettier (workspace root)", - language = "system", - entry = "npx --yes prettier@3.6.2 --write", + language = "node", + entry = "prettier --write", files = "^[^/]+\\.(ya?ml)$", pass_filenames = true, + additional_dependencies = ["prettier@3.6.2"], }, ] From f235672b63ff66beb2fcf1816ac3e2e457edc4bf Mon Sep 17 00:00:00 2001 From: David Hadley Date: Tue, 17 Nov 2026 08:38:54 +0000 Subject: [PATCH 2/2] chore(ci): update to latest prettier version --- charts/prek.toml | 4 ++-- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 2 +- frontend/prek.toml | 2 +- prek.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/prek.toml b/charts/prek.toml index 4d3d1145e..964fd9d81 100644 --- a/charts/prek.toml +++ b/charts/prek.toml @@ -8,7 +8,7 @@ hooks = [ entry = "prettier --write", files = "^[^/]+/[^/]*\\.ya?ml$", pass_filenames = true, - additional_dependencies = ["prettier@3.6.2"], + additional_dependencies = ["prettier@3.9.10"], }, { id = "prettier-json", @@ -17,6 +17,6 @@ hooks = [ entry = "prettier --write", files = "\\.json$", pass_filenames = true, - additional_dependencies = ["prettier@3.6.2"], + additional_dependencies = ["prettier@3.9.10"], }, ] diff --git a/frontend/package.json b/frontend/package.json index 3bee9627d..978ffa4ec 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -51,7 +51,7 @@ "globals": "^17.12.0", "identity-obj-proxy": "^3.0.0", "jsdom": "^27.1.0", - "prettier": "^3.9.9", + "prettier": "^3.9.10", "typescript": "^5.9.3", "typescript-eslint": "^8.70.1", "vite": "^8.3.3", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 7cbb3fe0a..c9cd3a480 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -292,7 +292,7 @@ importers: specifier: ^27.1.0 version: 27.4.0(supports-color@7.2.0) prettier: - specifier: ^3.9.9 + specifier: ^3.9.10 version: 3.9.10 typescript: specifier: ^5.9.3 diff --git a/frontend/prek.toml b/frontend/prek.toml index b4e8f0ae4..2c99d6215 100644 --- a/frontend/prek.toml +++ b/frontend/prek.toml @@ -8,6 +8,6 @@ hooks = [ entry = "prettier --config .prettierrc --ignore-path ../.gitignore --check \"**/*.{js,ts,tsx,json}\"", files = "\\.(js|ts|tsx|json)$", pass_filenames = false, - additional_dependencies = ["prettier@3.9.8"], + additional_dependencies = ["prettier@3.9.10"], }, ] diff --git a/prek.toml b/prek.toml index 5464d56b2..51d2f6617 100644 --- a/prek.toml +++ b/prek.toml @@ -36,6 +36,6 @@ hooks = [ entry = "prettier --write", files = "^[^/]+\\.(ya?ml)$", pass_filenames = true, - additional_dependencies = ["prettier@3.6.2"], + additional_dependencies = ["prettier@3.9.10"], }, ]