From f7a77533240ec435c8a7b103b6f6be409bf995d8 Mon Sep 17 00:00:00 2001
From: MohamedBassem <me@mbassem.com>
Date: Sun, 9 Jun 2024 10:52:09 +0000
Subject: fix(cli): Fix CLI version in help message. Fixes #139

---
 apps/cli/src/index.ts      | 6 +++++-
 apps/cli/src/vite-env.d.ts | 9 +++++++++
 apps/cli/tsconfig.json     | 3 ++-
 apps/cli/vite.config.mts   | 5 +++++
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 apps/cli/src/vite-env.d.ts

diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts
index 12cd7a13..a4f6f7b4 100644
--- a/apps/cli/src/index.ts
+++ b/apps/cli/src/index.ts
@@ -22,7 +22,11 @@ const program = new Command()
       .makeOptionMandatory(true)
       .env("HOARDER_SERVER_ADDR"),
   )
-  .version(process.env.npm_package_version ?? "0.0.0");
+  .version(
+    import.meta.env && "CLI_VERSION" in import.meta.env
+      ? import.meta.env.CLI_VERSION
+      : "0.0.0",
+  );
 
 program.addCommand(bookmarkCmd);
 program.addCommand(listsCmd);
diff --git a/apps/cli/src/vite-env.d.ts b/apps/cli/src/vite-env.d.ts
new file mode 100644
index 00000000..604ce503
--- /dev/null
+++ b/apps/cli/src/vite-env.d.ts
@@ -0,0 +1,9 @@
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly CLI_VERSION: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json
index 43577686..bf344404 100644
--- a/apps/cli/tsconfig.json
+++ b/apps/cli/tsconfig.json
@@ -9,6 +9,7 @@
     "strictNullChecks": true,
     "paths": {
       "@/*": ["./src/*"]
-    }
+    },
+    "types": ["vite/client"]
   }
 }
diff --git a/apps/cli/vite.config.mts b/apps/cli/vite.config.mts
index 4c18902f..81717bff 100644
--- a/apps/cli/vite.config.mts
+++ b/apps/cli/vite.config.mts
@@ -18,4 +18,9 @@ export default defineConfig({
     noExternal: /^(?!node:).*$/,
   },
   plugins: [tsconfigPaths()],
+  define: {
+    "import.meta.env.CLI_VERSION": JSON.stringify(
+      process.env.npm_package_version,
+    ),
+  },
 });
-- 
cgit v1.2.3-70-g09d2