Close bitshares#1478: Set version in package.json instead of git tag

bangzi1001 · May 5, 2018 · 8d7f9bf · 8d7f9bf
1 parent b72bc44
commit 8d7f9bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "BitShares2-light",
-    "version": "2.0.180418b",
+    "version": "2.0.180505",
     "description": "Advanced wallet interface for the BitShares financial blockchain.",
     "homepage": "https://github.com/bitshares/bitshares-ui",
     "author": "Sigve Kvalsvik <[email protected]>",

diff --git a/webpack.config.js b/webpack.config.js
@@ -2,10 +2,9 @@ var path = require("path");
 var webpack = require("webpack");
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 var Clean = require("clean-webpack-plugin");
-var git = require("git-rev-sync");
 require("es6-promise").polyfill();
 var locales = require("./app/assets/locales");
-
+var __VERSION__ = require("./package.json").version;
 // BASE APP DIR
 var root_dir = path.resolve(__dirname);
 
@@ -66,7 +65,7 @@ module.exports = function(env) {
     var plugins = [
         new webpack.optimize.OccurrenceOrderPlugin(),
         new webpack.DefinePlugin({
-            APP_VERSION: JSON.stringify(git.tag()),
+            APP_VERSION: JSON.stringify(__VERSION__),
             __ELECTRON__: !!env.electron,
             __HASH_HISTORY__: !!env.hash,
             __BASE_URL__: JSON.stringify(baseUrl),