From cbae88fc4e9b98764cfccca2e85f265c4b894573 Mon Sep 17 00:00:00 2001
From: Adam Brangenberg <adambrangenberg@proton.me>
Date: Mon, 31 Jul 2023 04:08:32 +0000
Subject: [PATCH] Removing redundant properties (#356)
---
quartz/plugins/index.ts | 84 ++----------------------------------------
1 files changed, 4 insertions(+), 80 deletions(-)
diff --git a/quartz/plugins/index.ts b/quartz/plugins/index.ts
index a6231db..23440fb 100644
--- a/quartz/plugins/index.ts
+++ b/quartz/plugins/index.ts
@@ -1,90 +1,15 @@
-import { GlobalConfiguration } from "../cfg"
-import { QuartzComponent } from "../components/types"
import { StaticResources } from "../resources"
-import { joinStyles } from "../theme"
-import { EmitCallback, PluginTypes } from "./types"
-import styles from "../styles/base.scss"
import { FilePath, ServerSlug } from "../path"
+import { BuildCtx } from "../ctx"
-export type ComponentResources = {
- css: string[]
- beforeDOMLoaded: string[]
- afterDOMLoaded: string[]
-}
-
-export function getComponentResources(plugins: PluginTypes): ComponentResources {
- const allComponents: Set<QuartzComponent> = new Set()
- for (const emitter of plugins.emitters) {
- const components = emitter.getQuartzComponents()
- for (const component of components) {
- allComponents.add(component)
- }
- }
-
- const componentResources = {
- css: new Set<string>(),
- beforeDOMLoaded: new Set<string>(),
- afterDOMLoaded: new Set<string>(),
- }
-
- for (const component of allComponents) {
- const { css, beforeDOMLoaded, afterDOMLoaded } = component
- if (css) {
- componentResources.css.add(css)
- }
- if (beforeDOMLoaded) {
- componentResources.beforeDOMLoaded.add(beforeDOMLoaded)
- }
- if (afterDOMLoaded) {
- componentResources.afterDOMLoaded.add(afterDOMLoaded)
- }
- }
-
- return {
- css: [...componentResources.css],
- beforeDOMLoaded: [...componentResources.beforeDOMLoaded],
- afterDOMLoaded: [...componentResources.afterDOMLoaded],
- }
-}
-
-function joinScripts(scripts: string[]): string {
- // wrap with iife to prevent scope collision
- return scripts.map((script) => `(function () {${script}})();`).join("\n")
-}
-
-export async function emitComponentResources(
- cfg: GlobalConfiguration,
- res: ComponentResources,
- emit: EmitCallback,
-): Promise<FilePath[]> {
- const fps = await Promise.all([
- emit({
- slug: "index" as ServerSlug,
- ext: ".css",
- content: joinStyles(cfg.theme, styles, ...res.css),
- }),
- emit({
- slug: "prescript" as ServerSlug,
- ext: ".js",
- content: joinScripts(res.beforeDOMLoaded),
- }),
- emit({
- slug: "postscript" as ServerSlug,
- ext: ".js",
- content: joinScripts(res.afterDOMLoaded),
- }),
- ])
- return fps
-}
-
-export function getStaticResourcesFromPlugins(plugins: PluginTypes) {
+export function getStaticResourcesFromPlugins(ctx: BuildCtx) {
const staticResources: StaticResources = {
css: [],
js: [],
}
- for (const transformer of plugins.transformers) {
- const res = transformer.externalResources ? transformer.externalResources() : {}
+ for (const transformer of ctx.cfg.plugins.transformers) {
+ const res = transformer.externalResources ? transformer.externalResources(ctx) : {}
if (res?.js) {
staticResources.js.push(...res.js)
}
@@ -104,7 +29,6 @@
// inserted in processors.ts
interface DataMap {
slug: ServerSlug
- allSlugs: ServerSlug[]
filePath: FilePath
}
}
--
Gitblit v1.10.0