Skip to content

Commit c5854f4

Browse files
committed
fix: app version
Signed-off-by: Innei <tukon479@gmail.com>
1 parent dad33a1 commit c5854f4

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

apps/main/src/tipc/app.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,14 @@ import { fileURLToPath } from "node:url"
66

77
import { getRendererHandlers } from "@egoist/tipc/main"
88
import { callWindowExpose } from "@follow/shared/bridge"
9-
import pkg from "@pkg"
109
import { app, BrowserWindow, clipboard, dialog, screen, shell } from "electron"
1110

1211
import { registerMenuAndContextMenu } from "~/init"
1312
import { clearAllData, getCacheSize } from "~/lib/cleaner"
1413
import { store, StoreKey } from "~/lib/store"
1514
import { registerAppTray } from "~/lib/tray"
1615
import { logger, revealLogFile } from "~/logger"
17-
import {
18-
cleanupOldRender,
19-
getCurrentRenderManifest,
20-
loadDynamicRenderEntry,
21-
} from "~/updater/hot-updater"
16+
import { cleanupOldRender, loadDynamicRenderEntry } from "~/updater/hot-updater"
2217

2318
import { isDev, isWindows11 } from "../env"
2419
import { downloadFile } from "../lib/download"
@@ -279,9 +274,8 @@ ${content}
279274
}
280275
}),
281276

282-
getRenderVersion: t.procedure.action(async () => {
283-
const manifest = getCurrentRenderManifest()
284-
return manifest?.version || pkg.version
277+
getAppVersion: t.procedure.action(async () => {
278+
return app.getVersion()
285279
}),
286280
rendererUpdateReload: t.procedure.action(async () => {
287281
const __dirname = fileURLToPath(new URL(".", import.meta.url))

apps/renderer/src/modules/settings/tabs/about.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Button } from "@follow/components/ui/button/index.js"
33
import { styledButtonVariant } from "@follow/components/ui/button/variants.js"
44
import { Divider } from "@follow/components/ui/divider/index.js"
55
import { getCurrentEnvironment } from "@follow/utils/environment"
6-
import { license, repository } from "@pkg"
6+
import PKG, { license, repository } from "@pkg"
77
import { useQuery } from "@tanstack/react-query"
88
import { Trans, useTranslation } from "react-i18next"
99

@@ -15,11 +15,13 @@ import { getNewIssueUrl } from "~/lib/issues"
1515
export const SettingAbout = () => {
1616
const { t } = useTranslation("settings")
1717
const currentEnvironment = getCurrentEnvironment().join("\n")
18-
const { data: renderVersion } = useQuery({
19-
queryKey: ["renderVersion"],
20-
queryFn: () => tipcClient?.getRenderVersion() || "",
18+
const { data: appVersion } = useQuery({
19+
queryKey: ["appVersion"],
20+
queryFn: () => tipcClient?.getAppVersion() || "",
2121
})
2222

23+
const rendererVersion = PKG.version
24+
2325
return (
2426
<div>
2527
<section className="mt-4">
@@ -31,16 +33,16 @@ export const SettingAbout = () => {
3133
{APP_NAME} {!import.meta.env.PROD ? `(${import.meta.env.MODE})` : ""}
3234
</div>
3335
<div className="flex flex-wrap items-center gap-2">
34-
<span className="rounded bg-muted px-2 py-1 text-xs">app: {APP_VERSION}</span>
35-
{renderVersion && (
36+
<span className="rounded bg-muted px-2 py-1 text-xs">app: {appVersion}</span>
37+
{rendererVersion && (
3638
<span className="rounded bg-muted px-2 py-1 text-xs">
37-
renderer: {renderVersion}
39+
renderer: {rendererVersion}
3840
</span>
3941
)}
4042
<CopyButton
4143
value={
42-
renderVersion
43-
? `${currentEnvironment}\n**Renderer**: ${renderVersion}`
44+
rendererVersion
45+
? `${currentEnvironment}\n**Renderer**: ${rendererVersion}`
4446
: currentEnvironment
4547
}
4648
className="border-0 bg-transparent p-1 text-foreground/80 hover:bg-theme-item-hover hover:text-foreground active:bg-theme-item-active [&_i]:size-3"

0 commit comments

Comments
 (0)