From 8d7f9bfa8c634c377c00b2e92d8b3e1169219595 Mon Sep 17 00:00:00 2001 From: Sigve Date: Sat, 5 May 2018 17:46:24 +0100 Subject: [PATCH] Close #1478: Set version in package.json instead of git tag --- package-lock.json | 2 +- package.json | 2 +- webpack.config.js | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 402aaf53c8..f0a9dbacd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "BitShares2-light", - "version": "2.0.180418b", + "version": "2.0.180505", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7892c6db38..0586fe5a84 100644 --- 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 ", diff --git a/webpack.config.js b/webpack.config.js index 5c8952d0ce..8a29c3c296 100644 --- 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),