Compare commits

...

3 Commits

Author SHA1 Message Date
46afb213f0
rm pnpm-lock.yaml
This isn't a js project regardless of utilising prettier and I don't think anything around depends on the lock file being carried in git
2024-06-21 07:04:49 +03:00
a16887e471
n/prettier.md: update for corepack 2024-06-21 07:02:31 +03:00
cd4aa2bf40
pre-commit: use corepack 2024-06-21 06:53:50 +03:00
5 changed files with 16 additions and 124 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ keys.txt.asc
.jekyll-metadata
vendor/
node_modules/
pnpm-lock.yaml

View File

@ -79,14 +79,14 @@ repos:
hooks:
- id: pnpm-install-dev
name: Install pnpm dev dependencies
entry: pnpm install -D
entry: corepack pnpm install -D
language: system
always_run: true
verbose: true
pass_filenames: false
- id: prettier
name: prettier
entry: pnpm exec prettier --cache --ignore-unknown --write
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!

View File

@ -41,11 +41,12 @@ _{{ page.excerpt }}_
## Installation
1. `npm install -D -E prettier@3.3.2 prettier-plugin-nginx@1.0.3 @prettier/plugin-ruby@4.0.4 prettier-plugin-toml@2.0.1 @prettier/plugin-xml@3.4.1 prettier-plugin-sh@0.14.0`
or probably just `pnpm install -D` if it's not your project.
1. `corepack pnpm install -D -E prettier@latest prettier-plugin-nginx@latest @prettier/plugin-ruby@latest prettier-plugin-toml@latest @prettier/plugin-xml@latest prettier-plugin-sh@latest`
or probably just `corepack pnpm install -D` if it's not your project.
1. If they don't exist already
`echo "{}" > .prettierrc && touch .prettierignore`
1. `pnpm exec prettier . --write` or `pnpm exec prettier . --check`
1. `corepack pnpm exec prettier . --write` or
`corepack pnpm exec prettier . --check`
## Configuration
@ -68,11 +69,11 @@ looks like:
{ "files": ".prettierrc", "options": { "parser": "json" } },
{
"files": "conf/librewolf.overrides.cfg",
"options": { "parser": "javascript" }
"options": { "parser": ".js" }
},
{
"files": "conf/autoconfig.js.online",
"options": { "parser": "javascript" }
"options": { "parser": ".js" }
}
]
}
@ -105,14 +106,14 @@ repos:
hooks:
- id: pnpm-install-dev
name: Install pnpm dev dependencies
entry: pnpm install -D
entry: corepack pnpm install -D
language: system
always_run: true
verbose: true
#verbose: true
pass_filenames: false
- id: prettier
name: prettier
entry: pnpm exec prettier --cache --ignore-unknown --write
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!
@ -144,3 +145,5 @@ repos:
## Further information
- [prettier docs install](https://prettier.io/docs/en/install)
- [corepack docs](https://nodejs.org/api/corepack.html)
- [corepack readme](https://github.com/nodejs/corepack/blob/main/README.md)

3
package.json vendored
View File

@ -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"
}

113
pnpm-lock.yaml generated vendored
View File

@ -1,113 +0,0 @@
lockfileVersion: "9.0"
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
importers:
.:
devDependencies:
"@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-sh:
specifier: 0.14.0
version: 0.14.0(prettier@3.3.2)
packages:
"@prettier/plugin-xml@3.4.1":
resolution:
{
integrity: sha512-Uf/6/+9ez6z/IvZErgobZ2G9n1ybxF5BhCd7eMcKqfoWuOzzNUxBipNo3QAP8kRC1VD18TIo84no7LhqtyDcTg==,
}
peerDependencies:
prettier: ^3.0.0
"@xml-tools/parser@1.0.11":
resolution:
{
integrity: sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==,
}
chevrotain@7.1.1:
resolution:
{
integrity: sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==,
}
mvdan-sh@0.10.1:
resolution:
{
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.2:
resolution:
{
integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==,
}
engines: { node: ">=14" }
hasBin: true
regexp-to-ast@0.5.0:
resolution:
{
integrity: sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==,
}
sh-syntax@0.4.2:
resolution:
{
integrity: sha512-/l2UZ5fhGZLVZa16XQM9/Vq/hezGGbdHeVEA01uWjOL1+7Ek/gt6FquW0iKKws4a9AYPYvlz6RyVvjh3JxOteg==,
}
engines: { node: ">=16.0.0" }
tslib@2.6.3:
resolution:
{
integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==,
}
snapshots:
"@prettier/plugin-xml@3.4.1(prettier@3.3.2)":
dependencies:
"@xml-tools/parser": 1.0.11
prettier: 3.3.2
"@xml-tools/parser@1.0.11":
dependencies:
chevrotain: 7.1.1
chevrotain@7.1.1:
dependencies:
regexp-to-ast: 0.5.0
mvdan-sh@0.10.1: {}
prettier-plugin-sh@0.14.0(prettier@3.3.2):
dependencies:
mvdan-sh: 0.10.1
prettier: 3.3.2
sh-syntax: 0.4.2
prettier@3.3.2: {}
regexp-to-ast@0.5.0: {}
sh-syntax@0.4.2:
dependencies:
tslib: 2.6.3
tslib@2.6.3: {}