From a09a802a8b0789b714ee39a2ec8ce1fb27aa51b1 Mon Sep 17 00:00:00 2001 From: Lars Kappert Date: Sun, 14 Apr 2024 14:13:21 +0200 Subject: [PATCH 1/3] Replace `@knipignore` with `paths` config --- invokeai/frontend/web/knip.ts | 3 +++ .../frontend/web/src/common/components/Loading/Loading.tsx | 1 - .../gallery/components/Boards/BoardsList/NoBoardBoard.tsx | 1 - .../nodes/components/sidePanel/viewMode/EmptyState.tsx | 1 - .../src/features/system/components/AboutModal/AboutModal.tsx | 1 - .../src/features/system/components/InvokeAILogoComponent.tsx | 1 - 6 files changed, 3 insertions(+), 5 deletions(-) diff --git a/invokeai/frontend/web/knip.ts b/invokeai/frontend/web/knip.ts index 64c18e12bf0..d4b51e46d1f 100644 --- a/invokeai/frontend/web/knip.ts +++ b/invokeai/frontend/web/knip.ts @@ -10,6 +10,9 @@ const config: KnipConfig = { 'src/features/nodes/types/v2/**', ], ignoreBinaries: ['only-allow'], + paths: { + 'public/*': ['public/*'], + }, }; export default config; diff --git a/invokeai/frontend/web/src/common/components/Loading/Loading.tsx b/invokeai/frontend/web/src/common/components/Loading/Loading.tsx index 18971b4171f..dae5b40e8ce 100644 --- a/invokeai/frontend/web/src/common/components/Loading/Loading.tsx +++ b/invokeai/frontend/web/src/common/components/Loading/Loading.tsx @@ -1,5 +1,4 @@ import { Flex, Image, Spinner } from '@invoke-ai/ui-library'; -/** @knipignore */ import InvokeLogoWhite from 'public/assets/images/invoke-symbol-wht-lrg.svg'; import { memo } from 'react'; diff --git a/invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/NoBoardBoard.tsx b/invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/NoBoardBoard.tsx index 3c97837a90b..14bdecba659 100644 --- a/invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/NoBoardBoard.tsx +++ b/invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/NoBoardBoard.tsx @@ -6,7 +6,6 @@ import type { RemoveFromBoardDropData } from 'features/dnd/types'; import AutoAddIcon from 'features/gallery/components/Boards/AutoAddIcon'; import BoardContextMenu from 'features/gallery/components/Boards/BoardContextMenu'; import { autoAddBoardIdChanged, boardIdSelected } from 'features/gallery/store/gallerySlice'; -/** @knipignore */ import InvokeLogoSVG from 'public/assets/images/invoke-symbol-wht-lrg.svg'; import { memo, useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/invokeai/frontend/web/src/features/nodes/components/sidePanel/viewMode/EmptyState.tsx b/invokeai/frontend/web/src/features/nodes/components/sidePanel/viewMode/EmptyState.tsx index 3f3af4a5796..322e7014ca3 100644 --- a/invokeai/frontend/web/src/features/nodes/components/sidePanel/viewMode/EmptyState.tsx +++ b/invokeai/frontend/web/src/features/nodes/components/sidePanel/viewMode/EmptyState.tsx @@ -1,7 +1,6 @@ import { Button, Flex, Image, Text } from '@invoke-ai/ui-library'; import { useAppDispatch } from 'app/store/storeHooks'; import { workflowModeChanged } from 'features/nodes/store/workflowSlice'; -/** @knipignore */ import InvokeLogoSVG from 'public/assets/images/invoke-symbol-wht-lrg.svg'; import { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/invokeai/frontend/web/src/features/system/components/AboutModal/AboutModal.tsx b/invokeai/frontend/web/src/features/system/components/AboutModal/AboutModal.tsx index 9c3987a6696..d333b64ebfe 100644 --- a/invokeai/frontend/web/src/features/system/components/AboutModal/AboutModal.tsx +++ b/invokeai/frontend/web/src/features/system/components/AboutModal/AboutModal.tsx @@ -21,7 +21,6 @@ import { import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent'; import { discordLink, githubLink, websiteLink } from 'features/system/store/constants'; import { map } from 'lodash-es'; -/** @knipignore */ import InvokeLogoYellow from 'public/assets/images/invoke-tag-lrg.svg'; import type { ReactElement } from 'react'; import { cloneElement, memo, useCallback } from 'react'; diff --git a/invokeai/frontend/web/src/features/system/components/InvokeAILogoComponent.tsx b/invokeai/frontend/web/src/features/system/components/InvokeAILogoComponent.tsx index 678025770df..91d4382a52f 100644 --- a/invokeai/frontend/web/src/features/system/components/InvokeAILogoComponent.tsx +++ b/invokeai/frontend/web/src/features/system/components/InvokeAILogoComponent.tsx @@ -2,7 +2,6 @@ import { Image, Text, Tooltip } from '@invoke-ai/ui-library'; import { useStore } from '@nanostores/react'; import { $logo } from 'app/store/nanostores/logo'; -/** @knipignore */ import InvokeLogoYellow from 'public/assets/images/invoke-symbol-ylw-lrg.svg'; import { memo, useMemo, useRef } from 'react'; import { useGetAppVersionQuery } from 'services/api/endpoints/appInfo'; From 9aed2c2c3f2755876f7c815a1fa7a115d69757bb Mon Sep 17 00:00:00 2001 From: Lars Kappert Date: Sun, 14 Apr 2024 14:14:55 +0200 Subject: [PATCH 2/3] Scope project files to src dir (enables --production) --- invokeai/frontend/web/knip.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/invokeai/frontend/web/knip.ts b/invokeai/frontend/web/knip.ts index d4b51e46d1f..db89741fefc 100644 --- a/invokeai/frontend/web/knip.ts +++ b/invokeai/frontend/web/knip.ts @@ -1,6 +1,7 @@ import type { KnipConfig } from 'knip'; const config: KnipConfig = { + project: ['src/**/*.{ts,tsx}!'], ignore: [ // This file is only used during debugging 'src/app/store/middleware/debugLoggerMiddleware.ts', From 4ba367aab2c5acb1b90297d11755e720053e6571 Mon Sep 17 00:00:00 2001 From: Lars Kappert Date: Sun, 14 Apr 2024 14:18:58 +0200 Subject: [PATCH 3/3] Remove tag excluder --- invokeai/frontend/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/invokeai/frontend/web/package.json b/invokeai/frontend/web/package.json index a99910c5497..aabaa17c73f 100644 --- a/invokeai/frontend/web/package.json +++ b/invokeai/frontend/web/package.json @@ -24,7 +24,7 @@ "build": "pnpm run lint && vite build", "typegen": "node scripts/typegen.js", "preview": "vite preview", - "lint:knip": "knip --tags=-@knipignore", + "lint:knip": "knip", "lint:dpdm": "dpdm --no-warning --no-tree --transform --exit-code circular:1 src/main.tsx", "lint:eslint": "eslint --max-warnings=0 .", "lint:prettier": "prettier --check .",