Merge branch 'canary' into upgrade/jest

vercel · Dec 11, 2019 · 73988b4 · 73988b4
2 parents 3325d01 + 338e08b
commit 73988b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.prettierignore_staged b/.prettierignore_staged
@@ -0,0 +1,3 @@
+**/.next/**
+**/_next/**
+**/dist/**
diff --git a/lint-staged.config.js b/lint-staged.config.js
@@ -7,8 +7,10 @@ module.exports = {
       .map(filename => `"${isWin ? filename : escape([filename])}"`)
       .join(' ')
     return [
-      `prettier --write ${escapedFileNames}`,
-      `eslint --max-warnings=0 --fix ${filenames.map(f => `"${f}"`).join(' ')}`,
+      `prettier --with-node-modules --ignore-path='./.prettierignore_staged' --write ${escapedFileNames}`,
+      `eslint --no-ignore --max-warnings=0 --fix ${filenames
+        .map(f => `"${f}"`)
+        .join(' ')}`,
       `git add ${escapedFileNames}`,
     ]
   },
@@ -17,7 +19,7 @@ module.exports = {
       .map(filename => `"${isWin ? filename : escape([filename])}"`)
       .join(' ')
     return [
-      `prettier --write ${escapedFileNames}`,
+      `prettier --with-node-modules --ignore-path='./.prettierignore_staged' --write ${escapedFileNames}`,
       `git add ${escapedFileNames}`,
     ]
   },