From 0c199975f2d469ecdfd7efcf2ddd16ffa1dc492b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 17 Aug 2023 07:55:28 +0000
Subject: [PATCH] various path fixes for links to extensions, fix relative paths in links
---
quartz/plugins/emitters/assets.ts | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/quartz/plugins/emitters/assets.ts b/quartz/plugins/emitters/assets.ts
index d0913c4..edc22d9 100644
--- a/quartz/plugins/emitters/assets.ts
+++ b/quartz/plugins/emitters/assets.ts
@@ -1,36 +1,33 @@
-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"
-export const Assets: QuartzEmitterPlugin = () => ({
- 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")
+export const Assets: QuartzEmitterPlugin = () => {
+ return {
+ name: "Assets",
+ getQuartzComponents() {
+ return []
+ },
+ async emit({ argv, cfg }, _content, _resources, _emit): 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 fps: FilePath[] = []
- for await (const rawFp of globbyStream("**", {
- ignore: ["**/*.md"],
- cwd: argv.directory,
- })) {
- const fp = rawFp as FilePath
- const ext = path.extname(fp)
- const src = path.join(argv.directory, fp) as FilePath
- const name = (slugifyFilePath(fp as FilePath) + ext) as FilePath
- const dest = path.join(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)
- }
+ 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)
+ res.push(dest)
+ }
- return fps
- },
-})
+ return res
+ },
+ }
+}
--
Gitblit v1.10.0