From 27faed996539c74e3e55f5c2c9f021b764c18400 Mon Sep 17 00:00:00 2001 From: Innei Date: Wed, 23 Oct 2024 20:17:08 +0800 Subject: [PATCH 01/49] fix(server): upstream origin url Signed-off-by: Innei --- apps/server/index.ts | 11 ++++- apps/server/src/meta-handler.ts | 15 +++--- apps/server/src/router/global.ts | 75 +++++++++++++---------------- apps/server/src/vercel-rewrite.json | 52 -------------------- packages/shared/src/env.ts | 2 + 5 files changed, 52 insertions(+), 103 deletions(-) delete mode 100644 apps/server/src/vercel-rewrite.json diff --git a/apps/server/index.ts b/apps/server/index.ts index ad03346c3..5cf62fe43 100644 --- a/apps/server/index.ts +++ b/apps/server/index.ts @@ -2,6 +2,7 @@ import "./src/lib/load-env" import middie from "@fastify/middie" import { fastifyRequestContext } from "@fastify/request-context" +import { env } from "@follow/shared/env" import type { FastifyRequest } from "fastify" import Fastify from "fastify" @@ -17,6 +18,7 @@ declare module "@fastify/request-context" { req: FastifyRequest upstreamEnv: "prod" | "dev" + upstreamOrigin: string } } @@ -36,8 +38,13 @@ export const createApp = async () => { const forwardedHost = req.headers["x-forwarded-host"] const finalHost = forwardedHost || host - if (!isDev) req.requestContext.set("upstreamEnv", finalHost?.includes("dev") ? "dev" : "prod") - + const upstreamEnv = finalHost?.includes("dev") ? "dev" : "prod" + if (!isDev) req.requestContext.set("upstreamEnv", upstreamEnv) + if (upstreamEnv === "prod") { + req.requestContext.set("upstreamOrigin", env.VITE_WEB_PROD_URL || env.VITE_WEB_URL) + } else { + req.requestContext.set("upstreamOrigin", env.VITE_WEB_DEV_URL || env.VITE_WEB_URL) + } reply.header("x-handled-host", finalHost) done() }) diff --git a/apps/server/src/meta-handler.ts b/apps/server/src/meta-handler.ts index 1c298295f..5e8c46a59 100644 --- a/apps/server/src/meta-handler.ts +++ b/apps/server/src/meta-handler.ts @@ -34,14 +34,13 @@ export async function injectMetaHandler(req: FastifyRequest): Promise const apiClient = createApiClient() - const hostFromReq = req.headers["x-forwarded-host"] || req.headers.host - const protocol = req.headers["x-forwarded-proto"] || req.protocol || "https" + const upstreamOrigin = req.requestContext.get("upstreamOrigin") const url = req.originalUrl switch (true) { case url.startsWith("/share/feeds"): { - const parsedUrl = new URL(url, `https://${hostFromReq}`) + const parsedUrl = new URL(url, upstreamOrigin) const feedId = parsedUrl.pathname.split("/")[3] const feed = await apiClient.feeds.$get({ query: { id: feedId } }) @@ -52,7 +51,7 @@ export async function injectMetaHandler(req: FastifyRequest): Promise type: "openGraph", title: title || "", description: description || "", - image: `${protocol}://${hostFromReq}/og/feed/${feedId}`, + image: `${upstreamOrigin}/og/feed/${feedId}`, }, { type: "title", @@ -68,7 +67,7 @@ export async function injectMetaHandler(req: FastifyRequest): Promise break } case url.startsWith("/share/lists"): { - const parsedUrl = new URL(url, `https://${hostFromReq}`) + const parsedUrl = new URL(url, upstreamOrigin) const listId = parsedUrl.pathname.split("/")[3] const list = await apiClient.lists.$get({ query: { listId } }) @@ -79,7 +78,7 @@ export async function injectMetaHandler(req: FastifyRequest): Promise type: "openGraph", title: title || "", description: description || "", - image: `${protocol}://${hostFromReq}/og/list/${listId}`, + image: `${upstreamOrigin}/og/list/${listId}`, }, { type: "title", @@ -95,7 +94,7 @@ export async function injectMetaHandler(req: FastifyRequest): Promise break } case url.startsWith("/share/users"): { - const parsedUrl = new URL(url, `https://${hostFromReq}`) + const parsedUrl = new URL(url, upstreamOrigin) const userId = parsedUrl.pathname.split("/")[3] const handle = isBizId(userId || "") @@ -120,7 +119,7 @@ export async function injectMetaHandler(req: FastifyRequest): Promise { type: "openGraph", title: name || "", - image: `${protocol}://${hostFromReq}/og/user/${userId}`, + image: `${upstreamOrigin}/og/user/${userId}`, }, { type: "hydrate", diff --git a/apps/server/src/router/global.ts b/apps/server/src/router/global.ts index 4550a0b59..988554cee 100644 --- a/apps/server/src/router/global.ts +++ b/apps/server/src/router/global.ts @@ -33,45 +33,38 @@ const devHandler = (app: FastifyInstance) => { }) } const prodHandler = (app: FastifyInstance) => { - app.get("/share/test-vercel-header", (req, reply) => { - reply.send({ - headers: req.headers, - host: req.headers.host, - }) - }) app.get("*", async (req, reply) => { let template = require("../../.generated/index.template").default template = await safeInjectMetaToTemplate(template, req, reply) - // const isInVercelReverseProxy = req.headers["x-middleware-subrequest"] - - // if (isInVercelReverseProxy) { - // Add asset prefix - // Map all link and script to /assets - // - // - const prefix = "/external-dist" - const { document } = parseHTML(template) - for (const script of document.querySelectorAll("script")) { - script.src = `${prefix}${script.src}` - } - for (const link of document.querySelectorAll("link")) { - link.href = `${prefix}${link.href}` - } + const isInVercelReverseProxy = req.headers["x-middleware-subrequest"] const upstreamEnv = req.requestContext.get("upstreamEnv") + if (isInVercelReverseProxy || upstreamEnv === "prod") { + // Add asset prefix + // Map all link and script to /assets + // + // + const prefix = "/external-dist" + const { document } = parseHTML(template) + for (const script of document.querySelectorAll("script")) { + script.src = `${prefix}${script.src}` + } + for (const link of document.querySelectorAll("link")) { + link.href = `${prefix}${link.href}` + } - if (upstreamEnv) { - document.head.prepend(document.createComment(`upstreamEnv: ${upstreamEnv}`)) + const upstreamEnv = req.requestContext.get("upstreamEnv") - // override client side api url + if (upstreamEnv) { + document.head.prepend(document.createComment(`upstreamEnv: ${upstreamEnv}`)) - const upstreamHost = req.headers["x-forwarded-host"] || req.headers.host - const protocol = req.headers["x-forwarded-proto"] || "https" - const upstreamOrigin = `${protocol}://${upstreamHost}` + // override client side api url - const injectScript = (apiUrl: string) => { - const template = `function injectEnv(env2) { + const upstreamOrigin = req.requestContext.get("upstreamOrigin") + + const injectScript = (apiUrl: string) => { + const template = `function injectEnv(env2) { for (const key in env2) { if (env2[key] === void 0) continue; globalThis["__followEnv"] ??= {}; @@ -79,20 +72,20 @@ const prodHandler = (app: FastifyInstance) => { } } injectEnv({"VITE_API_URL":"${apiUrl}","VITE_EXTERNAL_API_URL":"${apiUrl}","VITE_WEB_URL":"${upstreamOrigin}"})` - const $script = document.createElement("script") - $script.innerHTML = template - document.head.prepend($script) + const $script = document.createElement("script") + $script.innerHTML = template + document.head.prepend($script) + } + if (upstreamEnv === "dev" && env.VITE_EXTERNAL_DEV_API_URL) { + injectScript(env.VITE_EXTERNAL_DEV_API_URL) + } + if (upstreamEnv === "prod" && env.VITE_EXTERNAL_PROD_API_URL) { + injectScript(env.VITE_EXTERNAL_PROD_API_URL) + } } - if (upstreamEnv === "dev" && env.VITE_EXTERNAL_DEV_API_URL) { - injectScript(env.VITE_EXTERNAL_DEV_API_URL) - } - if (upstreamEnv === "prod" && env.VITE_EXTERNAL_PROD_API_URL) { - injectScript(env.VITE_EXTERNAL_PROD_API_URL) - } - } - template = document.toString() - // } + template = document.toString() + } reply.type("text/html") reply.send(template) diff --git a/apps/server/src/vercel-rewrite.json b/apps/server/src/vercel-rewrite.json deleted file mode 100644 index c9585930d..000000000 --- a/apps/server/src/vercel-rewrite.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "headers": { - "dnt": "1", - "forwarded": "for=38.181.79.248;host=follow-topaz.vercel.app;proto=https;sig=0QmVhcmVyIDViNmI2MzcwZmQzZmU3MTcyZDNmYzNjYWYxNzMzYTM3Njc1N2MzYWQwYmUzNTlmNGYxYzk3ZGQ2YjY0N2JmMDQ=;exp=1729144861", - "x-real-ip": "38.181.79.248", - "x-vercel-edge-region": "hkg1", - "x-vercel-id": "hkg1:hkg1:hkg1::79hps-1729144561999-93eaf829e1eb", - "upgrade-insecure-requests": "1", - "cf-visitor": "{\"scheme\":\"https\"}", - "cookie": "__vercel_toolbar=1", - "x-middleware-subrequest": "931b984572b208c96d0b50809260502e6854440e", - "x-vercel-forwarded-for": "38.181.79.248", - "cf-ew-via": "15", - "sec-ch-ua-mobile": "?0", - "sec-fetch-mode": "navigate", - "x-vercel-ip-country-region": "NKT", - "x-vercel-ip-timezone": "Asia/Hong_Kong", - "x-vercel-ja4-digest": "t13d1412h2_e33ad33b3d25_6b314db333b6", - "x-vercel-skip-toolbar": "1", - "sec-fetch-dest": "document", - "x-vercel-ip-as-number": "138997", - "host": "follow-topaz.vercel.app", - "priority": "u=0, i", - "accept-encoding": "gzip", - "sec-fetch-site": "none", - "sec-ch-ua": "\"Google Chrome\";v=\"129\", \"Not=A?Brand\";v=\"8\", \"Chromium\";v=\"129\"", - "cf-worker": "cloudflare-workers.vercel-infra-production.com", - "sec-fetch-user": "?1", - "x-forwarded-proto": "https", - "x-vercel-ip-city": "Ha%20Kwai%20Chung", - "x-forwarded-host": "follow-topaz.vercel.app", - "x-vercel-ip-continent": "AS", - "x-vercel-ip-latitude": "22.3539", - "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", - "cdn-loop": "cloudflare; loops=1; subreqs=1", - "cf-ray": "8d3e0b0865c1dd4b-HKG", - "x-vercel-deployment-url": "follow-l3l4vb81x-inneis-projects.vercel.app", - "x-vercel-proxy-signature": "Bearer 5b6b6370fd3fe7172d3fc3caf1733a376757c3ad0be359f4f1c97dd6b647bf04", - "x-forwarded-for": "38.181.79.248", - "x-vercel-ip-country": "HK", - "x-vercel-ip-longitude": "114.1342", - "x-vercel-proxy-signature-ts": "1729144861", - "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36", - "cf-connecting-ip": "38.181.79.248", - "x-vercel-proxied-for": "162.158.178.107", - "accept-language": "zh-CN,zh;q=0.9,en;q=0.8", - "sec-ch-ua-platform": "\"macOS\"", - "connection": "close" - }, - "url": "/share/feeds/1/og/feed/1", - "ip": "127.0.0.1" -} diff --git a/packages/shared/src/env.ts b/packages/shared/src/env.ts index 704906de1..51a74480a 100644 --- a/packages/shared/src/env.ts +++ b/packages/shared/src/env.ts @@ -19,6 +19,8 @@ export const env = createEnv({ VITE_EXTERNAL_PROD_API_URL: z.string().optional(), VITE_EXTERNAL_DEV_API_URL: z.string().optional(), VITE_EXTERNAL_API_URL: z.string().optional(), + VITE_WEB_PROD_URL: z.string().optional(), + VITE_WEB_DEV_URL: z.string().optional(), }, emptyStringAsUndefined: true, From 1decc3555a5ff0ede2a7b8146210be5973907995 Mon Sep 17 00:00:00 2001 From: Innei Date: Wed, 23 Oct 2024 20:27:13 +0800 Subject: [PATCH 02/49] fix(server): deeplink handler Signed-off-by: Innei --- apps/server/client/lib/helper.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/server/client/lib/helper.ts b/apps/server/client/lib/helper.ts index 51226f578..6714a341d 100644 --- a/apps/server/client/lib/helper.ts +++ b/apps/server/client/lib/helper.ts @@ -34,7 +34,9 @@ export const openInFollowApp = ( window.addEventListener("blur", handleBlur) - window.location.href = `${DEEPLINK_SCHEME}://${deeplink}` + const deeplinkUrl = `${DEEPLINK_SCHEME}${deeplink}` + console.info("Open deeplink:", deeplinkUrl) + window.location.href = deeplinkUrl setTimeout(() => { cleanup() From 553640e495d0c6e521c59448a6997476ff2b631c Mon Sep 17 00:00:00 2001 From: Stephen Zhou <38493346+hyoban@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:57:14 +0800 Subject: [PATCH 03/49] fix: preview image size --- apps/renderer/src/components/ui/media/preview-media.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/renderer/src/components/ui/media/preview-media.tsx b/apps/renderer/src/components/ui/media/preview-media.tsx index b4427d516..680a7ee47 100644 --- a/apps/renderer/src/components/ui/media/preview-media.tsx +++ b/apps/renderer/src/components/ui/media/preview-media.tsx @@ -301,14 +301,14 @@ const FallbackableImage: FC<
{!isAllError && (
height - ? Math.min((windowHeight - 32 - 40) * (width / height), width) + ? `${Math.min((windowHeight - 32 - 40) * (width / height), width)}px` : undefined, - maxWidth: width > height ? windowWidth - 80 - 80 - 400 : undefined, + maxWidth: width > height ? `${windowWidth - 80 - 80 - 400}px` : undefined, }} > Date: Wed, 23 Oct 2024 22:11:18 +0800 Subject: [PATCH 04/49] fix: only fit content for image media --- apps/renderer/src/components/ui/media.tsx | 19 ++++++++++++++++++- .../src/components/ui/media/SwipeMedia.tsx | 2 ++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/apps/renderer/src/components/ui/media.tsx b/apps/renderer/src/components/ui/media.tsx index a4fb01999..4da2e3fee 100644 --- a/apps/renderer/src/components/ui/media.tsx +++ b/apps/renderer/src/components/ui/media.tsx @@ -21,6 +21,7 @@ type BaseProps = { thumbnail?: boolean blurhash?: string inline?: boolean + fitContent?: boolean } export type MediaProps = BaseProps & ( @@ -62,6 +63,7 @@ const MediaImpl: FC = ({ height, width, inline, + fitContent, ...rest } = props @@ -253,6 +255,7 @@ const MediaImpl: FC = ({ height={Number.parseInt(props.height as string)} containerWidth={containerWidth} noScale={inline} + fitContent={fitContent} >
{blurhash ? ( @@ -306,6 +309,7 @@ const AspectRatio = ({ children, style, noScale, + fitContent, ...props }: { width: number @@ -313,10 +317,23 @@ const AspectRatio = ({ containerWidth?: number children: React.ReactNode style?: React.CSSProperties + /** + * Keep the content size for inline image usage + */ noScale?: boolean + /** + * If `fit` is true, the content width may be increased to fit the container width + */ + fitContent?: boolean [key: string]: any }) => { - const scaleFactor = noScale ? 1 : containerWidth && width ? containerWidth / width : 1 + const scaleFactor = noScale + ? 1 + : containerWidth && width + ? fitContent + ? containerWidth / width + : Math.min(1, containerWidth / width) + : 1 const scaledWidth = width ? width * scaleFactor : undefined const scaledHeight = height ? height * scaleFactor : undefined diff --git a/apps/renderer/src/components/ui/media/SwipeMedia.tsx b/apps/renderer/src/components/ui/media/SwipeMedia.tsx index 32cb5ed75..118ac3dbc 100644 --- a/apps/renderer/src/components/ui/media/SwipeMedia.tsx +++ b/apps/renderer/src/components/ui/media/SwipeMedia.tsx @@ -98,6 +98,7 @@ export function SwipeMedia({ onPreview?.(uniqMedia, i) }} showFallback={true} + fitContent /> ))} @@ -135,6 +136,7 @@ export function SwipeMedia({ height={uniqMedia[0].height} width={uniqMedia[0].width} blurhash={uniqMedia[0].blurhash} + fitContent /> ) : (
From 6e949bb6a5894caaa66dda912be26f35f6bc40cf Mon Sep 17 00:00:00 2001 From: Stephen Zhou <38493346+hyoban@users.noreply.github.com> Date: Wed, 23 Oct 2024 23:16:33 +0800 Subject: [PATCH 05/49] chore: update api type --- packages/shared/src/hono.ts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/shared/src/hono.ts b/packages/shared/src/hono.ts index cff7ae17e..beeacd322 100644 --- a/packages/shared/src/hono.ts +++ b/packages/shared/src/hono.ts @@ -143,6 +143,22 @@ declare const achievements: drizzle_orm_pg_core.PgTableWithColumns<{ baseColumn: never; generated: undefined; }, {}, {}>; + tx: drizzle_orm_pg_core.PgColumn<{ + name: "tx"; + tableName: "achievements"; + dataType: "string"; + columnType: "PgText"; + data: string; + driverParam: string; + notNull: false; + hasDefault: false; + isPrimaryKey: false; + isAutoincrement: false; + hasRuntimeDefault: false; + enumValues: [string, ...string[]]; + baseColumn: never; + generated: undefined; + }, {}, {}>; }; dialect: "pg"; }>; @@ -155,6 +171,7 @@ declare const achievementsOpenAPISchema: zod.ZodObject<{ progressMax: zod.ZodNumber; done: zod.ZodBoolean; doneAt: zod.ZodNullable; + tx: zod.ZodNullable; }, zod.UnknownKeysParam, zod.ZodTypeAny, { type: "received" | "checking" | "completed" | "incomplete" | "audit"; id: string; @@ -164,6 +181,7 @@ declare const achievementsOpenAPISchema: zod.ZodObject<{ progressMax: number; done: boolean; doneAt: string | null; + tx: string | null; }, { type: "received" | "checking" | "completed" | "incomplete" | "audit"; id: string; @@ -173,6 +191,7 @@ declare const achievementsOpenAPISchema: zod.ZodObject<{ progressMax: number; done: boolean; doneAt: string | null; + tx: string | null; }>; declare const languageSchema: z.ZodEnum<["en", "ja", "zh-CN", "zh-TW"]>; @@ -5447,6 +5466,7 @@ declare const _routes: hono_hono_base.HonoBase Date: Wed, 23 Oct 2024 23:36:59 +0800 Subject: [PATCH 06/49] fix: convert html to markdown before save to obsidian --- apps/renderer/package.json | 2 + .../src/hooks/biz/useEntryActions.tsx | 3 +- apps/renderer/src/lib/parse-html.ts | 3 + pnpm-lock.yaml | 78 ++++++++++++++++++- 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/apps/renderer/package.json b/apps/renderer/package.json index 001f138ee..836aa56cd 100644 --- a/apps/renderer/package.json +++ b/apps/renderer/package.json @@ -62,6 +62,7 @@ "franc-min": "6.2.0", "fuse.js": "7.0.0", "hast-util-to-jsx-runtime": "2.3.2", + "hast-util-to-mdast": "^10.1.0", "hast-util-to-text": "4.0.2", "i18next": "^23.16.0", "i18next-browser-languagedetector": "8.0.0", @@ -72,6 +73,7 @@ "lethargy": "1.0.9", "lodash-es": "4.17.21", "masonic": "4.0.1", + "mdast-util-to-markdown": "^2.1.0", "nanoid": "5.0.7", "ofetch": "1.4.1", "path-to-regexp": "8.2.0", diff --git a/apps/renderer/src/hooks/biz/useEntryActions.tsx b/apps/renderer/src/hooks/biz/useEntryActions.tsx index 492fad32d..2eb04a7e7 100644 --- a/apps/renderer/src/hooks/biz/useEntryActions.tsx +++ b/apps/renderer/src/hooks/biz/useEntryActions.tsx @@ -33,6 +33,7 @@ import { shortcuts } from "~/constants/shortcuts" import { tipcClient } from "~/lib/client" import { nextFrame } from "~/lib/dom" import { FeedViewType } from "~/lib/enum" +import { parseHtml } from "~/lib/parse-html" import { getOS } from "~/lib/utils" import StarAnimationUri from "~/lottie/star.lottie?url" import type { CombinedEntryModel } from "~/models" @@ -427,7 +428,7 @@ export const useEntryActions = ({ saveToObsidian.mutate({ url: populatedEntry.entries.url, title: populatedEntry.entries.title || "", - content: populatedEntry.entries.content || "", + content: parseHtml(populatedEntry.entries.content || "").toMarkdown(), author: populatedEntry.entries.author || "", publishedAt: populatedEntry.entries.publishedAt || "", vaultPath: obsidianVaultPath, diff --git a/apps/renderer/src/lib/parse-html.ts b/apps/renderer/src/lib/parse-html.ts index 7474599e9..8e587fa0b 100644 --- a/apps/renderer/src/lib/parse-html.ts +++ b/apps/renderer/src/lib/parse-html.ts @@ -2,7 +2,9 @@ import type { Element, Parent, Text } from "hast" import type { Schema } from "hast-util-sanitize" import type { Components } from "hast-util-to-jsx-runtime" import { toJsxRuntime } from "hast-util-to-jsx-runtime" +import { toMdast } from "hast-util-to-mdast" import { toText } from "hast-util-to-text" +import { toMarkdown } from "mdast-util-to-markdown" import { createElement } from "react" import { Fragment, jsx, jsxs } from "react/jsx-runtime" import { renderToString } from "react-dom/server" @@ -235,6 +237,7 @@ export const parseHtml = ( }, }), toText: () => toText(hastTree), + toMarkdown: () => toMarkdown(toMdast(hastTree)), } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eb7cb3cc6..f371989d2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -477,6 +477,9 @@ importers: hast-util-to-jsx-runtime: specifier: 2.3.2 version: 2.3.2 + hast-util-to-mdast: + specifier: ^10.1.0 + version: 10.1.0 hast-util-to-text: specifier: 4.0.2 version: 4.0.2 @@ -507,6 +510,9 @@ importers: masonic: specifier: 4.0.1 version: 4.0.1(react@18.3.1) + mdast-util-to-markdown: + specifier: ^2.1.0 + version: 2.1.0 nanoid: specifier: 5.0.7 version: 5.0.7 @@ -3599,7 +3605,7 @@ packages: '@radix-ui/react-slot@1.1.0': resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==} peerDependencies: - '@types/react': '*' + '@types/react': npm:types-react@19.0.0-rc.1 react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc peerDependenciesMeta: '@types/react': @@ -6541,6 +6547,9 @@ packages: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} + hast-util-embedded@3.0.0: + resolution: {integrity: sha512-naH8sld4Pe2ep03qqULEtvYr7EjrLK2QHY8KJR6RJkTUjPGObe1vnx585uzem2hGra+s1q08DZZpfgDVYRbaXA==} + hast-util-excerpt@2.0.0: resolution: {integrity: sha512-3hM4U3Tjvx8bn+KGM51BA2VL6poq3AyOHguq3dzDjI74lxYZfOV1zAEEiSbcGd8CXgx9N9JRS5MlS4izTWJRig==} @@ -6553,12 +6562,21 @@ packages: hast-util-has-property@3.0.0: resolution: {integrity: sha512-MNilsvEKLFpV604hwfhVStK0usFY/QmM5zX16bo7EjnAEGofr5YyI37kzopBlZJkHD4t887i+q/C8/tr5Q94cA==} + hast-util-is-body-ok-link@3.0.1: + resolution: {integrity: sha512-0qpnzOBLztXHbHQenVB8uNuxTnm/QBFUOmdOSsEn7GnBtyY07+ENTWVFBAnXd/zEgd9/SUG3lRY7hSIBWRgGpQ==} + hast-util-is-element@3.0.0: resolution: {integrity: sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==} + hast-util-minify-whitespace@1.0.1: + resolution: {integrity: sha512-L96fPOVpnclQE0xzdWb/D12VT5FabA7SnZOUMtL1DbXmYiHJMXZvFkIZfiMmTCNJHUeO2K9UYNXoVyfz+QHuOw==} + hast-util-parse-selector@4.0.0: resolution: {integrity: sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==} + hast-util-phrasing@3.0.1: + resolution: {integrity: sha512-6h60VfI3uBQUxHqTyMymMZnEbNl1XmEGtOxxKYL7stY2o601COo62AWAYBQR9lZbYXYSBoxag8UpPRXK+9fqSQ==} + hast-util-sanitize@5.0.1: resolution: {integrity: sha512-IGrgWLuip4O2nq5CugXy4GI2V8kx4sFVy5Hd4vF7AR2gxS0N9s7nEAVUyeMtZKZvzrxVsHt73XdTsno1tClIkQ==} @@ -6571,6 +6589,9 @@ packages: hast-util-to-jsx-runtime@2.3.2: resolution: {integrity: sha512-1ngXYb+V9UT5h+PxNRa1O1FYguZK/XL+gkeqvp7EdHlB9oHUG0eYRo/vY5inBdcqo3RkPMC58/H94HvkbfGdyg==} + hast-util-to-mdast@10.1.0: + resolution: {integrity: sha512-DsL/SvCK9V7+vfc6SLQ+vKIyBDXTk2KLSbfBYkH4zeF/uR1yBajHRhkzuaUSGOB1WJSTieJBdHwxlC+HLKvZZw==} + hast-util-to-string@3.0.0: resolution: {integrity: sha512-OGkAxX1Ua3cbcW6EJ5pT/tslVb90uViVkcJ4ZZIMW/R33DX/AkcJcRrPebPwJkHYwlDHXz4aIwvAAaAdtrACFA==} @@ -8738,6 +8759,9 @@ packages: rehype-infer-description-meta@2.0.0: resolution: {integrity: sha512-8MZjKRfQiNB5+Qpt0fS9bpjcKe+nhF5GOTHo0M5e+XdStDpcZxkSMMnCfNIlpNaOyIQ7Hu1qEaUxm8ZL1lYI1g==} + rehype-minify-whitespace@6.0.2: + resolution: {integrity: sha512-Zk0pyQ06A3Lyxhe9vGtOtzz3Z0+qZ5+7icZ/PL/2x1SHPbKao5oB/g/rlc6BCTajqBb33JcOe71Ye1oFsuYbnw==} + rehype-parse@9.0.1: resolution: {integrity: sha512-ksCzCD0Fgfh7trPDxr2rSylbwq9iYDkSn8TCDmEJ49ljEUBxDVCzCHv7QNzZOfODanX4+bWQ4WZqLCRWYLfhag==} @@ -9395,6 +9419,9 @@ packages: resolution: {integrity: sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==} engines: {node: '>=0.10.0'} + trim-trailing-lines@2.1.0: + resolution: {integrity: sha512-5UR5Biq4VlVOtzqkm2AZlgvSlDJtME46uV0br0gENbwN4l5+mMKT4b9gJKqWtuL2zAIqajGJGuvbCbcAJUZqBg==} + trough@2.2.0: resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==} @@ -16967,6 +16994,11 @@ snapshots: function-bind: 1.1.2 optional: true + hast-util-embedded@3.0.0: + dependencies: + '@types/hast': 3.0.4 + hast-util-is-element: 3.0.0 + hast-util-excerpt@2.0.0: dependencies: '@types/hast': 3.0.4 @@ -16996,14 +17028,34 @@ snapshots: dependencies: '@types/hast': 3.0.4 + hast-util-is-body-ok-link@3.0.1: + dependencies: + '@types/hast': 3.0.4 + hast-util-is-element@3.0.0: dependencies: '@types/hast': 3.0.4 + hast-util-minify-whitespace@1.0.1: + dependencies: + '@types/hast': 3.0.4 + hast-util-embedded: 3.0.0 + hast-util-is-element: 3.0.0 + hast-util-whitespace: 3.0.0 + unist-util-is: 6.0.0 + hast-util-parse-selector@4.0.0: dependencies: '@types/hast': 3.0.4 + hast-util-phrasing@3.0.1: + dependencies: + '@types/hast': 3.0.4 + hast-util-embedded: 3.0.0 + hast-util-has-property: 3.0.0 + hast-util-is-body-ok-link: 3.0.1 + hast-util-is-element: 3.0.0 + hast-util-sanitize@5.0.1: dependencies: '@types/hast': 3.0.4 @@ -17063,6 +17115,23 @@ snapshots: transitivePeerDependencies: - supports-color + hast-util-to-mdast@10.1.0: + dependencies: + '@types/hast': 3.0.4 + '@types/mdast': 4.0.4 + '@ungap/structured-clone': 1.2.0 + hast-util-phrasing: 3.0.1 + hast-util-to-html: 9.0.3 + hast-util-to-text: 4.0.2 + hast-util-whitespace: 3.0.0 + mdast-util-phrasing: 4.1.0 + mdast-util-to-hast: 13.2.0 + mdast-util-to-string: 4.0.0 + rehype-minify-whitespace: 6.0.2 + trim-trailing-lines: 2.1.0 + unist-util-position: 5.0.0 + unist-util-visit: 5.0.0 + hast-util-to-string@3.0.0: dependencies: '@types/hast': 3.0.4 @@ -19464,6 +19533,11 @@ snapshots: unist-util-remove-position: 5.0.0 vfile: 6.0.3 + rehype-minify-whitespace@6.0.2: + dependencies: + '@types/hast': 3.0.4 + hast-util-minify-whitespace: 1.0.1 + rehype-parse@9.0.1: dependencies: '@types/hast': 3.0.4 @@ -20197,6 +20271,8 @@ snapshots: dependencies: escape-string-regexp: 1.0.5 + trim-trailing-lines@2.1.0: {} + trough@2.2.0: {} truncate-utf8-bytes@1.0.2: From 9778ce203713e715a7d877e3bc109a77e39bbbca Mon Sep 17 00:00:00 2001 From: Huajin <114134574+xhuajin@users.noreply.github.com> Date: Thu, 24 Oct 2024 08:50:23 +0800 Subject: [PATCH 07/49] feat: add horizontal scroll functionality to TimelineTabs (#1081) Co-authored-by: xhuajin Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com> --- .../modules/entry-column/layouts/TimelineTabs.tsx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx b/apps/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx index 33bcc3d77..07d4edc58 100644 --- a/apps/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx +++ b/apps/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx @@ -20,9 +20,15 @@ export const TimelineTabs = () => { const navigate = useNavigateEntry() if (!hasData) return null + + const handleWheel = (e: React.WheelEvent) => { + e.preventDefault() + e.currentTarget.scrollLeft += e.deltaY + } + return ( { if (!val) { @@ -34,7 +40,7 @@ export const TimelineTabs = () => { } }} > - + Yours @@ -44,7 +50,7 @@ export const TimelineTabs = () => { listId={s.listId!} view={view} iconSize={16} - className="h-5 !bg-transparent p-0 leading-none" + className="h-5 !bg-transparent p-0" /> ))} @@ -54,7 +60,7 @@ export const TimelineTabs = () => { inboxId={s.inboxId!} view={view} iconSize={16} - className="h-5 !bg-transparent p-0 leading-none" + className="h-5 !bg-transparent p-0" /> ))} From bb2b350fe71b353af0d1f612aba196291723ca14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=93=E9=BC=A0?= <71394853+hamster1963@users.noreply.github.com> Date: Thu, 24 Oct 2024 08:51:16 +0800 Subject: [PATCH 08/49] fix: Wrong initial position of tab animation (#1087) Co-authored-by: hamster1963 --- apps/renderer/src/components/ui/tabs.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/renderer/src/components/ui/tabs.tsx b/apps/renderer/src/components/ui/tabs.tsx index ee6e212a9..719137852 100644 --- a/apps/renderer/src/components/ui/tabs.tsx +++ b/apps/renderer/src/components/ui/tabs.tsx @@ -113,6 +113,9 @@ const TabsTrigger = React.forwardRef( {isSelect && ( Date: Thu, 24 Oct 2024 09:02:09 +0800 Subject: [PATCH 09/49] fix: disable auto toggle readability in web --- apps/renderer/src/modules/entry-content/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/renderer/src/modules/entry-content/index.tsx b/apps/renderer/src/modules/entry-content/index.tsx index 1186378b2..82d4a4f23 100644 --- a/apps/renderer/src/modules/entry-content/index.tsx +++ b/apps/renderer/src/modules/entry-content/index.tsx @@ -286,7 +286,7 @@ export const EntryContentRender: Component<{
- {entry.settings?.readability && ( + {entry.settings?.readability && IN_ELECTRON && ( )} {entry.settings?.sourceContent && } From ac7fa6bba7f46abec5b016bd8fee894d71a8c1da Mon Sep 17 00:00:00 2001 From: Konv Suu <2583695112@qq.com> Date: Thu, 24 Oct 2024 11:58:40 +0800 Subject: [PATCH 10/49] fix: margin condition in EntryListHeader (#1103) --- .../src/modules/entry-column/layouts/EntryListHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx b/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx index 5077a03be..d943a11fa 100644 --- a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx +++ b/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx @@ -75,7 +75,7 @@ export const EntryListHeader: FC<{ ref={containerRef} className={cn( "flex w-full flex-col pl-6 pr-4 pt-2.5 transition-[padding] duration-300 ease-in-out", - view !== FeedViewType.Articles && view !== FeedViewType.Pictures && "mb-2", + view !== FeedViewType.Pictures && "mb-2", )} >
From ee7d168ab4f899e087ed5aa7bca8697a345d6b0d Mon Sep 17 00:00:00 2001 From: lc4t <11334449+lc4t@users.noreply.github.com> Date: Thu, 24 Oct 2024 11:59:46 +0800 Subject: [PATCH 11/49] chore(i18n): add daily reward system translation (#1102) Co-authored-by: lc4t --- locales/settings/zh-CN.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/locales/settings/zh-CN.json b/locales/settings/zh-CN.json index d95682706..04e927373 100644 --- a/locales/settings/zh-CN.json +++ b/locales/settings/zh-CN.json @@ -223,6 +223,7 @@ "titles.profile": "个人资料", "titles.shortcuts": "快捷键", "wallet.address.title": "地址", + "wallet.balance.dailyReward": "你的每日奖励", "wallet.balance.title": "余额", "wallet.balance.withdrawable": "可提取", "wallet.balance.withdrawableTooltip": "可提取的 Power 包括收到的打赏和充值", @@ -233,10 +234,21 @@ "wallet.create.button": "创建钱包", "wallet.create.description": "创建一个免费钱包以获得 Power。你可以给其他创作者打赏,也可以通过贡献内容来获得奖励。", "wallet.power.dailyClaim": "每天可以领取 {{amount}} 个免费 Power。Power 可用于在 Follow 上打赏 RSS 条目。", + "wallet.power.description2": "Power 是 {{blockchainName}} 区块链上的一个 ERC-20 代币,可用于在 Follow 平台上进行购买和打赏。", + "wallet.power.rewardDescription": "所有活跃在 Follow 的用户都有资格获得每日 Power 奖励。", + "wallet.power.rewardDescription2": "根据您的等级和过往活动,您今天可以获得一份 奖励。了解更多。", + "wallet.power.rewardDescription3": "我们正在测试一个新的奖励系统。活跃在 Follow 并为平台做出贡献的用户将获得更多奖励。以下是根据新的规则,您可以预期获得的奖励。请注意,这些信息仅供参考。", + "wallet.ranking.level": "等级", + "wallet.ranking.name": "用户", + "wallet.ranking.power": "Power", + "wallet.ranking.rank": "排名", + "wallet.ranking.title": "Power 排名", "wallet.sidebar_title": "Power", "wallet.transactions.amount": "数量", "wallet.transactions.date": "日期", + "wallet.transactions.description": "某些交易会产生 {{percentage}}% 的平台费用,以支持 Follow 的发展。详情请参阅区块链交易记录。", "wallet.transactions.from": "发送者", + "wallet.transactions.more": "通过区块链浏览器查看更多信息。", "wallet.transactions.noTransactions": "无交易记录", "wallet.transactions.title": "交易记录", "wallet.transactions.to": "接收者", From 3a85febb6e2c46f7a59e02b74dca4f3dd6bcc2c3 Mon Sep 17 00:00:00 2001 From: Innei Date: Thu, 24 Oct 2024 14:37:43 +0800 Subject: [PATCH 12/49] refactor(monorepo): migrate to monorepo (#1059) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * init Signed-off-by: Innei * chore: utils import Signed-off-by: Innei * remove stable router Signed-off-by: Innei * refactor: components import Signed-off-by: Innei * chore: auto-fix linting and formatting issues * minify Signed-off-by: Innei * update Signed-off-by: Innei * fix: test Signed-off-by: Innei * chore: ui component extract Signed-off-by: Innei * fix: import Signed-off-by: Innei * re-render Signed-off-by: Innei * refactor: remove hooks Signed-off-by: Innei * fix Signed-off-by: Innei * update Signed-off-by: Innei * setting Signed-off-by: Innei * update Signed-off-by: Innei * refactor: remove icons Signed-off-by: Innei * typings Signed-off-by: Innei * feat: add horizontal scroll functionality to TimelineTabs (#1081) Co-authored-by: xhuajin Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com> * fix: Wrong initial position of tab animation (#1087) Co-authored-by: hamster1963 * fix: disable auto toggle readability in web * fix: margin condition in EntryListHeader (#1103) * chore(i18n): add daily reward system translation (#1102) Co-authored-by: lc4t * fix: deps Signed-off-by: Innei * fix: type Signed-off-by: Innei * update Signed-off-by: Innei * fix Signed-off-by: Innei --------- Signed-off-by: Innei Signed-off-by: Innei Co-authored-by: Innei Co-authored-by: Huajin <114134574+xhuajin@users.noreply.github.com> Co-authored-by: xhuajin Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com> Co-authored-by: 仓鼠 <71394853+hamster1963@users.noreply.github.com> Co-authored-by: hamster1963 Co-authored-by: Konv Suu <2583695112@qq.com> Co-authored-by: lc4t <11334449+lc4t@users.noreply.github.com> Co-authored-by: lc4t --- .vscode/settings.json | 22 +- apps/main/package.json | 4 - apps/renderer/package.json | 26 +- apps/renderer/src/App.tsx | 2 +- apps/renderer/src/api/trending.ts | 2 +- apps/renderer/src/atoms/corner-player.ts | 2 +- apps/renderer/src/atoms/hooks/viewport.ts | 27 -- apps/renderer/src/atoms/player.ts | 2 +- apps/renderer/src/atoms/route.ts | 41 --- apps/renderer/src/atoms/server-configs.ts | 2 +- apps/renderer/src/atoms/settings/general.ts | 3 +- apps/renderer/src/atoms/settings/helper.ts | 155 ---------- .../src/atoms/settings/integration.ts | 3 +- apps/renderer/src/atoms/settings/ui.ts | 3 +- apps/renderer/src/atoms/sidebar.ts | 2 +- apps/renderer/src/atoms/updater.ts | 2 +- apps/renderer/src/atoms/user.ts | 2 +- apps/renderer/src/atoms/viewport.ts | 31 -- .../src/components/common/ErrorElement.tsx | 2 +- .../components/common/LoadMoreIndicator.tsx | 3 +- .../common/LoadRemixAsyncComponent.tsx | 3 +- .../common/MemoedDangerousHTMLStyle.tsx | 19 -- .../src/components/common/NotFound.tsx | 4 +- .../src/components/common/PoweredByFooter.tsx | 6 +- .../src/components/common/ShadowDOM.tsx | 5 +- .../FeedFoundCanBeFollowErrorFallback.tsx | 6 +- .../src/components/errors/FeedNotFound.tsx | 4 +- .../src/components/errors/ModalError.tsx | 2 +- .../src/components/errors/PageError.tsx | 2 +- apps/renderer/src/components/errors/helper.ts | 2 +- .../errors/previews/FeedPreview.tsx | 14 +- apps/renderer/src/components/header.tsx | 95 ------ .../src/components/icons/Language.tsx | 78 ----- .../components/icons/OouiUserAnonymous.tsx | 11 - .../src/components/icons/PhCloudCheck.tsx | 18 -- .../src/components/icons/PhCloudWarning.tsx | 18 -- .../src/components/icons/PhCloudX.tsx | 18 -- apps/renderer/src/components/icons/empty.tsx | 33 -- apps/renderer/src/components/icons/follow.tsx | 12 - apps/renderer/src/components/icons/logo.tsx | 29 -- apps/renderer/src/components/icons/resize.tsx | 12 - apps/renderer/src/components/icons/user.tsx | 22 -- apps/renderer/src/components/icons/users.tsx | 18 -- apps/renderer/src/components/site-icon.tsx | 111 ------- apps/renderer/src/components/ui/Masonry.tsx | 217 ------------- .../ui/auto-completion/AutoCompletion.tsx | 7 +- apps/renderer/src/components/ui/avatar.tsx | 42 --- .../ui/background/WindowUnderBlur.tsx | 2 +- .../src/components/ui/button/index.tsx | 241 --------------- .../src/components/ui/button/variants.tsx | 75 ----- .../ui/code-highlighter/constants/index.tsx | 2 +- .../ui/code-highlighter/copy-button.tsx | 5 +- .../ui/code-highlighter/shiki/Shiki.tsx | 4 +- .../ui/code-highlighter/shiki/hooks.ts | 2 +- .../src/components/ui/collapse/Collapse.tsx | 3 +- .../ui/context-menu/context-menu.tsx | 8 +- .../src/components/ui/datetime/index.tsx | 96 +----- .../src/components/ui/divider/Divider.tsx | 49 --- .../components/ui/divider/PanelSpliter.tsx | 60 ---- .../src/components/ui/divider/index.ts | 2 - .../ui/dropdown-menu/dropdown-menu.tsx | 8 +- .../src/components/ui/fab/FABContainer.tsx | 7 +- .../src/components/ui/input/Input.tsx | 37 --- .../src/components/ui/input/TextArea.tsx | 111 ------- .../renderer/src/components/ui/input/index.ts | 2 - apps/renderer/src/components/ui/kbd/Kbd.tsx | 3 +- .../renderer/src/components/ui/link/index.tsx | 7 +- .../components/ui/list-item-hover-overlay.tsx | 89 ------ apps/renderer/src/components/ui/loading.tsx | 140 --------- .../components/ui/lottie-container/index.tsx | 3 +- .../src/components/ui/markdown/HTML.tsx | 2 +- .../src/components/ui/markdown/Markdown.tsx | 2 +- .../components/ui/markdown/components/Toc.tsx | 10 +- .../ui/markdown/components/TocItem.tsx | 6 +- .../ui/markdown/renderers/BlockImage.tsx | 2 +- .../ui/markdown/renderers/Heading.tsx | 7 +- .../ui/markdown/renderers/InlineImage.tsx | 3 +- .../ui/markdown/renderers/MarkdownLink.tsx | 7 +- .../src/components/ui/marquee/index.tsx | 60 ---- apps/renderer/src/components/ui/media.tsx | 4 +- .../src/components/ui/media/SwipeMedia.tsx | 2 +- .../src/components/ui/media/VideoPlayer.tsx | 11 +- .../src/components/ui/media/preview-media.tsx | 8 +- .../ui/modal/helper/async-loading.tsx | 9 +- .../ui/modal/helper/use-async-modal.tsx | 2 +- .../ui/modal/stacked/components.tsx | 2 +- .../ui/modal/stacked/custom-modal.tsx | 5 +- .../ui/modal/stacked/declarative-modal.tsx | 2 +- .../ui/modal/stacked/internal/use-animate.ts | 3 +- .../ui/modal/stacked/internal/use-select.ts | 3 +- .../src/components/ui/modal/stacked/modal.tsx | 13 +- .../components/ui/modal/stacked/overlay.tsx | 2 +- .../src/components/ui/paper/Paper.tsx | 3 +- .../ui/platform-icon/collections/eagle.tsx | 12 - .../platform-icon/collections/instapaper.tsx | 12 - .../ui/platform-icon/collections/omnivore.tsx | 12 - .../ui/platform-icon/collections/readwise.tsx | 23 -- .../ui/platform-icon/collections/rss3.tsx | 12 - .../src/components/ui/platform-icon/icons.ts | 6 - .../src/components/ui/platform-icon/index.tsx | 47 --- .../src/components/ui/platform-icon/utils.tsx | 28 -- .../components/ui/popover/index.module.css | 23 -- .../src/components/ui/popover/index.tsx | 36 --- .../src/components/ui/portal/index.tsx | 16 - .../src/components/ui/portal/provider.tsx | 11 - .../src/components/ui/radio-group/Radio.tsx | 48 --- .../components/ui/radio-group/RadioCard.tsx | 54 ---- .../components/ui/radio-group/RadioGroup.tsx | 29 -- .../src/components/ui/radio-group/context.ts | 15 - .../src/components/ui/radio-group/index.ts | 3 - .../components/ui/scroll-area/ScrollArea.tsx | 149 --------- .../src/components/ui/scroll-area/ctx.ts | 3 - .../src/components/ui/scroll-area/hooks.ts | 103 ------- .../ui/scroll-area/index.module.css | 44 --- .../src/components/ui/scroll-area/index.ts | 1 - .../src/components/ui/segment/ctx.tsx | 8 - .../src/components/ui/segment/index.tsx | 83 ----- apps/renderer/src/components/ui/select.tsx | 159 ---------- apps/renderer/src/components/ui/skeleton.tsx | 7 - apps/renderer/src/components/ui/sonner.tsx | 18 -- .../src/components/ui/tooltip/index.tsx | 51 ---- .../src/components/ui/tooltip/styles.ts | 10 - .../ui/typography/EllipsisWithTooltip.tsx | 87 ------ .../src/components/ui/typography/index.ts | 1 - .../src/components/ux/transition/icon.tsx | 3 +- apps/renderer/src/constants/app.tsx | 2 +- apps/renderer/src/constants/index.ts | 1 - apps/renderer/src/constants/tabs.tsx | 69 ----- apps/renderer/src/database/schemas/entry.ts | 2 +- apps/renderer/src/database/schemas/feed.ts | 2 +- .../src/hooks/biz/useDiscoverRSSHubRoute.tsx | 2 +- .../src/hooks/biz/useEntryActions.tsx | 25 +- .../renderer/src/hooks/biz/useFeedActions.tsx | 6 +- apps/renderer/src/hooks/biz/useFollow.tsx | 2 +- .../src/hooks/biz/useNavigateEntry.ts | 4 +- apps/renderer/src/hooks/biz/useRouteParams.ts | 4 +- apps/renderer/src/hooks/biz/useSignOut.ts | 2 +- .../common/factory/createHTMLMediaHook.ts | 287 ------------------ apps/renderer/src/hooks/common/index.ts | 13 - .../src/hooks/common/internal/for-theme.ts | 15 - .../src/hooks/common/useAnyPointDown.ts | 7 - apps/renderer/src/hooks/common/useDark.ts | 12 - .../src/hooks/common/useInputComposition.ts | 96 ------ apps/renderer/src/hooks/common/useInterval.ts | 56 ---- apps/renderer/src/hooks/common/useIsOnline.ts | 20 -- apps/renderer/src/hooks/common/useMeasure.ts | 210 ------------- .../src/hooks/common/usePageVisibility.ts | 17 -- apps/renderer/src/hooks/common/usePrevious.ts | 9 - apps/renderer/src/hooks/common/useRefValue.ts | 15 - apps/renderer/src/hooks/common/useSetState.ts | 17 -- .../renderer/src/hooks/common/useSyncTheme.ts | 73 ++--- apps/renderer/src/hooks/common/useTitle.ts | 16 - .../common/useTypescriptHappyCallback.ts | 6 - apps/renderer/src/hooks/common/useVideo.ts | 3 - apps/renderer/src/i18n.ts | 9 +- apps/renderer/src/initialize/hydrate.ts | 3 +- apps/renderer/src/initialize/index.ts | 9 - .../renderer/src/initialize/migrates/index.ts | 2 +- apps/renderer/src/lib/chain.ts | 27 -- apps/renderer/src/lib/color.ts | 54 ---- apps/renderer/src/lib/dom.ts | 23 -- apps/renderer/src/lib/enum.ts | 18 -- apps/renderer/src/lib/environment.ts | 21 -- apps/renderer/src/lib/error-parser.ts | 2 +- apps/renderer/src/lib/event-bus.ts | 35 --- apps/renderer/src/lib/issues.ts | 3 +- apps/renderer/src/lib/jotai.ts | 38 +-- apps/renderer/src/lib/link-parser.ts | 114 ------- apps/renderer/src/lib/load-language.ts | 2 +- apps/renderer/src/lib/native-menu.ts | 2 +- apps/renderer/src/lib/ns.ts | 11 - apps/renderer/src/lib/parse-html.ts | 4 +- apps/renderer/src/lib/parsers.ts | 5 +- apps/renderer/src/lib/route-builder.test.ts | 176 ----------- apps/renderer/src/lib/route-builder.ts | 188 ------------ apps/renderer/src/lib/translate.ts | 5 +- apps/renderer/src/lib/url-builder.ts | 26 -- apps/renderer/src/lib/utils.spec.ts | 29 -- apps/renderer/src/lib/utils.ts | 216 +------------ apps/renderer/src/lib/yielder.ts | 16 - apps/renderer/src/main.tsx | 6 +- apps/renderer/src/models/index.ts | 41 --- apps/renderer/src/models/types.ts | 128 -------- apps/renderer/src/modules/ab/atoms.ts | 15 - apps/renderer/src/modules/ab/fallback.ts | 5 - apps/renderer/src/modules/ab/hoc.tsx | 32 -- apps/renderer/src/modules/ab/providers.tsx | 72 ----- .../achievement/AchievementModalContent.tsx | 16 +- .../activation/ActivationModalContent.tsx | 22 +- .../activation/NeedActivationToast.tsx | 5 +- .../ai/ai-daily/EntryPlaceholderDaily.tsx | 2 +- .../ai/ai-daily/FeedDailyModalContent.tsx | 4 +- .../src/modules/ai/ai-daily/daily.tsx | 23 +- .../src/modules/ai/ai-daily/types.tsx | 2 +- .../src/modules/app/EnvironmentIndicator.tsx | 7 +- .../modules/app/NetworkStatusIndicator.tsx | 5 +- .../src/modules/auth/LoginModalContent.tsx | 8 +- .../src/modules/boost/boost-certification.tsx | 12 +- .../src/modules/boost/boost-progress.tsx | 2 +- .../modules/boost/boosting-contributors.tsx | 2 +- .../src/modules/boost/level-benefits.tsx | 2 +- apps/renderer/src/modules/boost/modal.tsx | 4 +- .../src/modules/boost/radio-cards.tsx | 4 +- .../src/modules/claim/feed-claim-modal.tsx | 14 +- .../src/modules/discover/DiscoverFeedForm.tsx | 29 +- .../src/modules/discover/feed-form.tsx | 40 +-- apps/renderer/src/modules/discover/form.tsx | 30 +- apps/renderer/src/modules/discover/import.tsx | 26 +- .../src/modules/discover/inbox-form.tsx | 34 +-- .../src/modules/discover/inbox-list-form.tsx | 22 +- .../src/modules/discover/list-form.tsx | 38 +-- .../modules/discover/recommendations-card.tsx | 4 +- .../src/modules/discover/recommendations.tsx | 2 +- .../src/modules/discover/rss3-form.tsx | 5 +- .../src/modules/discover/transform-form.tsx | 3 +- apps/renderer/src/modules/discover/types.ts | 2 +- .../src/modules/discover/user-form.tsx | 3 +- .../EntryColumnShortcutHandler.tsx | 2 +- .../entry-column/Items/article-item.tsx | 5 +- .../modules/entry-column/Items/audio-item.tsx | 3 +- .../src/modules/entry-column/Items/index.ts | 2 +- .../entry-column/Items/notification-item.tsx | 5 +- .../entry-column/Items/picture-item.tsx | 9 +- .../entry-column/Items/picture-masonry.tsx | 10 +- .../entry-column/Items/social-media-item.tsx | 9 +- .../modules/entry-column/Items/video-item.tsx | 6 +- .../entry-column/components/DateItem.tsx | 10 +- .../components/mark-all-button.tsx | 8 +- .../src/modules/entry-column/hooks.ts | 2 +- .../src/modules/entry-column/index.tsx | 18 +- .../src/modules/entry-column/item.tsx | 8 +- .../entry-column/layouts/EntryItemWrapper.tsx | 8 +- .../entry-column/layouts/EntryListHeader.tsx | 18 +- .../entry-column/layouts/TimelineTabs.tsx | 3 +- .../src/modules/entry-column/lists.tsx | 2 +- .../src/modules/entry-column/star-icon.tsx | 2 +- .../templates/grid-item-template.tsx | 6 +- .../templates/list-item-template.tsx | 12 +- .../src/modules/entry-column/translation.tsx | 8 +- .../src/modules/entry-column/types.ts | 8 +- .../src/modules/entry-content/atoms.tsx | 2 +- .../components/EntryPlaceholderLogo.tsx | 7 +- .../components/EntryReadHistory.tsx | 15 +- .../entry-content/components/EntryTitle.tsx | 4 +- .../components/SupportCreator.tsx | 6 +- .../components/WarnGoToExternalLink.tsx | 8 +- .../src/modules/entry-content/header.tsx | 11 +- .../src/modules/entry-content/index.tsx | 19 +- .../src/modules/entry-content/loading.tsx | 6 +- apps/renderer/src/modules/feed-column/atom.ts | 2 +- .../src/modules/feed-column/auto-updater.tsx | 2 +- .../feed-column/category-remove-dialog.tsx | 2 +- .../feed-column/category-rename-dialog.tsx | 12 +- .../src/modules/feed-column/category.tsx | 17 +- .../src/modules/feed-column/corner-player.tsx | 11 +- .../src/modules/feed-column/header.tsx | 10 +- .../src/modules/feed-column/index.tsx | 10 +- .../renderer/src/modules/feed-column/item.tsx | 25 +- .../renderer/src/modules/feed-column/list.tsx | 11 +- .../sort-by/SortByAlphabeticalList.tsx | 2 +- .../src/modules/feed-column/sort-by/types.tsx | 2 +- .../src/modules/feed-column/unread-number.tsx | 3 +- .../feed}/feed-certification.tsx | 13 +- .../feed}/feed-icon.tsx | 9 +- .../feed}/feed-summary.tsx | 10 +- .../feed}/view-select-content.tsx | 7 +- apps/renderer/src/modules/modal/shortcuts.tsx | 6 +- .../new-user-guide/guide-modal-content.tsx | 4 +- .../src/modules/new-user-guide/modal.tsx | 2 +- .../modules/new-user-guide/steps/behavior.tsx | 2 +- .../modules/new-user-guide/steps/feeds.tsx | 10 +- .../modules/new-user-guide/steps/rsshub.tsx | 3 +- apps/renderer/src/modules/panel/cmdf.tsx | 6 +- apps/renderer/src/modules/panel/cmdk.tsx | 31 +- apps/renderer/src/modules/panel/cmdn.tsx | 6 +- .../my-wallet-section/claim-daily-reward.tsx | 5 +- .../power/my-wallet-section/create-wallet.tsx | 2 +- .../modules/power/my-wallet-section/index.tsx | 16 +- .../reward-description-modal.tsx | 14 +- .../power/my-wallet-section/withdraw.tsx | 22 +- .../src/modules/power/ranking/index.tsx | 18 +- .../power/transaction-section/index.tsx | 36 ++- apps/renderer/src/modules/profile/hooks.ts | 2 +- .../modules/profile/profile-setting-form.tsx | 26 +- .../modules/profile/user-profile-modal.tsx | 26 +- .../modules/renderer/components/TimeStamp.tsx | 2 +- .../renderer/src/modules/renderer/context.tsx | 3 +- apps/renderer/src/modules/renderer/html.tsx | 2 +- .../src/modules/settings/action-card.tsx | 38 +-- .../renderer/src/modules/settings/control.tsx | 15 +- .../modules/settings/helper/SyncIndicator.tsx | 11 +- .../src/modules/settings/helper/builder.ts | 40 +++ .../settings/{ => helper}/setting-builder.tsx | 4 +- .../src/modules/settings/helper/sync-queue.ts | 6 +- .../modules/settings/hooks/use-setting-ctx.ts | 8 +- .../src/modules/settings/modal/content.tsx | 2 +- .../src/modules/settings/modal/layout.tsx | 40 +-- .../renderer/src/modules/settings/section.tsx | 3 +- .../src/modules/settings/sections/fonts.tsx | 26 +- .../src/modules/settings/tabs/about.tsx | 10 +- .../modules/settings/tabs/actions/index.tsx | 6 +- .../src/modules/settings/tabs/apperance.tsx | 30 +- .../src/modules/settings/tabs/feeds.tsx | 18 +- .../src/modules/settings/tabs/general.tsx | 22 +- .../src/modules/settings/tabs/integration.tsx | 14 +- .../src/modules/settings/tabs/invitations.tsx | 35 ++- .../src/modules/settings/tabs/lists/index.tsx | 33 +- .../modules/settings/tabs/lists/modals.tsx | 48 +-- apps/renderer/src/modules/settings/title.tsx | 5 +- apps/renderer/src/modules/settings/utils.ts | 2 +- .../modules/shared/ViewSelectorRadioGroup.tsx | 8 +- apps/renderer/src/modules/trending/index.tsx | 26 +- .../renderer/src/modules/user/LoginButton.tsx | 4 +- .../src/modules/user/ProfileButton.tsx | 32 +- apps/renderer/src/modules/user/UserAvatar.tsx | 4 +- .../src/modules/wallet/activity-points.tsx | 4 +- apps/renderer/src/modules/wallet/balance.tsx | 6 +- apps/renderer/src/modules/wallet/level.tsx | 4 +- .../renderer/src/modules/wallet/tip-modal.tsx | 12 +- .../pages/(external)/(with-layout)/layout.tsx | 95 +++++- .../(with-layout)/share/feeds/[id]/index.tsx | 20 +- .../(with-layout)/share/lists/[id]/index.tsx | 14 +- .../(with-layout)/share/users/[id]/index.tsx | 17 +- .../src/pages/(external)/invitation.tsx | 26 +- apps/renderer/src/pages/(external)/login.tsx | 4 +- .../src/pages/(external)/redirect.tsx | 2 +- .../(layer)/(subview)/discover/index.tsx | 6 +- .../pages/(main)/(layer)/(subview)/hooks.ts | 3 +- .../pages/(main)/(layer)/(subview)/layout.tsx | 10 +- .../(main)/(layer)/(subview)/power/index.tsx | 2 +- .../feeds/[feedId]/[entryId]/index.tsx | 7 +- .../(main)/(layer)/feeds/[feedId]/layout.tsx | 6 +- apps/renderer/src/pages/(main)/index.tsx | 2 +- apps/renderer/src/pages/(main)/layout.tsx | 10 +- apps/renderer/src/pages/add/index.tsx | 2 +- .../src/pages/settings/(settings)/actions.tsx | 3 +- .../pages/settings/(settings)/invitations.tsx | 3 +- .../src/pages/settings/(settings)/list.tsx | 3 +- .../pages/settings/(settings)/shortcuts.tsx | 2 +- apps/renderer/src/pages/settings/index.tsx | 5 +- apps/renderer/src/pages/settings/layout.tsx | 6 +- .../src/providers/context-menu-provider.tsx | 4 +- .../renderer/src/providers/event-provider.tsx | 37 --- .../providers/extension-expose-provider.tsx | 7 +- apps/renderer/src/providers/i18n-provider.tsx | 2 +- .../providers/invalidate-query-provider.tsx | 2 +- .../src/providers/lazy/index.electron.ts | 1 - apps/renderer/src/providers/lazy/index.ts | 7 +- .../renderer/src/providers/root-providers.tsx | 72 ++--- .../src/providers/stable-router-provider.tsx | 47 --- apps/renderer/src/providers/user-provider.tsx | 2 +- .../providers/wrapped-element-provider.tsx | 2 +- apps/renderer/src/queries/ai.ts | 3 +- apps/renderer/src/queries/feed.ts | 2 +- apps/renderer/src/queries/subscriptions.ts | 3 +- apps/renderer/src/router.tsx | 2 +- apps/renderer/src/router.web.tsx | 2 +- apps/renderer/src/services/cleaner.spec.ts | 2 +- apps/renderer/src/services/entry.spec.ts | 2 +- apps/renderer/src/services/entry.ts | 3 +- apps/renderer/src/services/feed.ts | 3 +- apps/renderer/src/services/inbox.ts | 3 +- apps/renderer/src/services/list.ts | 2 +- apps/renderer/src/store/entry/hooks.ts | 2 +- apps/renderer/src/store/entry/store.ts | 16 +- apps/renderer/src/store/entry/types.ts | 5 +- apps/renderer/src/store/feed/hooks.ts | 5 +- apps/renderer/src/store/feed/store.ts | 20 +- apps/renderer/src/store/feed/types.ts | 2 +- apps/renderer/src/store/image/index.ts | 2 +- apps/renderer/src/store/inbox/hooks.ts | 2 +- apps/renderer/src/store/inbox/store.ts | 9 +- apps/renderer/src/store/inbox/types.ts | 2 +- apps/renderer/src/store/list/hooks.ts | 4 +- apps/renderer/src/store/list/store.ts | 9 +- apps/renderer/src/store/list/types.ts | 2 +- apps/renderer/src/store/search/index.ts | 4 +- apps/renderer/src/store/search/types.ts | 2 +- apps/renderer/src/store/subscription/hooks.ts | 3 +- apps/renderer/src/store/subscription/store.ts | 22 +- apps/renderer/src/store/unread/index.ts | 9 +- apps/renderer/src/store/user/hooks.ts | 2 +- apps/renderer/src/store/user/store.ts | 9 +- apps/renderer/src/store/utils/clear.ts | 3 +- apps/renderer/src/store/utils/helper.ts | 8 + apps/renderer/src/styles/main.css | 1 - apps/renderer/src/styles/tailwind.css | 70 ----- apps/renderer/src/wdyr.ts | 10 + apps/renderer/tsconfig.json | 3 +- apps/server/client/framer-lazy-feature.ts | 1 - apps/server/client/index.tsx | 2 +- .../client/pages/share/users/[id]/index.tsx | 2 - .../client/providers/root-providers.tsx | 39 +-- apps/server/package.json | 6 +- apps/server/src/router/og/__base.tsx | 11 +- configs/vite.render.config.ts | 5 +- electron.vite.config.ts | 1 + package.json | 4 +- packages/atoms/src/helper/setting.ts | 26 +- packages/components/package.json | 2 + .../components/src/common/MotionProvider.tsx | 18 ++ .../components}/src/framer-lazy-feature.ts | 0 .../src/providers/event-provider.tsx | 2 +- .../src/providers/stable-router-provider.tsx | 14 +- .../src/ui/auto-resize-height/index.tsx | 3 +- packages/components/src/ui/button/index.tsx | 2 +- .../components/src/ui/card/index.tsx | 3 +- .../components/src/ui/checkbox/index.tsx | 7 +- packages/components/src/ui/datetime/index.tsx | 2 +- .../components/src/ui/divider/Divider.tsx | 17 -- .../components/src/ui/form/index.tsx | 6 +- .../components/src/ui/label/index.tsx | 7 +- packages/components/src/ui/masonry/index.tsx | 4 +- .../ui/platform-icon/collections/obsidian.tsx | 0 .../components/src/ui/platform-icon/icons.ts | 1 + .../components/src/ui/radio-group/Radio.tsx | 3 +- .../src/ui/radio-group/RadioCard.tsx | 3 +- packages/components/src/ui/skeleton/index.tsx | 5 + .../components/src/ui/switch/index.tsx | 7 +- .../components/src}/ui/table/index.tsx | 3 +- .../components/src}/ui/table/variants.tsx | 0 .../components/src/ui/tabs/index.tsx | 3 +- packages/constants/package.json | 3 + packages/constants/src/enums.ts | 5 + packages/constants/src/tabs.tsx | 2 + packages/hooks/src/index.ts | 1 + packages/hooks/src/useDark.ts | 7 +- packages/hooks/src/useSyncTheme.ts | 6 +- packages/models/src/index.ts | 10 +- packages/models/src/types.ts | 19 +- packages/utils/package.json | 5 +- .../lib => packages/utils/src}/scroller.ts | 0 packages/utils/src/url-builder.ts | 2 +- packages/utils/src/utils.ts | 16 +- packages/utils/vitest.config.ts | 34 +++ pnpm-lock.yaml | 269 +++++----------- tailwind.config.ts | 1 + 437 files changed, 1656 insertions(+), 6851 deletions(-) delete mode 100644 apps/renderer/src/atoms/hooks/viewport.ts delete mode 100644 apps/renderer/src/atoms/route.ts delete mode 100644 apps/renderer/src/atoms/settings/helper.ts delete mode 100644 apps/renderer/src/atoms/viewport.ts delete mode 100644 apps/renderer/src/components/common/MemoedDangerousHTMLStyle.tsx delete mode 100644 apps/renderer/src/components/header.tsx delete mode 100644 apps/renderer/src/components/icons/Language.tsx delete mode 100644 apps/renderer/src/components/icons/OouiUserAnonymous.tsx delete mode 100644 apps/renderer/src/components/icons/PhCloudCheck.tsx delete mode 100644 apps/renderer/src/components/icons/PhCloudWarning.tsx delete mode 100644 apps/renderer/src/components/icons/PhCloudX.tsx delete mode 100644 apps/renderer/src/components/icons/empty.tsx delete mode 100644 apps/renderer/src/components/icons/follow.tsx delete mode 100644 apps/renderer/src/components/icons/logo.tsx delete mode 100644 apps/renderer/src/components/icons/resize.tsx delete mode 100644 apps/renderer/src/components/icons/user.tsx delete mode 100644 apps/renderer/src/components/icons/users.tsx delete mode 100644 apps/renderer/src/components/site-icon.tsx delete mode 100644 apps/renderer/src/components/ui/Masonry.tsx delete mode 100644 apps/renderer/src/components/ui/avatar.tsx delete mode 100644 apps/renderer/src/components/ui/button/index.tsx delete mode 100644 apps/renderer/src/components/ui/button/variants.tsx delete mode 100644 apps/renderer/src/components/ui/divider/Divider.tsx delete mode 100644 apps/renderer/src/components/ui/divider/PanelSpliter.tsx delete mode 100644 apps/renderer/src/components/ui/divider/index.ts delete mode 100644 apps/renderer/src/components/ui/input/Input.tsx delete mode 100644 apps/renderer/src/components/ui/input/TextArea.tsx delete mode 100644 apps/renderer/src/components/ui/input/index.ts delete mode 100644 apps/renderer/src/components/ui/list-item-hover-overlay.tsx delete mode 100644 apps/renderer/src/components/ui/loading.tsx delete mode 100644 apps/renderer/src/components/ui/marquee/index.tsx delete mode 100644 apps/renderer/src/components/ui/platform-icon/collections/eagle.tsx delete mode 100644 apps/renderer/src/components/ui/platform-icon/collections/instapaper.tsx delete mode 100644 apps/renderer/src/components/ui/platform-icon/collections/omnivore.tsx delete mode 100644 apps/renderer/src/components/ui/platform-icon/collections/readwise.tsx delete mode 100644 apps/renderer/src/components/ui/platform-icon/collections/rss3.tsx delete mode 100644 apps/renderer/src/components/ui/platform-icon/icons.ts delete mode 100644 apps/renderer/src/components/ui/platform-icon/index.tsx delete mode 100644 apps/renderer/src/components/ui/platform-icon/utils.tsx delete mode 100644 apps/renderer/src/components/ui/popover/index.module.css delete mode 100644 apps/renderer/src/components/ui/popover/index.tsx delete mode 100644 apps/renderer/src/components/ui/portal/index.tsx delete mode 100644 apps/renderer/src/components/ui/portal/provider.tsx delete mode 100644 apps/renderer/src/components/ui/radio-group/Radio.tsx delete mode 100644 apps/renderer/src/components/ui/radio-group/RadioCard.tsx delete mode 100644 apps/renderer/src/components/ui/radio-group/RadioGroup.tsx delete mode 100644 apps/renderer/src/components/ui/radio-group/context.ts delete mode 100644 apps/renderer/src/components/ui/radio-group/index.ts delete mode 100644 apps/renderer/src/components/ui/scroll-area/ScrollArea.tsx delete mode 100644 apps/renderer/src/components/ui/scroll-area/ctx.ts delete mode 100644 apps/renderer/src/components/ui/scroll-area/hooks.ts delete mode 100644 apps/renderer/src/components/ui/scroll-area/index.module.css delete mode 100644 apps/renderer/src/components/ui/scroll-area/index.ts delete mode 100644 apps/renderer/src/components/ui/segment/ctx.tsx delete mode 100644 apps/renderer/src/components/ui/segment/index.tsx delete mode 100644 apps/renderer/src/components/ui/select.tsx delete mode 100644 apps/renderer/src/components/ui/skeleton.tsx delete mode 100644 apps/renderer/src/components/ui/sonner.tsx delete mode 100644 apps/renderer/src/components/ui/tooltip/index.tsx delete mode 100644 apps/renderer/src/components/ui/tooltip/styles.ts delete mode 100644 apps/renderer/src/components/ui/typography/EllipsisWithTooltip.tsx delete mode 100644 apps/renderer/src/components/ui/typography/index.ts delete mode 100644 apps/renderer/src/constants/tabs.tsx delete mode 100644 apps/renderer/src/hooks/common/factory/createHTMLMediaHook.ts delete mode 100644 apps/renderer/src/hooks/common/internal/for-theme.ts delete mode 100644 apps/renderer/src/hooks/common/useAnyPointDown.ts delete mode 100644 apps/renderer/src/hooks/common/useDark.ts delete mode 100644 apps/renderer/src/hooks/common/useInputComposition.ts delete mode 100644 apps/renderer/src/hooks/common/useInterval.ts delete mode 100644 apps/renderer/src/hooks/common/useIsOnline.ts delete mode 100644 apps/renderer/src/hooks/common/useMeasure.ts delete mode 100644 apps/renderer/src/hooks/common/usePageVisibility.ts delete mode 100644 apps/renderer/src/hooks/common/usePrevious.ts delete mode 100644 apps/renderer/src/hooks/common/useRefValue.ts delete mode 100644 apps/renderer/src/hooks/common/useSetState.ts delete mode 100644 apps/renderer/src/hooks/common/useTitle.ts delete mode 100644 apps/renderer/src/hooks/common/useTypescriptHappyCallback.ts delete mode 100644 apps/renderer/src/hooks/common/useVideo.ts delete mode 100644 apps/renderer/src/lib/chain.ts delete mode 100644 apps/renderer/src/lib/color.ts delete mode 100644 apps/renderer/src/lib/dom.ts delete mode 100644 apps/renderer/src/lib/enum.ts delete mode 100644 apps/renderer/src/lib/environment.ts delete mode 100644 apps/renderer/src/lib/event-bus.ts delete mode 100644 apps/renderer/src/lib/link-parser.ts delete mode 100644 apps/renderer/src/lib/ns.ts delete mode 100644 apps/renderer/src/lib/route-builder.test.ts delete mode 100644 apps/renderer/src/lib/route-builder.ts delete mode 100644 apps/renderer/src/lib/url-builder.ts delete mode 100644 apps/renderer/src/lib/utils.spec.ts delete mode 100644 apps/renderer/src/lib/yielder.ts delete mode 100644 apps/renderer/src/models/index.ts delete mode 100644 apps/renderer/src/models/types.ts delete mode 100644 apps/renderer/src/modules/ab/atoms.ts delete mode 100644 apps/renderer/src/modules/ab/fallback.ts delete mode 100644 apps/renderer/src/modules/ab/hoc.tsx delete mode 100644 apps/renderer/src/modules/ab/providers.tsx rename apps/renderer/src/{components => modules/feed}/feed-certification.tsx (88%) rename apps/renderer/src/{components => modules/feed}/feed-icon.tsx (96%) rename apps/renderer/src/{components => modules/feed}/feed-summary.tsx (86%) rename apps/renderer/src/{components => modules/feed}/view-select-content.tsx (74%) create mode 100644 apps/renderer/src/modules/settings/helper/builder.ts rename apps/renderer/src/modules/settings/{ => helper}/setting-builder.tsx (97%) delete mode 100644 apps/renderer/src/providers/event-provider.tsx delete mode 100644 apps/renderer/src/providers/stable-router-provider.tsx delete mode 100644 apps/renderer/src/styles/tailwind.css create mode 100644 apps/renderer/src/wdyr.ts delete mode 100644 apps/server/client/framer-lazy-feature.ts create mode 100644 packages/components/src/common/MotionProvider.tsx rename {apps/renderer => packages/components}/src/framer-lazy-feature.ts (100%) rename apps/renderer/src/components/ui/auto-resize-height.tsx => packages/components/src/ui/auto-resize-height/index.tsx (97%) rename apps/renderer/src/components/ui/card.tsx => packages/components/src/ui/card/index.tsx (97%) rename apps/renderer/src/components/ui/checkbox.tsx => packages/components/src/ui/checkbox/index.tsx (85%) rename apps/renderer/src/components/ui/form.tsx => packages/components/src/ui/form/index.tsx (95%) rename apps/renderer/src/components/ui/label.tsx => packages/components/src/ui/label/index.tsx (88%) rename {apps/renderer/src/components => packages/components/src}/ui/platform-icon/collections/obsidian.tsx (100%) create mode 100644 packages/components/src/ui/skeleton/index.tsx rename apps/renderer/src/components/ui/switch.tsx => packages/components/src/ui/switch/index.tsx (94%) rename {apps/renderer/src/components => packages/components/src}/ui/table/index.tsx (98%) rename {apps/renderer/src/components => packages/components/src}/ui/table/variants.tsx (100%) rename apps/renderer/src/components/ui/tabs.tsx => packages/components/src/ui/tabs/index.tsx (99%) rename {apps/renderer/src/lib => packages/utils/src}/scroller.ts (100%) create mode 100644 packages/utils/vitest.config.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index e7f25f883..67e7943f2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -54,13 +54,25 @@ "rule": "unused-imports/no-unused-imports", "severity": "off" }, - { "rule": "@typescript-eslint/require-await", "severity": "info" }, - { "rule": "@typescript-eslint/await-thenable", "severity": "info" }, - { "rule": "@typescript-eslint/no-floating-promises", "severity": "info" }, - { "rule": "@typescript-eslint/no-misused-promises", "severity": "info" } + { + "rule": "@typescript-eslint/require-await", + "severity": "info" + }, + { + "rule": "@typescript-eslint/await-thenable", + "severity": "info" + }, + { + "rule": "@typescript-eslint/no-floating-promises", + "severity": "info" + }, + { + "rule": "@typescript-eslint/no-misused-promises", + "severity": "info" + } ], "cSpell.words": ["Hydable", "rsshub", "Русский"], - "editor.foldingImportsByDefault": true, + // "editor.foldingImportsByDefault": true, "commentTranslate.hover.enabled": false, "typescript.tsdk": "node_modules/typescript/lib", "i18n-ally.enabledFrameworks": ["i18next"], diff --git a/apps/main/package.json b/apps/main/package.json index 22f308a94..c14d007c7 100644 --- a/apps/main/package.json +++ b/apps/main/package.json @@ -30,8 +30,6 @@ "@mozilla/readability": "^0.5.0", "@sentry/electron": "5.6.0", "builder-util-runtime": "9.2.10", - "dayjs": "1.11.13", - "dotenv": "16.4.5", "electron-context-menu": "4.0.4", "electron-log": "5.2.0", "electron-squirrel-startup": "1.0.1", @@ -39,10 +37,8 @@ "font-list": "1.5.1", "i18next": "^23.16.0", "linkedom": "^0.18.5", - "lodash-es": "4.17.21", "lowdb": "7.0.1", "msedge-tts": "1.3.4", - "nanoid": "5.0.7", "ofetch": "1.4.1", "semver": "7.6.3", "vscode-languagedetection": "npm:@vscode/vscode-languagedetection@^1.0.22" diff --git a/apps/renderer/package.json b/apps/renderer/package.json index 836aa56cd..6edd7ceb9 100644 --- a/apps/renderer/package.json +++ b/apps/renderer/package.json @@ -4,6 +4,7 @@ "private": true, "main": "./dist/main/index.js", "scripts": { + "dev": "cd ../.. && pnpm dev:web", "test": "vitest", "typecheck": "tsc --noEmit" }, @@ -16,39 +17,28 @@ "@headlessui/react": "2.1.10", "@hono/auth-js": "1.0.11", "@hookform/resolvers": "3.9.0", - "@iconify/tools": "4.0.7", "@lottiefiles/dotlottie-react": "0.9.1", "@microflash/remark-callout-directives": "4.3.1", - "@mozilla/readability": "^0.5.0", "@openpanel/web": "1.0.1", "@radix-ui/react-avatar": "1.1.1", - "@radix-ui/react-checkbox": "1.1.2", "@radix-ui/react-context-menu": "2.2.2", "@radix-ui/react-dialog": "1.1.2", "@radix-ui/react-dropdown-menu": "2.1.2", "@radix-ui/react-hover-card": "1.1.2", "@radix-ui/react-label": "2.1.0", "@radix-ui/react-popover": "1.1.2", - "@radix-ui/react-radio-group": "1.2.1", - "@radix-ui/react-scroll-area": "1.2.0", - "@radix-ui/react-select": "2.1.2", "@radix-ui/react-slider": "^1.2.1", "@radix-ui/react-slot": "1.1.0", - "@radix-ui/react-switch": "1.1.1", - "@radix-ui/react-tabs": "1.1.1", - "@radix-ui/react-toast": "1.2.2", - "@radix-ui/react-tooltip": "1.1.3", "@sentry/react": "8.34.0", "@shikijs/transformers": "1.22.0", - "@t3-oss/env-core": "^0.11.1", "@tanstack/query-sync-storage-persister": "5.59.13", "@tanstack/react-query": "5.59.14", "@tanstack/react-query-devtools": "5.59.14", "@tanstack/react-query-persist-client": "5.59.14", "@use-gesture/react": "10.3.1", + "@welldone-software/why-did-you-render": "8.0.3", "@yornaath/batshit": "0.10.1", "camelcase-keys": "9.1.3", - "class-variance-authority": "0.7.0", "click-to-react-component": "1.1.0", "clsx": "2.1.1", "cmdk": "1.0.0", @@ -79,7 +69,7 @@ "path-to-regexp": "8.2.0", "re-resizable": "6.10.0", "react-blurhash": "^0.3.0", - "react-error-boundary": "4.0.13", + "react-error-boundary": "4.1.2", "react-fast-marquee": "1.6.5", "react-hook-form": "7.53.0", "react-hotkeys-hook": "4.5.1", @@ -87,7 +77,6 @@ "react-intersection-observer": "9.13.1", "react-resizable-layout": "npm:@innei/react-resizable-layout@0.7.3-fork.1", "react-router-dom": "6.27.0", - "react-selecto": "1.26.3", "react-shadow": "20.5.0", "react-virtuoso": "4.12.0", "rehype-infer-description-meta": "2.0.0", @@ -102,8 +91,6 @@ "shiki": "1.22.0", "sonner": "^1.5.0", "swiper": "11.1.14", - "tailwind-merge": "2.5.4", - "tailwindcss-motion": "0.3.0-beta", "tldts": "6.1.51", "unified": "11.0.5", "use-context-selector": "2.0.0", @@ -115,7 +102,14 @@ }, "devDependencies": { "@babel/generator": "7.25.7", + "@follow/atoms": "workspace:*", + "@follow/components": "workspace:*", + "@follow/constants": "workspace:*", + "@follow/hooks": "workspace:*", + "@follow/models": "workspace:*", + "@follow/shared": "workspace:*", "@follow/types": "workspace:*", + "@follow/utils": "workspace:*", "@hono/node-server": "1.13.2", "@types/katex": "0.16.7", "@types/lodash-es": "4.17.12", diff --git a/apps/renderer/src/App.tsx b/apps/renderer/src/App.tsx index a7ae6fa9f..d4f92844a 100644 --- a/apps/renderer/src/App.tsx +++ b/apps/renderer/src/App.tsx @@ -1,4 +1,5 @@ import { IN_ELECTRON } from "@follow/shared/constants" +import { cn, getOS } from "@follow/utils/utils" import { useEffect, useLayoutEffect } from "react" import { Outlet } from "react-router-dom" @@ -9,7 +10,6 @@ import { useUISettingKey } from "./atoms/settings/ui" import { navigateEntry } from "./hooks/biz/useNavigateEntry" import { applyAfterReadyCallbacks } from "./initialize/queue" import { appLog } from "./lib/log" -import { cn, getOS } from "./lib/utils" import { Titlebar } from "./modules/app/Titlebar" import { RootProviders } from "./providers/root-providers" import { handlers } from "./tipc" diff --git a/apps/renderer/src/api/trending.ts b/apps/renderer/src/api/trending.ts index 18c9d5777..92a81212b 100644 --- a/apps/renderer/src/api/trending.ts +++ b/apps/renderer/src/api/trending.ts @@ -1,7 +1,7 @@ +import type { Models } from "@follow/models" import camelcaseKeys from "camelcase-keys" import { apiFetch } from "~/lib/api-fetch" -import type { Models } from "~/models" const v1ApiPrefix = "/v1" export const getTrendingAggregates = async () => { diff --git a/apps/renderer/src/atoms/corner-player.ts b/apps/renderer/src/atoms/corner-player.ts index 72075bd5e..0609b2b43 100644 --- a/apps/renderer/src/atoms/corner-player.ts +++ b/apps/renderer/src/atoms/corner-player.ts @@ -1,7 +1,7 @@ +import { getStorageNS } from "@follow/utils/ns" import { atomWithStorage } from "jotai/utils" import { createAtomHooks } from "~/lib/jotai" -import { getStorageNS } from "~/lib/ns" type CornerPlayerAtomValue = { show: boolean diff --git a/apps/renderer/src/atoms/hooks/viewport.ts b/apps/renderer/src/atoms/hooks/viewport.ts deleted file mode 100644 index 8e9c1b4e7..000000000 --- a/apps/renderer/src/atoms/hooks/viewport.ts +++ /dev/null @@ -1,27 +0,0 @@ -import type { ExtractAtomValue } from "jotai" -import { useAtomValue } from "jotai" -import { selectAtom } from "jotai/utils" -import { useCallback } from "react" - -import { jotaiStore } from "~/lib/jotai" - -import { viewportAtom } from "../viewport" - -export const useViewport = (selector: (value: ExtractAtomValue) => T): T => - useAtomValue( - selectAtom( - viewportAtom, - useCallback((atomValue) => selector(atomValue), []), - ), - ) - -export const useIsMobile = () => - useViewport(useCallback((v: ExtractAtomValue) => isMobile(v), [])) - -const isMobile = (v: ExtractAtomValue) => (v.sm || v.md || !v.sm) && !v.lg -export const currentIsMobile = () => { - const v = jotaiStore.get(viewportAtom) - return isMobile(v) -} - -export const getViewport = () => jotaiStore.get(viewportAtom) diff --git a/apps/renderer/src/atoms/player.ts b/apps/renderer/src/atoms/player.ts index f09f4f4bc..fd6bf6f7e 100644 --- a/apps/renderer/src/atoms/player.ts +++ b/apps/renderer/src/atoms/player.ts @@ -1,10 +1,10 @@ +import { getStorageNS } from "@follow/utils/ns" import { noop } from "foxact/noop" import { atomWithStorage, createJSONStorage } from "jotai/utils" import type { SyncStorage } from "jotai/vanilla/utils/atomWithStorage" import { getRouteParams } from "~/hooks/biz/useRouteParams" import { createAtomHooks } from "~/lib/jotai" -import { getStorageNS } from "~/lib/ns" type PlayerAtomValue = { show: boolean diff --git a/apps/renderer/src/atoms/route.ts b/apps/renderer/src/atoms/route.ts deleted file mode 100644 index 71fb1a252..000000000 --- a/apps/renderer/src/atoms/route.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { atom, useAtomValue } from "jotai" -import { selectAtom } from "jotai/utils" -import { useMemo } from "react" -import type { Location, NavigateFunction, Params } from "react-router-dom" - -import { createAtomHooks } from "~/lib/jotai" - -interface RouteAtom { - params: Readonly> - searchParams: URLSearchParams - location: Location -} - -export const [routeAtom, , , , getReadonlyRoute, setRoute] = createAtomHooks( - atom({ - params: {}, - searchParams: new URLSearchParams(), - - location: { - pathname: "", - search: "", - hash: "", - state: null, - key: "", - }, - }), -) - -const noop = [] -export const useReadonlyRouteSelector = ( - selector: (route: RouteAtom) => T, - deps: any[] = noop, -): T => useAtomValue(useMemo(() => selectAtom(routeAtom, (route) => selector(route)), deps)) - -// Vite HMR will create new router instance, but RouterProvider always stable - -const [, , , , navigate, setNavigate] = createAtomHooks( - atom<{ fn: NavigateFunction | null }>({ fn() {} }), -) -const getStableRouterNavigate = () => navigate().fn -export { getStableRouterNavigate, setNavigate } diff --git a/apps/renderer/src/atoms/server-configs.ts b/apps/renderer/src/atoms/server-configs.ts index d48daba17..02eac3b64 100644 --- a/apps/renderer/src/atoms/server-configs.ts +++ b/apps/renderer/src/atoms/server-configs.ts @@ -1,7 +1,7 @@ +import type { ServerConfigs } from "@follow/models/types" import { atom } from "jotai" import { createAtomHooks } from "~/lib/jotai" -import type { ServerConfigs } from "~/models" export const [, , useServerConfigs, , getServerConfigs, setServerConfigs] = createAtomHooks( atom>(null), diff --git a/apps/renderer/src/atoms/settings/general.ts b/apps/renderer/src/atoms/settings/general.ts index a9b6ba98b..8fff08649 100644 --- a/apps/renderer/src/atoms/settings/general.ts +++ b/apps/renderer/src/atoms/settings/general.ts @@ -1,9 +1,8 @@ +import { createSettingAtom } from "@follow/atoms/helper/setting.js" import type { GeneralSettings } from "@follow/shared/interface/settings" import { jotaiStore } from "~/lib/jotai" -import { createSettingAtom } from "./helper" - const createDefaultSettings = (): GeneralSettings => ({ // App appLaunchOnStartup: false, diff --git a/apps/renderer/src/atoms/settings/helper.ts b/apps/renderer/src/atoms/settings/helper.ts deleted file mode 100644 index b66ac0874..000000000 --- a/apps/renderer/src/atoms/settings/helper.ts +++ /dev/null @@ -1,155 +0,0 @@ -import { useAtomValue } from "jotai" -import { atomWithStorage, selectAtom } from "jotai/utils" -import { useMemo } from "react" - -import { useRefValue } from "~/hooks/common" -import { EventBus } from "~/lib/event-bus" -import { createAtomHooks } from "~/lib/jotai" -import { getStorageNS } from "~/lib/ns" -import type { SettingItem } from "~/modules/settings/setting-builder" -import { createSettingBuilder } from "~/modules/settings/setting-builder" - -declare module "~/lib/event-bus" { - interface CustomEvent { - SETTING_CHANGE_EVENT: { - updated: number - payload: Record - key: string - } - } -} - -export const createSettingAtom = ( - settingKey: string, - createDefaultSettings: () => T, -) => { - const atom = atomWithStorage(getStorageNS(settingKey), createDefaultSettings(), undefined, { - getOnInit: true, - }) - - const [, , useSettingValue, , getSettings, setSettings] = createAtomHooks(atom) - - const initializeDefaultSettings = () => { - const currentSettings = getSettings() - const defaultSettings = createDefaultSettings() - if (typeof currentSettings !== "object") setSettings(defaultSettings) - const newSettings = { ...defaultSettings, ...currentSettings } - setSettings(newSettings) - } - - const selectAtomCacheMap = {} as Record, any> - - const useSettingKey = >(key: T) => { - let selectedAtom = selectAtomCacheMap[key] - if (!selectedAtom) { - selectedAtom = selectAtom(atom, (s) => s[key]) - selectAtomCacheMap[key] = selectedAtom - } - - return useAtomValue(selectedAtom) as ReturnType[T] - } - - const useSettingSelector = < - T extends keyof ReturnType, - S extends ReturnType, - R = S[T], - >( - selector: (s: S) => R, - ): R => { - const stableSelector = useRefValue(selector) - - return useAtomValue( - // @ts-expect-error - useMemo(() => selectAtom(atom, stableSelector.current), [stableSelector]), - ) - } - - const setSetting = >( - key: K, - value: ReturnType[K], - ) => { - const updated = Date.now() - setSettings({ - ...getSettings(), - [key]: value, - - updated, - }) - - EventBus.dispatch("SETTING_CHANGE_EVENT", { - payload: { [key]: value }, - updated, - key: settingKey, - }) - } - - const clearSettings = () => { - setSettings(createDefaultSettings()) - } - - Object.defineProperty(useSettingValue, "select", { - value: useSettingSelector, - }) - - return { - useSettingKey, - useSettingSelector, - setSetting, - clearSettings, - initializeDefaultSettings, - - useSettingValue, - getSettings, - - settingAtom: atom, - } as { - useSettingKey: typeof useSettingKey - useSettingSelector: typeof useSettingSelector - setSetting: typeof setSetting - clearSettings: typeof clearSettings - initializeDefaultSettings: typeof initializeDefaultSettings - useSettingValue: typeof useSettingValue & { - select: T>>(key: T) => Awaited - } - getSettings: typeof getSettings - settingAtom: typeof atom - } -} - -export const createDefineSettingItem = - (_getSetting: () => T, setSetting: (key: any, value: Partial) => void) => - ( - key: K, - options: { - label: string - description?: string | JSX.Element - onChange?: (value: T[K]) => void - hide?: boolean - } & Omit, "onChange" | "description" | "label" | "hide" | "key">, - ): any => { - const { label, description, onChange, hide, ...rest } = options - - return { - key, - label, - description, - onChange: (value: any) => { - if (onChange) return onChange(value as any) - setSetting(key, value as any) - }, - disabled: hide, - ...rest, - } as SettingItem - } - -export const createSetting = ( - useSetting: () => T, - setSetting: (key: any, value: Partial) => void, -) => { - const SettingBuilder = createSettingBuilder(useSetting) - const defineSettingItem = createDefineSettingItem(useSetting, setSetting) - return { - SettingBuilder, - defineSettingItem, - } -} diff --git a/apps/renderer/src/atoms/settings/integration.ts b/apps/renderer/src/atoms/settings/integration.ts index f54a02ace..18ef943e3 100644 --- a/apps/renderer/src/atoms/settings/integration.ts +++ b/apps/renderer/src/atoms/settings/integration.ts @@ -1,7 +1,6 @@ +import { createSettingAtom } from "@follow/atoms/helper/setting.js" import type { IntegrationSettings } from "@follow/shared/interface/settings" -import { createSettingAtom } from "./helper" - export const createDefaultSettings = (): IntegrationSettings => ({ // eagle enableEagle: true, diff --git a/apps/renderer/src/atoms/settings/ui.ts b/apps/renderer/src/atoms/settings/ui.ts index 465aa4869..cce52ab74 100644 --- a/apps/renderer/src/atoms/settings/ui.ts +++ b/apps/renderer/src/atoms/settings/ui.ts @@ -1,7 +1,6 @@ +import { createSettingAtom } from "@follow/atoms/helper/setting.js" import type { UISettings } from "@follow/shared/interface/settings" -import { createSettingAtom } from "./helper" - export const createDefaultSettings = (): UISettings => ({ // Sidebar entryColWidth: 356, diff --git a/apps/renderer/src/atoms/sidebar.ts b/apps/renderer/src/atoms/sidebar.ts index 1300157a2..b946206e0 100644 --- a/apps/renderer/src/atoms/sidebar.ts +++ b/apps/renderer/src/atoms/sidebar.ts @@ -1,7 +1,7 @@ +import { FeedViewType } from "@follow/constants" import { atom } from "jotai" import { getRouteParams } from "~/hooks/biz/useRouteParams" -import { FeedViewType } from "~/lib/enum" import { createAtomHooks } from "~/lib/jotai" const defaultFeedView = FeedViewType.Articles diff --git a/apps/renderer/src/atoms/updater.ts b/apps/renderer/src/atoms/updater.ts index 297e688d7..548d3cfa1 100644 --- a/apps/renderer/src/atoms/updater.ts +++ b/apps/renderer/src/atoms/updater.ts @@ -1,7 +1,7 @@ +import { getStorageNS } from "@follow/utils/ns" import { atomWithStorage } from "jotai/utils" import { createAtomHooks } from "~/lib/jotai" -import { getStorageNS } from "~/lib/ns" export const [, , useUpdaterStatus, , , setUpdaterStatus] = createAtomHooks( atomWithStorage(getStorageNS("updater"), false, undefined, { diff --git a/apps/renderer/src/atoms/user.ts b/apps/renderer/src/atoms/user.ts index 36482817e..41af27f60 100644 --- a/apps/renderer/src/atoms/user.ts +++ b/apps/renderer/src/atoms/user.ts @@ -1,7 +1,7 @@ import type { User } from "@auth/core/types" +import type { UserRole } from "@follow/constants" import { atom } from "jotai" -import type { UserRole } from "~/lib/enum" import { createAtomHooks } from "~/lib/jotai" export const [, , useWhoami, , whoami, setWhoami] = createAtomHooks(atom>(null)) diff --git a/apps/renderer/src/atoms/viewport.ts b/apps/renderer/src/atoms/viewport.ts deleted file mode 100644 index 02b82f760..000000000 --- a/apps/renderer/src/atoms/viewport.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { atom } from "jotai" - -export const viewportAtom = atom({ - /** - * 640px - */ - sm: false, - - /** - * 768px - */ - md: false, - - /** - * 1024px - */ - lg: false, - - /** - * 1280px - */ - xl: false, - - /** - * 1536px - */ - "2xl": false, - - h: 0, - w: 0, -}) diff --git a/apps/renderer/src/components/common/ErrorElement.tsx b/apps/renderer/src/components/common/ErrorElement.tsx index 23f0392ad..2c8ae4f1e 100644 --- a/apps/renderer/src/components/common/ErrorElement.tsx +++ b/apps/renderer/src/components/common/ErrorElement.tsx @@ -1,3 +1,4 @@ +import { Button } from "@follow/components/ui/button/index.js" import { captureException } from "@sentry/react" import { useEffect, useRef } from "react" import { isRouteErrorResponse, useNavigate, useRouteError } from "react-router-dom" @@ -7,7 +8,6 @@ import { attachOpenInEditor } from "~/lib/dev" import { getNewIssueUrl } from "~/lib/issues" import { clearLocalPersistStoreData } from "~/store/utils/clear" -import { Button } from "../ui/button" import { PoweredByFooter } from "./PoweredByFooter" export function ErrorElement() { diff --git a/apps/renderer/src/components/common/LoadMoreIndicator.tsx b/apps/renderer/src/components/common/LoadMoreIndicator.tsx index 18102bfb6..e645155f2 100644 --- a/apps/renderer/src/components/common/LoadMoreIndicator.tsx +++ b/apps/renderer/src/components/common/LoadMoreIndicator.tsx @@ -1,7 +1,6 @@ +import { LoadingCircle } from "@follow/components/ui/loading/index.jsx" import { useInView } from "react-intersection-observer" -import { LoadingCircle } from "../ui/loading" - export const LoadMoreIndicator: Component<{ onLoading: () => void }> = ({ onLoading, children, className }) => { diff --git a/apps/renderer/src/components/common/LoadRemixAsyncComponent.tsx b/apps/renderer/src/components/common/LoadRemixAsyncComponent.tsx index e91defd7a..40208aae7 100644 --- a/apps/renderer/src/components/common/LoadRemixAsyncComponent.tsx +++ b/apps/renderer/src/components/common/LoadRemixAsyncComponent.tsx @@ -1,8 +1,7 @@ +import { LoadingCircle } from "@follow/components/ui/loading/index.jsx" import type { FC, ReactNode } from "react" import { createElement, useEffect, useState } from "react" -import { LoadingCircle } from "../ui/loading" - export const LoadRemixAsyncComponent: FC<{ loader: () => Promise Header: FC<{ loader: () => any; [key: string]: any }> diff --git a/apps/renderer/src/components/common/MemoedDangerousHTMLStyle.tsx b/apps/renderer/src/components/common/MemoedDangerousHTMLStyle.tsx deleted file mode 100644 index cad4cf7d5..000000000 --- a/apps/renderer/src/components/common/MemoedDangerousHTMLStyle.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import type { FC } from "react" -import { memo, useMemo } from "react" - -export const MemoedDangerousHTMLStyle: FC< - { - children: string - } & React.DetailedHTMLProps, HTMLStyleElement> & - Record -> = memo(({ children, ...rest }) => ( -