From 9da95cb8058967365633bb738bc6e8bb49f029e7 Mon Sep 17 00:00:00 2001 From: Dax Raad Date: Fri, 10 Oct 2025 17:37:03 -0400 Subject: [PATCH] upgrade to bun 1.3.0 --- .github/workflows/deploy.yml | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/publish-vscode.yml | 2 +- .github/workflows/publish.yml | 6 +++--- .github/workflows/snapshot.yml | 6 +++--- .github/workflows/test.yml | 2 +- .github/workflows/typecheck.yml | 2 +- bun.lock | 9 +++++++-- package.json | 7 +++++-- packages/opencode/src/config/config.ts | 4 ++-- packages/opencode/src/lsp/client.ts | 4 ++-- packages/opencode/src/util/context.ts | 2 +- packages/opencode/test/snapshot/snapshot.test.ts | 2 +- packages/opencode/tsconfig.json | 1 + script/publish.ts | 4 ++-- 15 files changed, 32 insertions(+), 23 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 90d44064..d94f7f48 100644 --- a/.github/workflows/deploy.yml +++ b/.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 diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 11ecc93f..2927dd1b 100644 --- a/.github/workflows/format.yml +++ b/.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: | diff --git a/.github/workflows/publish-vscode.yml b/.github/workflows/publish-vscode.yml index f40c9379..bff8c192 100644 --- a/.github/workflows/publish-vscode.yml +++ b/.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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 310ce162..c10957a1 100644 --- a/.github/workflows/publish.yml +++ b/.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: | diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 0cc6faf7..ddb09535 100644 --- a/.github/workflows/snapshot.yml +++ b/.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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 73516f2e..441f9585 100644 --- a/.github/workflows/test.yml +++ b/.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: | diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index e8089656..3854644b 100644 --- a/.github/workflows/typecheck.yml +++ b/.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 diff --git a/bun.lock b/bun.lock index d8b347a6..f0622544 100644 --- a/bun.lock +++ b/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/braces@3.0.5", "", {}, "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/debug@4.1.12", "", { "dependencies": { "@types/ms": "*" } }, "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="], @@ -3166,6 +3169,8 @@ "@tanstack/router-utils/pathe": ["pathe@2.0.3", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="], + "@types/bun/bun-types": ["bun-types@1.3.0", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-u8X0thhx+yJ0KmkxuEo9HAtdfgCBaM/aI9K90VQcQioAmkVp3SG3FkwWGibUFz3WdXAdcsqOcbU40lK7tbHdkQ=="], + "@vercel/nft/estree-walker": ["estree-walker@2.0.2", "", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="], "@vercel/nft/glob": ["glob@10.4.5", "", { "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=="], diff --git a/package.json b/package.json index e1116503..eb9d33a1 100644 --- a/package.json +++ b/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/start@1.1.7": "patches/@solidjs%2Fstart@1.1.7.patch" + }, + "overrides": { + "@types/bun": "catalog:" } } diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts index a05d159e..aa785235 100644 --- a/packages/opencode/src/config/config.ts +++ b/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) {} } } diff --git a/packages/opencode/src/lsp/client.ts b/packages/opencode/src/lsp/client.ts index 66cc8eaa..8a658968 100644 --- a/packages/opencode/src/lsp/client.ts +++ b/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() diff --git a/packages/opencode/src/util/context.ts b/packages/opencode/src/util/context.ts index 1e5db36a..b56329d8 100644 --- a/packages/opencode/src/util/context.ts +++ b/packages/opencode/src/util/context.ts @@ -18,7 +18,7 @@ export namespace Context { return result }, provide(value: T, fn: () => R) { - return storage.run(value, fn) + return storage.run(value, fn) }, } } diff --git a/packages/opencode/test/snapshot/snapshot.test.ts b/packages/opencode/test/snapshot/snapshot.test.ts index 1398162e..0ffed351 100644 --- a/packages/opencode/test/snapshot/snapshot.test.ts +++ b/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`) diff --git a/packages/opencode/tsconfig.json b/packages/opencode/tsconfig.json index 167d7936..478672ce 100644 --- a/packages/opencode/tsconfig.json +++ b/packages/opencode/tsconfig.json @@ -5,6 +5,7 @@ "jsx": "preserve", "jsxImportSource": "@opentui/solid", "lib": ["ESNext", "DOM", "DOM.Iterable"], + "types": [], "customConditions": ["browser"], "baseUrl": ".", "paths": { diff --git a/script/publish.ts b/script/publish.ts index a4f2ba66..05d6df22 100755 --- a/script/publish.ts +++ b/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[]