Merge upstream v8.2.11

[2bndy5]

merge in updates from upstream v8.2.11

closes #55

There were 3 files that had conflicts:

src/assets/javascripts/components/search/query/index.ts

Merged in this PR.

--- a/src/assets/javascripts/components/search/query/index.ts
+++ b/src/assets/javascripts/components/search/query/index.ts
@@ -106,6 +106,17 @@ export function watchSearchQuery(
         history.replaceState({}, "", `${url}`)
       })
 
+<<<<<<< ours
+=======
+  /* Set query from parameter */
+  param$.subscribe(value => { // TODO: not ideal - find a better way
+    if (value) {
+      el.value = value
+      el.focus()
+    }
+  })
+
+>>>>>>> theirs
   /* Intercept focus and input events */
   const focus$ = watchElementFocus(el)
   const value$ = merge(

src/assets/javascripts/components/search/result/index.ts

Ignored these changes

--- a/src/assets/javascripts/components/search/result/index.ts
+++ b/src/assets/javascripts/components/search/result/index.ts
@@ -155,5 +155,41 @@ export function mountSearchResult(
           meta.textContent = translation("search.result.placeholder")
         }
       })
+<<<<<<< ours
   return of()
+=======
+
+  /* Update search result list */
+  push$
+    .pipe(
+      tap(() => list.innerHTML = ""),
+      switchMap(({ items }) => merge(
+        of(...items.slice(0, 10)),
+        of(...items.slice(10))
+          .pipe(
+            bufferCount(4),
+            zipWith(boundary$),
+            switchMap(([chunk]) => chunk)
+          )
+      ))
+    )
+      .subscribe(result => list.appendChild(
+        renderSearchResultItem(result)
+      ))
+
+  /* Filter search result message */
+  const result$ = rx$
+    .pipe(
+      filter(isSearchResultMessage),
+      map(({ data }) => data)
+    )
+
+  /* Create and return component */
+  return result$
+    .pipe(
+      tap(state => push$.next(state)),
+      finalize(() => push$.complete()),
+      map(state => ({ ref: el, ...state }))
+    )
+>>>>>>> theirs
 }

tools/build/index.ts

Merged only single line changes and import statements - ignored block changes at bottom

--- a/tools/build/index.ts
+++ b/tools/build/index.ts
@@ -35,14 +35,10 @@ import {
   scan,
   startWith,
   switchMap,
-  switchMapTo,
   toArray,
   zip
 } from "rxjs"
-import {
-  extendDefaultPlugins,
-  optimize
-} from "svgo"
+import { optimize } from "svgo"
 
 import { base, resolve, watch } from "./_"
 import { copyAll } from "./copy"
@@ -79,10 +75,11 @@ function ext(file: string, extension: string): string {
  */
 function minsvg(data: string): string {
   const result = optimize(data, {
-    plugins: extendDefaultPlugins([
+    plugins: [
+      "preset-default",
       { name: "removeDimensions", active: true },
       { name: "removeViewBox", active: false }
-    ])
+    ]
   })
   return result.data || data
 }
@@ -158,7 +155,7 @@ const manifest$ = merge(
       )
         .pipe(
           startWith("*"),
-          switchMapTo(observable$.pipe(toArray()))
+          switchMap(() => observable$.pipe(toArray()))
         )
     ))
 )
@@ -254,6 +251,12 @@ const docs$ = (() => {
 
 })()
 
+/* Build overrides */
+const overrides$ =
+  process.argv.includes("--all")
+    ? merge(index$, schema$)
+    : EMPTY
+
 /* ----------------------------------------------------------------------------
  * Program
  * ------------------------------------------------------------------------- */
@@ -261,6 +264,7 @@ const docs$ = (() => {
 /* Assemble pipeline */
 const templatesBuild$ =
   process.argv.includes("--dirty")
+<<<<<<< ours
     ? templates$
     : concat(assets$, templates$)
 
@@ -268,6 +272,10 @@ const build$: Observable<any> =
   process.argv.includes("--docs")
     ? merge(templatesBuild$, docs$)
     : templatesBuild$
+=======
+    ? merge(templates$, sources$)
+    : concat(assets$, merge(templates$, sources$, overrides$))
+>>>>>>> theirs
 
 /* Let's get rolling */
 build$.subscribe()

[jbms]

This now makes the assignment to el.value and call to el.focus above redundant, so we can remove that.

[jbms]

I think it is fine to keep it, and instead do the removal I mentioned, as that will minimize merge conflicts in the future.

[jbms]

As far as the redundant assignment to el.value, I was referring to this line:

sphinx-immaterial/src/assets/javascripts/components/search/query/index.ts

Line 90 in 98d0ab6

const value = el.value = searchParams.get("q")!

(Unfortunately github does not allow you to comment on unmodified lines very easily)

That should be changed to just:

const value = searchParams.get("q")!
param$ = of(value)

[jbms]

I think it is better to keep the call to el.focus() here and instead remove it from a few lines above in the same file. That way we minimize merge conflicts.

[2bndy5]

This whole review system is all messed up for some reason. I can't even do a simple reply unless I'm looking at the PR diff. And then that seems to look like a separate review comment...

[jbms]

Thanks. Just one last change:

8274da5#diff-36117e5373aef262c0fc3e0d37c56bec5d51de771f9d91a7100aa5def753dfb8L90

that line should remove the assignment to el.value

[2bndy5]

oops, I didn't notice that missing bit in the snippet you posted.

[jbms]

This looks ready to merge, thanks!