Mercurial > gemma
changeset 986:c34a2a643f5e
merge
author | Markus Kottlaender <markus@intevation.de> |
---|---|
date | Fri, 19 Oct 2018 16:39:05 +0200 |
parents | 3c9ea8ab856a (current diff) b5ca66313ea9 (diff) |
children | 3841509f6e9e |
files | client/package.json client/src/identify/Identify.vue |
diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/client/package.json Fri Oct 19 16:05:46 2018 +0200 +++ b/client/package.json Fri Oct 19 16:39:05 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/identify/Identify.vue Fri Oct 19 16:05:46 2018 +0200 +++ b/client/src/identify/Identify.vue Fri Oct 19 16:39:05 2018 +0200 @@ -108,7 +108,14 @@ }; }, 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: {