some lint and typecheck fixes

Opentrons · Mar 6, 2024 · 4d9314f · 4d9314f
1 parent c8373f5
commit 4d9314f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/app-shell/src/system-info/__tests__/usb-devices.test.ts b/app-shell/src/system-info/__tests__/usb-devices.test.ts
@@ -7,7 +7,6 @@ import { createLogger } from '../../log'
 import { createUsbDeviceMonitor, getWindowsDriverVersion } from '../usb-devices'
 import { isWindows } from '../../os'
 
-
 vi.mock('execa')
 vi.mock('usb')
 vi.mock('electron-store')
@@ -87,6 +86,7 @@ if (!isWindows()) {
       const mfrIterator = getManufacturerIterator()
       const productIterator = getProductIterator()
       vi.mocked(usb.getDeviceList).mockReturnValueOnce(mockDevices)
+      // @ts-expect-error Revisit after Vite migration.
       vi.mocked(usb.Device).mockImplementation((descriptorId, callback) =>
         callback(
           undefined,
@@ -143,7 +143,7 @@ if (!isWindows()) {
           }
         })
         createUsbDeviceMonitor({ onDeviceAdd })
-        // @ts-expect-error
+        // @ts-expect-error Revisit after Vite migration.
         vi.mocked(usb.Device).mockImplementation((descriptorId, callback) =>
           callback(undefined, ['sn1', 'mfr1', 'pn1'][descriptorId])
         )

diff --git a/app/src/App/OnDeviceDisplayApp.tsx b/app/src/App/OnDeviceDisplayApp.tsx
@@ -26,7 +26,6 @@ import { ConnectViaWifi } from '../pages/ConnectViaWifi'
 import { EmergencyStop } from '../pages/EmergencyStop'
 import { NameRobot } from '../pages/NameRobot'
 import { NetworkSetupMenu } from '../pages/NetworkSetupMenu'
-import { PrivacyPolicy } from '../pages/PrivacyPolicy'
 import { ProtocolSetup } from '../pages/ProtocolSetup'
 import { RobotDashboard } from '../pages/RobotDashboard'
 import { RobotSettingsDashboard } from '../pages/RobotSettingsDashboard'
@@ -61,7 +60,6 @@ import type { Dispatch } from '../redux/types'
 // network calls to localhost. see ./hacks.ts for more.
 hackWindowNavigatorOnLine()
 
-
 export const ON_DEVICE_DISPLAY_PATHS = [
   '/dashboard',
   '/deck-configuration',
@@ -85,7 +83,9 @@ export const ON_DEVICE_DISPLAY_PATHS = [
   '/welcome',
 ] as const
 
-function getPathComponent(path: typeof ON_DEVICE_DISPLAY_PATHS[number]): JSX.Element {
+function getPathComponent(
+  path: typeof ON_DEVICE_DISPLAY_PATHS[number]
+): JSX.Element {
   switch (path) {
     case '/dashboard':
       return <RobotDashboard />
@@ -152,10 +152,9 @@ export const OnDeviceDisplayApp = (): JSX.Element => {
   const dispatch = useDispatch<Dispatch>()
   const isIdle = useIdle(sleepTime, options)
   const [currentNode, setCurrentNode] = React.useState<null | HTMLElement>(null)
-  const scrollRef = React.useCallback(
-    (node: HTMLElement | null) => { setCurrentNode(node) },
-    []
-  )
+  const scrollRef = React.useCallback((node: HTMLElement | null) => {
+    setCurrentNode(node)
+  }, [])
   const isScrolling = useScrolling(currentNode)
 
   const TOUCH_SCREEN_STYLE = css`
@@ -206,16 +205,14 @@ export const OnDeviceDisplayApp = (): JSX.Element => {
                   <ToasterOven>
                     <ProtocolReceiptToasts />
                     <Switch>
-                      {ON_DEVICE_DISPLAY_PATHS.map(
-                        path => (
-                          <Route key={path} exact path={path}>
-                            <Box css={TOUCH_SCREEN_STYLE} ref={scrollRef}>
-                              <ModalPortalRoot />
-                              {getPathComponent(path)}
-                            </Box>
-                          </Route>
-                        )
-                      )}
+                      {ON_DEVICE_DISPLAY_PATHS.map(path => (
+                        <Route key={path} exact path={path}>
+                          <Box css={TOUCH_SCREEN_STYLE} ref={scrollRef}>
+                            <ModalPortalRoot />
+                            {getPathComponent(path)}
+                          </Box>
+                        </Route>
+                      ))}
                       <Redirect exact from="/" to={'/loading'} />
                     </Switch>
                   </ToasterOven>

diff --git a/tsconfig-eslint.json b/tsconfig-eslint.json
@@ -34,6 +34,7 @@
     "react-api-client/src",
     "usb-bridge/node-client/src",
     "**/*.js",
+    "**/*.ts",
     "*.js",
     ".*.js",
     "**/*.json"

diff --git a/vitest.config.ts b/vitest.config.ts
@@ -1,9 +1,11 @@
+/* eslint-disable @typescript-eslint/triple-slash-reference */
 /// <reference types="vitest" />
 /// <reference types="vite/client" />
 import path from 'path'
 import { configDefaults, defineConfig, mergeConfig } from 'vitest/config'
 import viteConfig from './vite.config'
 
+// eslint-disable-next-line import/no-default-export
 export default mergeConfig(
   viteConfig,
   defineConfig({