From 7eb1c8c1417b2655a6d2d9054acb8e7c2bfb4cb9 Mon Sep 17 00:00:00 2001 From: Coracle-Bot Date: Wed, 9 Sep 2026 02:24:05 +0000 Subject: [PATCH] Upgrade welshman to 0.10.2 --- e2e/harness/seed/space.ts | 13 ++++++------ package.json | 20 +++++++++--------- pnpm-lock.yaml | Bin 399016 -> 399016 bytes src/app/access.ts | 5 +++-- src/app/components/CalendarEventForm.svelte | 3 ++- src/app/components/ClassifiedForm.svelte | 3 ++- src/app/components/GoalCreate.svelte | 3 ++- src/app/components/PollCreate.svelte | 3 ++- src/app/components/PollVotes.svelte | 4 ++-- src/app/components/ThreadCreate.svelte | 3 ++- src/app/core.ts | 10 ++++----- src/app/featured.ts | 4 ++-- .../[relay]/articles/create/+page.svelte | 4 ++-- 13 files changed, 41 insertions(+), 34 deletions(-) diff --git a/e2e/harness/seed/space.ts b/e2e/harness/seed/space.ts index 6a069077..55106837 100644 --- a/e2e/harness/seed/space.ts +++ b/e2e/harness/seed/space.ts @@ -13,7 +13,7 @@ import { import type {EventTemplate, HashedEvent, SignedEvent, StampedEvent} from "@welshman/util" import {Nip59} from "@welshman/signer" import {DirectMessage, EventWriter, Profile} from "@welshman/domain" -import type {BaseEventReader, ConfiguredKind, KindFactory} from "@welshman/domain" +import type {BaseEventReader, ConfiguredKind, EventQuery, KindFactory} from "@welshman/domain" import type {RoomOptions, TestRelay} from "../zooid/types" import type {Zooid} from "../zooid/relay" import type {TenantName} from "../zooid/config" @@ -81,9 +81,9 @@ export type SeededSpace = { // This space's domain kinds, bound to a resolver that answers with its url, so a writer built // here renders its relay hints as this space. For everything `event()` takes a template for: // `space.event(user, () => space.kind(Article).writer().setTitle("x").renderTemplate())`. - kind>( - factory: KindFactory, - ): ConfiguredKind + kind, Q extends EventQuery>( + factory: KindFactory, + ): ConfiguredKind } export type SeedSpaceOptions = { @@ -209,8 +209,9 @@ export const seedSpace = ({zooid, enqueue, startedAt, name}: SeedSpaceOptions): created_at: createdAt, })) - const kind = >(factory: KindFactory) => - factory.configure(context) + const kind = , Q extends EventQuery>( + factory: KindFactory, + ) => factory.configure(context) // Every wrap is published over the sender's own connection, since a gift wrap's author is an // ephemeral key nobody in this process can authenticate as. zooid stores it anyway, authorizing a diff --git a/package.json b/package.json index 647910f2..0323dd66 100644 --- a/package.json +++ b/package.json @@ -82,16 +82,16 @@ "@types/throttle-debounce": "^5.0.2", "@vite-pwa/assets-generator": "^1.0.2", "@vite-pwa/sveltekit": "^1.1.0", - "@welshman/app": "^0.9.10", - "@welshman/content": "^0.9.10", - "@welshman/domain": "^0.9.10", - "@welshman/editor": "^0.9.10", - "@welshman/feeds": "^0.9.10", - "@welshman/lib": "^0.9.10", - "@welshman/net": "^0.9.10", - "@welshman/signer": "^0.9.10", - "@welshman/store": "^0.9.10", - "@welshman/util": "^0.9.10", + "@welshman/app": "^0.10.2", + "@welshman/content": "^0.10.2", + "@welshman/domain": "^0.10.2", + "@welshman/editor": "^0.10.2", + "@welshman/feeds": "^0.10.2", + "@welshman/lib": "^0.10.2", + "@welshman/net": "^0.10.2", + "@welshman/signer": "^0.10.2", + "@welshman/store": "^0.10.2", + "@welshman/util": "^0.10.2", "cheerio": "^1.2.0", "compressorjs-next": "^1.1.2", "dompurify": "^3.4.13", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a76e1aadc0f30e6ed6d1af59a3e4aaefa73ace3f..96a127a6cb3efe7ad83c8edfbed51aacdc746b9c 100644 GIT binary patch delta 5252 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 KPaXQf;y(e=Iuu6$ diff --git a/src/app/access.ts b/src/app/access.ts index f6b93a23..8b5988b9 100644 --- a/src/app/access.ts +++ b/src/app/access.ts @@ -7,6 +7,7 @@ import { isRelayUrl, makeEvent, normalizeRelayUrl, + relay, FOLLOWS, MESSAGING_RELAYS, PROFILE, @@ -101,7 +102,7 @@ export const deriveRelayAuthError = (url: string) => }) export const publishJoinRequest = (url: string, claim?: string) => { - const eventWriter = writer(RelayJoin).forceRelays(url) + const eventWriter = writer(RelayJoin).forceRoutes(relay(url)) if (claim) { eventWriter.setClaim(claim) @@ -111,7 +112,7 @@ export const publishJoinRequest = (url: string, claim?: string) => { } export const publishLeaveRequest = (url: string) => - command(writer(RelayLeave).forceRelays(url)).then(publish) + command(writer(RelayLeave).forceRoutes(relay(url))).then(publish) // A relay answers a re-sent request with "duplicate:" and a membership it already has with // "already a member" — both leave us where we wanted to be, so only anything else is a refusal. diff --git a/src/app/components/CalendarEventForm.svelte b/src/app/components/CalendarEventForm.svelte index 0fe81194..3354fe68 100644 --- a/src/app/components/CalendarEventForm.svelte +++ b/src/app/components/CalendarEventForm.svelte @@ -2,6 +2,7 @@ import type {Snippet} from "svelte" import {writable} from "svelte/store" import {randomId} from "@welshman/lib" + import {relay} from "@welshman/util" import {publish} from "@welshman/app" import {TimeEvent} from "@welshman/domain" import {preventDefault} from "@lib/html" @@ -100,7 +101,7 @@ if (h) { eventWriter.setRoom(url, h) } else { - eventWriter.forceRelays(url) + eventWriter.forceRoutes(relay(url)) } const calendarThunk = await command(eventWriter).then(publish) diff --git a/src/app/components/ClassifiedForm.svelte b/src/app/components/ClassifiedForm.svelte index a304383b..405a0f03 100644 --- a/src/app/components/ClassifiedForm.svelte +++ b/src/app/components/ClassifiedForm.svelte @@ -1,6 +1,7 @@