From b1a661bd65a03ed167a24f95e960021d26a269c6 Mon Sep 17 00:00:00 2001
From: MrCoder <eagle.xiao@gmail.com>
Date: Fri, 24 Feb 2023 20:31:57 +1100
Subject: [PATCH] Added git related debug information.

---
 src/components/DiagramFrame/Debug/Debug.vue |  8 +++++---
 vite.config.js                              | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/DiagramFrame/Debug/Debug.vue b/src/components/DiagramFrame/Debug/Debug.vue
index c900de2a3..e069767a0 100644
--- a/src/components/DiagramFrame/Debug/Debug.vue
+++ b/src/components/DiagramFrame/Debug/Debug.vue
@@ -18,21 +18,23 @@
           <circle cx="6" cy="18" r="3"></circle>
           <path d="M18 9a9 9 0 0 1-9 9"></path>
         </svg>
-        <span class="inline-block px-2">{{ gitBranch }}:{{ commitHash }}</span>
+        <span class="inline-block px-2">{{ gitBranch }} ({{ gitTag }}) {{ commitHash }}</span>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-const commitHash = 'process.env.VUE_APP_GIT_HASH';
-const gitBranch = 'process.env.VUE_APP_GIT_BRANCH';
+const commitHash = import.meta.env.VITE_COMMIT_HASH;
+const gitBranch = import.meta.env.VITE_GIT_BRANCH;
+const gitTag = import.meta.env.VITE_GIT_TAG;
 export default {
   name: 'Debug',
   data() {
     return {
       commitHash,
       gitBranch,
+      gitTag,
     };
   },
   computed: {
diff --git a/vite.config.js b/vite.config.js
index f00a8fe5e..759dc2fed 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -13,7 +13,21 @@ function getCypressHtmlFiles() {
 
 const cypressHtmlFiles = getCypressHtmlFiles();
 console.log(cypressHtmlFiles);
+
+process.env.VITE_COMMIT_HASH = execSync('git rev-parse --short HEAD').toString().trim()
+process.env.VITE_GIT_BRANCH = execSync('git branch --show-current').toString().trim()
+// https://stackoverflow.com/a/45993185/529187
+process.env.VITE_GIT_TAG = execSync('git describe --tags --always --abbrev=0').toString().trim()
+console.log(`Building ${process.env.VITE_GIT_HASH} (${process.env.VITE_GIT_BRANCH}) on ${process.env.VITE_GIT_BRANCH}`)
+
+process.env.VITE_SOME_KEY = 'process.env.VITE_SOME_KEY1';
+process.env.SOME_KEY = 'process.env.VITE_SOME_KEY2';
 export default defineConfig({
+  define: {
+    'import.meta.env': {
+      VITE_SOME_KEY: JSON.stringify('import.meta.env.VITE_SOME_KEY3'),
+    },
+  },
   build: {
     rollupOptions: {
       input: ['index.html', 'embed.html', ...cypressHtmlFiles],