From 971cd021421ceff82cd17db5dc7cf432c34faea5 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Sat, 11 Mar 2023 23:29:25 -0800 Subject: [PATCH] Fix eslint errors --- package-lock.json | 38 +++++++--------------- package.json | 2 -- src-web/components/Dialog.tsx | 1 - src-web/components/Editor/autocomplete.ts | 2 +- src-web/components/Editor/url/extension.ts | 1 - src-web/components/Grid.tsx | 17 ++++++---- src-web/components/HeaderEditor.tsx | 32 ++++++++++-------- src-web/components/RouterError.tsx | 23 ------------- src-web/hooks/useRequest.ts | 14 ++++---- src-web/hooks/useResponses.ts | 5 +-- src-web/hooks/useWorkspaces.ts | 3 +- src-web/lib/debounce.ts | 6 ++-- src-web/main.tsx | 2 +- src-web/pages/Workspaces.tsx | 1 + vite.config.ts | 4 ++- 15 files changed, 64 insertions(+), 87 deletions(-) delete mode 100644 src-web/components/RouterError.tsx diff --git a/package-lock.json b/package-lock.json index 11626274..8ac3e1ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,8 +42,6 @@ "@types/node": "^18.7.10", "@types/parse-color": "^1.0.1", "@types/parse-json": "^4.0.0", - "@types/react": "^18.0.15", - "@types/react-dom": "^18.0.6", "@typescript-eslint/eslint-plugin": "^5.52.0", "@typescript-eslint/parser": "^5.52.0", "autoprefixer": "^10.4.13", @@ -2406,33 +2404,27 @@ "version": "15.7.5", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", - "devOptional": true + "optional": true, + "peer": true }, "node_modules/@types/react": { "version": "18.0.28", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz", "integrity": "sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==", - "devOptional": true, + "optional": true, + "peer": true, "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", "csstype": "^3.0.2" } }, - "node_modules/@types/react-dom": { - "version": "18.0.11", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz", - "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==", - "dev": true, - "dependencies": { - "@types/react": "*" - } - }, "node_modules/@types/scheduler": { "version": "0.16.2", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", - "devOptional": true + "optional": true, + "peer": true }, "node_modules/@types/semver": { "version": "7.3.13", @@ -9467,33 +9459,27 @@ "version": "15.7.5", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", - "devOptional": true + "optional": true, + "peer": true }, "@types/react": { "version": "18.0.28", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz", "integrity": "sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==", - "devOptional": true, + "optional": true, + "peer": true, "requires": { "@types/prop-types": "*", "@types/scheduler": "*", "csstype": "^3.0.2" } }, - "@types/react-dom": { - "version": "18.0.11", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz", - "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==", - "dev": true, - "requires": { - "@types/react": "*" - } - }, "@types/scheduler": { "version": "0.16.2", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", - "devOptional": true + "optional": true, + "peer": true }, "@types/semver": { "version": "7.3.13", diff --git a/package.json b/package.json index 55143821..3feaaa46 100644 --- a/package.json +++ b/package.json @@ -49,8 +49,6 @@ "@types/node": "^18.7.10", "@types/parse-color": "^1.0.1", "@types/parse-json": "^4.0.0", - "@types/react": "^18.0.15", - "@types/react-dom": "^18.0.6", "@typescript-eslint/eslint-plugin": "^5.52.0", "@typescript-eslint/parser": "^5.52.0", "autoprefixer": "^10.4.13", diff --git a/src-web/components/Dialog.tsx b/src-web/components/Dialog.tsx index 7c9c41f3..539246b9 100644 --- a/src-web/components/Dialog.tsx +++ b/src-web/components/Dialog.tsx @@ -2,7 +2,6 @@ import * as D from '@radix-ui/react-dialog'; import classnames from 'classnames'; import { motion } from 'framer-motion'; import type { ComponentChildren } from 'preact'; -import React from 'react'; import { IconButton } from './IconButton'; import { HStack, VStack } from './Stacks'; diff --git a/src-web/components/Editor/autocomplete.ts b/src-web/components/Editor/autocomplete.ts index f4e29fcb..f1606861 100644 --- a/src-web/components/Editor/autocomplete.ts +++ b/src-web/components/Editor/autocomplete.ts @@ -11,7 +11,7 @@ export function debouncedAutocompletionDisplay({ millis }: { millis: number }) { startCompletion(view); }, millis); - return EditorView.updateListener.of(({ view, docChanged, focusChanged }) => { + return EditorView.updateListener.of(({ view, docChanged }) => { // const completions = currentCompletions(view.state); // const status = completionStatus(view.state); diff --git a/src-web/components/Editor/url/extension.ts b/src-web/components/Editor/url/extension.ts index 3abf9da9..0e40bf37 100644 --- a/src-web/components/Editor/url/extension.ts +++ b/src-web/components/Editor/url/extension.ts @@ -1,4 +1,3 @@ -import { completeFromList } from '@codemirror/autocomplete'; import { LanguageSupport, LRLanguage } from '@codemirror/language'; import { completions } from './completion'; import { parser } from './url'; diff --git a/src-web/components/Grid.tsx b/src-web/components/Grid.tsx index 27c28977..b51a6765 100644 --- a/src-web/components/Grid.tsx +++ b/src-web/components/Grid.tsx @@ -1,7 +1,7 @@ import classnames from 'classnames'; -import type { HTMLAttributes } from 'react'; +import type { ComponentChildren } from 'preact'; -const colsClasses = { +const colsClasses: Record = { none: 'grid-cols-none', 1: 'grid-cols-1', 2: 'grid-cols-2', @@ -24,13 +24,15 @@ const gapClasses = { 3: 'gap-3', }; -type Props = HTMLAttributes & { +interface Props { rows?: keyof typeof rowsClasses; cols?: keyof typeof colsClasses; gap?: keyof typeof gapClasses; -}; + className?: string; + children?: ComponentChildren; +} -export function Grid({ className, cols, gap, ...props }: Props) { +export function Grid({ className, cols, gap, children }: Props) { return (
+ > + {children} +
); } diff --git a/src-web/components/HeaderEditor.tsx b/src-web/components/HeaderEditor.tsx index 38f324d9..c989f77d 100644 --- a/src-web/components/HeaderEditor.tsx +++ b/src-web/components/HeaderEditor.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useCallback, useEffect, useState } from 'react'; import { useRequestUpdate } from '../hooks/useRequest'; import type { HttpHeader, HttpRequest } from '../lib/models'; import { IconButton } from './IconButton'; @@ -13,10 +13,13 @@ type PairWithId = { header: Partial; id: string }; export function HeaderEditor({ request }: Props) { const updateRequest = useRequestUpdate(request); - const saveHeaders = (pairs: PairWithId[]) => { - const headers = pairs.map((p) => ({ name: '', value: '', ...p.header })); - updateRequest.mutate({ headers }); - }; + const saveHeaders = useCallback( + (pairs: PairWithId[]) => { + const headers = pairs.map((p) => ({ name: '', value: '', ...p.header })); + updateRequest.mutate({ headers }); + }, + [updateRequest], + ); const newPair = () => { return { header: { name: '', value: '' }, id: Math.random().toString() }; @@ -26,13 +29,16 @@ export function HeaderEditor({ request }: Props) { request.headers.map((h) => ({ header: h, id: Math.random().toString() })), ); - const setPairsAndSave = (fn: (pairs: PairWithId[]) => PairWithId[]) => { - setPairs((oldPairs) => { - const newPairs = fn(oldPairs); - saveHeaders(newPairs); - return newPairs; - }); - }; + const setPairsAndSave = useCallback( + (fn: (pairs: PairWithId[]) => PairWithId[]) => { + setPairs((oldPairs) => { + const newPairs = fn(oldPairs); + saveHeaders(newPairs); + return newPairs; + }); + }, + [saveHeaders], + ); const handleChangeHeader = (pair: PairWithId) => { setPairsAndSave((pairs) => @@ -52,7 +58,7 @@ export function HeaderEditor({ request }: Props) { if (lastPair.header.name !== '' || lastPair.header.value !== '') { setPairsAndSave((pairs) => [...pairs, newPair()]); } - }, [pairs]); + }, [pairs, setPairsAndSave]); const handleDelete = (pair: PairWithId) => { setPairsAndSave((oldPairs) => oldPairs.filter((p) => p.id !== pair.id)); diff --git a/src-web/components/RouterError.tsx b/src-web/components/RouterError.tsx deleted file mode 100644 index 05bbdec6..00000000 --- a/src-web/components/RouterError.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { useRouteError } from 'react-router-dom'; -import { ButtonLink } from './ButtonLink'; -import { Heading } from './Heading'; -import { VStack } from './Stacks'; - -export function RouterError() { - const error = useRouteError(); - const stringified = JSON.stringify(error); - const message = (error as any).message ?? stringified; - return ( -
- - Route Error 🔥 - 
-          {message}
-
- - Go Home - - -
- ); -} diff --git a/src-web/hooks/useRequest.ts b/src-web/hooks/useRequest.ts index 0dbc5476..d5597bde 100644 --- a/src-web/hooks/useRequest.ts +++ b/src-web/hooks/useRequest.ts @@ -26,13 +26,15 @@ export function useRequestUpdate(request: HttpRequest | null) { throw new Error("Can't update a null request"); } - const updatedRequest = { ...request, ...patch } as any; + const updatedRequest = { ...request, ...patch }; - // TODO: Figure out why this is necessary - updatedRequest.createdAt = updatedRequest.createdAt.toISOString().replace('Z', ''); - updatedRequest.updatedAt = updatedRequest.updatedAt.toISOString().replace('Z', ''); - - await invoke('update_request', { request: updatedRequest }); + await invoke('update_request', { + request: { + ...updatedRequest, + createdAt: updatedRequest.createdAt.toISOString().replace('Z', ''), + updatedAt: updatedRequest.updatedAt.toISOString().replace('Z', ''), + }, + }); }, }); } diff --git a/src-web/hooks/useResponses.ts b/src-web/hooks/useResponses.ts index 55fefb0b..8ed7ee15 100644 --- a/src-web/hooks/useResponses.ts +++ b/src-web/hooks/useResponses.ts @@ -1,6 +1,7 @@ -import { invoke } from '@tauri-apps/api'; -import { convertDates, HttpResponse } from '../lib/models'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; +import { invoke } from '@tauri-apps/api'; +import type { HttpResponse } from '../lib/models'; +import { convertDates } from '../lib/models'; export function responsesQueryKey(requestId: string) { return ['responses', { requestId }]; diff --git a/src-web/hooks/useWorkspaces.ts b/src-web/hooks/useWorkspaces.ts index 9c133fe4..84561bc4 100644 --- a/src-web/hooks/useWorkspaces.ts +++ b/src-web/hooks/useWorkspaces.ts @@ -1,5 +1,6 @@ import { invoke } from '@tauri-apps/api'; -import { convertDates, Workspace } from '../lib/models'; +import type { Workspace } from '../lib/models'; +import { convertDates } from '../lib/models'; import { useQuery } from '@tanstack/react-query'; export function useWorkspaces() { diff --git a/src-web/lib/debounce.ts b/src-web/lib/debounce.ts index a2d44532..5252734b 100644 --- a/src-web/lib/debounce.ts +++ b/src-web/lib/debounce.ts @@ -1,6 +1,8 @@ -export function debounce(fn: (...args: any[]) => any, delay: number) { +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export function debounce(fn: (...args: any[]) => void, delay: number) { let timer: ReturnType; - const result = function (...args: Parameters) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const result = function (...args: any[]) { clearTimeout(timer); timer = setTimeout(() => fn(...args), delay); }; diff --git a/src-web/main.tsx b/src-web/main.tsx index 5e406346..9fed958f 100644 --- a/src-web/main.tsx +++ b/src-web/main.tsx @@ -1,7 +1,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { listen } from '@tauri-apps/api/event'; import { MotionConfig } from 'framer-motion'; -import { render } from 'preact'; +import { render } from 'react-dom'; import { HelmetProvider } from 'react-helmet-async'; import { AppRouter } from './components/AppRouter'; import { requestsQueryKey } from './hooks/useRequest'; diff --git a/src-web/pages/Workspaces.tsx b/src-web/pages/Workspaces.tsx index dfd70dfe..a2e97ffb 100644 --- a/src-web/pages/Workspaces.tsx +++ b/src-web/pages/Workspaces.tsx @@ -3,6 +3,7 @@ import { Heading } from '../components/Heading'; import { VStack } from '../components/Stacks'; import { useWorkspaces } from '../hooks/useWorkspaces'; +// eslint-disable-next-line @typescript-eslint/no-unused-vars export function Workspaces(props: { path: string }) { const workspaces = useWorkspaces(); return ( diff --git a/vite.config.ts b/vite.config.ts index fbbd52c2..537a31f4 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -4,7 +4,7 @@ import { ViteRsw } from 'vite-plugin-rsw'; import topLevelAwait from 'vite-plugin-top-level-await'; // https://vitejs.dev/config/ -export default defineConfig({ +const config = defineConfig({ plugins: [preact({ devToolsEnabled: true }), ViteRsw(), topLevelAwait()], // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build` @@ -30,3 +30,5 @@ export default defineConfig({ chunkSizeWarningLimit: Infinity, }, }); + +export default config;