font loading options, optimize css

This commit is contained in:
Jacky Zhao 2023-07-24 21:54:47 -07:00
parent 9701313bf3
commit f2324819a8
8 changed files with 261 additions and 38 deletions

View File

@ -4,6 +4,7 @@ draft: true
## high priority ## high priority
- local fonts
- images in same folder are broken on shortest path mode - images in same folder are broken on shortest path mode
- https://help.obsidian.md/Editing+and+formatting/Tags#Nested+tags nested tags?? and big tag listing - https://help.obsidian.md/Editing+and+formatting/Tags#Nested+tags nested tags?? and big tag listing
- watch mode for config/source code - watch mode for config/source code

189
package-lock.json generated
View File

@ -25,6 +25,7 @@
"hast-util-to-string": "^2.0.0", "hast-util-to-string": "^2.0.0",
"is-absolute-url": "^4.0.1", "is-absolute-url": "^4.0.1",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"lightningcss": "^1.21.5",
"mdast-util-find-and-replace": "^2.2.2", "mdast-util-find-and-replace": "^2.2.2",
"mdast-util-to-string": "^3.2.0", "mdast-util-to-string": "^3.2.0",
"micromorph": "^0.4.5", "micromorph": "^0.4.5",
@ -2378,6 +2379,17 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/detect-libc": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
"bin": {
"detect-libc": "bin/detect-libc.js"
},
"engines": {
"node": ">=0.10"
}
},
"node_modules/diff": { "node_modules/diff": {
"version": "5.1.0", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
@ -3384,6 +3396,183 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/lightningcss": {
"version": "1.21.5",
"resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.21.5.tgz",
"integrity": "sha512-/pEUPeih2EwIx9n4T82aOG6CInN83tl/mWlw6B5gWLf36UplQi1L+5p3FUHsdt4fXVfOkkh9KIaM3owoq7ss8A==",
"dependencies": {
"detect-libc": "^1.0.3"
},
"engines": {
"node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"optionalDependencies": {
"lightningcss-darwin-arm64": "1.21.5",
"lightningcss-darwin-x64": "1.21.5",
"lightningcss-linux-arm-gnueabihf": "1.21.5",
"lightningcss-linux-arm64-gnu": "1.21.5",
"lightningcss-linux-arm64-musl": "1.21.5",
"lightningcss-linux-x64-gnu": "1.21.5",
"lightningcss-linux-x64-musl": "1.21.5",
"lightningcss-win32-x64-msvc": "1.21.5"
}
},
"node_modules/lightningcss-darwin-arm64": {
"version": "1.21.5",
"resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.21.5.tgz",
"integrity": "sha512-z05hyLX85WY0UfhkFUOrWEFqD69lpVAmgl3aDzMKlIZJGygbhbegqb4PV8qfUrKKNBauut/qVNPKZglhTaDDxA==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/lightningcss-darwin-x64": {
"version": "1.21.5",
"resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.21.5.tgz",
"integrity": "sha512-MSJhmej/U9MrdPxDk7+FWhO8+UqVoZUHG4VvKT5RQ4RJtqtANTiWiI97LvoVNMtdMnHaKs1Pkji6wHUFxjJsHQ==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/lightningcss-linux-arm-gnueabihf": {
"version": "1.21.5",
"resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.21.5.tgz",
"integrity": "sha512-xN6+5/JsMrbZHL1lPl+MiNJ3Xza12ueBKPepiyDCFQzlhFRTj7D0LG+cfNTzPBTO8KcYQynLpl1iBB8LGp3Xtw==",
"cpu": [
"arm"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/lightningcss-linux-arm64-gnu": {
"version": "1.21.5",
"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.21.5.tgz",
"integrity": "sha512-KfzFNhC4XTbmG3ma/xcTs/IhCwieW89XALIusKmnV0N618ZDXEB0XjWOYQRCXeK9mfqPdbTBpurEHV/XZtkniQ==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/lightningcss-linux-arm64-musl": {
"version": "1.21.5",
"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.21.5.tgz",
"integrity": "sha512-bc0GytQO5Mn9QM6szaZ+31fQHNdidgpM1sSCwzPItz8hg3wOvKl8039rU0veMJV3ZgC9z0ypNRceLrSHeRHmXw==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/lightningcss-linux-x64-gnu": {
"version": "1.21.5",
"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.21.5.tgz",
"integrity": "sha512-JwMbgypPQgc2kW2av3OwzZ8cbrEuIiDiXPJdXRE6aVxu67yHauJawQLqJKTGUhiAhy6iLDG8Wg0a3/ziL+m+Kw==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/lightningcss-linux-x64-musl": {
"version": "1.21.5",
"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.21.5.tgz",
"integrity": "sha512-Ib8b6IQ/OR/VrPU6YBgy4T3QnuHY7DUa95O+nz+cwrTkMSN6fuHcTcIaz4t8TJ6HI5pl3uxUOZjmtls2pyQWow==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/lightningcss-win32-x64-msvc": {
"version": "1.21.5",
"resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.21.5.tgz",
"integrity": "sha512-A8cSi8lUpBeVmoF+DqqW7cd0FemDbCuKr490IXdjyeI+KL8adpSKUs8tcqO0OXPh1EoDqK7JNkD/dELmd4Iz5g==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/longest-streak": { "node_modules/longest-streak": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz", "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",

View File

@ -44,6 +44,7 @@
"hast-util-to-string": "^2.0.0", "hast-util-to-string": "^2.0.0",
"is-absolute-url": "^4.0.1", "is-absolute-url": "^4.0.1",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"lightningcss": "^1.21.5",
"mdast-util-find-and-replace": "^2.2.2", "mdast-util-find-and-replace": "^2.2.2",
"mdast-util-to-string": "^3.2.0", "mdast-util-to-string": "^3.2.0",
"micromorph": "^0.4.5", "micromorph": "^0.4.5",

View File

@ -95,7 +95,7 @@ const config: QuartzConfig = {
filters: [Plugin.RemoveDrafts()], filters: [Plugin.RemoveDrafts()],
emitters: [ emitters: [
Plugin.AliasRedirects(), Plugin.AliasRedirects(),
Plugin.ComponentResources(), Plugin.ComponentResources({ fontOrigin: "googleFonts" }),
Plugin.ContentPage({ Plugin.ContentPage({
...sharedPageComponents, ...sharedPageComponents,
...contentPageLayout, ...contentPageLayout,

View File

@ -11,6 +11,7 @@ import { intro, isCancel, outro, select, text } from "@clack/prompts"
import { rimraf } from "rimraf" import { rimraf } from "rimraf"
import prettyBytes from "pretty-bytes" import prettyBytes from "pretty-bytes"
import { spawnSync } from "child_process" import { spawnSync } from "child_process"
import { transform } from "lightningcss"
const UPSTREAM_NAME = "upstream" const UPSTREAM_NAME = "upstream"
const QUARTZ_SOURCE_BRANCH = "v4-alpha" const QUARTZ_SOURCE_BRANCH = "v4-alpha"
@ -302,6 +303,7 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started.
plugins: [ plugins: [
sassPlugin({ sassPlugin({
type: "css-text", type: "css-text",
cssImports: true,
}), }),
{ {
name: "inline-script-loader", name: "inline-script-loader",

View File

@ -1,5 +1,5 @@
import { FilePath, ServerSlug } from "../../path" import { FilePath, ServerSlug } from "../../path"
import { PluginTypes, QuartzEmitterPlugin } from "../types" import { QuartzEmitterPlugin } from "../types"
// @ts-ignore // @ts-ignore
import spaRouterScript from "../../components/scripts/spa.inline" import spaRouterScript from "../../components/scripts/spa.inline"
@ -13,6 +13,7 @@ import { BuildCtx } from "../../ctx"
import { StaticResources } from "../../resources" import { StaticResources } from "../../resources"
import { QuartzComponent } from "../../components/types" import { QuartzComponent } from "../../components/types"
import { googleFontHref, joinStyles } from "../../theme" import { googleFontHref, joinStyles } from "../../theme"
import { transform } from "lightningcss"
type ComponentResources = { type ComponentResources = {
css: string[] css: string[]
@ -67,7 +68,6 @@ function addGlobalPageResources(
) { ) {
const cfg = ctx.cfg.configuration const cfg = ctx.cfg.configuration
const reloadScript = ctx.argv.serve const reloadScript = ctx.argv.serve
staticResources.css.push(googleFontHref(cfg.theme))
// popovers // popovers
if (cfg.enablePopovers) { if (cfg.enablePopovers) {
@ -120,35 +120,61 @@ function addGlobalPageResources(
} }
} }
export const ComponentResources: QuartzEmitterPlugin = () => ({ interface Options {
name: "ComponentResources", fontOrigin: "googleFonts" | "local"
getQuartzComponents() { }
return []
}, const defaultOptions: Options = {
async emit(ctx, _content, resources, emit): Promise<FilePath[]> { fontOrigin: "googleFonts",
// component specific scripts and styles }
const componentResources = getComponentResources(ctx)
// important that this goes *after* component scripts export const ComponentResources: QuartzEmitterPlugin<Options> = (opts?: Partial<Options>) => {
// as the "nav" event gets triggered here and we should make sure const { fontOrigin } = { ...defaultOptions, ...opts }
// that everyone else had the chance to register a listener for it return {
addGlobalPageResources(ctx, resources, componentResources) name: "ComponentResources",
const fps = await Promise.all([ getQuartzComponents() {
emit({ return []
slug: "index" as ServerSlug, },
ext: ".css", async emit(ctx, _content, resources, emit): Promise<FilePath[]> {
content: joinStyles(ctx.cfg.configuration.theme, styles, ...componentResources.css), // component specific scripts and styles
}), const componentResources = getComponentResources(ctx)
emit({ // important that this goes *after* component scripts
slug: "prescript" as ServerSlug, // as the "nav" event gets triggered here and we should make sure
ext: ".js", // that everyone else had the chance to register a listener for it
content: joinScripts(componentResources.beforeDOMLoaded),
}), if (fontOrigin === "googleFonts") {
emit({ resources.css.push(googleFontHref(ctx.cfg.configuration.theme))
slug: "postscript" as ServerSlug, } else if (fontOrigin === "local") {
ext: ".js", // let the user do it themselves in css
content: joinScripts(componentResources.afterDOMLoaded), }
}),
]) addGlobalPageResources(ctx, resources, componentResources)
return fps
}, const stylesheet = joinStyles(ctx.cfg.configuration.theme, styles, ...componentResources.css)
}) const prescript = joinScripts(componentResources.beforeDOMLoaded)
const postscript = joinScripts(componentResources.afterDOMLoaded)
const fps = await Promise.all([
emit({
slug: "index" as ServerSlug,
ext: ".css",
content: transform({
filename: "index.css",
code: Buffer.from(stylesheet),
minify: true
}).code.toString(),
}),
emit({
slug: "prescript" as ServerSlug,
ext: ".js",
content: prescript,
}),
emit({
slug: "postscript" as ServerSlug,
ext: ".js",
content: postscript,
}),
])
return fps
},
}
}

View File

@ -1,6 +1,6 @@
@use "./custom.scss";
@use "./syntax.scss"; @use "./syntax.scss";
@use "./callouts.scss"; @use "./callouts.scss";
@use "./custom.scss";
@use "./variables.scss" as *; @use "./variables.scss" as *;
html { html {

View File

@ -24,13 +24,17 @@ export interface Theme {
const DEFAULT_SANS_SERIF = const DEFAULT_SANS_SERIF =
'-apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif' '-apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif'
const DEFAULT_MONO = "ui-monospace, SFMono-Regular, SF Mono, Menlo, monospace" const DEFAULT_MONO = "ui-monospace, SFMono-Regular, SF Mono, Menlo, monospace"
export function googleFontHref(theme: Theme) { export function googleFontHref(theme: Theme) {
const { code, header, body } = theme.typography const { code, header, body } = theme.typography
return `https://fonts.googleapis.com/css2?family=${code}&family=${header}:wght@400;700&family=${body}:ital,wght@0,400;0,600;1,400;1,600&display=swap` return `https://fonts.googleapis.com/css2?family=${code}&family=${header}:wght@400;700&family=${body}:ital,wght@0,400;0,600;1,400;1,600&display=swap`
} }
export function joinStyles(theme: Theme, ...stylesheet: string[]) { export function joinStyles(theme: Theme, ...stylesheet: string[]) {
return `:root { return `
${stylesheet.join("\n\n")}
:root {
--light: ${theme.colors.lightMode.light}; --light: ${theme.colors.lightMode.light};
--lightgray: ${theme.colors.lightMode.lightgray}; --lightgray: ${theme.colors.lightMode.lightgray};
--gray: ${theme.colors.lightMode.gray}; --gray: ${theme.colors.lightMode.gray};
@ -55,6 +59,6 @@ export function joinStyles(theme: Theme, ...stylesheet: string[]) {
--tertiary: ${theme.colors.darkMode.tertiary}; --tertiary: ${theme.colors.darkMode.tertiary};
--highlight: ${theme.colors.darkMode.highlight}; --highlight: ${theme.colors.darkMode.highlight};
} }
`
${stylesheet.join("\n\n")}`
} }