From 13b60826ed5d05481500a36c4fec9add3503aef8 Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sun, 4 Aug 2024 10:04:47 +0300 Subject: [PATCH] switch to global prettier config, pre-commit run --- .editorconfig | 2 +- .pre-commit-config.yaml | 2 -- .prettierrc | 7 ------- package.json | 10 +++++----- renovate-config.json | 6 +++--- renovate.json | 8 ++++---- 6 files changed, 13 insertions(+), 22 deletions(-) delete mode 100644 .prettierrc diff --git a/.editorconfig b/.editorconfig index d2a08f5..11f52d0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,7 @@ charset = utf-8 indent_style = tab indent_size = tab -[*.{yaml,yml,cff,json}] +[*.{yaml,yml,cff}] indent_style = space indent_size = 2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0e13962..4e72a7b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,3 @@ -# @format - # See https://pre-commit.com for more information # See https://pre-commit.ci for more information ci: diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 7a8c0bc..0000000 --- a/.prettierrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "insertPragma": true, - "proseWrap": "always", - "singleAttributePerLine": true, - "plugins": ["prettier-plugin-sh"], - "overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }] -} diff --git a/package.json b/package.json index 44dfda7..fd6e762 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "devDependencies": { - "prettier": "3.3.3", - "prettier-plugin-sh": "0.14.0" - }, - "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903" + "devDependencies": { + "@aminda/global-prettier-config": "2024.28.4" + }, + "packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e", + "prettier": "@aminda/global-prettier-config" } diff --git a/renovate-config.json b/renovate-config.json index b897673..574a24b 100644 --- a/renovate-config.json +++ b/renovate-config.json @@ -1,5 +1,5 @@ { - "extends": [ - "github>Mikaela/shell-things:.renovate-shared" - ] + "extends": [ + "github>Mikaela/shell-things:.renovate-shared" + ] } diff --git a/renovate.json b/renovate.json index a6ad10b..b66a4a5 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "github>Mikaela/.github:renovate-config" - ] + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "github>Mikaela/.github:renovate-config" + ] }