Skip to content

Commit 35ad6a5

Browse files
authored
Merge branch 'dev' into fix-permission-keyboard-shortcut
2 parents b9f0dd3 + d69ba27 commit 35ad6a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1774
-1307
lines changed

.github/workflows/deploy.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ jobs:
1717

1818
- uses: ./.github/actions/setup-bun
1919

20+
- uses: actions/setup-node@v4
21+
with:
22+
node-version: "24"
23+
2024
- run: bun sst deploy --stage=${{ github.ref_name }}
2125
env:
2226
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

STATS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,4 @@
147147
| 2025-11-19 | 804,409 (+12,846) | 747,624 (+15,080) | 1,552,033 (+27,926) |
148148
| 2025-11-20 | 814,620 (+10,211) | 757,907 (+10,283) | 1,572,527 (+20,494) |
149149
| 2025-11-21 | 826,309 (+11,689) | 769,307 (+11,400) | 1,595,616 (+23,089) |
150+
| 2025-11-22 | 837,269 (+10,960) | 780,996 (+11,689) | 1,618,265 (+22,649) |

bun.lock

Lines changed: 640 additions & 468 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/hashes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"nodeModules": "sha256-HILcNy8B0k++ObGwUrD9dM0n9MvASR4AiyxmKSv3LV8="
2+
"nodeModules": "sha256-RBR8w/avdOa1TcUkfGC1pzlU+KnhNMLq5L4+ZRFex6s="
33
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"vite": "7.1.4",
4949
"@solidjs/meta": "0.29.4",
5050
"@solidjs/router": "0.15.4",
51-
"@solidjs/start": "1.2.0",
51+
"@solidjs/start": "https://pkg.pr.new/@solidjs/start@dbff19d",
5252
"solid-js": "1.9.10",
5353
"vite-plugin-solid": "2.11.10"
5454
}

packages/console/app/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ dist
33
.output
44
.vercel
55
.netlify
6-
.vinxi
76
app.config.timestamp_*.js
87

98
# Environment

packages/console/app/app.config.ts

Lines changed: 0 additions & 23 deletions
This file was deleted.

packages/console/app/package.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "@opencode-ai/console-app",
3-
"version": "1.0.98",
3+
"version": "1.0.105",
44
"type": "module",
55
"scripts": {
66
"typecheck": "tsgo --noEmit",
7-
"dev": "vinxi dev --host 0.0.0.0",
7+
"dev": "vite dev --host 0.0.0.0",
88
"dev:remote": "VITE_AUTH_URL=https://auth.dev.opencode.ai bun sst shell --stage=dev bun dev",
9-
"build": "./script/generate-sitemap.ts && vinxi build && ../../opencode/script/schema.ts ./.output/public/config.json",
10-
"start": "vinxi start"
9+
"build": "./script/generate-sitemap.ts && vite build && ../../opencode/script/schema.ts ./.output/public/config.json",
10+
"start": "vite start"
1111
},
1212
"dependencies": {
13+
"@cloudflare/vite-plugin": "1.15.2",
1314
"@ibm/plex": "6.4.1",
1415
"@jsx-email/render": "1.1.1",
1516
"@kobalte/core": "catalog:",
@@ -21,13 +22,15 @@
2122
"@solidjs/router": "catalog:",
2223
"@solidjs/start": "catalog:",
2324
"chart.js": "4.5.1",
25+
"nitro": "3.0.1-alpha.1",
2426
"solid-js": "catalog:",
25-
"vinxi": "^0.5.7",
27+
"vite": "catalog:",
2628
"zod": "catalog:"
2729
},
2830
"devDependencies": {
31+
"@typescript/native-preview": "catalog:",
2932
"typescript": "catalog:",
30-
"@typescript/native-preview": "catalog:"
33+
"wrangler": "4.50.0"
3134
},
3235
"engines": {
3336
"node": ">=22"

packages/console/app/src/context/auth.session.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useSession } from "vinxi/http"
1+
import { useSession } from "@solidjs/start/http"
22

33
export interface AuthSession {
44
account?: Record<
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
/// <reference types="@solidjs/start/env" />
2+
3+
export declare module "@solidjs/start/server" {
4+
export type APIEvent = { request: Request }
5+
}

0 commit comments

Comments
 (0)