fomantic-ui 2.9.1-beta.22 → 2.9.1-beta.24

package/tasks/config/project/config.js

@@ -2,8 +2,7 @@
             Set-up
 *******************************/
 
-var
-    extend   = require('extend'),
+const
     fs       = require('fs'),
     path     = require('path'),
 
@@ -17,18 +16,16 @@ var
 module.exports = {
 
     getPath: function (file, directory) {
-        var
+        let
             configPath,
             walk = function (directory) {
-                var
+                let
                     nextDirectory = path.resolve(path.join(directory, path.sep, '..')),
                     currentPath   = path.normalize(path.join(directory, file))
                 ;
                 if (fs.existsSync(currentPath)) {
                     // found file
                     configPath = path.normalize(directory);
-
-                    return;
                 } else {
                     // reached file system root, let's stop
                     if (nextDirectory == directory) {
@@ -50,13 +47,11 @@ module.exports = {
 
     // adds additional derived values to a config object
     addDerivedValues: function (config) {
-        config = config || extend(false, {}, defaults);
-
         /* --------------
             File Paths
         --------------- */
 
-        var
+        let
             configPath = this.getPath(),
             sourcePaths = {},
             outputPaths = {},
@@ -65,12 +60,12 @@ module.exports = {
 
         // resolve paths (config location + base + path)
         for (folder in config.paths.source) {
-            if (config.paths.source.hasOwnProperty(folder)) {
+            if (Object.prototype.hasOwnProperty.call(config.paths.source, folder)) {
                 sourcePaths[folder] = path.resolve(path.join(configPath, config.base, config.paths.source[folder]));
             }
         }
         for (folder in config.paths.output) {
-            if (config.paths.output.hasOwnProperty(folder)) {
+            if (Object.prototype.hasOwnProperty.call(config.paths.output, folder)) {
                 outputPaths[folder] = path.resolve(path.join(configPath, config.base, config.paths.output[folder]));
             }
         }
@@ -119,16 +114,16 @@ module.exports = {
         }
 
         // remove duplicates from component array
-        if (config.components instanceof Array) {
+        if (Array.isArray(config.components)) {
             config.components = config.components.filter(function (component, index) {
                 return config.components.indexOf(component) == index;
             });
         }
 
-        const components = (Array.isArray(config.components) && config.components.length >= 1)
+        const components = Array.isArray(config.components) && config.components.length > 0
             ? config.components
             : defaults.components;
-        const individuals =  (Array.isArray(config.individuals) && config.individuals.length >= 1)
+        const individuals =  Array.isArray(config.individuals) && config.individuals.length > 0
             ? config.individuals
             : [];
         const componentsExceptIndividuals = components.filter((component) => !individuals.includes(component));
@@ -137,11 +132,11 @@ module.exports = {
         config.globs.components = componentsExceptIndividuals.length === 1 ? componentsExceptIndividuals[0] : '{' + componentsExceptIndividuals.join(',') + '}';
 
         // components that should be built, but excluded from main .css/.js files
-        config.globs.individuals = individuals.length === 1 ? individuals[0] : (individuals.length > 1)
-            ? '{' + individuals.join(',') + '}'
-            : undefined;
-
-        return config;
+        config.globs.individuals = individuals.length === 1
+            ? individuals[0]
+            : (individuals.length > 1
+                ? '{' + individuals.join(',') + '}'
+                : undefined);
     },
 
 };

package/tasks/config/project/install.js

@@ -2,13 +2,12 @@
             Set-up
 *******************************/
 
-var
+const
     fs             = require('fs'),
     path           = require('path'),
+    requireDotFile = require('require-dot-file'),
     defaults       = require('../defaults'),
-    release        = require('./release'),
-
-    requireDotFile = require('require-dot-file')
+    release        = require('./release')
 ;
 
 /*******************************
@@ -17,16 +16,16 @@ var
 
 /* Preconditions for install questions */
 
-var when = {
+let when = {
 
     // path
     changeRoot: function (questions) {
-        return (questions.useRoot !== undefined && questions.useRoot !== true);
+        return questions.useRoot !== undefined && questions.useRoot !== true;
     },
 
     // permissions
     changePermissions: function (questions) {
-        return (questions.changePermissions && questions.changePermissions === true);
+        return questions.changePermissions === true;
     },
 
     // install
@@ -35,27 +34,27 @@ var when = {
     },
 
     allowOverwrite: function (questions) {
-        return (questions.overwrite === undefined || questions.overwrite == 'yes');
+        return questions.overwrite === undefined || questions.overwrite == 'yes';
     },
     notAuto: function (questions) {
-        return (questions.install !== 'auto' && (questions.overwrite === undefined || questions.overwrite == 'yes'));
+        return questions.install !== 'auto' && (questions.overwrite === undefined || questions.overwrite == 'yes');
     },
     custom: function (questions) {
-        return (questions.install === 'custom' && (questions.overwrite === undefined || questions.overwrite == 'yes'));
+        return questions.install === 'custom' && (questions.overwrite === undefined || questions.overwrite == 'yes');
     },
     express: function (questions) {
-        return (questions.install === 'express' && (questions.overwrite === undefined || questions.overwrite == 'yes'));
+        return questions.install === 'express' && (questions.overwrite === undefined || questions.overwrite == 'yes');
     },
 
     // customize
     customize: function (questions) {
-        return (questions.customize === true);
+        return questions.customize === true;
     },
     primaryColor: function (questions) {
-        return (questions.primaryColor);
+        return questions.primaryColor;
     },
     secondaryColor: function (questions) {
-        return (questions.secondaryColor);
+        return questions.secondaryColor;
     },
 };
 
@@ -65,9 +64,9 @@ var when = {
 
 /* Filters to user input from install questions */
 
-var filter = {
+let filter = {
     removeTrailingSlash: function (path) {
-        return path.replace(/(\/$|\\$)+/mg, '');
+        return path.replace(/(\/$|\\$)+/gm, '');
     },
 };
 
@@ -84,7 +83,7 @@ module.exports = {
 
     // detect whether there is a semantic.json configuration and that the auto-install option is set to true
     shouldAutoInstall: function () {
-        var
+        let
             config = when.hasConfig()
         ;
 
@@ -93,10 +92,10 @@ module.exports = {
 
     // checks if files are in a PM directory
     getPackageManager: function (directory) {
-        var
+        let
             // returns last matching result (avoid sub-module detection)
             walk = function (directory) {
-                var
+                let
                     pathArray     = directory.split(path.sep),
                     folder        = pathArray[pathArray.length - 1],
                     nextDirectory = path.join(directory, path.sep, '..')
@@ -106,12 +105,14 @@ module.exports = {
                         name: 'Bower',
                         root: nextDirectory,
                     };
-                } else if (folder == 'node_modules') {
+                }
+                if (folder == 'node_modules') {
                     return {
                         name: 'NPM',
                         root: nextDirectory,
                     };
-                } else if (folder == 'composer') {
+                }
+                if (folder == 'composer') {
                     return {
                         name: 'Composer',
                         root: nextDirectory,
@@ -126,17 +127,17 @@ module.exports = {
             }
         ;
         // start walk from current directory if none specified
-        directory = directory || (__dirname + path.sep);
+        directory = directory || path.join((__dirname, path.sep));
 
         return walk(directory);
     },
 
     // checks if files is PMed submodule
     isSubModule: function (directory) {
-        var
+        let
             moduleFolders = 0,
             walk = function (directory) {
-                var
+                let
                     pathArray     = directory.split(path.sep),
                     folder        = pathArray[pathArray.length - 2],
                     nextDirectory = path.join(directory, path.sep, '..')
@@ -147,7 +148,7 @@ module.exports = {
                     moduleFolders--;
                 }
                 if (path.resolve(directory) === path.resolve(nextDirectory)) {
-                    return (moduleFolders > 1);
+                    return moduleFolders > 1;
                 }
 
                 // recurse downward
@@ -155,13 +156,13 @@ module.exports = {
             }
         ;
         // start walk from current directory if none specified
-        directory = directory || (__dirname + path.sep);
+        directory = directory || path.join(__dirname, path.sep);
 
         return walk(directory);
     },
 
     createJSON: function (answers) {
-        var
+        let
             json = {
                 paths: {
                     source: {},
@@ -231,7 +232,7 @@ module.exports = {
 
     regExp: {
         // used to match siteFolder variable in theme.less
-        siteVariable: /@siteFolder .*\'(.*)/mg,
+        siteVariable: /@siteFolder .*'(.*)/gm,
     },
 
     // source paths (when installing)
@@ -352,10 +353,10 @@ module.exports = {
 
                 // duplicated manually from tasks/defaults.js with additional property
                 choices: [
-                    { name: '\x1b[4mGlobal\x1b[0m', disabled: 'Styles that are applied across a site' },
+                    { name: '\u001B[4mGlobal\u001B[0m', disabled: 'Styles that are applied across a site' },
                     { name: 'reset', checked: true },
                     { name: 'site', checked: true },
-                    { name: '\x1b[4mElements\x1b[0m', disabled: 'Page elements with a single function' },
+                    { name: '\u001B[4mElements\u001B[0m', disabled: 'Page elements with a single function' },
                     { name: 'button', checked: true },
                     { name: 'container', checked: true },
                     { name: 'divider', checked: true },
@@ -372,21 +373,21 @@ module.exports = {
                     { name: 'reveal', checked: true },
                     { name: 'segment', checked: true },
                     { name: 'step', checked: true },
-                    { name: '\x1b[4mCollections\x1b[0m', disabled: 'Heterogeneous groups of components' },
+                    { name: '\u001B[4mCollections\u001B[0m', disabled: 'Heterogeneous groups of components' },
                     { name: 'breadcrumb', checked: true },
                     { name: 'form', checked: true },
                     { name: 'grid', checked: true },
                     { name: 'menu', checked: true },
                     { name: 'message', checked: true },
                     { name: 'table', checked: true },
-                    { name: '\x1b[4mViews\x1b[0m', disabled: 'Convention for presenting specific types of content' },
+                    { name: '\u001B[4mViews\u001B[0m', disabled: 'Convention for presenting specific types of content' },
                     { name: 'ad', checked: true },
                     { name: 'card', checked: true },
                     { name: 'comment', checked: true },
                     { name: 'feed', checked: true },
                     { name: 'item', checked: true },
                     { name: 'statistic', checked: true },
-                    { name: '\x1b[4mModules\x1b[0m', disabled: 'Components which need Javascript for interactivity' },
+                    { name: '\u001B[4mModules\u001B[0m', disabled: 'Components which need Javascript for interactivity' },
                     { name: 'accordion', checked: true },
                     { name: 'calendar', checked: true },
                     { name: 'checkbox', checked: true },
@@ -409,7 +410,7 @@ module.exports = {
                     { name: 'text', checked: true },
                     { name: 'toast', checked: true },
                     { name: 'transition', checked: true },
-                    { name: '\x1b[4mBehaviors\x1b[0m', disabled: 'Standalone javascript components' },
+                    { name: '\u001B[4mBehaviors\u001B[0m', disabled: 'Standalone javascript components' },
                     { name: 'api', checked: true },
                     { name: 'form', checked: true },
                     { name: 'state', checked: true },

package/tasks/config/project/release.js

@@ -2,8 +2,9 @@
          Release Config
 *******************************/
 
-var
-    requireDotFile = require('require-dot-file'),
+const requireDotFile = require('require-dot-file');
+
+let
     config,
     npmPackage,
     version
@@ -13,9 +14,7 @@ var
          Derived Values
 *******************************/
 
-try {
-    config = requireDotFile('semantic.json', process.cwd());
-} catch (error) {}
+config = requireDotFile('semantic.json', process.cwd());
 
 try {
     npmPackage = require('../../../package.json');
@@ -28,7 +27,7 @@ try {
 }
 
 // looks for version in config or package.json (whichever is available)
-version = (npmPackage && npmPackage.version !== undefined && npmPackage.name == 'fomantic-ui')
+version = npmPackage && npmPackage.version !== undefined && npmPackage.name == 'fomantic-ui'
     ? npmPackage.version
     : config.version;
 
@@ -43,16 +42,16 @@ module.exports = {
     url: 'https://fomantic-ui.com/',
 
     banner: ''
-        + '/*' + '\n'
-        + ' * # <%= title %> - <%= version %>' + '\n'
-        + ' * <%= repository %>' + '\n'
-        + ' * <%= url %>' + '\n'
-        + ' *' + '\n'
-        + ' * Copyright <%= year %> Contributors' + '\n'
-        + ' * Released under the MIT license' + '\n'
-        + ' * https://opensource.org/licenses/MIT' + '\n'
-        + ' *' + '\n'
-        + ' */' + '\n',
+        + '/*\n'
+        + ' * # <%= title %> - <%= version %>\n'
+        + ' * <%= repository %>\n'
+        + ' * <%= url %>\n'
+        + ' *\n'
+        + ' * Copyright <%= year %> Contributors\n'
+        + ' * Released under the MIT license\n'
+        + ' * https://opensource.org/licenses/MIT\n'
+        + ' *\n'
+        + ' */\n',
 
     version: version,
 

package/tasks/config/tasks.js

@@ -1,15 +1,15 @@
-var
+const
     browserslist = require('browserslist'),
     console = require('better-console'),
     config  = require('./user'),
     release = require('./project/release')
 ;
 
-var defaultBrowsers = browserslist(browserslist.defaults);
-var userBrowsers = browserslist();
-var hasBrowserslistConfig = JSON.stringify(defaultBrowsers) !== JSON.stringify(userBrowsers);
+let defaultBrowsers = browserslist(browserslist.defaults);
+let userBrowsers = browserslist();
+let hasBrowserslistConfig = JSON.stringify(defaultBrowsers) !== JSON.stringify(userBrowsers);
 
-var overrideBrowserslist = hasBrowserslistConfig ? undefined : [
+let overrideBrowserslist = hasBrowserslistConfig ? undefined : [
     'last 2 versions',
     '> 1%',
     'opera 12.1',
@@ -18,9 +18,7 @@ var overrideBrowserslist = hasBrowserslistConfig ? undefined : [
 ];
 
 // Node 12 does not support ??, so a little polyfill
-var nullish = (value, fallback) => {
-    return value !== undefined && value !== null ? value : fallback;
-};
+let nullish = (value, fallback) => (value !== undefined && value !== null ? value : fallback);
 
 module.exports = {
 
@@ -55,32 +53,32 @@ module.exports = {
 
             // remove all comments from config files (.variable)
             variables: {
-                in: /(\/\*[\s\S]+?\*\/+)[\s\S]+?\/\* End Config \*\//,
+                in: /(\/\*[\S\s]+?\*\/+)[\S\s]+?\/\* End Config \*\//,
                 out: '$1',
             },
 
             // add version to first comment
             license: {
-                in: /(^\/\*[\s\S]+)(# Fomantic-UI )([\s\S]+?\*\/)/,
+                in: /(^\/\*[\S\s]+)(# Fomantic-UI )([\S\s]+?\*\/)/,
                 out: '$1$2' + release.version + ' $3',
             },
 
             // adds uniform spacing around comments
             large: {
-                in: /(\/\*\*\*\*[\s\S]+?\*\/)/mg,
+                in: /(\/\*{4}[\S\s]+?\*\/)/gm,
                 out: '\n\n$1\n',
             },
             small: {
-                in: /(\/\*---[\s\S]+?\*\/)/mg,
+                in: /(\/\*---[\S\s]+?\*\/)/gm,
                 out: '\n$1\n',
             },
             tiny: {
-                in: /(\/\* [\s\S]+? \*\/)/mg,
+                in: /(\/\* [\S\s]+? \*\/)/gm,
                 out: '\n$1',
             },
         },
 
-        theme: /.*(\/|\\)themes(\/|\\).*?(?=(\/|\\))/mg,
+        theme: /.*(\/|\\)themes(\/|\\).*?(?=(\/|\\))/gm,
 
     },
 
@@ -97,7 +95,7 @@ module.exports = {
 
         /* Comment Banners */
         header: {
-            year: nullish(config.header.year, (new Date()).getFullYear()),
+            year: nullish(config.header.year, new Date().getFullYear()),
             title: nullish(config.header.title, release.title),
             version: nullish(config.header.version, release.version),
             repository: nullish(config.header.repository, release.repository),
@@ -107,20 +105,20 @@ module.exports = {
         plumber: {
             less: {
                 errorHandler: function (error) {
-                    var
+                    let
                         regExp = {
                             variable: /@(\S.*?)\s/,
-                            theme: /themes[\/\\]+(.*?)[\/\\].*/,
-                            element: /[\/\\]([^\/\\*]*)\.overrides/,
+                            theme: /themes[/\\]+(.*?)[/\\].*/,
+                            element: /[/\\]([^*/\\]*)\.overrides/,
                         },
                         theme,
                         element
                     ;
-                    if (error && error.filename && error.filename.match(/theme.less/)) {
+                    if (error && error.filename && /theme.less/.test(error.filename)) {
                         if (error.line == 9) {
                             element = regExp.variable.exec(error.message)[1];
                             if (element) {
-                                console.error('Missing theme.config value for ', element);
+                                console.error('Missing theme.config value for', element);
                             }
                             console.error('Most likely new UI was added in an update. You will need to add missing elements from theme.config.example');
                         } else if (error.line == 84) {

package/tasks/config/user.js

@@ -2,7 +2,7 @@
              Set-up
 *******************************/
 
-var
+const
     // npm dependencies
     extend          = require('extend'),
     fs              = require('fs'),
@@ -11,8 +11,10 @@ var
 
     // semantic.json defaults
     defaults        = require('./defaults'),
-    config          = require('./project/config'),
+    config          = require('./project/config')
+;
 
+let
     // Final config object
     gulpConfig = {},
 
@@ -37,7 +39,7 @@ try {
 }
 
 // extend user config with defaults
-gulpConfig = (!userConfig)
+gulpConfig = !userConfig
     ? extend(true, {}, defaults)
     : extend(false, {}, defaults, userConfig);
 

package/tasks/docs/build.js

@@ -2,7 +2,8 @@
  Build Docs
  *******************************/
 
-var
+const
+    extend      = require('extend'),
     gulp        = require('gulp'),
 
     // node dependencies
@@ -14,7 +15,7 @@ var
     print       = require('gulp-print').default,
 
     // user config
-    config      = require('../config/docs'),
+    configDocs      = require('../config/docs'),
 
     // install config
     tasks       = require('../config/tasks'),
@@ -35,7 +36,8 @@ var
 
 module.exports = function (callback) {
     // use a different config
-    config = configSetup.addDerivedValues(config);
+    const config = extend(true, {}, configDocs);
+    configSetup.addDerivedValues(config);
 
     // shorthand
     const globs  = config.globs;

package/tasks/docs/metadata.js

@@ -2,14 +2,14 @@
            Summarize Docs
 *******************************/
 
-var
+const
     // node dependencies
     console      = require('better-console'),
     fs           = require('fs'),
     YAML         = require('yamljs')
 ;
 
-var data = {};
+let data = {};
 
 /**
  * Test for prefix in string.
@@ -22,8 +22,8 @@ function startsWith(str, prefix) {
 }
 
 function inArray(needle, haystack) {
-    var length = haystack.length;
-    for (var i = 0; i < length; i++) {
+    let length = haystack.length;
+    for (let i = 0; i < length; i++) {
         if (haystack[i] == needle) {
             return true;
         }
@@ -49,7 +49,7 @@ function parser(file, callback) {
     }
 
     try {
-        var
+        let
             /** @type {string} */
             text     = String(file.contents.toString('utf8')),
             lines    = text.split('\n'),
@@ -68,7 +68,7 @@ function parser(file, callback) {
 
         filename = filename.slice(position + key.length + 1, filename.length);
 
-        var
+        let
             lineCount = lines.length,
             active    = false,
             yaml      = [],
@@ -109,7 +109,6 @@ function parser(file, callback) {
             meta.category = meta.type;
             meta.filename = filename;
             meta.url = '/' + filename;
-            meta.title = meta.title;
             // Primary key will by filepath
             data[meta.element] = meta;
         } else {
@@ -117,7 +116,7 @@ function parser(file, callback) {
             // console.log(meta);
         }
     } catch (error) {
-        console.log(error, filename);
+        console.log(error, file.path);
     }
 
     callback(null, file);

package/tasks/docs/serve.js

@@ -1,7 +1,9 @@
 /*******************************
  Serve Docs
  *******************************/
-var
+
+const
+    extend      = require('extend'),
     gulp        = require('gulp'),
 
     // node dependencies
@@ -11,7 +13,7 @@ var
     print       = require('gulp-print').default,
 
     // user config
-    config      = require('../config/docs'),
+    configDocs      = require('../config/docs'),
 
     // task config
     tasks       = require('../config/tasks'),
@@ -27,7 +29,8 @@ var
 
 module.exports = function () {
     // use a different config
-    config = configSetup.addDerivedValues(config);
+    const config = extend(true, {}, configDocs);
+    configSetup.addDerivedValues(config);
 
     console.clear();
     console.log('Watching source files for changes');