From ab0e20b4d0ad1e650126ffd0afa7d0ed6bd46da2 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 11 Feb 2024 18:57:24 +0000
Subject: [PATCH] chore: refactor out and export endsWith
---
quartz/plugins/emitters/assets.ts | 65 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/quartz/plugins/emitters/assets.ts b/quartz/plugins/emitters/assets.ts
index d231d1d..379cd5b 100644
--- a/quartz/plugins/emitters/assets.ts
+++ b/quartz/plugins/emitters/assets.ts
@@ -1,55 +1,52 @@
-import { globbyStream } from "globby"
-import { FilePath, slugifyFilePath } from "../../path"
+import { FilePath, joinSegments, slugifyFilePath } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
import path from "path"
import fs from "fs"
+import { glob } from "../../util/glob"
+import DepGraph from "../../depgraph"
-interface Options {
- attachmentsFolder: string | null
-}
-
-const defaultOptions: Options = {
- attachmentsFolder: null,
-}
-
-export const Assets: QuartzEmitterPlugin<Options> = (userOpts?: Options) => {
- const { attachmentsFolder } = { ...defaultOptions, ...userOpts }
-
+export const Assets: QuartzEmitterPlugin = () => {
return {
name: "Assets",
getQuartzComponents() {
return []
},
- async emit({ argv }, _content, _resources, _emit): Promise<FilePath[]> {
- // glob all non MD/MDX/HTML files in content folder and copy it over
- const assetsPath = path.join(argv.output, "assets")
+ async getDependencyGraph(ctx, _content, _resources) {
+ const { argv, cfg } = ctx
+ const graph = new DepGraph<FilePath>()
- const fps: FilePath[] = []
- for await (const rawFp of globbyStream("**", {
- ignore: ["**/*.md"],
- cwd: argv.directory,
- })) {
- const fp = rawFp as FilePath
+ const fps = await glob("**", argv.directory, ["**/*.md", ...cfg.configuration.ignorePatterns])
+
+ for (const fp of fps) {
const ext = path.extname(fp)
- const src = path.join(argv.directory, fp) as FilePath
- let name = (slugifyFilePath(fp as FilePath) + ext) as FilePath
+ const src = joinSegments(argv.directory, fp) as FilePath
+ const name = (slugifyFilePath(fp as FilePath, true) + ext) as FilePath
- if (attachmentsFolder) {
- const segments = name.split("/")
- if (segments.at(-2) === attachmentsFolder) {
- segments.splice(-2, 1)
- name = segments.join("/") as FilePath
- }
- }
+ const dest = joinSegments(argv.output, name) as FilePath
- const dest = path.join(assetsPath, name) as FilePath
+ graph.addEdge(src, dest)
+ }
+
+ return graph
+ },
+ async emit({ argv, cfg }, _content, _resources): Promise<FilePath[]> {
+ // glob all non MD/MDX/HTML files in content folder and copy it over
+ const assetsPath = argv.output
+ const fps = await glob("**", argv.directory, ["**/*.md", ...cfg.configuration.ignorePatterns])
+ const res: FilePath[] = []
+ for (const fp of fps) {
+ const ext = path.extname(fp)
+ const src = joinSegments(argv.directory, fp) as FilePath
+ const name = (slugifyFilePath(fp as FilePath, true) + ext) as FilePath
+
+ const dest = joinSegments(assetsPath, name) as FilePath
const dir = path.dirname(dest) as FilePath
await fs.promises.mkdir(dir, { recursive: true }) // ensure dir exists
await fs.promises.copyFile(src, dest)
- fps.push(path.join("assets", fp) as FilePath)
+ res.push(dest)
}
- return fps
+ return res
},
}
}
--
Gitblit v1.10.0