Use welshman/app

src/routes/+layout.svelte

@@ -6,6 +6,19 @@
   import {goto} from "$app/navigation"
   import {browser} from "$app/environment"
   import {sleep} from "@welshman/lib"
+  import {
+    relays,
+    handles,
+    loadRelay,
+    initStorage,
+    repository,
+    session,
+    pubkey,
+    publishStatusData,
+    plaintext,
+    freshness,
+  } from "@welshman/app"
+  import type {PublishStatusData, PublishStatusDataByUrlById} from "@welshman/app"
   import {createEventStore, adapter} from "@welshman/store"
   import ModalBox from "@lib/components/ModalBox.svelte"
   import Toast from "@app/components/Toast.svelte"
@@ -13,12 +26,8 @@
   import PrimaryNav from "@app/components/PrimaryNav.svelte"
   import {modals, clearModal} from "@app/modal"
   import {theme} from "@app/theme"
-  import {pk, session, repository, DEFAULT_RELAYS} from "@app/base"
-  import type {PublishStatusData, PublishStatusDataByUrlById} from "@app/state"
-  import {relays, freshness, plaintext, handles, loadRelay, publishStatusData} from "@app/state"
-  import {initStorage} from "@app/storage"
+  import {DEFAULT_RELAYS} from "@app/state"
   import {loadUserData} from "@app/commands"
-  import * as base from "@app/base"
   import * as state from "@app/state"
 
   let ready: Promise<unknown>
@@ -48,7 +57,7 @@
   }
 
   onMount(() => {
-    Object.assign(window, {get, base, state})
+    Object.assign(window, {get, state})
 
     ready = initStorage(3, {
       events: {
@@ -137,8 +146,8 @@
         loadRelay(url)
       }
 
-      if ($pk) {
-        loadUserData($pk)
+      if ($pubkey) {
+        loadUserData($pubkey)
       }
     })
   })

src/routes/+layout.ts

@@ -0,0 +1,2 @@
+export const prerender = true
+export const ssr = false

src/routes/discover/+page.svelte

@@ -2,16 +2,15 @@
   import {onMount} from "svelte"
   import Masonry from "svelte-bricks"
   import {GROUP_META, displayRelayUrl} from "@welshman/util"
+  import {load, relays} from "@welshman/app"
   import Icon from "@lib/components/Icon.svelte"
   import {makeSpacePath} from "@app/routes"
-  import {DEFAULT_RELAYS} from "@app/base"
   import {
-    load,
     displayGroup,
-    relays,
     searchGroups,
     relayUrlsByNom,
     userMembership,
+    DEFAULT_RELAYS,
   } from "@app/state"
 
   let term = ""

src/routes/discover/themes/+page.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import themes from "daisyui/src/theming/themes"
   import {identity} from "@welshman/lib"
-  import {createSearch} from "@lib/util"
+  import {createSearch} from "@welshman/app"
   import Icon from "@lib/components/Icon.svelte"
   import {theme} from "@app/theme"
 

src/routes/settings/relays/+page.svelte

@@ -3,10 +3,10 @@
   import {readable} from "svelte/store"
   import {displayRelayUrl, isShareableRelayUrl} from "@welshman/util"
   import type {SignedEvent} from "@welshman/util"
+  import {subscribe, loadRelay, relaySearch} from "@welshman/app"
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
-  import {DEFAULT_RELAYS, INDEXER_RELAYS} from "@app/base"
-  import {searchRelays, subscribe, loadRelay} from "@app/state"
+  import {DEFAULT_RELAYS, INDEXER_RELAYS} from "@app/state"
 
   const relays = readable(DEFAULT_RELAYS)
 
@@ -52,7 +52,7 @@
     <Icon icon="magnifer" />
     <input bind:value={term} class="grow" type="text" placeholder="Search for relays..." />
   </label>
-  {#each $searchRelays.searchValues(term).filter(url => !$relays.includes(url)) as url (url)}
+  {#each $relaySearch.searchValues(term).filter(url => !$relays.includes(url)) as url (url)}
     <div class="card2 card2-sm flex items-center justify-between">
       <div class="flex items-center gap-2">
         <Icon icon="remote-controller-minimalistic" />

src/routes/spaces/[nom]/[[room]]/+page.svelte

@@ -12,12 +12,12 @@
   import {page} from "$app/stores"
   import {sortBy, now} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
-  import {formatTimestampAsDate} from "@lib/util"
+  import {subscribe, formatTimestampAsDate} from "@welshman/app"
   import Icon from "@lib/components/Icon.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import GroupNote from "@app/components/GroupNote.svelte"
   import GroupCompose from "@app/components/GroupCompose.svelte"
-  import {subscribe, deriveGroupChat, userRelayUrlsByNom} from "@app/state"
+  import {deriveGroupChat, userRelayUrlsByNom} from "@app/state"
 
   const {nom} = $page.params
   const chat = deriveGroupChat(nom)