Merge pull request #182 from calibreapp/types

🔨 Improve typing

Author: robmorieson

package.json

@@ -17,7 +17,9 @@
   },
   "prettier": {
     "semi": false,
-    "singleQuote": true
+    "singleQuote": true,
+    "trailingComma": "none",
+    "arrowParens": "avoid"
   },
   "keywords": [
     "performance",

src/components/HelpScout/index.tsx

@@ -160,8 +160,8 @@ const getIcon = (icon: HelpScoutIcon): JSX.Element => {
 interface Props {
   color?: string
   icon?: HelpScoutIcon
-  zIndex: string
-  horizontalPosition: 'left' | 'right'
+  zIndex?: string
+  horizontalPosition?: 'left' | 'right'
 }
 
 const HelpScout = ({

src/components/LiveChatLoaderProvider.tsx

@@ -5,11 +5,13 @@ import { LiveChatLoaderContext } from '../context'
 
 interface LiveChatLoaderProps {
   provider: Provider
-  children: JSX.Element
+  children: React.ReactNode
   idlePeriod?: number
   providerKey: string
   appID?: string
   baseUrl?: string
+  // locale is only relevant to certain providers, e.g. Messenger and Chatwoot
+  locale?: string
   beforeInit?: () => void
   onReady?: () => void
 }

src/components/Messenger/index.tsx

@@ -1,6 +1,5 @@
 import React, { CSSProperties, memo } from 'react'
 
-import { Provider } from '../../types'
 import useProvider from '../../hooks/useProvider'
 import useChat from '../../hooks/useChat'
 
@@ -26,7 +25,6 @@ const styles: CSSProperties = {
 }
 
 interface Props {
-  providerKey: Provider | undefined
   themeColor?: string
   loggedInGreeting?: string
   loggedOutGreeting?: string
@@ -38,6 +36,10 @@ interface Props {
   color?: string
 }
 
+interface ChatProps extends Props {
+  providerKey: string
+}
+
 // eslint-disable-next-line react/display-name
 const CustomerChat = memo(
   ({
@@ -47,7 +49,7 @@ const CustomerChat = memo(
     loggedOutGreeting,
     greetingDialogDisplay,
     greetingDialogDelay
-  }: Props) => {
+  }: ChatProps) => {
     const fields = {
       page_id: providerKey,
       theme_color: color,

website/.eslintrc.json

@@ -0,0 +1,10 @@
+{
+  "extends": [
+    "next"
+  ],
+  "settings": {
+    "next": {
+      "rootDir": "website/"
+    }
+  }
+}

website/layouts/main.js

@@ -7,36 +7,36 @@ export default ({ title, children }) => (
       <meta name="title" content={title} />
       <meta name="viewport" content="width=device-width, initial-scale=1" />
       <meta charSet="utf-8" />
-      <link rel="icon" href="/static/favicon.ico" />
-      <link color="#3b97d3" href="/static/spade.svg" rel="mask-icon" />
+      <link rel="icon" href="/favicon.ico" />
+      <link color="#3b97d3" href="/spade.svg" rel="mask-icon" />
       <link
         rel="apple-touch-icon"
         type="image/png"
-        href="/static/apple-touch-icon-76-76.png"
+        href="/apple-touch-icon-76-76.png"
         sizes="76x76"
       />
       <link
         rel="apple-touch-icon"
         type="image/png"
-        href="/static/apple-touch-icon-120-120.png"
+        href="/apple-touch-icon-120-120.png"
         sizes="120x120"
       />
       <link
         rel="apple-touch-icon"
         type="image/png"
-        href="/static/apple-touch-icon-152-152.png"
+        href="/apple-touch-icon-152-152.png"
         sizes="152x152"
       />
       <link
         rel="apple-touch-icon"
         type="image/png"
-        href="/static/apple-touch-icon-167-167.png"
+        href="/apple-touch-icon-167-167.png"
         sizes="167x167"
       />
       <link
         rel="apple-touch-icon"
         type="image/png"
-        href="/static/apple-touch-icon-180-180.png"
+        href="/apple-touch-icon-180-180.png"
         sizes="180x180"
       />
     </Head>

website/next-env.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.