This commit is contained in:
Jacky Zhao 2023-07-23 17:09:12 -07:00
parent ed7327bd77
commit 1feb4d07fa
6 changed files with 9 additions and 25 deletions

View File

@ -91,10 +91,7 @@ async function startServing(ctx: BuildCtx, initialContent: ProcessedContent[]) {
await rimraf(argv.output) await rimraf(argv.output)
const parsedFiles = [...contentMap.values()] const parsedFiles = [...contentMap.values()]
const filteredContent = filterContent(ctx, parsedFiles) const filteredContent = filterContent(ctx, parsedFiles)
await emitContent( await emitContent(ctx, filteredContent)
ctx,
filteredContent,
)
console.log(chalk.green(`Done rebuilding in ${perf.timeSince()}`)) console.log(chalk.green(`Done rebuilding in ${perf.timeSince()}`))
} catch { } catch {
console.log(chalk.yellow(`Rebuild failed. Waiting on a change to fix the error...`)) console.log(chalk.yellow(`Rebuild failed. Waiting on a change to fix the error...`))

View File

@ -13,7 +13,7 @@ export const AliasRedirects: QuartzEmitterPlugin = () => ({
getQuartzComponents() { getQuartzComponents() {
return [] return []
}, },
async emit({argv}, content, _resources, emit): Promise<FilePath[]> { async emit({ argv }, content, _resources, emit): Promise<FilePath[]> {
const fps: FilePath[] = [] const fps: FilePath[] = []
for (const [_tree, file] of content) { for (const [_tree, file] of content) {

View File

@ -1,7 +1,5 @@
import { globbyStream } from "globby" import { globbyStream } from "globby"
import { import { FilePath, slugifyFilePath } from "../../path"
FilePath, slugifyFilePath,
} from "../../path"
import { QuartzEmitterPlugin } from "../types" import { QuartzEmitterPlugin } from "../types"
import path from "path" import path from "path"
import fs from "fs" import fs from "fs"

View File

@ -4,4 +4,4 @@ export { FolderPage } from "./folderPage"
export { ContentIndex } from "./contentIndex" export { ContentIndex } from "./contentIndex"
export { AliasRedirects } from "./aliases" export { AliasRedirects } from "./aliases"
export { Assets } from "./assets" export { Assets } from "./assets"
export { Static } from "./static" export { Static } from "./static"

View File

@ -1,12 +1,9 @@
import { globby } from "globby" import { globby } from "globby"
import { import { FilePath, QUARTZ } from "../../path"
FilePath, QUARTZ
} from "../../path"
import { QuartzEmitterPlugin } from "../types" import { QuartzEmitterPlugin } from "../types"
import path from "path" import path from "path"
import fs from "fs" import fs from "fs"
export const Static: QuartzEmitterPlugin = () => ({ export const Static: QuartzEmitterPlugin = () => ({
name: "Static", name: "Static",
getQuartzComponents() { getQuartzComponents() {
@ -16,6 +13,6 @@ export const Static: QuartzEmitterPlugin = () => ({
const staticPath = path.join(QUARTZ, "static") const staticPath = path.join(QUARTZ, "static")
const fps = await globby("*", { cwd: staticPath }) const fps = await globby("*", { cwd: staticPath })
await fs.promises.cp(staticPath, path.join(argv.output, "static"), { recursive: true }) await fs.promises.cp(staticPath, path.join(argv.output, "static"), { recursive: true })
return fps.map(fp => path.join("static", fp)) as FilePath[] return fps.map((fp) => path.join("static", fp)) as FilePath[]
}, },
}) })

View File

@ -84,11 +84,8 @@ function addGlobalPageResources(
} }
} }
export async function emitContent( export async function emitContent(ctx: BuildCtx, content: ProcessedContent[]) {
ctx: BuildCtx, const { argv, cfg } = ctx
content: ProcessedContent[],
) {
const { argv, cfg }= ctx
const contentFolder = argv.directory const contentFolder = argv.directory
const perf = new PerfTimer() const perf = new PerfTimer()
const log = new QuartzLogger(ctx.argv.verbose) const log = new QuartzLogger(ctx.argv.verbose)
@ -125,12 +122,7 @@ export async function emitContent(
// emitter plugins // emitter plugins
for (const emitter of cfg.plugins.emitters) { for (const emitter of cfg.plugins.emitters) {
try { try {
const emitted = await emitter.emit( const emitted = await emitter.emit(ctx, content, staticResources, emit)
ctx,
content,
staticResources,
emit,
)
emittedFiles += emitted.length emittedFiles += emitted.length
if (ctx.argv.verbose) { if (ctx.argv.verbose) {