refactor: upgrade linter

will-stone · Oct 7, 2023 · d05e8d7 · d05e8d7
1 parent 8e58e10
commit d05e8d7
Show file tree

Hide file tree

Showing 10 changed files with 270 additions and 197 deletions.
diff --git a/__mocks__/fileMock.js → __mocks__/file-mock.js b/__mocks__/fileMock.js → __mocks__/file-mock.js
@@ -1,3 +1,3 @@
-// __mocks__/fileMock.js
+// __mocks__/file-mock.js
 
 module.exports = 'test-file-stub'
diff --git a/__mocks__/styleMock.js → __mocks__/style-mock.js b/__mocks__/styleMock.js → __mocks__/style-mock.js
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -1,3 +1,3 @@
 import config from '@will-stone/eslint-config'
 
-export default [...config]
+export default config()
diff --git a/jest.config.ts b/jest.config.ts
@@ -3,9 +3,9 @@ import type { Config } from '@jest/types'
 // Sync object
 const config: Config.InitialOptions = {
   moduleNameMapper: {
-    '\\.(css|less)$': '<rootDir>/__mocks__/styleMock.js',
+    '\\.(css|less)$': '<rootDir>/__mocks__/style-mock.js',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
-      '<rootDir>/__mocks__/fileMock.js',
+      '<rootDir>/__mocks__/file-mock.js',
   },
   modulePathIgnorePatterns: ['<rootDir>/out/'],
   preset: 'ts-jest',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "doctor": "npm run lint && npm run typecheck && npm run test",
     "icns": "cd ./src/shared/static/icon && ../../../../scripts/png2icns.sh icon.png",
     "lint": "ESLINT_USE_FLAT_CONFIG=true eslint -c eslint.config.mjs .",
-    "list-apps": "ts-node ./scripts/listInstalledApps",
+    "list-apps": "ts-node ./scripts/list-installed-apps",
     "make": "electron-forge make --arch=x64,arm64",
     "make:arm": "electron-forge make --arch=arm64",
     "make:intel": "electron-forge make --arch=x64",
@@ -60,7 +60,7 @@
     "@types/react-dom": "^18.2.7",
     "@types/react-redux": "^7.1.25",
     "@vercel/webpack-asset-relocator-loader": "^1.7.3",
-    "@will-stone/eslint-config": "^0.1.0",
+    "@will-stone/eslint-config": "^0.5.1",
     "@will-stone/prettier-config": "^7.0.1",
     "app-exists": "^2.1.1",
     "axios": "^1.4.0",

diff --git a/scripts/listInstalledApps.ts → scripts/list-installed-apps.ts b/scripts/listInstalledApps.ts → scripts/list-installed-apps.ts
diff --git a/src/config/CONSTANTS.ts → src/config/constants.ts b/src/config/CONSTANTS.ts → src/config/constants.ts
diff --git a/src/main/state/middleware.action-hub.ts b/src/main/state/middleware.action-hub.ts
@@ -3,7 +3,7 @@
 import { app, autoUpdater, shell } from 'electron'
 import deepEqual from 'fast-deep-equal'
 
-import { B_URL, ISSUES_URL } from '../../config/CONSTANTS'
+import { B_URL, ISSUES_URL } from '../../config/constants'
 import {
   clickedApp,
   clickedUpdateBar,

diff --git a/src/shared/state/reducer.data.ts b/src/shared/state/reducer.data.ts
@@ -1,7 +1,7 @@
 import { createReducer } from '@reduxjs/toolkit'
 
 import type { AppName } from '../../config/apps'
-import { CARROT_URL } from '../../config/CONSTANTS'
+import { CARROT_URL } from '../../config/constants'
 import {
   availableUpdate,
   downloadedUpdate,