From bfc04681a42adecbd64d98406f989f5202f40704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Wed, 14 Feb 2024 14:09:05 +0100 Subject: [PATCH 1/6] inline css images and fonts closes #786 --- src/rollup.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rollup.ts b/src/rollup.ts index d9ed65f62..fe7dd8635 100644 --- a/src/rollup.ts +++ b/src/rollup.ts @@ -22,9 +22,13 @@ function rewriteInputsNamespace(code: string) { return code.replace(/\b__ns__\b/g, "inputs-3a86ea"); } +const INLINE_CSS = Object.fromEntries( + ["svg", "png", "jpeg", "jpg", "gif", "eot", "otf", "woff", "woff2"].map((ext) => [`.${ext}`, "dataurl" as const]) +); export async function bundleStyles({path, theme}: {path?: string; theme?: string[]}): Promise { const result = await build({ bundle: true, + loader: INLINE_CSS, ...(path ? {entryPoints: [path]} : {stdin: {contents: renderTheme(theme!), loader: "css"}}), write: false, alias: STYLE_MODULES From 0bb827a3cdf395b4ec67c615e8fc993ed6d8ed66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 15 Feb 2024 12:41:42 +0100 Subject: [PATCH 2/6] build url() resources as static assets (hashes provided for free by esbuild) --- src/build.ts | 2 +- src/preview.ts | 10 ++++++++-- src/rollup.ts | 38 +++++++++++++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/build.ts b/src/build.ts index 3c0321a68..9c01f0508 100644 --- a/src/build.ts +++ b/src/build.ts @@ -120,7 +120,7 @@ export async function build( const outputPath = join("_import", style.path); const sourcePath = join(root, style.path); effects.output.write(`${faint("style")} ${sourcePath} ${faint("→")} `); - const code = await bundleStyles({path: sourcePath}); + const code = await bundleStyles({path: sourcePath, includePath: config.output}); await effects.writeFile(outputPath, code); } else { const outputPath = join("_observablehq", `theme-${style.theme}.css`); diff --git a/src/preview.ts b/src/preview.ts index e621c2872..bdd921ad5 100644 --- a/src/preview.ts +++ b/src/preview.ts @@ -115,10 +115,16 @@ export class PreviewServer { } else if (pathname.startsWith("/_import/")) { const path = pathname.slice("/_import".length); const filepath = join(root, path); + const includePath = join(root, ".observablehq", "cache"); try { - if (pathname.endsWith(".css")) { + if (pathname.startsWith("/_import/assets/")) { + const filepath = join(includePath, pathname); await access(filepath, constants.R_OK); - end(req, res, await bundleStyles({path: filepath}), "text/css"); + send(req, filepath, {root: ""}).pipe(res); + return; + } else if (pathname.endsWith(".css")) { + await access(filepath, constants.R_OK); + end(req, res, await bundleStyles({path: filepath, includePath}), "text/css"); return; } else if (pathname.endsWith(".js")) { const input = await readFile(filepath, "utf-8"); diff --git a/src/rollup.ts b/src/rollup.ts index fe7dd8635..477199609 100644 --- a/src/rollup.ts +++ b/src/rollup.ts @@ -1,3 +1,5 @@ +import {access, constants, writeFile} from "node:fs/promises"; +import {join} from "node:path"; import {nodeResolve} from "@rollup/plugin-node-resolve"; import {type CallExpression} from "acorn"; import {simple} from "acorn-walk"; @@ -5,12 +7,14 @@ import {build} from "esbuild"; import type {AstNode, OutputChunk, Plugin, ResolveIdResult} from "rollup"; import {rollup} from "rollup"; import esbuild from "rollup-plugin-esbuild"; -import {getClientPath} from "./files.js"; +import {isEnoent} from "./error.js"; +import {getClientPath, prepareOutput} from "./files.js"; import {getStringLiteralValue, isStringLiteral} from "./javascript/features.js"; import {isPathImport, resolveNpmImport} from "./javascript/imports.js"; import {getObservableUiOrigin} from "./observableApiClient.js"; import {Sourcemap} from "./sourcemap.js"; import {THEMES, renderTheme} from "./theme.js"; +import {faint} from "./tty.js"; import {relativeUrl} from "./url.js"; const STYLE_MODULES = { @@ -23,18 +27,42 @@ function rewriteInputsNamespace(code: string) { } const INLINE_CSS = Object.fromEntries( - ["svg", "png", "jpeg", "jpg", "gif", "eot", "otf", "woff", "woff2"].map((ext) => [`.${ext}`, "dataurl" as const]) + ["svg", "png", "jpeg", "jpg", "gif", "eot", "otf", "woff", "woff2"].map((ext) => [`.${ext}`, "file" as const]) ); -export async function bundleStyles({path, theme}: {path?: string; theme?: string[]}): Promise { +export async function bundleStyles({ + path, + theme, + includePath +}: { + path?: string; + theme?: string[]; + includePath?: string; +}): Promise { const result = await build({ bundle: true, loader: INLINE_CSS, ...(path ? {entryPoints: [path]} : {stdin: {contents: renderTheme(theme!), loader: "css"}}), write: false, + outdir: "/_import", + assetNames: "assets/[name].[hash]", alias: STYLE_MODULES }); - const text = result.outputFiles[0].text; - return rewriteInputsNamespace(text); // TODO only for inputs + let text; + for (let i = 0, n = result.outputFiles.length; i < n; ++i) { + const file = result.outputFiles[i]; + if (typeof includePath === "string" && i < n - 1) { + const out = join(includePath, file.path); + try { + await access(out, constants.R_OK); + } catch (error) { + if (!isEnoent(error)) throw error; + console.log(faint("css asset"), out); + await prepareOutput(out); + await writeFile(out, file.contents); + } + } else text = file.text; + } + return path === "src/client/stdlib/inputs.css" ? rewriteInputsNamespace(text) : text; } export async function rollupClient(clientPath: string, {minify = false} = {}): Promise { From b85cbcaeee0018c27043db41c5b02e1ec262ccc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 15 Feb 2024 18:18:11 +0100 Subject: [PATCH 3/6] effects --- src/build.ts | 34 ++++++++++++++------ src/deploy.ts | 3 ++ src/preview.ts | 87 +++++++++++++++++++++++++++++++++++++++++++------- src/rollup.ts | 46 +++++++++++++------------- 4 files changed, 126 insertions(+), 44 deletions(-) diff --git a/src/build.ts b/src/build.ts index 9c01f0508..cf46a6bd1 100644 --- a/src/build.ts +++ b/src/build.ts @@ -10,7 +10,7 @@ import {getClientPath, prepareOutput, visitMarkdownFiles} from "./files.js"; import {createImportResolver, rewriteModule} from "./javascript/imports.js"; import type {Logger, Writer} from "./logger.js"; import {renderServerless} from "./render.js"; -import {bundleStyles, rollupClient} from "./rollup.js"; +import {bundleStyles, rollupClient, saveCssAssets} from "./rollup.js"; import {Telemetry} from "./telemetry.js"; import {faint} from "./tty.js"; import {resolvePath} from "./url.js"; @@ -60,7 +60,12 @@ export interface BuildEffects { * @param outputPath The path of this file relative to the outputRoot. For * example, in a local build this should be relative to the dist directory. */ - writeFile(outputPath: string, contents: Buffer | string): Promise; + writeFile(outputPath: string, contents: Buffer | Uint8Array | string): Promise; + + /** + * @param path The path to test relative to the outputRoot. + */ + fileExists(path: string): Promise; } export async function build( @@ -110,9 +115,9 @@ export async function build( const clientPath = getClientPath(entry); const outputPath = join("_observablehq", name); effects.output.write(`${faint("bundle")} ${clientPath} ${faint("→")} `); - const code = await (entry.endsWith(".css") - ? bundleStyles({path: clientPath}) - : rollupClient(clientPath, {minify: true})); + const code = entry.endsWith(".css") + ? (await bundleStyles({path: clientPath})).text + : await rollupClient(clientPath, {minify: true}); await effects.writeFile(outputPath, code); } for (const style of styles) { @@ -120,13 +125,14 @@ export async function build( const outputPath = join("_import", style.path); const sourcePath = join(root, style.path); effects.output.write(`${faint("style")} ${sourcePath} ${faint("→")} `); - const code = await bundleStyles({path: sourcePath, includePath: config.output}); - await effects.writeFile(outputPath, code); + const {text, files} = await bundleStyles({path: sourcePath}); + await effects.writeFile(outputPath, text); + await saveCssAssets(files, effects); } else { const outputPath = join("_observablehq", `theme-${style.theme}.css`); effects.output.write(`${faint("bundle")} theme-${style.theme}.css ${faint("→")} `); - const code = await bundleStyles({theme: style.theme}); - await effects.writeFile(outputPath, code); + const {text} = await bundleStyles({theme: style.theme}); + await effects.writeFile(outputPath, text); } } } @@ -201,6 +207,16 @@ export class FileBuildEffects implements BuildEffects { await prepareOutput(destination); await writeFile(destination, contents); } + async fileExists(path: string): Promise { + path = join(this.outputRoot, path); + try { + await access(path, constants.R_OK); + return true; + } catch (error) { + if (!isEnoent(error)) throw error; + } + return false; + } } function styleEquals(a: Style, b: Style): boolean { diff --git a/src/deploy.ts b/src/deploy.ts index 740b6ec2f..f868ec155 100644 --- a/src/deploy.ts +++ b/src/deploy.ts @@ -362,6 +362,9 @@ class DeployBuildEffects implements BuildEffects { this.logger.log(outputPath); await this.apiClient.postDeployFileContents(this.deployId, content, outputPath); } + async fileExists(): Promise { + return false; + } } // export for testing diff --git a/src/preview.ts b/src/preview.ts index bdd921ad5..62e99d959 100644 --- a/src/preview.ts +++ b/src/preview.ts @@ -1,7 +1,7 @@ import {createHash} from "node:crypto"; import {watch} from "node:fs"; import type {FSWatcher, WatchEventType} from "node:fs"; -import {access, constants, readFile, stat} from "node:fs/promises"; +import {access, constants, copyFile, readFile, stat, writeFile} from "node:fs/promises"; import {createServer} from "node:http"; import type {IncomingMessage, RequestListener, Server, ServerResponse} from "node:http"; import {basename, dirname, extname, join, normalize} from "node:path"; @@ -15,14 +15,15 @@ import type {Config} from "./config.js"; import {mergeStyle} from "./config.js"; import {Loader} from "./dataloader.js"; import {HttpError, isEnoent, isHttpError, isSystemError} from "./error.js"; -import {getClientPath} from "./files.js"; +import {getClientPath, prepareOutput} from "./files.js"; import {FileWatchers} from "./fileWatchers.js"; import {createImportResolver, rewriteModule} from "./javascript/imports.js"; import {getImplicitSpecifiers, getImplicitStylesheets} from "./libraries.js"; +import type {Logger, Writer} from "./logger.js"; import {diffMarkdown, parseMarkdown} from "./markdown.js"; import type {ParseResult} from "./markdown.js"; import {renderPreview, resolveStylesheet} from "./render.js"; -import {bundleStyles, rollupClient} from "./rollup.js"; +import {bundleStyles, rollupClient, saveCssAssets} from "./rollup.js"; import {Telemetry} from "./telemetry.js"; import {bold, faint, green, link, red} from "./tty.js"; import {relativeUrl} from "./url.js"; @@ -37,6 +38,28 @@ export interface PreviewOptions { verbose?: boolean; } +export interface PreviewEffects { + logger: Logger; + output: Writer; + + /** + * @param outputPath The path of this file relative to the outputRoot. For + * example, in a local build this should be relative to the dist directory. + */ + copyFile(sourcePath: string, outputPath: string): Promise; + + /** + * @param outputPath The path of this file relative to the outputRoot. For + * example, in a local build this should be relative to the dist directory. + */ + writeFile(outputPath: string, contents: Buffer | Uint8Array | string): Promise; + + /** + * @param path The path to test relative to the outputRoot. + */ + fileExists(path: string): Promise; +} + export async function preview(options: PreviewOptions): Promise { return PreviewServer.start(options); } @@ -46,14 +69,19 @@ export class PreviewServer { private readonly _server: ReturnType; private readonly _socketServer: WebSocketServer; private readonly _verbose: boolean; + private readonly _effects: PreviewEffects; - private constructor({config, server, verbose}: {config: Config; server: Server; verbose: boolean}) { + private constructor( + {config, server, verbose}: {config: Config; server: Server; verbose: boolean}, + effects: PreviewEffects = new DefaultPreviewEffects(join(config.root, ".observablehq", "cache")) + ) { this._config = config; this._verbose = verbose; this._server = server; this._server.on("request", this._handleRequest); this._socketServer = new WebSocketServer({server: this._server}); this._socketServer.on("connection", this._handleConnection); + this._effects = effects; } static async start({verbose = true, hostname, port, open, ...options}: PreviewOptions) { @@ -102,14 +130,14 @@ export class PreviewServer { if (pathname.endsWith(".js")) { end(req, res, await rollupClient(path), "text/javascript"); } else if (pathname.endsWith(".css")) { - end(req, res, await bundleStyles({path}), "text/css"); + end(req, res, (await bundleStyles({path})).text, "text/css"); } else { throw new HttpError(`Not found: ${pathname}`, 404); } } else if (pathname === "/_observablehq/client.js") { end(req, res, await rollupClient(getClientPath("./src/client/preview.js")), "text/javascript"); } else if ((match = /^\/_observablehq\/theme-(?[\w-]+(,[\w-]+)*)?\.css$/.exec(pathname))) { - end(req, res, await bundleStyles({theme: match.groups!.theme?.split(",") ?? []}), "text/css"); + end(req, res, (await bundleStyles({theme: match.groups!.theme?.split(",") ?? []})).text, "text/css"); } else if (pathname.startsWith("/_observablehq/")) { send(req, pathname.slice("/_observablehq".length), {root: publicRoot}).pipe(res); } else if (pathname.startsWith("/_import/")) { @@ -118,13 +146,13 @@ export class PreviewServer { const includePath = join(root, ".observablehq", "cache"); try { if (pathname.startsWith("/_import/assets/")) { - const filepath = join(includePath, pathname); - await access(filepath, constants.R_OK); - send(req, filepath, {root: ""}).pipe(res); + await access(join(includePath, pathname), constants.R_OK); + send(req, pathname, {root: includePath}).pipe(res); return; } else if (pathname.endsWith(".css")) { - await access(filepath, constants.R_OK); - end(req, res, await bundleStyles({path: filepath, includePath}), "text/css"); + const {text, files} = await bundleStyles({path: filepath}); + await saveCssAssets(files, this._effects); + end(req, res, text, "text/css"); return; } else if (pathname.endsWith(".js")) { const input = await readFile(filepath, "utf-8"); @@ -415,3 +443,40 @@ function handleWatch(socket: WebSocket, req: IncomingMessage, {root, style: defa socket.send(JSON.stringify(message)); } } + +class DefaultPreviewEffects implements PreviewEffects { + private readonly outputRoot: string; + readonly logger: Logger; + readonly output: Writer; + constructor( + outputRoot: string, + {logger = console, output = process.stdout}: {logger?: Logger; output?: Writer} = {} + ) { + if (!outputRoot) throw new Error("missing outputRoot"); + this.logger = logger; + this.output = output; + this.outputRoot = outputRoot; + } + async copyFile(sourcePath: string, outputPath: string): Promise { + const destination = join(this.outputRoot, outputPath); + this.logger.log(destination); + await prepareOutput(destination); + await copyFile(sourcePath, destination); + } + async writeFile(outputPath: string, contents: string | Buffer): Promise { + const destination = join(this.outputRoot, outputPath); + this.logger.log(destination); + await prepareOutput(destination); + await writeFile(destination, contents); + } + async fileExists(path: string): Promise { + path = join(this.outputRoot, path); + try { + await access(path, constants.R_OK); + return true; + } catch (error) { + if (!isEnoent(error)) throw error; + } + return false; + } +} diff --git a/src/rollup.ts b/src/rollup.ts index 477199609..143d424c9 100644 --- a/src/rollup.ts +++ b/src/rollup.ts @@ -1,5 +1,4 @@ -import {access, constants, writeFile} from "node:fs/promises"; -import {join} from "node:path"; +import {basename} from "path"; import {nodeResolve} from "@rollup/plugin-node-resolve"; import {type CallExpression} from "acorn"; import {simple} from "acorn-walk"; @@ -7,8 +6,8 @@ import {build} from "esbuild"; import type {AstNode, OutputChunk, Plugin, ResolveIdResult} from "rollup"; import {rollup} from "rollup"; import esbuild from "rollup-plugin-esbuild"; -import {isEnoent} from "./error.js"; -import {getClientPath, prepareOutput} from "./files.js"; +import type {BuildEffects} from "./build.js"; +import {getClientPath} from "./files.js"; import {getStringLiteralValue, isStringLiteral} from "./javascript/features.js"; import {isPathImport, resolveNpmImport} from "./javascript/imports.js"; import {getObservableUiOrigin} from "./observableApiClient.js"; @@ -26,18 +25,19 @@ function rewriteInputsNamespace(code: string) { return code.replace(/\b__ns__\b/g, "inputs-3a86ea"); } +type AssetReference = {path: string; contents: Uint8Array}; + const INLINE_CSS = Object.fromEntries( ["svg", "png", "jpeg", "jpg", "gif", "eot", "otf", "woff", "woff2"].map((ext) => [`.${ext}`, "file" as const]) ); + export async function bundleStyles({ path, - theme, - includePath + theme }: { path?: string; theme?: string[]; - includePath?: string; -}): Promise { +}): Promise<{text: string; files: AssetReference[]}> { const result = await build({ bundle: true, loader: INLINE_CSS, @@ -47,22 +47,11 @@ export async function bundleStyles({ assetNames: "assets/[name].[hash]", alias: STYLE_MODULES }); - let text; - for (let i = 0, n = result.outputFiles.length; i < n; ++i) { - const file = result.outputFiles[i]; - if (typeof includePath === "string" && i < n - 1) { - const out = join(includePath, file.path); - try { - await access(out, constants.R_OK); - } catch (error) { - if (!isEnoent(error)) throw error; - console.log(faint("css asset"), out); - await prepareOutput(out); - await writeFile(out, file.contents); - } - } else text = file.text; - } - return path === "src/client/stdlib/inputs.css" ? rewriteInputsNamespace(text) : text; + const {text} = result.outputFiles.at(-1)!; + return { + text: path === "src/client/stdlib/inputs.css" ? rewriteInputsNamespace(text) : text, + files: result.outputFiles.slice(0, -1).map(({path, contents}) => ({path: path.slice(1), contents})) + }; } export async function rollupClient(clientPath: string, {minify = false} = {}): Promise { @@ -183,3 +172,12 @@ function importMetaResolve(): Plugin { } }; } + +export async function saveCssAssets(files: AssetReference[], effects: BuildEffects): Promise { + for (const {path, contents} of files) { + if (!(await effects.fileExists(path))) { + effects.output.write(`${faint("asset")} ${basename(path)} ${faint("→")} `); + await effects.writeFile(path, contents); + } + } +} From e9151c5ee2a0f8e6968a36a637eea2c1c0d9f29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 15 Feb 2024 19:02:02 +0100 Subject: [PATCH 4/6] test --- .../css-assets-public/atkinson-sample.woff2 | Bin 0 -> 15884 bytes .../build/css-assets-public/atkinson.css | 11 + test/input/build/css-assets-public/index.md | 53 + .../assets/atkinson-sample.25NLOUQG.woff2 | Bin 0 -> 15884 bytes .../css-assets-public/_import/atkinson.css | 1019 +++++++++++++++++ .../css-assets-public/_observablehq/client.js | 0 .../_observablehq/runtime.js | 0 .../css-assets-public/_observablehq/stdlib.js | 0 .../_observablehq/stdlib/dot.js | 0 .../_observablehq/stdlib/duckdb.js | 0 .../_observablehq/stdlib/inputs.css | 0 .../_observablehq/stdlib/inputs.js | 0 .../_observablehq/stdlib/mermaid.js | 0 .../_observablehq/stdlib/sqlite.js | 0 .../_observablehq/stdlib/tex.js | 0 .../_observablehq/stdlib/vega-lite.js | 0 .../_observablehq/stdlib/xlsx.js | 0 .../_observablehq/stdlib/zip.js | 0 .../output/build/css-assets-public/index.html | 68 ++ 19 files changed, 1151 insertions(+) create mode 100644 test/input/build/css-assets-public/atkinson-sample.woff2 create mode 100644 test/input/build/css-assets-public/atkinson.css create mode 100644 test/input/build/css-assets-public/index.md create mode 100644 test/output/build/css-assets-public/_import/assets/atkinson-sample.25NLOUQG.woff2 create mode 100644 test/output/build/css-assets-public/_import/atkinson.css create mode 100644 test/output/build/css-assets-public/_observablehq/client.js create mode 100644 test/output/build/css-assets-public/_observablehq/runtime.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/dot.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/duckdb.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/inputs.css create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/inputs.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/mermaid.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/sqlite.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/tex.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/vega-lite.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/xlsx.js create mode 100644 test/output/build/css-assets-public/_observablehq/stdlib/zip.js create mode 100644 test/output/build/css-assets-public/index.html diff --git a/test/input/build/css-assets-public/atkinson-sample.woff2 b/test/input/build/css-assets-public/atkinson-sample.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..99b3c6f5e440bc94bb70b1727928066cadfd1bbf GIT binary patch literal 15884 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 literal 0 HcmV?d00001 diff --git a/test/input/build/css-assets-public/atkinson.css b/test/input/build/css-assets-public/atkinson.css new file mode 100644 index 000000000..fb2d6ead6 --- /dev/null +++ b/test/input/build/css-assets-public/atkinson.css @@ -0,0 +1,11 @@ +@import url("observablehq:default.css"); +@import url("observablehq:theme-glacier.css"); + +@font-face { + font-family: "atkinson"; + src: url("atkinson-sample.woff2") format("woff2"); +} + +:root { + --serif: atkinson; +} \ No newline at end of file diff --git a/test/input/build/css-assets-public/index.md b/test/input/build/css-assets-public/index.md new file mode 100644 index 000000000..3cb668ec6 --- /dev/null +++ b/test/input/build/css-assets-public/index.md @@ -0,0 +1,53 @@ +--- +style: "atkinson.css" +--- + +# Atkinson Hyperlegible + +## from the Braille Institute + +**a typeface providing greater legibility and readability for low vision readers** + +Atkinson Hyperlegible font is named after Braille Institute founder, J. Robert Atkinson. What makes it different from traditional typography design is that it focuses on letterform distinction to increase character recognition, ultimately improving readability. Free for anyone to use! + +For more see the [brailleinstitute.org/freefont](https://brailleinstitute.org/freefont) web page. + +--- + +## Font License + +Copyright © 2020, Braille Institute of America, Inc., [brailleinstitute.org/freefont](https://www.brailleinstitute.org/freefont) with Reserved Typeface Name Atkinson Hyperlegible Font. + +#### General + +Copyright Holder allows the Font to be used, studied, modified and redistributed freely as long as it is not sold by itself. The Font, including any derivative works, may be bundled, embedded, redistributed and/or sold with any software or other work provided that the Reserved Typeface Name is not used on, in or by any derivative work. The Font and derivatives, however, cannot be released under any other type of license. The requirement for the Font to remain under this license does not +apply to any document created using the Font or any of its derivatives. + +#### Definitions + +- "Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. +- “Copyright Holder” refers to Braille Institute of America, Inc. +- “Font” refers to the Atkinson Hyperlegible Font developed by Copyright Holder. +- "Font Software" refers to the set of files released by Copyright Holder under this license. This may include source files, build scripts and documentation. +- "Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. +- "Original Version" refers to the collection of the Font Software components as distributed by Copyright Holder. +- "Reserved Typeface Name" refers to the name Atkinson Hyperlegible Font. + +#### Permission & Conditions + +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: +1) Neither the Font Software nor any of its individual components, in Original Version or Modified Version, may be sold by itself. +2) The Original Version or Modified Version of the Font Software may be bundled, redistributed and/or sold with any other software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. +3) No Modified Version of the Font Software may use the Reserved Typeface Name unless explicit written permission is granted by Copyright Holder. This restriction only applies to the primary font name as presented to the users. +4) The name of Copyright Holder or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version or any related software or other product, except: +(a) to acknowledge the contribution(s) of Copyright Holder and the Author(s); or +(b) with the prior written permission of Copyright Holder. +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. + +#### Termination + +This license shall immediately terminate and become null and void if any of the above conditions are not met. + +#### Disclaimer + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK OR OTHER RIGHT. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OF OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/test/output/build/css-assets-public/_import/assets/atkinson-sample.25NLOUQG.woff2 b/test/output/build/css-assets-public/_import/assets/atkinson-sample.25NLOUQG.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..99b3c6f5e440bc94bb70b1727928066cadfd1bbf GIT binary patch literal 15884 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 literal 0 HcmV?d00001 diff --git a/test/output/build/css-assets-public/_import/atkinson.css b/test/output/build/css-assets-public/_import/atkinson.css new file mode 100644 index 000000000..f41f7d20e --- /dev/null +++ b/test/output/build/css-assets-public/_import/atkinson.css @@ -0,0 +1,1019 @@ +/* src/style/global.css */ +:root { + --monospace: + Menlo, + Consolas, + monospace; + --monospace-font: 14px/1.5 var(--monospace); + --serif: + "Source Serif Pro", + "Iowan Old Style", + "Apple Garamond", + "Palatino Linotype", + "Times New Roman", + "Droid Serif", + Times, + serif, + "Apple Color Emoji", + "Segoe UI Emoji", + "Segoe UI Symbol"; + --sans-serif: + -apple-system, + BlinkMacSystemFont, + "avenir next", + avenir, + helvetica, + "helvetica neue", + ubuntu, + roboto, + noto, + "segoe ui", + arial, + sans-serif; + --theme-blue: #4269d0; + --theme-green: #3ca951; + --theme-red: #ff725c; + --theme-yellow: #efb118; +} +html { + -webkit-text-size-adjust: 100%; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background: var(--theme-background); + color: var(--theme-foreground); +} +body { + font: 17px/1.5 var(--serif); + margin: 0; +} +a[href] { + color: var(--theme-foreground-focus); +} +h1, +h2, +h3, +h4, +h5, +h6 { + color: var(--theme-foreground-alt); + font-weight: 700; + line-height: 1.15; + margin-top: 0; + margin-bottom: 0.25rem; + scroll-margin-top: 1rem; +} +h2 + p, +h3 + p, +h4 + p, +h2 + table, +h3 + table, +h4 + table { + margin-top: 0; +} +h1 + h2 { + color: var(--theme-foreground); + font-size: 20px; + font-style: italic; + font-weight: normal; + margin-bottom: 1rem; +} +a[href] { + text-decoration: none; +} +a[href]:hover, +a[href]:focus { + text-decoration: underline; +} +h1 code, +h2 code, +h3 code, +h4 code, +h5 code, +h6 code { + font-size: 90%; +} +pre { + line-height: 1.5; +} +pre, +code, +tt { + font-family: var(--monospace); + font-size: 14px; +} +img { + max-width: calc(100vw - 28px); +} +p, +table, +figure, +figcaption, +h1, +h2, +h3, +h4, +h5, +h6, +.katex-display { + max-width: 640px; +} +blockquote, +ol, +ul { + max-width: 600px; +} +blockquote { + margin: 1rem 1.5rem; +} +ul ol { + padding-left: 28px; +} +hr { + height: 1px; + margin: 1rem 0; + padding: 1rem 0; + border: none; + background: + no-repeat center/100% 1px linear-gradient( + to right, + var(--theme-foreground-faintest), + var(--theme-foreground-faintest)); +} +pre { + background-color: var(--theme-background-alt); + border-radius: 4px; + margin: 1rem -1rem; + max-width: 960px; + min-height: 1.5em; + padding: 0.5rem 1rem; + overflow-x: auto; + box-sizing: border-box; +} +input:not([type]), +input[type=email], +input[type=number], +input[type=password], +input[type=range], +input[type=search], +input[type=tel], +input[type=text], +input[type=url] { + width: 240px; +} +input, +canvas, +button { + vertical-align: middle; +} +button, +input, +textarea { + accent-color: var(--theme-blue); +} +table { + width: 100%; + border-collapse: collapse; + font: 13px/1.2 var(--sans-serif); +} +table pre, +table code, +table tt { + font-size: inherit; + line-height: inherit; +} +th > pre:only-child, +td > pre:only-child { + margin: 0; + padding: 0; +} +th { + color: var(--theme-foreground); + text-align: left; + vertical-align: bottom; +} +td { + color: var(--theme-foreground-alt); + vertical-align: top; +} +th, +td { + padding: 3px 6.5px 3px 0; +} +th:last-child, +td:last-child { + padding-right: 0; +} +tr:not(:last-child) { + border-bottom: solid 1px var(--theme-foreground-faintest); +} +thead tr { + border-bottom: solid 1px var(--theme-foreground-fainter); +} +figure, +table { + margin: 1rem 0; +} +figure img { + max-width: 100%; +} +figure > h2, +figure > h3 { + font-family: var(--sans-serif); +} +figure > h2 { + font-size: 20px; +} +figure > h3 { + font-size: 16px; + font-weight: normal; +} +figcaption { + font: small var(--sans-serif); + color: var(--theme-foreground-muted); +} +a[href].observablehq-header-anchor { + color: inherit; +} +:root { + --font-big: 700 32px/1 var(--sans-serif); + --font-small: 14px var(--sans-serif); +} +.big { + font: var(--font-big); +} +.small { + font: var(--font-small); +} +.red { + color: var(--theme-red); +} +.yellow { + color: var(--theme-yellow); +} +.green { + color: var(--theme-green); +} +.blue { + color: var(--theme-blue); +} +.muted { + color: var(--theme-foreground-muted); +} + +/* src/style/layout.css */ +:root { + --theme-caret: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Cpath d='M5 7L8.125 9.5L11.25 7' stroke='black' stroke-width='1.5' stroke-linecap='round' fill='none'/%3E%3C/svg%3E"); + --theme-toggle: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Cpath d='m10.5,11 2.5-3-2.5-3 M6,8h7' fill='none' stroke='black' stroke-width='2'/%3E%3Crect x='2' y='2' fill='currentColor' height='12' rx='0.5' width='2'/%3E%3C/svg%3E"); +} +#observablehq-main, +#observablehq-header, +#observablehq-footer { + margin: 1rem auto; + max-width: 1152px; +} +#observablehq-main { + min-height: calc(100vh - 20rem); + position: relative; + z-index: 0; +} +#observablehq-footer { + display: block; + margin-top: 10rem; + font: 12px var(--sans-serif); + color: var(--theme-foreground-faint); +} +#observablehq-footer nav { + display: grid; + max-width: 640px; + grid-template-columns: 1fr 1fr; + column-gap: 1rem; + margin-bottom: 1rem; +} +#observablehq-footer nav a { + display: flex; + flex-direction: column; + border: 1px solid var(--theme-foreground-fainter); + border-radius: 8px; + padding: 1rem; + line-height: 1rem; + text-decoration: none; +} +#observablehq-footer nav a span { + font-size: 14px; +} +#observablehq-footer nav a:hover span { + text-decoration: underline; +} +#observablehq-footer nav a:hover { + border-color: var(--theme-foreground-focus); +} +#observablehq-footer nav a[rel=prev] { + grid-column: 1; + align-items: start; +} +#observablehq-footer nav a[rel=next] { + grid-column: 2; + align-items: end; +} +#observablehq-footer nav a::before { + color: var(--theme-foreground-faint); +} +#observablehq-footer nav a[rel=prev]::before { + content: "Previous page"; +} +#observablehq-footer nav a[rel=next]::before { + content: "Next page"; +} +#observablehq-center { + margin: 1rem 2rem; +} +#observablehq-sidebar { + position: fixed; + background: var(--theme-background-alt); + color: var(--theme-foreground-muted); + font: 14px var(--sans-serif); + visibility: hidden; + font-weight: 500; + width: 272px; + z-index: 2; + top: 0; + bottom: 0; + left: -272px; + box-sizing: border-box; + padding: 0 0.5rem 1rem 0.5rem; + overflow-y: auto; +} +#observablehq-sidebar ol, +#observablehq-toc ol { + list-style: none; + margin: 0; + padding: 0; +} +#observablehq-sidebar > ol, +#observablehq-sidebar > details { + position: relative; + padding-bottom: 0.5rem; + margin: 0.5rem 0; + border-bottom: solid 1px var(--theme-foreground-faintest); +} +#observablehq-sidebar > ol:first-child { + position: sticky; + top: 0; + z-index: 1; + background: var(--theme-background-alt); + font-size: 16px; + font-weight: 700; + padding-top: 1rem; + padding-left: 0.5rem; + margin: 0; + margin-left: -0.5rem; + color: var(--theme-foreground); +} +#observablehq-sidebar > ol:last-child, +#observablehq-sidebar > details:last-child { + border-bottom: none; +} +#observablehq-sidebar summary { + font-weight: 700; + color: var(--theme-foreground); + cursor: default; +} +#observablehq-sidebar summary::-webkit-details-marker, +#observablehq-sidebar summary::marker { + display: none; +} +#observablehq-sidebar summary::after { + position: absolute; + right: 0.5rem; + width: 1rem; + height: 1rem; + background: var(--theme-foreground-muted); + content: ""; + -webkit-mask: var(--theme-caret); + mask: var(--theme-caret); + transition: transform 250ms ease; + transform: rotate(-90deg); + transform-origin: 50% 50%; +} +#observablehq-sidebar summary:hover::after { + color: var(--theme-foreground); +} +#observablehq-sidebar details[open] summary::after { + transform: rotate(0deg); +} +#observablehq-sidebar-toggle { + position: fixed; + appearance: none; + background: none; + top: 0; + left: 0; + height: 100%; + width: 2rem; + display: flex; + align-items: center; + justify-content: center; + cursor: e-resize; + margin: 0; + color: var(--theme-foreground-muted); + z-index: 1; +} +#observablehq-sidebar-close { + position: absolute; + top: 1rem; + right: 0; + width: 2rem; + height: 2.2rem; + display: flex; + align-items: center; + justify-content: center; + color: var(--theme-foreground-muted); + cursor: w-resize; + z-index: 2; +} +#observablehq-sidebar-toggle::before, +#observablehq-sidebar-close::before { + content: ""; + width: 1rem; + height: 1rem; + background: currentColor; + -webkit-mask: var(--theme-toggle); + mask: var(--theme-toggle); +} +#observablehq-sidebar-close::before { + transform: scaleX(-1); +} +#observablehq-sidebar summary, +.observablehq-link a { + display: block; + padding: 0.5rem 1rem 0.5rem 1.5rem; + margin-left: -0.5rem; +} +#observablehq-sidebar summary:hover, +.observablehq-link-active a, +.observablehq-link a:hover { + background: var(--theme-background); +} +.observablehq-link a:hover { + color: var(--theme-foreground-focus); +} +#observablehq-toc { + display: none; + position: fixed; + color: var(--theme-foreground-muted); + font: 400 14px var(--sans-serif); + z-index: 1; + top: 0; + right: 0; + bottom: 0; + overflow-y: auto; +} +#observablehq-toc nav { + width: 192px; + margin: 2rem 0; + padding: 0 1rem; + box-sizing: border-box; + border-left: solid 1px var(--theme-foreground-faintest); +} +#observablehq-toc div { + font-weight: 700; + color: var(--theme-foreground); + margin-bottom: 0.5rem; +} +.observablehq-secondary-link a { + display: block; + padding: 0.25rem 0; +} +.observablehq-link:not(.observablehq-link-active) a[href]:not(:hover), +.observablehq-secondary-link:not(.observablehq-secondary-link-active) a[href]:not(:hover) { + color: inherit; +} +.observablehq-link-active, +.observablehq-secondary-link-active { + position: relative; +} +.observablehq-link-active::before, +.observablehq-secondary-link-highlight { + content: ""; + position: absolute; + width: 3px; + background: var(--theme-foreground-focus); +} +.observablehq-link-active::before { + top: 0; + bottom: 0; + left: -0.5rem; +} +.observablehq-secondary-link-highlight { + left: 1px; + top: 2rem; + height: 0; + transition: top 150ms ease, height 150ms ease; +} +#observablehq-sidebar { + transition: visibility 150ms 0ms, left 150ms 0ms ease; +} +#observablehq-sidebar-toggle:checked ~ #observablehq-sidebar { + left: 0; + visibility: initial; + box-shadow: 0 0 8px 4px rgba(0, 0, 0, 0.1); + transition: visibility 0ms 0ms, left 150ms 0ms ease; +} +#observablehq-sidebar-backdrop { + display: none; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 2; +} +#observablehq-sidebar-toggle:checked ~ #observablehq-sidebar-backdrop { + display: initial; +} +@media (prefers-color-scheme: dark) { + #observablehq-sidebar-toggle:checked ~ #observablehq-sidebar { + box-shadow: 0 0 8px 4px rgba(0, 0, 0, 0.5); + } +} +@media (min-width: calc(640px + 6rem + 272px)) { + #observablehq-sidebar { + transition: none !important; + } + #observablehq-sidebar-toggle:checked ~ #observablehq-sidebar-backdrop { + display: none; + } + #observablehq-sidebar-toggle:checked ~ #observablehq-sidebar, + #observablehq-sidebar-toggle:indeterminate ~ #observablehq-sidebar { + left: 0; + visibility: initial; + box-shadow: none; + border-right: solid 1px var(--theme-foreground-faintest); + } + #observablehq-sidebar-toggle:checked ~ #observablehq-center, + #observablehq-sidebar-toggle:indeterminate ~ #observablehq-center { + padding-left: calc(272px + 1rem); + padding-right: 1rem; + } +} +@media (min-width: calc(640px + 6rem + 192px)) { + #observablehq-toc ~ #observablehq-center { + padding-right: calc(192px + 1rem); + } + #observablehq-toc { + display: block; + } +} +@media (min-width: calc(640px + 6rem + 272px)) { + #observablehq-sidebar-toggle:checked ~ #observablehq-toc, + #observablehq-sidebar-toggle:indeterminate ~ #observablehq-toc { + display: none; + } +} +@media (min-width: calc(640px + 6rem + 272px + 192px)) { + #observablehq-sidebar-toggle:checked ~ #observablehq-toc, + #observablehq-sidebar-toggle:indeterminate ~ #observablehq-toc, + #observablehq-toc { + display: block; + } + #observablehq-sidebar-toggle:checked ~ #observablehq-toc ~ #observablehq-center, + #observablehq-sidebar-toggle:indeterminate ~ #observablehq-toc ~ #observablehq-center, + #observablehq-toc ~ #observablehq-center { + padding-right: calc(192px + 1rem); + } +} +.observablehq-pre-container { + position: relative; + margin: 1rem -1rem; + max-width: 960px; +} +.observablehq-pre-container::after { + position: absolute; + top: 0; + right: 0; + height: 21px; + font: 12px var(--sans-serif); + color: var(--theme-foreground-muted); + background: + linear-gradient( + to right, + transparent, + var(--theme-background-alt) 40%); + padding: 0.5rem 0.5rem 0.5rem 1.5rem; +} +.observablehq-pre-container[data-language]::after { + content: attr(data-language); +} +.observablehq-pre-container pre { + padding-right: 4rem; + margin: 0; + max-width: none; +} +.observablehq-pre-copy { + position: absolute; + top: 0; + right: 0; + background: none; + color: transparent; + border: none; + border-radius: 4px; + padding: 0 8px; + margin: 4px; + height: 29px; + cursor: pointer; + z-index: 1; + display: flex; + align-items: center; +} +.observablehq-pre-container[data-copy] .observablehq-pre-copy, +.observablehq-pre-container:hover .observablehq-pre-copy, +.observablehq-pre-container .observablehq-pre-copy:focus { + background: var(--theme-background-alt); + color: var(--theme-foreground-faint); +} +.observablehq-pre-container .observablehq-pre-copy:hover { + color: var(--theme-foreground-muted); +} +.observablehq-pre-container .observablehq-pre-copy:active { + color: var(--theme-foreground); + background: var(--theme-foreground-faintest); +} +@media print { + #observablehq-center { + padding-left: 1em !important; + } + #observablehq-sidebar, + #observablehq-footer { + display: none !important; + } +} + +/* src/style/grid.css */ +#observablehq-center { + container-type: inline-size; +} +.grid { + margin: 1rem 0; + display: grid; + gap: 1rem; + grid-auto-rows: 1fr; +} +.grid svg { + overflow: visible; +} +.grid figure { + margin: 0; +} +.grid > * > p:first-child { + margin-top: 0; +} +.grid > * > p:last-child { + margin-bottom: 0; +} +@container (min-width: 640px) { + .grid-cols-2, + .grid-cols-4 { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } + .grid-cols-2 .grid-colspan-2, + .grid-cols-2 .grid-colspan-3, + .grid-cols-2 .grid-colspan-4, + .grid-cols-4 .grid-colspan-2, + .grid-cols-4 .grid-colspan-3, + .grid-cols-4 .grid-colspan-4 { + grid-column: span 2; + } +} +@container (min-width: 720px) { + .grid-cols-3 { + grid-template-columns: repeat(3, minmax(0, 1fr)); + } + .grid-cols-3 .grid-colspan-2 { + grid-column: span 2; + } + .grid-cols-3 .grid-colspan-3 { + grid-column: span 3; + } +} +@container (min-width: 1080px) { + .grid-cols-4 { + grid-template-columns: repeat(4, minmax(0, 1fr)); + } + .grid-cols-4 .grid-colspan-3 { + grid-column: span 3; + } + .grid-cols-4 .grid-colspan-4 { + grid-column: span 4; + } +} +.grid-rowspan-2 { + grid-row: span 2; +} +.grid-rowspan-3 { + grid-row: span 3; +} +.grid-rowspan-4 { + grid-row: span 4; +} + +/* src/style/note.css */ +.note, +.tip, +.warning, +.caution { + border-left: solid 1px var(--theme-foreground-fainter); + padding: 0 2rem; + margin: 1rem 0; + box-sizing: border-box; + max-width: 640px; +} +.note::before, +.tip::before, +.warning::before, +.caution::before { + content: "Note"; + display: block; + margin-bottom: 1rem; + font-weight: 700; + color: var(--theme-foreground-muted); +} +.tip { + border-left-color: var(--theme-green); +} +.tip::before { + content: "Tip"; + color: var(--theme-green); +} +.warning { + border-left-color: var(--theme-yellow); +} +.warning::before { + content: "Warning"; + color: var(--theme-yellow); +} +.caution { + border-left-color: var(--theme-red); +} +.caution::before { + content: "Caution"; + color: var(--theme-red); +} +.note[label]::before, +.tip[label]::before, +.warning[label]::before, +.caution[label]::before { + content: attr(label); +} + +/* src/style/card.css */ +.card { + background: var(--theme-background-alt); + border: solid 1px var(--theme-foreground-faintest); + border-radius: 0.75rem; + padding: 1rem; + margin: 1rem 0; + font: 14px var(--sans-serif); +} +.grid > .card, +.card figure { + margin: 0; +} +.card h2, +.card h3 { + font-size: inherit; +} +.card h2 { + font-weight: 500; + font-size: 15px; +} +.card h3 { + font-weight: 400; + color: var(--theme-foreground-muted); +} +.card h2 ~ svg, +.card h3 ~ svg, +.card h2 ~ p, +.card h3 ~ p { + margin-top: 1rem; +} + +/* src/style/inspector.css */ +.observablehq--block:not(.observablehq--loading):empty { + margin: 0; +} +@keyframes observablehq-loading { + from { + transform: rotate(0); + } + to { + transform: rotate(360deg); + } +} +.observablehq--loading::before { + content: "\21bb"; + font: var(--monospace-font); + color: var(--theme-foreground-muted); + display: inline-block; + transform-origin: 0.32em 55%; + animation-name: observablehq-loading; + animation-timing-function: linear; + animation-duration: 1s; + animation-iteration-count: infinite; +} +.observablehq--block.observablehq--loading::before { + display: block; +} +.observablehq--block { + margin: 1rem 0; +} +.observablehq--block .observablehq, +.observablehq--block .observablehq--inspect { + display: block; +} +.observablehq--collapsed, +.observablehq--expanded.observablehq--inspect a { + cursor: pointer; +} +.observablehq--caret { + margin-right: 4px; + vertical-align: baseline; +} +.observablehq--field { + text-indent: -1rem; + margin-left: 1rem; +} +.observablehq--inspect { + font: var(--monospace-font); + overflow-x: auto; + white-space: pre; +} +.observablehq--inspect.observablehq--import { + white-space: normal; +} +.observablehq--inspect::-webkit-scrollbar { + display: none; +} +.observablehq--error .observablehq--inspect { + word-break: break-all; + white-space: pre-wrap; +} +.observablehq--string-expand { + margin-left: 6px; + padding: 2px 6px; + border-radius: 2px; + font-size: 80%; + background: var(--theme-background-alt); + cursor: pointer; + vertical-align: middle; +} +.observablehq--keyword, +.hljs-doctag, +.hljs-keyword, +.hljs-meta .hljs-keyword, +.hljs-template-tag, +.hljs-template-variable, +.hljs-type, +.hljs-variable.language_ { + color: var(--syntax-keyword); +} +.observablehq--symbol, +.hljs-title, +.hljs-title.class_, +.hljs-title.class_.inherited__, +.hljs-title.function_ { + color: var(--syntax-entity); +} +.observablehq--index, +.observablehq--key, +.hljs-attr, +.hljs-attribute, +.hljs-meta, +.hljs-operator, +.hljs-variable, +.hljs-selector-attr, +.hljs-selector-class, +.hljs-selector-id { + color: var(--syntax-constant); +} +.observablehq--regexp, +.observablehq--string, +.hljs-regexp, +.hljs-string, +.hljs-meta .hljs-string { + color: var(--syntax-string); +} +.observablehq--null, +.observablehq--undefined, +.hljs-built_in, +.hljs-literal, +.hljs-symbol { + color: var(--syntax-variable); +} +.observablehq--prototype-key, +.observablehq--empty, +.hljs-comment, +.hljs-formula { + color: var(--syntax-comment); +} +.observablehq--bigint, +.observablehq--boolean, +.observablehq--date, +.observablehq--forbidden, +.observablehq--number, +.hljs-name, +.hljs-number, +.hljs-quote, +.hljs-selector-tag, +.hljs-selector-pseudo { + color: var(--syntax-entity-tag); +} +.hljs-subst { + color: var(--syntax-storage-modifier-import); +} +.hljs-section { + color: var(--syntax-markup-heading); + font-weight: bold; +} +.hljs-bullet { + color: var(--syntax-markup-list); +} +.hljs-emphasis { + color: var(--syntax-markup-italic); + font-style: italic; +} +.hljs-strong { + color: var(--syntax-markup-bold); + font-weight: bold; +} +.hljs-addition { + color: var(--syntax-markup-inserted); + background-color: var(--syntax-markup-inserted-background); +} +.hljs-deletion { + color: var(--syntax-markup-deleted); + background-color: var(--syntax-markup-deleted-background); +} +.observablehq--empty { + font-style: oblique; +} +.observablehq--error { + color: var(--syntax-keyword); +} + +/* src/style/plot.css */ +.plot-d6a7b5 { + --plot-background: var(--theme-background); +} +p .plot-d6a7b5 { + display: inline-block; +} + +/* src/style/default.css */ + +/* src/style/syntax-light.css */ +:root { + --syntax-keyword: #d73a49; + --syntax-entity: #6f42c1; + --syntax-constant: #005cc5; + --syntax-string: #032f62; + --syntax-variable: #e36209; + --syntax-comment: var(--theme-foreground-muted); + --syntax-entity-tag: #22863a; + --syntax-storage-modifier-import: #24292e; + --syntax-markup-heading: #005cc5; + --syntax-markup-list: #735c0f; + --syntax-markup-italic: #24292e; + --syntax-markup-bold: #24292e; + --syntax-markup-inserted: #22863a; + --syntax-markup-inserted-background: #f0fff4; + --syntax-markup-deleted: #b31d28; + --syntax-markup-deleted-background: #ffeef0; +} + +/* src/style/abstract-light.css */ +:root { + --theme-background-b: color-mix(in srgb, var(--theme-foreground) 4%, var(--theme-background-a)); + --theme-background: var(--theme-background-a); + --theme-background-alt: var(--theme-background-b); + --theme-foreground-alt: color-mix(in srgb, var(--theme-foreground) 90%, var(--theme-background-a)); + --theme-foreground-muted: color-mix(in srgb, var(--theme-foreground) 60%, var(--theme-background-a)); + --theme-foreground-faint: color-mix(in srgb, var(--theme-foreground) 50%, var(--theme-background-a)); + --theme-foreground-fainter: color-mix(in srgb, var(--theme-foreground) 30%, var(--theme-background-a)); + --theme-foreground-faintest: color-mix(in srgb, var(--theme-foreground) 14%, var(--theme-background-a)); + color-scheme: light; +} + +/* src/style/theme-glacier.css */ +:root { + --theme-foreground: #1c3957; + --theme-foreground-focus: #d75c48; + --theme-background-a: #f4faff; +} + +/* test/input/build/css-assets-public/atkinson.css */ +@font-face { + font-family: "atkinson"; + src: url("./assets/atkinson-sample.25NLOUQG.woff2") format("woff2"); +} +:root { + --serif: atkinson; +} diff --git a/test/output/build/css-assets-public/_observablehq/client.js b/test/output/build/css-assets-public/_observablehq/client.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/runtime.js b/test/output/build/css-assets-public/_observablehq/runtime.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib.js b/test/output/build/css-assets-public/_observablehq/stdlib.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/dot.js b/test/output/build/css-assets-public/_observablehq/stdlib/dot.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/duckdb.js b/test/output/build/css-assets-public/_observablehq/stdlib/duckdb.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/inputs.css b/test/output/build/css-assets-public/_observablehq/stdlib/inputs.css new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/inputs.js b/test/output/build/css-assets-public/_observablehq/stdlib/inputs.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/mermaid.js b/test/output/build/css-assets-public/_observablehq/stdlib/mermaid.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/sqlite.js b/test/output/build/css-assets-public/_observablehq/stdlib/sqlite.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/tex.js b/test/output/build/css-assets-public/_observablehq/stdlib/tex.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/vega-lite.js b/test/output/build/css-assets-public/_observablehq/stdlib/vega-lite.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/xlsx.js b/test/output/build/css-assets-public/_observablehq/stdlib/xlsx.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/_observablehq/stdlib/zip.js b/test/output/build/css-assets-public/_observablehq/stdlib/zip.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/output/build/css-assets-public/index.html b/test/output/build/css-assets-public/index.html new file mode 100644 index 000000000..1287f4343 --- /dev/null +++ b/test/output/build/css-assets-public/index.html @@ -0,0 +1,68 @@ + + + +Atkinson Hyperlegible + + + + + + + + + + +
+
+

Atkinson Hyperlegible

+

from the Braille Institute

+

a typeface providing greater legibility and readability for low vision readers

+

Atkinson Hyperlegible font is named after Braille Institute founder, J. Robert Atkinson. What makes it different from traditional typography design is that it focuses on letterform distinction to increase character recognition, ultimately improving readability. Free for anyone to use!

+

For more see the brailleinstitute.org/freefont web page.

+
+

Font License

+

Copyright © 2020, Braille Institute of America, Inc., brailleinstitute.org/freefont with Reserved Typeface Name Atkinson Hyperlegible Font.

+

General

+

Copyright Holder allows the Font to be used, studied, modified and redistributed freely as long as it is not sold by itself. The Font, including any derivative works, may be bundled, embedded, redistributed and/or sold with any software or other work provided that the Reserved Typeface Name is not used on, in or by any derivative work. The Font and derivatives, however, cannot be released under any other type of license. The requirement for the Font to remain under this license does not +apply to any document created using the Font or any of its derivatives.

+

Definitions

+
    +
  • "Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
    • +
  • “Copyright Holder” refers to Braille Institute of America, Inc.
    • +
  • “Font” refers to the Atkinson Hyperlegible Font developed by Copyright Holder.
    • +
  • "Font Software" refers to the set of files released by Copyright Holder under this license. This may include source files, build scripts and documentation.
    • +
  • "Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
    • +
  • "Original Version" refers to the collection of the Font Software components as distributed by Copyright Holder.
    • +
  • "Reserved Typeface Name" refers to the name Atkinson Hyperlegible Font.
    • +
+

Permission & Conditions

+

Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:

+
    +
  1. Neither the Font Software nor any of its individual components, in Original Version or Modified Version, may be sold by itself.
    2. +
  2. The Original Version or Modified Version of the Font Software may be bundled, redistributed and/or sold with any other software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
    3. +
  3. No Modified Version of the Font Software may use the Reserved Typeface Name unless explicit written permission is granted by Copyright Holder. This restriction only applies to the primary font name as presented to the users.
    4. +
  4. The name of Copyright Holder or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version or any related software or other product, except: +(a) to acknowledge the contribution(s) of Copyright Holder and the Author(s); or +(b) with the prior written permission of Copyright Holder.
    5. +
  5. The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license.
    6. +
+

Termination

+

This license shall immediately terminate and become null and void if any of the above conditions are not met.

+

Disclaimer

+

THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK OR OTHER RIGHT. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OF OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

+
+ +
From 6762b598acb2237c3ed01aa0852d19e0b0face48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 15 Feb 2024 19:22:52 +0100 Subject: [PATCH 5/6] some additional work to catch the error this is in order to remove the misleading messages from esbuild, because the developer cannot mark these assets as external. --- src/rollup.ts | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/rollup.ts b/src/rollup.ts index 143d424c9..f30e89d5a 100644 --- a/src/rollup.ts +++ b/src/rollup.ts @@ -38,20 +38,26 @@ export async function bundleStyles({ path?: string; theme?: string[]; }): Promise<{text: string; files: AssetReference[]}> { - const result = await build({ - bundle: true, - loader: INLINE_CSS, - ...(path ? {entryPoints: [path]} : {stdin: {contents: renderTheme(theme!), loader: "css"}}), - write: false, - outdir: "/_import", - assetNames: "assets/[name].[hash]", - alias: STYLE_MODULES - }); - const {text} = result.outputFiles.at(-1)!; - return { - text: path === "src/client/stdlib/inputs.css" ? rewriteInputsNamespace(text) : text, - files: result.outputFiles.slice(0, -1).map(({path, contents}) => ({path: path.slice(1), contents})) - }; + try { + const result = await build({ + bundle: true, + loader: INLINE_CSS, + ...(path ? {entryPoints: [path]} : {stdin: {contents: renderTheme(theme!), loader: "css"}}), + write: false, + outdir: "/_import", + assetNames: "assets/[name].[hash]", + alias: STYLE_MODULES, + logLevel: "silent" + }); + const {text} = result.outputFiles.at(-1)!; + return { + text: path === "src/client/stdlib/inputs.css" ? rewriteInputsNamespace(text) : text, + files: result.outputFiles.slice(0, -1).map(({path, contents}) => ({path: path.slice(1), contents})) + }; + } catch (error: any) { + const err = error?.errors?.[0]?.location; + throw new Error(err ? `Error bundling ${err.file} line ${err.line}:\n${err.lineText}` : "Bundler error."); + } } export async function rollupClient(clientPath: string, {minify = false} = {}): Promise { From efff783148168b7de58d9d2291d70c1495be082f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 15 Feb 2024 19:29:44 +0100 Subject: [PATCH 6/6] fix tests --- src/build.ts | 1 - .../css-assets-public/_import/atkinson.css | 107 +++++++++++++++++- 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/src/build.ts b/src/build.ts index ec62d5f2c..24065f393 100644 --- a/src/build.ts +++ b/src/build.ts @@ -11,7 +11,6 @@ import {createImportResolver, rewriteModule} from "./javascript/imports.js"; import type {Logger, Writer} from "./logger.js"; import {renderServerless} from "./render.js"; import {bundleStyles, rollupClient, saveCssAssets} from "./rollup.js"; -import {bundleStyles, rollupClient} from "./rollup.js"; import {searchIndex} from "./search.js"; import {Telemetry} from "./telemetry.js"; import {faint} from "./tty.js"; diff --git a/test/output/build/css-assets-public/_import/atkinson.css b/test/output/build/css-assets-public/_import/atkinson.css index f41f7d20e..a0da030cd 100644 --- a/test/output/build/css-assets-public/_import/atkinson.css +++ b/test/output/build/css-assets-public/_import/atkinson.css @@ -264,6 +264,7 @@ a[href].observablehq-header-anchor { :root { --theme-caret: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Cpath d='M5 7L8.125 9.5L11.25 7' stroke='black' stroke-width='1.5' stroke-linecap='round' fill='none'/%3E%3C/svg%3E"); --theme-toggle: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Cpath d='m10.5,11 2.5-3-2.5-3 M6,8h7' fill='none' stroke='black' stroke-width='2'/%3E%3Crect x='2' y='2' fill='currentColor' height='12' rx='0.5' width='2'/%3E%3C/svg%3E"); + --theme-magnifier: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Cpath stroke='currentColor' stroke-width='2' fill='none' d='M15,15L10.5,10.5a3,3 0 1,0 -6 -6a3,3 0 1,0 6 6'%3E%3C/path%3E%3C/svg%3E"); } #observablehq-main, #observablehq-header, @@ -444,9 +445,10 @@ a[href].observablehq-header-anchor { } #observablehq-sidebar summary, .observablehq-link a { - display: block; + display: flex; padding: 0.5rem 1rem 0.5rem 1.5rem; margin-left: -0.5rem; + align-items: center; } #observablehq-sidebar summary:hover, .observablehq-link-active a, @@ -512,6 +514,7 @@ a[href].observablehq-header-anchor { #observablehq-sidebar { transition: visibility 150ms 0ms, left 150ms 0ms ease; } +.observablehq-sidebar-open ~ #observablehq-sidebar, #observablehq-sidebar-toggle:checked ~ #observablehq-sidebar { left: 0; visibility: initial; @@ -527,6 +530,7 @@ a[href].observablehq-header-anchor { left: 0; z-index: 2; } +.observablehq-sidebar-open ~ #observablehq-sidebar-backdrop, #observablehq-sidebar-toggle:checked ~ #observablehq-sidebar-backdrop { display: initial; } @@ -637,6 +641,107 @@ a[href].observablehq-header-anchor { color: var(--theme-foreground); background: var(--theme-foreground-faintest); } +#observablehq-sidebar.observablehq-search-results > ol:not(:first-child), +#observablehq-sidebar.observablehq-search-results > details { + display: none; +} +#observablehq-search { + position: relative; + padding: 0.5rem 0 0 0; + display: flex; + align-items: center; +} +#observablehq-search input { + padding: 6px 4px 6px 2.2em; + width: 100%; + border: none; + border-radius: 4px; + background-color: var(--theme-background); + font-size: 13.3px; + height: 28px; +} +#observablehq-search input::placeholder { + color: var(--theme-foreground-faint); +} +#observablehq-search::before { + position: absolute; + left: 0.5rem; + content: ""; + width: 1rem; + height: 1rem; + background: currentColor; + -webkit-mask: var(--theme-magnifier); + mask: var(--theme-magnifier); + pointer-events: none; +} +#observablehq-search::after { + position: absolute; + right: 6px; + content: attr(data-shortcut); + pointer-events: none; +} +#observablehq-search:focus-within::after { + content: ""; +} +#observablehq-search-results { + --relevance-width: 32px; + position: absolute; + overflow-y: auto; + top: 6.5rem; + left: 0; + right: 0.5rem; + bottom: 0; +} +#observablehq-search-results a span { + max-width: 184px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +#observablehq-search-results div { + text-align: right; + font-size: 10px; + margin: 0.5em; +} +#observablehq-search-results li { + position: relative; + display: flex; + align-items: center; +} +#observablehq-search-results a { + flex-grow: 1; +} +#observablehq-search-results li:after, +#observablehq-search-results a:after { + content: ""; + width: var(--relevance-width); + height: 4px; + position: absolute; + right: 0.5em; + border-radius: 2px; + background: var(--theme-foreground-muted); +} +#observablehq-search-results li.observablehq-link-active:after { + background: var(--theme-foreground-focus); +} +#observablehq-search-results a:after { + background: var(--theme-foreground-faintest); +} +#observablehq-search-results li[data-score="0"]:after { + width: calc(var(--relevance-width) * 0.125); +} +#observablehq-search-results li[data-score="1"]:after { + width: calc(var(--relevance-width) * 0.25); +} +#observablehq-search-results li[data-score="2"]:after { + width: calc(var(--relevance-width) * 0.4375); +} +#observablehq-search-results li[data-score="3"]:after { + width: calc(var(--relevance-width) * 0.625); +} +#observablehq-search-results li[data-score="4"]:after { + width: calc(var(--relevance-width) * 0.8125); +} @media print { #observablehq-center { padding-left: 1em !important;