fomantic-ui 2.10.0-beta.3 → 2.10.0-beta.5

package/tasks/admin/distributions/update.js

@@ -8,7 +8,7 @@
 
   * Commits changes from create repo
   * Pushes changes to GitHub
-  * Tag new releases if version changed in main repo
+  * Tag new releases if the version changed in main repo
 
 */
 
@@ -40,7 +40,6 @@ module.exports = function (callback) {
         index = -1,
         total = release.distributions.length,
         timer,
-        stream,
         stepRepo
     ;
 
@@ -50,7 +49,7 @@ module.exports = function (callback) {
         return;
     }
 
-    // Do Git commands synchronously per distribution, to avoid issues
+    // Do the Git commands synchronously per distribution, to avoid issues
     stepRepo = function () {
         index += 1;
         if (index >= total) {
@@ -110,10 +109,10 @@ module.exports = function (callback) {
             gulp.src('./', gitOptions)
                 .pipe(git.add(gitOptions))
                 .pipe(git.commit(commitMessage, commitOptions), function () {})
-                .on('error', function (error) {
+                .on('error', function () {
                     // canProceed = false; bug in git commit <https://github.com/stevelacy/gulp-git/issues/49>
                 })
-                .on('finish', function (callback) {
+                .on('finish', function () {
                     if (canProceed) {
                         pushFiles();
                     } else {
@@ -127,7 +126,7 @@ module.exports = function (callback) {
         // push changes to remote
         function pushFiles() {
             console.info('Pushing files for ' + distribution);
-            git.push('origin', 'master', { args: '', cwd: outputDirectory }, function (error) {
+            git.push('origin', 'master', { args: '', cwd: outputDirectory }, function () {
                 console.info('Push completed successfully');
                 getSHA();
             });
@@ -148,10 +147,10 @@ module.exports = function (callback) {
             }
             github.repos.createRelease(releaseOptions, function () {
                 nextRepo();
-            });
+            }).then();
         }
 
-        // Steps to next repository
+        // Steps to the next repository
         function nextRepo() {
             console.log('Sleeping for 1 second...');
             // avoid rate throttling

package/tasks/admin/publish.js

@@ -15,6 +15,6 @@ const gulp = require('gulp');
 module.exports = function (callback) {
     gulp.series(
         'update distributions', // commit less/css versions to github
-        'update components' // commit components to github
+        'update components' // commit components to GitHub
     )(callback);
 };

package/tasks/admin/register.js

@@ -4,8 +4,8 @@
 
 /*
   Task to register component repos with Package Managers
-  * Registers component with bower
-  * Registers component with NPM
+  * Registers a component with bower
+  * Registers a component with NPM
 */
 
 // node dependencies
@@ -20,14 +20,13 @@ let
     total   = repos.length,
     index   = -1,
 
-    stream,
     stepRepo
 ;
 
 module.exports = function (callback) {
     console.log('Registering repos with package managers');
 
-    // Do Git commands synchronously per component, to avoid issues
+    // Do the Git commands synchronously per component, to avoid issues
     stepRepo = function () {
         index += 1;
         if (index >= total) {

package/tasks/admin/release.js

@@ -16,9 +16,9 @@ const gulp = require('gulp');
 module.exports = function (callback) {
     gulp.series(
         // 'build', // build Fomantic
-        'init distributions', // sync with current github version
+        'init distributions', // sync with the current GitHub version
         'create distributions', // update each repo with changes from master repo
-        'init components', // sync with current github version
+        'init components', // sync with the current GitHub version
         'create components' // update each repo
     )(callback);
 };

package/tasks/build/css.js

@@ -45,7 +45,7 @@ const
 ;
 
 /**
- * Builds the css
+ * Builds the CSS
  * @param src
  * @param type
  * @param compress
@@ -88,7 +88,7 @@ function build(src, type, compress, config, opts) {
 
 /**
  * Packages the css files in dist
- * @param {string} type - type of the css processing (none, rtl, docs)
+ * @param {string} type - type of the CSS processing (none, rtl, docs)
  * @param {boolean} compress - should the output be compressed
  */
 function pack(type, compress) {
@@ -273,7 +273,7 @@ module.exports.watch = function (type, config) {
                 lessPath = path;
             }
 
-            // Add file to internal changed files array
+            // Add the file to the internal changed files array
             if (!files.includes(lessPath)) {
                 files.push(lessPath);
             }
@@ -284,12 +284,12 @@ module.exports.watch = function (type, config) {
                 const buildFiles = [...files];
                 // Call method
                 gulp.series((callback) => method(buildFiles, callback))();
-                // Reset internal changed files array
+                // Reset the internal changed files array
                 files = [];
             }, 1000);
         })
     ;
 };
 
-// Expose build css method
+// Expose build CSS method
 module.exports.buildCSS = buildCSS;

package/tasks/build/javascript.js

@@ -41,7 +41,7 @@ const
 ;
 
 /**
- * Concat and uglify the Javascript files
+ * Concat and uglify the JavaScript files
  * @param {string|array} src - source files
  * @param type
  * @param config
@@ -65,7 +65,7 @@ function build(src, type, config) {
 }
 
 /**
- * Packages the Javascript files in dist
+ * Packages the JavaScript files in dist
  * @param {string} type - type of the js processing (none, rtl, docs)
  * @param {boolean} compress - should the output be compressed
  */
@@ -151,7 +151,7 @@ module.exports.watch = function (type, config) {
                 clearTimeout(timeout);
             }
 
-            // Add file to internal changed files array
+            // Add the file to the internal changed files array
             if (!files.includes(path)) {
                 files.push(path);
             }

package/tasks/check-install.js

@@ -4,7 +4,6 @@
 
 const
     // node dependencies
-    gulp    = require('gulp'),
     console = require('@fomantic/better-console'),
     isSetup = require('./config/project/install').isSetup,
 

package/tasks/clean.js

@@ -3,12 +3,12 @@
 *******************************/
 
 const
-    del    = require('del'),
-    config = require('./config/user'),
-    tasks  = require('./config/tasks')
+    fs    = require('fs-extra'),
+    config = require('./config/user')
 ;
 
 // cleans distribution files
-module.exports = function () {
-    return del([config.paths.clean], tasks.settings.del);
+module.exports = function (callback) {
+    fs.removeSync(config.paths.clean);
+    callback();
 };

package/tasks/collections/admin.js

@@ -19,7 +19,7 @@ const
 ;
 
 /*
-  This are tasks to be run by project maintainers
+  These are tasks to be run by project maintainers
   - Creating Component Repos
   - Syncing with GitHub via APIs
   - Modifying package files

package/tasks/collections/docs.js

@@ -14,8 +14,8 @@ const
 */
 module.exports = function (gulp) {
     gulp.task('serve-docs', serveDocs);
-    gulp.task('serve-docs').description = 'Serve file changes to SUI Docs';
+    gulp.task('serve-docs').description = 'Serve file changes to FUI Docs';
 
     gulp.task('build-docs', buildDocs);
-    gulp.task('build-docs').description = 'Build all files and add to SUI Docs';
+    gulp.task('build-docs').description = 'Build all files and add to FUI Docs';
 };

package/tasks/config/admin/github.js

@@ -20,16 +20,8 @@ if (!oAuth) {
     console.error('Must add oauth token for GitHub in tasks/config/admin/oauth.js');
 }
 
-let github = new GithubAPI({
-    version: '3.0.0',
-    debug: true,
-    protocol: 'https',
-    timeout: 5000,
-});
-
-github.authenticate({
-    type: 'oauth',
-    token: oAuth.token,
+let github = new GithubAPI.Octokit({
+    auth: oAuth.token,
 });
 
 module.exports = github;

package/tasks/config/admin/templates/README.md

@@ -2,7 +2,7 @@
 
 This repository contains pre-compiled {component} files using the default themes. This is intended for use in projects that do not need all the bells and whistles of Fomantic UI, and want to keep file size to a minimum.
 
-For the latest changes please see the [Release Notes](https://github.com/fomantic/UI-{Component}/blob/master/RELEASE-NOTES.md)
+For the latest changes, please see the [Release Notes](https://github.com/fomantic/UI-{Component}/blob/master/RELEASE-NOTES.md)
 
 **Special Note**
 An update in `2.0.8` has fixed an issue which may have prevented some single component modules from working correctly. Please see notes in [this pull request](https://github.com/Semantic-Org/Semantic-UI/pull/2816).
@@ -27,6 +27,6 @@ meteor add fomantic:ui-{component}
 
 ## Addendum
 
-This element's definitions (required class names, html structures) are available in the [UI Docs](https://www.fomantic-ui.com)
+This element's definitions (required class names, HTML structures) are available in the [UI Docs](https://www.fomantic-ui.com)
 
 Please consider checking out [all the benefits to theming](http://www.learnsemantic.com/guide/expert.html) before using these stand-alone releases.

package/tasks/config/admin/templates/bower.json

@@ -4,11 +4,8 @@
   "homepage"    : "https://www.fomantic-ui.com",
   "author": {
     "name" : "Jack Lukic",
-    "web"  : "http://www.jacklukic.com"
+    "web"  : "https://www.jacklukic.com"
   },
-  "ignore": [
-    "./index.js"
-  ],
   "keywords": [
     "fomantic",
     "semantic",
@@ -20,6 +17,7 @@
     "https://github.com/fomantic/Fomantic-UI/blob/master/LICENSE.md"
   ],
   "ignore": [
+    "./index.js",
     "docs",
     "node",
     "server",

package/tasks/config/admin/templates/composer.json

@@ -6,7 +6,7 @@
     {
       "name" : "Jack Lukic",
       "email": "jacklukic@gmail.com",
-      "homepage"  : "http://www.jacklukic.com",
+      "homepage"  : "https://www.jacklukic.com",
       "role" : "Creator"
     }
   ],

package/tasks/config/admin/templates/css-package.js

@@ -16,7 +16,6 @@ Package.onUse(function (api) {
 
     api.addAssets([
         // icons
-        'themes/default/assets/fonts/icons.woff',
         'themes/default/assets/fonts/icons.woff2',
     ], 'client');
 

package/tasks/config/project/config.js

@@ -24,7 +24,7 @@ module.exports = {
                     currentPath   = path.normalize(path.join(directory, file))
                 ;
                 if (fs.existsSync(currentPath)) {
-                    // found file
+                    // found the file
                     configPath = path.normalize(directory);
                 } else {
                     // reached file system root, let's stop
@@ -37,7 +37,7 @@ module.exports = {
             }
         ;
 
-        // start walk from outside require-dot-files directory
+        // start the walk from outside require-dot-files directory
         file = file || defaults.files.config;
         directory = directory || path.join(__dirname, path.sep, '..');
         walk(directory);
@@ -81,7 +81,7 @@ module.exports = {
              CSS URLs
         --------------- */
 
-        // determine asset paths in css by finding relative path between themes and output
+        // determine asset paths in CSS by finding relative path between themes and output
         // force forward slashes
 
         config.paths.assets = {
@@ -99,7 +99,7 @@ module.exports = {
             config.hasPermissions = true;
             config.parsedPermissions = typeof config.permission === 'string' ? parseInt(config.permission, 8) : config.permission;
         } else {
-            // pass blank object to avoid causing errors
+            // pass a blank object to avoid causing errors
             config.permission = {};
             config.hasPermissions = false;
             config.parsedPermissions = {};
@@ -113,7 +113,7 @@ module.exports = {
             config.globs = {};
         }
 
-        // remove duplicates from component array
+        // remove duplicates from the component array
         if (Array.isArray(config.components)) {
             config.components = config.components.filter(function (component, index) {
                 return config.components.indexOf(component) === index;
@@ -128,7 +128,7 @@ module.exports = {
             : [];
         const componentsExceptIndividuals = components.filter((component) => !individuals.includes(component));
 
-        // takes component object and creates file glob matching selected components
+        // takes the 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

package/tasks/config/project/install.js

@@ -3,7 +3,6 @@
 *******************************/
 
 const
-    fs             = require('fs'),
     path           = require('path'),
     requireDotFile = require('require-dot-file'),
     defaults       = require('../defaults'),
@@ -126,7 +125,7 @@ module.exports = {
                 return walk(nextDirectory);
             }
         ;
-        // start walk from current directory if none specified
+        // start walk from the current directory if none specified
         directory = directory || path.join(__dirname, path.sep);
 
         return walk(directory);
@@ -191,7 +190,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
@@ -753,7 +752,7 @@ module.exports = {
         /* Copy Install Folders */
         wrench: {
 
-            // overwrite existing files update & install (default theme / definition)
+            // overwrite existing files update and install (default theme / definition)
             overwrite: {
                 forceDelete: true,
                 excludeHiddenUnix: true,

package/tasks/config/project/release.js

@@ -29,7 +29,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

@@ -18,8 +18,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 +46,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 +58,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 +85,6 @@ module.exports = {
 
     settings: {
 
-        /* Remove Files in Clean */
-        del: {
-            silent: true,
-        },
-
         concatCSS: {
             rebaseUrls: false,
         },

package/tasks/config/user.js

@@ -4,8 +4,6 @@
 
 const
     // npm dependencies
-    fs              = require('fs'),
-    path            = require('path'),
     extend          = require('extend'),
     requireDotFile  = require('require-dot-file'),
 
@@ -16,7 +14,7 @@ const
 
 let
     // Final config object
-    gulpConfig = {},
+    gulpConfig,
 
     // semantic.json settings
     userConfig
@@ -27,7 +25,7 @@ let
 *******************************/
 
 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/metadata.js

@@ -4,9 +4,9 @@
 
 const
     // node dependencies
-    fs           = require('fs'),
     console      = require('@fomantic/better-console'),
-    YAML         = require('yamljs')
+    path = require('path'),
+    YAML         = require('js-yaml')
 ;
 
 let data = {};
@@ -33,7 +33,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.
@@ -54,7 +54,7 @@ function parser(file, callback) {
             text     = String(file.contents.toString('utf8')),
             lines    = text.split('\n'),
             filename = file.path.slice(0, -4),
-            key      = 'server/documents',
+            key      = 'server' + path.sep + 'documents',
             position = filename.indexOf(key)
         ;
 
@@ -66,7 +66,7 @@ function parser(file, callback) {
             return callback(null, file);
         }
 
-        filename = filename.slice(position + key.length + 1, filename.length);
+        filename = filename.slice(position + key.length + 1, filename.length).replaceAll(path.win32.sep, path.posix.sep);
 
         let
             lineCount = lines.length,
@@ -104,16 +104,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

@@ -27,7 +27,7 @@ const
     assets      = require('../build/assets')
 ;
 
-module.exports = function () {
+module.exports = function (callback) {
     // use a different config
     const config = extend(true, {}, configDocs);
     configSetup.addDerivedValues(config);
@@ -96,4 +96,6 @@ module.exports = function () {
     --------------- */
 
     assets.watch('docs', config);
+
+    callback();
 };

package/tasks/install.js

@@ -9,21 +9,18 @@
 
    * (NPM) Install - Will ask for where to put fomantic (outside pm folder)
    * (NPM) Upgrade - Will look for fomantic install, copy over files and update if new version
-   * Standard installer runs asking for paths to site files etc
+   * Standard installer runs asking for paths to site files etc.
 */
 
 const
     // node dependencies
-    fs             = require('fs'),
+    fs             = require('fs-extra'),
     path           = require('path'),
-    mkdirp         = require('mkdirp'),
     extend         = require('extend'),
     console        = require('@fomantic/better-console'),
     gulp           = require('gulp'),
 
     // gulp dependencies
-    chmod          = require('gulp-chmod'),
-    del            = require('del'),
     jsonEditor     = require('gulp-json-editor'),
     plumber        = require('@fomantic/gulp-plumber'),
     inquirer       = require('inquirer'),
@@ -35,9 +32,6 @@ const
     // install config
     install        = require('./config/project/install'),
 
-    // user config
-    config         = require('./config/user'),
-
     // release config (name/title/etc)
     release        = require('./config/project/release'),
 
@@ -76,7 +70,7 @@ module.exports = function (callback) {
         return;
     }
 
-    if (!fs.existsSync(source.site)) {
+    if (!fs.pathExistsSync(source.site)) {
         console.log('Missing _site folder. \u001B[92mgulp install\u001B[0m must run inside \u001B[92mnode_modules' + path.sep + 'fomantic-ui\u001B[0m');
         console.error('Aborting.');
         callback();
@@ -105,7 +99,7 @@ module.exports = function (callback) {
         ;
 
         // duck-type if there is a project installed
-        if (fs.existsSync(updatePaths.definition)) {
+        if (fs.pathExistsSync(updatePaths.definition)) {
             // perform update if new version
             if (currentConfig.version !== release.version) {
                 console.log('Updating Fomantic UI from ' + currentConfig.version + ' to ' + release.version);
@@ -179,7 +173,7 @@ module.exports = function (callback) {
             .replace('{packageMessage}', 'We detected you are using ' + manager.name + ' Nice!')
             .replace('{root}', manager.root)
         ;
-        // set default path to detected PM root
+        // set default path to the detected PM root
         rootQuestions[0].default = manager.root;
         rootQuestions[1].default = manager.root;
 
@@ -253,7 +247,7 @@ module.exports = function (callback) {
 
         // Check if PM install
         if (manager && (answers.useRoot || answers.customRoot)) {
-            // Set root to custom root path if set
+            // Set root to the custom root path if set
             if (answers.customRoot) {
                 if (answers.customRoot === '') {
                     console.log('Unable to proceed, invalid project root');
@@ -290,10 +284,10 @@ module.exports = function (callback) {
 
             // create project folders
             try {
-                mkdirp.sync(installFolder);
-                mkdirp.sync(installPaths.definition);
-                mkdirp.sync(installPaths.theme);
-                mkdirp.sync(installPaths.tasks);
+                fs.mkdirpSync(installFolder);
+                fs.mkdirpSync(installPaths.definition);
+                fs.mkdirpSync(installPaths.theme);
+                fs.mkdirpSync(installPaths.tasks);
             } catch (error) {
                 console.error('NPM does not have permissions to create folders at your specified path. Adjust your folders permissions and run "npm install" again');
             }
@@ -338,7 +332,7 @@ module.exports = function (callback) {
         --------------- */
 
         // Copy _site templates folder to destination
-        if (fs.existsSync(installPaths.site)) {
+        if (fs.pathExistsSync(installPaths.site)) {
             console.info('Site folder exists, merging files (no overwrite)', installPaths.site);
         } else {
             console.info('Creating site theme folder', installPaths.site);
@@ -360,7 +354,7 @@ module.exports = function (callback) {
             // rewrite site variable in theme.less
             console.info('Adjusting @siteFolder to:', pathToSite + '/');
 
-            if (fs.existsSync(installPaths.themeConfig)) {
+            if (fs.pathExistsSync(installPaths.themeConfig)) {
                 console.info('Modifying src/theme.config (LESS config)', installPaths.themeConfig);
 
                 return gulp.src(installPaths.themeConfig)
@@ -390,7 +384,7 @@ module.exports = function (callback) {
             ;
 
             // adjust variables in theme.less
-            if (fs.existsSync(installPaths.config)) {
+            if (fs.pathExistsSync(installPaths.config)) {
                 console.info('Extending config file (semantic.json)', installPaths.config);
 
                 return gulp.src(installPaths.config)
@@ -431,7 +425,7 @@ module.exports = function (callback) {
                 inquirer.prompt(questions.cleanup)
                     .then((answers) => {
                         if (answers.cleanup === 'yes') {
-                            del(install.setupFiles);
+                            install.setupFiles.forEach((file) => fs.removeSync(file));
                         }
                         if (answers.build === 'yes') {
                             gulp.series('build')(callback);