From fc0e52313522759aa17402deef0fbb47216beb95 Mon Sep 17 00:00:00 2001 From: Justin Silvestre Date: Mon, 25 Nov 2024 17:25:09 +0100 Subject: [PATCH] Lint, analysis tweak --- .husky/pre-commit | 5 ++--- app/lib/dic/kanjijumpForcedAtomicFigures.ts | 3 ++- app/routes/browse.compound-components.tsx | 4 ---- package-lock.json | 12 ++++++------ package.json | 5 +++-- 5 files changed, 13 insertions(+), 16 deletions(-) mode change 100755 => 100644 .husky/pre-commit diff --git a/.husky/pre-commit b/.husky/pre-commit old mode 100755 new mode 100644 index 0312b7602..8df2f8235 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,3 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" +npm test run -npx lint-staged \ No newline at end of file +npx lint-staged diff --git a/app/lib/dic/kanjijumpForcedAtomicFigures.ts b/app/lib/dic/kanjijumpForcedAtomicFigures.ts index a401962e3..731648098 100644 --- a/app/lib/dic/kanjijumpForcedAtomicFigures.ts +++ b/app/lib/dic/kanjijumpForcedAtomicFigures.ts @@ -185,5 +185,6 @@ export const kanjijumpForcedAtomicFigures = new Set([ "乇", "了", "毛", - "𢆉" + "𢆉", + "屯" ]) \ No newline at end of file diff --git a/app/routes/browse.compound-components.tsx b/app/routes/browse.compound-components.tsx index db3d1fe2d..1acc120fd 100644 --- a/app/routes/browse.compound-components.tsx +++ b/app/routes/browse.compound-components.tsx @@ -170,10 +170,6 @@ function CompoundComponentsPageContent({ nonCharacterCompoundComponents.matchedFiguresCount + totalCompoundComponentCharacters; - const totalCompoundNonCharacterVariantComponents = - compoundComponentCharacterVariants.matchedFiguresCount + - nonCharacterCompoundComponents.matchedFiguresCount; - const popover = useManyFiguresPopover(); const content = ( diff --git a/package-lock.json b/package-lock.json index b65814523..f66530f76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-testing-library": "^6.1.0", "happy-dom": "^12.9.1", - "husky": "^8.0.3", + "husky": "^9.1.7", "lint-staged": "^15.0.2", "msw": "^1.3.2", "npm-run-all": "^4.1.5", @@ -7167,15 +7167,15 @@ } }, "node_modules/husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", + "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, "bin": { - "husky": "lib/bin.js" + "husky": "bin.js" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/typicode" diff --git a/package.json b/package.json index 53ed6f74e..bead633bd 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "test:e2e:run": "cross-env PORT=8811 start-server-and-test start:mocks http://localhost:8811 \"npx cypress run\"", "typecheck": "tsc && tsc -p cypress", "validate": "run-p \"test -- --run\" lint typecheck test:e2e:run", - "prisma": "prisma" + "prisma": "prisma", + "prepare": "husky" }, "eslintIgnore": [ "/node_modules", @@ -102,7 +103,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-testing-library": "^6.1.0", "happy-dom": "^12.9.1", - "husky": "^8.0.3", + "husky": "^9.1.7", "lint-staged": "^15.0.2", "msw": "^1.3.2", "npm-run-all": "^4.1.5",