Dax Raad 4 месяцев назад
Родитель
Сommit
9da95cb805

+ 1 - 1
.github/workflows/deploy.yml

@@ -17,7 +17,7 @@ jobs:
 
       - uses: oven-sh/setup-bun@v1
         with:
-          bun-version: 1.2.21
+          bun-version: 1.3.0
 
       - run: bun install
 

+ 1 - 1
.github/workflows/format.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: 1.2.21
+          bun-version: 1.3.0
 
       - name: run
         run: |

+ 1 - 1
.github/workflows/publish-vscode.yml

@@ -21,7 +21,7 @@ jobs:
 
       - uses: oven-sh/setup-bun@v2
         with:
-          bun-version: 1.2.21
+          bun-version: 1.3.0
 
       - run: git fetch --force --tags
       - run: bun install -g @vscode/vsce

+ 3 - 3
.github/workflows/publish.yml

@@ -37,16 +37,16 @@ jobs:
 
       - uses: oven-sh/setup-bun@v2
         with:
-          bun-version: 1.2.21
+          bun-version: 1.3.0
 
       - name: Cache ~/.bun
         id: cache-bun
         uses: actions/cache@v3
         with:
           path: ~/.bun
-          key: ${{ runner.os }}-bun-1-2-21-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-1-3-0-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-1-2-21-
+            ${{ runner.os }}-bun-1-3-0-
 
       - name: Install makepkg
         run: |

+ 3 - 3
.github/workflows/snapshot.yml

@@ -26,16 +26,16 @@ jobs:
 
       - uses: oven-sh/setup-bun@v2
         with:
-          bun-version: 1.2.21
+          bun-version: 1.3.0
 
       - name: Cache ~/.bun
         id: cache-bun
         uses: actions/cache@v3
         with:
           path: ~/.bun
-          key: ${{ runner.os }}-bun-1-2-21-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-1-3-0-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-1-2-21-
+            ${{ runner.os }}-bun-1-3-0-
 
       - name: Install dependencies
         run: bun install

+ 1 - 1
.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: 1.2.21
+          bun-version: 1.3.0
 
       - name: run
         run: |

+ 1 - 1
.github/workflows/typecheck.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: 1.2.21
+          bun-version: 1.3.0
 
       - name: Install dependencies
         run: bun install

+ 7 - 2
bun.lock

@@ -254,11 +254,14 @@
     "web-tree-sitter",
     "tree-sitter-bash",
   ],
+  "overrides": {
+    "@types/bun": "catalog:",
+  },
   "catalog": {
     "@hono/zod-validator": "0.4.2",
     "@kobalte/core": "0.13.11",
     "@tsconfig/node22": "22.0.2",
-    "@types/bun": "1.2.21",
+    "@types/bun": "1.3.0",
     "@types/node": "22.13.9",
     "ai": "5.0.8",
     "fuzzysort": "3.1.0",
@@ -1154,7 +1157,7 @@
 
     "@types/braces": ["@types/[email protected]", "", {}, "sha512-SQFof9H+LXeWNz8wDe7oN5zu7ket0qwMu5vZubW4GCJ8Kkeh6nBWUz87+KTz/G3Kqsrp0j/W253XJb3KMEeg3w=="],
 
-    "@types/bun": ["@types/bun@1.2.21", "", { "dependencies": { "bun-types": "1.2.21" } }, "sha512-NiDnvEqmbfQ6dmZ3EeUO577s4P5bf4HCTXtI6trMc6f6RzirY5IrF3aIookuSpyslFzrnvv2lmEWv5HyC1X79A=="],
+    "@types/bun": ["@types/bun@1.3.0", "", { "dependencies": { "bun-types": "1.3.0" } }, "sha512-+lAGCYjXjip2qY375xX/scJeVRmZ5cY0wyHYyCYxNcdEXrQ4AOe3gACgd4iQ8ksOslJtW4VNxBJ8llUwc3a6AA=="],
 
     "@types/debug": ["@types/[email protected]", "", { "dependencies": { "@types/ms": "*" } }, "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="],
 
@@ -3166,6 +3169,8 @@
 
     "@tanstack/router-utils/pathe": ["[email protected]", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="],
 
+    "@types/bun/bun-types": ["[email protected]", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-u8X0thhx+yJ0KmkxuEo9HAtdfgCBaM/aI9K90VQcQioAmkVp3SG3FkwWGibUFz3WdXAdcsqOcbU40lK7tbHdkQ=="],
+
     "@vercel/nft/estree-walker": ["[email protected]", "", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="],
 
     "@vercel/nft/glob": ["[email protected]", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],

+ 5 - 2
package.json

@@ -3,7 +3,7 @@
   "name": "opencode",
   "private": true,
   "type": "module",
-  "packageManager": "bun@1.2.21",
+  "packageManager": "bun@1.3.0",
   "scripts": {
     "dev": "bun run packages/opencode/src/index.ts",
     "typecheck": "bun turbo typecheck",
@@ -16,7 +16,7 @@
       "packages/sdk/js"
     ],
     "catalog": {
-      "@types/bun": "1.2.21",
+      "@types/bun": "1.3.0",
       "@hono/zod-validator": "0.4.2",
       "@kobalte/core": "0.13.11",
       "@types/node": "22.13.9",
@@ -56,5 +56,8 @@
   ],
   "patchedDependencies": {
     "@solidjs/[email protected]": "patches/@solidjs%[email protected]"
+  },
+  "overrides": {
+    "@types/bun": "catalog:"
   }
 }

+ 2 - 2
packages/opencode/src/config/config.ts

@@ -691,10 +691,10 @@ export namespace Config {
       }
       const data = parsed.data
       if (data.plugin) {
-        for (let i = 0; i < data.plugin?.length; i++) {
+        for (let i = 0; i < data.plugin.length; i++) {
           const plugin = data.plugin[i]
           try {
-            data.plugin[i] = import.meta.resolve(plugin, configFilepath)
+            data.plugin[i] = import.meta.resolve!(plugin, configFilepath)
           } catch (err) {}
         }
       }

+ 2 - 2
packages/opencode/src/lsp/client.ts

@@ -39,8 +39,8 @@ export namespace LSPClient {
     l.info("starting client")
 
     const connection = createMessageConnection(
-      new StreamMessageReader(input.server.process.stdout),
-      new StreamMessageWriter(input.server.process.stdin),
+      new StreamMessageReader(input.server.process.stdout as any),
+      new StreamMessageWriter(input.server.process.stdin as any),
     )
 
     const diagnostics = new Map<string, Diagnostic[]>()

+ 1 - 1
packages/opencode/src/util/context.ts

@@ -18,7 +18,7 @@ export namespace Context {
         return result
       },
       provide<R>(value: T, fn: () => R) {
-        return storage.run<R>(value, fn)
+        return storage.run(value, fn)
       },
     }
   }

+ 1 - 1
packages/opencode/test/snapshot/snapshot.test.ts

@@ -123,7 +123,7 @@ test("binary file handling", async () => {
       const before = await Snapshot.track()
       expect(before).toBeTruthy()
 
-      await Bun.write(`${tmp.path}/image.png`, Buffer.from([0x89, 0x50, 0x4e, 0x47]))
+      await Bun.write(`${tmp.path}/image.png`, new Uint8Array([0x89, 0x50, 0x4e, 0x47]))
 
       const patch = await Snapshot.patch(before!)
       expect(patch.files).toContain(`${tmp.path}/image.png`)

+ 1 - 0
packages/opencode/tsconfig.json

@@ -5,6 +5,7 @@
     "jsx": "preserve",
     "jsxImportSource": "@opentui/solid",
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
+    "types": [],
     "customConditions": ["browser"],
     "baseUrl": ".",
     "paths": {

+ 2 - 2
script/publish.ts

@@ -2,8 +2,8 @@
 
 import { $ } from "bun"
 import { createOpencode } from "@opencode-ai/sdk"
-if (process.versions.bun !== "1.2.21") {
-  throw new Error("This script requires bun@1.2.21")
+if (process.versions.bun !== "1.3.0") {
+  throw new Error("This script requires bun@1.3.0")
 }
 
 const notes = [] as string[]