Browse Source

Fixes semantic.json version overwriting package version

pull/2956/head
Jack Lukic 9 years ago
parent
commit
3d20d5e979
1 changed files with 8 additions and 7 deletions
  1. 15
      tasks/config/project/release.js

15
tasks/config/project/release.js

@ -5,7 +5,7 @@
var var
requireDotFile = require('require-dot-file'), requireDotFile = require('require-dot-file'),
config, config,
packageJSON,
npmPackage,
version version
; ;
@ -15,25 +15,26 @@ var
*******************************/ *******************************/
try { try {
config = requireDotFile('semantic.json');
config = requireDotFile('semantic.json');
} }
catch(error) {} catch(error) {}
try { try {
packageJSON = require('../../../package.json');
npmPackage = require('../../../package.json');
} }
catch(error) { catch(error) {
// generate fake package // generate fake package
packageJSON = {
npmPackage = {
name: 'Unknown',
version: 'x.x' version: 'x.x'
}; };
} }
// looks for version in config or package.json (whichever is available) // 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
; ;

Loading…
Cancel
Save