Mercurial > gemma

changeset 985:b5ca66313ea9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add hg revision to version string in dev mode
author Markus Kottlaender <markus@intevation.de>
date Fri, 19 Oct 2018 16:28:06 +0200
parents e833617d1314
children c34a2a643f5e
files client/package.json client/src/layers/Identify.vue
diffstat 2 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/client/package.json	Fri Oct 19 13:00:21 2018 +0200
+++ b/client/package.json	Fri Oct 19 16:28:06 2018 +0200
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "run:both": "concurrently \"../cmd/gemma/gemma\" \"vue-cli-service serve\"",
-    "serve": "vue-cli-service serve",
+    "serve": "VUE_APP_REV=$(hg id -i) vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
     "test:unit": "vue-cli-service test:unit",
--- a/client/src/layers/Identify.vue	Fri Oct 19 13:00:21 2018 +0200
+++ b/client/src/layers/Identify.vue	Fri Oct 19 16:28:06 2018 +0200
@@ -79,7 +79,7 @@
 
 <script>
 import { mapState } from "vuex";
-import { version } from "../../package.json"
+import { version } from "../../package.json";
 
 export default {
   name: "identify",
@@ -108,8 +108,15 @@
       };
     },
     version() {
-      return version; // version number from package.json
-    },
+      // version number from package.json
+      let versionStr = "v" + version;
+
+      // hg revision
+      if (process.env.NODE_ENV === "development")
+        versionStr += "-rev-" + process.env.VUE_APP_REV;
+
+      return versionStr;
+    }
   },
   methods: {
     collapse() {