From a563a8bcccbeff53278834e13a4a24fe8ebb95f4 Mon Sep 17 00:00:00 2001
From: Sean Lilley <lilleyse@gmail.com>
Date: Mon, 2 Aug 2021 09:42:20 -0400
Subject: [PATCH 1/2] Switch to prettier for formatting

---
 .editorconfig   |  2 +-
 .eslintrc.json  |  2 +-
 .gitignore      |  3 +++
 .npmignore      |  2 ++
 .prettierignore | 12 ++++++++++++
 .travis.yml     |  1 +
 package.json    | 18 +++++++++++++++---
 7 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 .prettierignore

diff --git a/.editorconfig b/.editorconfig
index 2536d66..5760be5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,7 +3,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
diff --git a/.eslintrc.json b/.eslintrc.json
index 8381a39..e61d31a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-    "extends": "cesium/node",
+    "extends": ["cesium/node", "prettier"],
     "rules": {
         "no-unused-vars": ["error", {"args": "none"}]
     }
diff --git a/.gitignore b/.gitignore
index f423e7b..2f139fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,9 @@ package-lock.json
 .idea/workspace.xml
 .idea/tasks.xml
 
+# VSCode user-specific
+*.vscode
+
 # Generate data
 .eslintcache
 coverage
diff --git a/.npmignore b/.npmignore
index db38711..9c8ac95 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,3 +1,4 @@
+/.vscode
 /.idea
 /coverage
 /doc/*
@@ -10,6 +11,7 @@
 .gitattributes
 .nyc_output
 .npmignore
+.prettierignore
 .travis.yml
 gulpfile.js
 *.tgz
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..c70d188
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,12 @@
+
+# Ignore everything
+*
+
+# Unignore directories (to all depths) and unignore code and style files in these directories
+!bin/**/
+!doc/**/
+!lib/**/
+!specs/**/
+
+!**/*.js
+!**/*.md
diff --git a/.travis.yml b/.travis.yml
index ca4e2a2..aeec6a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
   - "12"
 script:
   - npm run eslint
+  - npm run prettier-check
   - npm run test -- --failTaskOnError --suppressPassed
 
 after_success:
diff --git a/package.json b/package.json
index b089975..1cbfa46 100644
--- a/package.json
+++ b/package.json
@@ -37,14 +37,23 @@
   "devDependencies": {
     "cloc": "^2.8.0",
     "coveralls": "^3.1.1",
-    "eslint": "^7.31.0",
+    "eslint": "^7.32.0",
     "eslint-config-cesium": "^8.0.1",
+    "eslint-config-prettier": "^8.3.0",
     "gulp": "^4.0.2",
+    "husky": "^4.3.8",
     "jasmine": "^3.8.0",
     "jasmine-spec-reporter": "^7.0.0",
     "jsdoc": "^3.6.7",
     "nyc": "^15.1.0",
-    "open": "^8.2.1"
+    "open": "^8.2.1",
+    "prettier": "2.3.2",
+    "pretty-quick": "^3.1.1"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "eslint && pretty-quick --staged"
+    }
   },
   "scripts": {
     "jsdoc": "jsdoc ./lib -R ./README.md -d doc",
@@ -53,7 +62,10 @@
     "test-watch": "gulp test-watch",
     "coverage": "gulp coverage",
     "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
-    "cloc": "gulp cloc"
+    "cloc": "gulp cloc",
+    "prettier": "prettier --write \"**/*\"",
+    "prettier-check": "prettier --check \"**/*\"",
+    "pretty-quick": "pretty-quick"
   },
   "bin": {
     "obj2gltf": "./bin/obj2gltf.js"

From d782d78f2af22756b14e40f100069ea3541415c9 Mon Sep 17 00:00:00 2001
From: Sean Lilley <lilleyse@gmail.com>
Date: Mon, 2 Aug 2021 10:44:04 -0400
Subject: [PATCH 2/2] Remove auto-formatting temporarily

---
 .travis.yml  | 1 -
 package.json | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aeec6a0..ca4e2a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ node_js:
   - "12"
 script:
   - npm run eslint
-  - npm run prettier-check
   - npm run test -- --failTaskOnError --suppressPassed
 
 after_success:
diff --git a/package.json b/package.json
index 1cbfa46..e3211c7 100644
--- a/package.json
+++ b/package.json
@@ -50,11 +50,6 @@
     "prettier": "2.3.2",
     "pretty-quick": "^3.1.1"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "eslint && pretty-quick --staged"
-    }
-  },
   "scripts": {
     "jsdoc": "jsdoc ./lib -R ./README.md -d doc",
     "eslint": "eslint \"./**/*.js\" --cache --quiet",