From 2c16036ef3f2ebf6a707b5ae8fa486fa102bc1dc Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 29 Feb 2024 17:08:25 +0100 Subject: [PATCH] ci: add prettier to pre-commit --- .editorconfig | 9 ++++++++- .eslintrc | 3 ++- .pre-commit-config.yaml | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 24f122a8d43..e7d5cfeddcb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,13 @@ trim_trailing_whitespace = true charset = utf-8 # python, js indentation settings -[{*.py,*.js}] +[{*.py,*.js,*.vue,*.css,*.scss,*.html}] indent_style = tab indent_size = 4 +max_line_length = 110 + +# JSON files - mostly doctype schema files +[{*.json}] +insert_final_newline = false +indent_style = space +indent_size = 2 diff --git a/.eslintrc b/.eslintrc index f3d4fd5091f..1f2255279af 100644 --- a/.eslintrc +++ b/.eslintrc @@ -124,6 +124,7 @@ "beforeEach": true, "onScan": true, "extend_cscript": true, - "localforage": true + "localforage": true, + "Plaid": true } } diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6ea121f2982..1f115811f83 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,6 +20,23 @@ repos: - id: check-yaml - id: debug-statements + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v2.7.1 + hooks: + - id: prettier + types_or: [javascript, vue, scss] + # Ignore any files that might contain jinja / bundles + exclude: | + (?x)^( + erpnext/public/dist/.*| + cypress/.*| + .*node_modules.*| + .*boilerplate.*| + erpnext/public/js/controllers/.*| + erpnext/templates/pages/order.js| + erpnext/templates/includes/.* + )$ + - repo: https://github.com/pre-commit/mirrors-eslint rev: v8.44.0 hooks: