From 2c572e8b31cd7e4a32cb74310f04448f8fa8ce64 Mon Sep 17 00:00:00 2001 From: Valerie Pomerleau Date: Wed, 23 Jul 2025 16:55:52 -0700 Subject: [PATCH] enable husky pre-commit and eslint ts files --- .husky/pre-commit | 2 +- package.json | 4 +--- packages/fxa-settings/.eslintignore | 6 ++++++ packages/fxa-settings/.eslintrc.json | 14 ++++++++++---- .../FlowRecoveryKeyDownload/index.test.tsx | 19 +++++++++---------- .../key-stretch-experiment.test.ts | 1 + packages/fxa-settings/src/pages/mocks.tsx | 7 ++++--- 7 files changed, 32 insertions(+), 21 deletions(-) mode change 100644 => 100755 .husky/pre-commit diff --git a/.husky/pre-commit b/.husky/pre-commit old mode 100644 new mode 100755 index c27d8893a9..2312dc587f --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1 +1 @@ -lint-staged +npx lint-staged diff --git a/package.json b/package.json index b48d29204f..6b0e412ac0 100644 --- a/package.json +++ b/package.json @@ -145,9 +145,7 @@ "eslint" ], "*.{ts,tsx}": [ - "prettier --config _dev/.prettierrc --write" - ], - "packages/fxa-auth-server/**/*.{ts,tsx}": [ + "prettier --config _dev/.prettierrc --write", "eslint" ], "*.css": [ diff --git a/packages/fxa-settings/.eslintignore b/packages/fxa-settings/.eslintignore index 20687473be..1f53bda8ed 100644 --- a/packages/fxa-settings/.eslintignore +++ b/packages/fxa-settings/.eslintignore @@ -1 +1,7 @@ storybook-static +.storybook/*.js +config/ +public/ +scripts/ +*.config.js +Gruntfile.js diff --git a/packages/fxa-settings/.eslintrc.json b/packages/fxa-settings/.eslintrc.json index 3fed8bb311..2e31b044ef 100644 --- a/packages/fxa-settings/.eslintrc.json +++ b/packages/fxa-settings/.eslintrc.json @@ -1,9 +1,6 @@ { "root": true, - "extends": [ - "react-app", - "react-app/jest" - ], + "extends": ["react-app", "react-app/jest"], "rules": { "import/export": "error", "import/named": "off", @@ -23,5 +20,14 @@ "testing-library/no-unnecessary-act": "off", "testing-library/no-container": "off" }, + "overrides": [ + { + "files": ["*.ts", "*.tsx"], + "rules": { + "no-unused-vars": "off", + "@typescript-eslint/no-unused-vars": "error" + } + } + ], "ignorePatterns": ["build/", "scripts/build.js"] } diff --git a/packages/fxa-settings/src/components/Settings/FlowRecoveryKeyDownload/index.test.tsx b/packages/fxa-settings/src/components/Settings/FlowRecoveryKeyDownload/index.test.tsx index e6ac2806ce..ee46c841f8 100644 --- a/packages/fxa-settings/src/components/Settings/FlowRecoveryKeyDownload/index.test.tsx +++ b/packages/fxa-settings/src/components/Settings/FlowRecoveryKeyDownload/index.test.tsx @@ -35,22 +35,21 @@ const renderFlowPage = async () => { await act(() => { renderWithRouter( ); }); }; describe('FlowRecoveryKeyDownload', () => { - afterEach(() => { jest.clearAllMocks(); }); diff --git a/packages/fxa-settings/src/models/experiments/key-stretch-experiment.test.ts b/packages/fxa-settings/src/models/experiments/key-stretch-experiment.test.ts index e7ce6696df..c3eecc5489 100644 --- a/packages/fxa-settings/src/models/experiments/key-stretch-experiment.test.ts +++ b/packages/fxa-settings/src/models/experiments/key-stretch-experiment.test.ts @@ -20,6 +20,7 @@ describe('Key Stretch Experiment Model', function () { }; const window = new ReachRouterWindow(); + // eslint-disable-next-line @typescript-eslint/no-unused-vars let model: KeyStretchExperiment; beforeEach(function () { model = new KeyStretchExperiment(new GenericData({})); diff --git a/packages/fxa-settings/src/pages/mocks.tsx b/packages/fxa-settings/src/pages/mocks.tsx index 8f6c9a5a8a..48e362d247 100644 --- a/packages/fxa-settings/src/pages/mocks.tsx +++ b/packages/fxa-settings/src/pages/mocks.tsx @@ -6,7 +6,7 @@ import * as LoadingSpinnerModule from 'fxa-react/components/LoadingSpinner'; import { MozServices } from '../lib/types'; import { MOCK_ACCOUNT } from '../models/mocks'; -import { Integration, IntegrationType, OAuthNativeIntegration, RelierCmsInfo } from '../models'; +import { Integration, IntegrationType } from '../models'; export const MOCK_EMAIL = MOCK_ACCOUNT.primaryEmail.email; export const MOCK_UID = 'abcd1234abcd1234abcd1234abcd1234'; @@ -103,7 +103,8 @@ export const MOCK_CMS_INFO = { logoUrl: 'https://gist.githubusercontent.com/vbudhram/c53b07efd1656acfff7d2c7e9d6825fe/raw/030df98ee27f609333606d36c7bf3af45af53f39/123Done_red.svg', logoAltText: 'logo', - backgroundColor: 'linear-gradient(135deg, rgba(255, 255, 255, 0.7) 0%, rgba(255, 26, 26, 0.25) 40%, rgba(230, 0, 0, 0.3) 70%, rgba(179, 0, 0, 0.45) 100%)', + backgroundColor: + 'linear-gradient(135deg, rgba(255, 255, 255, 0.7) 0%, rgba(255, 26, 26, 0.25) 40%, rgba(230, 0, 0, 0.3) 70%, rgba(179, 0, 0, 0.45) 100%)', }, EmailFirstPage: { headline: 'Sign up or sign in to your Mozilla account', @@ -156,4 +157,4 @@ export const createMockIntegrationWithCms = () => data: { validate: () => {}, }, - }) as Integration; \ No newline at end of file + }) as Integration;