Make preferences available on all pages

src/routes/(opengrok-compat)/+layout.svelte

@@ -1,13 +1,7 @@
 <script lang="ts">
   import Link from "$lib/link.svelte";
-  import {
-    acquireOpenGrokInstantRedirectStore,
-    persistInitialPreferences,
-  } from "$lib/preferences";
+  import { acquireOpenGrokInstantRedirectStore } from "$lib/preferences";
 
-  export let data: import("./$types").LayoutData;
-
-  persistInitialPreferences(data.preferences);
   const openGrokInstantRedirect = acquireOpenGrokInstantRedirectStore();
 </script>
 

src/routes/(search-page)/+page.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { persistInitialPreferences } from "$lib/preferences";
   import SearchForm from "./search-form.svelte";
   import Lander from "./lander.svelte";
   import SearchResults from "./search-results.svelte";
@@ -8,8 +7,6 @@
 
   export let data: import("./$types").PageData;
 
-  persistInitialPreferences(data.preferences);
-
   // Represents the last non-erroneous results, so that when we get an error,
   // we can display them instead of taking away all the results.
   let previousSearchResults: TimedSearchResults | null = null;

src/routes/(search-page)/+page.ts

@@ -10,13 +10,8 @@ export type SearchOutcome =
   | { kind: "error"; error: string };
 export type TimedSearchResults = ApiSearchResults & { requestDuration: number };
 
-export const load: import("./$types").PageLoad = async ({
-  url,
-  fetch,
-  data: { preferences },
-}) => ({
+export const load: import("./$types").PageLoad = async ({ url, fetch }) => ({
   searchOutcome: await executeSearch(url, fetch),
-  preferences,
 });
 
 const executeSearch = async (

src/routes/+layout.server.ts

@@ -0,0 +1,9 @@
+import { loadPreferences } from "$lib/preferences";
+
+export const load: import("./$types").LayoutServerLoad = ({ cookies }) => {
+  return {
+    // While not all pages need preferences, most do. It's easiest to just make
+    // them ubiquitously available.
+    preferences: loadPreferences(cookies),
+  };
+};

src/routes/+layout.svelte

@@ -1,13 +1,18 @@
 <script lang="ts">
   import { page } from "$app/stores";
+  import { persistInitialPreferences } from "$lib/preferences";
   import "../app.css";
 
   const navLinks = [
     ["/", "Search"],
     ["/repositories", "Repositories"],
     ["/syntax", "Query Syntax"],
     ["/about", "About"],
+    ["/preferences", "Preferences"],
   ] as const;
+
+  export let data: import("./$types").LayoutServerData;
+  persistInitialPreferences(data.preferences);
 </script>
 
 <div class="container mx-auto px-2 py-4">