From cbbe880f055ffb63e6eee5c66d8638e07fed6ad5 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Thu, 6 Jun 2024 20:57:42 +0300
Subject: [PATCH] switch to local prettier + sh plugin

---
 .pre-commit-config.yaml | 39 +++++++++++++++----------
 .prettierrc             |  4 +++
 package.json            |  3 +-
 pnpm-lock.yaml          | 65 ++++++++++++++++++++++++++++++++++-------
 4 files changed, 84 insertions(+), 27 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d50580a..3847dc9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ ci:
   # the frequency of unnecessary PRs.
   # https://github.com/pre-commit-ci/issues/issues/83
   autoupdate_schedule: quarterly
-  skip: [pylint]
+  skip: [pylint, pnpm-prettier]
 
 # use pypy3 for python
 default_language_version:
@@ -71,17 +71,24 @@ repos:
     rev: v3.1.0
     hooks:
       - id: add-trailing-comma
-  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: "v3.3.0"
+  - repo: local
     hooks:
-      - id: prettier
-        exclude_types: [python, pyi, jupyter]
-        additional_dependencies: [
-            # https://www.npmjs.com/package/prettier
-            "prettier@3.2.5",
-            # https://www.npmjs.com/package/@prettier/plugin-ruby
-            "@prettier/plugin-ruby@4.0.4",
-          ]
+      - id: pnpm-prettier
+        name: prettier
+        entry: pnpm exec prettier --cache --ignore-unknown --write
+        language: system
+        exclude_types: [json]
+      # - repo: https://github.com/rbubley/mirrors-prettier
+  #   rev: "v3.3.0"
+  #   hooks:
+  #     - id: prettier
+  #       exclude_types: [python, pyi, jupyter]
+  #       additional_dependencies: [
+  #           # https://www.npmjs.com/package/prettier
+  #           "prettier@3.2.5",
+  #           # https://www.npmjs.com/package/@prettier/plugin-ruby
+  #           "@prettier/plugin-ruby@4.0.4",
+  #         ]
   - repo: https://github.com/psf/black
     rev: 24.4.2
     hooks:
@@ -89,11 +96,11 @@ repos:
         #Refer to pyproject.toml
         #args: ["--line-length", "79", "--target-version", "py310"]
       #- id: black-jupyter
-  - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.8.0-1
-    hooks:
-      - id: shfmt
-        #- id: shfmt-docker
+      #  - repo: https://github.com/scop/pre-commit-shfmt
+      #    rev: v3.8.0-1
+      #    hooks:
+      #      - id: shfmt
+      #- id: shfmt-docker
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
     rev: "2.7.3"
     hooks:
diff --git a/.prettierrc b/.prettierrc
index e69de29..e3398dd 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+{
+	"plugins": ["@prettier/plugin-ruby", "prettier-plugin-sh"],
+	"overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }]
+}
diff --git a/package.json b/package.json
index 476103a..d10f58f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
 	"devDependencies": {
 		"@prettier/plugin-ruby": "4.0.4",
-		"prettier": "3.3.0"
+		"prettier": "3.3.1",
+		"prettier-plugin-sh": "0.14.0"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a77dd21..7a75682 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,10 +9,13 @@ importers:
     devDependencies:
       "@prettier/plugin-ruby":
         specifier: 4.0.4
-        version: 4.0.4(prettier@3.3.0)
+        version: 4.0.4(prettier@3.3.1)
       prettier:
-        specifier: 3.3.0
-        version: 3.3.0
+        specifier: 3.3.1
+        version: 3.3.1
+      prettier-plugin-sh:
+        specifier: 0.14.0
+        version: 0.14.0(prettier@3.3.1)
 
 packages:
   "@prettier/plugin-ruby@4.0.4":
@@ -23,17 +26,59 @@ packages:
     peerDependencies:
       prettier: ^3.0.0
 
-  prettier@3.3.0:
+  mvdan-sh@0.10.1:
     resolution:
       {
-        integrity: sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==,
+        integrity: sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==,
+      }
+
+  prettier-plugin-sh@0.14.0:
+    resolution:
+      {
+        integrity: sha512-hfXulj5+zEl/ulrO5kMuuTPKmXvOg0bnLHY1hKFNN/N+/903iZbNp8NyZBTsgI8dtkSgFfAEIQq0IQTyP1ZVFQ==,
+      }
+    engines: { node: ">=16.0.0" }
+    peerDependencies:
+      prettier: ^3.0.3
+
+  prettier@3.3.1:
+    resolution:
+      {
+        integrity: sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==,
       }
     engines: { node: ">=14" }
     hasBin: true
 
-snapshots:
-  "@prettier/plugin-ruby@4.0.4(prettier@3.3.0)":
-    dependencies:
-      prettier: 3.3.0
+  sh-syntax@0.4.2:
+    resolution:
+      {
+        integrity: sha512-/l2UZ5fhGZLVZa16XQM9/Vq/hezGGbdHeVEA01uWjOL1+7Ek/gt6FquW0iKKws4a9AYPYvlz6RyVvjh3JxOteg==,
+      }
+    engines: { node: ">=16.0.0" }
 
-  prettier@3.3.0: {}
+  tslib@2.6.3:
+    resolution:
+      {
+        integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==,
+      }
+
+snapshots:
+  "@prettier/plugin-ruby@4.0.4(prettier@3.3.1)":
+    dependencies:
+      prettier: 3.3.1
+
+  mvdan-sh@0.10.1: {}
+
+  prettier-plugin-sh@0.14.0(prettier@3.3.1):
+    dependencies:
+      mvdan-sh: 0.10.1
+      prettier: 3.3.1
+      sh-syntax: 0.4.2
+
+  prettier@3.3.1: {}
+
+  sh-syntax@0.4.2:
+    dependencies:
+      tslib: 2.6.3
+
+  tslib@2.6.3: {}