From 3d20d5e9796e05cc100af73370173f3383cf1d81 Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Wed, 2 Sep 2015 10:23:27 -0400 Subject: [PATCH] Fixes semantic.json version overwriting package version --- tasks/config/project/release.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tasks/config/project/release.js b/tasks/config/project/release.js index e9b0d7117..865811d3a 100644 --- a/tasks/config/project/release.js +++ b/tasks/config/project/release.js @@ -5,7 +5,7 @@ var requireDotFile = require('require-dot-file'), config, - packageJSON, + npmPackage, version ; @@ -15,25 +15,26 @@ var *******************************/ try { - config = requireDotFile('semantic.json'); + config = requireDotFile('semantic.json'); } catch(error) {} try { - packageJSON = require('../../../package.json'); + npmPackage = require('../../../package.json'); } catch(error) { // generate fake package - packageJSON = { + npmPackage = { + name: 'Unknown', version: 'x.x' }; } // looks for version in config or package.json (whichever is available) -version = (config && config.version !== undefined) - ? config.version - : packageJSON.version +version = (npmPackage && npmPackage.version !== undefined && npmPackage.name == 'semantic-ui') + ? npmPackage.version + : config.version ;