Skip to content

Commit

Permalink
Merge branch 'develop' into all-contributors/add-dreaming-augustin
Browse files Browse the repository at this point in the history
  • Loading branch information
lubber-de authored Dec 22, 2024
2 parents 87970d9 + 2bc983b commit 4c80bb0
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 7 deletions.
20 changes: 19 additions & 1 deletion tasks/config/project/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ const requireDotFile = require('require-dot-file');
let
config,
npmPackage,
version
version,
revision,
versionInFileName,
includeVersionInFileName
;

/*******************************
Expand All @@ -31,6 +34,20 @@ version = npmPackage && npmPackage.version !== undefined && npmPackage.name ===
? npmPackage.version
: config.version;

// looks for revision in config.
revision = config.revision === undefined ? '' : config.revision;

includeVersionInFileName = config.includeVersionInFileName === undefined ? false : config.includeVersionInFileName;

versionInFileName = '';

if (includeVersionInFileName) {
versionInFileName = '-' + version;
if (revision !== '') {
versionInFileName += '-' + revision;
}
}

/*******************************
Export
*******************************/
Expand All @@ -54,5 +71,6 @@ module.exports = {
+ ' */\n',

version: version,
versionInFileName: versionInFileName,

};
12 changes: 6 additions & 6 deletions tasks/config/tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ module.exports = {
},

filenames: {
concatenatedCSS: 'semantic.css',
concatenatedJS: 'semantic.js',
concatenatedMinifiedCSS: 'semantic.min.css',
concatenatedMinifiedJS: 'semantic.min.js',
concatenatedRTLCSS: 'semantic.rtl.css',
concatenatedMinifiedRTLCSS: 'semantic.rtl.min.css',
concatenatedCSS: 'semantic' + release.versionInFileName + '.css',
concatenatedJS: 'semantic' + release.versionInFileName + '.js',
concatenatedMinifiedCSS: 'semantic' + release.versionInFileName + '.min.css',
concatenatedMinifiedJS: 'semantic' + release.versionInFileName + '.min.js',
concatenatedRTLCSS: 'semantic' + release.versionInFileName + '.rtl.css',
concatenatedMinifiedRTLCSS: 'semantic' + release.versionInFileName + '.rtl.min.css',
},

regExp: {
Expand Down

0 comments on commit 4c80bb0

Please sign in to comment.