From 716a33fb96b7e0bf9d6c2203bc53f281d5d1ee16 Mon Sep 17 00:00:00 2001
From: Dermot Duffy <dermot.duffy@gmail.com>
Date: Sun, 22 Sep 2024 12:55:44 -0700
Subject: [PATCH] fix: Use pkg version until semantic-release is used (#1565)

* fix: Use pkg version until semantic-release is used

* Make istanbul happy with coverage
---
 rollup.config.js         | 15 ++++++++-------
 src/utils/diagnostics.ts | 10 ++++++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/rollup.config.js b/rollup.config.js
index 14a52a17..c6202371 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,13 +1,13 @@
-import typescript from '@rollup/plugin-typescript';
 import commonjs from '@rollup/plugin-commonjs';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import terser from '@rollup/plugin-terser';
-import serve from 'rollup-plugin-serve';
-import json from '@rollup/plugin-json';
-import styles from 'rollup-plugin-styler';
 import image from '@rollup/plugin-image';
+import json from '@rollup/plugin-json';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
+import terser from '@rollup/plugin-terser';
+import typescript from '@rollup/plugin-typescript';
 import gitInfo from 'rollup-plugin-git-info';
+import serve from 'rollup-plugin-serve';
+import styles from 'rollup-plugin-styler';
 import { visualizer } from 'rollup-plugin-visualizer';
 
 const watch = process.env.ROLLUP_WATCH === 'true' || process.env.ROLLUP_WATCH === '1';
@@ -58,7 +58,8 @@ const plugins = [
     preventAssignment: true,
     values: {
       'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'),
-      __FRIGATE_CARD_RELEASE_VERSION__: process.env.RELEASE_VERSION ?? 'dev',
+      __FRIGATE_CARD_RELEASE_VERSION__:
+        process.env.RELEASE_VERSION ?? (dev ? 'dev' : 'pkg'),
     },
   }),
   watch && serve(serveopts),
diff --git a/src/utils/diagnostics.ts b/src/utils/diagnostics.ts
index 5de978cf..a36f92c5 100644
--- a/src/utils/diagnostics.ts
+++ b/src/utils/diagnostics.ts
@@ -14,11 +14,17 @@ interface GitDiagnostics {
 
 export const getReleaseVersion = (): string => {
   const releaseVersion = '__FRIGATE_CARD_RELEASE_VERSION__';
-  /* istanbul ignore if: this path cannot be reached during tests as the value
-  is substituted by rollup -- @preserve */
+
+  /* istanbul ignore if: depends on rollup substitution -- @preserve */
+  if ((releaseVersion as unknown) === 'pkg') {
+    return pkg.version;
+  }
+
+  /* istanbul ignore if: depends on rollup substitution -- @preserve */
   if ((releaseVersion as unknown) === 'dev') {
     return `${releaseVersion}+${pkg['gitAbbrevHash']} (${pkg['buildDate']})`;
   }
+
   return releaseVersion;
 };