From 9b4bf73bb554d2f927bd527f0c0319dd06e068ba Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Thu, 27 Jun 2024 07:42:28 +0300
Subject: [PATCH] pre-commit: cleanup prettier/pnpm hooks && add missing
 packagemanager to package.json

---
 .pre-commit-config.yaml | 28 +++++++++++-----------------
 package.json            |  3 ++-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2f45f34..8f6b3d3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.ci for more information
 ci:
-  skip: [pnpm-prettier]
+  skip: [install-dev-deps, prettier]
   # I don't need so many duplicated notifications on the same thing as I keep
   # autoupdating manually too. Besides it just creates extra branch I never
   # touch.
@@ -63,25 +63,19 @@ repos:
       - id: check-github-workflows
       - id: check-gitlab-ci
 
-  # - repo: https://github.com/rbubley/mirrors-prettier
-  #   rev: "v3.3.1"
-  #   hooks:
-  #     - id: prettier
-  #       additional_dependencies: [
-  #           # https://www.npmjs.com/package/prettier
-  #           "prettier@3.3.1",
-  #           # https://www.npmjs.com/package/@prettier/plugin-xml
-  #           "@prettier/plugin-xml@3.4.1",
-  #         ]
-
   - repo: local
     hooks:
-      - id: pnpm-prettier
-        name: prettier
-        entry: pnpm exec prettier --cache --ignore-unknown --write
+      - id: install-dev-deps
+        name: Install pnpm dev dependencies
+        entry: corepack pnpm install -D
+        language: system
+        always_run: true
+        verbose: true
+        pass_filenames: false
+      - id: prettier
+        name: prettier
+        entry: corepack pnpm exec prettier --cache --ignore-unknown --write
         language: system
-        # Better handled by pretty-format-json from pre-commit-hooks.
-        # Remember to have *.json in .prettierignore!
         exclude_types: [json]
 
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
diff --git a/package.json b/package.json
index 2f3724c..cd671a0 100644
--- a/package.json
+++ b/package.json
@@ -3,5 +3,6 @@
     "@prettier/plugin-xml": "3.4.1",
     "prettier": "3.3.2",
     "prettier-plugin-sh": "0.14.0"
-  }
+  },
+  "packageManager": "pnpm@9.4.0+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a"
 }