lint: use svelte/reactivity classes
This commit is contained in:
11 files changed
+26
-47
No files matched your search
+4
-4
@@ -23,11 +23,11 @@ export default ts.config(
|
|||||||
'no-undef': 'off',
|
'no-undef': 'off',
|
||||||
// sveltekit should make this native then
|
// sveltekit should make this native then
|
||||||
'svelte/valid-prop-names-in-kit-pages': 'off',
|
'svelte/valid-prop-names-in-kit-pages': 'off',
|
||||||
'svelte/no-at-html-tags': 'warn',
|
'svelte/no-at-html-tags': 'off',
|
||||||
'@typescript-eslint/no-unsafe-function-type': 'warn',
|
'@typescript-eslint/no-unsafe-function-type': 'off',
|
||||||
'svelte/require-each-key': 'off',
|
'svelte/require-each-key': 'off',
|
||||||
'svelte/prefer-writable-derived': 'warn',
|
'svelte/prefer-writable-derived': 'off',
|
||||||
'no-console': 'warn',
|
'no-console': 'off',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -17,7 +17,7 @@
|
|||||||
"@types/nprogress": "^0.2.0",
|
"@types/nprogress": "^0.2.0",
|
||||||
"@types/ua-parser-js": "^0.7.39",
|
"@types/ua-parser-js": "^0.7.39",
|
||||||
"eslint": "^9.28.0",
|
"eslint": "^9.28.0",
|
||||||
"eslint-plugin-svelte": "^3.9.1",
|
"eslint-plugin-svelte": "^3.11.0",
|
||||||
"jsdom": "^22.1.0",
|
"jsdom": "^22.1.0",
|
||||||
"lemmy-js-client": "0.19.11-donation-dialog.1",
|
"lemmy-js-client": "0.19.11-donation-dialog.1",
|
||||||
"linkify-it": "^5.0.0",
|
"linkify-it": "^5.0.0",
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
"postcss": "^8.4.30",
|
"postcss": "^8.4.30",
|
||||||
"prettier": "^3.3.3",
|
"prettier": "^3.3.3",
|
||||||
"prettier-plugin-svelte": "^3.2.7",
|
"prettier-plugin-svelte": "^3.2.7",
|
||||||
"svelte": "^5.34.8",
|
"svelte": "^5.37.3",
|
||||||
"svelte-adapter-bun-next": "^1.0.3",
|
"svelte-adapter-bun-next": "^1.0.3",
|
||||||
"svelte-check": "^4.0.0",
|
"svelte-check": "^4.0.0",
|
||||||
"svelte-floating-ui": "^1.5.9",
|
"svelte-floating-ui": "^1.5.9",
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { Comment, CommentView } from 'lemmy-js-client'
|
import type { Comment, CommentView } from 'lemmy-js-client'
|
||||||
|
import { SvelteMap } from 'svelte/reactivity'
|
||||||
|
|
||||||
export interface CommentNodeI {
|
export interface CommentNodeI {
|
||||||
comment_view: CommentView
|
comment_view: CommentView
|
||||||
@@ -28,7 +29,7 @@ export function buildCommentsTree(
|
|||||||
baseDepth: number = 0,
|
baseDepth: number = 0,
|
||||||
filter: (c: CommentView) => boolean = () => true,
|
filter: (c: CommentView) => boolean = () => true,
|
||||||
): CommentNodeI[] {
|
): CommentNodeI[] {
|
||||||
const map = new Map<number, CommentNodeI>()
|
const map = new SvelteMap<number, CommentNodeI>()
|
||||||
|
|
||||||
let min_depth = Number.MAX_VALUE
|
let min_depth = Number.MAX_VALUE
|
||||||
for (const comment_view of comments) {
|
for (const comment_view of comments) {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
post: PostView
|
post: PostView
|
||||||
}
|
}
|
||||||
|
|
||||||
let { post } = $props()
|
let { post }: Props = $props()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<Post {post} class="py-0!" />
|
<Post {post} class="py-0!" />
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { settings } from '$lib/settings.svelte'
|
import { settings } from '$lib/settings.svelte'
|
||||||
import type { PostView } from 'lemmy-js-client'
|
import type { PostView } from 'lemmy-js-client'
|
||||||
|
import { SvelteMap, SvelteSet } from 'svelte/reactivity'
|
||||||
|
|
||||||
export type PostViewWithCrossposts = PostView & {
|
export type PostViewWithCrossposts = PostView & {
|
||||||
withCrossposts: true
|
withCrossposts: true
|
||||||
@@ -10,12 +11,12 @@ export type PostViewWithoutCrossposts = PostView & { withCrossposts?: false }
|
|||||||
export const combineCrossposts = (
|
export const combineCrossposts = (
|
||||||
posts: PostView[],
|
posts: PostView[],
|
||||||
): (PostViewWithCrossposts | PostViewWithoutCrossposts)[] => {
|
): (PostViewWithCrossposts | PostViewWithoutCrossposts)[] => {
|
||||||
const urlMap = new Map<
|
const urlMap = new SvelteMap<
|
||||||
string,
|
string,
|
||||||
PostViewWithCrossposts | PostViewWithoutCrossposts
|
PostViewWithCrossposts | PostViewWithoutCrossposts
|
||||||
>()
|
>()
|
||||||
const results: (PostViewWithCrossposts | PostViewWithoutCrossposts)[] = []
|
const results: (PostViewWithCrossposts | PostViewWithoutCrossposts)[] = []
|
||||||
const seenUrls = new Set<string>()
|
const seenUrls = new SvelteSet<string>()
|
||||||
|
|
||||||
posts?.forEach(post => {
|
posts?.forEach(post => {
|
||||||
if (
|
if (
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
import { fly } from 'svelte/transition'
|
import { fly } from 'svelte/transition'
|
||||||
import { page as pageData } from '$app/state'
|
import { page as pageData } from '$app/state'
|
||||||
import { invalidate } from '$app/navigation'
|
import { invalidate } from '$app/navigation'
|
||||||
|
import { SvelteURLSearchParams } from 'svelte/reactivity'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
page?: number
|
page?: number
|
||||||
@@ -27,8 +28,8 @@
|
|||||||
|
|
||||||
let customHref = (href?: string) => {
|
let customHref = (href?: string) => {
|
||||||
if (href?.startsWith('?')) {
|
if (href?.startsWith('?')) {
|
||||||
const current = new URLSearchParams(pageData.url.searchParams)
|
const current = new SvelteURLSearchParams(pageData.url.searchParams)
|
||||||
const newParams = new URLSearchParams(href)
|
const newParams = new SvelteURLSearchParams(href)
|
||||||
|
|
||||||
current.delete(Array.from(newParams.keys())[0])
|
current.delete(Array.from(newParams.keys())[0])
|
||||||
current.append(
|
current.append(
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ import {
|
|||||||
ViewColumns,
|
ViewColumns,
|
||||||
type IconSource,
|
type IconSource,
|
||||||
} from 'svelte-hero-icons'
|
} from 'svelte-hero-icons'
|
||||||
|
import { SvelteURL } from 'svelte/reactivity'
|
||||||
|
|
||||||
export interface Group {
|
export interface Group {
|
||||||
name: string
|
name: string
|
||||||
@@ -411,7 +412,7 @@ export function getGroups(
|
|||||||
f.community.name,
|
f.community.name,
|
||||||
f.community.actor_id,
|
f.community.actor_id,
|
||||||
)}`,
|
)}`,
|
||||||
detail: new URL(f.community.actor_id).hostname,
|
detail: new SvelteURL(f.community.actor_id).hostname,
|
||||||
})) ?? [],
|
})) ?? [],
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|||||||
+4
-31
@@ -1,12 +1,11 @@
|
|||||||
import { goto } from '$app/navigation'
|
import { goto } from '$app/navigation'
|
||||||
import { client } from '$lib/lemmy.svelte.js'
|
import { client } from '$lib/lemmy.svelte.js'
|
||||||
import { settings } from '$lib/settings.svelte'
|
import { settings } from '$lib/settings.svelte'
|
||||||
import { feature } from '$lib/version.js'
|
|
||||||
import type { SubscribedType } from 'lemmy-js-client'
|
import type { SubscribedType } from 'lemmy-js-client'
|
||||||
import { toast } from 'mono-svelte'
|
import { toast } from 'mono-svelte'
|
||||||
import { t } from './i18n/translations'
|
import { t } from './i18n/translations'
|
||||||
import { site } from './lemmy.svelte'
|
|
||||||
import { errorMessage } from './lemmy/error'
|
import { errorMessage } from './lemmy/error'
|
||||||
|
import { SvelteURL } from 'svelte/reactivity'
|
||||||
|
|
||||||
// Despite the name, this will round up
|
// Despite the name, this will round up
|
||||||
// Example: findClosestNumber([8, 16, 32, 64, 128], 76) will return 128
|
// Example: findClosestNumber([8, 16, 32, 64, 128], 76) will return 128
|
||||||
@@ -29,7 +28,7 @@ export const searchParam = (
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const fullCommunityName = (name: string, actorId: string) =>
|
export const fullCommunityName = (name: string, actorId: string) =>
|
||||||
`${name}@${new URL(actorId).hostname}`
|
`${name}@${new SvelteURL(actorId).hostname}`
|
||||||
|
|
||||||
export const placeholders = {
|
export const placeholders = {
|
||||||
url: ['https://example.com'],
|
url: ['https://example.com'],
|
||||||
@@ -126,38 +125,12 @@ export async function uploadImage(
|
|||||||
const formData = new FormData()
|
const formData = new FormData()
|
||||||
formData.append('images[]', image)
|
formData.append('images[]', image)
|
||||||
|
|
||||||
if (feature('unproxiedImageUpload', site.data?.version)) {
|
|
||||||
const res = await client({ auth: jwt, instanceURL: instance }).uploadImage({
|
const res = await client({ auth: jwt, instanceURL: instance }).uploadImage({
|
||||||
image: image,
|
image: image,
|
||||||
})
|
})
|
||||||
|
|
||||||
if (res.url) return res.url
|
if (res.url) return res.url
|
||||||
else throw new Error(`Failed to upload image. ${res.msg}`)
|
else throw new Error(`Failed to upload image. ${res.msg}`)
|
||||||
} else {
|
|
||||||
const response = await fetch(
|
|
||||||
`${
|
|
||||||
window.location.origin
|
|
||||||
}/cors/${instance}/pictrs/image?${new URLSearchParams({
|
|
||||||
auth: jwt,
|
|
||||||
})}`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
body: formData,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
const json = await response.json()
|
|
||||||
|
|
||||||
if (json.msg == 'ok') {
|
|
||||||
return `https://${instance}/pictrs/image/${json.files?.[0]?.file}`
|
|
||||||
}
|
|
||||||
throw new Error(
|
|
||||||
`${
|
|
||||||
(await response.text().catch(() => undefined)) ??
|
|
||||||
'Failed to upload image'
|
|
||||||
}: ${response.status}: ${response.statusText}`,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const instanceToURL = (input: string) =>
|
export const instanceToURL = (input: string) =>
|
||||||
@@ -167,7 +140,7 @@ export const instanceToURL = (input: string) =>
|
|||||||
|
|
||||||
export function canParseUrl(url: string): boolean {
|
export function canParseUrl(url: string): boolean {
|
||||||
try {
|
try {
|
||||||
new URL(url)
|
new SvelteURL(url)
|
||||||
return true
|
return true
|
||||||
} catch {
|
} catch {
|
||||||
return false
|
return false
|
||||||
@@ -175,7 +148,7 @@ export function canParseUrl(url: string): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function instanceId(actorId: string) {
|
export function instanceId(actorId: string) {
|
||||||
return new URL(actorId).hostname
|
return new SvelteURL(actorId).hostname
|
||||||
}
|
}
|
||||||
|
|
||||||
export function escapeHtml(input: string): string {
|
export function escapeHtml(input: string): string {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
import { Button } from 'mono-svelte'
|
import { Button } from 'mono-svelte'
|
||||||
import { ArrowPath, Check, Icon, Inbox } from 'svelte-hero-icons'
|
import { ArrowPath, Check, Icon, Inbox } from 'svelte-hero-icons'
|
||||||
import InboxItem from './InboxItem.svelte'
|
import InboxItem from './InboxItem.svelte'
|
||||||
|
import { SvelteURLSearchParams } from 'svelte/reactivity'
|
||||||
|
|
||||||
let { data } = $props()
|
let { data } = $props()
|
||||||
|
|
||||||
@@ -43,10 +44,10 @@
|
|||||||
newParamString: string,
|
newParamString: string,
|
||||||
) {
|
) {
|
||||||
// Create a new URLSearchParams object from the current search params
|
// Create a new URLSearchParams object from the current search params
|
||||||
const updatedParams = new URLSearchParams(currentSearchParams)
|
const updatedParams = new SvelteURLSearchParams(currentSearchParams)
|
||||||
|
|
||||||
// Parse the new parameter string
|
// Parse the new parameter string
|
||||||
const newParam = new URLSearchParams(newParamString)
|
const newParam = new SvelteURLSearchParams(newParamString)
|
||||||
|
|
||||||
// Get the key and value of the new parameter
|
// Get the key and value of the new parameter
|
||||||
const [key, value]: [string, string] = newParam.entries().next().value!
|
const [key, value]: [string, string] = newParam.entries().next().value!
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
import { Button, Modal } from 'mono-svelte'
|
import { Button, Modal } from 'mono-svelte'
|
||||||
import { ChatBubbleOvalLeftEllipsis, Icon, Inbox } from 'svelte-hero-icons'
|
import { ChatBubbleOvalLeftEllipsis, Icon, Inbox } from 'svelte-hero-icons'
|
||||||
import { expoOut } from 'svelte/easing'
|
import { expoOut } from 'svelte/easing'
|
||||||
|
import { SvelteSet } from 'svelte/reactivity'
|
||||||
import { fly } from 'svelte/transition'
|
import { fly } from 'svelte/transition'
|
||||||
|
|
||||||
interface ConversationPreview {
|
interface ConversationPreview {
|
||||||
@@ -34,7 +35,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function filterDuplicates<T, K>(array: T[], predicate: (item: T) => K): T[] {
|
function filterDuplicates<T, K>(array: T[], predicate: (item: T) => K): T[] {
|
||||||
const seen = new Set()
|
const seen = new SvelteSet()
|
||||||
return array.filter(element => {
|
return array.filter(element => {
|
||||||
const value = predicate(element)
|
const value = predicate(element)
|
||||||
if (seen.has(value)) {
|
if (seen.has(value)) {
|
||||||
|
|||||||
Reference in new issue
Block a user