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

…oard/non-majors-5d1e29067b build(deps): bump the non-majors group across 1 directory with 12 updates
traPtitech · Jul 16, 2024 · 57273f5 · 57273f5
2 parents f665eaf + ce53d1c
commit 57273f5
Show file tree

Hide file tree

Showing 6 changed files with 347 additions and 260 deletions.
diff --git a/dashboard/biome.json b/dashboard/biome.json
@@ -10,7 +10,7 @@
     "formatter": {
       "quoteStyle": "single",
       "semicolons": "asNeeded",
-      "trailingComma": "all"
+      "trailingCommas": "all"
     }
   },
   "linter": {

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -9,25 +9,25 @@
     "fmt": "biome format src",
     "fmt:apply": "biome format src --write",
     "lint": "biome check src",
-    "lint:apply": "biome check src --apply",
-    "lint:force": "biome check src --apply-unsafe",
+    "lint:apply": "biome check src --write",
+    "lint:force": "biome check src --write --unsafe",
     "fix": "yarn fmt:apply && yarn lint:apply",
     "typecheck": "tsc --noEmit",
     "ci": "biome ci src",
     "analyze": "vite build --mode analyze"
   },
   "license": "MIT",
   "devDependencies": {
-    "@biomejs/biome": "1.7.3",
+    "@biomejs/biome": "1.8.3",
     "@macaron-css/core": "1.5.2",
     "@macaron-css/solid": "1.5.1",
     "@macaron-css/vite": "1.5.1",
-    "@tanstack/virtual-core": "3.5.0",
-    "@types/node": "20.13.0",
+    "@tanstack/virtual-core": "3.8.1",
+    "@types/node": "20.14.9",
     "rollup-plugin-visualizer": "5.12.0",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "unplugin-fonts": "1.1.1",
-    "vite": "5.2.12",
+    "vite": "5.3.3",
     "vite-plugin-compression": "0.5.1",
     "vite-plugin-solid": "2.10.2",
     "vite-plugin-solid-svg": "0.8.1"
@@ -36,20 +36,20 @@
     "@bufbuild/protobuf": "1.10.0",
     "@connectrpc/connect": "1.4.0",
     "@connectrpc/connect-web": "1.4.0",
-    "@kobalte/core": "0.12.6",
-    "@modular-forms/solid": "0.20.0",
+    "@kobalte/core": "0.13.3",
+    "@modular-forms/solid": "0.22.1",
     "@solid-primitives/refs": "1.0.8",
     "@solidjs/meta": "0.29.4",
-    "@solidjs/router": "0.13.5",
-    "@tanstack/solid-virtual": "3.5.0",
+    "@solidjs/router": "0.13.6",
+    "@tanstack/solid-virtual": "3.8.1",
     "@types/async-lock": "1.4.2",
     "ansi-to-html": "0.7.2",
     "async-lock": "1.4.1",
     "chart.js": "4.4.3",
     "fuse.js": "7.0.0",
-    "solid-chartjs": "1.3.9",
+    "solid-chartjs": "1.3.10",
     "solid-icons": "1.1.0",
-    "solid-js": "1.8.17",
+    "solid-js": "1.8.18",
     "solid-tippy": "0.2.1",
     "solid-toast": "0.5.0",
     "tippy.js": "6.3.7"

diff --git a/dashboard/src/components/templates/app/AppsFilter.tsx b/dashboard/src/components/templates/app/AppsFilter.tsx
@@ -1,7 +1,8 @@
-import { As, Checkbox, DropdownMenu, RadioGroup } from '@kobalte/core'
+import { Checkbox, DropdownMenu, type PolymorphicCallbackProps, RadioGroup } from '@kobalte/core'
+import type { RadioGroupRootOptions, RadioGroupRootRenderProps } from '@kobalte/core/radio-group'
 import { keyframes, style } from '@macaron-css/core'
 import { styled } from '@macaron-css/solid'
-import { type Component, For, type Setter, Show } from 'solid-js'
+import { type Component, type ComponentProps, For, type Setter, Show } from 'solid-js'
 import { CheckBoxIcon } from '/@/components/UI/CheckBoxIcon'
 import { MaterialSymbols } from '/@/components/UI/MaterialSymbols'
 import { RadioIcon } from '/@/components/UI/RadioIcon'
@@ -245,32 +246,41 @@ const AppsFilter: Component<{
               </For>
             </ItemsContainer>
           </FilterItemContainer>
-          <RadioGroup.Root onChange={props.setSort} asChild>
-            <As
-              component={FilterItemContainer}
-              style={{
-                'grid-area': 'sort',
-              }}
-            >
-              <RadioGroup.Label>Sort</RadioGroup.Label>
-              <ItemsContainer>
-                <For each={Object.values(sortItems)}>
-                  {(s) => (
-                    <RadioGroup.Item value={s.value}>
-                      <RadioGroup.ItemInput />
-                      <RadioGroup.ItemLabel class={RadioItemStyle}>
-                        <RadioGroup.ItemIndicator forceMount>
-                          <RadioIcon selected={props.sort === s.value} />
-                        </RadioGroup.ItemIndicator>
-                        {s.label}
-                      </RadioGroup.ItemLabel>
-                      <RadioGroup.ItemDescription />
-                    </RadioGroup.Item>
-                  )}
-                </For>
-              </ItemsContainer>
-            </As>
-          </RadioGroup.Root>
+          <RadioGroup.Root
+            onChange={props.setSort}
+            as={(
+              asProps: PolymorphicCallbackProps<
+                ComponentProps<typeof FilterItemContainer>,
+                RadioGroupRootOptions,
+                RadioGroupRootRenderProps
+              >,
+            ) => (
+              <FilterItemContainer
+                style={{
+                  'grid-area': 'sort',
+                }}
+                {...asProps}
+              >
+                <RadioGroup.Label>Sort</RadioGroup.Label>
+                <ItemsContainer>
+                  <For each={Object.values(sortItems)}>
+                    {(s) => (
+                      <RadioGroup.Item value={s.value}>
+                        <RadioGroup.ItemInput />
+                        <RadioGroup.ItemLabel class={RadioItemStyle}>
+                          <RadioGroup.ItemIndicator forceMount>
+                            <RadioIcon selected={props.sort === s.value} />
+                          </RadioGroup.ItemIndicator>
+                          {s.label}
+                        </RadioGroup.ItemLabel>
+                        <RadioGroup.ItemDescription />
+                      </RadioGroup.Item>
+                    )}
+                  </For>
+                </ItemsContainer>
+              </FilterItemContainer>
+            )}
+          />
           <FilterItemContainer
             style={{
               'grid-area': 'noapp',

diff --git a/dashboard/src/libs/useModal.tsx b/dashboard/src/libs/useModal.tsx
@@ -1,7 +1,13 @@
-import { As, Dialog } from '@kobalte/core'
+import { Dialog, type PolymorphicCallbackProps } from '@kobalte/core'
+import type {
+  DialogContentOptions,
+  DialogContentRenderProps,
+  DialogDescriptionOptions,
+  DialogDescriptionRenderProps,
+} from '@kobalte/core/dialog'
 import { keyframes, style } from '@macaron-css/core'
 import { styled } from '@macaron-css/solid'
-import { type ParentComponent, Show, createSignal, mergeProps } from 'solid-js'
+import { type ComponentProps, type ParentComponent, Show, createSignal, mergeProps } from 'solid-js'
 import { colorVars, textVars } from '/@/theme'
 import { MaterialSymbols } from '../components/UI/MaterialSymbols'
 
@@ -207,12 +213,18 @@ const useModal = (options?: {
             <Dialog.Content
               onEscapeKeyDown={close}
               onPointerDownOutside={mergedProps.closeOnClickOutside ? close : undefined}
-              asChild
-            >
-              <As component={Content} fit={props.fit}>
-                {props.children}
-              </As>
-            </Dialog.Content>
+              as={(
+                asProps: PolymorphicCallbackProps<
+                  ComponentProps<typeof Content>,
+                  DialogContentOptions,
+                  DialogContentRenderProps
+                >,
+              ) => (
+                <Content fit={props.fit} {...asProps}>
+                  {props.children}
+                </Content>
+              )}
+            />
           </DialogPositioner>
         </Dialog.Portal>
       </Dialog.Root>
@@ -236,11 +248,19 @@ const useModal = (options?: {
     fit?: boolean
   }> = (props) => {
     return (
-      <Dialog.Description asChild>
-        <As component={Description} fit={props.fit}>
-          {props.children}
-        </As>
-      </Dialog.Description>
+      <Dialog.Description
+        as={(
+          asProps: PolymorphicCallbackProps<
+            ComponentProps<typeof Description>,
+            DialogDescriptionOptions,
+            DialogDescriptionRenderProps
+          >,
+        ) => (
+          <Description fit={props.fit} {...asProps}>
+            {props.children}
+          </Description>
+        )}
+      />
     )
   }
 

diff --git a/dashboard/src/routes.tsx b/dashboard/src/routes.tsx
@@ -119,13 +119,6 @@ export const useBuildData = () => {
   }
 }
 
-declare module '@solidjs/router' {
-  type RouteProps<S extends string> = {
-    // Invalid component type? workaround
-    component?: Component<RouteSectionProps>
-  }
-}
-
 export const Routes: Component<{ root: Component<RouteSectionProps> }> = (props) => (
   <Router root={props.root}>
     <Route path="/" component={() => <Navigate href="/apps" />} />