diff --git a/ignore.js b/ignore.js index 6d54c64..cf419b6 100644 --- a/ignore.js +++ b/ignore.js @@ -68,7 +68,13 @@ const normalizeOptions = (options = {}) => ({ export const isIgnoredByIgnoreFiles = async (patterns, options) => { const {cwd, suppressErrors, deep, ignore} = normalizeOptions(options); - const paths = await fastGlob(patterns, {cwd, suppressErrors, deep, ignore, ...ignoreFilesGlobOptions}); + const paths = await fastGlob(patterns, { + cwd, + suppressErrors, + deep, + ignore, + ...ignoreFilesGlobOptions, + }); const files = await Promise.all( paths.map(async filePath => ({ @@ -83,7 +89,13 @@ export const isIgnoredByIgnoreFiles = async (patterns, options) => { export const isIgnoredByIgnoreFilesSync = (patterns, options) => { const {cwd, suppressErrors, deep, ignore} = normalizeOptions(options); - const paths = fastGlob.sync(patterns, {cwd, suppressErrors, deep, ignore, ...ignoreFilesGlobOptions}); + const paths = fastGlob.sync(patterns, { + cwd, + suppressErrors, + deep, + ignore, + ...ignoreFilesGlobOptions, + }); const files = paths.map(filePath => ({ filePath, diff --git a/index.d.ts b/index.d.ts index 0e2abb0..feadca3 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,5 +1,5 @@ -import type FastGlob from 'fast-glob'; -import {type Options as FastGlobOptions, type Entry} from 'fast-glob'; +import type FastGlob from 'fast-glob'; // eslint-disable-line import/no-duplicates +import {type Options as FastGlobOptions, type Entry} from 'fast-glob'; // eslint-disable-line import/no-duplicates export type GlobEntry = Entry; diff --git a/index.test-d.ts b/index.test-d.ts index 7fe7839..64ec92e 100644 --- a/index.test-d.ts +++ b/index.test-d.ts @@ -80,7 +80,7 @@ expectType(globbyStream('*.tmp', {ignore: ['**/b.tmp']})) // `NodeJS.ReadableStream` is not generic, unfortunately, // so it seems `(string | Buffer)[]` is the best we can get here - expectType>(streamResult); + expectType>(streamResult); // eslint-disable-line @typescript-eslint/ban-types })(); // GenerateGlobTasks diff --git a/package.json b/package.json index 3f0275b..07af14f 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "git" ], "dependencies": { - "@sindresorhus/merge-streams": "^1.0.0", + "@sindresorhus/merge-streams": "^2.1.0", "fast-glob": "^3.3.2", "ignore": "^5.2.4", "path-type": "^5.0.0", @@ -77,8 +77,8 @@ "benchmark": "2.1.4", "glob-stream": "^8.0.0", "tempy": "^3.1.0", - "tsd": "^0.29.0", - "xo": "^0.56.0" + "tsd": "^0.30.4", + "xo": "^0.57.0" }, "xo": { "ignores": [ diff --git a/tests/ignore.js b/tests/ignore.js index 798bab2..2ab99fc 100644 --- a/tests/ignore.js +++ b/tests/ignore.js @@ -13,12 +13,12 @@ import { getPathValues, } from './utilities.js'; -const runIsIgnoredByIgnoreFiles = async (t, patterns, options, fn) => { +const runIsIgnoredByIgnoreFiles = async (t, patterns, options, function_) => { const promisePredicate = await isIgnoredByIgnoreFiles(patterns, options); const syncPredicate = isIgnoredByIgnoreFilesSync(patterns, options); - const promiseResult = fn(promisePredicate); - const syncResult = fn(syncPredicate); + const promiseResult = function_(promisePredicate); + const syncResult = function_(syncPredicate); t[Array.isArray(promiseResult) ? 'deepEqual' : 'is']( promiseResult, @@ -29,12 +29,12 @@ const runIsIgnoredByIgnoreFiles = async (t, patterns, options, fn) => { return promiseResult; }; -const runIsGitIgnored = async (t, options, fn) => { +const runIsGitIgnored = async (t, options, function_) => { const promisePredicate = await isGitIgnored(options); const syncPredicate = isGitIgnoredSync(options); - const promiseResult = fn(promisePredicate); - const syncResult = fn(syncPredicate); + const promiseResult = function_(promisePredicate); + const syncResult = function_(syncPredicate); t[Array.isArray(promiseResult) ? 'deepEqual' : 'is']( promiseResult,