From c46be27e9e0b1bfee837ddb53215e3b8403b557f 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 (cherry picked from commit 2c16036ef3f2ebf6a707b5ae8fa486fa102bc1dc) --- .editorconfig | 9 ++++++++- .eslintrc | 3 ++- .pre-commit-config.yaml | 45 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 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 276d6ff3725..4a5f87171e8 100644 --- a/.eslintrc +++ b/.eslintrc @@ -156,6 +156,7 @@ "onScan": true, "html2canvas": true, "extend_cscript": true, - "localforage": true + "localforage": true, + "Plaid": true } } diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fba2f74a5b9..b95b32d7ddb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,6 +20,51 @@ 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/.*| + .*/supplier_quotation.js| + .*/sales_taxes_and_charges_template.js| + .*/purchase_taxes_and_charges_template.js| + .*/subcontracting_order.js| + .*/landed_cost_voucher.js| + .*/payment_entry.js| + .*/loan_interest_accrual.js| + .*/loan_disbursement.js| + .*/loan_application.js| + .*/italy.js| + .*/sales_invoice.js| + .*/subcontracting_receipt.js| + .*/request_for_quotation.js| + .*/pos_profile.js| + .*/opportunity.js| + .*/quotation.js| + .*/sales_common.js| + .*/sales_order.js| + .*/pos_invoice.js| + .*/purchase_invoice.js| + .*/loan_repayment.js| + .*/material_request.js| + .*/purchase_receipt.js| + .*/delivery_note.js| + .*/loan.js| + .*/stock_entry.js| + .*/purchase_order.js| + .*/loan_write_off.js + )$ + - repo: https://github.com/PyCQA/flake8 rev: 5.0.4 hooks: