gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 15:19:01 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

refactor(client): deduplicate app info type

Browse Source
This commit is contained in:
Elian Doran 2025-08-03 16:22:54 +03:00
parent 8f99ce7d14
commit b645d21fcd
No known key found for this signature in database
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/client/src/widgets/dialogs/about.tsx
View File

@ -8,15 +8,7 @@ import utils from "../../services/utils.js";
import openService from "../../services/open.js"; import openService from "../../services/open.js";
import { useState } from "preact/hooks"; import { useState } from "preact/hooks";
import type { CSSProperties } from "preact/compat"; import type { CSSProperties } from "preact/compat";
import type { AppInfo } from "@triliumnext/commons";
interface AppInfo {
appVersion: string;
dbVersion: number;
syncVersion: number;
buildDate: string;
buildRevision: string;
dataDirectory: string;
}
function AboutDialogComponent() { function AboutDialogComponent() {
let [appInfo, setAppInfo] = useState<AppInfo | null>(null); let [appInfo, setAppInfo] = useState<AppInfo | null>(null);

5
apps/server/src/services/app_info.ts
View File

@ -2,6 +2,7 @@ import path from "path";
import build from "./build.js"; import build from "./build.js";
import packageJson from "../../package.json" with { type: "json" }; import packageJson from "../../package.json" with { type: "json" };
import dataDir from "./data_dir.js"; import dataDir from "./data_dir.js";
import { AppInfo } from "@triliumnext/commons";
const APP_DB_VERSION = 233; const APP_DB_VERSION = 233;
const SYNC_VERSION = 36; const SYNC_VERSION = 36;
@ -16,5 +17,5 @@ export default {
buildRevision: build.buildRevision, buildRevision: build.buildRevision,
dataDirectory: path.resolve(dataDir.TRILIUM_DATA_DIR), dataDirectory: path.resolve(dataDir.TRILIUM_DATA_DIR),
clipperProtocolVersion: CLIPPER_PROTOCOL_VERSION, clipperProtocolVersion: CLIPPER_PROTOCOL_VERSION,
utcDateTime: new Date().toISOString() // for timezone inference utcDateTime: new Date().toISOString()
}; } satisfies AppInfo;

1
packages/commons/src/index.ts
View File

@ -6,3 +6,4 @@ export * from "./lib/rows.js";
export * from "./lib/test-utils.js"; export * from "./lib/test-utils.js";
export * from "./lib/mime_type.js"; export * from "./lib/mime_type.js";
export * from "./lib/bulk_actions.js"; export * from "./lib/bulk_actions.js";
export * from "./lib/server_api.js";

12
packages/commons/src/lib/server_api.ts Normal file
View File

@ -0,0 +1,12 @@
export interface AppInfo {
appVersion: string;
dbVersion: number;
nodeVersion: string;
syncVersion: number;
buildDate: string;
buildRevision: string;
dataDirectory: string;
clipperProtocolVersion: string;
/** for timezone inference */
utcDateTime: string;
}