fomantic-ui 2.9.1-beta.1 → 2.9.1-beta.11

package/tasks/build/css.js

@@ -109,6 +109,7 @@ function pack(type, compress) {
     .pipe(dedupe())
     .pipe(replace(assets.uncompressed, assets.packaged))
     .pipe(concatCSS(concatenatedCSS, settings.concatCSS))
+    .pipe(gulpif(config.stripHeaders, replace(comments.header.in, comments.header.out)))
     .pipe(gulpif(config.hasPermissions, chmod(config.parsedPermissions)))
     .pipe(gulpif(compress, minifyCSS(settings.concatMinify)))
     .pipe(header(banner, settings.header))
@@ -133,10 +134,9 @@ function buildCSS(src, type, config, opts, callback) {
   }
 
   if (globs.individuals !== undefined && typeof src === 'string') {
-    const individuals = config.globs.individuals.replace(/\{/g,'');
-    const components = config.globs.components.replace(/\}/g,',').concat(individuals);
+    const components = config.globs.components.replace(/[{}]/g,'') + ',' + config.globs.individuals.replace(/[{}]/g,'');
 
-    src = config.paths.source.definitions + '/**/' + components + '.less';
+    src = config.paths.source.definitions + '/**/{' + components + '}.less';
   }
 
   const buildUncompressed       = () => build(src, type, false, config, opts);

package/tasks/build/javascript.js

@@ -77,6 +77,7 @@ function pack(type, compress) {
     .pipe(dedupe())
     .pipe(replace(assets.uncompressed, assets.packaged))
     .pipe(concat(concatenatedJS))
+    .pipe(gulpif(config.stripHeaders, replace(comments.header.in, comments.header.out)))
     .pipe(gulpif(compress, uglify(settings.concatUglify)))
     .pipe(header(banner, settings.header))
     .pipe(gulpif(config.hasPermissions, chmod(config.parsedPermissions)))
@@ -100,10 +101,9 @@ function buildJS(src, type, config, callback) {
   }
 
   if (globs.individuals !== undefined && typeof src === 'string') {
-    const individuals = config.globs.individuals.replace(/\{/g,'');
-    const components = config.globs.components.replace(/\}/g,',').concat(individuals);
+    const components = config.globs.components.replace(/[{}]/g,'') + ',' + config.globs.individuals.replace(/[{}]/g,'');
 
-    src = config.paths.source.definitions + '/**/' + components + (config.globs.ignored || '') + '.js';
+    src = config.paths.source.definitions + '/**/{' + components + '}' + (config.globs.ignored || '') + '.js';
   }
 
   // copy source javascript

package/tasks/config/defaults.js

@@ -115,6 +115,8 @@ module.exports = {
   // whether to load admin tasks
   admin: false,
 
+  header: {},
+
   // globs used for matching file patterns
   globs      : {
     ignored    : '!(*.min|*.map|*.rtl)',

package/tasks/config/project/config.js

@@ -138,10 +138,10 @@ module.exports = {
     const componentsExceptIndividuals = components.filter((component) => !individuals.includes(component));
 
     // takes component object and creates file glob matching selected components
-    config.globs.components = '{' + componentsExceptIndividuals.join(',') + '}';
+    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)
+    config.globs.individuals = individuals.length === 1 ? individuals[0] : (individuals.length > 1)
       ? '{' + individuals.join(',') + '}'
       : undefined
     ;

package/tasks/config/project/release.js

@@ -46,7 +46,7 @@ module.exports = {
 
   title      : 'Fomantic UI',
   repository : 'https://github.com/fomantic/Fomantic-UI',
-  url        : 'http://fomantic-ui.com/',
+  url        : 'https://fomantic-ui.com/',
 
   banner: ''
     + '/*' + '\n'
@@ -56,7 +56,7 @@ module.exports = {
     + ' *' + '\n'
     + ' * Copyright <%= year %> Contributors' + '\n'
     + ' * Released under the MIT license' + '\n'
-    + ' * http://opensource.org/licenses/MIT' + '\n'
+    + ' * https://opensource.org/licenses/MIT' + '\n'
     + ' *' + '\n'
     + ' */' + '\n',
 

package/tasks/config/tasks.js

@@ -17,9 +17,14 @@ var overrideBrowserslist = hasBrowserslistConfig ? undefined : [
   '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) {
@@ -42,6 +47,11 @@ module.exports = {
   regExp: {
 
     comments: {
+      // remove all component headers in concatenated file
+      header: {
+        in: /\/\*!(?:(?!\/\*).)*# Fomantic-UI \d+\.\d+\.(?:(?!\/\*).)*MIT license(?:(?!\/\*).)*\*\/\n?/gs,
+        out: ''
+      },
 
       // remove all comments from config files (.variable)
       variables : {
@@ -87,11 +97,11 @@ module.exports = {
 
     /* Comment Banners */
     header: {
-      year       : (new Date()).getFullYear(),
-      title      : release.title,
-      version    : release.version,
-      repository : release.repository,
-      url        : release.url
+      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: {
@@ -113,7 +123,7 @@ module.exports = {
                 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) {
+            } 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);

package/tasks/config/user.js

@@ -29,10 +29,13 @@ var
 try {
   // 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('No semantic.json config found');
+    console.error('require-dot-file module not found');
   }
 }
 

package/tasks/install.js

@@ -106,7 +106,7 @@ module.exports = function (callback) {
 
       // perform update if new version
       if (currentConfig.version !== release.version) {
-        console.log('Updating Semantic UI from ' + currentConfig.version + ' to ' + release.version);
+        console.log('Updating Fomantic UI from ' + currentConfig.version + ' to ' + release.version);
 
         console.info('Updating ui definitions...');
         wrench.copyDirSyncRecursive(source.definitions, updatePaths.definition, settings.wrench.overwrite);
@@ -151,7 +151,7 @@ module.exports = function (callback) {
         callback();
         return;
       } else {
-        console.log('Current version of Semantic UI already installed');
+        console.log('Current version of Fomantic UI already installed');
         callback();
         return;
       }