From 1117a6871f63987dd899d14fee994ac5f110f1f3 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Fri, 17 Apr 2020 12:30:15 +1000 Subject: [PATCH] Improve consistency between prettier and pretty-quick. --- .prettierignore | 40 +++++++++++++++++++++++++++++----------- package.json | 4 ++-- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/.prettierignore b/.prettierignore index 2a72d0c22ea3..92c8679798e7 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,11 +1,29 @@ -/node_modules -/Build -/ThirdParty -/Apps/Sandcastle/ThirdParty -/Source/Cesium.js -/Source/Shaders/**/*.js -/Source/ThirdParty/** -/Source/Workers/**/* -!/Source/Workers/cesiumWorkerBootstrapper.js -!/Source/Workers/transferTypedArrayTest.js -*.min.js + +# Ignore everything +* + +# Unignore directories (to all depths) and unignore code and style files in these directories +!.concierge/**/ +!.github/**/ +!.vscode/**/ +!Apps/**/ +!Documentation/**/ +!Source/**/ +!Specs/**/ +!Tools/**/ + +!**/*.js +!**/*.css +!**/*.html +!**/*.md + +# Re-ignore a few things caught above +**/*.min.js +Source/Cesium.js +Source/Shaders/**/*.js +Source/ThirdParty/** +Source/Workers/**/* +Apps/Sandcastle/ThirdParty + +!Source/Workers/cesiumWorkerBootstrapper.js +!Source/Workers/transferTypedArrayTest.js diff --git a/package.json b/package.json index 64e8e2a5bf7a..c21c14e8548e 100644 --- a/package.json +++ b/package.json @@ -121,8 +121,8 @@ "deploy-s3": "gulp deploy-s3", "deploy-status": "gulp deploy-status", "deploy-set-version": "gulp deploy-set-version", - "prettier": "prettier --write \"**/*.(js|css|html|md)\"", - "prettier-check": "prettier --check \"**/*.(js|css|html|md)\"", + "prettier": "prettier --write \"**/*\"", + "prettier-check": "prettier --check \"**/*\"", "pretty-quick": "pretty-quick" } }