Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into docs/update-images-and-links

Browse Source
This commit is contained in:
Daniel Ching 2025-06-25 13:31:54 +08:00 committed by GitHub
commit 3a1cb87a47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/download-extension/package.json
View File

@ -16,7 +16,7 @@
"rimraf": "^3.0.2",
"rolldown": "1.0.0-beta.1",
"run-script-os": "^1.1.6",
"typescript": "5.3.3",
"typescript": "5.8.3",
"vitest": "^3.0.6"
},
"files": [

2
web-app/package.json
View File

@ -28,7 +28,7 @@
"@tabler/icons-react": "^3.33.0",
"@tailwindcss/vite": "^4.1.4",
"@tanstack/react-router": "^1.116.0",
"@tanstack/react-router-devtools": "^1.116.0",
"@tanstack/react-router-devtools": "^1.121.34",
"@tauri-apps/api": "^2.5.0",
"@tauri-apps/plugin-deep-link": "~2",
"@tauri-apps/plugin-dialog": "^2.2.1",

4
web-app/src/containers/ThreadList.tsx
View File

@ -101,9 +101,7 @@ const SortableItem = memo(({ thread }: { thread: Thread }) => {
)}
>
<div className="py-1 pr-2 truncate">
<span
dangerouslySetInnerHTML={{ __html: thread.title || t('common:newThread') }}
/>
<span>{thread.title || t('common:newThread')}</span>
</div>
<div className="flex items-center">
<DropdownMenu

56
web-app/src/routes/settings/hardware.tsx
View File

@ -374,33 +374,37 @@ function Hardware() {
)}
{/* GPU Information */}
<Card title={t('settings:hardware.gpus')}>
{hardwareData.gpus.length > 0 ? (
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragEnd={handleDragEnd}
>
<SortableContext
items={hardwareData.gpus.map((gpu) => gpu.id)}
strategy={verticalListSortingStrategy}
{!IS_MACOS ? (
<Card title={t('settings:hardware.gpus')}>
{hardwareData.gpus.length > 0 ? (
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragEnd={handleDragEnd}
>
{hardwareData.gpus.map((gpu, index) => (
<SortableGPUItem
key={gpu.id || index}
gpu={gpu}
index={index}
/>
))}
</SortableContext>
</DndContext>
) : (
<CardItem
title={t('settings:hardware.noGpus')}
actions={<></>}
/>
)}
</Card>
<SortableContext
items={hardwareData.gpus.map((gpu) => gpu.id)}
strategy={verticalListSortingStrategy}
>
{hardwareData.gpus.map((gpu, index) => (
<SortableGPUItem
key={gpu.id || index}
gpu={gpu}
index={index}
/>
))}
</SortableContext>
</DndContext>
) : (
<CardItem
title={t('settings:hardware.noGpus')}
actions={<></>}
/>
)}
</Card>
) : (
<></>
)}
</div>
</div>
</div>

26
yarn.lock
View File

@ -2274,7 +2274,7 @@ __metadata:
"@tabler/icons-react": "npm:^3.33.0"
"@tailwindcss/vite": "npm:^4.1.4"
"@tanstack/react-router": "npm:^1.116.0"
"@tanstack/react-router-devtools": "npm:^1.116.0"
"@tanstack/react-router-devtools": "npm:^1.121.34"
"@tanstack/router-plugin": "npm:^1.116.1"
"@tauri-apps/api": "npm:^2.5.0"
"@tauri-apps/plugin-deep-link": "npm:~2"
@ -5751,17 +5751,16 @@ __metadata:
languageName: node
linkType: hard
"@tanstack/react-router-devtools@npm:^1.116.0":
version: 1.117.0
resolution: "@tanstack/react-router-devtools@npm:1.117.0"
"@tanstack/react-router-devtools@npm:^1.121.34":
version: 1.121.34
resolution: "@tanstack/react-router-devtools@npm:1.121.34"
dependencies:
"@tanstack/router-devtools-core": "npm:^1.117.0"
solid-js: "npm:^1.9.5"
"@tanstack/router-devtools-core": "npm:^1.121.34"
peerDependencies:
"@tanstack/react-router": ^1.117.0
"@tanstack/react-router": ^1.121.34
react: ">=18.0.0 || >=19.0.0"
react-dom: ">=18.0.0 || >=19.0.0"
checksum: 10c0/a30af002ec3bb3b835e1ec87dc2990778bd67f9b53cf8885fca625e537371eca3218620373797562a4196a5057a7fe8ea922c958dbb309792186dcf1ab113fb2
checksum: 10c0/815b32eafde6755a6f6f36d28590abd72db50530433b94ee864a5f37e61497b4c5b143943d1ce96786528b20e066708f8f441bf306c8b97bbc5217c65a4c12be
languageName: node
linkType: hard
@ -5806,21 +5805,22 @@ __metadata:
languageName: node
linkType: hard
"@tanstack/router-devtools-core@npm:^1.117.0":
version: 1.117.0
resolution: "@tanstack/router-devtools-core@npm:1.117.0"
"@tanstack/router-devtools-core@npm:^1.121.34":
version: 1.121.34
resolution: "@tanstack/router-devtools-core@npm:1.121.34"
dependencies:
clsx: "npm:^2.1.1"
goober: "npm:^2.1.16"
solid-js: "npm:^1.9.5"
peerDependencies:
"@tanstack/router-core": ^1.117.0
"@tanstack/router-core": ^1.121.34
csstype: ^3.0.10
solid-js: ">=1.9.5"
tiny-invariant: ^1.3.3
peerDependenciesMeta:
csstype:
optional: true
checksum: 10c0/063252e7bd58562a67be0766a0cfbeec31c04c43d6324e5b44953059123d0c222320fa52dc1ade01d3110075e51487836c835ad2e957c8b61a3797e0943d1eac
checksum: 10c0/3cdc0ee4827e4ab37a979700d062c318538a13b982ed80bb23b5235eea6fa5992940b406cc9c4e03737742a45f3ab8397aefe52a1b7913cdc48a470702a00f24
languageName: node
linkType: hard