diff --git a/package-lock.json b/package-lock.json index 40000559..7894c354 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,6 +33,7 @@ "ethereum-cryptography": "^2.1.2", "ethereumjs-util": "^7.1.5", "ethr-did-resolver": "^8.1.2", + "git-describe": "^4.1.1", "jdenticon": "^3.2.0", "js-generate-password": "^0.1.9", "localstorage-slim": "^2.5.0", @@ -8894,8 +8895,7 @@ "node_modules/@types/semver": { "version": "7.5.3", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==", - "dev": true + "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==" }, "node_modules/@types/send": { "version": "0.17.2", @@ -16272,6 +16272,30 @@ "node": ">=6" } }, + "node_modules/git-describe": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/git-describe/-/git-describe-4.1.1.tgz", + "integrity": "sha512-JC8ganO5kO80G8+XE98TDDjnMXQN3Estk3qdJuG2EGRF/l6zuMTMcN+8OSfQZ5FWpqIRLB015anWX4aSRgnxAQ==", + "dependencies": { + "@types/semver": "^7.3.8", + "lodash": "^4.17.21" + }, + "engines": { + "node": ">=4.0.0" + }, + "optionalDependencies": { + "semver": "^5.6.0" + } + }, + "node_modules/git-describe/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "optional": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -19338,8 +19362,7 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "devOptional": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash.clonedeep": { "version": "4.5.0", diff --git a/package.json b/package.json index 5e676582..0ece1c54 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "ethereum-cryptography": "^2.1.2", "ethereumjs-util": "^7.1.5", "ethr-did-resolver": "^8.1.2", + "git-describe": "^4.1.1", "jdenticon": "^3.2.0", "js-generate-password": "^0.1.9", "localstorage-slim": "^2.5.0", diff --git a/src/views/HelpView.vue b/src/views/HelpView.vue index f16d1f59..5739bd84 100644 --- a/src/views/HelpView.vue +++ b/src/views/HelpView.vue @@ -214,9 +214,7 @@

What app version is this?

-

- {{ package.version }} -

+

{{ package.version }} ({{ commitHash }})

For any other questions, including removing your data: @@ -246,6 +244,7 @@ export default class Help extends Vue { $notify!: (notification: Notification, timeout?: number) => void; package = Package; + commitHash = process.env.VUE_APP_GIT_HASH; showOnboardInfo() { this.$notify( diff --git a/vue.config.js b/vue.config.js index 364757e2..946e889b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,4 +1,8 @@ const { defineConfig } = require("@vue/cli-service"); +const { gitDescribeSync } = require("git-describe"); + +process.env.VUE_APP_GIT_HASH = gitDescribeSync().hash; + module.exports = defineConfig({ transpileDependencies: true, configureWebpack: {