feat(lint): fix multiple rare eslint errors

Modernize code using eslint advisory introduced in GH-2596. This PR focuses on fixing multiple rare rules, done in one PR, as otherwise there will be only a few LOC changed per separate PR.
fomantic · Dec 12, 2022 · 7498343 · 7498343
1 parent b672789
commit 7498343
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 64 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -160,21 +160,6 @@ module.exports = {
         'unicorn/prefer-regexp-test': 'off',
         'unicorn/prefer-switch': 'off',
         'unicorn/prefer-ternary': 'off',
-
-        // TODO rare errors
-        'arrow-body-style': 'off',
-        'block-scoped-var': 'off',
-        'import/no-extraneous-dependencies': 'off',
-        'import/order': 'off',
-        'new-cap': 'off',
-        'newline-per-chained-call': 'off',
-        'no-extra-boolean-cast': 'off',
-        'no-redeclare': 'off',
-        'no-unneeded-ternary': 'off',
-        'no-useless-return': 'off',
-        'operator-assignment': 'off',
-        'unicorn/no-console-spaces': 'off',
-        yoda: 'off',
     },
     reportUnusedDisableDirectives: true,
     globals: {

diff --git a/examples/responsive.html b/examples/responsive.html
@@ -642,7 +642,7 @@ <h3 class="ui center aligned header">Responsive Steps</h3>
 <script type="text/javascript">
 $(document).ready(function() {
 
-  var
+  let
     $headers     = $('body > h3'),
     $header      = $headers.first(),
     ignoreScroll = false,

diff --git a/scripts/nightly-version.js b/scripts/nightly-version.js
@@ -4,8 +4,8 @@ const path = require('path');
 const childProcess = require('child_process');
 
 // npm
-const fetch = require('node-fetch');
-const semver = require('semver');
+const fetch = require('node-fetch'); // eslint-disable-line import/no-extraneous-dependencies
+const semver = require('semver'); // eslint-disable-line import/no-extraneous-dependencies
 const actions = require('@actions/core');
 
 // pkg

diff --git a/src/definitions/behaviors/form.js b/src/definitions/behaviors/form.js
@@ -1682,7 +1682,7 @@
 
             // is not empty or blank string
             empty: function (value) {
-                return !(value === undefined || '' === value || Array.isArray(value) && value.length === 0);
+                return !(value === undefined || value === '' || Array.isArray(value) && value.length === 0);
             },
 
             // checkbox checked

diff --git a/src/definitions/modules/calendar.js b/src/definitions/modules/calendar.js
@@ -334,7 +334,8 @@
                             if (isDay && settings.showWeekNumbers) {
                                 tempMode += ' andweek';
                             }
-                            var table = $('<table/>').addClass(className.table).addClass(tempMode).addClass(numberText[columns] + ' column').appendTo(container);
+                            var table = $('<table/>').addClass(className.table).addClass(tempMode).addClass(numberText[columns] + ' column')
+                                .appendTo(container);
                             if (isInverted) {
                                 table.addClass(className.inverted);
                             }
@@ -1646,7 +1647,8 @@
                 if (!text) {
                     return null;
                 }
-                text = String(text).trim().replace(/([.:\/\-])\s+/g, '$1').replace(/\s+([.:\/-])/g, '$1').replace(/\s+/g, ' ');
+                text = String(text).trim().replace(/([.:\/\-])\s+/g, '$1').replace(/\s+([.:\/-])/g, '$1')
+                    .replace(/\s+/g, ' ');
                 if (text.length === 0) {
                     return null;
                 }
@@ -1766,7 +1768,7 @@
                             if (isNaN(j)) {
                                 continue;
                             }
-                            if (1 <= j && j <= 12) {
+                            if (j >= 1 && j <= 12) {
                                 month = j;
                                 numbers.splice(k, 1);
 
@@ -1781,7 +1783,7 @@
                         if (isNaN(j)) {
                             continue;
                         }
-                        if (1 <= j && j <= 31) {
+                        if (j >= 1 && j <= 31) {
                             day = j;
                             numbers.splice(i, 1);
 
@@ -1815,7 +1817,7 @@
                             if (isNaN(j)) {
                                 continue;
                             }
-                            if (0 <= j && j <= 23) {
+                            if (j >= 0 && j <= 23) {
                                 hour = j;
                                 numbers.splice(i, 1);
 
@@ -1831,7 +1833,7 @@
                             if (isNaN(j)) {
                                 continue;
                             }
-                            if (0 <= j && j <= 59) {
+                            if (j >= 0 && j <= 59) {
                                 minute = j;
                                 numbers.splice(i, 1);
 

diff --git a/src/definitions/modules/dimmer.js b/src/definitions/modules/dimmer.js
@@ -721,7 +721,7 @@
                         .addClass(settings.className.loader)
                         .addClass(settings.loaderVariation)
                     ;
-                    if (!!settings.loaderText) {
+                    if (settings.loaderText) {
                         l.text(settings.loaderText);
                         l.addClass('text');
                     }

diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js
@@ -3304,9 +3304,7 @@
                                 : (values == value)
                         ;
 
-                        return (hasValue)
-                            ? true
-                            : false;
+                        return !!(hasValue);
                     },
                     valueIgnoringCase: function (value) {
                         var

diff --git a/src/definitions/modules/popup.js b/src/definitions/modules/popup.js
@@ -371,9 +371,7 @@
                     if (settings.inline || settings.popup) {
                         return (module.has.popup());
                     } else {
-                        return ($popup.closest($context).length >= 1)
-                            ? true
-                            : false;
+                        return ($popup.closest($context).length >= 1);
                     }
                 },
 

diff --git a/src/definitions/modules/progress.js b/src/definitions/modules/progress.js
@@ -95,7 +95,7 @@
                         var precision = 1;
                         var ratio = min / total;
                         while (precisionPower < 10) {
-                            ratio = ratio * precision;
+                            ratio *= precision;
                             if (ratio > 1) {
                                 break;
                             }

diff --git a/src/definitions/modules/search.js b/src/definitions/modules/search.js
@@ -32,7 +32,7 @@
             queryArguments  = [].slice.call(arguments, 1),
             returnedValue
         ;
-        $(this).each(function () {
+        $allModules.each(function () {
             var
                 settings          = ($.isPlainObject(parameters))
                     ? $.extend(true, {}, $.fn.search.settings, parameters)

diff --git a/src/definitions/modules/toast.js b/src/definitions/modules/toast.js
@@ -309,7 +309,7 @@
                         }
                         if (settings.displayTime > 0) {
                             var progressingClass = className.progressing + ' ' + (settings.pauseOnHover ? className.pausable : '');
-                            if (!!settings.showProgress) {
+                            if (settings.showProgress) {
                                 $progress = $('<div/>', {
                                     class: className.progress + ' ' + (settings.classProgress || settings.class),
                                     'data-percent': '',

diff --git a/tasks/admin/distributions/create.js b/tasks/admin/distributions/create.js
@@ -71,8 +71,8 @@ module.exports = function (callback) {
 
             // get files for meteor
             gatherFiles = function (dir) {
-                var
-                    dir   = dir || path.resolve('.'),
+                dir = dir || path.resolve('.');
+                let
                     list  = fs.readdirSync(dir),
                     omitted = [
                         '.git',

diff --git a/tasks/config/admin/github.js b/tasks/config/admin/github.js
@@ -8,7 +8,7 @@
 let
     fs          = require('fs'),
     path        = require('path'),
-    githubAPI   = require('@octokit/rest'),
+    GithubAPI   = require('@octokit/rest'),
 
     // stores oauth info for GitHub API
     oAuthConfig = path.join(__dirname, 'oauth.js'),
@@ -22,7 +22,7 @@ if (!oAuth) {
     console.error('Must add oauth token for GitHub in tasks/config/admin/oauth.js');
 }
 
-github = new githubAPI({
+github = new GithubAPI({
     version: '3.0.0',
     debug: true,
     protocol: 'https',

diff --git a/tasks/config/project/config.js b/tasks/config/project/config.js
@@ -16,7 +16,7 @@ let
 module.exports = {
 
     getPath: function (file, directory) {
-        var
+        let
             configPath,
             walk = function (directory) {
                 let
@@ -26,8 +26,6 @@ module.exports = {
                 if (fs.existsSync(currentPath)) {
                     // found file
                     configPath = path.normalize(directory);
-
-                    return;
                 } else {
                     // reached file system root, let's stop
                     if (nextDirectory == directory) {

diff --git a/tasks/config/project/install.js b/tasks/config/project/install.js
@@ -5,10 +5,9 @@
 let
     fs             = require('fs'),
     path           = require('path'),
+    requireDotFile = require('require-dot-file'),
     defaults       = require('../defaults'),
-    release        = require('./release'),
-
-    requireDotFile = require('require-dot-file')
+    release        = require('./release')
 ;
 
 /*******************************
@@ -93,7 +92,7 @@ module.exports = {
 
     // checks if files are in a PM directory
     getPackageManager: function (directory) {
-        var
+        let
             // returns last matching result (avoid sub-module detection)
             walk = function (directory) {
                 let
@@ -133,7 +132,7 @@ module.exports = {
 
     // checks if files is PMed submodule
     isSubModule: function (directory) {
-        var
+        let
             moduleFolders = 0,
             walk = function (directory) {
                 let

diff --git a/tasks/config/tasks.js b/tasks/config/tasks.js
@@ -18,9 +18,7 @@ let overrideBrowserslist = hasBrowserslistConfig ? undefined : [
 ];
 
 // Node 12 does not support ??, so a little polyfill
-let nullish = (value, fallback) => {
-    return value !== undefined && value !== null ? value : fallback;
-};
+let nullish = (value, fallback) => (value !== undefined && value !== null ? value : fallback);
 
 module.exports = {
 
@@ -120,7 +118,7 @@ module.exports = {
                         if (error.line == 9) {
                             element = regExp.variable.exec(error.message)[1];
                             if (element) {
-                                console.error('Missing theme.config value for ', element);
+                                console.error('Missing theme.config value for', element);
                             }
                             console.error('Most likely new UI was added in an update. You will need to add missing elements from theme.config.example');
                         } else if (error.line == 84) {

diff --git a/tasks/docs/metadata.js b/tasks/docs/metadata.js
@@ -49,7 +49,7 @@ function parser(file, callback) {
     }
 
     try {
-        var
+        let
             /** @type {string} */
             text     = String(file.contents.toString('utf8')),
             lines    = text.split('\n'),
@@ -117,7 +117,7 @@ function parser(file, callback) {
             // console.log(meta);
         }
     } catch (error) {
-        console.log(error, filename);
+        console.log(error, file.path);
     }
 
     callback(null, file);

diff --git a/tasks/install.js b/tasks/install.js
@@ -153,7 +153,7 @@ module.exports = function (callback) {
                 return;
             }
         } else {
-            console.error('Cannot locate files to update at path: ', updatePaths.definition);
+            console.error('Cannot locate files to update at path:', updatePaths.definition);
             console.log('Running installer');
         }
     }
@@ -342,7 +342,7 @@ module.exports = function (callback) {
             ;
 
             // rewrite site variable in theme.less
-            console.info('Adjusting @siteFolder to: ', pathToSite + '/');
+            console.info('Adjusting @siteFolder to:', pathToSite + '/');
 
             if (fs.existsSync(installPaths.themeConfig)) {
                 console.info('Modifying src/theme.config (LESS config)', installPaths.themeConfig);

diff --git a/test/.eslintrc.js b/test/.eslintrc.js
@@ -9,10 +9,6 @@ module.exports = {
     },
     rules: {
         'jest/no-disabled-tests': 'off',
-
-        // TODO rare errors
-        'jest/no-jasmine-globals': 'off',
-        'jest/no-test-prefixes': 'off',
     },
     globals: {
         jQuery: false,

diff --git a/test/modules/module.spec.js b/test/modules/module.spec.js
@@ -6,7 +6,7 @@ function moduleTests(ui) {
         name      = $.fn[module].settings.name,
 
         testValue = 'Test',
-        fixtures  = jasmine.getFixtures(),
+        fixtures  = jasmine.getFixtures(), // eslint-disable-line jest/no-jasmine-globals
 
         originalSettings,
         $modules,

diff --git a/test/modules/popup.spec.js b/test/modules/popup.spec.js
@@ -1,4 +1,4 @@
-xdescribe('UI Popup', function () {
+describe.skip('UI Popup', function () {
     moduleTests({
         module: 'popup',
         element: 'i.icon',

diff --git a/test/modules/search.spec.js b/test/modules/search.spec.js
@@ -1,4 +1,4 @@
-xdescribe('UI Search', function () {
+describe.skip('UI Search', function () {
     moduleTests({
         module: 'search',
         element: '.ui.search',

diff --git a/test/modules/tab.spec.js b/test/modules/tab.spec.js
@@ -1,4 +1,4 @@
-xdescribe('UI Tab', function () {
+describe.skip('UI Tab', function () {
     moduleTests({
         module: 'tab',
         element: '.ui.menu .item',

diff --git a/test/modules/transition.spec.js b/test/modules/transition.spec.js
@@ -1,4 +1,4 @@
-xdescribe('UI Transition', function () {
+describe.skip('UI Transition', function () {
     moduleTests({
         module: 'transition',
         element: '.ui.image',