Skip to content

Commit

Permalink
Tools: Husky upgrade and git ignorance improved (#33183)
Browse files Browse the repository at this point in the history
* With husky 7.0.0, .husky/.gitignore is now unnecessary and can be removed
Ref: #32077 (comment)
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 <[email protected]>
  • Loading branch information
shivapoudel and gziolo committed Jul 6, 2021
1 parent 1f55df5 commit 2c822ac
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
# default # Set the default behavior, in case people don't have `core.autocrlf` set.
* text=auto * text=auto


# Windows bat files in mobile/android # Windows bat files in mobile/android.
*.bat -text *.bat -text


# Denote all files that are truly binary and should not be modified. # Denote all files that are truly binary and should not be modified.
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,19 +7,22 @@ node_modules
gutenberg.zip gutenberg.zip


# Directories/files that may appear in your environment # Directories/files that may appear in your environment
.DS_Store
*.log *.log
phpcs.xml
yarn.lock yarn.lock
/artifacts /artifacts


.cache .cache
*.tsbuildinfo *.tsbuildinfo


# Operating system specific files
.DS_Store
Thumbs.db

# Report generated from jest-junit # Report generated from jest-junit
test/native/junit.xml test/native/junit.xml


# Local overrides # Local overrides
.wp-env.override.json .wp-env.override.json
phpcs.xml
phpunit.xml phpunit.xml
phpunit-watcher.yml phpunit-watcher.yml
1 change: 0 additions & 1 deletion .husky/.gitignore

This file was deleted.

6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"execa": "4.0.2", "execa": "4.0.2",
"fast-glob": "2.2.7", "fast-glob": "2.2.7",
"glob": "7.1.2", "glob": "7.1.2",
"husky": "6.0.0", "husky": "7.0.0",
"inquirer": "7.1.0", "inquirer": "7.1.0",
"jest": "26.6.3", "jest": "26.6.3",
"jest-junit": "11.0.0", "jest-junit": "11.0.0",
Expand Down

0 comments on commit 2c822ac

Please sign in to comment.