diff --git a/.env.example b/.env.example deleted file mode 100644 index db3376d05..000000000 --- a/.env.example +++ /dev/null @@ -1,14 +0,0 @@ -VITE_WEB_URL=http://localhost:5173 -VITE_API_URL=http://localhost:3000 -VITE_IMGPROXY_URL=http://localhost:2873 -VITE_SENTRY_DSN= -VITE_BUILD_TYPE=production -VITE_INBOXES_EMAIL=@follow.re -VITE_OPENPANEL_CLIENT_ID= -VITE_OPENPANEL_API_URL= - -EXPO_PUBLIC_API_URL=https://api.follow.is -EXPO_PUBLIC_OPENPANEL_CLIENT_ID= -EXPO_PUBLIC_OPENPANEL_API_URL= - -VITE_EDITOR=cursor diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml index 0e0d1516c..77f619546 100644 --- a/.github/workflows/build-web.yml +++ b/.github/workflows/build-web.yml @@ -42,4 +42,4 @@ jobs: run: pnpm install - name: Build web and SSR server run: | - npm exec turbo run //#build:web @follow/server#build + npm exec turbo run @follow/desktop#build:web @follow/server#build diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ada7e4df..637393419 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,10 +122,12 @@ jobs: - name: Install dependencies run: pnpm i - name: Update main hash - run: pnpm update:main-hash + run: | + cd apps/desktop + pnpm update:main-hash - name: Build if: matrix.os != 'macos-latest' - run: npm exec turbo run //#build + run: pnpm build:electron env: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} @@ -141,7 +143,7 @@ jobs: with: max_attempts: 3 timeout_minutes: 10 - command: npm exec turbo run //#build:macos + command: pnpm build:macos - name: Build (Mac App Store) if: matrix.os == 'macos-latest' && github.event.inputs.mas == 'true' @@ -150,7 +152,7 @@ jobs: OSX_SIGN_IDENTITY: ${{ secrets.OSX_SIGN_IDENTITY_MAS }} OSX_SIGN_PROVISIONING_PROFILE_PATH: ${{ runner.temp }}/build_pp.provisionprofile BUILD_VERSION: ${{ github.event.inputs.build_version }} - run: npm exec turbo run //#build:mas + run: pnpm build:mas - name: Build Renderer if: matrix.os == 'ubuntu-latest' @@ -166,14 +168,14 @@ jobs: with: name: ${{ matrix.os }} path: | - out/make/**/*.dmg - out/make/**/*.zip - out/make/**/*.exe - out/make/**/*.AppImage - out/make/**/*.yml - out/make/**/*.pkg - dist/manifest.yml - dist/*.tar.gz + apps/desktop/out/make/**/*.dmg + apps/desktop/out/make/**/*.zip + apps/desktop/out/make/**/*.exe + apps/desktop/out/make/**/*.AppImage + apps/desktop/out/make/**/*.yml + apps/desktop/out/make/**/*.pkg + apps/desktop/dist/manifest.yml + apps/desktop/dist/*.tar.gz retention-days: 90 - name: Upload file (arm64.dmg) @@ -184,7 +186,7 @@ jobs: with: name: macos-arm64-dmg path: | - out/make/**/*arm64.dmg + apps/desktop/out/make/**/*arm64.dmg retention-days: 90 - name: Upload file (pkg) @@ -204,13 +206,13 @@ jobs: uses: actions/attest-build-provenance@v1 with: subject-path: | - out/make/**/*.dmg - out/make/**/*.zip - out/make/**/*.exe - out/make/**/*.AppImage - out/make/**/*.yml - dist/manifest.yml - dist/*.tar.gz + apps/desktop/out/make/**/*.dmg + apps/desktop/out/make/**/*.zip + apps/desktop/out/make/**/*.exe + apps/desktop/out/make/**/*.AppImage + apps/desktop/out/make/**/*.yml + apps/desktop/dist/manifest.yml + apps/desktop/dist/*.tar.gz - run: npx changelogithub if: github.ref_type == 'tag' || github.event.inputs.tag_version == 'true' @@ -231,10 +233,10 @@ jobs: prerelease: true tag_name: v${{ steps.version.outputs.APP_VERSION }} files: | - out/make/**/*.dmg - out/make/**/*.zip - out/make/**/*.exe - out/make/**/*.AppImage - out/make/**/*.yml - dist/manifest.yml - dist/*.tar.gz + apps/desktop/out/make/**/*.dmg + apps/desktop/out/make/**/*.zip + apps/desktop/out/make/**/*.exe + apps/desktop/out/make/**/*.AppImage + apps/desktop/out/make/**/*.yml + apps/desktop/dist/manifest.yml + apps/desktop/dist/*.tar.gz diff --git a/.gitignore b/.gitignore index a51e1ff76..ea9dbaa88 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ vite.config.*.mjs .generated .turbo -apps/renderer/dev-dist +apps/desktop/src/renderer/dev-dist tsconfig.tsbuildinfo apps/mobile/ios diff --git a/.vscode/settings.json b/.vscode/settings.json index 9c0ee4ede..b2f70433d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,8 +18,8 @@ ], "tailwindCSS.experimental.configFile": { "apps/mobile/tailwind.config.ts": "apps/mobile/**", - "apps/server/tailwind.config.ts": "apps/server/**", - "tailwind.config.ts": ["!apps/mobile/**", "!apps/server/**", "**"] + "apps/desktop/src/server/tailwind.config.ts": "apps/desktop/src/server/**", + "tailwind.config.ts": ["!apps/mobile/**", "!apps/desktop/src/server/**", "**"] }, "typescript.tsserver.maxTsServerMemory": 8096, "typescript.tsserver.nodePath": "node", diff --git a/build/entitlements.mac.plist b/apps/desktop/build/entitlements.mac.plist similarity index 100% rename from build/entitlements.mac.plist rename to apps/desktop/build/entitlements.mac.plist diff --git a/build/entitlements.mas.child.plist b/apps/desktop/build/entitlements.mas.child.plist similarity index 100% rename from build/entitlements.mas.child.plist rename to apps/desktop/build/entitlements.mas.child.plist diff --git a/build/entitlements.mas.plist b/apps/desktop/build/entitlements.mas.plist similarity index 100% rename from build/entitlements.mas.plist rename to apps/desktop/build/entitlements.mas.plist diff --git a/configs/vite.electron-render.config.ts b/apps/desktop/configs/vite.electron-render.config.ts similarity index 88% rename from configs/vite.electron-render.config.ts rename to apps/desktop/configs/vite.electron-render.config.ts index 1b693efb7..0636d9dca 100644 --- a/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, "apps/renderer"), + root: resolve(root, "src/renderer"), build: { outDir: resolve(root, "dist/renderer"), sourcemap: !!process.env.CI, target: "esnext", rollupOptions: { input: { - main: resolve(root, "apps/renderer/index.html"), + main: resolve(root, "src/renderer/index.html"), }, }, minify: true, diff --git a/configs/vite.render.config.ts b/apps/desktop/configs/vite.render.config.ts similarity index 93% rename from configs/vite.render.config.ts rename to apps/desktop/configs/vite.render.config.ts index 4cceaa661..0e5ab512e 100644 --- a/configs/vite.render.config.ts +++ b/apps/desktop/configs/vite.render.config.ts @@ -7,12 +7,12 @@ import react from "@vitejs/plugin-react" import { prerelease } from "semver" import type { UserConfig } from "vite" +import { getGitHash } from "../../../scripts/lib" import { astPlugin } from "../plugins/vite/ast" import { circularImportRefreshPlugin } from "../plugins/vite/hmr" import { customI18nHmrPlugin } from "../plugins/vite/i18n-hmr" import { localesPlugin } from "../plugins/vite/locales" import i18nCompleteness from "../plugins/vite/utils/i18n-completeness" -import { getGitHash } from "../scripts/lib" const pkgDir = resolve(dirname(fileURLToPath(import.meta.url)), "..") const pkg = JSON.parse(readFileSync(resolve(pkgDir, "./package.json"), "utf8")) @@ -33,10 +33,10 @@ const changelogFile = getChangelogFileContent() export const viteRenderBaseConfig = { resolve: { alias: { - "~": resolve("apps/renderer/src"), + "~": resolve("src/renderer/src"), "@pkg": resolve("package.json"), "@locales": resolve("locales"), - "@follow/electron-main": resolve("apps/main/src"), + "@follow/electron-main": resolve("src/main/src"), }, }, base: "/", @@ -81,7 +81,7 @@ export const viteRenderBaseConfig = { ], define: { APP_VERSION: JSON.stringify(pkg.version), - APP_NAME: JSON.stringify(pkg.name), + APP_NAME: JSON.stringify(pkg.productName), APP_DEV_CWD: JSON.stringify(process.cwd()), GIT_COMMIT_SHA: JSON.stringify(process.env.VERCEL_GIT_COMMIT_SHA || getGitHash()), diff --git a/electron.vite.config.ts b/apps/desktop/electron.vite.config.ts similarity index 87% rename from electron.vite.config.ts rename to apps/desktop/electron.vite.config.ts index 7590d738d..fecd11cfa 100644 --- a/electron.vite.config.ts +++ b/apps/desktop/electron.vite.config.ts @@ -2,17 +2,17 @@ import { resolve } from "node:path" import { defineConfig } from "electron-vite" +import { getGitHash } from "../../scripts/lib" import { viteRenderBaseConfig } from "./configs/vite.render.config" import { cleanupUnnecessaryFilesPlugin } from "./plugins/vite/cleanup" import { createPlatformSpecificImportPlugin } from "./plugins/vite/specific-import" -import { getGitHash } from "./scripts/lib" export default defineConfig({ main: { build: { outDir: "dist/main", lib: { - entry: "./apps/main/src/index.ts", + entry: "./src/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("./apps/main/src"), + "~": resolve("./src/main/src"), }, }, define: { @@ -32,7 +32,7 @@ export default defineConfig({ build: { outDir: "dist/preload", lib: { - entry: "./apps/main/preload/index.ts", + entry: "./src/main/preload/index.ts", }, }, resolve: { @@ -45,14 +45,14 @@ export default defineConfig({ renderer: { ...viteRenderBaseConfig, - root: "apps/renderer", + root: "src/renderer", build: { outDir: "dist/renderer", sourcemap: !!process.env.CI, target: "esnext", rollupOptions: { input: { - main: resolve("./apps/renderer/index.html"), + main: resolve("./src/renderer/index.html"), }, }, minify: true, diff --git a/forge.config.cts b/apps/desktop/forge.config.cts similarity index 98% rename from forge.config.cts rename to apps/desktop/forge.config.cts index 2def025f9..a91e0b1f7 100644 --- a/forge.config.cts +++ b/apps/desktop/forge.config.cts @@ -74,7 +74,7 @@ async function cleanSources(buildPath, _electronVersion, platform, _arch, callba return } return cp( - path.join(process.cwd(), "node_modules", item), + path.join(process.cwd(), "../../node_modules", item), path.join(buildPath, "node_modules", item), { recursive: true, @@ -241,7 +241,7 @@ const config: ForgeConfig = { result.artifacts = result.artifacts.map((artifact) => { if (artifactRegex.test(artifact)) { const newArtifact = `${path.dirname(artifact)}/${ - result.packageJSON.name + result.packageJSON.productName }-${result.packageJSON.version}-${ platformNamesMap[result.platform] }-${result.arch}${path.extname(artifact)}` diff --git a/locales/app/ar-DZ.json b/apps/desktop/locales/app/ar-DZ.json similarity index 100% rename from locales/app/ar-DZ.json rename to apps/desktop/locales/app/ar-DZ.json diff --git a/locales/app/ar-IQ.json b/apps/desktop/locales/app/ar-IQ.json similarity index 100% rename from locales/app/ar-IQ.json rename to apps/desktop/locales/app/ar-IQ.json diff --git a/locales/app/ar-KW.json b/apps/desktop/locales/app/ar-KW.json similarity index 100% rename from locales/app/ar-KW.json rename to apps/desktop/locales/app/ar-KW.json diff --git a/locales/app/ar-MA.json b/apps/desktop/locales/app/ar-MA.json similarity index 100% rename from locales/app/ar-MA.json rename to apps/desktop/locales/app/ar-MA.json diff --git a/locales/app/ar-SA.json b/apps/desktop/locales/app/ar-SA.json similarity index 100% rename from locales/app/ar-SA.json rename to apps/desktop/locales/app/ar-SA.json diff --git a/locales/app/ar-TN.json b/apps/desktop/locales/app/ar-TN.json similarity index 100% rename from locales/app/ar-TN.json rename to apps/desktop/locales/app/ar-TN.json diff --git a/locales/app/de.json b/apps/desktop/locales/app/de.json similarity index 100% rename from locales/app/de.json rename to apps/desktop/locales/app/de.json diff --git a/locales/app/en.json b/apps/desktop/locales/app/en.json similarity index 100% rename from locales/app/en.json rename to apps/desktop/locales/app/en.json diff --git a/locales/app/es.json b/apps/desktop/locales/app/es.json similarity index 100% rename from locales/app/es.json rename to apps/desktop/locales/app/es.json diff --git a/locales/app/fi.json b/apps/desktop/locales/app/fi.json similarity index 100% rename from locales/app/fi.json rename to apps/desktop/locales/app/fi.json diff --git a/locales/app/fr.json b/apps/desktop/locales/app/fr.json similarity index 100% rename from locales/app/fr.json rename to apps/desktop/locales/app/fr.json diff --git a/locales/app/it.json b/apps/desktop/locales/app/it.json similarity index 100% rename from locales/app/it.json rename to apps/desktop/locales/app/it.json diff --git a/locales/app/ja.json b/apps/desktop/locales/app/ja.json similarity index 100% rename from locales/app/ja.json rename to apps/desktop/locales/app/ja.json diff --git a/locales/app/ko.json b/apps/desktop/locales/app/ko.json similarity index 100% rename from locales/app/ko.json rename to apps/desktop/locales/app/ko.json diff --git a/locales/app/pt.json b/apps/desktop/locales/app/pt.json similarity index 100% rename from locales/app/pt.json rename to apps/desktop/locales/app/pt.json diff --git a/locales/app/ru.json b/apps/desktop/locales/app/ru.json similarity index 100% rename from locales/app/ru.json rename to apps/desktop/locales/app/ru.json diff --git a/locales/app/tr.json b/apps/desktop/locales/app/tr.json similarity index 100% rename from locales/app/tr.json rename to apps/desktop/locales/app/tr.json diff --git a/locales/app/zh-CN.json b/apps/desktop/locales/app/zh-CN.json similarity index 100% rename from locales/app/zh-CN.json rename to apps/desktop/locales/app/zh-CN.json diff --git a/locales/app/zh-HK.json b/apps/desktop/locales/app/zh-HK.json similarity index 100% rename from locales/app/zh-HK.json rename to apps/desktop/locales/app/zh-HK.json diff --git a/locales/app/zh-TW.json b/apps/desktop/locales/app/zh-TW.json similarity index 100% rename from locales/app/zh-TW.json rename to apps/desktop/locales/app/zh-TW.json diff --git a/locales/common/ar-DZ.json b/apps/desktop/locales/common/ar-DZ.json similarity index 100% rename from locales/common/ar-DZ.json rename to apps/desktop/locales/common/ar-DZ.json diff --git a/locales/common/ar-IQ.json b/apps/desktop/locales/common/ar-IQ.json similarity index 100% rename from locales/common/ar-IQ.json rename to apps/desktop/locales/common/ar-IQ.json diff --git a/locales/common/ar-KW.json b/apps/desktop/locales/common/ar-KW.json similarity index 100% rename from locales/common/ar-KW.json rename to apps/desktop/locales/common/ar-KW.json diff --git a/locales/common/ar-MA.json b/apps/desktop/locales/common/ar-MA.json similarity index 100% rename from locales/common/ar-MA.json rename to apps/desktop/locales/common/ar-MA.json diff --git a/locales/common/ar-SA.json b/apps/desktop/locales/common/ar-SA.json similarity index 100% rename from locales/common/ar-SA.json rename to apps/desktop/locales/common/ar-SA.json diff --git a/locales/common/ar-TN.json b/apps/desktop/locales/common/ar-TN.json similarity index 100% rename from locales/common/ar-TN.json rename to apps/desktop/locales/common/ar-TN.json diff --git a/locales/common/de.json b/apps/desktop/locales/common/de.json similarity index 100% rename from locales/common/de.json rename to apps/desktop/locales/common/de.json diff --git a/locales/common/en.json b/apps/desktop/locales/common/en.json similarity index 100% rename from locales/common/en.json rename to apps/desktop/locales/common/en.json diff --git a/locales/common/es.json b/apps/desktop/locales/common/es.json similarity index 100% rename from locales/common/es.json rename to apps/desktop/locales/common/es.json diff --git a/locales/common/fi.json b/apps/desktop/locales/common/fi.json similarity index 100% rename from locales/common/fi.json rename to apps/desktop/locales/common/fi.json diff --git a/locales/common/fr.json b/apps/desktop/locales/common/fr.json similarity index 100% rename from locales/common/fr.json rename to apps/desktop/locales/common/fr.json diff --git a/locales/common/it.json b/apps/desktop/locales/common/it.json similarity index 100% rename from locales/common/it.json rename to apps/desktop/locales/common/it.json diff --git a/locales/common/ja.json b/apps/desktop/locales/common/ja.json similarity index 100% rename from locales/common/ja.json rename to apps/desktop/locales/common/ja.json diff --git a/locales/common/ko.json b/apps/desktop/locales/common/ko.json similarity index 100% rename from locales/common/ko.json rename to apps/desktop/locales/common/ko.json diff --git a/locales/common/pt.json b/apps/desktop/locales/common/pt.json similarity index 100% rename from locales/common/pt.json rename to apps/desktop/locales/common/pt.json diff --git a/locales/common/ru.json b/apps/desktop/locales/common/ru.json similarity index 100% rename from locales/common/ru.json rename to apps/desktop/locales/common/ru.json diff --git a/locales/common/tr.json b/apps/desktop/locales/common/tr.json similarity index 100% rename from locales/common/tr.json rename to apps/desktop/locales/common/tr.json diff --git a/locales/common/zh-CN.json b/apps/desktop/locales/common/zh-CN.json similarity index 100% rename from locales/common/zh-CN.json rename to apps/desktop/locales/common/zh-CN.json diff --git a/locales/common/zh-HK.json b/apps/desktop/locales/common/zh-HK.json similarity index 100% rename from locales/common/zh-HK.json rename to apps/desktop/locales/common/zh-HK.json diff --git a/locales/common/zh-TW.json b/apps/desktop/locales/common/zh-TW.json similarity index 100% rename from locales/common/zh-TW.json rename to apps/desktop/locales/common/zh-TW.json diff --git a/locales/errors/de.json b/apps/desktop/locales/errors/de.json similarity index 100% rename from locales/errors/de.json rename to apps/desktop/locales/errors/de.json diff --git a/locales/errors/en.json b/apps/desktop/locales/errors/en.json similarity index 100% rename from locales/errors/en.json rename to apps/desktop/locales/errors/en.json diff --git a/locales/errors/fr.json b/apps/desktop/locales/errors/fr.json similarity index 100% rename from locales/errors/fr.json rename to apps/desktop/locales/errors/fr.json diff --git a/locales/errors/ja.json b/apps/desktop/locales/errors/ja.json similarity index 100% rename from locales/errors/ja.json rename to apps/desktop/locales/errors/ja.json diff --git a/locales/errors/ko.json b/apps/desktop/locales/errors/ko.json similarity index 100% rename from locales/errors/ko.json rename to apps/desktop/locales/errors/ko.json diff --git a/locales/errors/ru.json b/apps/desktop/locales/errors/ru.json similarity index 100% rename from locales/errors/ru.json rename to apps/desktop/locales/errors/ru.json diff --git a/locales/errors/tr.json b/apps/desktop/locales/errors/tr.json similarity index 100% rename from locales/errors/tr.json rename to apps/desktop/locales/errors/tr.json diff --git a/locales/errors/zh-CN.json b/apps/desktop/locales/errors/zh-CN.json similarity index 100% rename from locales/errors/zh-CN.json rename to apps/desktop/locales/errors/zh-CN.json diff --git a/locales/errors/zh-HK.json b/apps/desktop/locales/errors/zh-HK.json similarity index 100% rename from locales/errors/zh-HK.json rename to apps/desktop/locales/errors/zh-HK.json diff --git a/locales/errors/zh-TW.json b/apps/desktop/locales/errors/zh-TW.json similarity index 100% rename from locales/errors/zh-TW.json rename to apps/desktop/locales/errors/zh-TW.json diff --git a/locales/external/ar-DZ.json b/apps/desktop/locales/external/ar-DZ.json similarity index 100% rename from locales/external/ar-DZ.json rename to apps/desktop/locales/external/ar-DZ.json diff --git a/locales/external/ar-IQ.json b/apps/desktop/locales/external/ar-IQ.json similarity index 100% rename from locales/external/ar-IQ.json rename to apps/desktop/locales/external/ar-IQ.json diff --git a/locales/external/ar-MA.json b/apps/desktop/locales/external/ar-MA.json similarity index 100% rename from locales/external/ar-MA.json rename to apps/desktop/locales/external/ar-MA.json diff --git a/locales/external/ar-SA.json b/apps/desktop/locales/external/ar-SA.json similarity index 100% rename from locales/external/ar-SA.json rename to apps/desktop/locales/external/ar-SA.json diff --git a/locales/external/ar-TN.json b/apps/desktop/locales/external/ar-TN.json similarity index 100% rename from locales/external/ar-TN.json rename to apps/desktop/locales/external/ar-TN.json diff --git a/locales/external/ar-kw.json b/apps/desktop/locales/external/ar-kw.json similarity index 100% rename from locales/external/ar-kw.json rename to apps/desktop/locales/external/ar-kw.json diff --git a/locales/external/de.json b/apps/desktop/locales/external/de.json similarity index 100% rename from locales/external/de.json rename to apps/desktop/locales/external/de.json diff --git a/locales/external/en.json b/apps/desktop/locales/external/en.json similarity index 100% rename from locales/external/en.json rename to apps/desktop/locales/external/en.json diff --git a/locales/external/es.json b/apps/desktop/locales/external/es.json similarity index 100% rename from locales/external/es.json rename to apps/desktop/locales/external/es.json diff --git a/locales/external/fi.json b/apps/desktop/locales/external/fi.json similarity index 100% rename from locales/external/fi.json rename to apps/desktop/locales/external/fi.json diff --git a/locales/external/fr.json b/apps/desktop/locales/external/fr.json similarity index 100% rename from locales/external/fr.json rename to apps/desktop/locales/external/fr.json diff --git a/locales/external/it.json b/apps/desktop/locales/external/it.json similarity index 100% rename from locales/external/it.json rename to apps/desktop/locales/external/it.json diff --git a/locales/external/ja.json b/apps/desktop/locales/external/ja.json similarity index 100% rename from locales/external/ja.json rename to apps/desktop/locales/external/ja.json diff --git a/locales/external/ko.json b/apps/desktop/locales/external/ko.json similarity index 100% rename from locales/external/ko.json rename to apps/desktop/locales/external/ko.json diff --git a/locales/external/pt.json b/apps/desktop/locales/external/pt.json similarity index 100% rename from locales/external/pt.json rename to apps/desktop/locales/external/pt.json diff --git a/locales/external/ru.json b/apps/desktop/locales/external/ru.json similarity index 100% rename from locales/external/ru.json rename to apps/desktop/locales/external/ru.json diff --git a/locales/external/tr.json b/apps/desktop/locales/external/tr.json similarity index 100% rename from locales/external/tr.json rename to apps/desktop/locales/external/tr.json diff --git a/locales/external/zh-CN.json b/apps/desktop/locales/external/zh-CN.json similarity index 100% rename from locales/external/zh-CN.json rename to apps/desktop/locales/external/zh-CN.json diff --git a/locales/external/zh-HK.json b/apps/desktop/locales/external/zh-HK.json similarity index 100% rename from locales/external/zh-HK.json rename to apps/desktop/locales/external/zh-HK.json diff --git a/locales/external/zh-TW.json b/apps/desktop/locales/external/zh-TW.json similarity index 100% rename from locales/external/zh-TW.json rename to apps/desktop/locales/external/zh-TW.json diff --git a/locales/lang/ar-DZ.json b/apps/desktop/locales/lang/ar-DZ.json similarity index 100% rename from locales/lang/ar-DZ.json rename to apps/desktop/locales/lang/ar-DZ.json diff --git a/locales/lang/ar-IQ.json b/apps/desktop/locales/lang/ar-IQ.json similarity index 100% rename from locales/lang/ar-IQ.json rename to apps/desktop/locales/lang/ar-IQ.json diff --git a/locales/lang/ar-KW.json b/apps/desktop/locales/lang/ar-KW.json similarity index 100% rename from locales/lang/ar-KW.json rename to apps/desktop/locales/lang/ar-KW.json diff --git a/locales/lang/ar-MA.json b/apps/desktop/locales/lang/ar-MA.json similarity index 100% rename from locales/lang/ar-MA.json rename to apps/desktop/locales/lang/ar-MA.json diff --git a/locales/lang/ar-SA.json b/apps/desktop/locales/lang/ar-SA.json similarity index 100% rename from locales/lang/ar-SA.json rename to apps/desktop/locales/lang/ar-SA.json diff --git a/locales/lang/ar-TN.json b/apps/desktop/locales/lang/ar-TN.json similarity index 100% rename from locales/lang/ar-TN.json rename to apps/desktop/locales/lang/ar-TN.json diff --git a/locales/lang/de.json b/apps/desktop/locales/lang/de.json similarity index 100% rename from locales/lang/de.json rename to apps/desktop/locales/lang/de.json diff --git a/locales/lang/en.json b/apps/desktop/locales/lang/en.json similarity index 100% rename from locales/lang/en.json rename to apps/desktop/locales/lang/en.json diff --git a/locales/lang/es.json b/apps/desktop/locales/lang/es.json similarity index 100% rename from locales/lang/es.json rename to apps/desktop/locales/lang/es.json diff --git a/locales/lang/fi.json b/apps/desktop/locales/lang/fi.json similarity index 100% rename from locales/lang/fi.json rename to apps/desktop/locales/lang/fi.json diff --git a/locales/lang/fr.json b/apps/desktop/locales/lang/fr.json similarity index 100% rename from locales/lang/fr.json rename to apps/desktop/locales/lang/fr.json diff --git a/locales/lang/it.json b/apps/desktop/locales/lang/it.json similarity index 100% rename from locales/lang/it.json rename to apps/desktop/locales/lang/it.json diff --git a/locales/lang/ja.json b/apps/desktop/locales/lang/ja.json similarity index 100% rename from locales/lang/ja.json rename to apps/desktop/locales/lang/ja.json diff --git a/locales/lang/ko.json b/apps/desktop/locales/lang/ko.json similarity index 100% rename from locales/lang/ko.json rename to apps/desktop/locales/lang/ko.json diff --git a/locales/lang/pt.json b/apps/desktop/locales/lang/pt.json similarity index 100% rename from locales/lang/pt.json rename to apps/desktop/locales/lang/pt.json diff --git a/locales/lang/ru.json b/apps/desktop/locales/lang/ru.json similarity index 100% rename from locales/lang/ru.json rename to apps/desktop/locales/lang/ru.json diff --git a/locales/lang/tr.json b/apps/desktop/locales/lang/tr.json similarity index 100% rename from locales/lang/tr.json rename to apps/desktop/locales/lang/tr.json diff --git a/locales/lang/zh-CN.json b/apps/desktop/locales/lang/zh-CN.json similarity index 100% rename from locales/lang/zh-CN.json rename to apps/desktop/locales/lang/zh-CN.json diff --git a/locales/lang/zh-HK.json b/apps/desktop/locales/lang/zh-HK.json similarity index 100% rename from locales/lang/zh-HK.json rename to apps/desktop/locales/lang/zh-HK.json diff --git a/locales/lang/zh-TW.json b/apps/desktop/locales/lang/zh-TW.json similarity index 100% rename from locales/lang/zh-TW.json rename to apps/desktop/locales/lang/zh-TW.json diff --git a/locales/native/ar-IQ.json b/apps/desktop/locales/native/ar-IQ.json similarity index 100% rename from locales/native/ar-IQ.json rename to apps/desktop/locales/native/ar-IQ.json diff --git a/locales/native/ar-KW.json b/apps/desktop/locales/native/ar-KW.json similarity index 100% rename from locales/native/ar-KW.json rename to apps/desktop/locales/native/ar-KW.json diff --git a/locales/native/ar-TN.json b/apps/desktop/locales/native/ar-TN.json similarity index 100% rename from locales/native/ar-TN.json rename to apps/desktop/locales/native/ar-TN.json diff --git a/locales/native/de.json b/apps/desktop/locales/native/de.json similarity index 100% rename from locales/native/de.json rename to apps/desktop/locales/native/de.json diff --git a/locales/native/en.json b/apps/desktop/locales/native/en.json similarity index 100% rename from locales/native/en.json rename to apps/desktop/locales/native/en.json diff --git a/locales/native/fr.json b/apps/desktop/locales/native/fr.json similarity index 100% rename from locales/native/fr.json rename to apps/desktop/locales/native/fr.json diff --git a/locales/native/it.json b/apps/desktop/locales/native/it.json similarity index 100% rename from locales/native/it.json rename to apps/desktop/locales/native/it.json diff --git a/locales/native/ja.json b/apps/desktop/locales/native/ja.json similarity index 100% rename from locales/native/ja.json rename to apps/desktop/locales/native/ja.json diff --git a/locales/native/ko.json b/apps/desktop/locales/native/ko.json similarity index 100% rename from locales/native/ko.json rename to apps/desktop/locales/native/ko.json diff --git a/locales/native/ru.json b/apps/desktop/locales/native/ru.json similarity index 100% rename from locales/native/ru.json rename to apps/desktop/locales/native/ru.json diff --git a/locales/native/tr.json b/apps/desktop/locales/native/tr.json similarity index 100% rename from locales/native/tr.json rename to apps/desktop/locales/native/tr.json diff --git a/locales/native/zh-CN.json b/apps/desktop/locales/native/zh-CN.json similarity index 100% rename from locales/native/zh-CN.json rename to apps/desktop/locales/native/zh-CN.json diff --git a/locales/native/zh-HK.json b/apps/desktop/locales/native/zh-HK.json similarity index 100% rename from locales/native/zh-HK.json rename to apps/desktop/locales/native/zh-HK.json diff --git a/locales/native/zh-TW.json b/apps/desktop/locales/native/zh-TW.json similarity index 100% rename from locales/native/zh-TW.json rename to apps/desktop/locales/native/zh-TW.json diff --git a/locales/settings/ar-DZ.json b/apps/desktop/locales/settings/ar-DZ.json similarity index 100% rename from locales/settings/ar-DZ.json rename to apps/desktop/locales/settings/ar-DZ.json diff --git a/locales/settings/ar-IQ.json b/apps/desktop/locales/settings/ar-IQ.json similarity index 100% rename from locales/settings/ar-IQ.json rename to apps/desktop/locales/settings/ar-IQ.json diff --git a/locales/settings/ar-KW.json b/apps/desktop/locales/settings/ar-KW.json similarity index 100% rename from locales/settings/ar-KW.json rename to apps/desktop/locales/settings/ar-KW.json diff --git a/locales/settings/ar-MA.json b/apps/desktop/locales/settings/ar-MA.json similarity index 100% rename from locales/settings/ar-MA.json rename to apps/desktop/locales/settings/ar-MA.json diff --git a/locales/settings/ar-SA.json b/apps/desktop/locales/settings/ar-SA.json similarity index 100% rename from locales/settings/ar-SA.json rename to apps/desktop/locales/settings/ar-SA.json diff --git a/locales/settings/ar-TN.json b/apps/desktop/locales/settings/ar-TN.json similarity index 100% rename from locales/settings/ar-TN.json rename to apps/desktop/locales/settings/ar-TN.json diff --git a/locales/settings/de.json b/apps/desktop/locales/settings/de.json similarity index 100% rename from locales/settings/de.json rename to apps/desktop/locales/settings/de.json diff --git a/locales/settings/en.json b/apps/desktop/locales/settings/en.json similarity index 100% rename from locales/settings/en.json rename to apps/desktop/locales/settings/en.json diff --git a/locales/settings/es.json b/apps/desktop/locales/settings/es.json similarity index 100% rename from locales/settings/es.json rename to apps/desktop/locales/settings/es.json diff --git a/locales/settings/fi.json b/apps/desktop/locales/settings/fi.json similarity index 100% rename from locales/settings/fi.json rename to apps/desktop/locales/settings/fi.json diff --git a/locales/settings/fr.json b/apps/desktop/locales/settings/fr.json similarity index 100% rename from locales/settings/fr.json rename to apps/desktop/locales/settings/fr.json diff --git a/locales/settings/it.json b/apps/desktop/locales/settings/it.json similarity index 100% rename from locales/settings/it.json rename to apps/desktop/locales/settings/it.json diff --git a/locales/settings/ja.json b/apps/desktop/locales/settings/ja.json similarity index 100% rename from locales/settings/ja.json rename to apps/desktop/locales/settings/ja.json diff --git a/locales/settings/ko.json b/apps/desktop/locales/settings/ko.json similarity index 100% rename from locales/settings/ko.json rename to apps/desktop/locales/settings/ko.json diff --git a/locales/settings/pt.json b/apps/desktop/locales/settings/pt.json similarity index 100% rename from locales/settings/pt.json rename to apps/desktop/locales/settings/pt.json diff --git a/locales/settings/ru.json b/apps/desktop/locales/settings/ru.json similarity index 100% rename from locales/settings/ru.json rename to apps/desktop/locales/settings/ru.json diff --git a/locales/settings/tr.json b/apps/desktop/locales/settings/tr.json similarity index 100% rename from locales/settings/tr.json rename to apps/desktop/locales/settings/tr.json diff --git a/locales/settings/zh-CN.json b/apps/desktop/locales/settings/zh-CN.json similarity index 100% rename from locales/settings/zh-CN.json rename to apps/desktop/locales/settings/zh-CN.json diff --git a/locales/settings/zh-HK.json b/apps/desktop/locales/settings/zh-HK.json similarity index 100% rename from locales/settings/zh-HK.json rename to apps/desktop/locales/settings/zh-HK.json diff --git a/locales/settings/zh-TW.json b/apps/desktop/locales/settings/zh-TW.json similarity index 100% rename from locales/settings/zh-TW.json rename to apps/desktop/locales/settings/zh-TW.json diff --git a/locales/shortcuts/ar-DZ.json b/apps/desktop/locales/shortcuts/ar-DZ.json similarity index 100% rename from locales/shortcuts/ar-DZ.json rename to apps/desktop/locales/shortcuts/ar-DZ.json diff --git a/locales/shortcuts/ar-IQ.json b/apps/desktop/locales/shortcuts/ar-IQ.json similarity index 100% rename from locales/shortcuts/ar-IQ.json rename to apps/desktop/locales/shortcuts/ar-IQ.json diff --git a/locales/shortcuts/ar-KW.json b/apps/desktop/locales/shortcuts/ar-KW.json similarity index 100% rename from locales/shortcuts/ar-KW.json rename to apps/desktop/locales/shortcuts/ar-KW.json diff --git a/locales/shortcuts/ar-MA.json b/apps/desktop/locales/shortcuts/ar-MA.json similarity index 100% rename from locales/shortcuts/ar-MA.json rename to apps/desktop/locales/shortcuts/ar-MA.json diff --git a/locales/shortcuts/ar-SA.json b/apps/desktop/locales/shortcuts/ar-SA.json similarity index 100% rename from locales/shortcuts/ar-SA.json rename to apps/desktop/locales/shortcuts/ar-SA.json diff --git a/locales/shortcuts/ar-TN.json b/apps/desktop/locales/shortcuts/ar-TN.json similarity index 100% rename from locales/shortcuts/ar-TN.json rename to apps/desktop/locales/shortcuts/ar-TN.json diff --git a/locales/shortcuts/de.json b/apps/desktop/locales/shortcuts/de.json similarity index 100% rename from locales/shortcuts/de.json rename to apps/desktop/locales/shortcuts/de.json diff --git a/locales/shortcuts/en.json b/apps/desktop/locales/shortcuts/en.json similarity index 100% rename from locales/shortcuts/en.json rename to apps/desktop/locales/shortcuts/en.json diff --git a/locales/shortcuts/es.json b/apps/desktop/locales/shortcuts/es.json similarity index 100% rename from locales/shortcuts/es.json rename to apps/desktop/locales/shortcuts/es.json diff --git a/locales/shortcuts/fi.json b/apps/desktop/locales/shortcuts/fi.json similarity index 100% rename from locales/shortcuts/fi.json rename to apps/desktop/locales/shortcuts/fi.json diff --git a/locales/shortcuts/fr.json b/apps/desktop/locales/shortcuts/fr.json similarity index 100% rename from locales/shortcuts/fr.json rename to apps/desktop/locales/shortcuts/fr.json diff --git a/locales/shortcuts/it.json b/apps/desktop/locales/shortcuts/it.json similarity index 100% rename from locales/shortcuts/it.json rename to apps/desktop/locales/shortcuts/it.json diff --git a/locales/shortcuts/ja.json b/apps/desktop/locales/shortcuts/ja.json similarity index 100% rename from locales/shortcuts/ja.json rename to apps/desktop/locales/shortcuts/ja.json diff --git a/locales/shortcuts/ko.json b/apps/desktop/locales/shortcuts/ko.json similarity index 100% rename from locales/shortcuts/ko.json rename to apps/desktop/locales/shortcuts/ko.json diff --git a/locales/shortcuts/pt.json b/apps/desktop/locales/shortcuts/pt.json similarity index 100% rename from locales/shortcuts/pt.json rename to apps/desktop/locales/shortcuts/pt.json diff --git a/locales/shortcuts/ru.json b/apps/desktop/locales/shortcuts/ru.json similarity index 100% rename from locales/shortcuts/ru.json rename to apps/desktop/locales/shortcuts/ru.json diff --git a/locales/shortcuts/tr.json b/apps/desktop/locales/shortcuts/tr.json similarity index 100% rename from locales/shortcuts/tr.json rename to apps/desktop/locales/shortcuts/tr.json diff --git a/locales/shortcuts/zh-CN.json b/apps/desktop/locales/shortcuts/zh-CN.json similarity index 100% rename from locales/shortcuts/zh-CN.json rename to apps/desktop/locales/shortcuts/zh-CN.json diff --git a/locales/shortcuts/zh-HK.json b/apps/desktop/locales/shortcuts/zh-HK.json similarity index 100% rename from locales/shortcuts/zh-HK.json rename to apps/desktop/locales/shortcuts/zh-HK.json diff --git a/locales/shortcuts/zh-TW.json b/apps/desktop/locales/shortcuts/zh-TW.json similarity index 100% rename from locales/shortcuts/zh-TW.json rename to apps/desktop/locales/shortcuts/zh-TW.json diff --git a/apps/desktop/package.json b/apps/desktop/package.json new file mode 100644 index 000000000..c61f01286 --- /dev/null +++ b/apps/desktop/package.json @@ -0,0 +1,125 @@ +{ + "name": "@follow/desktop", + "type": "module", + "version": "0.3.7", + "private": true, + "description": "Follow everything in one place", + "author": "Follow Team", + "homepage": "https://github.com/RSSNext", + "repository": { + "url": "https://github.com/RSSNext/follow", + "type": "git" + }, + "main": "./dist/main/index.js", + "scripts": { + "analyze:web": "cross-env analyzer=1 vite build", + "build": "electron-vite build && electron-forge make", + "build:macos": "electron-vite build && electron-forge make --arch=x64 --platform=darwin && electron-forge make --arch=arm64 --platform=darwin && tsx scripts/merge-yml.ts", + "build:mas": "electron-vite build && electron-forge make --arch=universal --platform=mas", + "build:render": "vite build -c vite.config.electron-render.ts", + "build:rn-web": "rm -rf out/rn-web && cross-env RN_BUILD=1 vite build", + "build:web": "rm -rf out/web && cross-env WEB_BUILD=1 vite build", + "dedupe:locales": "eslint --fix locales/**/*.json", + "depcheck": "npx depcheck --quiet", + "dev": "turbo run @follow/web#dev @follow/server#dev", + "dev:debug": "export DEBUG=true && vite --debug", + "dev:electron": "electron-vite dev", + "dev:server": "pnpm run --filter=server dev", + "dev:web": "cross-env WEB_BUILD=1 vite", + "generator:i18n-template": "tsx scripts/generate-i18n-locale.ts", + "publish": "electron-vite build && electron-forge publish", + "start": "electron-vite preview", + "update:main-hash": "tsx plugins/vite/generate-main-hash.ts" + }, + "devDependencies": { + "@clack/prompts": "0.10.0", + "@egoist/tailwindcss-icons": "1.9.0", + "@electron-forge/cli": "7.7.0", + "@electron-forge/maker-dmg": "7.7.0", + "@electron-forge/maker-pkg": "7.7.0", + "@electron-forge/maker-squirrel": "7.7.0", + "@electron-forge/maker-zip": "7.7.0", + "@electron-forge/plugin-fuses": "7.7.0", + "@electron-forge/publisher-github": "7.7.0", + "@electron-toolkit/tsconfig": "1.0.1", + "@eslint/compat": "1.2.6", + "@follow/components": "workspace:*", + "@follow/constants": "workspace:*", + "@follow/hooks": "workspace:*", + "@follow/models": "workspace:*", + "@follow/shared": "workspace:*", + "@follow/utils": "workspace:*", + "@iconify-json/logos": "1.2.4", + "@iconify-json/mingcute": "1.2.3", + "@iconify-json/simple-icons": "1.2.25", + "@iconify/tools": "4.1.1", + "@pengx17/electron-forge-maker-appimage": "1.2.1", + "@sentry/vite-plugin": "3.1.2", + "@t3-oss/env-core": "0.12.0", + "@tailwindcss/container-queries": "0.1.1", + "@tailwindcss/typography": "0.5.16", + "@tsslint/cli": "1.5.8", + "@tsslint/config": "1.5.8", + "@tsslint/eslint": "1.5.8", + "@types/html-minifier-terser": "7.0.2", + "@types/js-yaml": "4.0.9", + "@types/node": "22.13.4", + "@types/react": "18.3.12", + "@types/react-dom": "18.3.1", + "@vercel/node": "5.1.7", + "@vitejs/plugin-legacy": "6.0.1", + "@vitejs/plugin-react": "4.3.4", + "async-es": "3.2.6", + "autoprefixer": "10.4.20", + "bufferutil": "4.0.9", + "cross-env": "7.0.3", + "cssnano": "7.0.6", + "dotenv": "16.4.7", + "drizzle-orm": "0.39.3", + "electron": "34.2.0", + "electron-devtools-installer": "4.0.0", + "electron-packager-languages": "0.6.0", + "electron-vite": "3.0.0", + "eslint": "9.20.1", + "eslint-config-hyoban": "3.2.1", + "eslint-plugin-react-native": "5.0.0", + "fake-indexeddb": "6.0.0", + "fast-glob": "3.3.3", + "happy-dom": "17.1.1", + "hono": "4.7.2", + "html-minifier-terser": "7.2.0", + "js-yaml": "4.1.0", + "lint-staged": "15.4.3", + "nbump": "2.0.7", + "postcss": "8.5.2", + "postcss-js": "4.0.1", + "prettier": "3.5.1", + "prettier-plugin-tailwindcss": "0.6.11", + "raw-body": "3.0.0", + "react": "18.3.1", + "react-dom": "18.3.1", + "rimraf": "6.0.1", + "shx": "0.3.4", + "simple-git-hooks": "2.11.1", + "svg-parser": "2.0.4", + "tailwindcss": "3.4.16", + "tailwindcss-animate": "1.0.7", + "tailwindcss-motion": "1.1.0", + "tailwindcss-safe-area": "0.6.0", + "tar": "7.4.3", + "tsup": "8.3.6", + "tsx": "4.19.3", + "turbo": "2.4.2", + "typescript": "5.7.3", + "unplugin-ast": "0.14.0", + "utf-8-validate": "6.0.5", + "vite": "6.1.0", + "vite-bundle-analyzer": "0.17.1", + "vite-plugin-mkcert": "1.17.6", + "vite-plugin-pwa": "0.21.1", + "vite-tsconfig-paths": "5.1.4", + "vitest": "3.0.6" + }, + "productName": "Follow", + "mainHash": "ad1913f95d3411e9bc07a90022c0f40d8f2e67e708eb704f64f1229ed31ac2d9" +} diff --git a/plugins/vite/ast.ts b/apps/desktop/plugins/vite/ast.ts similarity index 100% rename from plugins/vite/ast.ts rename to apps/desktop/plugins/vite/ast.ts diff --git a/plugins/vite/cleanup.ts b/apps/desktop/plugins/vite/cleanup.ts similarity index 100% rename from plugins/vite/cleanup.ts rename to apps/desktop/plugins/vite/cleanup.ts diff --git a/plugins/vite/compress.ts b/apps/desktop/plugins/vite/compress.ts similarity index 98% rename from plugins/vite/compress.ts rename to apps/desktop/plugins/vite/compress.ts index 4690f0ee8..d2e8fc61c 100644 --- a/plugins/vite/compress.ts +++ b/apps/desktop/plugins/vite/compress.ts @@ -39,7 +39,7 @@ function compressAndFingerprintPlugin(outDir: string): Plugin { const hex = hashSum.digest("hex") // Calculate main hash - const mainHash = await calculateMainHash(path.resolve(process.cwd(), "apps/main")) + const mainHash = await calculateMainHash(path.resolve(process.cwd(), "src/main")) // Get the current git tag version let version = "unknown" diff --git a/plugins/vite/deps.ts b/apps/desktop/plugins/vite/deps.ts similarity index 100% rename from plugins/vite/deps.ts rename to apps/desktop/plugins/vite/deps.ts diff --git a/plugins/vite/generate-main-hash.ts b/apps/desktop/plugins/vite/generate-main-hash.ts similarity index 98% rename from plugins/vite/generate-main-hash.ts rename to apps/desktop/plugins/vite/generate-main-hash.ts index b443e1acf..22998766a 100644 --- a/plugins/vite/generate-main-hash.ts +++ b/apps/desktop/plugins/vite/generate-main-hash.ts @@ -29,7 +29,7 @@ export async function calculateMainHash(mainDir: string): Promise { } async function main() { - const hash = await calculateMainHash(path.resolve(process.cwd(), "apps/main")) + const hash = await calculateMainHash(path.resolve(process.cwd(), "src/main")) const packageJson = JSON.parse( await fs.readFile(path.resolve(process.cwd(), "package.json"), "utf-8"), diff --git a/plugins/vite/hmr.ts b/apps/desktop/plugins/vite/hmr.ts similarity index 100% rename from plugins/vite/hmr.ts rename to apps/desktop/plugins/vite/hmr.ts diff --git a/plugins/vite/html-inject.ts b/apps/desktop/plugins/vite/html-inject.ts similarity index 90% rename from plugins/vite/html-inject.ts rename to apps/desktop/plugins/vite/html-inject.ts index 338f55ee2..b6cb61344 100644 --- a/plugins/vite/html-inject.ts +++ b/apps/desktop/plugins/vite/html-inject.ts @@ -1,6 +1,6 @@ import type { PluginOption } from "vite" -import type { env as EnvType } from "../../packages/shared/src/env" +import type { env as EnvType } from "../../../../packages/shared/src/env" export function htmlInjectPlugin(env: typeof EnvType): PluginOption { return { diff --git a/plugins/vite/i18n-hmr.ts b/apps/desktop/plugins/vite/i18n-hmr.ts similarity index 100% rename from plugins/vite/i18n-hmr.ts rename to apps/desktop/plugins/vite/i18n-hmr.ts diff --git a/plugins/vite/locales.ts b/apps/desktop/plugins/vite/locales.ts similarity index 100% rename from plugins/vite/locales.ts rename to apps/desktop/plugins/vite/locales.ts diff --git a/plugins/vite/manifest.ts b/apps/desktop/plugins/vite/manifest.ts similarity index 100% rename from plugins/vite/manifest.ts rename to apps/desktop/plugins/vite/manifest.ts diff --git a/plugins/vite/specific-import.ts b/apps/desktop/plugins/vite/specific-import.ts similarity index 100% rename from plugins/vite/specific-import.ts rename to apps/desktop/plugins/vite/specific-import.ts diff --git a/plugins/vite/utils/i18n-completeness.ts b/apps/desktop/plugins/vite/utils/i18n-completeness.ts similarity index 100% rename from plugins/vite/utils/i18n-completeness.ts rename to apps/desktop/plugins/vite/utils/i18n-completeness.ts diff --git a/postcss.config.cjs b/apps/desktop/postcss.config.cjs similarity index 100% rename from postcss.config.cjs rename to apps/desktop/postcss.config.cjs diff --git a/resources/app-update.yml b/apps/desktop/resources/app-update.yml similarity index 100% rename from resources/app-update.yml rename to apps/desktop/resources/app-update.yml diff --git a/resources/icon-no-padding.ico b/apps/desktop/resources/icon-no-padding.ico similarity index 100% rename from resources/icon-no-padding.ico rename to apps/desktop/resources/icon-no-padding.ico diff --git a/resources/icon.icns b/apps/desktop/resources/icon.icns similarity index 100% rename from resources/icon.icns rename to apps/desktop/resources/icon.icns diff --git a/resources/icon.ico b/apps/desktop/resources/icon.ico similarity index 100% rename from resources/icon.ico rename to apps/desktop/resources/icon.ico diff --git a/resources/icon.png b/apps/desktop/resources/icon.png similarity index 100% rename from resources/icon.png rename to apps/desktop/resources/icon.png diff --git a/resources/tray-icon.png b/apps/desktop/resources/tray-icon.png similarity index 100% rename from resources/tray-icon.png rename to apps/desktop/resources/tray-icon.png diff --git a/scripts/generate-i18n-locale.ts b/apps/desktop/scripts/generate-i18n-locale.ts similarity index 99% rename from scripts/generate-i18n-locale.ts rename to apps/desktop/scripts/generate-i18n-locale.ts index 2b5747564..2ee363bd0 100644 --- a/scripts/generate-i18n-locale.ts +++ b/apps/desktop/scripts/generate-i18n-locale.ts @@ -179,7 +179,7 @@ async function selectLocale(): Promise { const __dirname = dirname(fileURLToPath(import.meta.url)) const LOCALE_DIR = path.resolve(__dirname, "../locales") -const CONFIG_DIR = path.resolve(__dirname, "../apps/renderer/src/@types") +const CONFIG_DIR = path.resolve(__dirname, "../src/renderer/src/@types") async function main() { const selectedLocale = await selectLocale() diff --git a/apps/desktop/scripts/merge-yml.ts b/apps/desktop/scripts/merge-yml.ts new file mode 100644 index 000000000..223e74a97 --- /dev/null +++ b/apps/desktop/scripts/merge-yml.ts @@ -0,0 +1,56 @@ +import fs from "node:fs" +import path from "node:path" + +import yaml from "js-yaml" + +const outDir = "./out/make" + +function findYmlFiles(dir: string): string[] { + let results: string[] = [] + const items = fs.readdirSync(dir) + + items.forEach((item) => { + const fullPath = path.join(dir, item) + if (fs.statSync(fullPath).isDirectory()) { + results = results.concat(findYmlFiles(fullPath)) + } else if (item.endsWith(".yml")) { + results.push(fullPath) + } + }) + + return results +} + +const ymlFiles = findYmlFiles(outDir) + +let mergedContent = { + version: "", + files: [], + releaseDate: "", +} + +ymlFiles.forEach((file) => { + const fileContent = fs.readFileSync(file, "utf8") + const ymlData = yaml.load(fileContent) + + if (!mergedContent.version) { + mergedContent.version = ymlData.version + } + + mergedContent = { + version: ymlData.version, + files: mergedContent.files.concat(ymlData.files), + releaseDate: ymlData.releaseDate, + } +}) + +const mergedYml = yaml.dump(mergedContent, { + lineWidth: -1, +}) +fs.mkdirSync(path.join(outDir, "merged"), { recursive: true }) +const mergedFilePath = path.join(outDir, "merged", path.basename(ymlFiles[0])) +fs.writeFileSync(mergedFilePath, mergedYml) + +ymlFiles.forEach((file) => { + fs.unlinkSync(file) +}) diff --git a/apps/main/export.ts b/apps/desktop/src/main/export.ts similarity index 100% rename from apps/main/export.ts rename to apps/desktop/src/main/export.ts diff --git a/apps/main/global.d.ts b/apps/desktop/src/main/global.d.ts similarity index 100% rename from apps/main/global.d.ts rename to apps/desktop/src/main/global.d.ts diff --git a/apps/main/package.json b/apps/desktop/src/main/package.json similarity index 100% rename from apps/main/package.json rename to apps/desktop/src/main/package.json diff --git a/apps/main/preload/index.d.ts b/apps/desktop/src/main/preload/index.d.ts similarity index 100% rename from apps/main/preload/index.d.ts rename to apps/desktop/src/main/preload/index.d.ts diff --git a/apps/main/preload/index.ts b/apps/desktop/src/main/preload/index.ts similarity index 100% rename from apps/main/preload/index.ts rename to apps/desktop/src/main/preload/index.ts diff --git a/apps/main/src/@types/constants.ts b/apps/desktop/src/main/src/@types/constants.ts similarity index 100% rename from apps/main/src/@types/constants.ts rename to apps/desktop/src/main/src/@types/constants.ts diff --git a/apps/main/src/@types/i18next.d.ts b/apps/desktop/src/main/src/@types/i18next.d.ts similarity index 100% rename from apps/main/src/@types/i18next.d.ts rename to apps/desktop/src/main/src/@types/i18next.d.ts diff --git a/apps/main/src/@types/resources.ts b/apps/desktop/src/main/src/@types/resources.ts similarity index 100% rename from apps/main/src/@types/resources.ts rename to apps/desktop/src/main/src/@types/resources.ts diff --git a/apps/main/src/constants/app.ts b/apps/desktop/src/main/src/constants/app.ts similarity index 100% rename from apps/main/src/constants/app.ts rename to apps/desktop/src/main/src/constants/app.ts diff --git a/apps/main/src/constants/system.ts b/apps/desktop/src/main/src/constants/system.ts similarity index 100% rename from apps/main/src/constants/system.ts rename to apps/desktop/src/main/src/constants/system.ts diff --git a/apps/main/src/env.ts b/apps/desktop/src/main/src/env.ts similarity index 100% rename from apps/main/src/env.ts rename to apps/desktop/src/main/src/env.ts diff --git a/apps/main/src/helper.ts b/apps/desktop/src/main/src/helper.ts similarity index 100% rename from apps/main/src/helper.ts rename to apps/desktop/src/main/src/helper.ts diff --git a/apps/main/src/index.ts b/apps/desktop/src/main/src/index.ts similarity index 100% rename from apps/main/src/index.ts rename to apps/desktop/src/main/src/index.ts diff --git a/apps/main/src/init.ts b/apps/desktop/src/main/src/init.ts similarity index 100% rename from apps/main/src/init.ts rename to apps/desktop/src/main/src/init.ts diff --git a/apps/main/src/lib/api-client.ts b/apps/desktop/src/main/src/lib/api-client.ts similarity index 100% rename from apps/main/src/lib/api-client.ts rename to apps/desktop/src/main/src/lib/api-client.ts diff --git a/apps/main/src/lib/cleaner.ts b/apps/desktop/src/main/src/lib/cleaner.ts similarity index 100% rename from apps/main/src/lib/cleaner.ts rename to apps/desktop/src/main/src/lib/cleaner.ts diff --git a/apps/main/src/lib/dock.ts b/apps/desktop/src/main/src/lib/dock.ts similarity index 100% rename from apps/main/src/lib/dock.ts rename to apps/desktop/src/main/src/lib/dock.ts diff --git a/apps/main/src/lib/download.ts b/apps/desktop/src/main/src/lib/download.ts similarity index 100% rename from apps/main/src/lib/download.ts rename to apps/desktop/src/main/src/lib/download.ts diff --git a/apps/main/src/lib/i18n.ts b/apps/desktop/src/main/src/lib/i18n.ts similarity index 100% rename from apps/main/src/lib/i18n.ts rename to apps/desktop/src/main/src/lib/i18n.ts diff --git a/apps/main/src/lib/op.ts b/apps/desktop/src/main/src/lib/op.ts similarity index 100% rename from apps/main/src/lib/op.ts rename to apps/desktop/src/main/src/lib/op.ts diff --git a/apps/main/src/lib/proxy.test.ts b/apps/desktop/src/main/src/lib/proxy.test.ts similarity index 100% rename from apps/main/src/lib/proxy.test.ts rename to apps/desktop/src/main/src/lib/proxy.test.ts diff --git a/apps/main/src/lib/proxy.ts b/apps/desktop/src/main/src/lib/proxy.ts similarity index 100% rename from apps/main/src/lib/proxy.ts rename to apps/desktop/src/main/src/lib/proxy.ts diff --git a/apps/main/src/lib/readability.ts b/apps/desktop/src/main/src/lib/readability.ts similarity index 100% rename from apps/main/src/lib/readability.ts rename to apps/desktop/src/main/src/lib/readability.ts diff --git a/apps/main/src/lib/router.ts b/apps/desktop/src/main/src/lib/router.ts similarity index 100% rename from apps/main/src/lib/router.ts rename to apps/desktop/src/main/src/lib/router.ts diff --git a/apps/main/src/lib/store.ts b/apps/desktop/src/main/src/lib/store.ts similarity index 100% rename from apps/main/src/lib/store.ts rename to apps/desktop/src/main/src/lib/store.ts diff --git a/apps/main/src/lib/tray.ts b/apps/desktop/src/main/src/lib/tray.ts similarity index 100% rename from apps/main/src/lib/tray.ts rename to apps/desktop/src/main/src/lib/tray.ts diff --git a/apps/main/src/lib/user.ts b/apps/desktop/src/main/src/lib/user.ts similarity index 100% rename from apps/main/src/lib/user.ts rename to apps/desktop/src/main/src/lib/user.ts diff --git a/apps/main/src/lib/utils.ts b/apps/desktop/src/main/src/lib/utils.ts similarity index 100% rename from apps/main/src/lib/utils.ts rename to apps/desktop/src/main/src/lib/utils.ts diff --git a/apps/main/src/logger.ts b/apps/desktop/src/main/src/logger.ts similarity index 100% rename from apps/main/src/logger.ts rename to apps/desktop/src/main/src/logger.ts diff --git a/apps/main/src/menu.ts b/apps/desktop/src/main/src/menu.ts similarity index 100% rename from apps/main/src/menu.ts rename to apps/desktop/src/main/src/menu.ts diff --git a/apps/main/src/modules/language-detection/index.ts b/apps/desktop/src/main/src/modules/language-detection/index.ts similarity index 100% rename from apps/main/src/modules/language-detection/index.ts rename to apps/desktop/src/main/src/modules/language-detection/index.ts diff --git a/apps/main/src/renderer-handlers.ts b/apps/desktop/src/main/src/renderer-handlers.ts similarity index 100% rename from apps/main/src/renderer-handlers.ts rename to apps/desktop/src/main/src/renderer-handlers.ts diff --git a/apps/main/src/sentry.ts b/apps/desktop/src/main/src/sentry.ts similarity index 100% rename from apps/main/src/sentry.ts rename to apps/desktop/src/main/src/sentry.ts diff --git a/apps/main/src/tipc/_instance.ts b/apps/desktop/src/main/src/tipc/_instance.ts similarity index 100% rename from apps/main/src/tipc/_instance.ts rename to apps/desktop/src/main/src/tipc/_instance.ts diff --git a/apps/main/src/tipc/app.ts b/apps/desktop/src/main/src/tipc/app.ts similarity index 98% rename from apps/main/src/tipc/app.ts rename to apps/desktop/src/main/src/tipc/app.ts index 890956ce9..a15c2462c 100644 --- a/apps/main/src/tipc/app.ts +++ b/apps/desktop/src/main/src/tipc/app.ts @@ -271,7 +271,8 @@ ${content} const allWindows = BrowserWindow.getAllWindows() const dynamicRenderEntry = loadDynamicRenderEntry() - const appLoadEntry = dynamicRenderEntry || path.resolve(__dirname, "../../renderer/index.html") + const appLoadEntry = + dynamicRenderEntry || path.resolve(__dirname, "../../../../../renderer/index.html") logger.info("appLoadEntry", appLoadEntry) const mainWindow = getMainWindow() diff --git a/apps/main/src/tipc/debug.ts b/apps/desktop/src/main/src/tipc/debug.ts similarity index 100% rename from apps/main/src/tipc/debug.ts rename to apps/desktop/src/main/src/tipc/debug.ts diff --git a/apps/main/src/tipc/dock.ts b/apps/desktop/src/main/src/tipc/dock.ts similarity index 100% rename from apps/main/src/tipc/dock.ts rename to apps/desktop/src/main/src/tipc/dock.ts diff --git a/apps/main/src/tipc/index.ts b/apps/desktop/src/main/src/tipc/index.ts similarity index 100% rename from apps/main/src/tipc/index.ts rename to apps/desktop/src/main/src/tipc/index.ts diff --git a/apps/main/src/tipc/menu.ts b/apps/desktop/src/main/src/tipc/menu.ts similarity index 100% rename from apps/main/src/tipc/menu.ts rename to apps/desktop/src/main/src/tipc/menu.ts diff --git a/apps/main/src/tipc/reader.ts b/apps/desktop/src/main/src/tipc/reader.ts similarity index 100% rename from apps/main/src/tipc/reader.ts rename to apps/desktop/src/main/src/tipc/reader.ts diff --git a/apps/main/src/tipc/setting.ts b/apps/desktop/src/main/src/tipc/setting.ts similarity index 100% rename from apps/main/src/tipc/setting.ts rename to apps/desktop/src/main/src/tipc/setting.ts diff --git a/apps/main/src/tipc/tracker.ts b/apps/desktop/src/main/src/tipc/tracker.ts similarity index 100% rename from apps/main/src/tipc/tracker.ts rename to apps/desktop/src/main/src/tipc/tracker.ts diff --git a/apps/main/src/tracker/index.ts b/apps/desktop/src/main/src/tracker/index.ts similarity index 100% rename from apps/main/src/tracker/index.ts rename to apps/desktop/src/main/src/tracker/index.ts diff --git a/apps/main/src/updater/configs.ts b/apps/desktop/src/main/src/updater/configs.ts similarity index 100% rename from apps/main/src/updater/configs.ts rename to apps/desktop/src/main/src/updater/configs.ts diff --git a/apps/main/src/updater/custom-github-provider.ts b/apps/desktop/src/main/src/updater/custom-github-provider.ts similarity index 100% rename from apps/main/src/updater/custom-github-provider.ts rename to apps/desktop/src/main/src/updater/custom-github-provider.ts diff --git a/apps/main/src/updater/hot-updater.ts b/apps/desktop/src/main/src/updater/hot-updater.ts similarity index 100% rename from apps/main/src/updater/hot-updater.ts rename to apps/desktop/src/main/src/updater/hot-updater.ts diff --git a/apps/main/src/updater/index.ts b/apps/desktop/src/main/src/updater/index.ts similarity index 100% rename from apps/main/src/updater/index.ts rename to apps/desktop/src/main/src/updater/index.ts diff --git a/apps/main/src/updater/types.ts b/apps/desktop/src/main/src/updater/types.ts similarity index 100% rename from apps/main/src/updater/types.ts rename to apps/desktop/src/main/src/updater/types.ts diff --git a/apps/main/src/updater/utils.ts b/apps/desktop/src/main/src/updater/utils.ts similarity index 100% rename from apps/main/src/updater/utils.ts rename to apps/desktop/src/main/src/updater/utils.ts diff --git a/apps/main/src/updater/windows-updater.ts b/apps/desktop/src/main/src/updater/windows-updater.ts similarity index 100% rename from apps/main/src/updater/windows-updater.ts rename to apps/desktop/src/main/src/updater/windows-updater.ts diff --git a/apps/main/src/window.ts b/apps/desktop/src/main/src/window.ts similarity index 100% rename from apps/main/src/window.ts rename to apps/desktop/src/main/src/window.ts diff --git a/apps/main/tsconfig.json b/apps/desktop/src/main/tsconfig.json similarity index 100% rename from apps/main/tsconfig.json rename to apps/desktop/src/main/tsconfig.json diff --git a/apps/main/vitest.config.ts b/apps/desktop/src/main/vitest.config.ts similarity index 100% rename from apps/main/vitest.config.ts rename to apps/desktop/src/main/vitest.config.ts diff --git a/apps/renderer/debug_proxy.html b/apps/desktop/src/renderer/debug_proxy.html similarity index 100% rename from apps/renderer/debug_proxy.html rename to apps/desktop/src/renderer/debug_proxy.html diff --git a/apps/renderer/global.d.ts b/apps/desktop/src/renderer/global.d.ts similarity index 100% rename from apps/renderer/global.d.ts rename to apps/desktop/src/renderer/global.d.ts diff --git a/apps/renderer/index.html b/apps/desktop/src/renderer/index.html similarity index 100% rename from apps/renderer/index.html rename to apps/desktop/src/renderer/index.html diff --git a/apps/renderer/package.json b/apps/desktop/src/renderer/package.json similarity index 100% rename from apps/renderer/package.json rename to apps/desktop/src/renderer/package.json diff --git a/apps/renderer/public/apple-touch-icon-180x180.png b/apps/desktop/src/renderer/public/apple-touch-icon-180x180.png similarity index 100% rename from apps/renderer/public/apple-touch-icon-180x180.png rename to apps/desktop/src/renderer/public/apple-touch-icon-180x180.png diff --git a/apps/renderer/public/favicon-dev.ico b/apps/desktop/src/renderer/public/favicon-dev.ico similarity index 100% rename from apps/renderer/public/favicon-dev.ico rename to apps/desktop/src/renderer/public/favicon-dev.ico diff --git a/apps/renderer/public/favicon.ico b/apps/desktop/src/renderer/public/favicon.ico similarity index 100% rename from apps/renderer/public/favicon.ico rename to apps/desktop/src/renderer/public/favicon.ico diff --git a/apps/renderer/public/icon-192x192.png b/apps/desktop/src/renderer/public/icon-192x192.png similarity index 100% rename from apps/renderer/public/icon-192x192.png rename to apps/desktop/src/renderer/public/icon-192x192.png diff --git a/apps/renderer/public/icon-512x512.png b/apps/desktop/src/renderer/public/icon-512x512.png similarity index 100% rename from apps/renderer/public/icon-512x512.png rename to apps/desktop/src/renderer/public/icon-512x512.png diff --git a/apps/renderer/public/icon.svg b/apps/desktop/src/renderer/public/icon.svg similarity index 100% rename from apps/renderer/public/icon.svg rename to apps/desktop/src/renderer/public/icon.svg diff --git a/apps/renderer/public/maskable-icon-512x512.png b/apps/desktop/src/renderer/public/maskable-icon-512x512.png similarity index 100% rename from apps/renderer/public/maskable-icon-512x512.png rename to apps/desktop/src/renderer/public/maskable-icon-512x512.png diff --git a/apps/renderer/public/og-image.png b/apps/desktop/src/renderer/public/og-image.png similarity index 100% rename from apps/renderer/public/og-image.png rename to apps/desktop/src/renderer/public/og-image.png diff --git a/apps/renderer/public/opengraph-image.png b/apps/desktop/src/renderer/public/opengraph-image.png similarity index 100% rename from apps/renderer/public/opengraph-image.png rename to apps/desktop/src/renderer/public/opengraph-image.png diff --git a/apps/renderer/public/pwa-192x192.png b/apps/desktop/src/renderer/public/pwa-192x192.png similarity index 100% rename from apps/renderer/public/pwa-192x192.png rename to apps/desktop/src/renderer/public/pwa-192x192.png diff --git a/apps/renderer/public/pwa-512x512.png b/apps/desktop/src/renderer/public/pwa-512x512.png similarity index 100% rename from apps/renderer/public/pwa-512x512.png rename to apps/desktop/src/renderer/public/pwa-512x512.png diff --git a/apps/renderer/public/pwa-64x64.png b/apps/desktop/src/renderer/public/pwa-64x64.png similarity index 100% rename from apps/renderer/public/pwa-64x64.png rename to apps/desktop/src/renderer/public/pwa-64x64.png diff --git a/apps/renderer/pwa-assets.config.ts b/apps/desktop/src/renderer/pwa-assets.config.ts similarity index 100% rename from apps/renderer/pwa-assets.config.ts rename to apps/desktop/src/renderer/pwa-assets.config.ts diff --git a/apps/renderer/setup-file.ts b/apps/desktop/src/renderer/setup-file.ts similarity index 100% rename from apps/renderer/setup-file.ts rename to apps/desktop/src/renderer/setup-file.ts diff --git a/apps/renderer/src/@types/constants.ts b/apps/desktop/src/renderer/src/@types/constants.ts similarity index 100% rename from apps/renderer/src/@types/constants.ts rename to apps/desktop/src/renderer/src/@types/constants.ts diff --git a/apps/renderer/src/@types/default-resource.ts b/apps/desktop/src/renderer/src/@types/default-resource.ts similarity index 100% rename from apps/renderer/src/@types/default-resource.ts rename to apps/desktop/src/renderer/src/@types/default-resource.ts diff --git a/apps/renderer/src/@types/i18next.d.ts b/apps/desktop/src/renderer/src/@types/i18next.d.ts similarity index 100% rename from apps/renderer/src/@types/i18next.d.ts rename to apps/desktop/src/renderer/src/@types/i18next.d.ts diff --git a/apps/renderer/src/App.tsx b/apps/desktop/src/renderer/src/App.tsx similarity index 95% rename from apps/renderer/src/App.tsx rename to apps/desktop/src/renderer/src/App.tsx index c0de16b52..0a5bd1019 100644 --- a/apps/renderer/src/App.tsx +++ b/apps/desktop/src/renderer/src/App.tsx @@ -91,8 +91,8 @@ const AppSkeleton = () => { width: `${feedColWidth}px`, }} /> -
-
+
+
) diff --git a/apps/renderer/src/api/trending.ts b/apps/desktop/src/renderer/src/api/trending.ts similarity index 100% rename from apps/renderer/src/api/trending.ts rename to apps/desktop/src/renderer/src/api/trending.ts diff --git a/apps/renderer/src/assets/rsshub-icon.png b/apps/desktop/src/renderer/src/assets/rsshub-icon.png similarity index 100% rename from apps/renderer/src/assets/rsshub-icon.png rename to apps/desktop/src/renderer/src/assets/rsshub-icon.png diff --git a/apps/renderer/src/assets/rsshub.svg b/apps/desktop/src/renderer/src/assets/rsshub.svg similarity index 100% rename from apps/renderer/src/assets/rsshub.svg rename to apps/desktop/src/renderer/src/assets/rsshub.svg diff --git a/apps/renderer/src/atoms/ai-summary.ts b/apps/desktop/src/renderer/src/atoms/ai-summary.ts similarity index 100% rename from apps/renderer/src/atoms/ai-summary.ts rename to apps/desktop/src/renderer/src/atoms/ai-summary.ts diff --git a/apps/renderer/src/atoms/ai-translation.ts b/apps/desktop/src/renderer/src/atoms/ai-translation.ts similarity index 100% rename from apps/renderer/src/atoms/ai-translation.ts rename to apps/desktop/src/renderer/src/atoms/ai-translation.ts diff --git a/apps/renderer/src/atoms/app.ts b/apps/desktop/src/renderer/src/atoms/app.ts similarity index 100% rename from apps/renderer/src/atoms/app.ts rename to apps/desktop/src/renderer/src/atoms/app.ts diff --git a/apps/renderer/src/atoms/context-menu.ts b/apps/desktop/src/renderer/src/atoms/context-menu.ts similarity index 100% rename from apps/renderer/src/atoms/context-menu.ts rename to apps/desktop/src/renderer/src/atoms/context-menu.ts diff --git a/apps/renderer/src/atoms/corner-player.ts b/apps/desktop/src/renderer/src/atoms/corner-player.ts similarity index 100% rename from apps/renderer/src/atoms/corner-player.ts rename to apps/desktop/src/renderer/src/atoms/corner-player.ts diff --git a/apps/renderer/src/atoms/dom.ts b/apps/desktop/src/renderer/src/atoms/dom.ts similarity index 100% rename from apps/renderer/src/atoms/dom.ts rename to apps/desktop/src/renderer/src/atoms/dom.ts diff --git a/apps/renderer/src/atoms/feed.ts b/apps/desktop/src/renderer/src/atoms/feed.ts similarity index 100% rename from apps/renderer/src/atoms/feed.ts rename to apps/desktop/src/renderer/src/atoms/feed.ts diff --git a/apps/renderer/src/atoms/lang.ts b/apps/desktop/src/renderer/src/atoms/lang.ts similarity index 100% rename from apps/renderer/src/atoms/lang.ts rename to apps/desktop/src/renderer/src/atoms/lang.ts diff --git a/apps/renderer/src/atoms/network.ts b/apps/desktop/src/renderer/src/atoms/network.ts similarity index 100% rename from apps/renderer/src/atoms/network.ts rename to apps/desktop/src/renderer/src/atoms/network.ts diff --git a/apps/renderer/src/atoms/player.ts b/apps/desktop/src/renderer/src/atoms/player.ts similarity index 100% rename from apps/renderer/src/atoms/player.ts rename to apps/desktop/src/renderer/src/atoms/player.ts diff --git a/apps/renderer/src/atoms/readability.ts b/apps/desktop/src/renderer/src/atoms/readability.ts similarity index 100% rename from apps/renderer/src/atoms/readability.ts rename to apps/desktop/src/renderer/src/atoms/readability.ts diff --git a/apps/renderer/src/atoms/server-configs.ts b/apps/desktop/src/renderer/src/atoms/server-configs.ts similarity index 100% rename from apps/renderer/src/atoms/server-configs.ts rename to apps/desktop/src/renderer/src/atoms/server-configs.ts diff --git a/apps/renderer/src/atoms/settings/general.ts b/apps/desktop/src/renderer/src/atoms/settings/general.ts similarity index 100% rename from apps/renderer/src/atoms/settings/general.ts rename to apps/desktop/src/renderer/src/atoms/settings/general.ts diff --git a/apps/renderer/src/atoms/settings/integration.ts b/apps/desktop/src/renderer/src/atoms/settings/integration.ts similarity index 100% rename from apps/renderer/src/atoms/settings/integration.ts rename to apps/desktop/src/renderer/src/atoms/settings/integration.ts diff --git a/apps/renderer/src/atoms/settings/ui.ts b/apps/desktop/src/renderer/src/atoms/settings/ui.ts similarity index 100% rename from apps/renderer/src/atoms/settings/ui.ts rename to apps/desktop/src/renderer/src/atoms/settings/ui.ts diff --git a/apps/renderer/src/atoms/sidebar.ts b/apps/desktop/src/renderer/src/atoms/sidebar.ts similarity index 100% rename from apps/renderer/src/atoms/sidebar.ts rename to apps/desktop/src/renderer/src/atoms/sidebar.ts diff --git a/apps/renderer/src/atoms/source-content.tsx b/apps/desktop/src/renderer/src/atoms/source-content.tsx similarity index 100% rename from apps/renderer/src/atoms/source-content.tsx rename to apps/desktop/src/renderer/src/atoms/source-content.tsx diff --git a/apps/renderer/src/atoms/updater.ts b/apps/desktop/src/renderer/src/atoms/updater.ts similarity index 100% rename from apps/renderer/src/atoms/updater.ts rename to apps/desktop/src/renderer/src/atoms/updater.ts diff --git a/apps/renderer/src/atoms/user.ts b/apps/desktop/src/renderer/src/atoms/user.ts similarity index 100% rename from apps/renderer/src/atoms/user.ts rename to apps/desktop/src/renderer/src/atoms/user.ts diff --git a/apps/renderer/src/components/common/AppErrorBoundary.tsx b/apps/desktop/src/renderer/src/components/common/AppErrorBoundary.tsx similarity index 100% rename from apps/renderer/src/components/common/AppErrorBoundary.tsx rename to apps/desktop/src/renderer/src/components/common/AppErrorBoundary.tsx diff --git a/apps/renderer/src/components/common/ErrorElement.tsx b/apps/desktop/src/renderer/src/components/common/ErrorElement.tsx similarity index 97% rename from apps/renderer/src/components/common/ErrorElement.tsx rename to apps/desktop/src/renderer/src/components/common/ErrorElement.tsx index d607b4861..2ae576dff 100644 --- a/apps/renderer/src/components/common/ErrorElement.tsx +++ b/apps/desktop/src/renderer/src/components/common/ErrorElement.tsx @@ -99,7 +99,7 @@ export const FeedbackIssue = (_props: {

Still having this issue? Please give feedback in GitHub, thanks! { } return ( -

+
diff --git a/apps/renderer/src/components/common/PoweredByFooter.tsx b/apps/desktop/src/renderer/src/components/common/PoweredByFooter.tsx similarity index 87% rename from apps/renderer/src/components/common/PoweredByFooter.tsx rename to apps/desktop/src/renderer/src/components/common/PoweredByFooter.tsx index 7ef3a3436..37c4c3397 100644 --- a/apps/renderer/src/components/common/PoweredByFooter.tsx +++ b/apps/desktop/src/renderer/src/components/common/PoweredByFooter.tsx @@ -8,7 +8,7 @@ export const PoweredByFooter: Component = ({ className }) => ( {" "} diff --git a/apps/renderer/src/components/common/ProviderComposer.tsx b/apps/desktop/src/renderer/src/components/common/ProviderComposer.tsx similarity index 100% rename from apps/renderer/src/components/common/ProviderComposer.tsx rename to apps/desktop/src/renderer/src/components/common/ProviderComposer.tsx diff --git a/apps/renderer/src/components/common/ReloadPrompt.tsx b/apps/desktop/src/renderer/src/components/common/ReloadPrompt.tsx similarity index 100% rename from apps/renderer/src/components/common/ReloadPrompt.tsx rename to apps/desktop/src/renderer/src/components/common/ReloadPrompt.tsx diff --git a/apps/renderer/src/components/common/ShadowDOM.tsx b/apps/desktop/src/renderer/src/components/common/ShadowDOM.tsx similarity index 100% rename from apps/renderer/src/components/common/ShadowDOM.tsx rename to apps/desktop/src/renderer/src/components/common/ShadowDOM.tsx diff --git a/apps/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx b/apps/desktop/src/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx similarity index 96% rename from apps/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx rename to apps/desktop/src/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx index 2b0eedbf5..eb1361097 100644 --- a/apps/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx +++ b/apps/desktop/src/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx @@ -26,7 +26,7 @@ const FeedFoundCanBeFollowErrorFallback: FC = ({ resetErr useResetErrorWhenRouteChange(resetError) return ( -
+
{{ actions: ( diff --git a/apps/renderer/src/components/errors/FeedNotFound.tsx b/apps/desktop/src/renderer/src/components/errors/FeedNotFound.tsx similarity index 92% rename from apps/renderer/src/components/errors/FeedNotFound.tsx rename to apps/desktop/src/renderer/src/components/errors/FeedNotFound.tsx index 67ba5ba9b..4b2eca3e6 100644 --- a/apps/renderer/src/components/errors/FeedNotFound.tsx +++ b/apps/desktop/src/renderer/src/components/errors/FeedNotFound.tsx @@ -15,7 +15,7 @@ const FeedNotFoundErrorFallback: FC = ({ resetError, erro useResetErrorWhenRouteChange(resetError) const navigate = useNavigate() return ( -
+
diff --git a/apps/renderer/src/components/errors/ModalError.tsx b/apps/desktop/src/renderer/src/components/errors/ModalError.tsx similarity index 94% rename from apps/renderer/src/components/errors/ModalError.tsx rename to apps/desktop/src/renderer/src/components/errors/ModalError.tsx index 4bb89ac08..8607e3eee 100644 --- a/apps/renderer/src/components/errors/ModalError.tsx +++ b/apps/desktop/src/renderer/src/components/errors/ModalError.tsx @@ -14,7 +14,7 @@ const ModalErrorFallback: FC = (props) => { const modal = useCurrentModal() return ( = (props) => { const { message, stack } = parseError(props.error) useResetErrorWhenRouteChange(props.resetError) return ( -
+
diff --git a/apps/renderer/src/components/errors/RSSHubError.tsx b/apps/desktop/src/renderer/src/components/errors/RSSHubError.tsx similarity index 100% rename from apps/renderer/src/components/errors/RSSHubError.tsx rename to apps/desktop/src/renderer/src/components/errors/RSSHubError.tsx diff --git a/apps/renderer/src/components/errors/enum.ts b/apps/desktop/src/renderer/src/components/errors/enum.ts similarity index 100% rename from apps/renderer/src/components/errors/enum.ts rename to apps/desktop/src/renderer/src/components/errors/enum.ts diff --git a/apps/renderer/src/components/errors/helper.ts b/apps/desktop/src/renderer/src/components/errors/helper.ts similarity index 100% rename from apps/renderer/src/components/errors/helper.ts rename to apps/desktop/src/renderer/src/components/errors/helper.ts diff --git a/apps/renderer/src/components/errors/index.ts b/apps/desktop/src/renderer/src/components/errors/index.ts similarity index 100% rename from apps/renderer/src/components/errors/index.ts rename to apps/desktop/src/renderer/src/components/errors/index.ts diff --git a/apps/renderer/src/components/errors/previews/FeedPreview.tsx b/apps/desktop/src/renderer/src/components/errors/previews/FeedPreview.tsx similarity index 97% rename from apps/renderer/src/components/errors/previews/FeedPreview.tsx rename to apps/desktop/src/renderer/src/components/errors/previews/FeedPreview.tsx index 708916960..14abf8ecb 100644 --- a/apps/renderer/src/components/errors/previews/FeedPreview.tsx +++ b/apps/desktop/src/renderer/src/components/errors/previews/FeedPreview.tsx @@ -85,7 +85,7 @@ export function FeedPreview(props: { target="_blank" key={entry.id} > -
+
( onWheel={stopPropagation} className={cn( "pointer-events-auto max-h-48 grow", - "shadow-perfect overflow-auto rounded-md border border-border bg-popover text-popover-foreground", + "shadow-perfect border-border bg-popover text-popover-foreground overflow-auto rounded-md border", "w-[var(--input-width)] empty:invisible", )} > diff --git a/apps/renderer/src/components/ui/auto-completion/index.ts b/apps/desktop/src/renderer/src/components/ui/auto-completion/index.ts similarity index 100% rename from apps/renderer/src/components/ui/auto-completion/index.ts rename to apps/desktop/src/renderer/src/components/ui/auto-completion/index.ts diff --git a/apps/renderer/src/components/ui/background/WindowUnderBlur.tsx b/apps/desktop/src/renderer/src/components/ui/background/WindowUnderBlur.tsx similarity index 100% rename from apps/renderer/src/components/ui/background/WindowUnderBlur.tsx rename to apps/desktop/src/renderer/src/components/ui/background/WindowUnderBlur.tsx diff --git a/apps/renderer/src/components/ui/background/index.ts b/apps/desktop/src/renderer/src/components/ui/background/index.ts similarity index 100% rename from apps/renderer/src/components/ui/background/index.ts rename to apps/desktop/src/renderer/src/components/ui/background/index.ts diff --git a/apps/renderer/src/components/ui/button/CommandActionButton.tsx b/apps/desktop/src/renderer/src/components/ui/button/CommandActionButton.tsx similarity index 100% rename from apps/renderer/src/components/ui/button/CommandActionButton.tsx rename to apps/desktop/src/renderer/src/components/ui/button/CommandActionButton.tsx diff --git a/apps/renderer/src/components/ui/button/CopyButton.tsx b/apps/desktop/src/renderer/src/components/ui/button/CopyButton.tsx similarity index 100% rename from apps/renderer/src/components/ui/button/CopyButton.tsx rename to apps/desktop/src/renderer/src/components/ui/button/CopyButton.tsx diff --git a/apps/renderer/src/components/ui/button/base.tsx b/apps/desktop/src/renderer/src/components/ui/button/base.tsx similarity index 96% rename from apps/renderer/src/components/ui/button/base.tsx rename to apps/desktop/src/renderer/src/components/ui/button/base.tsx index 73e43d37c..c0815f1bd 100644 --- a/apps/renderer/src/components/ui/button/base.tsx +++ b/apps/desktop/src/renderer/src/components/ui/button/base.tsx @@ -40,7 +40,7 @@ export const AnimatedCommandButton: FC(({ className, inset, ...props }, ref) => ( )) @@ -135,7 +135,7 @@ const ContextMenuSeparator = React.forwardRef< >(({ className, ...props }, ref) => ( )) diff --git a/apps/renderer/src/components/ui/context-menu/index.ts b/apps/desktop/src/renderer/src/components/ui/context-menu/index.ts similarity index 100% rename from apps/renderer/src/components/ui/context-menu/index.ts rename to apps/desktop/src/renderer/src/components/ui/context-menu/index.ts diff --git a/apps/renderer/src/components/ui/datetime/index.tsx b/apps/desktop/src/renderer/src/components/ui/datetime/index.tsx similarity index 100% rename from apps/renderer/src/components/ui/datetime/index.tsx rename to apps/desktop/src/renderer/src/components/ui/datetime/index.tsx diff --git a/apps/renderer/src/components/ui/drop-zone.tsx b/apps/desktop/src/renderer/src/components/ui/drop-zone.tsx similarity index 100% rename from apps/renderer/src/components/ui/drop-zone.tsx rename to apps/desktop/src/renderer/src/components/ui/drop-zone.tsx diff --git a/apps/renderer/src/components/ui/dropdown-menu/dropdown-menu.tsx b/apps/desktop/src/renderer/src/components/ui/dropdown-menu/dropdown-menu.tsx similarity index 82% rename from apps/renderer/src/components/ui/dropdown-menu/dropdown-menu.tsx rename to apps/desktop/src/renderer/src/components/ui/dropdown-menu/dropdown-menu.tsx index 0ce5bfd02..609f4eb4f 100644 --- a/apps/renderer/src/components/ui/dropdown-menu/dropdown-menu.tsx +++ b/apps/desktop/src/renderer/src/components/ui/dropdown-menu/dropdown-menu.tsx @@ -43,7 +43,7 @@ const DropdownMenuSubTrigger = React.forwardRef< (({ className, ...props }, ref) => ( )) diff --git a/apps/renderer/src/components/ui/fab/FABContainer.tsx b/apps/desktop/src/renderer/src/components/ui/fab/FABContainer.tsx similarity index 100% rename from apps/renderer/src/components/ui/fab/FABContainer.tsx rename to apps/desktop/src/renderer/src/components/ui/fab/FABContainer.tsx diff --git a/apps/renderer/src/components/ui/fab/index.ts b/apps/desktop/src/renderer/src/components/ui/fab/index.ts similarity index 100% rename from apps/renderer/src/components/ui/fab/index.ts rename to apps/desktop/src/renderer/src/components/ui/fab/index.ts diff --git a/apps/renderer/src/components/ui/link/index.tsx b/apps/desktop/src/renderer/src/components/ui/link/index.tsx similarity index 100% rename from apps/renderer/src/components/ui/link/index.tsx rename to apps/desktop/src/renderer/src/components/ui/link/index.tsx diff --git a/apps/renderer/src/components/ui/lottie-container/index.tsx b/apps/desktop/src/renderer/src/components/ui/lottie-container/index.tsx similarity index 100% rename from apps/renderer/src/components/ui/lottie-container/index.tsx rename to apps/desktop/src/renderer/src/components/ui/lottie-container/index.tsx diff --git a/apps/renderer/src/components/ui/markdown/HTML.tsx b/apps/desktop/src/renderer/src/components/ui/markdown/HTML.tsx similarity index 100% rename from apps/renderer/src/components/ui/markdown/HTML.tsx rename to apps/desktop/src/renderer/src/components/ui/markdown/HTML.tsx diff --git a/apps/renderer/src/components/ui/markdown/Markdown.tsx b/apps/desktop/src/renderer/src/components/ui/markdown/Markdown.tsx similarity index 91% rename from apps/renderer/src/components/ui/markdown/Markdown.tsx rename to apps/desktop/src/renderer/src/components/ui/markdown/Markdown.tsx index 2e054bfe8..7f0e98171 100644 --- a/apps/renderer/src/components/ui/markdown/Markdown.tsx +++ b/apps/desktop/src/renderer/src/components/ui/markdown/Markdown.tsx @@ -23,7 +23,7 @@ export const Markdown: Component<
= ({ return (
= ({ const [hoverShow, setHoverShow] = useState(false) return ( -
+
@@ -144,7 +144,7 @@ const TocHoverCard: React.FC = ({ transition={{ duration: 0.5, type: "spring" }} className={cn( "relative z-10 -mt-1 rounded-xl border bg-white px-3 py-1 text-xs drop-shadow-xl dark:bg-neutral-950", - "max-h-[calc(100svh-4rem)] overflow-auto scrollbar-none", + "scrollbar-none max-h-[calc(100svh-4rem)] overflow-auto", )} > {toc.map((heading, index) => ( @@ -163,7 +163,7 @@ const TocHoverCard: React.FC = ({ handleScrollTo(index, heading.$heading, heading.anchorId) }} > - + {heading.title} diff --git a/apps/renderer/src/components/ui/markdown/components/TocItem.tsx b/apps/desktop/src/renderer/src/components/ui/markdown/components/TocItem.tsx similarity index 100% rename from apps/renderer/src/components/ui/markdown/components/TocItem.tsx rename to apps/desktop/src/renderer/src/components/ui/markdown/components/TocItem.tsx diff --git a/apps/renderer/src/components/ui/markdown/components/hooks.tsx b/apps/desktop/src/renderer/src/components/ui/markdown/components/hooks.tsx similarity index 100% rename from apps/renderer/src/components/ui/markdown/components/hooks.tsx rename to apps/desktop/src/renderer/src/components/ui/markdown/components/hooks.tsx diff --git a/apps/renderer/src/components/ui/markdown/context.tsx b/apps/desktop/src/renderer/src/components/ui/markdown/context.tsx similarity index 100% rename from apps/renderer/src/components/ui/markdown/context.tsx rename to apps/desktop/src/renderer/src/components/ui/markdown/context.tsx diff --git a/apps/renderer/src/components/ui/markdown/renderers/BlockErrorBoundary.tsx b/apps/desktop/src/renderer/src/components/ui/markdown/renderers/BlockErrorBoundary.tsx similarity index 100% rename from apps/renderer/src/components/ui/markdown/renderers/BlockErrorBoundary.tsx rename to apps/desktop/src/renderer/src/components/ui/markdown/renderers/BlockErrorBoundary.tsx diff --git a/apps/renderer/src/components/ui/markdown/renderers/BlockImage.tsx b/apps/desktop/src/renderer/src/components/ui/markdown/renderers/BlockImage.tsx similarity index 100% rename from apps/renderer/src/components/ui/markdown/renderers/BlockImage.tsx rename to apps/desktop/src/renderer/src/components/ui/markdown/renderers/BlockImage.tsx diff --git a/apps/renderer/src/components/ui/markdown/renderers/Heading.tsx b/apps/desktop/src/renderer/src/components/ui/markdown/renderers/Heading.tsx similarity index 96% rename from apps/renderer/src/components/ui/markdown/renderers/Heading.tsx rename to apps/desktop/src/renderer/src/components/ui/markdown/renderers/Heading.tsx index c595e5af2..492e735d0 100644 --- a/apps/renderer/src/components/ui/markdown/renderers/Heading.tsx +++ b/apps/desktop/src/renderer/src/components/ui/markdown/renderers/Heading.tsx @@ -24,7 +24,7 @@ export const createHeadingRenderer = {rest.children} { = ({ className={cn( "center", !(finalWidth || finalHeight) && "size-full", - "relative cursor-card bg-stone-100 object-cover", + "cursor-card relative bg-stone-100 object-cover", mediaContainerClassName, )} onClick={handleClick} @@ -264,7 +264,7 @@ const MediaImpl: FC = ({ > = ({ {blurhash ? ( ) : ( -
+
)}
@@ -334,11 +334,11 @@ const FallbackMedia: FC = ({ type, mediaContainerClassName, classNam className={cn( "size-full", "center rounded bg-zinc-100 dark:bg-neutral-900", - "not-prose !flex max-h-full flex-col space-y-1 p-4 @container", + "not-prose @container !flex max-h-full flex-col space-y-1 p-4", mediaContainerClassName, )} > -
+

Media loaded failed

diff --git a/apps/renderer/src/components/ui/media/SwipeMedia.tsx b/apps/desktop/src/renderer/src/components/ui/media/SwipeMedia.tsx similarity index 100% rename from apps/renderer/src/components/ui/media/SwipeMedia.tsx rename to apps/desktop/src/renderer/src/components/ui/media/SwipeMedia.tsx diff --git a/apps/renderer/src/components/ui/media/VideoPlayer.tsx b/apps/desktop/src/renderer/src/components/ui/media/VideoPlayer.tsx similarity index 99% rename from apps/renderer/src/components/ui/media/VideoPlayer.tsx rename to apps/desktop/src/renderer/src/components/ui/media/VideoPlayer.tsx index c46ad7c8b..2c3a7cc44 100644 --- a/apps/renderer/src/components/ui/media/VideoPlayer.tsx +++ b/apps/desktop/src/renderer/src/components/ui/media/VideoPlayer.tsx @@ -131,7 +131,7 @@ export const VideoPlayer = forwardRef( ) return ( - + {element}
diff --git a/apps/renderer/src/components/ui/media/VolumeSlider.tsx b/apps/desktop/src/renderer/src/components/ui/media/VolumeSlider.tsx similarity index 100% rename from apps/renderer/src/components/ui/media/VolumeSlider.tsx rename to apps/desktop/src/renderer/src/components/ui/media/VolumeSlider.tsx diff --git a/apps/renderer/src/components/ui/media/hooks.tsx b/apps/desktop/src/renderer/src/components/ui/media/hooks.tsx similarity index 100% rename from apps/renderer/src/components/ui/media/hooks.tsx rename to apps/desktop/src/renderer/src/components/ui/media/hooks.tsx diff --git a/apps/renderer/src/components/ui/media/preview-media.tsx b/apps/desktop/src/renderer/src/components/ui/media/preview-media.tsx similarity index 96% rename from apps/renderer/src/components/ui/media/preview-media.tsx rename to apps/desktop/src/renderer/src/components/ui/media/preview-media.tsx index 87f1c039b..abe1ca19f 100644 --- a/apps/renderer/src/components/ui/media/preview-media.tsx +++ b/apps/desktop/src/renderer/src/components/ui/media/preview-media.tsx @@ -71,7 +71,7 @@ const Wrapper: Component<{ exit={{ opacity: 0, }} - className="fixed right-4 flex items-center safe-inset-top-4" + className="safe-inset-top-4 fixed right-4 flex items-center" > @@ -87,7 +87,7 @@ const Wrapper: Component<{ className={cn( "relative flex h-full w-auto overflow-hidden", sideContent - ? "min-w-96 items-center justify-center rounded-l-xl bg-native" + ? "bg-native min-w-96 items-center justify-center rounded-l-xl" : "rounded-xl", )} > @@ -136,7 +136,7 @@ const Wrapper: Component<{
{!!sideContent && (
{sideContent} @@ -293,7 +293,7 @@ export const PreviewMediaContent: FC<{
@@ -303,7 +303,7 @@ export const PreviewMediaContent: FC<{ tabIndex={-1} onClick={stopPropagation} className={cn( - "center absolute left-1/2 z-[99] h-6 -translate-x-1/2 gap-2 rounded-full bg-neutral-700/90 px-4 duration-200 animate-in fade-in-0 slide-in-from-bottom-6", + "center animate-in fade-in-0 slide-in-from-bottom-6 absolute left-1/2 z-[99] h-6 -translate-x-1/2 gap-2 rounded-full bg-neutral-700/90 px-4 duration-200", isVideo ? "bottom-12" : "bottom-4", )} > @@ -518,7 +518,7 @@ const FallbackableImage: FC< href={src} target="_blank" rel="noreferrer" - className="underline duration-200 hover:text-accent" + className="hover:text-accent underline duration-200" > visit the original image {" "} diff --git a/apps/renderer/src/components/ui/modal/components/close.tsx b/apps/desktop/src/renderer/src/components/ui/modal/components/close.tsx similarity index 84% rename from apps/renderer/src/components/ui/modal/components/close.tsx rename to apps/desktop/src/renderer/src/components/ui/modal/components/close.tsx index f08a3e703..ac2063fda 100644 --- a/apps/renderer/src/components/ui/modal/components/close.tsx +++ b/apps/desktop/src/renderer/src/components/ui/modal/components/close.tsx @@ -12,7 +12,7 @@ export const FixedModalCloseButton: Component<{ +
{children} @@ -35,13 +35,13 @@ export const PeekModal = ( exit={{ opacity: 0, }} - className="fixed right-4 flex items-center gap-4 safe-inset-top-4" + className="safe-inset-top-4 fixed right-4 flex items-center gap-4" > {!!to && ( diff --git a/apps/renderer/src/components/ui/modal/stacked/atom.ts b/apps/desktop/src/renderer/src/components/ui/modal/stacked/atom.ts similarity index 100% rename from apps/renderer/src/components/ui/modal/stacked/atom.ts rename to apps/desktop/src/renderer/src/components/ui/modal/stacked/atom.ts diff --git a/apps/renderer/src/components/ui/modal/stacked/bus.ts b/apps/desktop/src/renderer/src/components/ui/modal/stacked/bus.ts similarity index 100% rename from apps/renderer/src/components/ui/modal/stacked/bus.ts rename to apps/desktop/src/renderer/src/components/ui/modal/stacked/bus.ts diff --git a/apps/renderer/src/components/ui/modal/stacked/components.tsx b/apps/desktop/src/renderer/src/components/ui/modal/stacked/components.tsx similarity index 77% rename from apps/renderer/src/components/ui/modal/stacked/components.tsx rename to apps/desktop/src/renderer/src/components/ui/modal/stacked/components.tsx index 73966f022..dbb6b0d24 100644 --- a/apps/renderer/src/components/ui/modal/stacked/components.tsx +++ b/apps/desktop/src/renderer/src/components/ui/modal/stacked/components.tsx @@ -10,7 +10,7 @@ export const ModalClose = () => { return ( diff --git a/apps/renderer/src/components/ui/modal/stacked/constants.ts b/apps/desktop/src/renderer/src/components/ui/modal/stacked/constants.ts similarity index 100% rename from apps/renderer/src/components/ui/modal/stacked/constants.ts rename to apps/desktop/src/renderer/src/components/ui/modal/stacked/constants.ts diff --git a/apps/renderer/src/components/ui/modal/stacked/context.tsx b/apps/desktop/src/renderer/src/components/ui/modal/stacked/context.tsx similarity index 100% rename from apps/renderer/src/components/ui/modal/stacked/context.tsx rename to apps/desktop/src/renderer/src/components/ui/modal/stacked/context.tsx diff --git a/apps/renderer/src/components/ui/modal/stacked/custom-modal.tsx b/apps/desktop/src/renderer/src/components/ui/modal/stacked/custom-modal.tsx similarity index 88% rename from apps/renderer/src/components/ui/modal/stacked/custom-modal.tsx rename to apps/desktop/src/renderer/src/components/ui/modal/stacked/custom-modal.tsx index d7dd5fc12..c923bd404 100644 --- a/apps/renderer/src/components/ui/modal/stacked/custom-modal.tsx +++ b/apps/desktop/src/renderer/src/components/ui/modal/stacked/custom-modal.tsx @@ -20,7 +20,7 @@ export const SlideUpModal: ModalTemplateType = (props) => { const winHeight = useState(() => window.innerHeight)[0] const { dismiss } = useCurrentModal() return ( -
+
{ opacity: 0, }} className={cn( - "relative flex flex-col items-center overflow-hidden rounded-xl border bg-theme-background p-8 pb-0", + "bg-theme-background relative flex flex-col items-center overflow-hidden rounded-xl border p-8 pb-0", "aspect-[7/9] w-[600px] max-w-full shadow lg:max-h-[calc(100vh-10rem)]", "motion-preset-slide-up motion-duration-200 motion-ease-spring-smooth", props.className, @@ -87,9 +87,9 @@ export const DrawerModalLayout: FC = ({ children }) => { exit="exit" layout="size" className={cn( - "flex flex-col items-center overflow-hidden rounded-xl border bg-theme-background p-8 pb-0", + "bg-theme-background flex flex-col items-center overflow-hidden rounded-xl border p-8 pb-0", "shadow-drawer-to-left w-[60ch] max-w-full", - "fixed bottom-4 right-2 safe-inset-top-4", + "safe-inset-top-4 fixed bottom-4 right-2", )} > {children} @@ -102,7 +102,7 @@ export const ScaleModal: ModalTemplateType = (props) => { const { dismiss } = useCurrentModal() return ( -
+
= ({ children, className, as: As = "main" }) => ( void } label: ( {t("words.undo")} - + Meta+Z diff --git a/apps/renderer/src/hooks/biz/useTimelineList.ts b/apps/desktop/src/renderer/src/hooks/biz/useTimelineList.ts similarity index 100% rename from apps/renderer/src/hooks/biz/useTimelineList.ts rename to apps/desktop/src/renderer/src/hooks/biz/useTimelineList.ts diff --git a/apps/renderer/src/hooks/biz/useTraySetting.ts b/apps/desktop/src/renderer/src/hooks/biz/useTraySetting.ts similarity index 100% rename from apps/renderer/src/hooks/biz/useTraySetting.ts rename to apps/desktop/src/renderer/src/hooks/biz/useTraySetting.ts diff --git a/apps/renderer/src/hooks/common/index.ts b/apps/desktop/src/renderer/src/hooks/common/index.ts similarity index 100% rename from apps/renderer/src/hooks/common/index.ts rename to apps/desktop/src/renderer/src/hooks/common/index.ts diff --git a/apps/renderer/src/hooks/common/useBizQuery.ts b/apps/desktop/src/renderer/src/hooks/common/useBizQuery.ts similarity index 100% rename from apps/renderer/src/hooks/common/useBizQuery.ts rename to apps/desktop/src/renderer/src/hooks/common/useBizQuery.ts diff --git a/apps/renderer/src/hooks/common/useContextMenu.tsx b/apps/desktop/src/renderer/src/hooks/common/useContextMenu.tsx similarity index 100% rename from apps/renderer/src/hooks/common/useContextMenu.tsx rename to apps/desktop/src/renderer/src/hooks/common/useContextMenu.tsx diff --git a/apps/renderer/src/hooks/common/useI18n.ts b/apps/desktop/src/renderer/src/hooks/common/useI18n.ts similarity index 100% rename from apps/renderer/src/hooks/common/useI18n.ts rename to apps/desktop/src/renderer/src/hooks/common/useI18n.ts diff --git a/apps/renderer/src/hooks/common/usePreventOverscrollBounce.ts b/apps/desktop/src/renderer/src/hooks/common/usePreventOverscrollBounce.ts similarity index 100% rename from apps/renderer/src/hooks/common/usePreventOverscrollBounce.ts rename to apps/desktop/src/renderer/src/hooks/common/usePreventOverscrollBounce.ts diff --git a/apps/renderer/src/hooks/common/useSwitchHotkeyScope.ts b/apps/desktop/src/renderer/src/hooks/common/useSwitchHotkeyScope.ts similarity index 100% rename from apps/renderer/src/hooks/common/useSwitchHotkeyScope.ts rename to apps/desktop/src/renderer/src/hooks/common/useSwitchHotkeyScope.ts diff --git a/apps/renderer/src/hooks/common/useSyncTheme.ts b/apps/desktop/src/renderer/src/hooks/common/useSyncTheme.ts similarity index 100% rename from apps/renderer/src/hooks/common/useSyncTheme.ts rename to apps/desktop/src/renderer/src/hooks/common/useSyncTheme.ts diff --git a/apps/renderer/src/i18n.ts b/apps/desktop/src/renderer/src/i18n.ts similarity index 100% rename from apps/renderer/src/i18n.ts rename to apps/desktop/src/renderer/src/i18n.ts diff --git a/apps/renderer/src/initialize/analytics.ts b/apps/desktop/src/renderer/src/initialize/analytics.ts similarity index 100% rename from apps/renderer/src/initialize/analytics.ts rename to apps/desktop/src/renderer/src/initialize/analytics.ts diff --git a/apps/renderer/src/initialize/global-shortcuts.ts b/apps/desktop/src/renderer/src/initialize/global-shortcuts.ts similarity index 98% rename from apps/renderer/src/initialize/global-shortcuts.ts rename to apps/desktop/src/renderer/src/initialize/global-shortcuts.ts index 27aef7784..6574a881e 100644 --- a/apps/renderer/src/initialize/global-shortcuts.ts +++ b/apps/desktop/src/renderer/src/initialize/global-shortcuts.ts @@ -18,7 +18,7 @@ const parseAccelerator = ( } export const registerAppGlobalShortcuts = () => { - // @see apps/main/menu.ts + // @see src/main/menu.ts const shortcuts: ShortcutDefinition[] = [ { accelerator: "CmdOrCtrl+,", diff --git a/apps/renderer/src/initialize/helper.ts b/apps/desktop/src/renderer/src/initialize/helper.ts similarity index 100% rename from apps/renderer/src/initialize/helper.ts rename to apps/desktop/src/renderer/src/initialize/helper.ts diff --git a/apps/renderer/src/initialize/history.ts b/apps/desktop/src/renderer/src/initialize/history.ts similarity index 100% rename from apps/renderer/src/initialize/history.ts rename to apps/desktop/src/renderer/src/initialize/history.ts diff --git a/apps/renderer/src/initialize/hydrate.ts b/apps/desktop/src/renderer/src/initialize/hydrate.ts similarity index 100% rename from apps/renderer/src/initialize/hydrate.ts rename to apps/desktop/src/renderer/src/initialize/hydrate.ts diff --git a/apps/renderer/src/initialize/index.ts b/apps/desktop/src/renderer/src/initialize/index.ts similarity index 100% rename from apps/renderer/src/initialize/index.ts rename to apps/desktop/src/renderer/src/initialize/index.ts diff --git a/apps/renderer/src/initialize/migrates/index.ts b/apps/desktop/src/renderer/src/initialize/migrates/index.ts similarity index 100% rename from apps/renderer/src/initialize/migrates/index.ts rename to apps/desktop/src/renderer/src/initialize/migrates/index.ts diff --git a/apps/renderer/src/initialize/op.ts b/apps/desktop/src/renderer/src/initialize/op.ts similarity index 100% rename from apps/renderer/src/initialize/op.ts rename to apps/desktop/src/renderer/src/initialize/op.ts diff --git a/apps/renderer/src/initialize/queue.ts b/apps/desktop/src/renderer/src/initialize/queue.ts similarity index 100% rename from apps/renderer/src/initialize/queue.ts rename to apps/desktop/src/renderer/src/initialize/queue.ts diff --git a/apps/renderer/src/initialize/sentry.config.ts b/apps/desktop/src/renderer/src/initialize/sentry.config.ts similarity index 100% rename from apps/renderer/src/initialize/sentry.config.ts rename to apps/desktop/src/renderer/src/initialize/sentry.config.ts diff --git a/apps/renderer/src/initialize/sentry.ts b/apps/desktop/src/renderer/src/initialize/sentry.ts similarity index 100% rename from apps/renderer/src/initialize/sentry.ts rename to apps/desktop/src/renderer/src/initialize/sentry.ts diff --git a/apps/renderer/src/lib/__tests__/parse-html.test.ts b/apps/desktop/src/renderer/src/lib/__tests__/parse-html.test.ts similarity index 100% rename from apps/renderer/src/lib/__tests__/parse-html.test.ts rename to apps/desktop/src/renderer/src/lib/__tests__/parse-html.test.ts diff --git a/apps/renderer/src/lib/api-fetch.ts b/apps/desktop/src/renderer/src/lib/api-fetch.ts similarity index 100% rename from apps/renderer/src/lib/api-fetch.ts rename to apps/desktop/src/renderer/src/lib/api-fetch.ts diff --git a/apps/renderer/src/lib/app.ts b/apps/desktop/src/renderer/src/lib/app.ts similarity index 100% rename from apps/renderer/src/lib/app.ts rename to apps/desktop/src/renderer/src/lib/app.ts diff --git a/apps/renderer/src/lib/client.ts b/apps/desktop/src/renderer/src/lib/client.ts similarity index 100% rename from apps/renderer/src/lib/client.ts rename to apps/desktop/src/renderer/src/lib/client.ts diff --git a/apps/renderer/src/lib/defineQuery.ts b/apps/desktop/src/renderer/src/lib/defineQuery.ts similarity index 100% rename from apps/renderer/src/lib/defineQuery.ts rename to apps/desktop/src/renderer/src/lib/defineQuery.ts diff --git a/apps/renderer/src/lib/dev.tsx b/apps/desktop/src/renderer/src/lib/dev.tsx similarity index 100% rename from apps/renderer/src/lib/dev.tsx rename to apps/desktop/src/renderer/src/lib/dev.tsx diff --git a/apps/renderer/src/lib/error-parser.ts b/apps/desktop/src/renderer/src/lib/error-parser.ts similarity index 100% rename from apps/renderer/src/lib/error-parser.ts rename to apps/desktop/src/renderer/src/lib/error-parser.ts diff --git a/apps/renderer/src/lib/img-proxy.ts b/apps/desktop/src/renderer/src/lib/img-proxy.ts similarity index 100% rename from apps/renderer/src/lib/img-proxy.ts rename to apps/desktop/src/renderer/src/lib/img-proxy.ts diff --git a/apps/renderer/src/lib/immersive-translate.ts b/apps/desktop/src/renderer/src/lib/immersive-translate.ts similarity index 100% rename from apps/renderer/src/lib/immersive-translate.ts rename to apps/desktop/src/renderer/src/lib/immersive-translate.ts diff --git a/apps/renderer/src/lib/issues.ts b/apps/desktop/src/renderer/src/lib/issues.ts similarity index 100% rename from apps/renderer/src/lib/issues.ts rename to apps/desktop/src/renderer/src/lib/issues.ts diff --git a/apps/renderer/src/lib/jotai.ts b/apps/desktop/src/renderer/src/lib/jotai.ts similarity index 100% rename from apps/renderer/src/lib/jotai.ts rename to apps/desktop/src/renderer/src/lib/jotai.ts diff --git a/apps/renderer/src/lib/load-language.ts b/apps/desktop/src/renderer/src/lib/load-language.ts similarity index 100% rename from apps/renderer/src/lib/load-language.ts rename to apps/desktop/src/renderer/src/lib/load-language.ts diff --git a/apps/renderer/src/lib/log.ts b/apps/desktop/src/renderer/src/lib/log.ts similarity index 100% rename from apps/renderer/src/lib/log.ts rename to apps/desktop/src/renderer/src/lib/log.ts diff --git a/apps/renderer/src/lib/native-menu.ts b/apps/desktop/src/renderer/src/lib/native-menu.ts similarity index 100% rename from apps/renderer/src/lib/native-menu.ts rename to apps/desktop/src/renderer/src/lib/native-menu.ts diff --git a/apps/renderer/src/lib/observe-resize.ts b/apps/desktop/src/renderer/src/lib/observe-resize.ts similarity index 100% rename from apps/renderer/src/lib/observe-resize.ts rename to apps/desktop/src/renderer/src/lib/observe-resize.ts diff --git a/apps/renderer/src/lib/parse-html.ts b/apps/desktop/src/renderer/src/lib/parse-html.ts similarity index 100% rename from apps/renderer/src/lib/parse-html.ts rename to apps/desktop/src/renderer/src/lib/parse-html.ts diff --git a/apps/renderer/src/lib/parse-markdown.ts b/apps/desktop/src/renderer/src/lib/parse-markdown.ts similarity index 100% rename from apps/renderer/src/lib/parse-markdown.ts rename to apps/desktop/src/renderer/src/lib/parse-markdown.ts diff --git a/apps/renderer/src/lib/parsers.ts b/apps/desktop/src/renderer/src/lib/parsers.ts similarity index 100% rename from apps/renderer/src/lib/parsers.ts rename to apps/desktop/src/renderer/src/lib/parsers.ts diff --git a/apps/renderer/src/lib/query-client.ts b/apps/desktop/src/renderer/src/lib/query-client.ts similarity index 100% rename from apps/renderer/src/lib/query-client.ts rename to apps/desktop/src/renderer/src/lib/query-client.ts diff --git a/apps/renderer/src/lib/translate.ts b/apps/desktop/src/renderer/src/lib/translate.ts similarity index 100% rename from apps/renderer/src/lib/translate.ts rename to apps/desktop/src/renderer/src/lib/translate.ts diff --git a/apps/renderer/src/lib/utils.ts b/apps/desktop/src/renderer/src/lib/utils.ts similarity index 100% rename from apps/renderer/src/lib/utils.ts rename to apps/desktop/src/renderer/src/lib/utils.ts diff --git a/apps/renderer/src/lottie/achievement.lottie b/apps/desktop/src/renderer/src/lottie/achievement.lottie similarity index 100% rename from apps/renderer/src/lottie/achievement.lottie rename to apps/desktop/src/renderer/src/lottie/achievement.lottie diff --git a/apps/renderer/src/lottie/confetti.lottie b/apps/desktop/src/renderer/src/lottie/confetti.lottie similarity index 100% rename from apps/renderer/src/lottie/confetti.lottie rename to apps/desktop/src/renderer/src/lottie/confetti.lottie diff --git a/apps/renderer/src/lottie/star.lottie b/apps/desktop/src/renderer/src/lottie/star.lottie similarity index 100% rename from apps/renderer/src/lottie/star.lottie rename to apps/desktop/src/renderer/src/lottie/star.lottie diff --git a/apps/renderer/src/main.tsx b/apps/desktop/src/renderer/src/main.tsx similarity index 100% rename from apps/renderer/src/main.tsx rename to apps/desktop/src/renderer/src/main.tsx diff --git a/apps/renderer/src/modules/achievement/AchievementModalContent.tsx b/apps/desktop/src/renderer/src/modules/achievement/AchievementModalContent.tsx similarity index 94% rename from apps/renderer/src/modules/achievement/AchievementModalContent.tsx rename to apps/desktop/src/renderer/src/modules/achievement/AchievementModalContent.tsx index 79a7b93b0..1b2d80653 100644 --- a/apps/renderer/src/modules/achievement/AchievementModalContent.tsx +++ b/apps/desktop/src/renderer/src/modules/achievement/AchievementModalContent.tsx @@ -206,7 +206,7 @@ export const AchievementModalContent: FC = () => {
{t("words.achievement")}
- + {t("achievement.description")} * @@ -233,7 +233,7 @@ export const AchievementModalContent: FC = () => { {copy.video && achievement.type === "received" && ( { presentBadgeVideo(achievement.actionId) }} @@ -242,7 +242,7 @@ export const AchievementModalContent: FC = () => { )}
-
+
{t(copy.description)}
@@ -265,7 +265,7 @@ export const AchievementModalContent: FC = () => { className={styledButtonVariant({ variant: "outline", className: - "relative gap-1 border-green-200 !bg-green-100/50 text-green-800 dark:border-green-200/20 dark:!bg-green-100/5 dark:text-foreground", + "dark:text-foreground relative gap-1 border-green-200 !bg-green-100/50 text-green-800 dark:border-green-200/20 dark:!bg-green-100/5", })} > @@ -278,7 +278,7 @@ export const AchievementModalContent: FC = () => { className={styledButtonVariant({ variant: "outline", className: - "relative cursor-not-allowed gap-1 border-zinc-200 !bg-zinc-100/50 text-zinc-800 dark:border-zinc-200/20 dark:!bg-zinc-100/5 dark:text-foreground", + "dark:text-foreground relative cursor-not-allowed gap-1 border-zinc-200 !bg-zinc-100/50 text-zinc-800 dark:border-zinc-200/20 dark:!bg-zinc-100/5", })} > Validating... @@ -300,7 +300,7 @@ export const AchievementModalContent: FC = () => { -

+

* {t("achievement.nft_coming_soon")}

@@ -421,19 +421,19 @@ const IncompleteButton: FC<{
- + {achievement.progress} / {achievement.progressMax} - + { { diff --git a/apps/renderer/src/modules/action/action-setting.tsx b/apps/desktop/src/renderer/src/modules/action/action-setting.tsx similarity index 100% rename from apps/renderer/src/modules/action/action-setting.tsx rename to apps/desktop/src/renderer/src/modules/action/action-setting.tsx diff --git a/apps/renderer/src/modules/action/feed-filter.tsx b/apps/desktop/src/renderer/src/modules/action/feed-filter.tsx similarity index 100% rename from apps/renderer/src/modules/action/feed-filter.tsx rename to apps/desktop/src/renderer/src/modules/action/feed-filter.tsx diff --git a/apps/renderer/src/modules/action/target-action-list.tsx b/apps/desktop/src/renderer/src/modules/action/target-action-list.tsx similarity index 99% rename from apps/renderer/src/modules/action/target-action-list.tsx rename to apps/desktop/src/renderer/src/modules/action/target-action-list.tsx index ac4042698..c4243c905 100644 --- a/apps/renderer/src/modules/action/target-action-list.tsx +++ b/apps/desktop/src/renderer/src/modules/action/target-action-list.tsx @@ -347,7 +347,7 @@ export const TargetActionList = ({ index }: { index: number }) => {
- + diff --git a/apps/renderer/src/modules/activation/ActivationModalContent.tsx b/apps/desktop/src/renderer/src/modules/activation/ActivationModalContent.tsx similarity index 97% rename from apps/renderer/src/modules/activation/ActivationModalContent.tsx rename to apps/desktop/src/renderer/src/modules/activation/ActivationModalContent.tsx index 02c107659..035ae66c7 100644 --- a/apps/renderer/src/modules/activation/ActivationModalContent.tsx +++ b/apps/desktop/src/renderer/src/modules/activation/ActivationModalContent.tsx @@ -84,7 +84,7 @@ export const ActivationModalContent = ({ )} diff --git a/apps/renderer/src/modules/activation/NeedActivationToast.tsx b/apps/desktop/src/renderer/src/modules/activation/NeedActivationToast.tsx similarity index 94% rename from apps/renderer/src/modules/activation/NeedActivationToast.tsx rename to apps/desktop/src/renderer/src/modules/activation/NeedActivationToast.tsx index c9c297c47..1849a62ec 100644 --- a/apps/renderer/src/modules/activation/NeedActivationToast.tsx +++ b/apps/desktop/src/renderer/src/modules/activation/NeedActivationToast.tsx @@ -13,7 +13,7 @@ export const NeedActivationToast = (props: { dimiss: () => void }) => {
{t("activation.description")}
diff --git a/apps/renderer/src/modules/app-layout/feed-column/components/PodcastButton.tsx b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/components/PodcastButton.tsx similarity index 94% rename from apps/renderer/src/modules/app-layout/feed-column/components/PodcastButton.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/feed-column/components/PodcastButton.tsx index 21a1c5eb5..d7dcf44ea 100644 --- a/apps/renderer/src/modules/app-layout/feed-column/components/PodcastButton.tsx +++ b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/components/PodcastButton.tsx @@ -39,7 +39,7 @@ export const PodcastButton = ({ feed }: { feed: FeedModel }) => { > {entry.entries.title} -
+
{feed.title} · @@ -94,7 +94,7 @@ export const PodcastButton = ({ feed }: { feed: FeedModel }) => { const ActionIcon = ({ className, onClick }: { className?: string; onClick?: () => void }) => ( diff --git a/apps/renderer/src/modules/app-layout/feed-column/desktop.tsx b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/desktop.tsx similarity index 99% rename from apps/renderer/src/modules/app-layout/feed-column/desktop.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/feed-column/desktop.tsx index 402f27ed7..8786959a0 100644 --- a/apps/renderer/src/modules/app-layout/feed-column/desktop.tsx +++ b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/desktop.tsx @@ -124,7 +124,7 @@ export function MainDestopLayout() {
diff --git a/apps/renderer/src/modules/app-layout/feed-column/float-bar.mobile.tsx b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/float-bar.mobile.tsx similarity index 92% rename from apps/renderer/src/modules/app-layout/feed-column/float-bar.mobile.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/feed-column/float-bar.mobile.tsx index fb12b5cc9..9f4e4696c 100644 --- a/apps/renderer/src/modules/app-layout/feed-column/float-bar.mobile.tsx +++ b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/float-bar.mobile.tsx @@ -73,13 +73,13 @@ export const MobileFloatBar = ({ return (
void }) = return (
{views.map((item) => ( diff --git a/apps/renderer/src/modules/app-layout/feed-column/index.electron.tsx b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.electron.tsx similarity index 100% rename from apps/renderer/src/modules/app-layout/feed-column/index.electron.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.electron.tsx diff --git a/apps/renderer/src/modules/app-layout/feed-column/index.mobile.tsx b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.mobile.tsx similarity index 100% rename from apps/renderer/src/modules/app-layout/feed-column/index.mobile.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.mobile.tsx diff --git a/apps/renderer/src/modules/app-layout/feed-column/index.shared.tsx b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.shared.tsx similarity index 100% rename from apps/renderer/src/modules/app-layout/feed-column/index.shared.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.shared.tsx diff --git a/apps/renderer/src/modules/app-layout/feed-column/index.tsx b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.tsx similarity index 100% rename from apps/renderer/src/modules/app-layout/feed-column/index.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/feed-column/index.tsx diff --git a/apps/renderer/src/modules/app-layout/feed-column/mobile.tsx b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/mobile.tsx similarity index 91% rename from apps/renderer/src/modules/app-layout/feed-column/mobile.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/feed-column/mobile.tsx index 7c3e3bf4b..ea0587819 100644 --- a/apps/renderer/src/modules/app-layout/feed-column/mobile.tsx +++ b/apps/desktop/src/renderer/src/modules/app-layout/feed-column/mobile.tsx @@ -24,7 +24,7 @@ export function FeedColumnMobile({ asWidget }: { asWidget?: boolean }) { return (
@@ -36,12 +36,12 @@ export function FeedColumnMobile({ asWidget }: { asWidget?: boolean }) {
- +
-
+
{views.map((item, index) => (
@@ -55,7 +55,7 @@ export function FeedColumnMobile({ asWidget }: { asWidget?: boolean }) {
diff --git a/apps/renderer/src/modules/app-layout/subview/hooks.ts b/apps/desktop/src/renderer/src/modules/app-layout/subview/hooks.ts similarity index 100% rename from apps/renderer/src/modules/app-layout/subview/hooks.ts rename to apps/desktop/src/renderer/src/modules/app-layout/subview/hooks.ts diff --git a/apps/renderer/src/modules/app-layout/subview/index.desktop.tsx b/apps/desktop/src/renderer/src/modules/app-layout/subview/index.desktop.tsx similarity index 97% rename from apps/renderer/src/modules/app-layout/subview/index.desktop.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/subview/index.desktop.tsx index d90b29db0..bfd17ec99 100644 --- a/apps/renderer/src/modules/app-layout/subview/index.desktop.tsx +++ b/apps/desktop/src/renderer/src/modules/app-layout/subview/index.desktop.tsx @@ -67,7 +67,7 @@ export function SubviewLayout() { onClick={() => { navigate(prevLocation) }} - className="no-drag-region inline-flex items-center gap-1 duration-200 hover:text-accent" + className="no-drag-region hover:text-accent inline-flex items-center gap-1 duration-200" > {t("words.back", { ns: "common" })} diff --git a/apps/renderer/src/modules/app-layout/subview/index.electron.tsx b/apps/desktop/src/renderer/src/modules/app-layout/subview/index.electron.tsx similarity index 100% rename from apps/renderer/src/modules/app-layout/subview/index.electron.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/subview/index.electron.tsx diff --git a/apps/renderer/src/modules/app-layout/subview/index.mobile.tsx b/apps/desktop/src/renderer/src/modules/app-layout/subview/index.mobile.tsx similarity index 100% rename from apps/renderer/src/modules/app-layout/subview/index.mobile.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/subview/index.mobile.tsx diff --git a/apps/renderer/src/modules/app-layout/subview/index.tsx b/apps/desktop/src/renderer/src/modules/app-layout/subview/index.tsx similarity index 100% rename from apps/renderer/src/modules/app-layout/subview/index.tsx rename to apps/desktop/src/renderer/src/modules/app-layout/subview/index.tsx diff --git a/apps/renderer/src/modules/app/EnvironmentIndicator.tsx b/apps/desktop/src/renderer/src/modules/app/EnvironmentIndicator.tsx similarity index 94% rename from apps/renderer/src/modules/app/EnvironmentIndicator.tsx rename to apps/desktop/src/renderer/src/modules/app/EnvironmentIndicator.tsx index c4f670a3d..1eb6e1166 100644 --- a/apps/renderer/src/modules/app/EnvironmentIndicator.tsx +++ b/apps/desktop/src/renderer/src/modules/app/EnvironmentIndicator.tsx @@ -50,7 +50,7 @@ export const EnvironmentIndicator = () => { }) }} > -
+
{role}:{isDev && } {import.meta.env.MODE}
diff --git a/apps/renderer/src/modules/app/NetworkStatusIndicator.tsx b/apps/desktop/src/renderer/src/modules/app/NetworkStatusIndicator.tsx similarity index 94% rename from apps/renderer/src/modules/app/NetworkStatusIndicator.tsx rename to apps/desktop/src/renderer/src/modules/app/NetworkStatusIndicator.tsx index 73254b629..89f35e019 100644 --- a/apps/renderer/src/modules/app/NetworkStatusIndicator.tsx +++ b/apps/desktop/src/renderer/src/modules/app/NetworkStatusIndicator.tsx @@ -21,7 +21,7 @@ export const NetworkStatusIndicator = () => {
{ }} >
{t("feed_form.fee_description")} diff --git a/apps/renderer/src/modules/discover/recommendation-content.tsx b/apps/desktop/src/renderer/src/modules/discover/recommendation-content.tsx similarity index 100% rename from apps/renderer/src/modules/discover/recommendation-content.tsx rename to apps/desktop/src/renderer/src/modules/discover/recommendation-content.tsx diff --git a/apps/renderer/src/modules/discover/recommendations-card.tsx b/apps/desktop/src/renderer/src/modules/discover/recommendations-card.tsx similarity index 86% rename from apps/renderer/src/modules/discover/recommendations-card.tsx rename to apps/desktop/src/renderer/src/modules/discover/recommendations-card.tsx index 7a0ea4ed9..6aa5ae6ba 100644 --- a/apps/renderer/src/modules/discover/recommendations-card.tsx +++ b/apps/desktop/src/renderer/src/modules/discover/recommendations-card.tsx @@ -46,15 +46,15 @@ export const RecommendationCard: FC = memo( return ( - -
+ +
- - + + @@ -70,7 +70,7 @@ export const RecommendationCard: FC = memo( -
    +
      {Object.keys(data.routes).map((route) => { const routeData = data.routes[route]! // some routes have multiple paths, like `huxiu` @@ -80,7 +80,7 @@ export const RecommendationCard: FC = memo( return (
    • { ;(e.target as HTMLElement).querySelector("button")?.click() }} @@ -88,7 +88,7 @@ export const RecommendationCard: FC = memo( >
    -
    +
    @@ -142,7 +142,7 @@ export const RecommendationCard: FC = memo( key={c} type="button" className={clsx( - "cursor-pointer rounded bg-muted/50 px-1.5 duration-200 hover:bg-muted", + "bg-muted/50 hover:bg-muted cursor-pointer rounded px-1.5 duration-200", !RSSHubCategories.includes(c) && "pointer-events-none opacity-50", )} > diff --git a/apps/renderer/src/modules/discover/recommendations.module.css b/apps/desktop/src/renderer/src/modules/discover/recommendations.module.css similarity index 100% rename from apps/renderer/src/modules/discover/recommendations.module.css rename to apps/desktop/src/renderer/src/modules/discover/recommendations.module.css diff --git a/apps/renderer/src/modules/discover/recommendations.tsx b/apps/desktop/src/renderer/src/modules/discover/recommendations.tsx similarity index 100% rename from apps/renderer/src/modules/discover/recommendations.tsx rename to apps/desktop/src/renderer/src/modules/discover/recommendations.tsx diff --git a/apps/renderer/src/modules/discover/rss3-form.tsx b/apps/desktop/src/renderer/src/modules/discover/rss3-form.tsx similarity index 100% rename from apps/renderer/src/modules/discover/rss3-form.tsx rename to apps/desktop/src/renderer/src/modules/discover/rss3-form.tsx diff --git a/apps/renderer/src/modules/discover/transform-form.tsx b/apps/desktop/src/renderer/src/modules/discover/transform-form.tsx similarity index 100% rename from apps/renderer/src/modules/discover/transform-form.tsx rename to apps/desktop/src/renderer/src/modules/discover/transform-form.tsx diff --git a/apps/renderer/src/modules/discover/types.ts b/apps/desktop/src/renderer/src/modules/discover/types.ts similarity index 100% rename from apps/renderer/src/modules/discover/types.ts rename to apps/desktop/src/renderer/src/modules/discover/types.ts diff --git a/apps/renderer/src/modules/discover/user-form.tsx b/apps/desktop/src/renderer/src/modules/discover/user-form.tsx similarity index 100% rename from apps/renderer/src/modules/discover/user-form.tsx rename to apps/desktop/src/renderer/src/modules/discover/user-form.tsx diff --git a/apps/renderer/src/modules/discover/utils.ts b/apps/desktop/src/renderer/src/modules/discover/utils.ts similarity index 100% rename from apps/renderer/src/modules/discover/utils.ts rename to apps/desktop/src/renderer/src/modules/discover/utils.ts diff --git a/apps/renderer/src/modules/editor/css-editor.tsx b/apps/desktop/src/renderer/src/modules/editor/css-editor.tsx similarity index 94% rename from apps/renderer/src/modules/editor/css-editor.tsx rename to apps/desktop/src/renderer/src/modules/editor/css-editor.tsx index c3777c557..217137b98 100644 --- a/apps/renderer/src/modules/editor/css-editor.tsx +++ b/apps/desktop/src/renderer/src/modules/editor/css-editor.tsx @@ -80,7 +80,7 @@ export const CSSEditor: Component<{ if (!isSupportPlainTextOnly) { return (
    -
    +
    Your browser does not support highlight CSS.
    @@ -101,11 +101,11 @@ export const CSSEditor: Component<{ className={cn( "size-full", - "ring-accent/20 duration-200 focus:border-accent/80 focus:outline-none focus:ring-2", + "ring-accent/20 focus:border-accent/80 duration-200 focus:outline-none focus:ring-2", "focus:!bg-accent/5", - "border border-border", + "border-border border", "placeholder:text-theme-placeholder-text dark:bg-zinc-700/[0.15] dark:text-zinc-200", - "overflow-auto whitespace-pre hover:border-accent/60", + "hover:border-accent/60 overflow-auto whitespace-pre", className, )} ref={ref} diff --git a/apps/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx b/apps/desktop/src/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx diff --git a/apps/renderer/src/modules/entry-column/Items/article-item.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/article-item.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/Items/article-item.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/Items/article-item.tsx diff --git a/apps/renderer/src/modules/entry-column/Items/audio-item.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/audio-item.tsx similarity index 92% rename from apps/renderer/src/modules/entry-column/Items/audio-item.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/Items/audio-item.tsx index 51740f5ab..c13ed3416 100644 --- a/apps/renderer/src/modules/entry-column/Items/audio-item.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/audio-item.tsx @@ -13,7 +13,7 @@ export function AudioItem({ entryId, entryPreview, translation }: UniversalItemP export function AudioItemStateLess({ entry, feed }: EntryItemStatelessProps) { return ( -
    +
    @@ -55,7 +55,7 @@ export function AudioItemStateLess({ entry, feed }: EntryItemStatelessProps) { } export const AudioItemSkeleton = ( -
    +
    diff --git a/apps/renderer/src/modules/entry-column/Items/index.ts b/apps/desktop/src/renderer/src/modules/entry-column/Items/index.ts similarity index 100% rename from apps/renderer/src/modules/entry-column/Items/index.ts rename to apps/desktop/src/renderer/src/modules/entry-column/Items/index.ts diff --git a/apps/renderer/src/modules/entry-column/Items/notification-item.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/notification-item.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/Items/notification-item.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/Items/notification-item.tsx diff --git a/apps/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx similarity index 94% rename from apps/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx index 0d47d75d9..d395c7d49 100644 --- a/apps/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx @@ -10,7 +10,7 @@ import type { EntryItemStatelessProps } from "../types" export function PictureItemStateLess({ entry, feed }: EntryItemStatelessProps) { return ( -
    +
    diff --git a/apps/renderer/src/modules/entry-column/Items/picture-item.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item.tsx similarity index 94% rename from apps/renderer/src/modules/entry-column/Items/picture-item.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item.tsx index e51f429e5..f84ef5e64 100644 --- a/apps/renderer/src/modules/entry-column/Items/picture-item.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item.tsx @@ -49,7 +49,7 @@ export function PictureItem({ entryId, entryPreview, translation }: UniversalIte }} /> ) : ( -
    +
    {t("entry_content.no_content")}
    @@ -128,7 +128,7 @@ export const PictureWaterFallItem = memo(function PictureWaterFallItem({
    ) : ( -
    +
    No media available
    @@ -179,7 +179,7 @@ MasonryItemFixedDimensionWrapper.whyDidYouRender = { } export const PictureItemSkeleton = ( -
    +
    diff --git a/apps/renderer/src/modules/entry-column/Items/picture-masonry.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-masonry.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/Items/picture-masonry.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/Items/picture-masonry.tsx diff --git a/apps/renderer/src/modules/entry-column/Items/social-media-item.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx similarity index 96% rename from apps/renderer/src/modules/entry-column/Items/social-media-item.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx index ac2f4e4be..50c257e07 100644 --- a/apps/renderer/src/modules/entry-column/Items/social-media-item.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx @@ -74,7 +74,7 @@ export const SocialMediaItem: EntryListItemFC = ({ entryId, entryPreview, transl "relative flex px-5 py-4 lg:px-8", "group", !asRead && - "before:absolute before:left-1 before:top-8 before:block before:size-2 before:rounded-full before:bg-accent md:before:-left-2 lg:before:left-2", + "before:bg-accent before:absolute before:left-1 before:top-8 before:block before:size-2 before:rounded-full md:before:-left-2 lg:before:left-2", )} > @@ -105,7 +105,7 @@ export const SocialMediaItem: EntryListItemFC = ({ entryId, entryPreview, transl
    +
    @@ -278,7 +278,7 @@ const SocialMediaGallery = ({ media }: { media: MediaModel[] }) => { type={media.type} previewImageUrl={media.preview_image_url} blurhash={media.blurhash} - className="size-28 shrink-0 data-[state=loading]:!bg-theme-placeholder-image" + className="data-[state=loading]:!bg-theme-placeholder-image size-28 shrink-0" loading="lazy" proxy={proxySize} onClick={() => { @@ -390,7 +390,7 @@ const CollapsedSocialMediaItem: Component<{ collapsedItemCache.put(entryId, true) }} aria-hidden - className="flex items-center justify-center text-xs duration-200 hover:text-foreground" + className="hover:text-foreground flex items-center justify-center text-xs duration-200" > {t("words.show_more")} diff --git a/apps/renderer/src/modules/entry-column/Items/video-item.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/video-item.tsx similarity index 94% rename from apps/renderer/src/modules/entry-column/Items/video-item.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/Items/video-item.tsx index a254ac29f..1e2e7178c 100644 --- a/apps/renderer/src/modules/entry-column/Items/video-item.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/video-item.tsx @@ -78,7 +78,7 @@ export function VideoItem({ entryId, entryPreview, translation }: UniversalItemP return (
    { if (isMobile() && entry.entries.url) { window.open(entry.entries.url, "_blank") @@ -129,7 +129,7 @@ export function VideoItem({ entryId, entryPreview, translation }: UniversalItemP showFallback={true} /> ) : ( -
    +
    No media available
    @@ -163,7 +163,7 @@ const PreviewVideoModalContent: ModalContentComponent<{ exit={{ opacity: 0, }} - className="fixed right-4 flex items-center safe-inset-top-4" + className="safe-inset-top-4 fixed right-4 flex items-center" > @@ -175,7 +175,7 @@ const PreviewVideoModalContent: ModalContentComponent<{ export function VideoItemStateLess({ entry, feed }: EntryItemStatelessProps) { return ( -
    +
    @@ -220,7 +220,7 @@ export function VideoItemStateLess({ entry, feed }: EntryItemStatelessProps) { } export const VideoItemSkeleton = ( -
    +
    diff --git a/apps/renderer/src/modules/entry-column/atoms/index.ts b/apps/desktop/src/renderer/src/modules/entry-column/atoms/index.ts similarity index 100% rename from apps/renderer/src/modules/entry-column/atoms/index.ts rename to apps/desktop/src/renderer/src/modules/entry-column/atoms/index.ts diff --git a/apps/renderer/src/modules/entry-column/components/DateItem.tsx b/apps/desktop/src/renderer/src/modules/entry-column/components/DateItem.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/components/DateItem.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/components/DateItem.tsx diff --git a/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx b/apps/desktop/src/renderer/src/modules/entry-column/components/mark-all-button.tsx similarity index 97% rename from apps/renderer/src/modules/entry-column/components/mark-all-button.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/components/mark-all-button.tsx index 4145601fa..51ef7420c 100644 --- a/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/components/mark-all-button.tsx @@ -66,7 +66,7 @@ export const MarkAllReadWithOverlay = forwardRef< label: ( {t("mark_all_read_button.undo")} - + Meta+Z @@ -151,7 +151,7 @@ const Popup = ({ which, containerRef, setPopoverRef, setShow, handleMarkAllAsRea transform: `translateY(${isElectronWindows ? "-95px" : "-70px"})`, }} transition={{ type: "spring", damping: 20, stiffness: 300 }} - className="shadow-modal absolute z-50 bg-background shadow lg:bg-theme-modal-background-opaque" + className="shadow-modal bg-background lg:bg-theme-modal-background-opaque absolute z-50 shadow" style={{ left: -paddingLeft, top: rect.top, diff --git a/apps/renderer/src/modules/entry-column/grid.tsx b/apps/desktop/src/renderer/src/modules/entry-column/grid.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/grid.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/grid.tsx diff --git a/apps/renderer/src/modules/entry-column/hooks/useEntriesByView.ts b/apps/desktop/src/renderer/src/modules/entry-column/hooks/useEntriesByView.ts similarity index 100% rename from apps/renderer/src/modules/entry-column/hooks/useEntriesByView.ts rename to apps/desktop/src/renderer/src/modules/entry-column/hooks/useEntriesByView.ts diff --git a/apps/renderer/src/modules/entry-column/hooks/useEntryIdListSnap.ts b/apps/desktop/src/renderer/src/modules/entry-column/hooks/useEntryIdListSnap.ts similarity index 100% rename from apps/renderer/src/modules/entry-column/hooks/useEntryIdListSnap.ts rename to apps/desktop/src/renderer/src/modules/entry-column/hooks/useEntryIdListSnap.ts diff --git a/apps/renderer/src/modules/entry-column/hooks/useEntryMarkReadHandler.tsx b/apps/desktop/src/renderer/src/modules/entry-column/hooks/useEntryMarkReadHandler.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/hooks/useEntryMarkReadHandler.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/hooks/useEntryMarkReadHandler.tsx diff --git a/apps/renderer/src/modules/entry-column/hooks/useMarkAll.ts b/apps/desktop/src/renderer/src/modules/entry-column/hooks/useMarkAll.ts similarity index 100% rename from apps/renderer/src/modules/entry-column/hooks/useMarkAll.ts rename to apps/desktop/src/renderer/src/modules/entry-column/hooks/useMarkAll.ts diff --git a/apps/renderer/src/modules/entry-column/index.tsx b/apps/desktop/src/renderer/src/modules/entry-column/index.tsx similarity index 98% rename from apps/renderer/src/modules/entry-column/index.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/index.tsx index ba4d01428..4cac1879c 100644 --- a/apps/renderer/src/modules/entry-column/index.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/index.tsx @@ -119,7 +119,7 @@ function EntryColumnImpl() { return (
    = ({ refetch, isRefreshin ref={containerRef} className={cn( "flex w-full flex-col pb-2 pr-4 transition-[padding] duration-300 ease-in-out", - "pl-6 pt-safe-offset-2.5", + "pt-safe-offset-2.5 pl-6", "bg-background", )} > diff --git a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.shared.tsx b/apps/desktop/src/renderer/src/modules/entry-column/layouts/EntryListHeader.shared.tsx similarity index 99% rename from apps/renderer/src/modules/entry-column/layouts/EntryListHeader.shared.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/layouts/EntryListHeader.shared.tsx index a1272f9bd..760bfffcf 100644 --- a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.shared.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/layouts/EntryListHeader.shared.tsx @@ -73,7 +73,7 @@ export const SwitchToMasonryButton = () => { sideOffset={12} side="bottom" className={clsx( - "z-10 rounded-xl border bg-background drop-shadow", + "bg-background z-10 rounded-xl border drop-shadow", "data-[state=open]:animate-in data-[state=closed]:animate-out", "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0", "data-[state=closed]:slide-out-to-top-5 data-[state=open]:slide-in-from-top-5", diff --git a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx b/apps/desktop/src/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx diff --git a/apps/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx b/apps/desktop/src/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx similarity index 96% rename from apps/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx index 7a8562db0..8d2f74141 100644 --- a/apps/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/layouts/TimelineTabs.tsx @@ -41,7 +41,7 @@ export const TimelineTabs = () => { return ( { if (!val) { diff --git a/apps/renderer/src/modules/entry-column/list.tsx b/apps/desktop/src/renderer/src/modules/entry-column/list.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/list.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/list.tsx diff --git a/apps/renderer/src/modules/entry-column/star-icon.tsx b/apps/desktop/src/renderer/src/modules/entry-column/star-icon.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/star-icon.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/star-icon.tsx diff --git a/apps/renderer/src/modules/entry-column/styles.ts b/apps/desktop/src/renderer/src/modules/entry-column/styles.ts similarity index 100% rename from apps/renderer/src/modules/entry-column/styles.ts rename to apps/desktop/src/renderer/src/modules/entry-column/styles.ts diff --git a/apps/renderer/src/modules/entry-column/templates/grid-item-template.tsx b/apps/desktop/src/renderer/src/modules/entry-column/templates/grid-item-template.tsx similarity index 97% rename from apps/renderer/src/modules/entry-column/templates/grid-item-template.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/templates/grid-item-template.tsx index 079574d2d..86faaac15 100644 --- a/apps/renderer/src/modules/entry-column/templates/grid-item-template.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/templates/grid-item-template.tsx @@ -55,7 +55,7 @@ export const GridItemFooter = ({
    diff --git a/apps/renderer/src/modules/entry-column/templates/list-item-template.tsx b/apps/desktop/src/renderer/src/modules/entry-column/templates/list-item-template.tsx similarity index 97% rename from apps/renderer/src/modules/entry-column/templates/list-item-template.tsx rename to apps/desktop/src/renderer/src/modules/entry-column/templates/list-item-template.tsx index 1d5003d3c..96964a077 100644 --- a/apps/renderer/src/modules/entry-column/templates/list-item-template.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/templates/list-item-template.tsx @@ -113,9 +113,9 @@ export function ListItem({ return (
    @@ -287,7 +287,7 @@ function AudioCover({ > @@ -69,7 +69,7 @@ export const EntryReadHistory: Component<{ entryId: string }> = ({ entryId }) => align="start" side="right" className={clsx( - "z-10 rounded-md border bg-background drop-shadow", + "bg-background z-10 rounded-md border drop-shadow", "data-[state=open]:animate-in data-[state=closed]:animate-out", "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0", "data-[state=closed]:slide-out-to-left-5 data-[state=open]:slide-in-from-left-5", diff --git a/apps/renderer/src/modules/entry-content/components/EntryReadHistory.electron.tsx b/apps/desktop/src/renderer/src/modules/entry-content/components/EntryReadHistory.electron.tsx similarity index 100% rename from apps/renderer/src/modules/entry-content/components/EntryReadHistory.electron.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/components/EntryReadHistory.electron.tsx diff --git a/apps/renderer/src/modules/entry-content/components/EntryReadHistory.mobile.tsx b/apps/desktop/src/renderer/src/modules/entry-content/components/EntryReadHistory.mobile.tsx similarity index 88% rename from apps/renderer/src/modules/entry-content/components/EntryReadHistory.mobile.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/components/EntryReadHistory.mobile.tsx index c14747d91..ca8d5b5eb 100644 --- a/apps/renderer/src/modules/entry-content/components/EntryReadHistory.mobile.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/components/EntryReadHistory.mobile.tsx @@ -35,7 +35,7 @@ export const EntryReadHistory: Component<{ entryId: string }> = ({ entryId }) => if (!entryHistory.userIds) return null return ( -
    +
    {entryHistory.userIds .filter((id) => id !== me?.id) .slice(0, LIMIT) @@ -56,9 +56,9 @@ export const EntryReadHistory: Component<{ entryId: string }> = ({ entryId }) => marginLeft: `-${LIMIT * 8}px`, zIndex: LIMIT + 1, }} - className="no-drag-region relative flex size-7 items-center justify-center rounded-full border border-border bg-muted ring-2 ring-background" + className="no-drag-region border-border bg-muted ring-background relative flex size-7 items-center justify-center rounded-full border ring-2" > - + +{Math.min(totalCount - LIMIT, 99)} @@ -106,7 +106,7 @@ const EntryUser: Component<{ userId: string; i: number }> = ({ userId, i }) => { present(userId) }} > - + = ({ userId }) => { tabIndex={0} className="relative flex min-w-0 max-w-[50ch] shrink-0 items-center gap-2 truncate rounded-md p-1 px-2" > - + {user.name?.slice(0, 2)} diff --git a/apps/renderer/src/modules/entry-content/components/EntryReadHistory.shared.tsx b/apps/desktop/src/renderer/src/modules/entry-content/components/EntryReadHistory.shared.tsx similarity index 89% rename from apps/renderer/src/modules/entry-content/components/EntryReadHistory.shared.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/components/EntryReadHistory.shared.tsx index c1ea44be7..700ef2ab1 100644 --- a/apps/renderer/src/modules/entry-content/components/EntryReadHistory.shared.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/components/EntryReadHistory.shared.tsx @@ -48,9 +48,9 @@ export const EntryUserRow: Component<{ userId: string }> = memo(({ userId }) => }} role="button" tabIndex={0} - className="relative flex min-w-0 max-w-[50ch] shrink-0 cursor-button items-center gap-2 truncate rounded-md p-1 px-2 hover:bg-muted" + className="cursor-button hover:bg-muted relative flex min-w-0 max-w-[50ch] shrink-0 items-center gap-2 truncate rounded-md p-1 px-2" > - + {getNameInitials(user.name || "")} @@ -90,7 +90,7 @@ export const EntryUser: Component<{ presentUserProfile(userId) }} > - + { return ( @@ -63,7 +63,7 @@ const TimelineItem = ({ id }: { id: string }) => { onClick={() => navigate({ entryId: id })} > {!asRead && ( - + )} { if (!entry) return null return compact ? ( -
    +
    @@ -94,7 +94,7 @@ export const EntryTitle = ({ entryId, compact }: EntryLinkProps) => { href={populatedFullHref || void 0} target="_blank" draggable="false" - className="block min-w-0 cursor-button rounded-lg transition-colors hover:bg-theme-item-hover focus-visible:bg-theme-item-hover focus-visible:!outline-none @sm:-mx-3 @sm:p-3 lg:-mx-6 lg:p-6" + className="cursor-button hover:bg-theme-item-hover focus-visible:bg-theme-item-hover @sm:-mx-3 @sm:p-3 block min-w-0 rounded-lg transition-colors focus-visible:!outline-none lg:-mx-6 lg:p-6" rel="noreferrer" onClick={(e) => { if (window.getSelection()?.toString()) { diff --git a/apps/renderer/src/modules/entry-content/components/SourceContentView.tsx b/apps/desktop/src/renderer/src/modules/entry-content/components/SourceContentView.tsx similarity index 96% rename from apps/renderer/src/modules/entry-content/components/SourceContentView.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/components/SourceContentView.tsx index 32ebbb8e4..b0dc9834e 100644 --- a/apps/renderer/src/modules/entry-content/components/SourceContentView.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/components/SourceContentView.tsx @@ -71,7 +71,7 @@ export const SourceContentPanel = ({ src }: { src: string | null }) => { {showSourceContent && src && ( {entryTitleMeta.title} diff --git a/apps/renderer/src/modules/entry-content/header.mobile.tsx b/apps/desktop/src/renderer/src/modules/entry-content/header.mobile.tsx similarity index 92% rename from apps/renderer/src/modules/entry-content/header.mobile.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/header.mobile.tsx index 1c376dabf..c12aadea6 100644 --- a/apps/renderer/src/modules/entry-content/header.mobile.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/header.mobile.tsx @@ -50,9 +50,9 @@ function EntryHeaderImpl({ view, entryId, className }: EntryHeaderProps) {
    @@ -67,7 +67,7 @@ function EntryHeaderImpl({ view, entryId, className }: EntryHeaderProps) { transform: shouldShowMeta ? "translateY(0)" : "translateY(30px)", opacity: shouldShowMeta ? 1 : 0, }} - className="pointer-events-auto flex w-full min-w-0 shrink gap-2 truncate px-1.5 pl-10 text-sm leading-tight text-theme-foreground duration-200" + className="text-theme-foreground pointer-events-auto flex w-full min-w-0 shrink gap-2 truncate px-1.5 pl-10 text-sm leading-tight duration-200" >
    @@ -180,7 +180,7 @@ const HeaderRightActions = ({ stiffness: 300, mass: 0.8, }} - className="shadow-modal fixed right-1 top-1 z-[1] mt-14 max-w-full rounded-lg border bg-theme-modal-background-opaque" + className="shadow-modal bg-theme-modal-background-opaque fixed right-1 top-1 z-[1] mt-14 max-w-full rounded-lg border" >
    {actions.map((item) => ( @@ -274,7 +274,7 @@ const TocPanel = ({ stiffness: 150, mass: 0.8, }} - className="fixed left-1/3 right-0 top-0 z-[1] mt-14 max-h-[60svh] max-w-full overflow-auto rounded-bl-md border border-t-0 bg-background px-3 py-1.5 shadow-sm" + className="bg-background fixed left-1/3 right-0 top-0 z-[1] mt-14 max-h-[60svh] max-w-full overflow-auto rounded-bl-md border border-t-0 px-3 py-1.5 shadow-sm" >
      {toc.map((heading, index) => ( @@ -293,7 +293,7 @@ const TocPanel = ({ handleScrollTo(index, heading.$heading, heading.anchorId) }} > - + {heading.title} diff --git a/apps/renderer/src/modules/entry-content/header.shared.tsx b/apps/desktop/src/renderer/src/modules/entry-content/header.shared.tsx similarity index 100% rename from apps/renderer/src/modules/entry-content/header.shared.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/header.shared.tsx diff --git a/apps/renderer/src/modules/entry-content/header.tsx b/apps/desktop/src/renderer/src/modules/entry-content/header.tsx similarity index 100% rename from apps/renderer/src/modules/entry-content/header.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/header.tsx diff --git a/apps/renderer/src/modules/entry-content/hooks.tsx b/apps/desktop/src/renderer/src/modules/entry-content/hooks.tsx similarity index 100% rename from apps/renderer/src/modules/entry-content/hooks.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/hooks.tsx diff --git a/apps/renderer/src/modules/entry-content/index.desktop.tsx b/apps/desktop/src/renderer/src/modules/entry-content/index.desktop.tsx similarity index 94% rename from apps/renderer/src/modules/entry-content/index.desktop.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/index.desktop.tsx index 8d8aacf0e..842746196 100644 --- a/apps/renderer/src/modules/entry-content/index.desktop.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/index.desktop.tsx @@ -164,11 +164,11 @@ export const EntryContent: Component = ({ -
      +
      = ({ >
      @@ -211,7 +211,7 @@ export const EntryContent: Component = ({ noMedia={noMedia} accessory={contentAccessories} as="article" - className="prose !max-w-full hyphens-auto dark:prose-invert prose-h1:text-[1.6em] prose-h1:font-bold" + className="prose dark:prose-invert prose-h1:text-[1.6em] prose-h1:font-bold !max-w-full hyphens-auto" style={stableRenderStyle} renderInlineStyle={readerRenderInlineStyle} > diff --git a/apps/renderer/src/modules/entry-content/index.mobile.tsx b/apps/desktop/src/renderer/src/modules/entry-content/index.mobile.tsx similarity index 94% rename from apps/renderer/src/modules/entry-content/index.mobile.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/index.mobile.tsx index ed33f5ef4..013fefcf0 100644 --- a/apps/renderer/src/modules/entry-content/index.mobile.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/index.mobile.tsx @@ -170,13 +170,13 @@ export const EntryContent: Component<{ entryId={entry.entries.id} view={view} className={cn( - "sticky top-0 z-[12] h-[55px] shrink-0 bg-background px-3 @container", + "bg-background @container sticky top-0 z-[12] h-[55px] shrink-0 px-3", classNames?.header, )} compact={compact} />
      {!hideRecentReader && ( @@ -191,7 +191,7 @@ export const EntryContent: Component<{ )}
      diff --git a/apps/renderer/src/modules/entry-content/index.shared.tsx b/apps/desktop/src/renderer/src/modules/entry-content/index.shared.tsx similarity index 97% rename from apps/renderer/src/modules/entry-content/index.shared.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/index.shared.tsx index 6fcf421f3..c9cb3d8ef 100644 --- a/apps/renderer/src/modules/entry-content/index.shared.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-content/index.shared.tsx @@ -119,7 +119,7 @@ export const ReadabilityContent = ({ entryId, feedId }: { entryId: string; feedI feedId={feedId} entryId={entryId} as="article" - className="prose hyphens-auto dark:prose-invert prose-h1:text-[1.6em] prose-h1:font-bold" + className="prose dark:prose-invert prose-h1:text-[1.6em] prose-h1:font-bold hyphens-auto" > {result?.content ?? ""} @@ -268,8 +268,8 @@ export const ContainerToc: FC = memo(() => { EventBus.dispatch("FOCUS_ENTRY_CONTAINER") }} className={cn( - "flex flex-col items-end animate-in fade-in-0 slide-in-from-bottom-12 easing-spring spring-soft", - "max-h-[calc(100vh-100px)] overflow-auto scrollbar-none", + "animate-in fade-in-0 slide-in-from-bottom-12 easing-spring spring-soft flex flex-col items-end", + "scrollbar-none max-h-[calc(100vh-100px)] overflow-auto", "@[700px]:-translate-x-12 @[800px]:-translate-x-16 @[900px]:translate-x-0 @[900px]:items-start", )} diff --git a/apps/renderer/src/modules/entry-content/index.tsx b/apps/desktop/src/renderer/src/modules/entry-content/index.tsx similarity index 100% rename from apps/renderer/src/modules/entry-content/index.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/index.tsx diff --git a/apps/renderer/src/modules/entry-content/loading.tsx b/apps/desktop/src/renderer/src/modules/entry-content/loading.tsx similarity index 100% rename from apps/renderer/src/modules/entry-content/loading.tsx rename to apps/desktop/src/renderer/src/modules/entry-content/loading.tsx diff --git a/apps/renderer/src/modules/feed/feed-certification.tsx b/apps/desktop/src/renderer/src/modules/feed/feed-certification.tsx similarity index 93% rename from apps/renderer/src/modules/feed/feed-certification.tsx rename to apps/desktop/src/renderer/src/modules/feed/feed-certification.tsx index 334461378..1deaa83a5 100644 --- a/apps/renderer/src/modules/feed/feed-certification.tsx +++ b/apps/desktop/src/renderer/src/modules/feed/feed-certification.tsx @@ -30,13 +30,13 @@ export const FeedCertification = ({ (feed.ownerUserId === me?.id ? ( - +
      - + {type === "feed" ? t("feed_item.claimed_feed") : t("feed_item.claimed_list")}
      {t("feed_item.claimed_by_you")}
      diff --git a/apps/renderer/src/modules/feed/feed-icon.tsx b/apps/desktop/src/renderer/src/modules/feed/feed-icon.tsx similarity index 100% rename from apps/renderer/src/modules/feed/feed-icon.tsx rename to apps/desktop/src/renderer/src/modules/feed/feed-icon.tsx diff --git a/apps/renderer/src/modules/feed/feed-summary.tsx b/apps/desktop/src/renderer/src/modules/feed/feed-summary.tsx similarity index 100% rename from apps/renderer/src/modules/feed/feed-summary.tsx rename to apps/desktop/src/renderer/src/modules/feed/feed-summary.tsx diff --git a/apps/renderer/src/modules/feed/feed-title.tsx b/apps/desktop/src/renderer/src/modules/feed/feed-title.tsx similarity index 100% rename from apps/renderer/src/modules/feed/feed-title.tsx rename to apps/desktop/src/renderer/src/modules/feed/feed-title.tsx diff --git a/apps/renderer/src/modules/feed/view-select-content.tsx b/apps/desktop/src/renderer/src/modules/feed/view-select-content.tsx similarity index 100% rename from apps/renderer/src/modules/feed/view-select-content.tsx rename to apps/desktop/src/renderer/src/modules/feed/view-select-content.tsx diff --git a/apps/renderer/src/modules/modal/shortcuts.tsx b/apps/desktop/src/renderer/src/modules/modal/shortcuts.tsx similarity index 96% rename from apps/renderer/src/modules/modal/shortcuts.tsx rename to apps/desktop/src/renderer/src/modules/modal/shortcuts.tsx index 140e86bae..bcf0c7cca 100644 --- a/apps/renderer/src/modules/modal/shortcuts.tsx +++ b/apps/desktop/src/renderer/src/modules/modal/shortcuts.tsx @@ -38,7 +38,7 @@ const ShortcutModalContent = () => { cursor: "grabbing", }} className={clsx( - "center absolute inset-0 m-auto flex max-h-[80vh] w-[60ch] max-w-[90vw] flex-col rounded-xl border bg-theme-modal-background-opaque", + "center bg-theme-modal-background-opaque absolute inset-0 m-auto flex max-h-[80vh] w-[60ch] max-w-[90vw] flex-col rounded-xl border", !modalOverlay && "shadow-modal", )} diff --git a/apps/renderer/src/modules/new-user-guide/guide-modal-content.tsx b/apps/desktop/src/renderer/src/modules/new-user-guide/guide-modal-content.tsx similarity index 98% rename from apps/renderer/src/modules/new-user-guide/guide-modal-content.tsx rename to apps/desktop/src/renderer/src/modules/new-user-guide/guide-modal-content.tsx index 52da54252..2f19a214d 100644 --- a/apps/renderer/src/modules/new-user-guide/guide-modal-content.tsx +++ b/apps/desktop/src/renderer/src/modules/new-user-guide/guide-modal-content.tsx @@ -169,7 +169,7 @@ export function GuideModalContent({ onClose }: { onClose: () => void }) { return (
      @@ -197,7 +197,7 @@ export function GuideModalContent({ onClose }: { onClose: () => void }) { {title} {!!guideSteps[step - 1]!.description && ( -
      +
      {guideSteps[step - 1]!.description!} @@ -308,7 +308,7 @@ function Step({ step, currentStep }: { step: number; currentStep: number }) { type: "tween", ease: "circOut", }} - className="absolute inset-0 rounded-full bg-theme-accent/20" + className="bg-theme-accent/20 absolute inset-0 rounded-full" />
      diff --git a/apps/renderer/src/modules/panel/cmdk.module.css b/apps/desktop/src/renderer/src/modules/panel/cmdk.module.css similarity index 100% rename from apps/renderer/src/modules/panel/cmdk.module.css rename to apps/desktop/src/renderer/src/modules/panel/cmdk.module.css diff --git a/apps/renderer/src/modules/panel/cmdk.tsx b/apps/desktop/src/renderer/src/modules/panel/cmdk.tsx similarity index 98% rename from apps/renderer/src/modules/panel/cmdk.tsx rename to apps/desktop/src/renderer/src/modules/panel/cmdk.tsx index b72c67bf2..0e207adec 100644 --- a/apps/renderer/src/modules/panel/cmdk.tsx +++ b/apps/desktop/src/renderer/src/modules/panel/cmdk.tsx @@ -137,8 +137,8 @@ export const SearchCmdK: React.FC = () => { onOpenChange={setAppSearchOpen} className={cn( "h-[600px] max-h-[80vh] w-[800px] max-w-[100vw] rounded-none md:h-screen md:max-h-[60vh] md:max-w-[80vw]", - "flex min-h-[50vh] flex-col bg-zinc-50/85 shadow-2xl backdrop-blur-xl dark:bg-neutral-900/90 md:rounded-xl", - "border-0 border-zinc-300 dark:border-zinc-700 md:border", + "flex min-h-[50vh] flex-col bg-zinc-50/85 shadow-2xl backdrop-blur-xl md:rounded-xl dark:bg-neutral-900/90", + "border-0 border-zinc-300 md:border dark:border-zinc-700", "absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2", )} > @@ -347,7 +347,7 @@ const SearchOptions: Component = memo(({ children }) => { const searchInstance = React.useContext(SearchCmdKContext) return ( -
      +
      {t("search.options.search_type")}