fomantic-ui 2.10.0-beta.4 → 2.10.0-beta.41

package/README.md

@@ -3,7 +3,9 @@
 # Fomantic-UI
 The official community fork of the popular Semantic-UI framework.
 
-[![GitHub Actions Status](https://github.com/fomantic/Fomantic-UI/workflows/CI/badge.svg)](https://github.com/fomantic/Fomantic-UI/actions)
+[![CI](https://github.com/fomantic/Fomantic-UI/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/fomantic/Fomantic-UI/actions/workflows/ci.yml)
+[![Nightly Build](https://github.com/fomantic/Fomantic-UI/actions/workflows/nightly.yml/badge.svg?branch=develop)](https://github.com/fomantic/Fomantic-UI/actions/workflows/nightly.yml)
+
 [![last commit (develop)](https://img.shields.io/github/last-commit/fomantic/Fomantic-UI/develop.svg?label=last%20commit%20%28develop%29)](https://github.com/fomantic/Fomantic-UI/commits/develop)
 [![License](https://img.shields.io/github/license/fomantic/Fomantic-UI?color=%233fb911)](https://github.com/fomantic/Fomantic-UI/blob/1fd94d2479f297c906bed557f0567d1d3f0a4d2c/LICENSE.md)
 
@@ -16,9 +18,6 @@ The official community fork of the popular Semantic-UI framework.
 [![jsdelivr](https://data.jsdelivr.com/v1/package/npm/fomantic-ui/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fomantic-ui)
 [![CDNJS](https://img.shields.io/cdnjs/v/fomantic-ui?color=e95420)](https://cdnjs.com/libraries/fomantic-ui)
 
-[![CI](https://github.com/fomantic/Fomantic-UI/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/fomantic/Fomantic-UI/actions/workflows/ci.yml)
-[![Nightly Build](https://github.com/fomantic/Fomantic-UI/actions/workflows/nightly.yml/badge.svg?branch=develop)](https://github.com/fomantic/Fomantic-UI/actions/workflows/nightly.yml)
-
 [![Package Quality](https://npm.packagequality.com/shield/fomantic-ui.svg?label=package%20quality)](https://packagequality.com/#?package=fomantic-ui)
 [![GitHub contributors](https://img.shields.io/github/contributors/fomantic/Fomantic-UI)](https://github.com/fomantic/Fomantic-UI/graphs/contributors)
 [![Dependabot Status](https://badgen.net/github/dependabot/fomantic/Fomantic-UI/?icon=dependabot)](https://github.com/features/security)
@@ -59,7 +58,7 @@ Fomantic includes an interactive installer to help setup your project.
 * Last 2 Versions of Firefox, Chrome, Safari Mac, Edge
 * Last 4 Versions of Android, Chrome for Android, iOS Safari[^1]
 
-[^1]: Fomantic-UI should basically still work in iOS Safari 9+, Android 6+, but, starting from v2.9.0, we won't support them anymore if anything works different than in recent versions.
+[^1]: Fomantic-UI should basically still work in iOS Safari 11+, Android 7+, but, starting from v2.9.0, we won't support them anymore if anything works different than in recent versions.
 
 ---
 

package/changelog-setup.js

@@ -1,9 +1,10 @@
 const semver = require('semver'); // eslint-disable-line import/no-extraneous-dependencies
 
-let changelogDeps  = {},
-    loopVersion = '',
-    uniqueCommits = []
-;
+let changelogDeps = {};
+let loopVersion = '';
+let uniqueCommits = [];
+let isMajor = false;
+let isMinor = false;
 const issueLinks = function (item) {
     if (typeof loopVersion !== 'string') {
         return item;
@@ -15,6 +16,17 @@ const issueLinks = function (item) {
 };
 
 module.exports = function (Handlebars) {
+    Handlebars.registerHelper('commit-collector', (merges, commits, major, minor, options) => {
+        const commitsFromMerges = merges.map((merge) => merge.commit);
+        const result = commits.concat(commitsFromMerges);
+        isMajor = major;
+        isMinor = minor;
+
+        return options.fn(result);
+    });
+
+    Handlebars.registerHelper('commit-list-breaking', (context, options) => (isMajor || isMinor ? Handlebars.helpers['commit-list-enhanced'](context, options) : ''));
+
     Handlebars.registerHelper('commit-list-enhanced', (context, options) => {
         const {
             exclude,
@@ -113,79 +125,83 @@ module.exports = function (Handlebars) {
         loopVersion = options.data.root.releases[options.data.index].tag;
 
         changelogDeps = {};
-        const
-            depsRegex = /(?:build\(deps[A-Za-z-]*\):|\[Snyk]) (?:\[?[Ss]ecurity]? )?(?:bump|upgrade) ([\w./@-]+) from (\d+\.\d+\.\d+) to (\d+\.\d+\.\d+)/,
-            detectVersionRange = function (item) {
-                let subjectDetails = item.subject.match(depsRegex);
-                if (!subjectDetails) {
-                    return true;
-                }
-
-                let depPackage = subjectDetails[1],
-                    depVersionFrom = subjectDetails[2],
-                    depVersionTo = subjectDetails[3]
-                ;
-                if (!changelogDeps[depPackage]) {
-                    changelogDeps[depPackage] = {
-                        from: '999.999.999',
-                        to: '0.0.0',
-                    };
-                }
-                if (semver.lt(depVersionFrom, changelogDeps[depPackage].from)) {
-                    changelogDeps[depPackage].from = depVersionFrom;
-                }
-                if (semver.gte(depVersionTo, changelogDeps[depPackage].to)) {
-                    changelogDeps[depPackage].to = depVersionTo;
+        const depsRegex = /(?:build\(deps[A-Za-z-]*\):|\[Snyk]) (?:\[?[Ss]ecurity]? )?(?:bump|upgrade) ([\w./@-]+) from (\d+\.\d+\.\d+) to (\d+\.\d+\.\d+)/;
+        const detectVersionRange = function (item) {
+            let subjectDetails = item.subject.match(depsRegex);
+            if (!subjectDetails) {
+                return true;
+            }
+
+            let depPackage = subjectDetails[1];
+            let depVersionFrom = subjectDetails[2];
+            let depVersionTo = subjectDetails[3];
+            if (!changelogDeps[depPackage]) {
+                changelogDeps[depPackage] = {
+                    from: '999.999.999',
+                    to: '0.0.0',
+                };
+            }
+            if (semver.lt(depVersionFrom, changelogDeps[depPackage].from)) {
+                changelogDeps[depPackage].from = depVersionFrom;
+            }
+            if (semver.gte(depVersionTo, changelogDeps[depPackage].to)) {
+                changelogDeps[depPackage].to = depVersionTo;
 
-                    return true;
-                }
+                return true;
+            }
 
-                return false;
-            },
-            list = context
-                .filter((item) => {
-                    const commit = item.commit || item;
-                    if (exclude) {
-                        const pattern = new RegExp(exclude, 'm');
-                        if (pattern.test(commit.message)) {
-                            return false;
-                        }
+            return false;
+        };
+        uniqueCommits = [];
+        const list = context
+            .filter((item) => {
+                const commit = item.commit || item;
+                if (exclude) {
+                    const pattern = new RegExp(exclude, 'm');
+                    if (pattern.test(commit.message)) {
+                        return false;
                     }
-                    if (message) {
-                        const pattern = new RegExp(message, 'm');
+                }
+                if (message) {
+                    const pattern = new RegExp(message, 'm');
 
-                        return pattern.test(commit.message);
-                    }
-                    if (subject) {
-                        const pattern = new RegExp(subject);
+                    return pattern.test(commit.message);
+                }
+                if (subject) {
+                    const pattern = new RegExp(subject);
 
-                        return pattern.test(commit.subject);
-                    }
+                    return pattern.test(commit.subject);
+                }
 
-                    return true;
-                })
-                .filter(detectVersionRange)
-                // second round as the previous list came unordered from git
-                .filter(detectVersionRange)
-                // adjust from version to create the whole range in one line (linked to the latest commit)
-                .map((item) => {
-                    let subjectDetails = item.subject.match(depsRegex);
-                    if (!subjectDetails) {
-                        return item;
-                    }
-                    let
-                        depPackage = subjectDetails[1],
-                        depVersionFrom = subjectDetails[2]
-                    ;
-                    item.subject = item.subject.replace(depVersionFrom, changelogDeps[depPackage].from);
+                return true;
+            })
+            .filter((item) => {
+                if (uniqueCommits.includes(item.subject)) {
+                    return false;
+                }
+                uniqueCommits.push(item.subject);
 
+                return true;
+            })
+            .filter(detectVersionRange)
+            // second round as the previous list came unordered from git
+            .filter(detectVersionRange)
+            // adjust from version to create the whole range in one line (linked to the latest commit)
+            .map((item) => {
+                let subjectDetails = item.subject.match(depsRegex);
+                if (!subjectDetails) {
                     return item;
-                })
-                .map(issueLinks)
-                .map((item) => options.fn(item))
-                .sort()
-                .join('')
-        ;
+                }
+                let depPackage = subjectDetails[1];
+                let depVersionFrom = subjectDetails[2];
+                item.subject = item.subject.replace(depVersionFrom, changelogDeps[depPackage].from);
+
+                return item;
+            })
+            .map(issueLinks)
+            .map((item) => options.fn(item))
+            .sort()
+            .join('');
         if (!list) {
             return '';
         }