Fix gitignore option compatibility with objectMode option (#157)

sindresorhus · Jan 6, 2021 · f9fc476 · f9fc476
1 parent 7807d29
commit f9fc476
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/gitignore.js b/gitignore.js
@@ -59,7 +59,7 @@ const ensureAbsolutePathForCwd = (cwd, p) => {
 };
 
 const getIsIgnoredPredecate = (ignores, cwd) => {
-	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p))));
+	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p.path || p))));
 };
 
 const getFile = async (file, cwd) => {

diff --git a/test.js b/test.js
@@ -303,6 +303,18 @@ test('respects gitignore option false - stream', async t => {
 	t.true(actual.includes('node_modules'));
 });
 
+test('gitingore option and objectMode option - async', async t => {
+	const result = await globby('fixtures/gitignore/*', {gitignore: true, objectMode: true});
+	t.is(result.length, 1);
+	t.truthy(result[0].path);
+});
+
+test('gitingore option and objectMode option - sync', t => {
+	const result = globby.sync('fixtures/gitignore/*', {gitignore: true, objectMode: true});
+	t.is(result.length, 1);
+	t.truthy(result[0].path);
+});
+
 test('`{extension: false}` and `expandDirectories.extensions` option', t => {
 	t.deepEqual(
 		globby.sync('*', {