From 0584089d92e7ffb6d32f02f3ee8455cef2b01d7f Mon Sep 17 00:00:00 2001 From: kieran Date: Wed, 12 Mar 2025 10:09:45 +0000 Subject: [PATCH] fix: about page --- packages/app/package.json | 2 +- packages/app/src/Pages/About.tsx | 20 ++++---------------- packages/app/vite.config.ts | 2 +- yarn.lock | 13 ++++++++----- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 308d37ff..edad2fbb 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -131,7 +131,7 @@ "vite": "^5.2.8", "vite-plugin-eslint": "^1.8.1", "vite-plugin-pwa": "^0.19.2", - "vite-plugin-version-mark": "^0.0.10", + "vite-plugin-version-mark": "^0.1.4", "vitest": "^0.34.6" } } diff --git a/packages/app/src/Pages/About.tsx b/packages/app/src/Pages/About.tsx index 2fdb4194..378931af 100644 --- a/packages/app/src/Pages/About.tsx +++ b/packages/app/src/Pages/About.tsx @@ -1,29 +1,17 @@ -import { useEffect, useState } from "react"; import { FormattedMessage } from "react-intl"; -import Changelog from "@/../CHANGELOG.md"; +import Changelog from "@/../CHANGELOG.md?raw"; import { Markdown } from "@/Components/Event/Markdown"; export function AboutPage() { - const [changelog, setChangelog] = useState(""); - - async function getChangelog() { - const res = await fetch(Changelog); - const content = await res.text(); - setChangelog(content); - } - - useEffect(() => { - getChangelog().catch(console.error); - }, []); - + const version = document.querySelector("meta[name='application-name']")?.getAttribute("content"); return (

- Version: {__SNORT_VERSION__} - + Version: {version?.split(":")?.at(1) ?? "unknown version"} +
); } diff --git a/packages/app/vite.config.ts b/packages/app/vite.config.ts index 1d685da5..2fcf49cc 100644 --- a/packages/app/vite.config.ts +++ b/packages/app/vite.config.ts @@ -35,7 +35,7 @@ export default defineConfig({ name: "snort", ifGitSHA: true, command: "git describe --always --tags", - ifMeta: false, + ifMeta: true, ifLog: false, ifGlobal: false, }), diff --git a/yarn.lock b/yarn.lock index 637e278e..c7a6298c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4782,7 +4782,7 @@ __metadata: vite: "npm:^5.2.8" vite-plugin-eslint: "npm:^1.8.1" vite-plugin-pwa: "npm:^0.19.2" - vite-plugin-version-mark: "npm:^0.0.10" + vite-plugin-version-mark: "npm:^0.1.4" vitest: "npm:^0.34.6" workbox-cacheable-response: "npm:^7.0.0" workbox-core: "npm:^6.4.2" @@ -13433,6 +13433,7 @@ __metadata: prettier: "npm:^3.0.3" typedoc: "npm:^0.25.7" typescript: "npm:^5.2.2" + vite-plugin-version-mark: "npm:^0.1.4" languageName: unknown linkType: soft @@ -15124,10 +15125,12 @@ __metadata: languageName: node linkType: hard -"vite-plugin-version-mark@npm:^0.0.10": - version: 0.0.10 - resolution: "vite-plugin-version-mark@npm:0.0.10" - checksum: 10/a5120d2c09e428a0942dfbd27ad60aa6305599daf5d52ce110d50ae9da23da1591d4e78c62eae2d724919b37315ecda2a192cfa60601a4b0ad5a6b87941750f1 +"vite-plugin-version-mark@npm:^0.1.4": + version: 0.1.4 + resolution: "vite-plugin-version-mark@npm:0.1.4" + peerDependencies: + vite: "*" + checksum: 10/25f2320c02d5d885842e823c5fc239b73f67716b84ca6a12acb6a6e5511bff97ae455484b651242311645c8878c3314b79408e3827cf07ac59c1b053e62a1bf3 languageName: node linkType: hard