diff --git a/config/dev.env.js b/config/dev.env.js index 985b51c7..59c1ba7c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,6 +1,9 @@ var merge = require('webpack-merge') var prodEnv = require('./prod.env') +var git = require('git-rev-sync') module.exports = merge(prodEnv, { - NODE_ENV: '"development"' + NODE_ENV: '"development"', + gitHash: '"' + git.short() + '"', + gitDate: '"' + git.date() + '"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 47aa886d..ed9355d9 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,3 +1,7 @@ +var git = require('git-rev-sync') + module.exports = { - NODE_ENV: '"production"' + NODE_ENV: '"production"', + gitHash: '"' + git.short() + '"', + gitDate: '"' + git.date() + '"' } diff --git a/package-lock.json b/package-lock.json index d1749312..d4c6a67a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5015,6 +5015,28 @@ "resolved": "https://registry.npmjs.org/git-rev/-/git-rev-0.2.1.tgz", "integrity": "sha1-jMvSCSs0W8LJFJVIOW31SWRspj8=" }, + "git-rev-sync": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.12.0.tgz", + "integrity": "sha1-RGhAbH5sO6TPRYeZnhrbKNnRr1U=", + "requires": { + "escape-string-regexp": "1.0.5", + "graceful-fs": "4.1.11", + "shelljs": "0.7.7" + }, + "dependencies": { + "shelljs": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz", + "integrity": "sha1-svXHfvlxSPS09uImguELuoZnz/E=", + "requires": { + "glob": "7.1.2", + "interpret": "1.1.0", + "rechoir": "0.6.2" + } + } + } + }, "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", @@ -5703,8 +5725,7 @@ "interpret": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", - "dev": true + "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=" }, "into-stream": { "version": "3.1.0", @@ -7551,8 +7572,7 @@ "path-parse": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" }, "path-to-regexp": { "version": "0.1.7", @@ -8595,7 +8615,6 @@ "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, "requires": { "resolve": "1.7.1" } @@ -8856,7 +8875,6 @@ "version": "1.7.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", - "dev": true, "requires": { "path-parse": "1.0.5" } diff --git a/package.json b/package.json index 91ddbf84..bc9224f3 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "body-parser": "^1.18.2", "cors": "^2.8.3", "express": "^4.16.3", - "git-rev": "^0.2.1", + "git-rev-sync": "^1.12.0", "jsonfile": "^4.0.0", "sails-disk": "^1.0.1", "socket.io": "^2.0.3", diff --git a/src/App.vue b/src/App.vue index 079547ad..2e253935 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@