From 935ccce25908ef15b19f8e01ee2ebe7e88ae5e9e Mon Sep 17 00:00:00 2001
From: Shiva Poudel <3774827+shivapoudel@users.noreply.github.com>
Date: Tue, 6 Jul 2021 16:38:41 +0545
Subject: [PATCH] Tools: Husky upgrade and git ignorance improved (#33183)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* With husky 7.0.0, .husky/.gitignore is now unnecessary and can be removed
Ref: https://github.com/WordPress/gutenberg/pull/32077#issuecomment-855802667
CC @gziolo

* Declare files that will always have LF line endings on checkout

* Git ignore Windows specific files and remove composer vendor dir

* Remove special handling for PHP files from .gitattributes

* Unfortunately vendor dir is required to pass the test

Co-authored-by: Greg Ziółkowski <grzegorz@gziolo.pl>
---
 .gitattributes    | 4 ++--
 .gitignore        | 7 +++++--
 .husky/.gitignore | 1 -
 package-lock.json | 6 +++---
 package.json      | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 .husky/.gitignore

diff --git a/.gitattributes b/.gitattributes
index 6e3eafb6ea3ddb..aaaedda10d2dc0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
-# default
+# Set the default behavior, in case people don't have `core.autocrlf` set.
 * text=auto
 
-# Windows bat files in mobile/android
+# Windows bat files in mobile/android.
 *.bat -text
 
 # Denote all files that are truly binary and should not be modified.
diff --git a/.gitignore b/.gitignore
index b0a128b5a01734..7f9de2f71e647d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,19 +7,22 @@ node_modules
 gutenberg.zip
 
 # Directories/files that may appear in your environment
-.DS_Store
 *.log
-phpcs.xml
 yarn.lock
 /artifacts
 
 .cache
 *.tsbuildinfo
 
+# Operating system specific files
+.DS_Store
+Thumbs.db
+
 # Report generated from jest-junit
 test/native/junit.xml
 
 # Local overrides
 .wp-env.override.json
+phpcs.xml
 phpunit.xml
 phpunit-watcher.yml
diff --git a/.husky/.gitignore b/.husky/.gitignore
deleted file mode 100644
index 31354ec1389994..00000000000000
--- a/.husky/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_
diff --git a/package-lock.json b/package-lock.json
index 8a685b0f36d410..bd7b9e54d3c61e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34540,9 +34540,9 @@
 			}
 		},
 		"husky": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz",
-			"integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/husky/-/husky-7.0.0.tgz",
+			"integrity": "sha512-xK7lO0EtSzfFPiw+oQncQVy/XqV7UVVjxBByc+Iv5iK3yhW9boDoWgvZy3OGo48QKg/hUtZkzz0hi2HXa0kn7w==",
 			"dev": true
 		},
 		"iconv-lite": {
diff --git a/package.json b/package.json
index e94da91a3047a4..7b5f3593e5bda4 100644
--- a/package.json
+++ b/package.json
@@ -173,7 +173,7 @@
 		"execa": "4.0.2",
 		"fast-glob": "2.2.7",
 		"glob": "7.1.2",
-		"husky": "6.0.0",
+		"husky": "7.0.0",
 		"inquirer": "7.1.0",
 		"jest": "26.6.3",
 		"jest-junit": "11.0.0",