diff --git a/test/build-test.ts b/test/build-test.ts index b187ef0b1..d84dff965 100644 --- a/test/build-test.ts +++ b/test/build-test.ts @@ -5,7 +5,7 @@ import os from "node:os"; import {extname} from "node:path/posix"; import {join, normalize, relative} from "node:path/posix"; import {PassThrough} from "node:stream"; -import {ascending, difference, sort} from "d3-array"; +import {ascending, descending, difference, sort} from "d3-array"; import type {BuildManifest} from "../src/build.js"; import {FileBuildEffects, build} from "../src/build.js"; import {normalizeConfig, readConfig, setCurrentDate} from "../src/config.js"; @@ -77,7 +77,10 @@ describe("build", () => { // renumber the hashes so they are sequential. This way we don’t have to // update the test snapshots whenever Framework’s client code changes. We // make an exception for minisearch.json because to test the content. - for (const path of sort(findFiles(join(outputDir, "_observablehq")), extname, (d) => d)) { + for (const path of sort( + findFiles(join(outputDir, "_observablehq")), + (a, b) => ascending(extname(a) === ".css", extname(b) === ".css") || ascending(a, b) + )) { const match = /^((.+)\.[0-9a-f]{8})\.(\w+)$/.exec(path); if (!match) throw new Error(`no hash found: ${path}`); const [, key, name, ext] = match; diff --git a/test/mocks/observableApi.ts b/test/mocks/observableApi.ts index ae526f5aa..65593636f 100644 --- a/test/mocks/observableApi.ts +++ b/test/mocks/observableApi.ts @@ -265,10 +265,10 @@ class ObservableApiMock { expectStandardFiles(options: Omit) { return this.expectFileUpload({...options, path: "index.html"}) - .expectFileUpload({...options, path: "_observablehq/theme-air,near-midnight.00000001.css"}) - .expectFileUpload({...options, path: "_observablehq/client.00000002.js"}) - .expectFileUpload({...options, path: "_observablehq/runtime.00000003.js"}) - .expectFileUpload({...options, path: "_observablehq/stdlib.00000004.js"}); + .expectFileUpload({...options, path: "_observablehq/client.00000001.js"}) + .expectFileUpload({...options, path: "_observablehq/runtime.00000002.js"}) + .expectFileUpload({...options, path: "_observablehq/stdlib.00000003.js"}) + .expectFileUpload({...options, path: "_observablehq/theme-air,near-midnight.00000004.css"}); } /** Register a file that is expected to be uploaded. Also includes that file in diff --git a/test/output/build/404/404.html b/test/output/build/404/404.html index 57237b065..de7987e63 100644 --- a/test/output/build/404/404.html +++ b/test/output/build/404/404.html @@ -8,12 +8,12 @@ Page not found - + - - - - + + + + diff --git a/test/output/build/404/_observablehq/client.00000002.js b/test/output/build/404/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/404/_observablehq/client.00000002.js rename to test/output/build/404/_observablehq/client.00000001.js diff --git a/test/output/build/404/_observablehq/runtime.00000003.js b/test/output/build/404/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/404/_observablehq/runtime.00000003.js rename to test/output/build/404/_observablehq/runtime.00000002.js diff --git a/test/output/build/404/_observablehq/stdlib.00000004.js b/test/output/build/404/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/404/_observablehq/stdlib.00000004.js rename to test/output/build/404/_observablehq/stdlib.00000003.js diff --git a/test/output/build/404/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/404/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/404/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/404/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/archives.posix/_observablehq/client.00000002.js b/test/output/build/archives.posix/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/archives.posix/_observablehq/client.00000002.js rename to test/output/build/archives.posix/_observablehq/client.00000001.js diff --git a/test/output/build/archives.posix/_observablehq/runtime.00000003.js b/test/output/build/archives.posix/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/archives.posix/_observablehq/runtime.00000003.js rename to test/output/build/archives.posix/_observablehq/runtime.00000002.js diff --git a/test/output/build/archives.posix/_observablehq/stdlib.00000004.js b/test/output/build/archives.posix/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/archives.posix/_observablehq/stdlib.00000004.js rename to test/output/build/archives.posix/_observablehq/stdlib.00000003.js diff --git a/test/output/build/archives.posix/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/archives.posix/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/archives.posix/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/archives.posix/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/archives.posix/tar.html b/test/output/build/archives.posix/tar.html index 1f4744e22..df09c13b5 100644 --- a/test/output/build/archives.posix/tar.html +++ b/test/output/build/archives.posix/tar.html @@ -7,16 +7,16 @@ Tar - + - - - - + + + + diff --git a/test/output/build/config/index.html b/test/output/build/config/index.html index fbbd50242..d905a1d73 100644 --- a/test/output/build/config/index.html +++ b/test/output/build/config/index.html @@ -7,15 +7,15 @@ Index - + - - - - + + + + diff --git a/test/output/build/config/one.html b/test/output/build/config/one.html index f5c7a4920..447733c3f 100644 --- a/test/output/build/config/one.html +++ b/test/output/build/config/one.html @@ -7,15 +7,15 @@ One - + - - - - + + + + diff --git a/test/output/build/config/sub/two.html b/test/output/build/config/sub/two.html index 1a3294dd4..72b3305cd 100644 --- a/test/output/build/config/sub/two.html +++ b/test/output/build/config/sub/two.html @@ -7,15 +7,15 @@ Two - + - - - - + + + + diff --git a/test/output/build/config/toc-override.html b/test/output/build/config/toc-override.html index 76d593550..7d24d3a00 100644 --- a/test/output/build/config/toc-override.html +++ b/test/output/build/config/toc-override.html @@ -7,15 +7,15 @@ H1: Section - + - - - - + + + + diff --git a/test/output/build/config/toc.html b/test/output/build/config/toc.html index ede823025..43a90d9e0 100644 --- a/test/output/build/config/toc.html +++ b/test/output/build/config/toc.html @@ -7,15 +7,15 @@ H1: Section - + - - - - + + + + diff --git a/test/output/build/data-loaders/_import/test.a9a4ef0e.js b/test/output/build/data-loaders/_import/test.a9a4ef0e.js index 8a590fa8a..d8d5a7264 100644 --- a/test/output/build/data-loaders/_import/test.a9a4ef0e.js +++ b/test/output/build/data-loaders/_import/test.a9a4ef0e.js @@ -1,3 +1,3 @@ -import {FileAttachment} from "../_observablehq/stdlib.00000004.js"; +import {FileAttachment} from "../_observablehq/stdlib.00000003.js"; export const test = FileAttachment({"name":"../test.txt","mimeType":"text/plain","path":"../_file/test.f2ca1bb6.txt","lastModified":1704931200000,"size":5}, import.meta.url).text(); diff --git a/test/output/build/data-loaders/_observablehq/client.00000002.js b/test/output/build/data-loaders/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/data-loaders/_observablehq/client.00000002.js rename to test/output/build/data-loaders/_observablehq/client.00000001.js diff --git a/test/output/build/data-loaders/_observablehq/runtime.00000003.js b/test/output/build/data-loaders/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/data-loaders/_observablehq/runtime.00000003.js rename to test/output/build/data-loaders/_observablehq/runtime.00000002.js diff --git a/test/output/build/data-loaders/_observablehq/stdlib.00000004.js b/test/output/build/data-loaders/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/data-loaders/_observablehq/stdlib.00000004.js rename to test/output/build/data-loaders/_observablehq/stdlib.00000003.js diff --git a/test/output/build/data-loaders/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/data-loaders/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/data-loaders/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/data-loaders/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/data-loaders/index.html b/test/output/build/data-loaders/index.html index f826c4334..400ef6388 100644 --- a/test/output/build/data-loaders/index.html +++ b/test/output/build/data-loaders/index.html @@ -7,18 +7,18 @@ Data loader test - + - - - - + + + + diff --git a/test/output/build/draft/page-published.html b/test/output/build/draft/page-published.html index 2bc66c9df..e6c69fc98 100644 --- a/test/output/build/draft/page-published.html +++ b/test/output/build/draft/page-published.html @@ -7,15 +7,15 @@ This is for real - + - - - - + + + + diff --git a/test/output/build/duckdb/_observablehq/client.00000003.js b/test/output/build/duckdb/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/duckdb/_observablehq/client.00000003.js rename to test/output/build/duckdb/_observablehq/client.00000001.js diff --git a/test/output/build/duckdb/_observablehq/runtime.00000004.js b/test/output/build/duckdb/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/duckdb/_observablehq/runtime.00000004.js rename to test/output/build/duckdb/_observablehq/runtime.00000002.js diff --git a/test/output/build/duckdb/_observablehq/stdlib.00000005.js b/test/output/build/duckdb/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/duckdb/_observablehq/stdlib.00000005.js rename to test/output/build/duckdb/_observablehq/stdlib.00000003.js diff --git a/test/output/build/duckdb/_observablehq/stdlib/duckdb.00000006.js b/test/output/build/duckdb/_observablehq/stdlib/duckdb.00000004.js similarity index 100% rename from test/output/build/duckdb/_observablehq/stdlib/duckdb.00000006.js rename to test/output/build/duckdb/_observablehq/stdlib/duckdb.00000004.js diff --git a/test/output/build/duckdb/_observablehq/stdlib/inputs.00000001.css b/test/output/build/duckdb/_observablehq/stdlib/inputs.00000005.js similarity index 100% rename from test/output/build/duckdb/_observablehq/stdlib/inputs.00000001.css rename to test/output/build/duckdb/_observablehq/stdlib/inputs.00000005.js diff --git a/test/output/build/duckdb/_observablehq/stdlib/inputs.00000007.js b/test/output/build/duckdb/_observablehq/stdlib/inputs.00000006.css similarity index 100% rename from test/output/build/duckdb/_observablehq/stdlib/inputs.00000007.js rename to test/output/build/duckdb/_observablehq/stdlib/inputs.00000006.css diff --git a/test/output/build/duckdb/_observablehq/theme-air,near-midnight.00000002.css b/test/output/build/duckdb/_observablehq/theme-air,near-midnight.00000007.css similarity index 100% rename from test/output/build/duckdb/_observablehq/theme-air,near-midnight.00000002.css rename to test/output/build/duckdb/_observablehq/theme-air,near-midnight.00000007.css diff --git a/test/output/build/duckdb/index.html b/test/output/build/duckdb/index.html index 57d96ad56..d470ee724 100644 --- a/test/output/build/duckdb/index.html +++ b/test/output/build/duckdb/index.html @@ -7,22 +7,22 @@ test DuckDB - - + + - - - - - - - + + + + + + + diff --git a/test/output/build/embed/w3c.js.html b/test/output/build/embed/w3c.js.html index 1323f1246..1f5d995e3 100644 --- a/test/output/build/embed/w3c.js.html +++ b/test/output/build/embed/w3c.js.html @@ -7,15 +7,15 @@ W3C.js - + - - - - + + + + diff --git a/test/output/build/fetches/_import/foo/foo.0cc12e18.js b/test/output/build/fetches/_import/foo/foo.0cc12e18.js index 10418ed04..c153e65a2 100644 --- a/test/output/build/fetches/_import/foo/foo.0cc12e18.js +++ b/test/output/build/fetches/_import/foo/foo.0cc12e18.js @@ -1,3 +1,3 @@ -import {FileAttachment} from "../../_observablehq/stdlib.00000004.js"; +import {FileAttachment} from "../../_observablehq/stdlib.00000003.js"; export const fooJsonData = await FileAttachment({"name":"../../foo/foo-data.json","mimeType":"application/json","path":"../../_file/foo/foo-data.67358ed8.json","lastModified":1704931200000,"size":10}, import.meta.url).json(); export const fooCsvData = await FileAttachment({"name":"../../foo/foo-data.csv","mimeType":"text/csv","path":"../../_file/foo/foo-data.24ef4634.csv","lastModified":1704931200000,"size":72}, import.meta.url).text(); diff --git a/test/output/build/fetches/_import/top.bacf54cc.js b/test/output/build/fetches/_import/top.bacf54cc.js index a39de487a..061141d29 100644 --- a/test/output/build/fetches/_import/top.bacf54cc.js +++ b/test/output/build/fetches/_import/top.bacf54cc.js @@ -1,4 +1,4 @@ -import {FileAttachment} from "../_observablehq/stdlib.00000004.js"; +import {FileAttachment} from "../_observablehq/stdlib.00000003.js"; export {fooCsvData, fooJsonData} from "./foo/foo.0cc12e18.js"; export const topJsonData = await FileAttachment({"name":"../top-data.json","mimeType":"application/json","path":"../_file/top-data.67358ed8.json","lastModified":1704931200000,"size":10}, import.meta.url).json(); export const topCsvData = await FileAttachment({"name":"../top-data.csv","mimeType":"text/csv","path":"../_file/top-data.24ef4634.csv","lastModified":1704931200000,"size":72}, import.meta.url).text(); diff --git a/test/output/build/fetches/_observablehq/client.00000002.js b/test/output/build/fetches/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/fetches/_observablehq/client.00000002.js rename to test/output/build/fetches/_observablehq/client.00000001.js diff --git a/test/output/build/fetches/_observablehq/runtime.00000003.js b/test/output/build/fetches/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/fetches/_observablehq/runtime.00000003.js rename to test/output/build/fetches/_observablehq/runtime.00000002.js diff --git a/test/output/build/fetches/_observablehq/stdlib.00000004.js b/test/output/build/fetches/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/fetches/_observablehq/stdlib.00000004.js rename to test/output/build/fetches/_observablehq/stdlib.00000003.js diff --git a/test/output/build/fetches/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/fetches/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/fetches/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/fetches/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/fetches/foo.html b/test/output/build/fetches/foo.html index e59d17e00..e4e54385f 100644 --- a/test/output/build/fetches/foo.html +++ b/test/output/build/fetches/foo.html @@ -7,17 +7,17 @@ Top - + - - - - + + + + diff --git a/test/output/build/imports/_observablehq/client.00000002.js b/test/output/build/imports/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/imports/_observablehq/client.00000002.js rename to test/output/build/imports/_observablehq/client.00000001.js diff --git a/test/output/build/imports/_observablehq/runtime.00000003.js b/test/output/build/imports/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/imports/_observablehq/runtime.00000003.js rename to test/output/build/imports/_observablehq/runtime.00000002.js diff --git a/test/output/build/imports/_observablehq/stdlib.00000004.js b/test/output/build/imports/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/imports/_observablehq/stdlib.00000004.js rename to test/output/build/imports/_observablehq/stdlib.00000003.js diff --git a/test/output/build/imports/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/imports/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/imports/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/imports/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/imports/foo/foo.html b/test/output/build/imports/foo/foo.html index f40455ab9..2cae2575d 100644 --- a/test/output/build/imports/foo/foo.html +++ b/test/output/build/imports/foo/foo.html @@ -7,12 +7,12 @@ Foo - + - - - - + + + + @@ -22,8 +22,8 @@ diff --git a/test/output/build/jsr/_observablehq/client.00000002.js b/test/output/build/jsr/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/jsr/_observablehq/client.00000002.js rename to test/output/build/jsr/_observablehq/client.00000001.js diff --git a/test/output/build/jsr/_observablehq/runtime.00000003.js b/test/output/build/jsr/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/jsr/_observablehq/runtime.00000003.js rename to test/output/build/jsr/_observablehq/runtime.00000002.js diff --git a/test/output/build/jsr/_observablehq/stdlib.00000004.js b/test/output/build/jsr/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/jsr/_observablehq/stdlib.00000004.js rename to test/output/build/jsr/_observablehq/stdlib.00000003.js diff --git a/test/output/build/jsr/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/jsr/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/jsr/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/jsr/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/jsr/index.html b/test/output/build/jsr/index.html index eb8f41f6d..3d6e5617b 100644 --- a/test/output/build/jsr/index.html +++ b/test/output/build/jsr/index.html @@ -7,12 +7,12 @@ Hello JSR - + - - - - + + + + @@ -22,7 +22,7 @@ diff --git a/test/output/build/npm/_import/index.4bdc071f.js b/test/output/build/npm/_import/index.4bdc071f.js index 9b6843f78..bddccaad0 100644 --- a/test/output/build/npm/_import/index.4bdc071f.js +++ b/test/output/build/npm/_import/index.4bdc071f.js @@ -1 +1 @@ -import "../_observablehq/stdlib/inputs.00000006.js"; +import "../_observablehq/stdlib/inputs.00000004.js"; diff --git a/test/output/build/npm/_observablehq/client.00000003.js b/test/output/build/npm/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/npm/_observablehq/client.00000003.js rename to test/output/build/npm/_observablehq/client.00000001.js diff --git a/test/output/build/npm/_observablehq/runtime.00000004.js b/test/output/build/npm/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/npm/_observablehq/runtime.00000004.js rename to test/output/build/npm/_observablehq/runtime.00000002.js diff --git a/test/output/build/npm/_observablehq/stdlib.00000005.js b/test/output/build/npm/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/npm/_observablehq/stdlib.00000005.js rename to test/output/build/npm/_observablehq/stdlib.00000003.js diff --git a/test/output/build/npm/_observablehq/stdlib/inputs.00000001.css b/test/output/build/npm/_observablehq/stdlib/inputs.00000004.js similarity index 100% rename from test/output/build/npm/_observablehq/stdlib/inputs.00000001.css rename to test/output/build/npm/_observablehq/stdlib/inputs.00000004.js diff --git a/test/output/build/npm/_observablehq/stdlib/inputs.00000006.js b/test/output/build/npm/_observablehq/stdlib/inputs.00000005.css similarity index 100% rename from test/output/build/npm/_observablehq/stdlib/inputs.00000006.js rename to test/output/build/npm/_observablehq/stdlib/inputs.00000005.css diff --git a/test/output/build/npm/_observablehq/theme-air,near-midnight.00000002.css b/test/output/build/npm/_observablehq/theme-air,near-midnight.00000006.css similarity index 100% rename from test/output/build/npm/_observablehq/theme-air,near-midnight.00000002.css rename to test/output/build/npm/_observablehq/theme-air,near-midnight.00000006.css diff --git a/test/output/build/npm/index.html b/test/output/build/npm/index.html index 5ab5fcf32..a14a21894 100644 --- a/test/output/build/npm/index.html +++ b/test/output/build/npm/index.html @@ -6,21 +6,21 @@ - - + + - - - - - + + + + + - + diff --git a/test/output/build/page-loaders/hello-ts.html b/test/output/build/page-loaders/hello-ts.html index ba541a0cd..676df53ec 100644 --- a/test/output/build/page-loaders/hello-ts.html +++ b/test/output/build/page-loaders/hello-ts.html @@ -7,15 +7,15 @@ Hello TypeScript - + - - - - + + + + diff --git a/test/output/build/page-loaders/index.html b/test/output/build/page-loaders/index.html index 0d56c9f4c..10e853399 100644 --- a/test/output/build/page-loaders/index.html +++ b/test/output/build/page-loaders/index.html @@ -7,15 +7,15 @@ Hello shell - + - - - - + + + + diff --git a/test/output/build/pager/_observablehq/client.00000002.js b/test/output/build/pager/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/pager/_observablehq/client.00000002.js rename to test/output/build/pager/_observablehq/client.00000001.js diff --git a/test/output/build/pager/_observablehq/runtime.00000003.js b/test/output/build/pager/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/pager/_observablehq/runtime.00000003.js rename to test/output/build/pager/_observablehq/runtime.00000002.js diff --git a/test/output/build/pager/_observablehq/stdlib.00000004.js b/test/output/build/pager/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/pager/_observablehq/stdlib.00000004.js rename to test/output/build/pager/_observablehq/stdlib.00000003.js diff --git a/test/output/build/pager/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/pager/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/pager/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/pager/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/pager/index.html b/test/output/build/pager/index.html index 37d10f1e0..7228b5ce0 100644 --- a/test/output/build/pager/index.html +++ b/test/output/build/pager/index.html @@ -7,15 +7,15 @@ index - + - - - - + + + + diff --git a/test/output/build/pager/null.html b/test/output/build/pager/null.html index 8f7c64c53..1e59931e0 100644 --- a/test/output/build/pager/null.html +++ b/test/output/build/pager/null.html @@ -7,15 +7,15 @@ null - + - - - - + + + + diff --git a/test/output/build/pager/sub/index.html b/test/output/build/pager/sub/index.html index bf45926d5..b56cff4e5 100644 --- a/test/output/build/pager/sub/index.html +++ b/test/output/build/pager/sub/index.html @@ -7,15 +7,15 @@ subindex - + - - - - + + + + diff --git a/test/output/build/pager/sub/page0.html b/test/output/build/pager/sub/page0.html index e9659b71b..1b71395a1 100644 --- a/test/output/build/pager/sub/page0.html +++ b/test/output/build/pager/sub/page0.html @@ -7,15 +7,15 @@ page 0 - + - - - - + + + + diff --git a/test/output/build/pager/sub/page1..10.html b/test/output/build/pager/sub/page1..10.html index 839d754a3..3f9cbd485 100644 --- a/test/output/build/pager/sub/page1..10.html +++ b/test/output/build/pager/sub/page1..10.html @@ -7,15 +7,15 @@ page 1..10 - + - - - - + + + + diff --git a/test/output/build/pager/sub/page1.html b/test/output/build/pager/sub/page1.html index 8927ed66d..ccf817eb2 100644 --- a/test/output/build/pager/sub/page1.html +++ b/test/output/build/pager/sub/page1.html @@ -7,15 +7,15 @@ page 1 - + - - - - + + + + diff --git a/test/output/build/pager/sub/page2.html b/test/output/build/pager/sub/page2.html index d77bcce2b..3b6e29d8f 100644 --- a/test/output/build/pager/sub/page2.html +++ b/test/output/build/pager/sub/page2.html @@ -7,15 +7,15 @@ page 2 - + - - - - + + + + diff --git a/test/output/build/pager/sub/page3.html b/test/output/build/pager/sub/page3.html index 62c9c42e0..e8b5b5b62 100644 --- a/test/output/build/pager/sub/page3.html +++ b/test/output/build/pager/sub/page3.html @@ -7,15 +7,15 @@ page 3 - + - - - - + + + + diff --git a/test/output/build/pager/sub/page4.html b/test/output/build/pager/sub/page4.html index 195497685..eb057a242 100644 --- a/test/output/build/pager/sub/page4.html +++ b/test/output/build/pager/sub/page4.html @@ -7,15 +7,15 @@ page 4 - + - - - - + + + + diff --git a/test/output/build/pager/sub/page5.html b/test/output/build/pager/sub/page5.html index 37b2ef64d..4b44ef2ea 100644 --- a/test/output/build/pager/sub/page5.html +++ b/test/output/build/pager/sub/page5.html @@ -7,15 +7,15 @@ page 5 - + - - - - + + + + diff --git a/test/output/build/pager/sub/page6.html b/test/output/build/pager/sub/page6.html index ee542d688..57870752c 100644 --- a/test/output/build/pager/sub/page6.html +++ b/test/output/build/pager/sub/page6.html @@ -7,15 +7,15 @@ page 6 - + - - - - + + + + diff --git a/test/output/build/pager/sub/page7.html b/test/output/build/pager/sub/page7.html index 4a28d49ab..4600ab452 100644 --- a/test/output/build/pager/sub/page7.html +++ b/test/output/build/pager/sub/page7.html @@ -7,15 +7,15 @@ page 7 - + - - - - + + + + diff --git a/test/output/build/pager/sub/page8.html b/test/output/build/pager/sub/page8.html index 5e99b4880..44ccaeb56 100644 --- a/test/output/build/pager/sub/page8.html +++ b/test/output/build/pager/sub/page8.html @@ -7,15 +7,15 @@ page 8 - + - - - - + + + + diff --git a/test/output/build/params/_observablehq/client.00000002.js b/test/output/build/params/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/params/_observablehq/client.00000002.js rename to test/output/build/params/_observablehq/client.00000001.js diff --git a/test/output/build/params/_observablehq/runtime.00000003.js b/test/output/build/params/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/params/_observablehq/runtime.00000003.js rename to test/output/build/params/_observablehq/runtime.00000002.js diff --git a/test/output/build/params/_observablehq/stdlib.00000004.js b/test/output/build/params/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/params/_observablehq/stdlib.00000004.js rename to test/output/build/params/_observablehq/stdlib.00000003.js diff --git a/test/output/build/params/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/params/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/params/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/params/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/params/bar/index.html b/test/output/build/params/bar/index.html index c21a54845..fa3a135c2 100644 --- a/test/output/build/params/bar/index.html +++ b/test/output/build/params/bar/index.html @@ -7,15 +7,15 @@ Hello, dir - + - - - - + + + + diff --git a/test/output/build/scripts/sub/index.html b/test/output/build/scripts/sub/index.html index 421f8caa8..cbf789f36 100644 --- a/test/output/build/scripts/sub/index.html +++ b/test/output/build/scripts/sub/index.html @@ -7,17 +7,17 @@ Subdirectory - + - - - - + + + + diff --git a/test/output/build/search-public/_observablehq/client.00000002.js b/test/output/build/search-public/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/search-public/_observablehq/client.00000002.js rename to test/output/build/search-public/_observablehq/client.00000001.js diff --git a/test/output/build/search-public/_observablehq/minisearch.00000006.json b/test/output/build/search-public/_observablehq/minisearch.00000002.json similarity index 100% rename from test/output/build/search-public/_observablehq/minisearch.00000006.json rename to test/output/build/search-public/_observablehq/minisearch.00000002.json diff --git a/test/output/build/search-public/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/search-public/_observablehq/theme-air,near-midnight.00000006.css similarity index 100% rename from test/output/build/search-public/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/search-public/_observablehq/theme-air,near-midnight.00000006.css diff --git a/test/output/build/search-public/page1.html b/test/output/build/search-public/page1.html index 2c6d507e7..76efb0dbe 100644 --- a/test/output/build/search-public/page1.html +++ b/test/output/build/search-public/page1.html @@ -7,15 +7,15 @@ page 1 - + - - + + diff --git a/test/output/build/search-public/page3.html b/test/output/build/search-public/page3.html index 8be284fc6..b5d537fbd 100644 --- a/test/output/build/search-public/page3.html +++ b/test/output/build/search-public/page3.html @@ -7,15 +7,15 @@ This page is not indexable - + - - + + diff --git a/test/output/build/search-public/sub/page2.html b/test/output/build/search-public/sub/page2.html index 7744a33b0..79ae45cf8 100644 --- a/test/output/build/search-public/sub/page2.html +++ b/test/output/build/search-public/sub/page2.html @@ -7,15 +7,15 @@ Page 2 - + - - + + diff --git a/test/output/build/simple-public/_observablehq/client.00000002.js b/test/output/build/simple-public/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/simple-public/_observablehq/client.00000002.js rename to test/output/build/simple-public/_observablehq/client.00000001.js diff --git a/test/output/build/simple-public/_observablehq/runtime.00000003.js b/test/output/build/simple-public/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/simple-public/_observablehq/runtime.00000003.js rename to test/output/build/simple-public/_observablehq/runtime.00000002.js diff --git a/test/output/build/simple-public/_observablehq/stdlib.00000004.js b/test/output/build/simple-public/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/simple-public/_observablehq/stdlib.00000004.js rename to test/output/build/simple-public/_observablehq/stdlib.00000003.js diff --git a/test/output/build/simple-public/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/simple-public/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/simple-public/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/simple-public/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/simple-public/index.html b/test/output/build/simple-public/index.html index f82f71395..4c53518fe 100644 --- a/test/output/build/simple-public/index.html +++ b/test/output/build/simple-public/index.html @@ -7,15 +7,15 @@ Build test case - + - - - - + + + + diff --git a/test/output/build/simple/_observablehq/client.00000002.js b/test/output/build/simple/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/simple/_observablehq/client.00000002.js rename to test/output/build/simple/_observablehq/client.00000001.js diff --git a/test/output/build/simple/_observablehq/runtime.00000003.js b/test/output/build/simple/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/simple/_observablehq/runtime.00000003.js rename to test/output/build/simple/_observablehq/runtime.00000002.js diff --git a/test/output/build/simple/_observablehq/stdlib.00000004.js b/test/output/build/simple/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/simple/_observablehq/stdlib.00000004.js rename to test/output/build/simple/_observablehq/stdlib.00000003.js diff --git a/test/output/build/simple/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/simple/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/simple/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/simple/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/simple/simple.html b/test/output/build/simple/simple.html index 2ff46e217..2aa5d2eaf 100644 --- a/test/output/build/simple/simple.html +++ b/test/output/build/simple/simple.html @@ -7,16 +7,16 @@ Build test case - + - - - - + + + + diff --git a/test/output/build/space-page/index.html b/test/output/build/space-page/index.html index 1627768cc..aafc84a11 100644 --- a/test/output/build/space-page/index.html +++ b/test/output/build/space-page/index.html @@ -7,15 +7,15 @@ A link - + - - - - + + + + diff --git a/test/output/build/sql/_observablehq/client.00000003.js b/test/output/build/sql/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/sql/_observablehq/client.00000003.js rename to test/output/build/sql/_observablehq/client.00000001.js diff --git a/test/output/build/sql/_observablehq/runtime.00000004.js b/test/output/build/sql/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/sql/_observablehq/runtime.00000004.js rename to test/output/build/sql/_observablehq/runtime.00000002.js diff --git a/test/output/build/sql/_observablehq/stdlib.00000005.js b/test/output/build/sql/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/sql/_observablehq/stdlib.00000005.js rename to test/output/build/sql/_observablehq/stdlib.00000003.js diff --git a/test/output/build/sql/_observablehq/stdlib/duckdb.00000006.js b/test/output/build/sql/_observablehq/stdlib/duckdb.00000004.js similarity index 100% rename from test/output/build/sql/_observablehq/stdlib/duckdb.00000006.js rename to test/output/build/sql/_observablehq/stdlib/duckdb.00000004.js diff --git a/test/output/build/sql/_observablehq/stdlib/inputs.00000001.css b/test/output/build/sql/_observablehq/stdlib/inputs.00000005.js similarity index 100% rename from test/output/build/sql/_observablehq/stdlib/inputs.00000001.css rename to test/output/build/sql/_observablehq/stdlib/inputs.00000005.js diff --git a/test/output/build/sql/_observablehq/stdlib/inputs.00000007.js b/test/output/build/sql/_observablehq/stdlib/inputs.00000006.css similarity index 100% rename from test/output/build/sql/_observablehq/stdlib/inputs.00000007.js rename to test/output/build/sql/_observablehq/stdlib/inputs.00000006.css diff --git a/test/output/build/sql/_observablehq/theme-air,near-midnight.00000002.css b/test/output/build/sql/_observablehq/theme-air,near-midnight.00000007.css similarity index 100% rename from test/output/build/sql/_observablehq/theme-air,near-midnight.00000002.css rename to test/output/build/sql/_observablehq/theme-air,near-midnight.00000007.css diff --git a/test/output/build/sql/index.html b/test/output/build/sql/index.html index 4d6bd2684..73d49a24b 100644 --- a/test/output/build/sql/index.html +++ b/test/output/build/sql/index.html @@ -6,24 +6,24 @@ - - + + - - - - - - - + + + + + + + diff --git a/test/output/build/typescript/_observablehq/client.00000002.js b/test/output/build/typescript/_observablehq/client.00000001.js similarity index 100% rename from test/output/build/typescript/_observablehq/client.00000002.js rename to test/output/build/typescript/_observablehq/client.00000001.js diff --git a/test/output/build/typescript/_observablehq/runtime.00000003.js b/test/output/build/typescript/_observablehq/runtime.00000002.js similarity index 100% rename from test/output/build/typescript/_observablehq/runtime.00000003.js rename to test/output/build/typescript/_observablehq/runtime.00000002.js diff --git a/test/output/build/typescript/_observablehq/stdlib.00000004.js b/test/output/build/typescript/_observablehq/stdlib.00000003.js similarity index 100% rename from test/output/build/typescript/_observablehq/stdlib.00000004.js rename to test/output/build/typescript/_observablehq/stdlib.00000003.js diff --git a/test/output/build/typescript/_observablehq/theme-air,near-midnight.00000001.css b/test/output/build/typescript/_observablehq/theme-air,near-midnight.00000004.css similarity index 100% rename from test/output/build/typescript/_observablehq/theme-air,near-midnight.00000001.css rename to test/output/build/typescript/_observablehq/theme-air,near-midnight.00000004.css diff --git a/test/output/build/typescript/index.html b/test/output/build/typescript/index.html index a2f1c731d..6365f5ee7 100644 --- a/test/output/build/typescript/index.html +++ b/test/output/build/typescript/index.html @@ -6,16 +6,16 @@ - + - - - - + + + +