From cc24964368ff2401e5b04218fed560172876da3b Mon Sep 17 00:00:00 2001 From: smilerz Date: Thu, 11 Apr 2024 18:24:44 -0500 Subject: [PATCH] Revert "moved prettier configuration to .prettierrc" This reverts commit c33c4ed79b47d5fe65cf5438bbf1d028ebdbeecc. --- .gitignore | 30 +++++++++++++++++------------- .prettierignore | 13 ------------- .prettierrc | 7 ------- vue/package.json | 7 +++++++ 4 files changed, 24 insertions(+), 33 deletions(-) delete mode 100644 .prettierignore delete mode 100644 .prettierrc diff --git a/.gitignore b/.gitignore index c4d38e418..143271c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -47,11 +47,6 @@ docs/reports/** # Django stuff: *.log -mediafiles/ -*.sqlite3* -staticfiles/ -postgresql/ -data/ # Sphinx documentation docs/_build/ @@ -64,23 +59,32 @@ target/ \.idea/dataSources\.local\.xml +venv/ + +mediafiles/ + +*.sqlite3* + \.idea/workspace\.xml \.idea/misc\.xml # Deployment -\.env -cookbook/static/vue -vue/webpack-stats.json +\.env +staticfiles/ +postgresql/ +data/ + + /docker-compose.override.yml vue/node_modules plugins -vue3/node_modules +vetur.config.js +cookbook/static/vue +vue/webpack-stats.json cookbook/templates/sw.js +.prettierignore vue/.yarn vue3/.vite - -# Configs -vetur.config.js -venv/ +vue3/node_modules diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index aea0c3a51..000000000 --- a/.prettierignore +++ /dev/null @@ -1,13 +0,0 @@ -# generated files -api.ts -vue/src/apps/*.js -vue/node_modules -staticfiles/ -docs/reports/ -/vue3/src/openapi/ - -# ignored files - prettier interferes with django templates and github actions -*.html -*.yml -*.yaml - diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 956e17f3c..000000000 --- a/.prettierrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "printWidth": 179, - "trailingComma": "es5", - "tabWidth": 2, - "semi": false, - "experimentalTernaries": true -} diff --git a/vue/package.json b/vue/package.json index 98d8f337b..10a8e23c8 100644 --- a/vue/package.json +++ b/vue/package.json @@ -98,5 +98,12 @@ "resolutions": { "@vue/cli-plugin-pwa/workbox-webpack-plugin": "^5.1.3", "coa": "2.0.2" + }, + "prettier": { + "printWidth": 179, + "trailingComma": "es5", + "tabWidth": 2, + "semi": false, + "experimentalTernaries": true } }