fomantic-ui 2.9.1-beta.2 → 2.9.1-beta.21

package/tasks/config/project/release.js

@@ -3,40 +3,34 @@
 *******************************/
 
 var
-  requireDotFile = require('require-dot-file'),
-  config,
-  npmPackage,
-  version
+    requireDotFile = require('require-dot-file'),
+    config,
+    npmPackage,
+    version
 ;
 
-
 /*******************************
          Derived Values
 *******************************/
 
 try {
-  config = requireDotFile('semantic.json', process.cwd());
-}
-catch(error) {}
-
+    config = requireDotFile('semantic.json', process.cwd());
+} catch (error) {}
 
 try {
-  npmPackage = require('../../../package.json');
-}
-catch(error) {
-  // generate fake package
-  npmPackage = {
-    name: 'Unknown',
-    version: 'x.x'
-  };
+    npmPackage = require('../../../package.json');
+} catch (error) {
+    // generate fake package
+    npmPackage = {
+        name: 'Unknown',
+        version: 'x.x',
+    };
 }
 
 // looks for version in config or package.json (whichever is available)
 version = (npmPackage && npmPackage.version !== undefined && npmPackage.name == 'fomantic-ui')
-  ? npmPackage.version
-  : config.version
-;
-
+    ? npmPackage.version
+    : config.version;
 
 /*******************************
              Export
@@ -44,22 +38,22 @@ version = (npmPackage && npmPackage.version !== undefined && npmPackage.name ==
 
 module.exports = {
 
-  title      : 'Fomantic UI',
-  repository : 'https://github.com/fomantic/Fomantic-UI',
-  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',
-
-  version    : version
+    title: 'Fomantic UI',
+    repository: 'https://github.com/fomantic/Fomantic-UI',
+    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',
+
+    version: version,
 
 };

package/tasks/config/tasks.js

@@ -1,181 +1,190 @@
 var
-  browserslist = require('browserslist'),
-  console = require('better-console'),
-  config  = require('./user'),
-  release = require('./project/release')
+    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)
+var defaultBrowsers = browserslist(browserslist.defaults);
+var userBrowsers = browserslist();
+var hasBrowserslistConfig = JSON.stringify(defaultBrowsers) !== JSON.stringify(userBrowsers);
 
 var overrideBrowserslist = hasBrowserslistConfig ? undefined : [
-  'last 2 versions',
-  '> 1%',
-  'opera 12.1',
-  'bb 10',
-  'android 4'
-]
+    'last 2 versions',
+    '> 1%',
+    'opera 12.1',
+    'bb 10',
+    'android 4',
+];
+
+// Node 12 does not support ??, so a little polyfill
+var nullish = (value, fallback) => {
+    return value !== undefined && value !== null ? value : fallback;
+};
 
 module.exports = {
 
-  banner : release.banner,
+    banner: nullish(config.banner, release.banner),
 
-  log: {
-    created: function(file) {
-      return 'Created: ' + file;
-    },
-    modified: function(file) {
-      return 'Modified: ' + file;
-    }
-  },
-
-  filenames: {
-    concatenatedCSS            : 'semantic.css',
-    concatenatedJS             : 'semantic.js',
-    concatenatedMinifiedCSS    : 'semantic.min.css',
-    concatenatedMinifiedJS     : 'semantic.min.js',
-    concatenatedRTLCSS         : 'semantic.rtl.css',
-    concatenatedMinifiedRTLCSS : 'semantic.rtl.min.css'
-  },
-
-  regExp: {
-
-    comments: {
-
-      // remove all comments from config files (.variable)
-      variables : {
-        in  : /(\/\*[\s\S]+?\*\/+)[\s\S]+?\/\* End Config \*\//,
-        out : '$1',
-      },
-
-      // add version to first comment
-      license: {
-        in  : /(^\/\*[\s\S]+)(# Fomantic-UI )([\s\S]+?\*\/)/,
-        out : '$1$2' + release.version + ' $3'
-      },
-
-      // adds uniform spacing around comments
-      large: {
-        in  : /(\/\*\*\*\*[\s\S]+?\*\/)/mg,
-        out : '\n\n$1\n'
-      },
-      small: {
-        in  : /(\/\*---[\s\S]+?\*\/)/mg,
-        out : '\n$1\n'
-      },
-      tiny: {
-        in  : /(\/\* [\s\S]+? \*\/)/mg,
-        out : '\n$1'
-      }
+    log: {
+        created: function (file) {
+            return 'Created: ' + file;
+        },
+        modified: function (file) {
+            return 'Modified: ' + file;
+        },
     },
 
-    theme: /.*(\/|\\)themes(\/|\\).*?(?=(\/|\\))/mg
-
-  },
-
-  settings: {
-
-    /* Remove Files in Clean */
-    del: {
-      silent : true
+    filenames: {
+        concatenatedCSS: 'semantic.css',
+        concatenatedJS: 'semantic.js',
+        concatenatedMinifiedCSS: 'semantic.min.css',
+        concatenatedMinifiedJS: 'semantic.min.js',
+        concatenatedRTLCSS: 'semantic.rtl.css',
+        concatenatedMinifiedRTLCSS: 'semantic.rtl.min.css',
     },
 
-    concatCSS: {
-      rebaseUrls: false
-    },
+    regExp: {
 
-    /* Comment Banners */
-    header: {
-      year       : (new Date()).getFullYear(),
-      title      : release.title,
-      version    : release.version,
-      repository : release.repository,
-      url        : release.url
-    },
+        comments: {
+            // remove all component headers in concatenated file
+            header: {
+                in: /\/\*!(?:(?!\/\*).)*# Fomantic-UI \d+\.\d+\.(?:(?!\/\*).)*MIT license(?:(?!\/\*).)*\*\/\n?/gs,
+                out: '',
+            },
 
-    plumber: {
-      less: {
-        errorHandler: function(error) {
-          var
-            regExp = {
-              variable : /@(\S.*?)\s/,
-              theme    : /themes[\/\\]+(.*?)[\/\\].*/,
-              element  : /[\/\\]([^\/\\*]*)\.overrides/
+            // remove all comments from config files (.variable)
+            variables: {
+                in: /(\/\*[\s\S]+?\*\/+)[\s\S]+?\/\* End Config \*\//,
+                out: '$1',
             },
-            theme,
-            element
-          ;
-          if(error && error.filename && error.filename.match(/theme.less/)) {
-            if (error.line == 9) {
-              element = regExp.variable.exec(error.message)[1];
-              if (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 == 73) {
-              element = regExp.element.exec(error.message)[1];
-              theme   = regExp.theme.exec(error.message)[1];
-              console.error(theme + ' is not an available theme for ' + element);
-            } else {
-              console.error(error);
-            }
-          }
-          else {
-            throw new Error(error);
-          }
-          this.emit('end');
-        }
-      }
-    },
 
-    /* What Browsers to Prefix */
-    prefix: {
-      overrideBrowserslist
-    },
+            // add version to first comment
+            license: {
+                in: /(^\/\*[\s\S]+)(# Fomantic-UI )([\s\S]+?\*\/)/,
+                out: '$1$2' + release.version + ' $3',
+            },
 
-    /* File Renames */
-    rename: {
-      minJS     : { extname : '.min.js' },
-      minCSS    : { extname : '.min.css' },
-      rtlCSS    : { extname : '.rtl.css' },
-      rtlMinCSS : { extname : '.rtl.min.css' }
-    },
+            // adds uniform spacing around comments
+            large: {
+                in: /(\/\*\*\*\*[\s\S]+?\*\/)/mg,
+                out: '\n\n$1\n',
+            },
+            small: {
+                in: /(\/\*---[\s\S]+?\*\/)/mg,
+                out: '\n$1\n',
+            },
+            tiny: {
+                in: /(\/\* [\s\S]+? \*\/)/mg,
+                out: '\n$1',
+            },
+        },
 
-    /* Minified CSS Concat */
-    minify: {
-      level: {
-        1: {
-          inline          : false
-        }
-      }
-    },
+        theme: /.*(\/|\\)themes(\/|\\).*?(?=(\/|\\))/mg,
 
-    /* Minified JS Settings */
-    uglify: {
-      mangle   : true,
-      output: {
-        comments: 'some'
-      }
     },
 
-    /* Minified Concat CSS Settings */
-    concatMinify: {
-      level: {
-        1: {
-          inline          : false,
-          specialComments : false
-        }
-      }
-    },
+    settings: {
+
+        /* Remove Files in Clean */
+        del: {
+            silent: true,
+        },
+
+        concatCSS: {
+            rebaseUrls: false,
+        },
+
+        /* Comment Banners */
+        header: {
+            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),
+            url: nullish(config.header.url, release.url),
+        },
+
+        plumber: {
+            less: {
+                errorHandler: function (error) {
+                    var
+                        regExp = {
+                            variable: /@(\S.*?)\s/,
+                            theme: /themes[\/\\]+(.*?)[\/\\].*/,
+                            element: /[\/\\]([^\/\\*]*)\.overrides/,
+                        },
+                        theme,
+                        element
+                    ;
+                    if (error && error.filename && error.filename.match(/theme.less/)) {
+                        if (error.line == 9) {
+                            element = regExp.variable.exec(error.message)[1];
+                            if (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) {
+                            element = regExp.element.exec(error.message)[1];
+                            theme = regExp.theme.exec(error.message)[1];
+                            console.error(theme + ' is not an available theme for ' + element);
+                        } else {
+                            console.error(error);
+                        }
+                    } else {
+                        throw new Error(error);
+                    }
+                    this.emit('end');
+                },
+            },
+        },
+
+        /* What Browsers to Prefix */
+        prefix: {
+            overrideBrowserslist: overrideBrowserslist,
+        },
+
+        /* File Renames */
+        rename: {
+            minJS: { extname: '.min.js' },
+            minCSS: { extname: '.min.css' },
+            rtlCSS: { extname: '.rtl.css' },
+            rtlMinCSS: { extname: '.rtl.min.css' },
+        },
+
+        /* Minified CSS Concat */
+        minify: {
+            level: {
+                1: {
+                    inline: false,
+                },
+            },
+        },
+
+        /* Minified JS Settings */
+        uglify: {
+            mangle: true,
+            output: {
+                comments: 'some',
+            },
+        },
+
+        /* Minified Concat CSS Settings */
+        concatMinify: {
+            level: {
+                1: {
+                    inline: false,
+                    specialComments: false,
+                },
+            },
+        },
 
-    /* Minified Concat JS */
-    concatUglify: {
-      mangle   : true,
-      output: {
-        comments: 'some'
-      }
-    }
+        /* Minified Concat JS */
+        concatUglify: {
+            mangle: true,
+            output: {
+                comments: 'some',
+            },
+        },
 
-  }
+    },
 };

package/tasks/config/user.js

@@ -3,44 +3,43 @@
 *******************************/
 
 var
-  // npm dependencies
-  extend          = require('extend'),
-  fs              = require('fs'),
-  path            = require('path'),
-  requireDotFile  = require('require-dot-file'),
+    // npm dependencies
+    extend          = require('extend'),
+    fs              = require('fs'),
+    path            = require('path'),
+    requireDotFile  = require('require-dot-file'),
 
-  // semantic.json defaults
-  defaults        = require('./defaults'),
-  config          = require('./project/config'),
+    // semantic.json defaults
+    defaults        = require('./defaults'),
+    config          = require('./project/config'),
 
-  // Final config object
-  gulpConfig = {},
-
-  // semantic.json settings
-  userConfig
+    // Final config object
+    gulpConfig = {},
 
+    // semantic.json settings
+    userConfig
 ;
 
-
 /*******************************
           User Config
 *******************************/
 
 try {
-  // looks for config file across all parent directories
-  userConfig = requireDotFile('semantic.json', process.cwd());
-}
-catch(error) {
-  if(error.code === 'MODULE_NOT_FOUND') {
-    console.error('No semantic.json config found');
-  }
+    // looks for config file across all parent directories
+    userConfig = requireDotFile('semantic.json', process.cwd());
+    if (userConfig.valueOf() === false) {
+        console.error('No semantic.json config found');
+    }
+} catch (error) {
+    if (error.code === 'MODULE_NOT_FOUND') {
+        console.error('require-dot-file module not found');
+    }
 }
 
 // extend user config with defaults
 gulpConfig = (!userConfig)
-  ? extend(true, {}, defaults)
-  : extend(false, {}, defaults, userConfig)
-;
+    ? extend(true, {}, defaults)
+    : extend(false, {}, defaults, userConfig);
 
 /*******************************
        Add Derived Values
@@ -49,10 +48,8 @@ gulpConfig = (!userConfig)
 // adds calculated values
 config.addDerivedValues(gulpConfig);
 
-
 /*******************************
              Export
 *******************************/
 
 module.exports = gulpConfig;
-