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

package/tasks/config/npm/gulpfile.js

@@ -3,13 +3,12 @@
  *******************************/
 
 var
-  gulp   = require('gulp'),
+    gulp   = require('gulp'),
 
-  // read user config to know what task to load
-  config = require('./tasks/config/user')
+    // read user config to know what task to load
+    config = require('./tasks/config/user')
 ;
 
-
 /*******************************
  *            Tasks
  *******************************/
@@ -20,16 +19,16 @@ require('./tasks/collections/install')(gulp);
 
 gulp.task('default', gulp.series('watch'));
 
-/*--------------
+/* --------------
       Docs
----------------*/
+--------------- */
 
 require('./tasks/collections/docs')(gulp);
 
-/*--------------
+/* --------------
       RTL
----------------*/
+--------------- */
 
 if (config.rtl) {
-  require('./tasks/collections/rtl')(gulp);
+    require('./tasks/collections/rtl')(gulp);
 }

package/tasks/config/project/config.js

@@ -3,152 +3,145 @@
 *******************************/
 
 var
-  extend   = require('extend'),
-  fs       = require('fs'),
-  path     = require('path'),
+    extend   = require('extend'),
+    fs       = require('fs'),
+    path     = require('path'),
 
-  defaults = require('../defaults')
+    defaults = require('../defaults')
 ;
 
-
 /*******************************
             Exports
 *******************************/
 
 module.exports = {
 
-  getPath: function(file, directory) {
-    var
-      configPath,
-      walk = function(directory) {
+    getPath: function (file, directory) {
         var
-          nextDirectory = path.resolve( path.join(directory, path.sep, '..') ),
-          currentPath   = path.normalize( path.join(directory, file) )
+            configPath,
+            walk = function (directory) {
+                var
+                    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) {
+                        return;
+                    }
+                    // otherwise recurse
+                    walk(nextDirectory, file);
+                }
+            }
         ;
-        if( fs.existsSync(currentPath) ) {
-          // found file
-          configPath = path.normalize(directory);
-          return;
+
+        // start walk from outside require-dot-files directory
+        file = file || defaults.files.config;
+        directory = directory || path.join(__dirname, path.sep, '..');
+        walk(directory);
+
+        return configPath || '';
+    },
+
+    // adds additional derived values to a config object
+    addDerivedValues: function (config) {
+        config = config || extend(false, {}, defaults);
+
+        /* --------------
+            File Paths
+        --------------- */
+
+        var
+            configPath = this.getPath(),
+            sourcePaths = {},
+            outputPaths = {},
+            folder
+        ;
+
+        // resolve paths (config location + base + path)
+        for (folder in config.paths.source) {
+            if (config.paths.source.hasOwnProperty(folder)) {
+                sourcePaths[folder] = path.resolve(path.join(configPath, config.base, config.paths.source[folder]));
+            }
         }
-        else {
-          // reached file system root, let's stop
-          if(nextDirectory == directory) {
-            return;
-          }
-          // otherwise recurse
-          walk(nextDirectory, file);
+        for (folder in config.paths.output) {
+            if (config.paths.output.hasOwnProperty(folder)) {
+                outputPaths[folder] = path.resolve(path.join(configPath, config.base, config.paths.output[folder]));
+            }
         }
-      }
-    ;
-
-    // start walk from outside require-dot-files directory
-    file      = file || defaults.files.config;
-    directory = directory || path.join(__dirname, path.sep, '..');
-    walk(directory);
-    return configPath || '';
-  },
-
-  // adds additional derived values to a config object
-  addDerivedValues: function(config) {
-
-    config = config || extend(false, {}, defaults);
-
-    /*--------------
-       File Paths
-    ---------------*/
-
-    var
-      configPath = this.getPath(),
-      sourcePaths = {},
-      outputPaths = {},
-      folder
-    ;
-
-    // resolve paths (config location + base + path)
-    for(folder in config.paths.source) {
-      if(config.paths.source.hasOwnProperty(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)) {
-        outputPaths[folder] = path.resolve(path.join(configPath, config.base, config.paths.output[folder]));
-      }
-    }
-
-    // set config paths to full paths
-    config.paths.source = sourcePaths;
-    config.paths.output = outputPaths;
-
-    // resolve "clean" command path
-    config.paths.clean = path.resolve( path.join(configPath, config.base, config.paths.clean) );
-
-    /*--------------
-        CSS URLs
-    ---------------*/
-
-    // determine asset paths in css by finding relative path between themes and output
-    // force forward slashes
-
-    config.paths.assets = {
-      source       : '../../themes', // source asset path is always the same
-      uncompressed : './' + path.relative(config.paths.output.uncompressed, config.paths.output.themes).replace(/\\/g, '/'),
-      compressed   : './' + path.relative(config.paths.output.compressed, config.paths.output.themes).replace(/\\/g, '/'),
-      packaged     : './' + path.relative(config.paths.output.packaged, config.paths.output.themes).replace(/\\/g, '/')
-    };
-
-    /*--------------
-       Permission
-    ---------------*/
-
-    if(config.permission) {
-      config.hasPermissions = true;
-      config.parsedPermissions = typeof config.permission === 'string' ? parseInt(config.permission, 8) : config.permission;
-    }
-    else {
-      // pass blank object to avoid causing errors
-      config.permission     = {};
-      config.hasPermissions = false;
-      config.parsedPermissions = {};
-    }
-
-    /*--------------
-         Globs
-    ---------------*/
-
-    if(!config.globs) {
-      config.globs = {};
-    }
-
-    // remove duplicates from component array
-    if(config.components instanceof Array) {
-      config.components = config.components.filter(function(component, index) {
-        return config.components.indexOf(component) == index;
-      });
-    }
-
-    const components = (Array.isArray(config.components) && config.components.length >= 1)
-      ? config.components
-      : defaults.components
-    ;
-    const individuals =  (Array.isArray(config.individuals) && config.individuals.length >= 1)
-      ? config.individuals
-      : []
-    ;
-    const componentsExceptIndividuals = components.filter((component) => !individuals.includes(component));
-
-    // takes component object and creates file glob matching selected components
-    config.globs.components = '{' + componentsExceptIndividuals.join(',') + '}';
-
-    // components that should be built, but excluded from main .css/.js files
-    config.globs.individuals = (individuals.length >= 1)
-      ? '{' + individuals.join(',') + '}'
-      : undefined
-    ;
-
-    return config;
-
-  }
 
-};
+        // set config paths to full paths
+        config.paths.source = sourcePaths;
+        config.paths.output = outputPaths;
+
+        // resolve "clean" command path
+        config.paths.clean = path.resolve(path.join(configPath, config.base, config.paths.clean));
+
+        /* --------------
+             CSS URLs
+        --------------- */
+
+        // determine asset paths in css by finding relative path between themes and output
+        // force forward slashes
+
+        config.paths.assets = {
+            source: '../../themes', // source asset path is always the same
+            uncompressed: './' + path.relative(config.paths.output.uncompressed, config.paths.output.themes).replace(/\\/g, '/'),
+            compressed: './' + path.relative(config.paths.output.compressed, config.paths.output.themes).replace(/\\/g, '/'),
+            packaged: './' + path.relative(config.paths.output.packaged, config.paths.output.themes).replace(/\\/g, '/'),
+        };
+
+        /* --------------
+            Permission
+        --------------- */
+
+        if (config.permission) {
+            config.hasPermissions = true;
+            config.parsedPermissions = typeof config.permission === 'string' ? parseInt(config.permission, 8) : config.permission;
+        } else {
+            // pass blank object to avoid causing errors
+            config.permission = {};
+            config.hasPermissions = false;
+            config.parsedPermissions = {};
+        }
 
+        /* --------------
+             Globs
+        --------------- */
+
+        if (!config.globs) {
+            config.globs = {};
+        }
+
+        // remove duplicates from component array
+        if (config.components instanceof Array) {
+            config.components = config.components.filter(function (component, index) {
+                return config.components.indexOf(component) == index;
+            });
+        }
+
+        const components = (Array.isArray(config.components) && config.components.length >= 1)
+            ? config.components
+            : defaults.components;
+        const individuals =  (Array.isArray(config.individuals) && config.individuals.length >= 1)
+            ? config.individuals
+            : [];
+        const componentsExceptIndividuals = components.filter((component) => !individuals.includes(component));
+
+        // takes component object and creates file glob matching selected components
+        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;
+    },
+
+};