fix lint

devflowinc · Aug 30, 2024 · 3364057 · 3364057
1 parent 55a0675
commit 3364057
Show file tree

Hide file tree

Showing 9 changed files with 277 additions and 76 deletions.
diff --git a/.github/workflows/ts-sdk-gh-pages.yml b/.github/workflows/ts-sdk-gh-pages.yml
@@ -3,8 +3,6 @@ name: Deploy TS-SDK docs to github pages
 on:
   push:
     branches: ["main"]
-  pull_request:
-    branches: ["main"]
 
 jobs:
   build:

diff --git a/clients/search-component/.eslintrc.json b/clients/search-component/.eslintrc.json
diff --git a/clients/search-component/eslint.config.mjs b/clients/search-component/eslint.config.mjs
@@ -0,0 +1,10 @@
+// @ts-check
+
+import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default tseslint.config(
+  eslint.configs.recommended,
+  ...tseslint.configs.recommended,
+  { ignores: ["**/*.js", "**/*.cjs"] }
+);
diff --git a/clients/search-component/package.json b/clients/search-component/package.json
@@ -13,21 +13,24 @@
     "dev": "run-p watch:css watch:js",
     "watch:css": "npx postcss src/app.css -o dist/app.css --watch",
     "watch:js": "node ./scripts/watch.js",
-    "lint": "eslint 'src/**/*.ts' -c .eslintrc.json",
+    "lint": "eslint",
     "build:clean": "rm tsconfig.tsbuildinfo && rm -rf dist && yarn type:gen && yarn build",
     "build": "run-s build:src build:css type:dts",
     "build:src": "node ./scripts/build.js",
     "type:dts": "tsc --emitDeclarationOnly --declarationMap",
     "build:css": "npx postcss src/app.css -o dist/app.css "
   },
   "devDependencies": {
+    "@eslint/js": "^9.9.1",
     "@tailwindcss/forms": "^0.5.7",
+    "@types/eslint__js": "^8.42.3",
     "@types/lodash-es": "^4.17.12",
     "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
     "esbuild": "^0.23.1",
     "esbuild-node-externals": "^1.14.0",
     "esbuild-register": "^3.6.0",
+    "eslint": "^9.9.1",
     "eslint-plugin-react": "^7.35.0",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.41",
@@ -38,7 +41,8 @@
     "react-dom": "^18.3.1",
     "tailwind": "^4.0.0",
     "tailwindcss": "^3.4.10",
-    "typescript": "^5.5.4"
+    "typescript": "^5.5.4",
+    "typescript-eslint": "^8.3.0"
   },
   "dependencies": {
     "@r2wc/react-to-web-component": "^2.0.3",

diff --git a/clients/search-component/src/TrieveModal/index.css b/clients/search-component/src/TrieveModal/index.css
@@ -65,30 +65,29 @@ body {
         @apply font-normal text-xs text-zinc-600;
       }
     }
-  }
-
-  &.dark {
-    .kbd-wrapper {
-      kbd {
-        @apply border-zinc-400  text-zinc-400;
+    &.dark {
+      .kbd-wrapper {
+        kbd {
+          @apply border-zinc-400  text-zinc-400;
+        }
       }
-    }
 
-    @apply text-white bg-zinc-900;
+      @apply text-white bg-zinc-900;
 
-    input {
-      @apply bg-zinc-900 text-zinc-50 ring-zinc-700;
-    }
+      input {
+        @apply bg-zinc-900 text-zinc-50 ring-zinc-700;
+      }
 
-    .input-wrapper {
-      @apply bg-zinc-900;
-    }
+      .input-wrapper {
+        @apply bg-zinc-900;
+      }
 
-    .item {
-      @apply hover:bg-zinc-800 border-zinc-700 focus:bg-zinc-800 bg-zinc-900;
+      .item {
+        @apply hover:bg-zinc-800 border-zinc-700 focus:bg-zinc-800 bg-zinc-900;
 
-      .description {
-        @apply text-zinc-400;
+        .description {
+          @apply text-zinc-400;
+        }
       }
     }
   }

diff --git a/clients/search-component/src/TrieveModal/index.tsx b/clients/search-component/src/TrieveModal/index.tsx
@@ -56,15 +56,19 @@ export const TrieveModalSearch = ({
 
   const onUpOrDownClicked = (index: number, code: string) => {
     if (code === "ArrowDown") {
-      index < results.length - 1
-        ? document.getElementById(`trieve-search-item-${index + 1}`)?.focus()
-        : document.getElementById(`trieve-search-item-0`)?.focus();
+      if (index < results.length - 1) {
+        document.getElementById(`trieve-search-item-${index + 1}`)?.focus();
+      } else {
+        document.getElementById(`trieve-search-item-0`)?.focus();
+      }
     }
 
     if (code === "ArrowUp") {
-      index > 0
-        ? document.getElementById(`trieve-search-item-${index - 1}`)?.focus()
-        : inputRef.current?.focus();
+      if (index > 0) {
+        document.getElementById(`trieve-search-item-${index - 1}`)?.focus();
+      } else {
+        inputRef.current?.focus();
+      }
     }
   };
 

diff --git a/clients/search-component/src/TrieveModal/item.tsx b/clients/search-component/src/TrieveModal/item.tsx
@@ -17,6 +17,7 @@ export const Item = ({
   onUpOrDownClicked,
 }: Props) => {
   const Component = item.chunk.link ? "a" : "button";
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const itemRef = useRef<HTMLButtonElement | HTMLLinkElement | any>(null);
   const title =
     item.chunk.metadata?.title ||

diff --git a/clients/search-component/src/TrieveSearch/index.tsx b/clients/search-component/src/TrieveSearch/index.tsx
@@ -34,6 +34,7 @@ export const TrieveSearch = ({
             } else {
               onResultClick?.(state.selectedItem?.chunk as Chunk);
             }
+            return state;
           }
           case useCombobox.stateChangeTypes.InputBlur: {
             return {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,6 @@ name: Deploy TS-SDK docs to github pages @@
     on:
       push:
         branches: ["main"]
-      pull_request:
-        branches: ["main"]
     jobs:
       build:
@@ Expand Down @@