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

package/tasks/admin/components/update.js

@@ -8,41 +8,36 @@
 
   * 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
 
 */
 
-const
-    // node dependencies
-    fs             = require('fs'),
-    path           = require('path'),
-    console        = require('@fomantic/better-console'),
-    gulp           = require('gulp'),
-    git            = require('@fomantic/gulp-git'),
+// node dependencies
+const fs = require('node:fs');
+const path = require('node:path');
+const console = require('@fomantic/better-console');
+const gulp = require('gulp');
+const git = require('@fomantic/gulp-git');
 
-    // admin files
-    release        = require('../../config/admin/release'),
-    project        = require('../../config/project/release'),
+// admin files
+const release = require('../../config/admin/release');
+const project = require('../../config/project/release');
 
-    // oAuth configuration for GitHub
-    oAuth          = fs.existsSync(path.join(__dirname, '/../../config/admin/oauth.js'))
-        ? require('../../config/admin/oauth.js') // eslint-disable-line import/extensions
-        : false,
+// oAuth configuration for GitHub
+const oAuth = fs.existsSync(path.join(__dirname, '/../../config/admin/oauth.js'))
+    ? require('../../config/admin/oauth.js') // eslint-disable-line import/extensions
+    : false;
 
-    // shorthand
-    version = project.version
-;
+// shorthand
+const version = project.version;
 
 module.exports = function (callback) {
     const github = require('../../config/admin/github'); // eslint-disable-line global-require
 
-    let
-        index = -1,
-        total = release.components.length,
-        timer,
-        stream,
-        stepRepo
-    ;
+    let index = -1;
+    let total = release.components.length;
+    let timer;
+    let stepRepo;
 
     if (!oAuth) {
         console.error('Must add oauth token for GitHub in tasks/config/admin/oauth.js');
@@ -50,7 +45,7 @@ module.exports = function (callback) {
         return;
     }
 
-    // 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) {
@@ -59,41 +54,36 @@ module.exports = function (callback) {
             return;
         }
 
-        let
-            component            = release.components[index],
-            outputDirectory      = path.resolve(path.join(release.outputRoot, component)),
-            capitalizedComponent = component.charAt(0).toUpperCase() + component.slice(1),
-            repoName             = release.componentRepoRoot + capitalizedComponent,
+        let component = release.components[index];
+        let outputDirectory = path.resolve(path.join(release.outputRoot, component));
+        let capitalizedComponent = component.charAt(0).toUpperCase() + component.slice(1);
+        let repoName = release.componentRepoRoot + capitalizedComponent;
 
-            gitURL               = 'https://github.com/' + release.org + '/' + repoName + '.git',
-            repoURL              = 'https://github.com/' + release.org + '/' + repoName + '/',
+        let commitArgs = oAuth.name !== undefined && oAuth.email !== undefined
+            ? '--author "' + oAuth.name + ' <' + oAuth.email + '>"'
+            : '';
 
-            commitArgs = oAuth.name !== undefined && oAuth.email !== undefined
-                ? '--author "' + oAuth.name + ' <' + oAuth.email + '>"'
-                : '',
+        let componentPackage = fs.existsSync(outputDirectory + 'package.json')
+            ? require(outputDirectory + 'package.json') // eslint-disable-line global-require, import/no-dynamic-require
+            : false;
 
-            componentPackage = fs.existsSync(outputDirectory + 'package.json')
-                ? require(outputDirectory + 'package.json') // eslint-disable-line global-require, import/no-dynamic-require
-                : false,
+        let isNewVersion = version && componentPackage.version !== version;
 
-            isNewVersion  = version && componentPackage.version !== version,
+        let commitMessage = isNewVersion
+            ? 'Updated component to version ' + version
+            : 'Updated files from main repo';
 
-            commitMessage = isNewVersion
-                ? 'Updated component to version ' + version
-                : 'Updated files from main repo',
+        let gitOptions = { cwd: outputDirectory };
+        let commitOptions = { args: commitArgs, cwd: outputDirectory };
+        let releaseOptions = { tag_name: version, owner: release.org, repo: repoName };
 
-            gitOptions      = { cwd: outputDirectory },
-            commitOptions   = { args: commitArgs, cwd: outputDirectory },
-            releaseOptions  = { tag_name: version, owner: release.org, repo: repoName },
+        let fileModeOptions = { args: 'config core.fileMode false', cwd: outputDirectory };
+        let usernameOptions = { args: 'config user.name "' + oAuth.name + '"', cwd: outputDirectory };
+        let emailOptions = { args: 'config user.email "' + oAuth.email + '"', cwd: outputDirectory };
+        let versionOptions = { args: 'rev-parse --verify HEAD', cwd: outputDirectory };
 
-            fileModeOptions = { args: 'config core.fileMode false', cwd: outputDirectory },
-            usernameOptions = { args: 'config user.name "' + oAuth.name + '"', cwd: outputDirectory },
-            emailOptions    = { args: 'config user.email "' + oAuth.email + '"', cwd: outputDirectory },
-            versionOptions =  { args: 'rev-parse --verify HEAD', cwd: outputDirectory },
-
-            localRepoSetup  = fs.existsSync(path.join(outputDirectory, '.git')),
-            canProceed      = true
-        ;
+        let localRepoSetup = fs.existsSync(path.join(outputDirectory, '.git'));
+        let canProceed = true;
 
         console.info('Processing repository:' + outputDirectory);
 
@@ -114,24 +104,23 @@ 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 {
                         console.info('Nothing new to commit');
                         nextRepo();
                     }
-                })
-            ;
+                });
         }
 
         // push changes to remote
         function pushFiles() {
             console.info('Pushing files for ' + component);
-            git.push('origin', 'master', { args: '', cwd: outputDirectory }, function (error) {
+            git.push('origin', 'master', { args: '', cwd: outputDirectory }, function () {
                 console.info('Push completed successfully');
                 getSHA();
             });
@@ -152,10 +141,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/distributions/create.js

@@ -9,88 +9,66 @@
   * update package.json file
 */
 
-const
-    // node dependencies
-    fs              = require('fs'),
-    path            = require('path'),
-    gulp            = require('gulp'),
-    mergeStream     = require('merge-stream'),
-
-    // admin dependencies
-    flatten         = require('gulp-flatten'),
-    jsonEditor      = require('gulp-json-editor'),
-    plumber         = require('@fomantic/gulp-plumber'),
-    rename          = require('gulp-rename'),
-    replace         = require('gulp-replace'),
-
-    // config
-    config          = require('../../config/user'),
-    release         = require('../../config/admin/release'),
-    project         = require('../../config/project/release'),
-
-    // shorthand
-    version         = project.version,
-    output          = config.paths.output
-;
+// node dependencies
+const fs = require('node:fs');
+const path = require('node:path');
+const gulp = require('gulp');
+const mergeStream = require('merge-stream');
+
+// admin dependencies
+const flatten = require('gulp-flatten');
+const jsonEditor = require('gulp-json-editor');
+const plumber = require('@fomantic/gulp-plumber');
+const rename = require('gulp-rename');
+const replace = require('gulp-replace');
+
+// config
+const release = require('../../config/admin/release');
+const project = require('../../config/project/release');
+
+// shorthand
+const version = project.version;
 
 module.exports = function (callback) {
-    let
-        stream,
-        index,
-        tasks = []
-    ;
+    let index;
+    let tasks = [];
 
     for (index in release.distributions) {
-        let
-            distribution = release.distributions[index]
-    ;
+        let distribution = release.distributions[index];
 
         // streams... designed to save time and make coding fun...
         (function (distribution) {
-            let
-                distLowerCase   = distribution.toLowerCase(),
-                outputDirectory = path.join(release.outputRoot, distLowerCase),
-                packageFile     = path.join(outputDirectory, release.files.npm),
-                repoName        = release.distRepoRoot + distribution,
-                regExp          = {
-                    match: {
-                        files: '{files}',
-                        version: '{version}',
-                    },
+            let distLowerCase = distribution.toLowerCase();
+            let outputDirectory = path.join(release.outputRoot, distLowerCase);
+            let packageFile = path.join(outputDirectory, release.files.npm);
+            let regExp = {
+                match: {
+                    files: '{files}',
+                    version: '{version}',
                 },
-                task = {
-                    all: distribution + ' copying files',
-                    repo: distribution + ' create repo',
-                    meteor: distribution + ' create meteor package.js',
-                    package: distribution + ' create package.json',
-                },
-                gatherFiles,
-                createList
-            ;
+            };
+            let gatherFiles;
+            let createList;
 
             // get files for meteor
             gatherFiles = function (dir) {
                 dir = dir || path.resolve('.');
-                let
-                    list  = fs.readdirSync(dir),
-                    omitted = [
-                        '.git',
-                        'node_modules',
-                        'package.js',
-                        'LICENSE',
-                        'README.md',
-                        'package.json',
-                        'bower.json',
-                        '.gitignore',
-                    ],
-                    files = []
-                ;
+                let list = fs.readdirSync(dir);
+                let omitted = [
+                    '.git',
+                    'node_modules',
+                    'package.js',
+                    'LICENSE',
+                    'README.md',
+                    'package.json',
+                    'bower.json',
+                    '.gitignore',
+                ];
+                let files = [];
                 list.forEach(function (file) {
-                    let
-                        isOmitted = omitted.indexOf(file) > -1,
-                        filePath  = path.join(dir, file),
-                        stat      = fs.statSync(filePath)
-                    ;
+                    let isOmitted = omitted.indexOf(file) > -1;
+                    let filePath = path.join(dir, file);
+                    let stat = fs.statSync(filePath);
                     if (!isOmitted) {
                         if (stat && stat.isDirectory()) {
                             files = files.concat(gatherFiles(filePath));
@@ -115,71 +93,54 @@ module.exports = function (callback) {
             };
 
             tasks.push(function () {
-                let
-                    files     = gatherFiles(outputDirectory),
-                    filenames = createList(files)
-                ;
+                let files = gatherFiles(outputDirectory);
+                let filenames = createList(files);
                 gulp.src(release.templates.meteor[distLowerCase])
                     .pipe(plumber())
                     .pipe(flatten())
                     .pipe(replace(regExp.match.version, version))
                     .pipe(replace(regExp.match.files, filenames))
                     .pipe(rename(release.files.meteor))
-                    .pipe(gulp.dest(outputDirectory))
-                ;
+                    .pipe(gulp.dest(outputDirectory));
             });
 
             if (distribution === 'CSS') {
                 tasks.push(function () {
-                    let
-                        themes,
-                        components,
-                        releases
-                    ;
+                    let themes;
+                    let components;
+                    let releases;
                     themes = gulp.src('dist/themes/default/**/*', { base: 'dist/', encoding: false })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
                     components = gulp.src('dist/components/*', { base: 'dist/' })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
                     releases = gulp.src('dist/*', { base: 'dist/' })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
 
                     return mergeStream(themes, components, releases);
                 });
             } else if (distribution === 'LESS') {
                 tasks.push(function () {
-                    let
-                        definitions,
-                        overridesImport,
-                        lessImport,
-                        themeImport,
-                        themeConfig,
-                        siteTheme,
-                        themes
-                    ;
+                    let definitions;
+                    let overridesImport;
+                    let lessImport;
+                    let themeImport;
+                    let themeConfig;
+                    let siteTheme;
+                    let themes;
                     definitions = gulp.src('src/definitions/**/*', { base: 'src/' })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
                     overridesImport = gulp.src('src/overrides.less', { base: 'src/' })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
                     lessImport = gulp.src('src/semantic.less', { base: 'src/' })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
                     themeImport = gulp.src('src/theme.less', { base: 'src/' })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
                     themeConfig = gulp.src('src/theme.config.example', { base: 'src/' })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
                     siteTheme = gulp.src('src/_site/**/*', { base: 'src/' })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
                     themes = gulp.src('src/themes/**/*', { base: 'src/', encoding: false })
-                        .pipe(gulp.dest(outputDirectory))
-                    ;
+                        .pipe(gulp.dest(outputDirectory));
 
                     return mergeStream(definitions, overridesImport, lessImport, themeImport, themeConfig, siteTheme, themes);
                 });
@@ -196,8 +157,7 @@ module.exports = function (callback) {
 
                         return pkg;
                     }))
-                    .pipe(gulp.dest(outputDirectory))
-                ;
+                    .pipe(gulp.dest(outputDirectory));
             });
         })(distribution);
     }

package/tasks/admin/distributions/init.js

@@ -7,44 +7,30 @@
  This task pulls the latest version of distribution from GitHub
 
   * Creates new repo if doesn't exist (locally & GitHub)
-  * Adds remote it doesn't exists
+  * Adds remote it doesn't exist
   * Pulls latest changes from repo
 
 */
 
-const
-    // node dependencies
-    fs        = require('fs'),
-    path      = require('path'),
-    del       = require('del'),
-    console   = require('@fomantic/better-console'),
-    gulp      = require('gulp'),
-    git       = require('@fomantic/gulp-git'),
-    mkdirp    = require('mkdirp'),
-
-    // admin files
-    release   = require('../../config/admin/release'),
-    project   = require('../../config/project/release'),
-
-    // oAuth configuration for GitHub
-    oAuth     = fs.existsSync(path.join(__dirname, '/../../config/admin/oauth.js'))
-        ? require('../../config/admin/oauth.js') // eslint-disable-line import/extensions
-        : false,
-
-    // shorthand
-    version = project.version
-;
+// node dependencies
+const fs = require('fs-extra');
+const path = require('node:path');
+const console = require('@fomantic/better-console');
+const git = require('@fomantic/gulp-git');
 
-module.exports = function (callback) {
-    const github = require('../../config/admin/github'); // eslint-disable-line global-require
+// admin files
+const release = require('../../config/admin/release');
+
+// oAuth configuration for GitHub
+const oAuth = fs.pathExistsSync(path.join(__dirname, '/../../config/admin/oauth.js'))
+    ? require('../../config/admin/oauth.js') // eslint-disable-line import/extensions
+    : false;
 
-    let
-        index = -1,
-        total = release.distributions.length,
-        timer,
-        stream,
-        stepRepo
-    ;
+module.exports = function (callback) {
+    let index = -1;
+    let total = release.distributions.length;
+    let timer;
+    let stepRepo;
 
     if (!oAuth) {
         console.error('Must add oauth token for GitHub in tasks/config/admin/oauth.js');
@@ -62,31 +48,26 @@ module.exports = function (callback) {
             return;
         }
 
-        let
-            component          = release.distributions[index],
-            lowerCaseComponent = component.toLowerCase(),
-            outputDirectory    = path.resolve(release.outputRoot + lowerCaseComponent),
-            repoName           = release.distRepoRoot + component,
+        let component = release.distributions[index];
+        let lowerCaseComponent = component.toLowerCase();
+        let outputDirectory = path.resolve(release.outputRoot + lowerCaseComponent);
+        let repoName = release.distRepoRoot + component;
 
-            gitOptions         = { cwd: outputDirectory },
-            pullOptions        = { args: '-q', cwd: outputDirectory, quiet: true },
-            resetOptions       = { args: '-q --hard', cwd: outputDirectory, quiet: true },
-            gitURL             = 'git@github.com:' + release.org + '/' + repoName + '.git',
-            repoURL            = 'https://github.com/' + release.org + '/' + repoName + '/',
-            localRepoSetup     = fs.existsSync(path.join(outputDirectory, '.git'))
-        ;
+        let gitOptions = { cwd: outputDirectory };
+        let pullOptions = { args: '-q', cwd: outputDirectory, quiet: true };
+        let resetOptions = { args: '-q --hard', cwd: outputDirectory, quiet: true };
+        let gitURL = 'git@github.com:' + release.org + '/' + repoName + '.git';
+        let localRepoSetup = fs.pathExistsSync(path.join(outputDirectory, '.git'));
 
         console.log('Processing repository: ' + outputDirectory);
 
-        // create folder if doesn't exist
-        if (!fs.existsSync(outputDirectory)) {
-            mkdirp.sync(outputDirectory);
-        }
+        // create folder if it doesn't exist
+        fs.ensureDirSync(outputDirectory);
 
         // clean folder
         if (release.outputRoot.startsWith('../repos')) {
             console.info('Cleaning dir', outputDirectory);
-            del.sync([outputDirectory + '**/*'], { silent: true, force: true });
+            fs.removeSync(outputDirectory);
         }
 
         // set-up local repo
@@ -108,17 +89,6 @@ module.exports = function (callback) {
             });
         }
 
-        function createRepo() {
-            console.info('Creating GitHub repo ' + repoURL);
-            github.repos.createFromOrg({
-                org: release.org,
-                name: repoName,
-                homepage: release.homepage,
-            }, function () {
-                setupRepo();
-            });
-        }
-
         function addRemote() {
             console.info('Adding remote origin as ' + gitURL);
             git.addRemote('origin', gitURL, gitOptions, function () {
@@ -128,14 +98,14 @@ module.exports = function (callback) {
 
         function pullFiles() {
             console.info('Pulling ' + component + ' files');
-            git.pull('origin', 'master', pullOptions, function (error) {
+            git.pull('origin', 'master', pullOptions, function () {
                 resetFiles();
             });
         }
 
         function resetFiles() {
             console.info('Resetting files to head');
-            git.reset('HEAD', resetOptions, function (error) {
+            git.reset('HEAD', resetOptions, function () {
                 nextRepo();
             });
         }
@@ -153,7 +123,6 @@ module.exports = function (callback) {
             pullFiles();
         } else {
             setupRepo();
-            // createRepo() only use to create remote repo (easier to do manually)
         }
     };