Merge pull request #1118 from tupaschoal/update-deps-code-change

Part of #1117: Move more dependencies to latest or closer

.husky/pre-commit

@@ -1,6 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 echo "Running pre-commit hook with lint checks."
 
 pids=""
@@ -18,19 +15,19 @@ get_changed_files()
 
 readarray -t changed_css < <(get_changed_files 'css/*.css')
 if [ ! -z "$changed_css" ]; then
-    npx stylelint -- "${changed_css[@]}" &
+    stylelint -- "${changed_css[@]}" &
     pids="$pids $!"
 fi
 
 readarray -t changed_js < <(get_changed_files '*/*.cjs' '*/*.js' '*/*.mjs')
 if [ ! -z "$changed_js" ]; then
-    npx eslint "${changed_js[@]}" &
+    eslint "${changed_js[@]}" &
     pids="$pids $!"
 fi
 
 readarray -t changed_docs < <(get_changed_files 'locales/*/*.json' 'docs/*.md' '*.md')
 if [ ! -z "$changed_docs" ]; then
-    npx prettier -c "${changed_docs[@]}" &
+    prettier -c "${changed_docs[@]}" &
     pids="$pids $!"
 fi
 

__tests__/__main__/date-aux.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__main__/import-export.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__main__/main-window.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__main__/notification.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__main__/time-balance.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__main__/time-math.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__main__/user-preferences.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__main__/validate-json.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__main__/windows.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__renderer__/classes/CalendarFactory.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import '../../../__mocks__/jquery.mjs';

__tests__/__renderer__/classes/DayCalendar.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import '../../../__mocks__/jquery.mjs';

__tests__/__renderer__/classes/MonthCalendar.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import '../../../__mocks__/jquery.mjs';

__tests__/__renderer__/preferences.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import '../../__mocks__/jquery.mjs';

__tests__/__renderer__/themes.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import '../../__mocks__/jquery.mjs';

__tests__/__renderer__/user-preferences.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__renderer__/window-aux.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import assert from 'assert';

__tests__/__renderer__/workday-waiver-aux.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 'use strict';
 
 import '../../__mocks__/jquery.mjs';

eslint.config.mjs

@@ -0,0 +1,83 @@
+import globals from 'globals';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    files: [
+        '**/*.cjs', '**/*.js', '**/*.mjs'
+    ],
+
+    ignores: [
+        '**/assets/',
+        '**/coverage/',
+        '**/node_modules/',
+        '**/*.svg',
+        '**/*.html',
+        '**/*.css',
+        '**/release-builds',
+    ],
+}, ...compat.extends('eslint:recommended'), {
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.commonjs,
+            ...globals.node,
+            ...globals.mocha,
+            ...globals.jquery,
+            Atomics: 'readonly',
+            SharedArrayBuffer: 'readonly',
+        },
+
+        ecmaVersion: 2020,
+        sourceType: 'module',
+
+        parserOptions: {
+            ecmaFeatures: {
+                jsx: true,
+            },
+        },
+    },
+
+    rules: {
+        'block-spacing': 'error',
+        'eqeqeq': ['error', 'always'],
+
+        'brace-style': ['error', 'allman', {
+            'allowSingleLine': true,
+        }],
+
+        'func-call-spacing': ['error', 'never'],
+        'indent': 'error',
+        'keyword-spacing': 'error',
+        'linebreak-style': ['error', 'unix'],
+        'no-extra-semi': 'error',
+        'no-lonely-if': 'error',
+        'no-var': 'error',
+
+        'prefer-const': ['error', {
+            'destructuring': 'all',
+        }],
+
+        'quotes': ['error', 'single'],
+        'semi': 'error',
+        'no-trailing-spaces': 'error',
+
+        'semi-spacing': ['error', {
+            'before': false,
+            'after': true,
+        }],
+
+        'space-before-blocks': 'error',
+        'space-before-function-paren': ['error', 'never'],
+    },
+}];

js/import-export.mjs

@@ -64,7 +64,7 @@ function _exportDatabaseToFile(filename)
     {
         fs.writeFileSync(filename, JSON.stringify(information, null,'\t'), 'utf-8');
     }
-    catch (err)
+    catch
     {
         return false;
     }
@@ -149,7 +149,7 @@ function _importDatabaseFromFile(filename)
             return {'result': false, 'total': information.length, 'failed': failedEntries};
         }
     }
-    catch (err)
+    catch
     {
         return {'result': false, 'total': 0, 'failed': 0};
     }

js/squirrel.mjs

@@ -25,9 +25,8 @@ function handleSquirrelEvent(application)
                 detached: true
             });
         }
-        catch (error)
+        catch
         {
-            // eslint-disable-next-line no-empty
             // We don't need to do anything in this block.
         }
 

js/user-preferences.mjs

@@ -134,7 +134,7 @@ function readPreferences(filePath = getPreferencesFilePath())
     {
         preferences = JSON.parse(getFs().readFileSync(filePath));
     }
-    catch (err)
+    catch
     {
         preferences = {};
     }

js/validate-json.js

@@ -113,7 +113,7 @@ function isValidDate(year, month, day)
  */
 Validator.prototype.customFormats.dateFormat = function(dateStr)
 {
-    if (!typeof(dateStr) === 'String' || !dateStr.includes('-'))
+    if (!(typeof(dateStr) === 'string') || !dateStr.includes('-'))
     {
         return false;
     }

main.mjs

@@ -1,5 +1,3 @@
-/*eslint-disable no-useless-escape*/
-/*eslint-disable no-global-assign*/
 'use strict';
 
 import { app, ipcMain } from 'electron';
@@ -191,9 +189,8 @@ if (env === 'development')
     {
         require('electron-reloader')(module);
     }
-    catch (_)
+    catch
     {
-        // eslint-disable-next-line no-empty
         // We don't need to do anything in this block.
     }
 }