Merge branch 'master' into #288-migrate-to-eslint

# Conflicts: # .lintstagedrc.yml # package-lock.json # package.json
shiftcode · Apr 6, 2020 · bf61aaf · bf61aaf
2 parents 90bc53e + 3ffded4
commit bf61aaf
Show file tree

Hide file tree

Showing 5 changed files with 4,381 additions and 3,798 deletions.
diff --git a/.lintstagedrc.yml b/.lintstagedrc.yml
@@ -1,7 +1,5 @@
 "{src,test}/**/*.ts":
   - prettier --write --config ./.prettierrc.yml
   - eslint --config .eslintrc.js --ext .ts --fix
-  - git add
 "**/package.json":
   - sort-package-json
-  - git add