Merge pull request #4977 from RSSNext/release/desktop/1.6.1

release(desktop): Release v1.6.1

Author: DIYgod

.easignore

@@ -0,0 +1,54 @@
+node_modules
+dist
+out/*
+!out/
+!out/rn-web
+!out/rn-web/
+!out/rn-web/**
+.next
+.open-next
+next-env.d.ts
+.DS_Store
+*.log*
+.env
+.eslintcache
+.env.*
+!.env.example
+
+# Sentry Config File
+.env.sentry-build-plugin
+.vercel
+stats.html
+
+electron.vite.config.*.mjs
+vite.config.*.mjs
+
+.generated
+.turbo
+
+apps/desktop/src/renderer/dev-dist
+tsconfig.tsbuildinfo
+buildServer.json
+
+**/**/generated-routes.ts
+
+apps/desktop/build/appxmanifest.xml
+apps/desktop/resources/cli
+
+.claude/settings.local.json
+.serena
+
+.wrangler
+
+# Local agent artifacts
+.codex/
+
+# E2E outputs
+/apps/desktop/e2e/playwright-report/
+/apps/desktop/e2e/test-results/
+/apps/mobile/e2e/artifacts/
+/apps/mobile/report.xml
+/report.xml
+
+# Mobile local E2E build artifacts
+apps/mobile/build-*.tar.gz

.github/workflows/build-android.yml

@@ -72,6 +72,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Build mobile web assets
+        run: pnpm --dir apps/mobile/web-app build --outDir ../../../out/rn-web/html-renderer
+
       - name: 🔨 Build Android app
         working-directory: apps/mobile
         run: eas build --platform android --profile ${{ github.event.inputs.profile || 'preview' }} --local --output=${{ github.workspace }}/build.${{ github.event.inputs.profile == 'production' && 'aab' || 'apk' }}

.github/workflows/build-ios-development.yml

@@ -51,6 +51,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Build mobile web assets
+        run: pnpm --dir apps/mobile/web-app build --outDir ../../../out/rn-web/html-renderer
+
       - name: 🔨 Build iOS IPA
         working-directory: apps/mobile
         run: eas build --platform ios --profile development --non-interactive --local --output=./build.ipa
@@ -104,6 +107,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Build mobile web assets
+        run: pnpm --dir apps/mobile/web-app build --outDir ../../../out/rn-web/html-renderer
+
       - name: 🔨 Build iOS IPA
         working-directory: apps/mobile
         run: eas build --platform ios --profile development --non-interactive --local --output=./build.ipa
@@ -151,6 +157,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Build mobile web assets
+        run: pnpm --dir apps/mobile/web-app build --outDir ../../../out/rn-web/html-renderer
+
       - name: 🔨 Build iOS IPA
         working-directory: apps/mobile
         run: eas build --platform ios --profile ios-simulator --non-interactive --local --output=./build-simulator.ipa

.github/workflows/build-ios.yml

@@ -59,6 +59,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Build mobile web assets
+        run: pnpm --dir apps/mobile/web-app build --outDir ../../../out/rn-web/html-renderer
+
       - name: 🔨 Build iOS IPA
         working-directory: apps/mobile
         run: eas build --platform ios --profile ${{ github.event.inputs.profile || 'preview' }} --non-interactive --local --output=./build.ipa
@@ -117,6 +120,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Build mobile web assets
+        run: pnpm --dir apps/mobile/web-app build --outDir ../../../out/rn-web/html-renderer
+
       - name: 🔨 Build iOS IPA
         working-directory: apps/mobile
         run: eas build --platform ios --profile ${{ github.event.inputs.profile || 'preview' }} --non-interactive --local --output=./build.ipa

.prettierignore

@@ -2,6 +2,7 @@ pnpm-lock.yaml
 
 CHANGELOG.md
 .context
+.waylog
 
 apps/external/postcss.config.cjs
 

apps/desktop/changelog/1.6.1.md

@@ -0,0 +1,22 @@
+# What's new in v1.6.1
+
+## Shiny new things
+
+- Added Spotlight settings with refined highlighting controls
+- Unified desktop updates with the OTA service for more consistent delivery
+
+## Improvements
+
+- Moved desktop text-to-speech playback to the Folo service
+- Improved update compatibility handling and release metadata generation
+
+## No longer broken
+
+- Fixed regressions in desktop update and release flows
+- Fixed PDF export layout and branding
+- Fixed future credit reset dates in AI chat
+- Fixed PlayerProgress switching to hour formatting too late
+
+## Thanks
+
+Special thanks to volunteer contributor @kuishou68 for their valuable contribution

apps/desktop/changelog/next.md

@@ -2,21 +2,10 @@
 
 ## Shiny new things
 
-- Added Spotlight settings with refined highlighting controls
-- Unified desktop updates with the OTA service for more consistent delivery
-
 ## Improvements
 
-- Moved desktop text-to-speech playback to the Folo service
-- Improved update compatibility handling and release metadata generation
-
 ## No longer broken
 
-- Fixed regressions in desktop update and release flows
-- Fixed PDF export layout and branding
-- Fixed future credit reset dates in AI chat
-- Fixed PlayerProgress switching to hour formatting too late
-
 ## Thanks
 
-Special thanks to volunteer contributor @kuishou68 for their valuable contribution
+Special thanks to volunteer contributors @ for their valuable contributions

apps/desktop/layer/main/src/manager/bootstrap.ts

@@ -85,6 +85,8 @@ export class BootstrapManager {
         currentApiURL: env.VITE_API_URL,
       })
 
+      await cleanupOldRender()
+
       // Bypass CORS for PostHog analytics
       session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
         const url = new URL(details.url)

apps/desktop/layer/main/src/updater/api.test.ts

@@ -1,5 +1,11 @@
 import { beforeEach, describe, expect, it, vi } from "vitest"
 
+const { getCurrentRendererManifestMock } = vi.hoisted(() => ({
+  getCurrentRendererManifestMock: vi.fn<() => null | { runtimeVersion: string; version: string }>(
+    () => null,
+  ),
+}))
+
 vi.mock("@follow/shared/env.desktop", () => ({
   env: {
     VITE_OTA_URL: "https://ota.folo.is",
@@ -27,12 +33,30 @@ vi.mock("../env", () => ({
 }))
 
 vi.mock("~/updater/hot-updater", () => ({
-  getCurrentRendererManifest: () => null,
+  getCurrentRendererManifest: getCurrentRendererManifestMock,
+  isRendererManifestUsable: (
+    manifest: { runtimeVersion?: string; version?: string } | null,
+    input: { appVersion: string; runtimeVersion: string },
+  ) => {
+    if (!manifest?.runtimeVersion || manifest.runtimeVersion !== input.runtimeVersion) {
+      return false
+    }
+
+    const manifestVersion = manifest.version?.split("-")[0]
+    const appVersion = input.appVersion?.split("-")[0]
+
+    if (!manifestVersion || !appVersion) {
+      return false
+    }
+
+    return manifestVersion >= appVersion
+  },
 }))
 
 describe("desktop updater api", () => {
   beforeEach(() => {
     vi.stubGlobal("fetch", vi.fn())
+    getCurrentRendererManifestMock.mockReturnValue(null)
   })
 
   it("returns null when desktop manifest responds 204", async () => {
@@ -90,6 +114,27 @@ describe("desktop updater api", () => {
     expect(result?.app).toBeNull()
   })
 
+  it("falls back to the app version when the cached renderer manifest is stale", async () => {
+    getCurrentRendererManifestMock.mockReturnValue({
+      runtimeVersion: "1.6.0",
+      version: "0.6.4",
+    })
+
+    vi.mocked(fetch).mockResolvedValue(new Response(null, { status: 204 }))
+
+    const { fetchDesktopManifest } = await import("./api")
+    await fetchDesktopManifest()
+
+    expect(fetch).toHaveBeenCalledWith(
+      new URL("/manifest", "https://ota.folo.is"),
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          "X-App-Renderer-Version": "1.5.0",
+        }),
+      }),
+    )
+  })
+
   it("parses desktop policy responses", async () => {
     vi.mocked(fetch).mockResolvedValue(
       new Response(

apps/desktop/layer/main/src/updater/api.ts

@@ -1,9 +1,8 @@
 import { env } from "@follow/shared/env.desktop"
 import { createDesktopAPIHeaders } from "@follow/utils/headers"
 import PKG, { runtimeVersion as configuredRuntimeVersion, version as appVersion } from "@pkg"
-import { gte } from "semver"
 
-import { getCurrentRendererManifest } from "~/updater/hot-updater"
+import { getCurrentRendererManifest, isRendererManifestUsable } from "~/updater/hot-updater"
 
 import { channel } from "../env"
 import type {
@@ -18,8 +17,12 @@ export const getDesktopRuntimeVersion = () => configuredRuntimeVersion ?? appVer
 
 export const getDesktopRendererVersion = () => {
   const rendererManifest = getCurrentRendererManifest()
-  return gte(rendererManifest?.version ?? appVersion, appVersion)
-    ? (rendererManifest?.version ?? appVersion)
+
+  return isRendererManifestUsable(rendererManifest, {
+    appVersion,
+    runtimeVersion: getDesktopRuntimeVersion(),
+  })
+    ? rendererManifest!.version
     : appVersion
 }