diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 499a160c8..c6fbf66f6 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -9,15 +9,6 @@ updates: timezone: Asia/Singapore target-branch: dev ignore: - # Stuck by react 19 - - dependency-name: react - versions: [">=19.0.0"] - - dependency-name: react-dom - versions: [">=19.0.0"] - - dependency-name: "@types/react" - versions: [">=19.0.0"] - - dependency-name: "@types/react-dom" - versions: [">=19.0.0"] - dependency-name: "@shopify/flash-list" versions: [">1.7.3"] diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 1f00fa78e..4695f9bda 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -222,7 +222,7 @@ jobs: apps/desktop/out/make/**/latest.yml retention-days: 90 - - uses: signpath/github-action-submit-signing-request@v1.1 + - uses: signpath/github-action-submit-signing-request@v1.2 continue-on-error: true if: runner.os == 'windows' && env.RELEASE == 'true' with: diff --git a/.github/workflows/build-ios-development.yml b/.github/workflows/build-ios-development.yml index a44b96a68..5bfeda90e 100644 --- a/.github/workflows/build-ios-development.yml +++ b/.github/workflows/build-ios-development.yml @@ -29,7 +29,7 @@ jobs: if [ -n "$available" ]; then echo "runner-label=self-hosted" >> $GITHUB_OUTPUT else - echo "runner-label=macos-latest" >> $GITHUB_OUTPUT + echo "runner-label=macos-15" >> $GITHUB_OUTPUT fi build-ipa-device-self-hosted: @@ -71,11 +71,14 @@ jobs: build-ipa-device-github: name: Build iOS IPA for device (GitHub-hosted) - if: github.secret_source != 'None' && needs.check-runner.outputs.runner-label == 'macos-latest' + if: github.secret_source != 'None' && needs.check-runner.outputs.runner-label == 'macos-15' needs: check-runner - runs-on: macos-latest + runs-on: macos-15 steps: + - name: Use Xcode 16.3 + run: sudo xcode-select -s /Applications/Xcode_16.3.app + - name: 📦 Checkout code uses: actions/checkout@v4 @@ -114,9 +117,12 @@ jobs: build-simulator: name: Build iOS IPA for simulator if: github.secret_source != 'None' - runs-on: macos-latest + runs-on: macos-15 steps: + - name: Use Xcode 16.3 + run: sudo xcode-select -s /Applications/Xcode_16.3.app + - name: 📦 Checkout code uses: actions/checkout@v4 diff --git a/.gitignore b/.gitignore index f0f6d63e1..e61a18a3b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,4 @@ vite.config.*.mjs apps/desktop/src/renderer/dev-dist tsconfig.tsbuildinfo - -apps/mobile/ios -apps/mobile/android +buildServer.json \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index 7e77bea2a..1cbfba7df 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,4 @@ -packages/shared/src/hono.ts +packages/internal/shared/src/hono.ts pnpm-lock.yaml CHANGELOG.md diff --git a/bump.hotfix.config.js b/apps/desktop/bump.hotfix.config.js similarity index 96% rename from bump.hotfix.config.js rename to apps/desktop/bump.hotfix.config.js index e1792dea6..5a7107f87 100644 --- a/bump.hotfix.config.js +++ b/apps/desktop/bump.hotfix.config.js @@ -12,6 +12,6 @@ export default defineConfig({ ], commit_message: "release(desktop): hotfix to release v${NEW_VERSION}", tag: false, - changelog: true, + changelog: false, allowedBranches: ["hotfix/*"], }) diff --git a/apps/desktop/changelog/0.4.5.md b/apps/desktop/changelog/0.4.5.md new file mode 100644 index 000000000..476b5f305 --- /dev/null +++ b/apps/desktop/changelog/0.4.5.md @@ -0,0 +1,31 @@ +# What's new in v0.4.5 + +## Shiny new things + +- Translation view toggle – choose between “translation-only” or bilingual display (#3568) +- Mark Above/Below as Read option in the context menu (#3570) +- Automation actions: auto start entries that match your rules (#3625) +- Trending Feeds now spotlighted on the Discover page (eb6a409) +- Timeline previews for feeds you haven’t subscribed to yet (eb26cde) +- Invite-code gates removed – no invite code needed anymore (cee647c) + +## Improvements + +- Seamless fallback to client-side readability if the server parser fails (e6aa58e) +- Onboarding completely redesigned and streamlined (0357b7d) +- Removed long-unmaintained language packs (f48697c) +- Faster search performance +- AI summaries now render Markdown (#3641) +- Upgraded to React 19 and React Native 0.79 (#3661) +- Cleaner category layout in the Discover page +- Smoother sign-up / sign-in flow (e7f88b7) +- Dozens of visual polish tweaks across the app + +## No longer broken + +- Fixed occasional misplacement of the scroll indicator (87c9a48) +- Font settings now apply correctly (5aed9a7) +- Different views no longer clash with one another’s scroll positions (#3627) +- Picture and video view sizes no longer interfere with each other (#3645) +- Correct sorting icon in the feed list (#3675) +- Custom fonts containing spaces now render properly (#3674) diff --git a/apps/desktop/configs/vite.electron-render.config.ts b/apps/desktop/configs/vite.electron-render.config.ts index 0636d9dca..af67f5648 100644 --- a/apps/desktop/configs/vite.electron-render.config.ts +++ b/apps/desktop/configs/vite.electron-render.config.ts @@ -13,14 +13,14 @@ export default { plugins: [...viteRenderBaseConfig.plugins, createPlatformSpecificImportPlugin("electron")], - root: resolve(root, "src/renderer"), + root: resolve(root, "layer/renderer"), build: { outDir: resolve(root, "dist/renderer"), sourcemap: !!process.env.CI, target: "esnext", rollupOptions: { input: { - main: resolve(root, "src/renderer/index.html"), + main: resolve(root, "layer/renderer/index.html"), }, }, minify: true, diff --git a/apps/desktop/configs/vite.render.config.ts b/apps/desktop/configs/vite.render.config.ts index 8f55fa90d..b58841e1a 100644 --- a/apps/desktop/configs/vite.render.config.ts +++ b/apps/desktop/configs/vite.render.config.ts @@ -4,6 +4,7 @@ import { fileURLToPath } from "node:url" import { sentryVitePlugin } from "@sentry/vite-plugin" import react from "@vitejs/plugin-react" +import { codeInspectorPlugin } from "code-inspector-plugin" import { prerelease } from "semver" import type { UserConfig } from "vite" @@ -29,14 +30,15 @@ const getChangelogFileContent = () => { return "" } } + const changelogFile = getChangelogFileContent() export const viteRenderBaseConfig = { resolve: { alias: { - "~": resolve("src/renderer/src"), + "~": resolve("layer/renderer/src"), "@pkg": resolve("package.json"), "@locales": resolve("../../locales"), - "@follow/electron-main": resolve("src/main/src"), + "@follow/electron-main": resolve("layer/main/src"), }, }, base: "/", @@ -47,6 +49,11 @@ export const viteRenderBaseConfig = { }), circularImportRefreshPlugin(), + codeInspectorPlugin({ + bundler: "vite", + editor: "cursor", + hotKeys: ["metaKey"], + }), sentryVitePlugin({ org: "follow-rg", project: "follow", diff --git a/apps/desktop/electron.vite.config.ts b/apps/desktop/electron.vite.config.ts index e01cda7c8..54e0f7cee 100644 --- a/apps/desktop/electron.vite.config.ts +++ b/apps/desktop/electron.vite.config.ts @@ -12,7 +12,7 @@ export default defineConfig({ build: { outDir: "dist/main", lib: { - entry: "./src/main/src/index.ts", + entry: "./layer/main/src/index.ts", }, }, resolve: { @@ -20,7 +20,7 @@ export default defineConfig({ "@shared": resolve("packages/shared/src"), "@pkg": resolve("./package.json"), "@locales": resolve("../../locales"), - "~": resolve("./src/main/src"), + "~": resolve("./layer/main/src"), }, }, define: { @@ -32,7 +32,7 @@ export default defineConfig({ build: { outDir: "dist/preload", lib: { - entry: "./src/main/preload/index.ts", + entry: "./layer/main/preload/index.ts", }, }, resolve: { @@ -45,14 +45,14 @@ export default defineConfig({ renderer: { ...viteRenderBaseConfig, - root: "src/renderer", + root: "layer/renderer", build: { outDir: "dist/renderer", sourcemap: !!process.env.CI, target: "esnext", rollupOptions: { input: { - main: resolve("./src/renderer/index.html"), + main: resolve("./layer/renderer/index.html"), }, }, minify: true, diff --git a/apps/desktop/src/main/export.ts b/apps/desktop/layer/main/export.ts similarity index 100% rename from apps/desktop/src/main/export.ts rename to apps/desktop/layer/main/export.ts diff --git a/apps/desktop/src/main/global.d.ts b/apps/desktop/layer/main/global.d.ts similarity index 100% rename from apps/desktop/src/main/global.d.ts rename to apps/desktop/layer/main/global.d.ts diff --git a/apps/desktop/src/main/package.json b/apps/desktop/layer/main/package.json similarity index 88% rename from apps/desktop/src/main/package.json rename to apps/desktop/layer/main/package.json index 3e9f6c3a1..ec9731f60 100644 --- a/apps/desktop/src/main/package.json +++ b/apps/desktop/layer/main/package.json @@ -15,7 +15,6 @@ "import": "./export.js" } }, - "main": "./src/index.ts", "scripts": { "build": "tsc", "test": "vitest", @@ -26,6 +25,7 @@ "@electron-toolkit/preload": "3.0.2", "@electron-toolkit/utils": "4.0.0", "@eneris/push-receiver": "4.3.0", + "@follow-app/readability": "workspace:*", "@follow/shared": "workspace:*", "@follow/utils": "workspace:*", "@openpanel/web": "1.0.1", @@ -37,12 +37,12 @@ "electron-squirrel-startup": "1.0.1", "electron-store": "10.0.1", "electron-updater": "6.6.2", - "es-toolkit": "1.35.0", + "es-toolkit": "1.36.0", "fast-folder-size": "2.4.0", "font-list": "1.5.1", - "i18next": "25.0.0", + "i18next": "25.0.1", "js-yaml": "4.1.0", - "linkedom": "0.18.9", + "linkedom": "0.18.10", "lowdb": "7.0.1", "msedge-tts": "2.0.0", "node-machine-id": "1.1.12", @@ -55,9 +55,10 @@ "@follow/models": "workspace:*", "@follow/types": "workspace:*", "@types/js-yaml": "4.0.9", - "@types/node": "22.14.1", + "@types/node": "22.15.3", "electron": "35.1.5", "electron-devtools-installer": "4.0.0", - "hono": "4.7.7" + "hono": "4.7.7", + "typescript": "catalog:" } } diff --git a/apps/desktop/src/main/preload/index.d.ts b/apps/desktop/layer/main/preload/index.d.ts similarity index 100% rename from apps/desktop/src/main/preload/index.d.ts rename to apps/desktop/layer/main/preload/index.d.ts diff --git a/apps/desktop/src/main/preload/index.ts b/apps/desktop/layer/main/preload/index.ts similarity index 100% rename from apps/desktop/src/main/preload/index.ts rename to apps/desktop/layer/main/preload/index.ts diff --git a/apps/desktop/src/main/src/@types/constants.ts b/apps/desktop/layer/main/src/@types/constants.ts similarity index 77% rename from apps/desktop/src/main/src/@types/constants.ts rename to apps/desktop/layer/main/src/@types/constants.ts index 853148c27..bc16836b9 100644 --- a/apps/desktop/src/main/src/@types/constants.ts +++ b/apps/desktop/layer/main/src/@types/constants.ts @@ -1,4 +1,4 @@ -const langs = ["en", "zh-CN", "zh-HK", "zh-TW", "ja"] as const +const langs = ["en", "zh-CN", "zh-TW", "ja"] as const export const currentSupportedLanguages = [...langs].sort() as string[] export type MainSupportedLanguages = (typeof langs)[number] diff --git a/apps/desktop/src/main/src/@types/i18next.d.ts b/apps/desktop/layer/main/src/@types/i18next.d.ts similarity index 100% rename from apps/desktop/src/main/src/@types/i18next.d.ts rename to apps/desktop/layer/main/src/@types/i18next.d.ts diff --git a/apps/desktop/src/main/src/@types/resources.ts b/apps/desktop/layer/main/src/@types/resources.ts similarity index 85% rename from apps/desktop/src/main/src/@types/resources.ts rename to apps/desktop/layer/main/src/@types/resources.ts index 6bad90d50..ed1fc2925 100644 --- a/apps/desktop/src/main/src/@types/resources.ts +++ b/apps/desktop/layer/main/src/@types/resources.ts @@ -1,7 +1,6 @@ import en from "@locales/native/en.json" import ja from "@locales/native/ja.json" import zhCn from "@locales/native/zh-CN.json" -import zhHk from "@locales/native/zh-HK.json" import zhTw from "@locales/native/zh-TW.json" import type { MainSupportedLanguages, ns } from "./constants" @@ -13,9 +12,7 @@ export const resources = { "zh-CN": { native: zhCn, }, - "zh-HK": { - native: zhHk, - }, + "zh-TW": { native: zhTw, }, diff --git a/apps/desktop/src/main/src/constants/app.ts b/apps/desktop/layer/main/src/constants/app.ts similarity index 100% rename from apps/desktop/src/main/src/constants/app.ts rename to apps/desktop/layer/main/src/constants/app.ts diff --git a/apps/desktop/src/main/src/constants/system.ts b/apps/desktop/layer/main/src/constants/system.ts similarity index 100% rename from apps/desktop/src/main/src/constants/system.ts rename to apps/desktop/layer/main/src/constants/system.ts diff --git a/apps/desktop/src/main/src/env.ts b/apps/desktop/layer/main/src/env.ts similarity index 100% rename from apps/desktop/src/main/src/env.ts rename to apps/desktop/layer/main/src/env.ts diff --git a/apps/desktop/src/main/src/helper.ts b/apps/desktop/layer/main/src/helper.ts similarity index 100% rename from apps/desktop/src/main/src/helper.ts rename to apps/desktop/layer/main/src/helper.ts diff --git a/apps/desktop/src/main/src/index.ts b/apps/desktop/layer/main/src/index.ts similarity index 100% rename from apps/desktop/src/main/src/index.ts rename to apps/desktop/layer/main/src/index.ts diff --git a/apps/desktop/src/main/src/init.ts b/apps/desktop/layer/main/src/init.ts similarity index 100% rename from apps/desktop/src/main/src/init.ts rename to apps/desktop/layer/main/src/init.ts diff --git a/apps/desktop/src/main/src/lib/api-client.ts b/apps/desktop/layer/main/src/lib/api-client.ts similarity index 100% rename from apps/desktop/src/main/src/lib/api-client.ts rename to apps/desktop/layer/main/src/lib/api-client.ts diff --git a/apps/desktop/src/main/src/lib/cleaner.ts b/apps/desktop/layer/main/src/lib/cleaner.ts similarity index 100% rename from apps/desktop/src/main/src/lib/cleaner.ts rename to apps/desktop/layer/main/src/lib/cleaner.ts diff --git a/apps/desktop/src/main/src/lib/dock.ts b/apps/desktop/layer/main/src/lib/dock.ts similarity index 100% rename from apps/desktop/src/main/src/lib/dock.ts rename to apps/desktop/layer/main/src/lib/dock.ts diff --git a/apps/desktop/src/main/src/lib/download.ts b/apps/desktop/layer/main/src/lib/download.ts similarity index 100% rename from apps/desktop/src/main/src/lib/download.ts rename to apps/desktop/layer/main/src/lib/download.ts diff --git a/apps/desktop/src/main/src/lib/i18n.ts b/apps/desktop/layer/main/src/lib/i18n.ts similarity index 77% rename from apps/desktop/src/main/src/lib/i18n.ts rename to apps/desktop/layer/main/src/lib/i18n.ts index 4ce28a0ab..17efc4d39 100644 --- a/apps/desktop/src/main/src/lib/i18n.ts +++ b/apps/desktop/layer/main/src/lib/i18n.ts @@ -7,7 +7,10 @@ export const defaultNS = "native" export const i18n = i18next.createInstance() as typeof i18next i18n.init({ - fallbackLng: "en", + fallbackLng: { + default: ["en"], + "zh-TW": ["zh-CN", "en"], + }, defaultNS, resources, }) diff --git a/apps/desktop/src/main/src/lib/op.ts b/apps/desktop/layer/main/src/lib/op.ts similarity index 100% rename from apps/desktop/src/main/src/lib/op.ts rename to apps/desktop/layer/main/src/lib/op.ts diff --git a/apps/desktop/src/main/src/lib/proxy.test.ts b/apps/desktop/layer/main/src/lib/proxy.test.ts similarity index 100% rename from apps/desktop/src/main/src/lib/proxy.test.ts rename to apps/desktop/layer/main/src/lib/proxy.test.ts diff --git a/apps/desktop/src/main/src/lib/proxy.ts b/apps/desktop/layer/main/src/lib/proxy.ts similarity index 100% rename from apps/desktop/src/main/src/lib/proxy.ts rename to apps/desktop/layer/main/src/lib/proxy.ts diff --git a/apps/desktop/src/main/src/lib/router.ts b/apps/desktop/layer/main/src/lib/router.ts similarity index 75% rename from apps/desktop/src/main/src/lib/router.ts rename to apps/desktop/layer/main/src/lib/router.ts index fdae777fe..a5ff52705 100644 --- a/apps/desktop/src/main/src/lib/router.ts +++ b/apps/desktop/layer/main/src/lib/router.ts @@ -46,6 +46,34 @@ export const handleUrlRouting = (url: string) => { }) return } + case "/feed": { + callMainWindow(url, (mainWindow) => { + const caller = callWindowExpose(mainWindow) + + const id = searchParams.get("id") ?? undefined + const view = searchParams.get("view") ?? "0" + if (!id) return + caller.goToFeed({ + id, + view: Number.parseInt(view, 10), + }) + }) + return + } + case "/list": { + callMainWindow(url, (mainWindow) => { + const caller = callWindowExpose(mainWindow) + + const id = searchParams.get("id") ?? undefined + const view = searchParams.get("view") ?? "0" + if (!id) return + caller.goToList({ + id, + view: Number.parseInt(view, 10), + }) + }) + return + } case "/": { callMainWindow(url, (mainWindow) => { mainWindow.restore() diff --git a/apps/desktop/src/main/src/lib/store.ts b/apps/desktop/layer/main/src/lib/store.ts similarity index 100% rename from apps/desktop/src/main/src/lib/store.ts rename to apps/desktop/layer/main/src/lib/store.ts diff --git a/apps/desktop/src/main/src/lib/tray.ts b/apps/desktop/layer/main/src/lib/tray.ts similarity index 100% rename from apps/desktop/src/main/src/lib/tray.ts rename to apps/desktop/layer/main/src/lib/tray.ts diff --git a/apps/desktop/src/main/src/lib/user.ts b/apps/desktop/layer/main/src/lib/user.ts similarity index 100% rename from apps/desktop/src/main/src/lib/user.ts rename to apps/desktop/layer/main/src/lib/user.ts diff --git a/apps/desktop/src/main/src/lib/utils.ts b/apps/desktop/layer/main/src/lib/utils.ts similarity index 100% rename from apps/desktop/src/main/src/lib/utils.ts rename to apps/desktop/layer/main/src/lib/utils.ts diff --git a/apps/desktop/src/main/src/logger.ts b/apps/desktop/layer/main/src/logger.ts similarity index 100% rename from apps/desktop/src/main/src/logger.ts rename to apps/desktop/layer/main/src/logger.ts diff --git a/apps/desktop/src/main/src/menu.ts b/apps/desktop/layer/main/src/menu.ts similarity index 100% rename from apps/desktop/src/main/src/menu.ts rename to apps/desktop/layer/main/src/menu.ts diff --git a/apps/desktop/src/main/src/modules/language-detection/index.ts b/apps/desktop/layer/main/src/modules/language-detection/index.ts similarity index 100% rename from apps/desktop/src/main/src/modules/language-detection/index.ts rename to apps/desktop/layer/main/src/modules/language-detection/index.ts diff --git a/apps/desktop/src/main/src/renderer-handlers.ts b/apps/desktop/layer/main/src/renderer-handlers.ts similarity index 100% rename from apps/desktop/src/main/src/renderer-handlers.ts rename to apps/desktop/layer/main/src/renderer-handlers.ts diff --git a/apps/desktop/src/main/src/sentry.ts b/apps/desktop/layer/main/src/sentry.ts similarity index 100% rename from apps/desktop/src/main/src/sentry.ts rename to apps/desktop/layer/main/src/sentry.ts diff --git a/apps/desktop/src/main/src/side-effects.ts b/apps/desktop/layer/main/src/side-effects.ts similarity index 100% rename from apps/desktop/src/main/src/side-effects.ts rename to apps/desktop/layer/main/src/side-effects.ts diff --git a/apps/desktop/src/main/src/tipc/_instance.ts b/apps/desktop/layer/main/src/tipc/_instance.ts similarity index 100% rename from apps/desktop/src/main/src/tipc/_instance.ts rename to apps/desktop/layer/main/src/tipc/_instance.ts diff --git a/apps/desktop/src/main/src/tipc/app.ts b/apps/desktop/layer/main/src/tipc/app.ts similarity index 100% rename from apps/desktop/src/main/src/tipc/app.ts rename to apps/desktop/layer/main/src/tipc/app.ts diff --git a/apps/desktop/src/main/src/tipc/auth.ts b/apps/desktop/layer/main/src/tipc/auth.ts similarity index 100% rename from apps/desktop/src/main/src/tipc/auth.ts rename to apps/desktop/layer/main/src/tipc/auth.ts diff --git a/apps/desktop/src/main/src/tipc/debug.ts b/apps/desktop/layer/main/src/tipc/debug.ts similarity index 100% rename from apps/desktop/src/main/src/tipc/debug.ts rename to apps/desktop/layer/main/src/tipc/debug.ts diff --git a/apps/desktop/src/main/src/tipc/dock.ts b/apps/desktop/layer/main/src/tipc/dock.ts similarity index 100% rename from apps/desktop/src/main/src/tipc/dock.ts rename to apps/desktop/layer/main/src/tipc/dock.ts diff --git a/apps/desktop/src/main/src/tipc/index.ts b/apps/desktop/layer/main/src/tipc/index.ts similarity index 100% rename from apps/desktop/src/main/src/tipc/index.ts rename to apps/desktop/layer/main/src/tipc/index.ts diff --git a/apps/desktop/src/main/src/tipc/menu.ts b/apps/desktop/layer/main/src/tipc/menu.ts similarity index 100% rename from apps/desktop/src/main/src/tipc/menu.ts rename to apps/desktop/layer/main/src/tipc/menu.ts diff --git a/apps/desktop/src/main/src/tipc/reader.ts b/apps/desktop/layer/main/src/tipc/reader.ts similarity index 98% rename from apps/desktop/src/main/src/tipc/reader.ts rename to apps/desktop/layer/main/src/tipc/reader.ts index a20edbaf3..2afc8f96b 100644 --- a/apps/desktop/src/main/src/tipc/reader.ts +++ b/apps/desktop/layer/main/src/tipc/reader.ts @@ -2,7 +2,7 @@ import fs from "node:fs" import path from "node:path" import { callWindowExpose } from "@follow/shared/bridge" -import { readability } from "@follow/utils/readability" +import { readability } from "@follow-app/readability" import { app, BrowserWindow } from "electron" import { MsEdgeTTS, OUTPUT_FORMAT } from "msedge-tts" import type { ModelResult } from "vscode-languagedetection" diff --git a/apps/desktop/src/main/src/tipc/setting.ts b/apps/desktop/layer/main/src/tipc/setting.ts similarity index 100% rename from apps/desktop/src/main/src/tipc/setting.ts rename to apps/desktop/layer/main/src/tipc/setting.ts diff --git a/apps/desktop/src/main/src/updater/configs.ts b/apps/desktop/layer/main/src/updater/configs.ts similarity index 100% rename from apps/desktop/src/main/src/updater/configs.ts rename to apps/desktop/layer/main/src/updater/configs.ts diff --git a/apps/desktop/src/main/src/updater/custom-github-provider.ts b/apps/desktop/layer/main/src/updater/custom-github-provider.ts similarity index 100% rename from apps/desktop/src/main/src/updater/custom-github-provider.ts rename to apps/desktop/layer/main/src/updater/custom-github-provider.ts diff --git a/apps/desktop/src/main/src/updater/hot-updater.ts b/apps/desktop/layer/main/src/updater/hot-updater.ts similarity index 100% rename from apps/desktop/src/main/src/updater/hot-updater.ts rename to apps/desktop/layer/main/src/updater/hot-updater.ts diff --git a/apps/desktop/src/main/src/updater/index.ts b/apps/desktop/layer/main/src/updater/index.ts similarity index 100% rename from apps/desktop/src/main/src/updater/index.ts rename to apps/desktop/layer/main/src/updater/index.ts diff --git a/apps/desktop/src/main/src/updater/types.ts b/apps/desktop/layer/main/src/updater/types.ts similarity index 100% rename from apps/desktop/src/main/src/updater/types.ts rename to apps/desktop/layer/main/src/updater/types.ts diff --git a/apps/desktop/src/main/src/updater/utils.ts b/apps/desktop/layer/main/src/updater/utils.ts similarity index 100% rename from apps/desktop/src/main/src/updater/utils.ts rename to apps/desktop/layer/main/src/updater/utils.ts diff --git a/apps/desktop/src/main/src/updater/windows-updater.ts b/apps/desktop/layer/main/src/updater/windows-updater.ts similarity index 100% rename from apps/desktop/src/main/src/updater/windows-updater.ts rename to apps/desktop/layer/main/src/updater/windows-updater.ts diff --git a/apps/desktop/src/main/src/window.ts b/apps/desktop/layer/main/src/window.ts similarity index 100% rename from apps/desktop/src/main/src/window.ts rename to apps/desktop/layer/main/src/window.ts diff --git a/apps/desktop/src/main/tsconfig.json b/apps/desktop/layer/main/tsconfig.json similarity index 100% rename from apps/desktop/src/main/tsconfig.json rename to apps/desktop/layer/main/tsconfig.json diff --git a/apps/desktop/src/main/vitest.config.ts b/apps/desktop/layer/main/vitest.config.ts similarity index 100% rename from apps/desktop/src/main/vitest.config.ts rename to apps/desktop/layer/main/vitest.config.ts diff --git a/apps/desktop/src/renderer/debug_proxy.html b/apps/desktop/layer/renderer/debug_proxy.html similarity index 100% rename from apps/desktop/src/renderer/debug_proxy.html rename to apps/desktop/layer/renderer/debug_proxy.html diff --git a/apps/desktop/src/renderer/global.d.ts b/apps/desktop/layer/renderer/global.d.ts similarity index 100% rename from apps/desktop/src/renderer/global.d.ts rename to apps/desktop/layer/renderer/global.d.ts diff --git a/apps/desktop/src/renderer/index.html b/apps/desktop/layer/renderer/index.html similarity index 98% rename from apps/desktop/src/renderer/index.html rename to apps/desktop/layer/renderer/index.html index 876e077b2..65aaebabf 100644 --- a/apps/desktop/src/renderer/index.html +++ b/apps/desktop/layer/renderer/index.html @@ -18,7 +18,7 @@ Folo - + diff --git a/apps/desktop/src/renderer/package.json b/apps/desktop/layer/renderer/package.json similarity index 75% rename from apps/desktop/src/renderer/package.json rename to apps/desktop/layer/renderer/package.json index 9bae392a2..0897a59ae 100644 --- a/apps/desktop/src/renderer/package.json +++ b/apps/desktop/layer/renderer/package.json @@ -22,29 +22,28 @@ "@fontsource/sn-pro": "5.2.5", "@headlessui/react": "2.2.2", "@hookform/resolvers": "4.1.3", - "@lottiefiles/dotlottie-react": "0.13.3", + "@lottiefiles/dotlottie-react": "0.13.4", "@openpanel/web": "1.0.1", - "@radix-ui/react-avatar": "1.1.6", - "@radix-ui/react-context-menu": "2.2.11", - "@radix-ui/react-dialog": "1.1.10", - "@radix-ui/react-dropdown-menu": "2.1.11", - "@radix-ui/react-hover-card": "1.1.10", + "@radix-ui/react-avatar": "1.1.7", + "@radix-ui/react-context-menu": "2.2.12", + "@radix-ui/react-dialog": "1.1.11", + "@radix-ui/react-dropdown-menu": "2.1.12", + "@radix-ui/react-hover-card": "1.1.11", "@radix-ui/react-label": "2.1.4", - "@radix-ui/react-popover": "1.1.10", + "@radix-ui/react-popover": "1.1.11", "@radix-ui/react-slider": "1.3.2", "@radix-ui/react-slot": "1.2.0", - "@sentry/react": "9.13.0", - "@shikijs/transformers": "3.2.2", - "@tanstack/query-sync-storage-persister": "5.74.4", - "@tanstack/react-query": "5.74.4", - "@tanstack/react-query-devtools": "5.74.4", - "@tanstack/react-query-persist-client": "5.74.4", + "@sentry/react": "9.14.0", + "@shikijs/transformers": "3.3.0", + "@tanstack/query-sync-storage-persister": "5.74.7", + "@tanstack/react-query": "5.74.7", + "@tanstack/react-query-devtools": "5.74.7", + "@tanstack/react-query-persist-client": "5.74.7", "@tanstack/react-virtual": "3.13.6", "@use-gesture/react": "10.3.1", "@welldone-software/why-did-you-render": "10.0.1", "@yornaath/batshit": "0.10.1", "camelcase-keys": "9.1.3", - "click-to-react-component": "1.1.2", "clsx": "2.1.1", "cmdk": "1.1.1", "dayjs": "1.11.13", @@ -53,43 +52,43 @@ "dnum": "2.14.0", "embla-carousel-react": "8.6.0", "embla-carousel-wheel-gestures": "8.0.2", - "es-toolkit": "1.35.0", - "firebase": "11.6.0", + "es-toolkit": "1.36.0", + "firebase": "11.6.1", "foxact": "0.2.45", "franc-min": "6.2.0", "fuse.js": "7.1.0", "hast-util-to-jsx-runtime": "2.3.6", "hast-util-to-mdast": "10.1.2", - "i18next": "25.0.0", + "i18next": "25.0.1", "i18next-browser-languagedetector": "8.0.5", "idb-keyval": "6.2.1", "immer": "10.1.1", "jotai": "2.12.3", "lethargy": "1.0.9", - "masonic": "4.0.1", + "masonic": "4.1.0", "mdast-util-gfm-table": "2.0.0", "mdast-util-to-markdown": "2.1.2", - "motion": "12.7.4", + "motion": "12.9.2", "nanoid": "5.1.5", "ofetch": "1.4.1", "plain-shiki": "0.2.0", "re-resizable": "6.11.2", "react-blurhash": "0.3.0", "react-fast-marquee": "1.6.5", - "react-hook-form": "7.55.0", + "react-hook-form": "7.56.1", "react-hotkeys-hook": "5.0.1", - "react-i18next": "15.4.1", + "react-i18next": "15.5.1", "react-intersection-observer": "9.16.0", "react-ios-pwa-prompt": "2.0.6", "react-qr-code": "2.0.15", "react-resizable-layout": "npm:@innei/react-resizable-layout@0.7.3-fork.1", - "react-router": "7.5.1", + "react-router": "7.5.2", "react-selecto": "1.26.3", "react-shadow": "20.6.0", "react-zoom-pan-pinch": "3.7.0", - "shiki": "3.2.2", + "shiki": "3.3.0", "sonner": "2.0.3", - "tldts": "7.0.1", + "tldts": "7.0.4", "use-context-selector": "2.0.0", "use-sync-external-store": "1.5.0", "usehooks-ts": "3.1.1", @@ -105,10 +104,11 @@ "@follow/models": "workspace:*", "@follow/types": "workspace:*", "@follow/utils": "workspace:*", - "@types/node": "22.14.1", + "@types/node": "22.15.3", "@vite-pwa/assets-generator": "1.0.0", "fake-indexeddb": "6.0.0", "happy-dom": "17.4.4", - "react-scan": "0.3.3" + "react-scan": "0.3.3", + "typescript": "catalog:" } } diff --git a/apps/desktop/src/renderer/public/apple-touch-icon-180x180.png b/apps/desktop/layer/renderer/public/apple-touch-icon-180x180.png similarity index 100% rename from apps/desktop/src/renderer/public/apple-touch-icon-180x180.png rename to apps/desktop/layer/renderer/public/apple-touch-icon-180x180.png diff --git a/apps/desktop/src/renderer/public/favicon-dev.ico b/apps/desktop/layer/renderer/public/favicon-dev.ico similarity index 100% rename from apps/desktop/src/renderer/public/favicon-dev.ico rename to apps/desktop/layer/renderer/public/favicon-dev.ico diff --git a/apps/desktop/src/renderer/public/favicon.ico b/apps/desktop/layer/renderer/public/favicon.ico similarity index 100% rename from apps/desktop/src/renderer/public/favicon.ico rename to apps/desktop/layer/renderer/public/favicon.ico diff --git a/apps/desktop/src/renderer/public/icon-192x192.png b/apps/desktop/layer/renderer/public/icon-192x192.png similarity index 100% rename from apps/desktop/src/renderer/public/icon-192x192.png rename to apps/desktop/layer/renderer/public/icon-192x192.png diff --git a/apps/desktop/src/renderer/public/icon-512x512.png b/apps/desktop/layer/renderer/public/icon-512x512.png similarity index 100% rename from apps/desktop/src/renderer/public/icon-512x512.png rename to apps/desktop/layer/renderer/public/icon-512x512.png diff --git a/apps/desktop/src/renderer/public/icon.svg b/apps/desktop/layer/renderer/public/icon.svg similarity index 100% rename from apps/desktop/src/renderer/public/icon.svg rename to apps/desktop/layer/renderer/public/icon.svg diff --git a/apps/desktop/src/renderer/public/maskable-icon-512x512.png b/apps/desktop/layer/renderer/public/maskable-icon-512x512.png similarity index 100% rename from apps/desktop/src/renderer/public/maskable-icon-512x512.png rename to apps/desktop/layer/renderer/public/maskable-icon-512x512.png diff --git a/apps/desktop/src/renderer/public/og-image.png b/apps/desktop/layer/renderer/public/og-image.png similarity index 100% rename from apps/desktop/src/renderer/public/og-image.png rename to apps/desktop/layer/renderer/public/og-image.png diff --git a/apps/desktop/src/renderer/public/opengraph-image.png b/apps/desktop/layer/renderer/public/opengraph-image.png similarity index 100% rename from apps/desktop/src/renderer/public/opengraph-image.png rename to apps/desktop/layer/renderer/public/opengraph-image.png diff --git a/apps/desktop/src/renderer/public/pwa-192x192.png b/apps/desktop/layer/renderer/public/pwa-192x192.png similarity index 100% rename from apps/desktop/src/renderer/public/pwa-192x192.png rename to apps/desktop/layer/renderer/public/pwa-192x192.png diff --git a/apps/desktop/src/renderer/public/pwa-512x512.png b/apps/desktop/layer/renderer/public/pwa-512x512.png similarity index 100% rename from apps/desktop/src/renderer/public/pwa-512x512.png rename to apps/desktop/layer/renderer/public/pwa-512x512.png diff --git a/apps/desktop/src/renderer/public/pwa-64x64.png b/apps/desktop/layer/renderer/public/pwa-64x64.png similarity index 100% rename from apps/desktop/src/renderer/public/pwa-64x64.png rename to apps/desktop/layer/renderer/public/pwa-64x64.png diff --git a/apps/desktop/src/renderer/pwa-assets.config.ts b/apps/desktop/layer/renderer/pwa-assets.config.ts similarity index 100% rename from apps/desktop/src/renderer/pwa-assets.config.ts rename to apps/desktop/layer/renderer/pwa-assets.config.ts diff --git a/apps/desktop/src/renderer/setup-file.ts b/apps/desktop/layer/renderer/setup-file.ts similarity index 100% rename from apps/desktop/src/renderer/setup-file.ts rename to apps/desktop/layer/renderer/setup-file.ts diff --git a/apps/desktop/layer/renderer/src/@types/constants.ts b/apps/desktop/layer/renderer/src/@types/constants.ts new file mode 100644 index 000000000..1c2fc2d9d --- /dev/null +++ b/apps/desktop/layer/renderer/src/@types/constants.ts @@ -0,0 +1,14 @@ +// This file is auto-generated by scripts/generate-i18n-locale.ts +// DONT EDIT THIS FILE MANUALLY +const langs = ["en", "zh-CN", "zh-TW", "ja"] as const +export const currentSupportedLanguages = langs as readonly string[] +export type RendererSupportedLanguages = (typeof langs)[number] + +export const dayjsLocaleImportMap = { + en: ["en", () => import("dayjs/locale/en")], + ["zh-CN"]: ["zh-cn", () => import("dayjs/locale/zh-cn")], + ["ja"]: ["ja", () => import("dayjs/locale/ja")], + ["zh-TW"]: ["zh-tw", () => import("dayjs/locale/zh-tw")], +} +export const ns = ["common", "lang", "errors", "app", "settings", "shortcuts"] as const +export const defaultNS = "app" as const diff --git a/apps/desktop/layer/renderer/src/@types/default-resource.ts b/apps/desktop/layer/renderer/src/@types/default-resource.ts new file mode 100644 index 000000000..94d4ca17d --- /dev/null +++ b/apps/desktop/layer/renderer/src/@types/default-resource.ts @@ -0,0 +1,47 @@ +// This file is auto-generated by scripts/generate-i18n-locale.ts +// DONT EDIT THIS FILE MANUALLY +import en from "@locales/app/en.json" +import common_en from "@locales/common/en.json" +import common_ja from "@locales/common/ja.json" +import common_zhCN from "@locales/common/zh-CN.json" +import common_zhTW from "@locales/common/zh-TW.json" +import errors_en from "@locales/errors/en.json" +import lang_en from "@locales/lang/en.json" +import lang_ja from "@locales/lang/ja.json" +import lang_zhCN from "@locales/lang/zh-CN.json" +import lang_zhTW from "@locales/lang/zh-TW.json" +import settings_en from "@locales/settings/en.json" +import shortcuts_en from "@locales/shortcuts/en.json" + +import type { ns, RendererSupportedLanguages } from "./constants" + +/** + * This file is the language resource that is loaded in full when the app is initialized. + * When switching languages, the app will automatically download the required language resources, + * we will not load all the language resources to minimize the first screen loading time of the app. + * Generally, we only load english resources synchronously by default. + * In addition, we attach common resources for other languages, and the size of the common resources must be controlled. + */ +export const defaultResources = { + en: { + app: en, + lang: lang_en, + common: common_en, + settings: settings_en, + shortcuts: shortcuts_en, + errors: errors_en, + }, + "zh-CN": { + lang: lang_zhCN, + common: common_zhCN, + }, + + ja: { + lang: lang_ja, + common: common_ja, + }, + "zh-TW": { lang: lang_zhTW, common: common_zhTW }, +} satisfies Record< + RendererSupportedLanguages, + Partial>> +> diff --git a/apps/desktop/src/renderer/src/@types/i18next.d.ts b/apps/desktop/layer/renderer/src/@types/i18next.d.ts similarity index 100% rename from apps/desktop/src/renderer/src/@types/i18next.d.ts rename to apps/desktop/layer/renderer/src/@types/i18next.d.ts diff --git a/apps/desktop/src/renderer/src/App.tsx b/apps/desktop/layer/renderer/src/App.tsx similarity index 100% rename from apps/desktop/src/renderer/src/App.tsx rename to apps/desktop/layer/renderer/src/App.tsx diff --git a/apps/desktop/src/renderer/src/api/trending.ts b/apps/desktop/layer/renderer/src/api/trending.ts similarity index 100% rename from apps/desktop/src/renderer/src/api/trending.ts rename to apps/desktop/layer/renderer/src/api/trending.ts diff --git a/apps/desktop/src/renderer/src/assets/rsshub-icon.png b/apps/desktop/layer/renderer/src/assets/rsshub-icon.png similarity index 100% rename from apps/desktop/src/renderer/src/assets/rsshub-icon.png rename to apps/desktop/layer/renderer/src/assets/rsshub-icon.png diff --git a/apps/desktop/src/renderer/src/assets/rsshub.svg b/apps/desktop/layer/renderer/src/assets/rsshub.svg similarity index 100% rename from apps/desktop/src/renderer/src/assets/rsshub.svg rename to apps/desktop/layer/renderer/src/assets/rsshub.svg diff --git a/apps/desktop/src/renderer/src/atoms/ai-summary.ts b/apps/desktop/layer/renderer/src/atoms/ai-summary.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/ai-summary.ts rename to apps/desktop/layer/renderer/src/atoms/ai-summary.ts diff --git a/apps/desktop/src/renderer/src/atoms/ai-translation.ts b/apps/desktop/layer/renderer/src/atoms/ai-translation.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/ai-translation.ts rename to apps/desktop/layer/renderer/src/atoms/ai-translation.ts diff --git a/apps/desktop/src/renderer/src/atoms/app.ts b/apps/desktop/layer/renderer/src/atoms/app.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/app.ts rename to apps/desktop/layer/renderer/src/atoms/app.ts diff --git a/apps/desktop/src/renderer/src/atoms/context-menu.ts b/apps/desktop/layer/renderer/src/atoms/context-menu.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/context-menu.ts rename to apps/desktop/layer/renderer/src/atoms/context-menu.ts diff --git a/apps/desktop/src/renderer/src/atoms/corner-player.ts b/apps/desktop/layer/renderer/src/atoms/corner-player.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/corner-player.ts rename to apps/desktop/layer/renderer/src/atoms/corner-player.ts diff --git a/apps/desktop/src/renderer/src/atoms/dom.ts b/apps/desktop/layer/renderer/src/atoms/dom.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/dom.ts rename to apps/desktop/layer/renderer/src/atoms/dom.ts diff --git a/apps/desktop/src/renderer/src/atoms/feed.ts b/apps/desktop/layer/renderer/src/atoms/feed.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/feed.ts rename to apps/desktop/layer/renderer/src/atoms/feed.ts diff --git a/apps/desktop/src/renderer/src/atoms/lang.ts b/apps/desktop/layer/renderer/src/atoms/lang.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/lang.ts rename to apps/desktop/layer/renderer/src/atoms/lang.ts diff --git a/apps/desktop/src/renderer/src/atoms/network.ts b/apps/desktop/layer/renderer/src/atoms/network.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/network.ts rename to apps/desktop/layer/renderer/src/atoms/network.ts diff --git a/apps/desktop/src/renderer/src/atoms/player.ts b/apps/desktop/layer/renderer/src/atoms/player.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/player.ts rename to apps/desktop/layer/renderer/src/atoms/player.ts diff --git a/apps/desktop/layer/renderer/src/atoms/preview.ts b/apps/desktop/layer/renderer/src/atoms/preview.ts new file mode 100644 index 000000000..f2565f756 --- /dev/null +++ b/apps/desktop/layer/renderer/src/atoms/preview.ts @@ -0,0 +1,5 @@ +import { atom } from "jotai" + +import { createAtomHooks } from "~/lib/jotai" + +export const [, , , , previewBackPath, setPreviewBackPath] = createAtomHooks(atom()) diff --git a/apps/desktop/src/renderer/src/atoms/readability.ts b/apps/desktop/layer/renderer/src/atoms/readability.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/readability.ts rename to apps/desktop/layer/renderer/src/atoms/readability.ts diff --git a/apps/desktop/src/renderer/src/atoms/server-configs.ts b/apps/desktop/layer/renderer/src/atoms/server-configs.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/server-configs.ts rename to apps/desktop/layer/renderer/src/atoms/server-configs.ts diff --git a/apps/desktop/src/renderer/src/atoms/settings/general.ts b/apps/desktop/layer/renderer/src/atoms/settings/general.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/settings/general.ts rename to apps/desktop/layer/renderer/src/atoms/settings/general.ts diff --git a/apps/desktop/src/renderer/src/atoms/settings/integration.ts b/apps/desktop/layer/renderer/src/atoms/settings/integration.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/settings/integration.ts rename to apps/desktop/layer/renderer/src/atoms/settings/integration.ts diff --git a/apps/desktop/src/renderer/src/atoms/settings/ui.ts b/apps/desktop/layer/renderer/src/atoms/settings/ui.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/settings/ui.ts rename to apps/desktop/layer/renderer/src/atoms/settings/ui.ts diff --git a/apps/desktop/src/renderer/src/atoms/sidebar.ts b/apps/desktop/layer/renderer/src/atoms/sidebar.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/sidebar.ts rename to apps/desktop/layer/renderer/src/atoms/sidebar.ts diff --git a/apps/desktop/src/renderer/src/atoms/source-content.tsx b/apps/desktop/layer/renderer/src/atoms/source-content.tsx similarity index 100% rename from apps/desktop/src/renderer/src/atoms/source-content.tsx rename to apps/desktop/layer/renderer/src/atoms/source-content.tsx diff --git a/apps/desktop/src/renderer/src/atoms/updater.ts b/apps/desktop/layer/renderer/src/atoms/updater.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/updater.ts rename to apps/desktop/layer/renderer/src/atoms/updater.ts diff --git a/apps/desktop/src/renderer/src/atoms/user.ts b/apps/desktop/layer/renderer/src/atoms/user.ts similarity index 100% rename from apps/desktop/src/renderer/src/atoms/user.ts rename to apps/desktop/layer/renderer/src/atoms/user.ts diff --git a/apps/desktop/src/renderer/src/components/common/AppErrorBoundary.tsx b/apps/desktop/layer/renderer/src/components/common/AppErrorBoundary.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/AppErrorBoundary.tsx rename to apps/desktop/layer/renderer/src/components/common/AppErrorBoundary.tsx diff --git a/apps/desktop/src/renderer/src/components/common/ErrorElement.tsx b/apps/desktop/layer/renderer/src/components/common/ErrorElement.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/ErrorElement.tsx rename to apps/desktop/layer/renderer/src/components/common/ErrorElement.tsx diff --git a/apps/desktop/src/renderer/src/components/common/ExPromise.tsx b/apps/desktop/layer/renderer/src/components/common/ExPromise.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/ExPromise.tsx rename to apps/desktop/layer/renderer/src/components/common/ExPromise.tsx diff --git a/apps/desktop/src/renderer/src/components/common/Fragment.tsx b/apps/desktop/layer/renderer/src/components/common/Fragment.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/Fragment.tsx rename to apps/desktop/layer/renderer/src/components/common/Fragment.tsx diff --git a/apps/desktop/src/renderer/src/components/common/ImpressionTracker.tsx b/apps/desktop/layer/renderer/src/components/common/ImpressionTracker.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/ImpressionTracker.tsx rename to apps/desktop/layer/renderer/src/components/common/ImpressionTracker.tsx diff --git a/apps/desktop/src/renderer/src/components/common/LazyDotLottie.tsx b/apps/desktop/layer/renderer/src/components/common/LazyDotLottie.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/LazyDotLottie.tsx rename to apps/desktop/layer/renderer/src/components/common/LazyDotLottie.tsx diff --git a/apps/desktop/src/renderer/src/components/common/LoadMoreIndicator.tsx b/apps/desktop/layer/renderer/src/components/common/LoadMoreIndicator.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/LoadMoreIndicator.tsx rename to apps/desktop/layer/renderer/src/components/common/LoadMoreIndicator.tsx diff --git a/apps/desktop/src/renderer/src/components/common/LoadRemixAsyncComponent.tsx b/apps/desktop/layer/renderer/src/components/common/LoadRemixAsyncComponent.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/LoadRemixAsyncComponent.tsx rename to apps/desktop/layer/renderer/src/components/common/LoadRemixAsyncComponent.tsx diff --git a/apps/desktop/src/renderer/src/components/common/Motion.tsx b/apps/desktop/layer/renderer/src/components/common/Motion.tsx similarity index 82% rename from apps/desktop/src/renderer/src/components/common/Motion.tsx rename to apps/desktop/layer/renderer/src/components/common/Motion.tsx index dcec6083c..77330e1ba 100644 --- a/apps/desktop/src/renderer/src/components/common/Motion.tsx +++ b/apps/desktop/layer/renderer/src/components/common/Motion.tsx @@ -1,6 +1,6 @@ -import type { MotionProps, TargetAndTransition } from "motion/react" +import type { TargetAndTransition } from "motion/react" import { m as M } from "motion/react" -import { createElement, forwardRef } from "react" +import { createElement } from "react" import { useReduceMotion } from "~/hooks/biz/useReduceMotion" @@ -12,7 +12,7 @@ export const m: typeof M = new Proxy(M, { if (cacheMap.has(p)) { return cacheMap.get(p) } - const MotionComponent = forwardRef((props: MotionProps, ref) => { + const MotionComponent = ({ ref, ...props }) => { const shouldReduceMotion = useReduceMotion() const nextProps = { ...props } if (shouldReduceMotion) { @@ -34,7 +34,7 @@ export const m: typeof M = new Proxy(M, { } return createElement(Component, { ...nextProps, ref }) - }) + } cacheMap.set(p, MotionComponent) diff --git a/apps/desktop/src/renderer/src/components/common/NotFound.tsx b/apps/desktop/layer/renderer/src/components/common/NotFound.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/NotFound.tsx rename to apps/desktop/layer/renderer/src/components/common/NotFound.tsx diff --git a/apps/desktop/src/renderer/src/components/common/PoweredByFooter.tsx b/apps/desktop/layer/renderer/src/components/common/PoweredByFooter.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/PoweredByFooter.tsx rename to apps/desktop/layer/renderer/src/components/common/PoweredByFooter.tsx diff --git a/apps/desktop/src/renderer/src/components/common/ProviderComposer.tsx b/apps/desktop/layer/renderer/src/components/common/ProviderComposer.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/ProviderComposer.tsx rename to apps/desktop/layer/renderer/src/components/common/ProviderComposer.tsx diff --git a/apps/desktop/src/renderer/src/components/common/ReloadPrompt.tsx b/apps/desktop/layer/renderer/src/components/common/ReloadPrompt.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/common/ReloadPrompt.tsx rename to apps/desktop/layer/renderer/src/components/common/ReloadPrompt.tsx diff --git a/apps/desktop/src/renderer/src/components/common/ShadowDOM.tsx b/apps/desktop/layer/renderer/src/components/common/ShadowDOM.tsx similarity index 94% rename from apps/desktop/src/renderer/src/components/common/ShadowDOM.tsx rename to apps/desktop/layer/renderer/src/components/common/ShadowDOM.tsx index 36d6b2f3d..bdae1aa1d 100644 --- a/apps/desktop/src/renderer/src/components/common/ShadowDOM.tsx +++ b/apps/desktop/layer/renderer/src/components/common/ShadowDOM.tsx @@ -2,7 +2,7 @@ import { MemoedDangerousHTMLStyle } from "@follow/components/common/MemoedDanger import { useIsDark } from "@follow/hooks" import { nanoid } from "nanoid" import type { FC, PropsWithChildren, ReactNode } from "react" -import { createContext, createElement, useContext, useLayoutEffect, useMemo, useState } from "react" +import { createContext, createElement, use, useLayoutEffect, useMemo, useState } from "react" import root from "react-shadow" import { useUISettingKeys } from "~/atoms/settings/ui" @@ -90,7 +90,7 @@ export const ShadowDOM: FC< return ( // @ts-expect-error - +
({ @@ -107,12 +107,12 @@ export const ShadowDOM: FC< {injectHostStyles ? stylesElements : null} {props.children}
-
+
) } -ShadowDOM.useIsShadowDOM = () => useContext(ShadowDOMContext) +ShadowDOM.useIsShadowDOM = () => use(ShadowDOMContext) const cacheCssTextMap = {} as Record diff --git a/apps/desktop/src/renderer/src/components/errors/FeedNotFound.tsx b/apps/desktop/layer/renderer/src/components/errors/FeedNotFound.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/errors/FeedNotFound.tsx rename to apps/desktop/layer/renderer/src/components/errors/FeedNotFound.tsx diff --git a/apps/desktop/src/renderer/src/components/errors/ModalError.tsx b/apps/desktop/layer/renderer/src/components/errors/ModalError.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/errors/ModalError.tsx rename to apps/desktop/layer/renderer/src/components/errors/ModalError.tsx diff --git a/apps/desktop/src/renderer/src/components/errors/PageError.tsx b/apps/desktop/layer/renderer/src/components/errors/PageError.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/errors/PageError.tsx rename to apps/desktop/layer/renderer/src/components/errors/PageError.tsx diff --git a/apps/desktop/src/renderer/src/components/errors/RSSHubError.tsx b/apps/desktop/layer/renderer/src/components/errors/RSSHubError.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/errors/RSSHubError.tsx rename to apps/desktop/layer/renderer/src/components/errors/RSSHubError.tsx diff --git a/apps/desktop/src/renderer/src/components/errors/enum.ts b/apps/desktop/layer/renderer/src/components/errors/enum.ts similarity index 100% rename from apps/desktop/src/renderer/src/components/errors/enum.ts rename to apps/desktop/layer/renderer/src/components/errors/enum.ts diff --git a/apps/desktop/src/renderer/src/components/errors/helper.ts b/apps/desktop/layer/renderer/src/components/errors/helper.ts similarity index 100% rename from apps/desktop/src/renderer/src/components/errors/helper.ts rename to apps/desktop/layer/renderer/src/components/errors/helper.ts diff --git a/apps/desktop/src/renderer/src/components/errors/index.ts b/apps/desktop/layer/renderer/src/components/errors/index.ts similarity index 80% rename from apps/desktop/src/renderer/src/components/errors/index.ts rename to apps/desktop/layer/renderer/src/components/errors/index.ts index 265ea424b..aac49986a 100644 --- a/apps/desktop/src/renderer/src/components/errors/index.ts +++ b/apps/desktop/layer/renderer/src/components/errors/index.ts @@ -5,9 +5,6 @@ import { ErrorComponentType } from "./enum" const ErrorFallbackMap = { [ErrorComponentType.Modal]: lazy(() => import("./ModalError")), [ErrorComponentType.Page]: lazy(() => import("./PageError")), - [ErrorComponentType.FeedFoundCanBeFollow]: lazy( - () => import("./FeedFoundCanBeFollowErrorFallback"), - ), [ErrorComponentType.FeedNotFound]: lazy(() => import("./FeedNotFound")), [ErrorComponentType.RSSHubDiscoverError]: lazy(() => import("./RSSHubError")), } diff --git a/apps/desktop/src/renderer/src/components/mobile/button.tsx b/apps/desktop/layer/renderer/src/components/mobile/button.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/mobile/button.tsx rename to apps/desktop/layer/renderer/src/components/mobile/button.tsx diff --git a/apps/desktop/layer/renderer/src/components/ui/auto-completion/AutoCompletion.tsx b/apps/desktop/layer/renderer/src/components/ui/auto-completion/AutoCompletion.tsx new file mode 100644 index 000000000..124dd3897 --- /dev/null +++ b/apps/desktop/layer/renderer/src/components/ui/auto-completion/AutoCompletion.tsx @@ -0,0 +1,138 @@ +import { Input } from "@follow/components/ui/input/index.js" +import { RootPortal } from "@follow/components/ui/portal/index.jsx" +import { useCorrectZIndex } from "@follow/components/ui/z-index/ctx.js" +import { stopPropagation } from "@follow/utils/dom" +import { cn } from "@follow/utils/utils" +import { Combobox, ComboboxInput, ComboboxOption, ComboboxOptions } from "@headlessui/react" +import Fuse from "fuse.js" +import { AnimatePresence, m } from "motion/react" +import { Fragment, memo, useCallback, useEffect, useState } from "react" + +export type Suggestion = { + name: string + value: string +} +export interface AutocompleteProps extends React.InputHTMLAttributes { + suggestions: Suggestion[] + renderSuggestion?: (suggestion: Suggestion) => any + + onSuggestionSelected: (suggestion: NoInfer | null) => void + + // classnames + + searchKeys?: string[] + maxHeight?: number +} + +const defaultSearchKeys = ["name", "value"] +const defaultRenderSuggestion = (suggestion: any) => suggestion?.name +export const Autocomplete = ({ + ref: forwardedRef, + suggestions, + renderSuggestion = defaultRenderSuggestion, + onSuggestionSelected, + maxHeight, + value, + searchKeys = defaultSearchKeys, + defaultValue, + ...inputProps +}: AutocompleteProps & { ref?: React.Ref }) => { + const [selectedOptions, setSelectedOptions] = useState | null>( + () => suggestions.find((suggestion) => suggestion.value === value) || null, + ) + + const [filterableSuggestions, setFilterableSuggestions] = useState(suggestions) + + const doFilter = useCallback(() => { + const fuse = new Fuse(suggestions, { + keys: searchKeys, + }) + + const trimInputValue = (value as string)?.trim() + + if (!trimInputValue) return setFilterableSuggestions(suggestions) + + const results = fuse.search(trimInputValue) + + setFilterableSuggestions(results.map((result) => result.item)) + }, [suggestions, value, searchKeys]) + useEffect(() => { + doFilter() + }, [doFilter]) + + const zIndex = useCorrectZIndex(9) + return ( + { + setSelectedOptions(suggestion) + onSuggestionSelected(suggestion) + }} + > + {({ open }) => { + return ( + + + + {open && filterableSuggestions.length > 0 && ( + + +
+ {filterableSuggestions.map((suggestion) => ( + + ))} +
+
+
+ )} +
+
+ ) + }} +
+ ) +} + +const MemoizedComboboxOption = memo(({ suggestion }: { suggestion: Suggestion }) => { + return ( + + {suggestion.name} + + ) +}) + +Autocomplete.displayName = "Autocomplete" diff --git a/apps/desktop/src/renderer/src/components/ui/auto-completion/index.ts b/apps/desktop/layer/renderer/src/components/ui/auto-completion/index.ts similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/auto-completion/index.ts rename to apps/desktop/layer/renderer/src/components/ui/auto-completion/index.ts diff --git a/apps/desktop/src/renderer/src/components/ui/background/WindowUnderBlur.tsx b/apps/desktop/layer/renderer/src/components/ui/background/WindowUnderBlur.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/background/WindowUnderBlur.tsx rename to apps/desktop/layer/renderer/src/components/ui/background/WindowUnderBlur.tsx diff --git a/apps/desktop/src/renderer/src/components/ui/background/index.ts b/apps/desktop/layer/renderer/src/components/ui/background/index.ts similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/background/index.ts rename to apps/desktop/layer/renderer/src/components/ui/background/index.ts diff --git a/apps/desktop/layer/renderer/src/components/ui/button/CommandActionButton.tsx b/apps/desktop/layer/renderer/src/components/ui/button/CommandActionButton.tsx new file mode 100644 index 000000000..975b6143d --- /dev/null +++ b/apps/desktop/layer/renderer/src/components/ui/button/CommandActionButton.tsx @@ -0,0 +1,29 @@ +import type { ActionButtonProps } from "@follow/components/ui/button/action-button.js" +import { ActionButton } from "@follow/components/ui/button/action-button.js" + +import { useCommand } from "~/modules/command/hooks/use-command" +import type { FollowCommandId } from "~/modules/command/types" + +export interface CommandActionButtonProps extends ActionButtonProps { + commandId: FollowCommandId + onClick: () => void +} +export const CommandActionButton = ({ + ref, + ...props +}: CommandActionButtonProps & { ref?: React.Ref }) => { + const { commandId, ...rest } = props + const command = useCommand(commandId) + if (!command) return null + const { icon, label } = command + + return ( + + ) +} diff --git a/apps/desktop/src/renderer/src/components/ui/button/CopyButton.tsx b/apps/desktop/layer/renderer/src/components/ui/button/CopyButton.tsx similarity index 93% rename from apps/desktop/src/renderer/src/components/ui/button/CopyButton.tsx rename to apps/desktop/layer/renderer/src/components/ui/button/CopyButton.tsx index 7abebc66c..434be42e7 100644 --- a/apps/desktop/src/renderer/src/components/ui/button/CopyButton.tsx +++ b/apps/desktop/layer/renderer/src/components/ui/button/CopyButton.tsx @@ -9,7 +9,7 @@ export const CopyButton: Component<{ style?: React.CSSProperties variant?: "solid" | "outline" | "ghost" }> = ({ value, className, style, variant = "solid" }) => { - const copiedTimerRef = useRef() + const copiedTimerRef = useRef(undefined) const handleCopy = useCallback(() => { navigator.clipboard.writeText(value) diff --git a/apps/desktop/src/renderer/src/components/ui/button/base.tsx b/apps/desktop/layer/renderer/src/components/ui/button/base.tsx similarity index 97% rename from apps/desktop/src/renderer/src/components/ui/button/base.tsx rename to apps/desktop/layer/renderer/src/components/ui/button/base.tsx index 12b8c92af..03fe1cce8 100644 --- a/apps/desktop/src/renderer/src/components/ui/button/base.tsx +++ b/apps/desktop/layer/renderer/src/components/ui/button/base.tsx @@ -35,7 +35,7 @@ export const AnimatedCommandButton: FC { const [pressed, setPressed] = useState(false) - const timerRef = useRef() + const timerRef = useRef(undefined) return ( = ({ code, language, codeTheme, className, transparent }) => { +> = ({ code, language, codeTheme, className, transparent, showCopy = true }) => { const rendered = useMemo(() => { try { return shiki.codeToHtml(code, { @@ -198,7 +199,7 @@ const ShikiCode: FC< {language} )} - +
diff --git a/apps/desktop/src/renderer/src/components/ui/code-highlighter/shiki/hooks.ts b/apps/desktop/layer/renderer/src/components/ui/code-highlighter/shiki/hooks.ts similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/code-highlighter/shiki/hooks.ts rename to apps/desktop/layer/renderer/src/components/ui/code-highlighter/shiki/hooks.ts diff --git a/apps/desktop/src/renderer/src/components/ui/code-highlighter/shiki/index.ts b/apps/desktop/layer/renderer/src/components/ui/code-highlighter/shiki/index.ts similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/code-highlighter/shiki/index.ts rename to apps/desktop/layer/renderer/src/components/ui/code-highlighter/shiki/index.ts diff --git a/apps/desktop/src/renderer/src/components/ui/code-highlighter/shiki/shared.ts b/apps/desktop/layer/renderer/src/components/ui/code-highlighter/shiki/shared.ts similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/code-highlighter/shiki/shared.ts rename to apps/desktop/layer/renderer/src/components/ui/code-highlighter/shiki/shared.ts diff --git a/apps/desktop/src/renderer/src/components/ui/code-highlighter/shiki/shiki.module.css b/apps/desktop/layer/renderer/src/components/ui/code-highlighter/shiki/shiki.module.css similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/code-highlighter/shiki/shiki.module.css rename to apps/desktop/layer/renderer/src/components/ui/code-highlighter/shiki/shiki.module.css diff --git a/apps/desktop/src/renderer/src/components/ui/collapse/Collapse.tsx b/apps/desktop/layer/renderer/src/components/ui/collapse/Collapse.tsx similarity index 92% rename from apps/desktop/src/renderer/src/components/ui/collapse/Collapse.tsx rename to apps/desktop/layer/renderer/src/components/ui/collapse/Collapse.tsx index 76eefecaf..e72db3e51 100644 --- a/apps/desktop/src/renderer/src/components/ui/collapse/Collapse.tsx +++ b/apps/desktop/layer/renderer/src/components/ui/collapse/Collapse.tsx @@ -3,6 +3,7 @@ import { cn } from "@follow/utils/utils" import { atom, useAtom, useStore } from "jotai" import type { Variants } from "motion/react" import { AnimatePresence, m } from "motion/react" +import type { FC } from "react" import * as React from "react" import { useEffect } from "react" @@ -18,10 +19,12 @@ interface CollapseProps { contentClassName?: string } -export const CollapseGroup: Component<{ - defaultOpenId?: string - onOpenChange?: (state: Record) => void -}> = ({ children, defaultOpenId, onOpenChange }) => { +export const CollapseGroup: FC< + { + defaultOpenId?: string + onOpenChange?: (state: Record) => void + } & React.PropsWithChildren +> = ({ children, defaultOpenId, onOpenChange }) => { const ctxValue = React.useMemo( () => ({ currentOpenCollapseIdAtom: atom(defaultOpenId ?? null), @@ -38,7 +41,7 @@ export const CollapseGroup: Component<{ onOpenChange?.(state) }) }, [defaultOpenId]) - return {children} + return {children} } export const Collapse: Component = ({ onOpenChange, ...props }) => { diff --git a/apps/desktop/src/renderer/src/components/ui/collapse/hooks.tsx b/apps/desktop/layer/renderer/src/components/ui/collapse/hooks.tsx similarity index 81% rename from apps/desktop/src/renderer/src/components/ui/collapse/hooks.tsx rename to apps/desktop/layer/renderer/src/components/ui/collapse/hooks.tsx index c1aa87a59..7514bfba3 100644 --- a/apps/desktop/src/renderer/src/components/ui/collapse/hooks.tsx +++ b/apps/desktop/layer/renderer/src/components/ui/collapse/hooks.tsx @@ -1,5 +1,5 @@ import type { PrimitiveAtom } from "jotai" -import { createContext, useContext } from "react" +import { createContext, use } from "react" export interface CollapseContextValue { currentOpenCollapseIdAtom: PrimitiveAtom @@ -7,7 +7,7 @@ export interface CollapseContextValue { } export const CollaspeContext = createContext(null!) export const useCollapseContext = () => { - const ctx = useContext(CollaspeContext) + const ctx = use(CollaspeContext) if (!ctx) { throw new Error("CollapseContext not found") } diff --git a/apps/desktop/src/renderer/src/components/ui/collapse/index.ts b/apps/desktop/layer/renderer/src/components/ui/collapse/index.ts similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/collapse/index.ts rename to apps/desktop/layer/renderer/src/components/ui/collapse/index.ts diff --git a/apps/desktop/src/renderer/src/components/ui/context-menu/context-menu.tsx b/apps/desktop/layer/renderer/src/components/ui/context-menu/context-menu.tsx similarity index 71% rename from apps/desktop/src/renderer/src/components/ui/context-menu/context-menu.tsx rename to apps/desktop/layer/renderer/src/components/ui/context-menu/context-menu.tsx index 41ccb3b13..12fa65ebd 100644 --- a/apps/desktop/src/renderer/src/components/ui/context-menu/context-menu.tsx +++ b/apps/desktop/layer/renderer/src/components/ui/context-menu/context-menu.tsx @@ -10,12 +10,15 @@ const ContextMenuGroup = ContextMenuPrimitive.Group const ContextMenuSub = ContextMenuPrimitive.Sub const ContextMenuRadioGroup = ContextMenuPrimitive.RadioGroup -const ContextMenuSubTrigger = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef & { - inset?: boolean - } ->(({ className, inset, children, ...props }, ref) => ( +const ContextMenuSubTrigger = ({ + ref, + className, + inset, + children, + ...props +}: React.ComponentPropsWithoutRef & { + inset?: boolean +} & { ref?: React.Ref | null> }) => ( -)) +) ContextMenuSubTrigger.displayName = ContextMenuPrimitive.SubTrigger.displayName -const ContextMenuSubContent = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, ...props }, ref) => ( +const ContextMenuSubContent = ({ + ref, + className, + ...props +}: React.ComponentPropsWithoutRef & { + ref?: React.Ref | null> +}) => ( -)) +) ContextMenuSubContent.displayName = ContextMenuPrimitive.SubContent.displayName -const ContextMenuContent = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, ...props }, ref) => ( +const ContextMenuContent = ({ + ref, + className, + ...props +}: React.ComponentPropsWithoutRef & { + ref?: React.Ref | null> +}) => ( -)) +) ContextMenuContent.displayName = ContextMenuPrimitive.Content.displayName -const ContextMenuItem = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef & { - inset?: boolean - } ->(({ className, inset, ...props }, ref) => ( +const ContextMenuItem = ({ + ref, + className, + inset, + ...props +}: React.ComponentPropsWithoutRef & { + inset?: boolean +} & { ref?: React.Ref | null> }) => ( -)) +) ContextMenuItem.displayName = ContextMenuPrimitive.Item.displayName -const ContextMenuCheckboxItem = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, children, checked, ...props }, ref) => ( +const ContextMenuCheckboxItem = ({ + ref, + className, + children, + checked, + ...props +}: React.ComponentPropsWithoutRef & { + ref?: React.Ref | null> +}) => ( {children} -)) +) ContextMenuCheckboxItem.displayName = ContextMenuPrimitive.CheckboxItem.displayName -const ContextMenuLabel = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef & { - inset?: boolean - } ->(({ className, inset, ...props }, ref) => ( +const ContextMenuLabel = ({ + ref, + className, + inset, + ...props +}: React.ComponentPropsWithoutRef & { + inset?: boolean +} & { ref?: React.Ref | null> }) => ( -)) +) ContextMenuLabel.displayName = ContextMenuPrimitive.Label.displayName -const ContextMenuSeparator = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef ->(({ ...props }, ref) => ( +const ContextMenuSeparator = ({ + ref, + ...props +}: React.ComponentPropsWithoutRef & { + ref?: React.Ref | null> +}) => ( -)) +) ContextMenuSeparator.displayName = ContextMenuPrimitive.Separator.displayName export { diff --git a/apps/desktop/src/renderer/src/components/ui/context-menu/index.ts b/apps/desktop/layer/renderer/src/components/ui/context-menu/index.ts similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/context-menu/index.ts rename to apps/desktop/layer/renderer/src/components/ui/context-menu/index.ts diff --git a/apps/desktop/src/renderer/src/components/ui/datetime/index.tsx b/apps/desktop/layer/renderer/src/components/ui/datetime/index.tsx similarity index 100% rename from apps/desktop/src/renderer/src/components/ui/datetime/index.tsx rename to apps/desktop/layer/renderer/src/components/ui/datetime/index.tsx diff --git a/apps/desktop/src/renderer/src/components/ui/drop-zone.tsx b/apps/desktop/layer/renderer/src/components/ui/drop-zone.tsx similarity index 94% rename from apps/desktop/src/renderer/src/components/ui/drop-zone.tsx rename to apps/desktop/layer/renderer/src/components/ui/drop-zone.tsx index e0d8a4602..4b1ad9413 100644 --- a/apps/desktop/src/renderer/src/components/ui/drop-zone.tsx +++ b/apps/desktop/layer/renderer/src/components/ui/drop-zone.tsx @@ -59,7 +59,7 @@ export const DropZone = ({ return (