From 43b5c050697dc880e241b304a6790988bb3ba86b Mon Sep 17 00:00:00 2001 From: Jan Nicklas Date: Tue, 15 Jan 2019 11:52:29 +0100 Subject: [PATCH] fix: also use .prettierignore from current working directory (#14) --- src/index.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index f1fb2d5..8300cb9 100644 --- a/src/index.js +++ b/src/index.js @@ -29,16 +29,22 @@ export default ( onFoundSinceRevision && onFoundSinceRevision(scm.name, revision); + const rootIgnorer = createIgnorer(directory); + const cwdIgnorer = + process.cwd() !== directory ? createIgnorer(process.cwd()) : () => true; + const changedFiles = scm .getChangedFiles(directory, revision, staged) .filter(isSupportedExtension) - .filter(createIgnorer(directory)); + .filter(rootIgnorer) + .filter(cwdIgnorer); const unstagedFiles = staged ? scm .getUnstagedChangedFiles(directory, revision) .filter(isSupportedExtension) - .filter(createIgnorer(directory)) + .filter(rootIgnorer) + .filter(cwdIgnorer) : []; const wasFullyStaged = f => unstagedFiles.indexOf(f) < 0;