simplify prettier configuration

This commit is contained in:
Aminda Suomalainen 2024-07-14 16:28:37 +03:00
parent a76b159eb3
commit 6bfeaa46d8
Signed by: Mikaela
SSH Key Fingerprint: SHA256:CXLULpqNBdUKB6E6fLA1b/4SzG0HvKD19PbIePU175Q
5 changed files with 33 additions and 82 deletions

1
.gitignore vendored
View File

@ -14,7 +14,6 @@
!.nvmrc !.nvmrc
!.pre-commit-config.yaml !.pre-commit-config.yaml
!.prettierignore !.prettierignore
!.prettierrc.json
!.renovate-shared.json* !.renovate-shared.json*
!.reuse !.reuse

View File

@ -65,18 +65,10 @@ repos:
- repo: local - repo: local
hooks: hooks:
- 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 - id: prettier
name: prettier name: prettier
entry: corepack pnpm exec prettier --cache --ignore-unknown --write entry: corepack pnpx prettier --cache --ignore-unknown --write
language: system language: system
exclude_types: [json]
# .editorconfig validity checking # .editorconfig validity checking
- repo: https://github.com/editorconfig-checker/editorconfig-checker.python - repo: https://github.com/editorconfig-checker/editorconfig-checker.python

View File

@ -1,36 +0,0 @@
{
"bracketSameLine": true,
"endOfLine": "auto",
"insertPragma": true,
"overrides": [
{
"files": ".prettierrc",
"options": {
"parser": "json"
}
},
{
"files": "conf/librewolf.overrides.cfg",
"options": {
"parser": "babel"
}
},
{
"files": "conf/autoconfig.js.online",
"options": {
"parser": "babel"
}
}
],
"plugins": [
"@prettier/plugin-ruby",
"@prettier/plugin-xml",
"prettier-plugin-nginx",
"prettier-plugin-sh",
"prettier-plugin-toml"
],
"proseWrap": "always",
"quoteProps": "consistent",
"requirePragma": false,
"singleAttributePerLine": true
}

10
package.json vendored
View File

@ -1,11 +1,7 @@
{ {
"devDependencies": { "devDependencies": {
"@prettier/plugin-ruby": "4.0.4", "@aminda/global-prettier-config": "^2024.28.3"
"@prettier/plugin-xml": "3.4.1",
"prettier": "3.3.2",
"prettier-plugin-nginx": "1.0.3",
"prettier-plugin-sh": "0.14.0",
"prettier-plugin-toml": "2.0.1"
}, },
"packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903" "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903",
"prettier": "@aminda/global-prettier-config"
} }

58
pnpm-lock.yaml vendored
View File

@ -9,26 +9,17 @@ settings:
importers: importers:
.: .:
devDependencies: devDependencies:
"@prettier/plugin-ruby": "@aminda/global-prettier-config":
specifier: 4.0.4 specifier: ^2024.28.3
version: 4.0.4(prettier@3.3.2) version: 2024.28.3
"@prettier/plugin-xml":
specifier: 3.4.1
version: 3.4.1(prettier@3.3.2)
prettier:
specifier: 3.3.2
version: 3.3.2
prettier-plugin-nginx:
specifier: 1.0.3
version: 1.0.3
prettier-plugin-sh:
specifier: 0.14.0
version: 0.14.0(prettier@3.3.2)
prettier-plugin-toml:
specifier: 2.0.1
version: 2.0.1(prettier@3.3.2)
packages: packages:
"@aminda/global-prettier-config@2024.28.3":
resolution:
{
integrity: sha512-hb0F/AEbeuA8TM5Z7VJBbFhc5zHMXUZfVZ+QbfTt2V1kD/zKFYf8Tl99se1ZaIegxSDdfhdMpQO75+CRy5eqhA==,
}
"@prettier/plugin-ruby@4.0.4": "@prettier/plugin-ruby@4.0.4":
resolution: resolution:
{ {
@ -99,10 +90,10 @@ packages:
peerDependencies: peerDependencies:
prettier: ^3.0.3 prettier: ^3.0.3
prettier@3.3.2: prettier@3.3.3:
resolution: resolution:
{ {
integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==, integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==,
} }
engines: { node: ">=14" } engines: { node: ">=14" }
hasBin: true hasBin: true
@ -127,14 +118,23 @@ packages:
} }
snapshots: snapshots:
"@prettier/plugin-ruby@4.0.4(prettier@3.3.2)": "@aminda/global-prettier-config@2024.28.3":
dependencies: dependencies:
prettier: 3.3.2 "@prettier/plugin-ruby": 4.0.4(prettier@3.3.3)
"@prettier/plugin-xml": 3.4.1(prettier@3.3.3)
prettier: 3.3.3
prettier-plugin-nginx: 1.0.3
prettier-plugin-sh: 0.14.0(prettier@3.3.3)
prettier-plugin-toml: 2.0.1(prettier@3.3.3)
"@prettier/plugin-xml@3.4.1(prettier@3.3.2)": "@prettier/plugin-ruby@4.0.4(prettier@3.3.3)":
dependencies:
prettier: 3.3.3
"@prettier/plugin-xml@3.4.1(prettier@3.3.3)":
dependencies: dependencies:
"@xml-tools/parser": 1.0.11 "@xml-tools/parser": 1.0.11
prettier: 3.3.2 prettier: 3.3.3
"@taplo/core@0.1.1": {} "@taplo/core@0.1.1": {}
@ -154,18 +154,18 @@ snapshots:
prettier-plugin-nginx@1.0.3: {} prettier-plugin-nginx@1.0.3: {}
prettier-plugin-sh@0.14.0(prettier@3.3.2): prettier-plugin-sh@0.14.0(prettier@3.3.3):
dependencies: dependencies:
mvdan-sh: 0.10.1 mvdan-sh: 0.10.1
prettier: 3.3.2 prettier: 3.3.3
sh-syntax: 0.4.2 sh-syntax: 0.4.2
prettier-plugin-toml@2.0.1(prettier@3.3.2): prettier-plugin-toml@2.0.1(prettier@3.3.3):
dependencies: dependencies:
"@taplo/lib": 0.4.0-alpha.2 "@taplo/lib": 0.4.0-alpha.2
prettier: 3.3.2 prettier: 3.3.3
prettier@3.3.2: {} prettier@3.3.3: {}
regexp-to-ast@0.5.0: {} regexp-to-ast@0.5.0: {}