From be3f46817e5bc3408a900635cf214f2b538de5d1 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Wed, 21 May 2025 21:39:41 -0700 Subject: [PATCH] Fix vite server (#3816) --- packages/build/tsconfig.json | 3 ++- pnpm-lock.yaml | 3 --- webview-ui/package.json | 3 +-- webview-ui/vite.config.ts | 13 ++++++++++++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/build/tsconfig.json b/packages/build/tsconfig.json index 0f9961fdbd..a66434e570 100644 --- a/packages/build/tsconfig.json +++ b/packages/build/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "@roo-code/config-typescript/base.json", "compilerOptions": { - "types": ["vitest/globals"] + "types": ["vitest/globals"], + "outDir": "dist" }, "include": ["src"], "exclude": ["node_modules"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ab4d176d4f..b028cdc06f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -625,9 +625,6 @@ importers: '@jest/globals': specifier: ^29.7.0 version: 29.7.0 - '@roo-code/build': - specifier: workspace:^ - version: link:../packages/build '@roo-code/config-eslint': specifier: workspace:^ version: link:../packages/config-eslint diff --git a/webview-ui/package.json b/webview-ui/package.json index e8a540411e..faacb27cc8 100644 --- a/webview-ui/package.json +++ b/webview-ui/package.json @@ -8,7 +8,7 @@ "test": "jest -w=40%", "format": "prettier --write src", "dev": "vite", - "build": "pnpm --filter @roo-code/build build && tsc -b && vite build", + "build": "tsc -b && vite build", "preview": "vite preview", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build", @@ -76,7 +76,6 @@ "@jest/globals": "^29.7.0", "@roo-code/config-eslint": "workspace:^", "@roo-code/config-typescript": "workspace:^", - "@roo-code/build": "workspace:^", "@storybook/addon-essentials": "^8.5.6", "@storybook/blocks": "^8.5.6", "@storybook/react": "^8.5.6", diff --git a/webview-ui/vite.config.ts b/webview-ui/vite.config.ts index d3ca5b4a6b..35bc6912d8 100644 --- a/webview-ui/vite.config.ts +++ b/webview-ui/vite.config.ts @@ -1,11 +1,22 @@ import path, { resolve } from "path" import fs from "fs" +import { execSync } from "child_process" import { defineConfig, type PluginOption, type Plugin } from "vite" import react from "@vitejs/plugin-react" import tailwindcss from "@tailwindcss/vite" -import { getGitSha } from "@roo-code/build" +function getGitSha() { + let gitSha: string | undefined = undefined + + try { + gitSha = execSync("git rev-parse HEAD").toString().trim() + } catch (_error) { + // NO-OP + } + + return gitSha +} const wasmPlugin = (): Plugin => ({ name: "wasm",