Skip to content

Commit

Permalink
Migrate from prettier/prettier to prettier/pre-commit (#165)
Browse files Browse the repository at this point in the history
* Migrate from prettier/prettier to prettier/pre-commit

* Revert "Pin nodejs versions for pre-commit"
  This reverts commit 955f6dd.

* Re-apply "Migrate prettier from prettier/prettier to prettier/pre-commit"
  This reverts commit 1f85193.

* Improve prettier pre-commit configuration
  After prettier/pre-commit#17 was fixed

* Update to v2.1.2 in template config

* Update .pre-commit-config.yaml.jinja

Co-authored-by: Jairo Llopis <Yajo@users.noreply.github.com>
  • Loading branch information
joao-p-marques and yajo committed Nov 5, 2020
1 parent c517b93 commit 430e10d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
7 changes: 2 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ repos:
hooks:
- id: flake8
additional_dependencies: [flake8-bugbear==20.1.4]
# TODO Migrate to new prettier pre-commit repo after fixed:
# HACK https://github.com/prettier/pre-commit/pull/17
# HACK https://github.com/prettier/pre-commit/pull/18
- repo: https://github.com/prettier/prettier
rev: 2.1.2
- repo: https://github.com/prettier/pre-commit
rev: v2.1.2
hooks:
- id: prettier
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand Down
9 changes: 4 additions & 5 deletions .pre-commit-config.yaml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@ repos:
name: isort except __init__.py
args: [--settings, .]
exclude: /__init__\.py$
# TODO Migrate to new prettier pre-commit repo after fixed:
# HACK https://github.com/prettier/pre-commit/pull/17
# HACK https://github.com/prettier/pre-commit/pull/18
- repo: https://github.com/prettier/prettier
rev: 2.1.2
- repo: https://github.com/prettier/pre-commit
rev: v2.1.2
hooks:
- id: prettier
name: prettier + plugin-xml
additional_dependencies:
# HACK https://github.com/prettier/pre-commit/issues/16#issuecomment-713474520
- prettier@2.1.2
- "@prettier/plugin-xml@0.12.0"
args:
- --plugin=@prettier/plugin-xml
Expand Down

0 comments on commit 430e10d

Please sign in to comment.