Merge pull request #817 from traPtitech/dependabot/npm_and_yarn/dashb…

…oard/dev-deps-3660fec8b3 ⬆️ Bump the dev-deps group in /dashboard with 6 updates
traPtitech · Dec 8, 2023 · f6bc6b2 · f6bc6b2
2 parents fe372a2 + ffc8cbe
commit f6bc6b2
Show file tree

Hide file tree

Showing 15 changed files with 177 additions and 158 deletions.
diff --git a/dashboard/biome.json b/dashboard/biome.json
@@ -21,7 +21,7 @@
         "noUnusedImports": "error"
       },
       "style": {
-         "noNonNullAssertion": "warn"
+        "noNonNullAssertion": "warn"
       }
     }
   },

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -17,18 +17,18 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@biomejs/biome": "1.3.3",
+    "@biomejs/biome": "1.4.1",
     "@macaron-css/core": "1.2.0",
     "@macaron-css/solid": "1.4.1",
     "@macaron-css/vite": "1.4.3",
     "@tanstack/virtual-core": "3.0.1",
-    "@types/node": "20.9.4",
-    "rollup-plugin-visualizer": "5.9.3",
-    "typescript": "5.3.2",
+    "@types/node": "20.10.4",
+    "rollup-plugin-visualizer": "5.10.0",
+    "typescript": "5.3.3",
     "unplugin-fonts": "1.1.1",
-    "vite": "5.0.2",
+    "vite": "5.0.6",
     "vite-plugin-compression": "0.5.1",
-    "vite-plugin-solid": "2.7.2",
+    "vite-plugin-solid": "2.8.0",
     "vite-plugin-solid-svg": "0.7.0"
   },
   "dependencies": {

diff --git a/dashboard/src/components/UI/RadioIcon.tsx b/dashboard/src/components/UI/RadioIcon.tsx
@@ -61,16 +61,10 @@ export interface Props {
 
 export const RadioIcon: Component<Props> = (props) => {
   return (
-    <Container checked={props.selected} disabled={props.disabled}>
+    <Container checked={props.selected} disabled={props.disabled} role="img">
       <Show when={props.selected}>
-        <svg
-          width="20"
-          height="20"
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-          role="presentation"
-        >
+        <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <title>Radio Icon</title>
           <circle cx="10" cy="10" r="4" fill="currentColor" />
         </svg>
       </Show>

diff --git a/dashboard/src/components/templates/OwnerList.tsx b/dashboard/src/components/templates/OwnerList.tsx
@@ -90,11 +90,10 @@ const AddOwners: Component<{
   const filteredUsers = createMemo(() => {
     if (searchUserQuery() === '') {
       return props.nonOwners
-    } else {
-      return fuse()
-        .search(searchUserQuery())
-        .map((result) => result.item)
     }
+    return fuse()
+      .search(searchUserQuery())
+      .map((result) => result.item)
   })
 
   return (
@@ -188,11 +187,10 @@ const OwnerList: Component<{
   const filteredOwners = createMemo(() => {
     if (searchUserQuery() === '') {
       return props.owners
-    } else {
-      return fuse()
-        .search(searchUserQuery())
-        .map((result) => result.item)
     }
+    return fuse()
+      .search(searchUserQuery())
+      .map((result) => result.item)
   })
 
   const nonOwners = createMemo(() => props.users.filter((u) => !props.owners.some((o) => o.id === u.id)))

diff --git a/dashboard/src/components/templates/Select.tsx b/dashboard/src/components/templates/Select.tsx
@@ -167,7 +167,7 @@ export type SingleSelectProps<T extends string | number> = SelectProps<T> & {
   setValue?: (v: T) => void
 }
 
-export const SingleSelect = <T extends string | number,>(props: SingleSelectProps<T>): JSX.Element => {
+export const SingleSelect = <T extends string | number>(props: SingleSelectProps<T>): JSX.Element => {
   const [rootProps, selectProps] = splitProps(
     props,
     ['name', 'placeholder', 'options', 'required', 'disabled', 'readOnly'],
@@ -228,7 +228,7 @@ export type MultiSelectProps<T extends string | number> = SelectProps<T> & {
   setValue?: (v: T[]) => void
 }
 
-export const MultiSelect = <T extends string | number,>(props: MultiSelectProps<T>): JSX.Element => {
+export const MultiSelect = <T extends string | number>(props: MultiSelectProps<T>): JSX.Element => {
   const [rootProps, selectProps] = splitProps(
     props,
     ['name', 'placeholder', 'options', 'required', 'disabled', 'readOnly'],
@@ -349,7 +349,7 @@ export type ComboBoxProps<T extends string | number> = SelectProps<T> & {
   setValue?: (v: T) => void
 }
 
-export const ComboBox = <T extends string | number,>(props: SingleSelectProps<T>): JSX.Element => {
+export const ComboBox = <T extends string | number>(props: SingleSelectProps<T>): JSX.Element => {
   const [rootProps, selectProps] = splitProps(
     props,
     ['name', 'placeholder', 'options', 'required', 'disabled', 'readOnly'],
@@ -362,10 +362,9 @@ export const ComboBox = <T extends string | number,>(props: SingleSelectProps<T>
       if (find) {
         props.setValue?.(find.value)
         return find
-      } else {
-        props.setValue?.(prev.value)
-        return prev
       }
+      props.setValue?.(prev.value)
+      return prev
     },
     { label: props.value?.toString() ?? '', value: props.value ?? ('' as T) },
   )

diff --git a/dashboard/src/libs/application.tsx b/dashboard/src/libs/application.tsx
@@ -51,9 +51,8 @@ export const deploymentState = (app: Application): ApplicationState => {
       case Application_ContainerState.UNKNOWN:
         return ApplicationState.Error
     }
-  } else {
-    return ApplicationState.Serving
   }
+  return ApplicationState.Serving
 }
 
 const errorCommit = '0'.repeat(40)

diff --git a/dashboard/src/libs/branchesSuggestion.ts b/dashboard/src/libs/branchesSuggestion.ts
@@ -16,9 +16,8 @@ export const useBranchesSuggestion = (repoID: () => string, current: () => strin
       const normal = branches?.filter((b) => !b.includes('/'))
       const long = branches?.filter((b) => b.includes('/'))
       return [normal, long]
-    } else {
-      return [[], []]
     }
+    return [[], []]
   })
   const branchesFuse = createMemo(() => {
     const [normal, long] = branches()

diff --git a/dashboard/src/libs/clipboard.ts b/dashboard/src/libs/clipboard.ts
@@ -4,20 +4,19 @@ const copyTextToClipboard = async (text: string): Promise<void> => {
   if (navigator.clipboard) {
     // Use Clipboard API when available
     return navigator.clipboard.writeText(text)
-  } else {
-    const textArea = document.createElement('textarea')
-    textArea.value = text
+  }
+  const textArea = document.createElement('textarea')
+  textArea.value = text
 
-    // Avoid scrolling
-    textArea.style.position = 'fixed'
-    textArea.style.top = '0'
+  // Avoid scrolling
+  textArea.style.position = 'fixed'
+  textArea.style.top = '0'
 
-    document.body.appendChild(textArea)
-    textArea.focus()
-    textArea.select()
-    document.execCommand('copy')
-    document.body.removeChild(textArea)
-  }
+  document.body.appendChild(textArea)
+  textArea.focus()
+  textArea.select()
+  document.execCommand('copy')
+  document.body.removeChild(textArea)
 }
 
 export const writeToClipboard = (text: string): Promise<void> =>

diff --git a/dashboard/src/libs/localStore.ts b/dashboard/src/libs/localStore.ts
@@ -3,7 +3,7 @@ import { createStore } from 'solid-js/store'
 
 // https://www.solidjs.com/examples/todos
 
-export const createLocalSignal = <T,>(name: string, init: T): ReturnType<typeof createSignal<T>> => {
+export const createLocalSignal = <T>(name: string, init: T): ReturnType<typeof createSignal<T>> => {
   const localState = localStorage.getItem(name)
   const [state, setState] = createSignal<T>(localState ? JSON.parse(localState) : init)
   createEffect(() => localStorage.setItem(name, JSON.stringify(state())))

diff --git a/dashboard/src/libs/random.ts b/dashboard/src/libs/random.ts
@@ -1,2 +1,2 @@
 export const randIntN = (max: number): number => Math.floor(Math.random() * max)
-export const pickRandom = <T,>(arr: T[]): T => arr[randIntN(arr.length)]
+export const pickRandom = <T>(arr: T[]): T => arr[randIntN(arr.length)]
diff --git a/dashboard/src/libs/unique.ts b/dashboard/src/libs/unique.ts
@@ -1 +1 @@
-export const unique = <T,>(arr: T[]): T[] => Array.from(new Set(arr))
+export const unique = <T>(arr: T[]): T[] => Array.from(new Set(arr))
diff --git a/dashboard/src/pages/apps.tsx b/dashboard/src/pages/apps.tsx
@@ -96,9 +96,8 @@ const compareRepoWithApp =
     if (a.apps.length > 0 && b.apps.length > 0) {
       if (sort === 'asc') {
         return newestAppDate(a.apps) - newestAppDate(b.apps)
-      } else {
-        return newestAppDate(b.apps) - newestAppDate(a.apps)
       }
+      return newestAppDate(b.apps) - newestAppDate(a.apps)
     }
     // Bring up repositories with 1 or more apps at top
     if ((a.apps.length > 0 && b.apps.length === 0) || (a.apps.length === 0 && b.apps.length > 0)) {

diff --git a/dashboard/src/pages/apps/new.tsx b/dashboard/src/pages/apps/new.tsx
@@ -515,7 +515,7 @@ const formStep = {
   general: 1,
   website: 2,
 } as const
-type FormStep = typeof formStep[keyof typeof formStep]
+type FormStep = (typeof formStep)[keyof typeof formStep]
 
 export default () => {
   const [searchParams, setParam] = useSearchParams()

diff --git a/dashboard/src/pages/repos/[id]/settings/general.tsx b/dashboard/src/pages/repos/[id]/settings/general.tsx
@@ -146,8 +146,8 @@ const DeleteRepository: Component<{
                 content: !props.hasPermission
                   ? 'リポジトリを削除するにはオーナーになる必要があります'
                   : !canDeleteRepository()
-                  ? 'リポジトリ内にアプリケーションが存在するため削除できません'
-                  : undefined,
+                    ? 'リポジトリ内にアプリケーションが存在するため削除できません'
+                    : undefined,
               },
             }}
           >
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const unique = <T,>(arr: T[]): T[] => Array.from(new Set(arr))
		export const unique = <T>(arr: T[]): T[] => Array.from(new Set(arr))