From 52a353ebe18ac3168de58f6a7b4f36465aa13fee Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Wed, 9 Apr 2025 20:31:45 +0200
Subject: [PATCH] Changed logic to the sequence: package version git tag
 version development version -> hidden

closes #162
---
 src/routes/about/+page.svelte |  6 ++++--
 vite.config.ts                | 10 ++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte
index f9c81cf..b6c0f6c 100644
--- a/src/routes/about/+page.svelte
+++ b/src/routes/about/+page.svelte
@@ -3,13 +3,16 @@
   
   // Get the git tag version from environment variables
   const appVersion = import.meta.env.APP_VERSION || 'development';
+  const isVersionKnown = appVersion !== 'development';
 </script>
 
 <div class='w-full flex justify-center'>
   <main class='main-leather flex flex-col space-y-6 max-w-2xl w-full my-6 px-4'>
     <div class="flex justify-between items-center">
       <Heading tag='h1' class='h-leather mb-2'>About</Heading>
-      <span class="text-sm bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded text-nowrap">Version: {appVersion}</span>
+      {#if isVersionKnown}
+        <span class="text-sm bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded text-nowrap">Version: {appVersion}</span>
+      {/if}
     </div>
     
     <P class="mb-3">
@@ -102,4 +105,3 @@
     
     </main>
 </div>
-
diff --git a/vite.config.ts b/vite.config.ts
index 5d73bc3..4dc4254 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,18 +5,16 @@ import { execSync } from "child_process";
 // Function to get the latest git tag
 function getAppVersionString() {
   // if running in ci context, we can assume the package has been properly versioned
-  if (process.env.ALEXANDIRA_IS_CI_BUILD) {
-      return process.env.npm_package_version;
+  if (process.env.ALEXANDIRA_IS_CI_BUILD && process.env.npm_package_version && process.env.npm_package_version.trim() !== '') {
+    return process.env.npm_package_version;
   }
-
+    
   try {
     // Get the latest git tag, assuming git is installed and tagged branch is available
     const tag = execSync('git describe --tags --abbrev=0').toString().trim();
     return tag;
   } catch (error) {
-    console.error("Failed to get git tag:", error);
-    // Fallback to package version
-    return process.env.npm_package_version;
+    return 'development';
   }
 }