fomantic-ui 2.10.0-beta.1 → 2.10.0-beta.10

package/tasks/config/project/install.js

@@ -2,13 +2,10 @@
             Set-up
 *******************************/
 
-const
-    fs             = require('fs'),
-    path           = require('path'),
-    requireDotFile = require('require-dot-file'),
-    defaults       = require('../defaults'),
-    release        = require('./release')
-;
+const path = require('node:path');
+const requireDotFile = require('require-dot-file');
+const defaults = require('../defaults');
+const release = require('./release');
 
 /*******************************
           When to Ask
@@ -83,50 +80,44 @@ module.exports = {
 
     // detect whether there is a semantic.json configuration and that the auto-install option is set to true
     shouldAutoInstall: function () {
-        let
-            config = when.hasConfig()
-        ;
+        let config = when.hasConfig();
 
         return config.autoInstall;
     },
 
     // checks if files are in a PM directory
     getPackageManager: function (directory) {
-        let
-            // returns last matching result (avoid sub-module detection)
-            walk = function (directory) {
-                let
-                    pathArray     = directory.split(path.sep),
-                    folder        = pathArray[pathArray.length - 1],
-                    nextDirectory = path.join(directory, path.sep, '..')
-                ;
-                if (folder === 'bower_components') {
-                    return {
-                        name: 'Bower',
-                        root: nextDirectory,
-                    };
-                }
-                if (folder === 'node_modules') {
-                    return {
-                        name: 'NPM',
-                        root: nextDirectory,
-                    };
-                }
-                if (folder === 'composer') {
-                    return {
-                        name: 'Composer',
-                        root: nextDirectory,
-                    };
-                }
-                if (path.resolve(directory) === path.resolve(nextDirectory)) {
-                    return false;
-                }
-
-                // recurse downward
-                return walk(nextDirectory);
+        // returns last matching result (avoid sub-module detection)
+        let walk = function (directory) {
+            let pathArray = directory.split(path.sep);
+            let folder = pathArray[pathArray.length - 1];
+            let nextDirectory = path.join(directory, path.sep, '..');
+            if (folder === 'bower_components') {
+                return {
+                    name: 'Bower',
+                    root: nextDirectory,
+                };
             }
-        ;
-        // start walk from current directory if none specified
+            if (folder === 'node_modules') {
+                return {
+                    name: 'NPM',
+                    root: nextDirectory,
+                };
+            }
+            if (folder === 'composer') {
+                return {
+                    name: 'Composer',
+                    root: nextDirectory,
+                };
+            }
+            if (path.resolve(directory) === path.resolve(nextDirectory)) {
+                return false;
+            }
+
+            // recurse downward
+            return walk(nextDirectory);
+        };
+        // start walk from the current directory if none specified
         directory = directory || path.join(__dirname, path.sep);
 
         return walk(directory);
@@ -134,27 +125,23 @@ module.exports = {
 
     // checks if files is PMed submodule
     isSubModule: function (directory) {
-        let
-            moduleFolders = 0,
-            walk = function (directory) {
-                let
-                    pathArray     = directory.split(path.sep),
-                    folder        = pathArray[pathArray.length - 2],
-                    nextDirectory = path.join(directory, path.sep, '..')
-                ;
-                if (['bower_components', 'node_modules', 'composer'].includes(folder)) {
-                    moduleFolders++;
-                } else if (folder === '.pnpm') {
-                    moduleFolders--;
-                }
-                if (path.resolve(directory) === path.resolve(nextDirectory)) {
-                    return moduleFolders > 1;
-                }
-
-                // recurse downward
-                return walk(nextDirectory);
+        let moduleFolders = 0;
+        let walk = function (directory) {
+            let pathArray = directory.split(path.sep);
+            let folder = pathArray[pathArray.length - 2];
+            let nextDirectory = path.join(directory, path.sep, '..');
+            if (['bower_components', 'node_modules', 'composer'].includes(folder)) {
+                moduleFolders++;
+            } else if (folder === '.pnpm') {
+                moduleFolders--;
             }
-        ;
+            if (path.resolve(directory) === path.resolve(nextDirectory)) {
+                return moduleFolders > 1;
+            }
+
+            // recurse downward
+            return walk(nextDirectory);
+        };
         // start walk from current directory if none specified
         directory = directory || path.join(__dirname, path.sep);
 
@@ -162,14 +149,12 @@ module.exports = {
     },
 
     createJSON: function (answers) {
-        let
-            json = {
-                paths: {
-                    source: {},
-                    output: {},
-                },
-            }
-        ;
+        let json = {
+            paths: {
+                source: {},
+                output: {},
+            },
+        };
 
         // add components
         if (answers.components) {
@@ -191,7 +176,7 @@ module.exports = {
             json.base = path.normalize(answers.semanticRoot);
         }
 
-        // record version number to avoid re-installing on same version
+        // record version number to avoid re-installing on the same version
         json.version = release.version;
 
         // add dist folder paths
@@ -256,7 +241,6 @@ module.exports = {
         config: 'semantic.json',
         overridesImport: 'src/overrides.less',
         lessImport: 'src/semantic.less',
-        site: 'src/site',
         themeConfig: 'src/theme.config',
         themeImport: 'src/theme.less',
     },
@@ -751,20 +735,18 @@ module.exports = {
         },
 
         /* Copy Install Folders */
-        wrench: {
+        copy: {
 
-            // overwrite existing files update & install (default theme / definition)
+            // overwrite existing files update and install (default theme / definition)
             overwrite: {
-                forceDelete: true,
-                excludeHiddenUnix: true,
-                preserveFiles: false,
+                overwrite: true,
+                preserveTimestamps: true,
             },
 
             // only create files that don't exist (site theme update)
             merge: {
-                forceDelete: false,
-                excludeHiddenUnix: true,
-                preserveFiles: true,
+                overwrite: false,
+                preserveTimestamps: true,
             },
 
         },

package/tasks/config/project/release.js

@@ -4,14 +4,12 @@
 
 const requireDotFile = require('require-dot-file');
 
-let
-    config,
-    npmPackage,
-    version,
-    revision,
-    versionInFileName,
-    includeVersionInFileName
-;
+let config;
+let npmPackage;
+let version;
+let revision;
+let versionInFileName;
+let includeVersionInFileName;
 
 /*******************************
          Derived Values
@@ -29,7 +27,7 @@ try {
     };
 }
 
-// looks for version in config or package.json (whichever is available)
+// looks for the version in config or package.json (whichever is available)
 version = npmPackage && npmPackage.version !== undefined && npmPackage.name === 'fomantic-ui'
     ? npmPackage.version
     : config.version;

package/tasks/config/tasks.js

@@ -1,9 +1,7 @@
-const
-    browserslist = require('browserslist'),
-    console = require('@fomantic/better-console'),
-    config  = require('./user'),
-    release = require('./project/release')
-;
+const browserslist = require('browserslist');
+const console = require('@fomantic/better-console');
+const config = require('./user');
+const release = require('./project/release');
 
 let defaultBrowsers = browserslist(browserslist.defaults);
 let userBrowsers = browserslist();
@@ -18,8 +16,6 @@ if (!prefix.overrideBrowserslist && !hasBrowserslistConfig) {
         'last 4 iOS major versions',
         'last 4 Android major versions',
         'last 4 ChromeAndroid versions',
-        'Edge 12',
-        'ie 11',
     ];
 }
 
@@ -48,7 +44,7 @@ module.exports = {
     regExp: {
 
         comments: {
-            // remove all component headers in concatenated file
+            // remove all component headers in the concatenated file
             header: {
                 in: /\/\*!(?:(?!\/\*).)*# Fomantic-UI \d+\.\d+\.(?:(?!\/\*).)*MIT license(?:(?!\/\*).)*\*\/\n?/gs,
                 out: '',
@@ -60,7 +56,7 @@ module.exports = {
                 out: '$1',
             },
 
-            // add version to first comment
+            // add the version to the first comment
             license: {
                 in: /(^\/\*[\S\s]+)(# Fomantic-UI )([\S\s]+?\*\/)/,
                 out: '$1$2' + release.version + ' $3',
@@ -87,11 +83,6 @@ module.exports = {
 
     settings: {
 
-        /* Remove Files in Clean */
-        del: {
-            silent: true,
-        },
-
         concatCSS: {
             rebaseUrls: false,
         },
@@ -108,12 +99,10 @@ module.exports = {
         plumber: {
             less: {
                 errorHandler: function (error) {
-                    let
-                        regExp = {
-                            variable: /@(\S.*?)\s/,
-                        },
-                        element
-                    ;
+                    let regExp = {
+                        variable: /@(\S.*?)\s/,
+                    };
+                    let element;
                     if (error && error.filename && /theme.less/.test(error.filename)) {
                         if (error.line === 9) {
                             element = regExp.variable.exec(error.message)[1];

package/tasks/config/user.js

@@ -2,32 +2,26 @@
              Set-up
 *******************************/
 
-const
-    // npm dependencies
-    fs              = require('fs'),
-    path            = require('path'),
-    extend          = require('extend'),
-    requireDotFile  = require('require-dot-file'),
-
-    // semantic.json defaults
-    defaults        = require('./defaults'),
-    config          = require('./project/config')
-;
-
-let
-    // Final config object
-    gulpConfig = {},
-
-    // semantic.json settings
-    userConfig
-;
+// npm dependencies
+const extend = require('extend');
+const requireDotFile = require('require-dot-file');
+
+// semantic.json defaults
+const defaults = require('./defaults');
+const config = require('./project/config');
+
+// Final config object
+let gulpConfig;
+
+// semantic.json settings
+let userConfig;
 
 /*******************************
           User Config
 *******************************/
 
 try {
-    // looks for config file across all parent directories
+    // looks for a config file across all parent directories
     userConfig = requireDotFile('semantic.json', process.cwd());
     if (userConfig.valueOf() === false) {
         console.error('No semantic.json config found');

package/tasks/docs/build.js

@@ -2,37 +2,35 @@
  Build Docs
  *******************************/
 
-const
-    fs          = require('fs'),
-    extend      = require('extend'),
+const fs = require('node:fs');
+const extend = require('extend');
 
-    // node dependencies
-    console     = require('@fomantic/better-console'),
-    gulp        = require('gulp'),
-    map         = require('map-stream'),
+// node dependencies
+const console = require('@fomantic/better-console');
+const gulp = require('gulp');
+const map = require('map-stream');
 
-    // gulp dependencies
-    print       = require('gulp-print').default,
+// gulp dependencies
+const print = require('gulp-print').default;
 
-    // user config
-    configDocs      = require('../config/docs'),
+// user config
+const configDocs = require('../config/docs');
 
-    // install config
-    tasks       = require('../config/tasks'),
-    configSetup = require('../config/project/config'),
-    install     = require('../config/project/install'),
+// install config
+const tasks = require('../config/tasks');
+const configSetup = require('../config/project/config');
+const install = require('../config/project/install');
 
-    // metadata parsing
-    metadata    = require('./metadata'),
+// metadata parsing
+const metadata = require('./metadata');
 
-    // build methods
-    buildJS     = require('../build/javascript').buildJS,
-    buildCSS    = require('../build/css').buildCSS,
-    buildAssets = require('../build/assets').buildAssets,
+// build methods
+const buildJS = require('../build/javascript').buildJS;
+const buildCSS = require('../build/css').buildCSS;
+const buildAssets = require('../build/assets').buildAssets;
 
-    // shorthand
-    log         = tasks.log
-;
+// shorthand
+const log = tasks.log;
 
 module.exports = function (callback) {
     // use a different config
@@ -40,7 +38,7 @@ module.exports = function (callback) {
     configSetup.addDerivedValues(config);
 
     // shorthand
-    const globs  = config.globs;
+    const globs = config.globs;
     const output = config.paths.output;
 
     /* --------------
@@ -59,8 +57,7 @@ module.exports = function (callback) {
             .on('end', function () {
                 fs.mkdirSync(output.metadata, { recursive: true });
                 fs.writeFileSync(output.metadata + '/metadata.json', JSON.stringify(metadata.result, null, 2));
-            })
-        ;
+            });
     }
 
     /* --------------
@@ -73,8 +70,7 @@ module.exports = function (callback) {
 
         return gulp.src('examples/**/*.*', { encoding: false })
             .pipe(gulp.dest(output.examples))
-            .pipe(print(log.created))
-        ;
+            .pipe(print(log.created));
     }
 
     /* --------------
@@ -87,8 +83,7 @@ module.exports = function (callback) {
 
         return gulp.src('src/**/*.*', { encoding: false })
             .pipe(gulp.dest(output.less))
-            .pipe(print(log.created))
-        ;
+            .pipe(print(log.created));
     }
 
     /* --------------

package/tasks/docs/metadata.js

@@ -2,12 +2,10 @@
            Summarize Docs
 *******************************/
 
-const
-    // node dependencies
-    fs           = require('fs'),
-    console      = require('@fomantic/better-console'),
-    YAML         = require('yamljs')
-;
+// node dependencies
+const console = require('@fomantic/better-console');
+const path = require('node:path');
+const YAML = require('js-yaml');
 
 let data = {};
 
@@ -33,7 +31,7 @@ function inArray(needle, haystack) {
 }
 
 /**
- * Parses a file for metadata and stores result in data object.
+ * Parses a file for metadata and stores result in a data object.
  * @param {File} file - object provided by map-stream.
  * @param {function(?,File)} - callback provided by map-stream to
  * reply when done.
@@ -49,14 +47,12 @@ function parser(file, callback) {
     }
 
     try {
-        let
-            /** @type {string} */
-            text     = String(file.contents.toString('utf8')),
-            lines    = text.split('\n'),
-            filename = file.path.slice(0, -4),
-            key      = 'server/documents',
-            position = filename.indexOf(key)
-        ;
+        /** @type {string} */
+        let text = String(file.contents.toString('utf8'));
+        let lines = text.split('\n');
+        let filename = file.path.slice(0, -4);
+        let key = 'server' + path.sep + 'documents';
+        let position = filename.indexOf(key);
 
         // exit conditions
         if (!lines) {
@@ -66,24 +62,22 @@ function parser(file, callback) {
             return callback(null, file);
         }
 
-        filename = filename.slice(position + key.length + 1, filename.length);
-
-        let
-            lineCount = lines.length,
-            active    = false,
-            yaml      = [],
-            categories = [
-                'UI Element',
-                'UI Global',
-                'UI Collection',
-                'UI View',
-                'UI Module',
-                'UI Behavior',
-            ],
-            index,
-            meta,
-            line
-        ;
+        filename = filename.slice(position + key.length + 1, filename.length).replaceAll(path.win32.sep, path.posix.sep);
+
+        let lineCount = lines.length;
+        let active = false;
+        let yaml = [];
+        let categories = [
+            'UI Element',
+            'UI Global',
+            'UI Collection',
+            'UI View',
+            'UI Module',
+            'UI Behavior',
+        ];
+        let index;
+        let meta;
+        let line;
 
         for (index = 0; index < lineCount; index++) {
             line = lines[index];
@@ -104,16 +98,13 @@ function parser(file, callback) {
         }
 
         // Parse yaml.
-        meta = YAML.parse(yaml.join('\n'));
+        meta = YAML.load(yaml.join('\n'));
         if (meta && meta.type && meta.title && inArray(meta.type, categories)) {
             meta.category = meta.type;
             meta.filename = filename;
             meta.url = '/' + filename;
-            // Primary key will by filepath
-            data[meta.element] = meta;
-        } else {
-            // skip
-            // console.log(meta);
+            // Primary key will be filepath
+            data[meta.element.toLowerCase()] = meta;
         }
     } catch (error) {
         console.log(error, file.path);

package/tasks/docs/serve.js

@@ -2,32 +2,30 @@
  Serve Docs
  *******************************/
 
-const
-    extend      = require('extend'),
+const extend = require('extend');
 
-    // node dependencies
-    console     = require('@fomantic/better-console'),
-    gulp        = require('gulp'),
+// node dependencies
+const console = require('@fomantic/better-console');
+const gulp = require('gulp');
 
-    // gulp dependencies
-    print       = require('gulp-print').default,
+// gulp dependencies
+const print = require('gulp-print').default;
 
-    // user config
-    configDocs      = require('../config/docs'),
+// user config
+const configDocs = require('../config/docs');
 
-    // task config
-    tasks       = require('../config/tasks'),
-    configSetup = require('../config/project/config'),
+// task config
+const tasks = require('../config/tasks');
+const configSetup = require('../config/project/config');
 
-    // shorthand
-    log         = tasks.log,
+// shorthand
+const log = tasks.log;
 
-    css         = require('../build/css'),
-    js          = require('../build/javascript'),
-    assets      = require('../build/assets')
-;
+const css = require('../build/css');
+const js = require('../build/javascript');
+const assets = require('../build/assets');
 
-module.exports = function () {
+module.exports = function (callback) {
     // use a different config
     const config = extend(true, {}, configDocs);
     configSetup.addDerivedValues(config);
@@ -52,10 +50,8 @@ module.exports = function () {
                 encoding: false,
             })
                 .pipe(gulp.dest(config.paths.output.less))
-                .pipe(print(log.created))
-            ;
-        })
-    ;
+                .pipe(print(log.created));
+        });
 
     /* --------------
       Copy Examples
@@ -74,10 +70,8 @@ module.exports = function () {
                 encoding: false,
             })
                 .pipe(gulp.dest(config.paths.output.examples))
-                .pipe(print(log.created))
-            ;
-        })
-    ;
+                .pipe(print(log.created));
+        });
 
     /* --------------
         Watch CSS
@@ -96,4 +90,6 @@ module.exports = function () {
     --------------- */
 
     assets.watch('docs', config);
+
+    callback();
 };