Chore: Update eslint and its config, clean up some lint (#3293)

Author: codebykat

.eslintrc.json

@@ -196,7 +196,7 @@ lint-scss:
 
 .PHONY: lint-js
 lint-js:
-	@npx eslint --ignore-path .gitignore "**/*.{js,jsx,ts,tsx}"
+	@npx eslint
 
 
 # encrypted config file

Makefile

@@ -7,6 +7,7 @@
 - Updated styles, sass, style linting [#3294](https://github.com/Automattic/simplenote-electron/pull/3294)
 - Upgraded dependencies [#3292](https://github.com/Automattic/simplenote-electron/pull/3292)
 - Updated the ID type used for analytics to avoid sending invalid WPCOM IDs [#3291](https://github.com/Automattic/simplenote-electron/pull/3291)
+- Updated eslint configuration [#3293](https://github.com/Automattic/simplenote-electron/pull/3293)
 
 ## [v2.23.1]
 

RELEASE-NOTES.md

@@ -49,7 +49,7 @@ module.exports = async function (params) {
         `Could not begin signing macOS build. Errors: ${errors.join('\n')}`
       );
     } else {
-      console.log('All required env vars found. Moving on...');
+      console.log('All required env vars found. Moving on...'); // eslint-disable-line no-console
     }
   }
 

after_sign_hook.js

@@ -67,7 +67,6 @@ class ManualUpdater extends Updater {
         const releaseConfig = yaml.load(configBody);
 
         if (semver.lt(app.getVersion(), releaseConfig.version)) {
-          // eslint-disable-next-line no-console
           log.info(
             'New update is available, prompting user to update to',
             releaseConfig.version

desktop/updater/manual-updater/index.js

@@ -0,0 +1,96 @@
+import typescriptEslint from '@typescript-eslint/eslint-plugin';
+import react from 'eslint-plugin-react';
+import jest from 'eslint-plugin-jest';
+import prettier from 'eslint-plugin-prettier';
+import reactHooks from 'eslint-plugin-react-hooks';
+import { fixupPluginRules } from '@eslint/compat';
+import globals from 'globals';
+import tsParser from '@typescript-eslint/parser';
+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 [
+  {
+    ignores: ['dist/', 'eslint.config.mjs'],
+  },
+  ...compat.extends(
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:jest/recommended',
+    'prettier',
+    'plugin:prettier/recommended',
+    'plugin:react/recommended'
+  ),
+  {
+    plugins: {
+      '@typescript-eslint': typescriptEslint,
+      react,
+      jest,
+      prettier,
+      'react-hooks': fixupPluginRules(reactHooks),
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...jest.environments.globals.globals,
+        ...globals.mocha,
+        ...globals.node,
+      },
+
+      parser: tsParser,
+      ecmaVersion: 6,
+      sourceType: 'module',
+
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+
+    settings: {
+      react: {
+        version: 'detect',
+      },
+    },
+
+    rules: {
+      eqeqeq: ['error', 'always'],
+      'no-console': 'warn',
+      'no-lonely-if': 'error',
+      'no-shadow': 'warn',
+      'no-spaced-func': 'error',
+
+      'prettier/prettier': [
+        'error',
+        {
+          singleQuote: true,
+        },
+      ],
+
+      'react/display-name': 'warn',
+      'react/no-deprecated': 'warn',
+      'react/no-string-refs': 'warn',
+      'react/prop-types': 'off',
+      'vars-on-top': 'error',
+    },
+  },
+  {
+    files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
+
+    rules: {
+      'no-unused-vars': 'off',
+    },
+  },
+];

eslint.config.mjs

@@ -46,7 +46,7 @@ const analytics = {
       const fullEventName = `${prefix}_${eventName}`;
       const fullEventProperties = {
         ...eventProperties,
-        device_info_app_version: config.version, // eslint-disable-line no-undef
+        device_info_app_version: config.version,
       };
 
       debug(`${fullEventName}: %o`, fullEventProperties);

lib/analytics/index.ts

@@ -66,7 +66,7 @@ function buildTracks() {
       const tokens = host.split('.');
       let tryDomain: string;
       if (typeof TRACKS_COOKIE_DOMAIN !== 'undefined') {
-        cookieDomain = TRACKS_COOKIE_DOMAIN; // eslint-disable-line no-undef
+        cookieDomain = TRACKS_COOKIE_DOMAIN;
       } else {
         for (let i = 1; i <= tokens.length; ++i) {
           tryDomain = '.' + tokens.slice(-i).join('.');

lib/analytics/tracks.ts

@@ -164,9 +164,9 @@ const mapStateToProps: S.MapState<StateProps> = (state) => ({
   isSmallScreen: selectors.isSmallScreen(state),
   openedRevision:
     state.ui.openedRevision?.[0] === state.ui.openedNote
-      ? state.data.noteRevisions
+      ? (state.data.noteRevisions
           .get(state.ui.openedNote)
-          ?.get(state.ui.openedRevision?.[1]) ?? null
+          ?.get(state.ui.openedRevision?.[1]) ?? null)
       : null,
   openedNote: state.ui.openedNote,
   showNoteList: state.ui.showNoteList,

lib/app-layout/index.tsx

@@ -5,7 +5,7 @@ import CrossIcon from '../../icons/cross';
 import TopRightArrowIcon from '../../icons/arrow-top-right';
 import Dialog from '../../dialog';
 
-const appVersion = config.version; // eslint-disable-line no-undef
+const appVersion = config.version;
 
 type OwnProps = {
   closeDialog: () => void;