From 51111af049874faf98e300e95b8db6f494179ec6 Mon Sep 17 00:00:00 2001 From: Aaron Pham Date: Tue, 21 Jan 2025 23:22:43 -0500 Subject: [PATCH] chore: use gitIgnore function filter Signed-off-by: Aaron Pham --- quartz/build.ts | 9 +++------ quartz/util/loadIgnorePatterns.ts | 17 ----------------- 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 quartz/util/loadIgnorePatterns.ts diff --git a/quartz/build.ts b/quartz/build.ts index 33dff4d5f..db1ed25da 100644 --- a/quartz/build.ts +++ b/quartz/build.ts @@ -19,7 +19,6 @@ import { options } from "./util/sourcemap" import { Mutex } from "async-mutex" import DepGraph from "./depgraph" import { getStaticResourcesFromPlugins } from "./plugins" -import loadIgnorePatterns from "./util/loadIgnorePatterns" type Dependencies = Record | null> @@ -70,11 +69,9 @@ async function buildQuartz(argv: Argv, mut: Mutex, clientRefresh: () => void) { console.log(`Cleaned output directory \`${output}\` in ${perf.timeSince("clean")}`) perf.addEvent("glob") - const allFiles = await glob("**/*.*", argv.directory, [ - ...cfg.configuration.ignorePatterns, - ...loadIgnorePatterns(), - ]) - const fps = allFiles.filter((fp) => fp.endsWith(".md")).sort() + const gitIgnoreFilter = await isGitIgnored() + const allFiles = await glob("**/*.*", argv.directory, [...cfg.configuration.ignorePatterns]) + const fps = allFiles.filter((fp) => !gitIgnoreFilter(fp) && fp.endsWith(".md")).sort() console.log( `Found ${fps.length} input files from \`${argv.directory}\` in ${perf.timeSince("glob")}`, ) diff --git a/quartz/util/loadIgnorePatterns.ts b/quartz/util/loadIgnorePatterns.ts deleted file mode 100644 index 5a65175c5..000000000 --- a/quartz/util/loadIgnorePatterns.ts +++ /dev/null @@ -1,17 +0,0 @@ -import * as fs from "fs" -import * as path from "path" - -function loadIgnorePatterns(): string[] { - const gitignorePath = path.join(process.cwd(), ".gitignore") - if (!fs.existsSync(gitignorePath)) { - return [] - } - - const gitignoreContent = fs.readFileSync(gitignorePath, "utf-8") - return gitignoreContent - .split("\n") - .map((line) => line.trim()) - .filter((line) => line !== "" && !line.startsWith("#")) -} - -export default loadIgnorePatterns