diff options
| author | Dax Raad <[email protected]> | 2025-11-26 20:31:12 -0500 |
|---|---|---|
| committer | Dax Raad <[email protected]> | 2025-11-26 20:31:26 -0500 |
| commit | 501a2539c73278f11a7c8d97c8fec0723a22971d (patch) | |
| tree | 8eedbb44b71cd987d2eb289e459c9b1d67fd449f | |
| parent | 6a9856d4809015e0fcc4e26a355d4b1e1e0e40fb (diff) | |
| download | opencode-501a2539c73278f11a7c8d97c8fec0723a22971d.tar.gz opencode-501a2539c73278f11a7c8d97c8fec0723a22971d.zip | |
revert ts lsp to monorepo root
| -rw-r--r-- | bun.lock | 1 | ||||
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | packages/opencode/src/lsp/server.ts | 8 |
3 files changed, 9 insertions, 3 deletions
@@ -8,6 +8,7 @@ "@aws-sdk/client-s3": "3.933.0", "@opencode-ai/script": "workspace:*", "@opencode-ai/sdk": "workspace:*", + "typescript": "catalog:", }, "devDependencies": { "@tsconfig/bun": "catalog:", diff --git a/package.json b/package.json index 6de81dc24..e85f08e4e 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,8 @@ "dependencies": { "@aws-sdk/client-s3": "3.933.0", "@opencode-ai/script": "workspace:*", - "@opencode-ai/sdk": "workspace:*" + "@opencode-ai/sdk": "workspace:*", + "typescript": "catalog:" }, "repository": { "type": "git", diff --git a/packages/opencode/src/lsp/server.ts b/packages/opencode/src/lsp/server.ts index af96a02d8..0bc229e97 100644 --- a/packages/opencode/src/lsp/server.ts +++ b/packages/opencode/src/lsp/server.ts @@ -82,10 +82,14 @@ export namespace LSPServer { export const Typescript: Info = { id: "typescript", - root: NearestRoot(["tsconfig.json", "package.json", "jsconfig.json", ".git"], ["deno.json", "deno.jsonc"]), + root: NearestRoot( + ["package-lock.json", "bun.lockb", "bun.lock", "pnpm-lock.yaml", "yarn.lock"], + ["deno.json", "deno.jsonc"], + ), extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts"], async spawn(root) { - const tsserver = await Bun.resolve("typescript/lib/tsserver.js", root).catch(() => {}) + const tsserver = await Bun.resolve("typescript/lib/tsserver.js", Instance.directory).catch(() => {}) + log.info("typescript server", { tsserver }) if (!tsserver) return const proc = spawn(BunProc.which(), ["x", "typescript-language-server", "--stdio"], { cwd: root, |