Merge branch 'develop' into clearableSearch

fomantic · Dec 22, 2024 · ecd8fb0 · ecd8fb0
2 parents 87e40d3 + 16a9552
commit ecd8fb0
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -676,6 +676,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "dreaming-augustin",
+      "name": "dreaming-augustin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1203641?v=4",
+      "profile": "https://github.com/dreaming-augustin",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 4,

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -109,6 +109,9 @@ This is a list of all project contributors powered by [All Contributors](https:/
       <td align="center" valign="top" width="25%"><a href="https://twitter.com/alvarofleiva"><img src="https://avatars.githubusercontent.com/u/2561547?v=4?s=60" width="60px;" alt="Alvaro"/><br /><sub><b>Alvaro</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=alvarolm" title="Code">💻</a></td>
       <td align="center" valign="top" width="25%"><a href="https://github.com/Festiis"><img src="https://avatars.githubusercontent.com/u/44016065?v=4?s=60" width="60px;" alt="Festim Nuredini"/><br /><sub><b>Festim Nuredini</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=Festiis" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="25%"><a href="https://github.com/dreaming-augustin"><img src="https://avatars.githubusercontent.com/u/1203641?v=4?s=60" width="60px;" alt="dreaming-augustin"/><br /><sub><b>dreaming-augustin</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=dreaming-augustin" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

diff --git a/tasks/config/project/release.js b/tasks/config/project/release.js
@@ -7,7 +7,10 @@ const requireDotFile = require('require-dot-file');
 let
     config,
     npmPackage,
-    version
+    version,
+    revision,
+    versionInFileName,
+    includeVersionInFileName
 ;
 
 /*******************************
@@ -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
 *******************************/
@@ -54,5 +71,6 @@ module.exports = {
         + ' */\n',
 
     version: version,
+    versionInFileName: versionInFileName,
 
 };
diff --git a/tasks/config/tasks.js b/tasks/config/tasks.js
@@ -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: {