Compare commits

...

3 Commits

3 changed files with 26 additions and 16 deletions

View File

@ -3,6 +3,7 @@
ci: ci:
# Attempts to use networking and fails at name resolution, local hook # Attempts to use networking and fails at name resolution, local hook
# skip: [bundler-audit, pylint, latexmk, exiftool] # skip: [bundler-audit, pylint, latexmk, exiftool]
skip: [pnpm-prettier]
# Forĝejo/Gitea mirrors will autoclose pull requests. This should decrease # Forĝejo/Gitea mirrors will autoclose pull requests. This should decrease
# the frequency of unnecessary PRs. # the frequency of unnecessary PRs.
# https://github.com/pre-commit-ci/issues/issues/83 # https://github.com/pre-commit-ci/issues/issues/83
@ -125,21 +126,30 @@ repos:
# ensure nothing breaks the rules. # ensure nothing breaks the rules.
# prettier, opinionated code formatter # prettier, opinionated code formatter
#- repo: https://github.com/pre-commit/mirrors-prettier
- repo: https://github.com/rbubley/mirrors-prettier - repo: local
rev: "v3.2.5"
hooks: hooks:
- id: prettier - id: pnpm-prettier
additional_dependencies: [ name: prettier
# https://www.npmjs.com/package/prettier entry: pnpm exec prettier --cache --ignore-unknown --write
"prettier@3.2.5", language: system
# https://www.npmjs.com/package/prettier-plugin-nginx exclude_types: [json]
"prettier-plugin-nginx@1.0.3",
# https://www.npmjs.com/package/prettier-plugin-toml #- repo: https://github.com/pre-commit/mirrors-prettier
"prettier-plugin-toml@2.0.1", # - repo: https://github.com/rbubley/mirrors-prettier
# https://www.npmjs.com/package/prettier-plugin-sort-json # rev: "v3.2.5"
#"prettier-plugin-sort-json@4.0.0", # hooks:
] # - id: prettier
# additional_dependencies: [
# # https://www.npmjs.com/package/prettier
# "prettier@3.2.5",
# # https://www.npmjs.com/package/prettier-plugin-nginx
# "prettier-plugin-nginx@1.0.3",
# # https://www.npmjs.com/package/prettier-plugin-toml
# "prettier-plugin-toml@2.0.1",
# # https://www.npmjs.com/package/prettier-plugin-sort-json
# #"prettier-plugin-sort-json@4.0.0",
# ]
# Black, opinionated Python code formatter # Black, opinionated Python code formatter
# - repo: https://github.com/psf/black # - repo: https://github.com/psf/black

View File

@ -584,7 +584,7 @@ if hash pnpm 2>/dev/null; then
alias npx=pnpx alias npx=pnpx
alias pnpmx=pnpx alias pnpmx=pnpx
if ! hash prettier 2>/dev/null; then if ! hash prettier 2>/dev/null; then
alias prettier="pnpx prettier" alias prettier="pnpm exec prettier"
fi fi
fi fi

View File

@ -574,7 +574,7 @@ if hash pnpm 2>/dev/null; then
alias npx=pnpx alias npx=pnpx
alias pnpmx=pnpx alias pnpmx=pnpx
if ! hash prettier 2>/dev/null; then if ! hash prettier 2>/dev/null; then
alias prettier="pnpx prettier" alias prettier="pnpm exec prettier"
fi fi
fi fi