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

package/tasks/install.js

@@ -9,56 +9,45 @@
 
    * (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'),
-    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'),
-    rename         = require('gulp-rename'),
-    replace        = require('gulp-replace'),
-    requireDotFile = require('require-dot-file'),
-    wrench         = require('wrench-sui'),
-
-    // install config
-    install        = require('./config/project/install'),
-
-    // user config
-    config         = require('./config/user'),
-
-    // release config (name/title/etc)
-    release        = require('./config/project/release'),
-
-    // shorthand
-    questions      = install.questions,
-    files          = install.files,
-    folders        = install.folders,
-    regExp         = install.regExp,
-    settings       = install.settings,
-    source         = install.source
-;
+// node dependencies
+const fs = require('fs-extra');
+const path = require('node:path');
+const extend = require('extend');
+const console = require('@fomantic/better-console');
+const gulp = require('gulp');
+
+// gulp dependencies
+const jsonEditor = require('gulp-json-editor');
+const plumber = require('@fomantic/gulp-plumber');
+const inquirer = require('inquirer');
+const rename = require('gulp-rename');
+const replace = require('gulp-replace');
+const requireDotFile = require('require-dot-file');
+
+// install config
+const install = require('./config/project/install');
+
+// release config (name/title/etc)
+const release = require('./config/project/release');
+
+// shorthand
+const questions = install.questions;
+const files = install.files;
+const folders = install.folders;
+const regExp = install.regExp;
+const settings = install.settings;
+const source = install.source;
 
 // Export install task
 module.exports = function (callback) {
-    let
-        currentConfig = requireDotFile('semantic.json', process.cwd()),
-        manager       = install.getPackageManager(),
-        rootQuestions = questions.root,
-        installFolder = false,
-        answers
-    ;
+    let currentConfig = requireDotFile('semantic.json', process.cwd());
+    let manager = install.getPackageManager();
+    let rootQuestions = questions.root;
+    let installFolder = false;
+    let answers;
 
     console.clear();
 
@@ -76,7 +65,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();
@@ -90,55 +79,50 @@ module.exports = function (callback) {
 
     // run update scripts if semantic.json exists
     if (currentConfig && manager.name === 'NPM') {
-        let
-            updateFolder = path.join(manager.root, currentConfig.base),
-            updatePaths  = {
-                config: path.join(manager.root, files.config),
-                tasks: path.join(updateFolder, folders.tasks),
-                overridesImport: path.join(updateFolder, folders.overridesImport),
-                themeImport: path.join(updateFolder, folders.themeImport),
-                definition: path.join(currentConfig.paths.source.definitions),
-                site: path.join(currentConfig.paths.source.site),
-                theme: path.join(currentConfig.paths.source.themes),
-                defaultTheme: path.join(currentConfig.paths.source.themes, folders.defaultTheme),
-            }
-        ;
+        let updateFolder = path.join(manager.root, currentConfig.base);
+        let updatePaths = {
+            config: path.join(manager.root, files.config),
+            tasks: path.join(updateFolder, folders.tasks),
+            overridesImport: path.join(updateFolder, folders.overridesImport),
+            themeImport: path.join(updateFolder, folders.themeImport),
+            definition: path.join(currentConfig.paths.source.definitions),
+            site: path.join(currentConfig.paths.source.site),
+            theme: path.join(currentConfig.paths.source.themes),
+            defaultTheme: path.join(currentConfig.paths.source.themes, folders.defaultTheme),
+        };
 
         // 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);
 
                 console.info('Updating ui definitions...');
-                wrench.copyDirSyncRecursive(source.definitions, updatePaths.definition, settings.wrench.overwrite);
+                fs.copySync(source.definitions, updatePaths.definition, settings.copy.overwrite);
 
                 console.info('Updating default theme...');
-                wrench.copyDirSyncRecursive(source.themes, updatePaths.theme, settings.wrench.merge);
-                wrench.copyDirSyncRecursive(source.defaultTheme, updatePaths.defaultTheme, settings.wrench.overwrite);
+                fs.copySync(source.themes, updatePaths.theme, settings.copy.merge);
+                fs.copySync(source.defaultTheme, updatePaths.defaultTheme, settings.copy.overwrite);
 
                 console.info('Updating tasks...');
-                wrench.copyDirSyncRecursive(source.tasks, updatePaths.tasks, settings.wrench.overwrite);
+                fs.copySync(source.tasks, updatePaths.tasks, settings.copy.overwrite);
 
                 console.info('Updating gulpfile.js');
                 gulp.src(source.userGulpFile)
                     .pipe(plumber())
-                    .pipe(gulp.dest(updateFolder))
-                ;
+                    .pipe(gulp.dest(updateFolder));
 
                 // copy theme import
                 console.info('Updating theme import file');
                 gulp.src(source.themeImport)
                     .pipe(plumber())
-                    .pipe(gulp.dest(updatePaths.themeImport))
-                ;
+                    .pipe(gulp.dest(updatePaths.themeImport));
                 console.info('Updating overrides import file');
                 gulp.src(source.overridesImport)
                     .pipe(plumber())
-                    .pipe(gulp.dest(updatePaths.overridesImport))
-                ;
+                    .pipe(gulp.dest(updatePaths.overridesImport));
                 console.info('Adding new site theme files...');
-                wrench.copyDirSyncRecursive(source.site, updatePaths.site, settings.wrench.merge);
+                fs.copySync(source.site, updatePaths.site, settings.copy.merge);
 
                 console.info('Updating version...');
 
@@ -149,8 +133,7 @@ module.exports = function (callback) {
                     .pipe(jsonEditor({
                         version: release.version,
                     }))
-                    .pipe(gulp.dest(manager.root))
-                ;
+                    .pipe(gulp.dest(manager.root));
 
                 console.info('Update complete! Run "\u001B[92mgulp build\u001B[0m" to rebuild dist/ files.');
 
@@ -177,9 +160,8 @@ module.exports = function (callback) {
     if (manager.name === 'NPM') {
         rootQuestions[0].message = rootQuestions[0].message
             .replace('{packageMessage}', 'We detected you are using ' + manager.name + ' Nice!')
-            .replace('{root}', manager.root)
-        ;
-        // set default path to detected PM root
+            .replace('{root}', manager.root);
+        // set default path to the detected PM root
         rootQuestions[0].default = manager.root;
         rootQuestions[1].default = manager.root;
 
@@ -209,8 +191,7 @@ module.exports = function (callback) {
                 .then((setupAnswers) => {
                     // hoist
                     answers = setupAnswers;
-                })
-            ;
+                });
         }
     });
 
@@ -237,15 +218,13 @@ module.exports = function (callback) {
              Paths
         --------------- */
 
-        let
-            installPaths = {
-                config: files.config,
-                configFolder: folders.config,
-                site: answers.site || folders.site,
-                themeConfig: files.themeConfig,
-                themeConfigFolder: folders.themeConfig,
-            }
-        ;
+        let installPaths = {
+            config: files.config,
+            configFolder: folders.config,
+            site: answers.site || folders.site,
+            themeConfig: files.themeConfig,
+            themeConfigFolder: folders.themeConfig,
+        };
 
         /* --------------
            NPM Install
@@ -253,7 +232,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 +269,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');
             }
@@ -301,36 +280,32 @@ module.exports = function (callback) {
             console.log('Installing to \u001B[92m' + answers.semanticRoot + '\u001B[0m');
 
             console.info('Copying UI definitions');
-            wrench.copyDirSyncRecursive(source.definitions, installPaths.definition, settings.wrench.overwrite);
+            fs.copySync(source.definitions, installPaths.definition, settings.copy.overwrite);
 
             console.info('Copying UI themes');
-            wrench.copyDirSyncRecursive(source.themes, installPaths.theme, settings.wrench.merge);
-            wrench.copyDirSyncRecursive(source.defaultTheme, installPaths.defaultTheme, settings.wrench.overwrite);
+            fs.copySync(source.themes, installPaths.theme, settings.copy.merge);
+            fs.copySync(source.defaultTheme, installPaths.defaultTheme, settings.copy.overwrite);
 
             console.info('Copying gulp tasks');
-            wrench.copyDirSyncRecursive(source.tasks, installPaths.tasks, settings.wrench.overwrite);
+            fs.copySync(source.tasks, installPaths.tasks, settings.copy.overwrite);
 
             // copy theme import
             console.info('Adding theme files');
             gulp.src(source.themeImport)
                 .pipe(plumber())
-                .pipe(gulp.dest(installPaths.themeImport))
-            ;
+                .pipe(gulp.dest(installPaths.themeImport));
             gulp.src(source.overridesImport)
                 .pipe(plumber())
-                .pipe(gulp.dest(installPaths.overridesImport))
-            ;
+                .pipe(gulp.dest(installPaths.overridesImport));
             gulp.src(source.lessImport)
                 .pipe(plumber())
-                .pipe(gulp.dest(installPaths.lessImport))
-            ;
+                .pipe(gulp.dest(installPaths.lessImport));
 
             // create gulp file
             console.info('Creating gulpfile.js');
             gulp.src(source.userGulpFile)
                 .pipe(plumber())
-                .pipe(gulp.dest(installFolder))
-            ;
+                .pipe(gulp.dest(installFolder));
         }
 
         /* --------------
@@ -338,36 +313,33 @@ 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);
         }
-        wrench.copyDirSyncRecursive(source.site, installPaths.site, settings.wrench.merge);
+        fs.copySync(source.site, installPaths.site, settings.copy.merge);
 
         /* --------------
            Theme Config
         --------------- */
 
         gulp.task('create theme.config', function () {
-            let
-                // determine path to site theme folder from theme config
-                // force CSS path variable to use forward slashes for paths
-                pathToSite   = path.relative(path.resolve(installPaths.themeConfigFolder), path.resolve(installPaths.site)).replace(/\\/g, '/'),
-                siteVariable = "@siteFolder: '" + pathToSite + "/';"
-            ;
+            // determine path to site theme folder from theme config
+            // force CSS path variable to use forward slashes for paths
+            let pathToSite = path.relative(path.resolve(installPaths.themeConfigFolder), path.resolve(installPaths.site)).replace(/\\/g, '/');
+            let siteVariable = "@siteFolder: '" + pathToSite + "/';";
 
             // 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)
                     .pipe(plumber())
                     .pipe(replace(regExp.siteVariable, siteVariable))
-                    .pipe(gulp.dest(installPaths.themeConfigFolder))
-                ;
+                    .pipe(gulp.dest(installPaths.themeConfigFolder));
             }
 
             console.info('Creating src/theme.config (LESS config)', installPaths.themeConfig);
@@ -376,8 +348,7 @@ module.exports = function (callback) {
                 .pipe(plumber())
                 .pipe(rename({ extname: '' }))
                 .pipe(replace(regExp.siteVariable, siteVariable))
-                .pipe(gulp.dest(installPaths.themeConfigFolder))
-            ;
+                .pipe(gulp.dest(installPaths.themeConfigFolder));
         });
 
         /* --------------
@@ -385,20 +356,17 @@ module.exports = function (callback) {
         --------------- */
 
         gulp.task('create semantic.json', function () {
-            let
-                jsonConfig = install.createJSON(answers)
-            ;
+            let jsonConfig = install.createJSON(answers);
 
             // 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)
                     .pipe(plumber())
                     .pipe(rename(settings.rename.json)) // preserve file extension
                     .pipe(jsonEditor(jsonConfig))
-                    .pipe(gulp.dest(installPaths.configFolder))
-                ;
+                    .pipe(gulp.dest(installPaths.configFolder));
             }
 
             console.info('Creating config file (semantic.json)', installPaths.config);
@@ -407,8 +375,7 @@ module.exports = function (callback) {
                 .pipe(plumber())
                 .pipe(rename({ extname: '' })) // remove .template from ext
                 .pipe(jsonEditor(jsonConfig, { end_with_newline: true }))
-                .pipe(gulp.dest(installPaths.configFolder))
-            ;
+                .pipe(gulp.dest(installPaths.configFolder));
         });
 
         gulp.series('create theme.config', 'create semantic.json')(callback);
@@ -431,15 +398,14 @@ 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);
                         } else {
                             callback();
                         }
-                    })
-                ;
+                    });
             }
         }
     });

package/tasks/rtl/build.js

@@ -2,10 +2,8 @@
  *         Build Task
  *******************************/
 
-const
-    gulp = require('gulp'),
-    build = require('../build')
-;
+const gulp = require('gulp');
+const build = require('../build');
 
 // RTL builds are now handled by the default build process
 module.exports = function (callback) {

package/tasks/rtl/watch.js

@@ -2,12 +2,10 @@
  *          Watch Task
  *******************************/
 
-const
-    gulp = require('gulp'),
-    watch = require('../watch')
-;
+const gulp = require('gulp');
+const watch = require('../watch');
 
-// RTL watch are now handled by the default watch process
+// RTL watch is now handled by the default watch process
 module.exports = function (callback) {
     gulp.series(watch)(callback);
 };

package/tasks/watch.js

@@ -2,26 +2,24 @@
  *          Watch Task
  *******************************/
 
-const
-    // node dependencies
-    console    = require('@fomantic/better-console'),
-    gulp       = require('gulp'),
+// node dependencies
+const console = require('@fomantic/better-console');
 
-    // user config
-    config     = require('./config/user'),
+// user config
+const config = require('./config/user');
 
-    // task config
-    install    = require('./config/project/install'),
+// task config
+const install = require('./config/project/install');
 
-    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');
 
 // export task
-module.exports = function () {
+module.exports = function (callback) {
     if (!install.isSetup()) {
         console.error('Cannot watch files. Run "gulp install" to set-up Fomantic');
+        callback();
 
         return;
     }
@@ -45,4 +43,6 @@ module.exports = function () {
     --------------- */
 
     assets.watch('default', config);
+
+    callback();
 };

package/test/meteor/fonts.js

@@ -11,5 +11,4 @@
                 done();
             });
         });
-    })
-;
+    });

package/test/modules/module.spec.js

@@ -1,19 +1,17 @@
 function moduleTests(ui) {
-    let
-        module    = ui.module,
-        element   = ui.element,
-        singleton = ui.singleton,
-        name      = $.fn[module].settings.name,
-
-        testValue = 'Test',
-        fixtures  = jasmine.getFixtures(), // eslint-disable-line jest/no-jasmine-globals
-
-        originalSettings,
-        $modules,
-        $oneModule,
-        $module,
-        $clone
-    ;
+    let module = ui.module;
+    let element = ui.element;
+    let singleton = ui.singleton;
+    let name = $.fn[module].settings.name;
+
+    let testValue = 'Test';
+    let fixtures = jasmine.getFixtures(); // eslint-disable-line jest/no-jasmine-globals
+
+    let originalSettings;
+    let $modules;
+    let $oneModule;
+    let $module;
+    let $clone;
 
     // set fixture path
     fixtures.fixturesPath = 'base/test/fixtures/';
@@ -138,7 +136,7 @@ function moduleTests(ui) {
                 $modules[module]('setting', 'name', testValue);
 
                 let retrievedValue = $oneModule[module]('setting', 'name');
-                let clonedSetting  = $clone[module]('setting', 'name');
+                let clonedSetting = $clone[module]('setting', 'name');
 
                 expect(retrievedValue).toBe(testValue);
                 expect(clonedSetting).toBe(testValue);
@@ -156,7 +154,7 @@ function moduleTests(ui) {
                 $oneModule[module]('setting', 'name', testValue);
 
                 let retrievedValue = $oneModule[module]('setting', 'name');
-                let clonedSetting  = $clone[module]('setting', 'name');
+                let clonedSetting = $clone[module]('setting', 'name');
 
                 expect(retrievedValue).toBe(testValue);
                 expect(clonedSetting).toBe(name);
@@ -170,7 +168,7 @@ function moduleTests(ui) {
                 });
 
                 let retrievedValue = $oneModule[module]('setting', 'name');
-                let clonedSetting  = $clone[module]('setting', 'name');
+                let clonedSetting = $clone[module]('setting', 'name');
 
                 expect(retrievedValue).toBe(testValue);
                 expect(clonedSetting).toBe(name);

package/types/fomantic-ui-calendar.d.ts

@@ -141,7 +141,7 @@ declare namespace FomanticUI {
         /**
          * Month before day when parsing/converting date from/to text.
          *
-         * @default true
+         * @default false
          */
         monthFirst: boolean;
 

package/types/fomantic-ui-dropdown.d.ts

@@ -350,7 +350,7 @@ declare namespace FomanticUI {
         /**
          * Whether HTML included in dropdown values should be preserved.
          * Allows icons to show up in selected value.
-         * @default true
+         * @default false
          */
         preserveHTML: boolean;
 
@@ -500,6 +500,12 @@ declare namespace FomanticUI {
 
         // endregion
 
+        // region Template Settings
+
+        templates: Dropdown.TemplateSettings;
+
+        // endregion
+
         // region Callbacks
 
         /**
@@ -647,6 +653,7 @@ declare namespace FomanticUI {
     }
 
     namespace Dropdown {
+        type TemplateSettings = Partial<Pick<Settings.Templates, keyof Settings.Templates>>;
         type TransitionSettings = Partial<Pick<Settings.Transition, keyof Settings.Transition>>;
         type SelectorSettings = Partial<Pick<Settings.Selectors, keyof Settings.Selectors>>;
         type ClassNameSettings = Partial<Pick<Settings.ClassNames, keyof Settings.ClassNames>>;
@@ -658,6 +665,43 @@ declare namespace FomanticUI {
         type ErrorSettings = Partial<Pick<Settings.Errors, keyof Settings.Errors>>;
 
         namespace Settings {
+            interface Templates {
+                /**
+                 * @default function(string, settings)
+                 */
+                escape: (string: string, settings?: DropdownSettings) => string;
+
+                /**
+                 * generates dropdown from select values
+                 * @default function(message, type, header)
+                 */
+                dropdown: (select: {placeholder?: string, values: {[key: string]: string}}, settings: DropdownSettings) => string;
+
+                /**
+                 * generates just menu from select
+                 * @default function(response, settings)
+                 */
+                menu: (values: {[key: string]: string}, settings: DropdownSettings) => string;
+
+                /**
+                 * generates label for multiselect
+                 * @default function(response, settings)
+                 */
+                label: (value: string, text: string, settings: DropdownSettings) => string;
+
+                /**
+                 * generates messages like "No results"
+                 * @default function(response, settings)
+                 */
+                message: (message: string) => string;
+
+                /**
+                 * generates user addition to the selection menu
+                 * @default function(response, settings)
+                 */
+                addition: (choice: string) => string;
+            }
+
             interface Transition {
 
                 /**

package/types/fomantic-ui-embed.d.ts

@@ -314,7 +314,7 @@ declare namespace FomanticUI {
                 /**
                  * @default function
                  */
-                deQuote(string: string, encode: boolean): string;
+                escape(string: string): string;
 
                 /**
                  * @default function

package/types/fomantic-ui-flyout.d.ts

@@ -197,7 +197,7 @@ declare namespace FomanticUI {
         /**
          * Whether HTML included in given title, content or actions should be preserved.
          * Set to `false` in case you work with untrusted 3rd party content.
-         * @default true
+         * @default false
          */
         preserveHTML: boolean;