diff --git a/bun.lockb b/bun.lockb index 5b2b015c..69fe178d 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index c43a8754..3957adbb 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "jsdom": "^22.1.0", "lemmy-js-client": "0.19.11-donation-dialog.1", "linkify-it": "^5.0.0", - "marked": "7.0.5", + "marked": "^16.3.0", "marked-linkify-it": "^3.1.13", "nprogress": "^0.2.0", "openapi-fetch": "^0.14.0", @@ -36,7 +36,6 @@ "svelte-floating-ui": "^1.6.2", "svelte-focus-trap": "^1.2.0", "svelte-infinite-scroll": "^2.0.1", - "svelte-markdown": "^0.4.1", "sveltekit-i18n": "^2.4.2", "tailwindcss": "^4.1.13", "tslib": "^2.8.1", diff --git a/src/app.d.ts b/src/app.d.ts index 3201e590..2c93e142 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -1,6 +1,6 @@ // See https://kit.svelte.dev/docs/types#app -import type { Action } from '$lib/components/ui/navbar/commands/actions.svelte' +import type { Action } from '$comp/ui/navbar/commands/actions.svelte' // for information about these interfaces declare global { diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts index cf0c94e8..b1d160bb 100644 --- a/src/lib/auth.svelte.ts +++ b/src/lib/auth.svelte.ts @@ -1,9 +1,6 @@ import { browser } from '$app/environment' import { env } from '$env/dynamic/public' -import { - amModOfAny, - isAdmin, -} from '$lib/components/lemmy/moderation/moderation.js' +import { amModOfAny, isAdmin } from '$comp/lemmy/moderation/moderation.js' import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js' import { client, getClient, site } from '$lib/client/lemmy.svelte' import { instanceToURL, moveItem } from '$lib/util.svelte' diff --git a/src/lib/components/form/ImageAttachForm.svelte b/src/lib/components/form/ImageAttachForm.svelte index f9b4c936..255ec71d 100644 --- a/src/lib/components/form/ImageAttachForm.svelte +++ b/src/lib/components/form/ImageAttachForm.svelte @@ -1,6 +1,6 @@ {#if $modals.reporting.open} - {#await import('$lib/components/lemmy/moderation/ReportModal.svelte') then { default: ReportModal }} + {#await import('$comp/lemmy/moderation/ReportModal.svelte') then { default: ReportModal }} {/await} {/if} diff --git a/src/lib/components/lemmy/moderation/RemoveModal.svelte b/src/lib/components/lemmy/moderation/RemoveModal.svelte index c859fad2..0deb8ef4 100644 --- a/src/lib/components/lemmy/moderation/RemoveModal.svelte +++ b/src/lib/components/lemmy/moderation/RemoveModal.svelte @@ -1,12 +1,12 @@ {#if uploadingImage} - {#await import('$lib/components/form/ImageInputModal.svelte') then { default: UploadModal }} + {#await import('$comp/form/ImageInputModal.svelte') then { default: UploadModal }} '', (v) => (data.url = v)} diff --git a/src/lib/components/lemmy/post/index.ts b/src/lib/components/lemmy/post/index.ts index 782db59f..280dd095 100644 --- a/src/lib/components/lemmy/post/index.ts +++ b/src/lib/components/lemmy/post/index.ts @@ -8,9 +8,6 @@ export { default as PostMediaCompact } from './media/PostMediaCompact.svelte' export { default as PostImage } from './media/PostImage.svelte' export { default as PostIframe } from './media/PostIframe.svelte' export { default as PostLink } from './link/PostLink.svelte' -export { default as VirtualFeed } from './feed/VirtualFeed.svelte' -export { default as PostFeed } from './feed/PostFeed.svelte' -export { default as PostForm } from './form/PostForm.svelte' export { default as PostActions } from './actions/PostActions.svelte' export { diff --git a/src/lib/components/lemmy/post/link/PostLink.svelte b/src/lib/components/lemmy/post/link/PostLink.svelte index 232e8ed3..e4786ef8 100644 --- a/src/lib/components/lemmy/post/link/PostLink.svelte +++ b/src/lib/components/lemmy/post/link/PostLink.svelte @@ -1,5 +1,5 @@ - - - + + diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index fd1c5fce..919dde0d 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -1,6 +1,6 @@ + +{#if type} + {#if renderers[type]} + {@const Renderer = renderers[type]} + + {#each tokens as token} + {#if token.tokens && token.tokens.length > 0} + + {:else if token.text} + {decodeHtmlEntities(token.text)} + {:else if text} + {text} + {/if} + {/each} + + {/if} +{:else} + {#each tokens as token} + + {/each} +{/if} diff --git a/src/lib/components/markdown/renderers/MdImage.svelte b/src/lib/components/markdown/renderers/MdImage.svelte index 7b75d742..7e74386b 100644 --- a/src/lib/components/markdown/renderers/MdImage.svelte +++ b/src/lib/components/markdown/renderers/MdImage.svelte @@ -4,8 +4,8 @@ mediaType, optimizeImageURL, PostIframe, - } from '$lib/components/lemmy/post' - import { showImage } from '$lib/components/ui/ExpandableImage.svelte' + } from '$comp/lemmy/post' + import { showImage } from '$comp/ui/ExpandableImage.svelte' import { t } from '$lib/i18n/translations' import { getContext } from 'svelte' import { ArrowDownTray, Icon } from 'svelte-hero-icons' diff --git a/src/lib/components/markdown/renderers/MdParagraph.svelte b/src/lib/components/markdown/renderers/MdParagraph.svelte index fb102bc6..9ede12d0 100644 --- a/src/lib/components/markdown/renderers/MdParagraph.svelte +++ b/src/lib/components/markdown/renderers/MdParagraph.svelte @@ -1,15 +1,8 @@ -

+

{@render children?.()}

diff --git a/src/lib/components/markdown/renderers/MdSpoiler.svelte b/src/lib/components/markdown/renderers/MdSpoiler.svelte index ed6fe266..d8c22550 100644 --- a/src/lib/components/markdown/renderers/MdSpoiler.svelte +++ b/src/lib/components/markdown/renderers/MdSpoiler.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index 1367c853..1183d145 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -1,9 +1,9 @@ diff --git a/src/routes/c/[name]/settings/team/+page.svelte b/src/routes/c/[name]/settings/team/+page.svelte index bc91286c..fad1b673 100644 --- a/src/routes/c/[name]/settings/team/+page.svelte +++ b/src/routes/c/[name]/settings/team/+page.svelte @@ -1,9 +1,9 @@ diff --git a/src/routes/create/post/+page.svelte b/src/routes/create/post/+page.svelte index dd730541..4a3469ee 100644 --- a/src/routes/create/post/+page.svelte +++ b/src/routes/create/post/+page.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/instances/blocked/+page.svelte b/src/routes/instances/blocked/+page.svelte index 0fd57d7f..6d3c6b22 100644 --- a/src/routes/instances/blocked/+page.svelte +++ b/src/routes/instances/blocked/+page.svelte @@ -1,8 +1,8 @@
diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 8e5383be..c54afdc7 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -3,15 +3,14 @@ import { page } from '$app/state' import { profile } from '$lib/auth.svelte.js' import { client } from '$lib/client/lemmy.svelte' - import { CommunityLink } from '$lib/components/lemmy/community' - import { isAdmin } from '$lib/components/lemmy/moderation/moderation.js' - import ObjectAutocomplete from '$lib/components/lemmy/ObjectAutocomplete.svelte' - import { postLink } from '$lib/components/lemmy/post' - import UserAutocomplete from '$lib/components/lemmy/user/UserAutocomplete.svelte' - import UserLink from '$lib/components/lemmy/user/UserLink.svelte' - import { Header } from '$lib/components/ui/layout' - import Pageination from '$lib/components/ui/layout/Pageination.svelte' - import Placeholder from '$lib/components/ui/Placeholder.svelte' + import { isAdmin } from '$comp/lemmy/moderation/moderation.js' + import ObjectAutocomplete from '$comp/lemmy/ObjectAutocomplete.svelte' + import { postLink } from '$comp/lemmy/post' + import UserAutocomplete from '$comp/lemmy/user/UserAutocomplete.svelte' + import UserLink from '$comp/lemmy/user/UserLink.svelte' + import { Header } from '$comp/ui/layout' + import Pageination from '$comp/ui/layout/Pageination.svelte' + import Placeholder from '$comp/ui/Placeholder.svelte' import { t } from '$lib/i18n/translations' import { settings } from '$lib/settings.svelte.js' import { searchParam } from '$lib/util.svelte.js' @@ -27,6 +26,7 @@ } from 'svelte-hero-icons' import ModlogItemCard from './item/ModlogItemCard.svelte' import ModlogItemTable from './item/ModlogItemTable.svelte' + import CommunityLink from '$comp/lemmy/community/CommunityLink.svelte' let { data = $bindable() } = $props() diff --git a/src/routes/modlog/+page.ts b/src/routes/modlog/+page.ts index 8bd45208..d69a6416 100644 --- a/src/routes/modlog/+page.ts +++ b/src/routes/modlog/+page.ts @@ -18,7 +18,7 @@ import type { ModlogActionType, Person, } from '$lib/client/types' -import { publishedToDate } from '$lib/components/util/date.js' +import { publishedToDate } from '$comp/util/date.js' export type ActionName = | 'ban' diff --git a/src/routes/modlog/item/ModlogItemCard.svelte b/src/routes/modlog/item/ModlogItemCard.svelte index a6e3992e..8451363b 100644 --- a/src/routes/modlog/item/ModlogItemCard.svelte +++ b/src/routes/modlog/item/ModlogItemCard.svelte @@ -1,11 +1,11 @@ diff --git a/src/routes/profile/(local_user)/password/2fa/+page.svelte b/src/routes/profile/(local_user)/password/2fa/+page.svelte index b12a56eb..f58853c0 100644 --- a/src/routes/profile/(local_user)/password/2fa/+page.svelte +++ b/src/routes/profile/(local_user)/password/2fa/+page.svelte @@ -7,7 +7,7 @@ import { Button, Material, Modal, TextInput, toast } from 'mono-svelte' import { ClipboardDocument, Icon, Key } from 'svelte-hero-icons' import { errorMessage } from '$lib/lemmy/error.js' - import Placeholder from '$lib/components/ui/Placeholder.svelte' + import Placeholder from '$comp/ui/Placeholder.svelte' let { data } = $props() diff --git a/src/routes/profile/(local_user)/password/logins/+page.svelte b/src/routes/profile/(local_user)/password/logins/+page.svelte index 326adc2a..e4b25d47 100644 --- a/src/routes/profile/(local_user)/password/logins/+page.svelte +++ b/src/routes/profile/(local_user)/password/logins/+page.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/profile/voted/[type]/+page.svelte b/src/routes/profile/voted/[type]/+page.svelte index e68e2c1f..b545a875 100644 --- a/src/routes/profile/voted/[type]/+page.svelte +++ b/src/routes/profile/voted/[type]/+page.svelte @@ -1,8 +1,8 @@ diff --git a/src/routes/settings/lemmy/+page.svelte b/src/routes/settings/lemmy/+page.svelte index c52343e4..ab32ad2e 100644 --- a/src/routes/settings/lemmy/+page.svelte +++ b/src/routes/settings/lemmy/+page.svelte @@ -15,7 +15,7 @@ } from 'svelte-hero-icons' import Setting from '../Setting.svelte' import ToggleSetting from '../ToggleSetting.svelte' - import CommonList from '$lib/components/ui/layout/CommonList.svelte' + import CommonList from '$comp/ui/layout/CommonList.svelte' diff --git a/src/routes/settings/moderation/+page.svelte b/src/routes/settings/moderation/+page.svelte index 64622e6b..c7689390 100644 --- a/src/routes/settings/moderation/+page.svelte +++ b/src/routes/settings/moderation/+page.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/settings/other/+page.svelte b/src/routes/settings/other/+page.svelte index 46ac70a5..9ea747b1 100644 --- a/src/routes/settings/other/+page.svelte +++ b/src/routes/settings/other/+page.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte index 14bb94b9..2548b0f1 100644 --- a/src/routes/u/[name]/+page.svelte +++ b/src/routes/u/[name]/+page.svelte @@ -1,15 +1,15 @@