support firefox esr (#836)

* closes #828

* prettier

* javascript manual check

* fix all the tests

Author: Fil

src/client/toc.ts

@@ -2,7 +2,9 @@ const toc = document.querySelector<HTMLElement>("#observablehq-toc");
 if (toc) {
   const highlight = toc.appendChild(document.createElement("div"));
   highlight.classList.add("observablehq-secondary-link-highlight");
-  const headings = Array.from(document.querySelectorAll<HTMLElement>(toc.dataset.selector!)).reverse();
+  const headings = Array.from(document.querySelectorAll<HTMLElement>(toc.dataset.selector!))
+    .reverse()
+    .filter((e) => e.querySelector("a.observablehq-header-anchor"));
   const links = toc.querySelectorAll<HTMLElement>(".observablehq-secondary-link");
   const relink = (): HTMLElement | undefined => {
     for (const link of links) {

src/render.ts

@@ -151,7 +151,7 @@ interface Header {
   href: string;
 }
 
-const tocSelector = ["h1:not(:first-of-type)", "h2:not(h1 + h2):has(a.observablehq-header-anchor)"];
+const tocSelector = ["h1:not(:first-of-type)", "h2:not(h1 + h2)"];
 
 function findHeaders(parseResult: ParseResult): Header[] {
   return Array.from(parseHTML(parseResult.html).document.querySelectorAll(tocSelector.join(", ")))

test/output/build/404/404.html

@@ -24,7 +24,7 @@
 import "./_observablehq/client.js";
 
 </script>
-<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2):has(a.observablehq-header-anchor)">
+<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
 </nav>
 </aside>

test/output/build/archives/tar.html

@@ -70,7 +70,7 @@
   </ol>
 </nav>
 <script>{/* redacted init script */}</script>
-<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2):has(a.observablehq-header-anchor)">
+<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
 </nav>
 </aside>

test/output/build/archives/zip.html

@@ -56,7 +56,7 @@
   </ol>
 </nav>
 <script>{/* redacted init script */}</script>
-<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2):has(a.observablehq-header-anchor)">
+<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
 </nav>
 </aside>

test/output/build/config/closed/page.html

@@ -35,7 +35,7 @@
   </ol>
 </nav>
 <script>{/* redacted init script */}</script>
-<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2):has(a.observablehq-header-anchor)">
+<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
 </nav>
 </aside>

test/output/build/config/index.html

@@ -35,7 +35,7 @@
   </ol>
 </nav>
 <script>{/* redacted init script */}</script>
-<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2):has(a.observablehq-header-anchor)">
+<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
 </nav>
 </aside>

test/output/build/config/one.html

@@ -35,7 +35,7 @@
   </ol>
 </nav>
 <script>{/* redacted init script */}</script>
-<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2):has(a.observablehq-header-anchor)">
+<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
 </nav>
 </aside>

test/output/build/config/sub/two.html

@@ -35,7 +35,7 @@
   </ol>
 </nav>
 <script>{/* redacted init script */}</script>
-<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2):has(a.observablehq-header-anchor)">
+<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
 </nav>
 </aside>

test/output/build/config/toc-override.html

@@ -35,7 +35,7 @@
   </ol>
 </nav>
 <script>{/* redacted init script */}</script>
-<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2):has(a.observablehq-header-anchor)">
+<aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
 <div>dollar&amp;pound</div>
 <ol>