From 08e9a096afdbd518ffe110cfc6adacf8dbaddb45 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Thu, 9 Oct 2025 10:21:36 -0600 Subject: [PATCH 1/3] upgrade web tools to use biome2 --- packages/web-tools/biome.json | 6 +++--- packages/web-tools/package.json | 3 ++- packages/web-tools/src/index.ts | 11 ++++------- pnpm-lock.yaml | 3 +++ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/web-tools/biome.json b/packages/web-tools/biome.json index b242fa54d..fd4e132e2 100644 --- a/packages/web-tools/biome.json +++ b/packages/web-tools/biome.json @@ -1,7 +1,7 @@ { - "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", - "extends": ["../../biome.json"], + "$schema": "https://biomejs.dev/schemas/2.2.5/schema.json", + "extends": ["../../biome2.json"], "files": { - "include": ["src/**/*"] + "includes": ["src/**/*"] } } diff --git a/packages/web-tools/package.json b/packages/web-tools/package.json index 25f46ea76..c85283c6c 100644 --- a/packages/web-tools/package.json +++ b/packages/web-tools/package.json @@ -27,6 +27,7 @@ "dependencies": { "@buster/typescript-config": "workspace:*", "@buster/vitest-config": "workspace:*", - "@mendable/firecrawl-js": "^1.29.1" + "@mendable/firecrawl-js": "^1.29.1", + "@biomejs/biome": "2.2.5" } } diff --git a/packages/web-tools/src/index.ts b/packages/web-tools/src/index.ts index e1f62e7da..acbaa7cb3 100644 --- a/packages/web-tools/src/index.ts +++ b/packages/web-tools/src/index.ts @@ -1,20 +1,17 @@ // Main exports for the web-tools package export { researchCompany } from './deep-research/company-research'; -export { FirecrawlService } from './services/firecrawl'; -export { pollJobStatus } from './utils/polling'; - // Types export type { CompanyResearch, - CompanyResearchOptions, CompanyResearchError, + CompanyResearchOptions, } from './deep-research/types'; - export type { FirecrawlConfig, WebSearchOptions, - WebSearchResult, WebSearchResponse, + WebSearchResult, } from './services/firecrawl'; - +export { FirecrawlService } from './services/firecrawl'; export type { PollingOptions } from './utils/polling'; +export { pollJobStatus } from './utils/polling'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 738589a76..fb1cde16d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1436,6 +1436,9 @@ importers: packages/web-tools: dependencies: + '@biomejs/biome': + specifier: 2.2.5 + version: 2.2.5 '@buster/typescript-config': specifier: workspace:* version: link:../typescript-config From ae27b13b8194f3303078532a1e18d16081ad968b Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Thu, 9 Oct 2025 10:26:35 -0600 Subject: [PATCH 2/3] updgrade vitest to use biome 2 --- packages/vitest-config/biome.json | 14 ++++++++++++++ packages/vitest-config/configs/base-config.ts | 2 +- packages/vitest-config/configs/ui-config.ts | 2 +- packages/vitest-config/package.json | 2 ++ .../scripts/collection-json-outputs.ts | 3 --- pnpm-lock.yaml | 3 +++ 6 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 packages/vitest-config/biome.json diff --git a/packages/vitest-config/biome.json b/packages/vitest-config/biome.json new file mode 100644 index 000000000..e0eedf35e --- /dev/null +++ b/packages/vitest-config/biome.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://biomejs.dev/schemas/2.2.5/schema.json", + "extends": ["../../biome2.json"], + "files": { + "includes": ["src/**/*", "scripts/**/*", "configs/**/*"] + }, + "linter": { + "rules": { + "suspicious": { + "noConsole": "off" + } + } + } +} diff --git a/packages/vitest-config/configs/base-config.ts b/packages/vitest-config/configs/base-config.ts index 70d45ebc5..d72a5e97f 100644 --- a/packages/vitest-config/configs/base-config.ts +++ b/packages/vitest-config/configs/base-config.ts @@ -1,6 +1,6 @@ import { loadEnv } from 'vite'; -import { defineConfig } from 'vitest/config'; import type { Plugin, ViteUserConfig } from 'vitest/config'; +import { defineConfig } from 'vitest/config'; export const baseConfig = defineConfig(async () => { const { default: tsconfigPaths } = await import('vite-tsconfig-paths'); diff --git a/packages/vitest-config/configs/ui-config.ts b/packages/vitest-config/configs/ui-config.ts index c17b2e6cb..974088281 100644 --- a/packages/vitest-config/configs/ui-config.ts +++ b/packages/vitest-config/configs/ui-config.ts @@ -1,6 +1,6 @@ import { loadEnv } from 'vite'; -import { defineConfig } from 'vitest/config'; import type { Plugin, ViteUserConfig } from 'vitest/config'; +import { defineConfig } from 'vitest/config'; export const uiConfig = defineConfig(async () => { const { default: tsconfigPaths } = await import('vite-tsconfig-paths'); diff --git a/packages/vitest-config/package.json b/packages/vitest-config/package.json index 04410d17a..6e47bc804 100644 --- a/packages/vitest-config/package.json +++ b/packages/vitest-config/package.json @@ -26,6 +26,7 @@ }, "scripts": { "build": "tsc --build", + "lint": "biome check --write", "collect-json-reports": "node dist/scripts/collect-json-outputs.js", "merge-json-reports": "nyc merge coverage/raw coverage/merged/merged-coverage.json", "report": "nyc report -t coverage/merged --report-dir coverage/report --reporter=html --exclude-after-remap false", @@ -35,6 +36,7 @@ "@buster/typescript-config": "workspace:*", "@vitest/coverage-v8": "^3.2.4", "@vitest/ui": "^3.2.4", + "@biomejs/biome": "2.2.5", "glob": "^11.0.3", "jsdom": "^26.1.0", "nyc": "^17.1.0", diff --git a/packages/vitest-config/scripts/collection-json-outputs.ts b/packages/vitest-config/scripts/collection-json-outputs.ts index cc732fd32..f00af6ca7 100644 --- a/packages/vitest-config/scripts/collection-json-outputs.ts +++ b/packages/vitest-config/scripts/collection-json-outputs.ts @@ -44,7 +44,6 @@ async function collectCoverageFiles() { await fs.copyFile(coverageFilePath, destinationFile); } catch (_err) { // File doesn't exist in this directory, skip - // biome-ignore lint/suspicious/noConsoleLog: console.log(`No coverage.json found in ${match}`); } } @@ -55,13 +54,11 @@ async function collectCoverageFiles() { const replaceDotPatterns = (str: string) => str.replace(/\.\.\//g, ''); if (directoriesWithCoverage.length > 0) { - // biome-ignore lint/suspicious/noConsoleLog: This is a log console.log( `Found coverage.json in: ${directoriesWithCoverage.map(replaceDotPatterns).join(', ')}` ); } - // biome-ignore lint/suspicious/noConsoleLog: This is a log console.log(`Coverage collected into: ${path.join(process.cwd())}`); } catch (error) { console.error('Error collecting coverage files:', error); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fb1cde16d..3fefe6103 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1406,6 +1406,9 @@ importers: packages/vitest-config: dependencies: + '@biomejs/biome': + specifier: 2.2.5 + version: 2.2.5 '@buster/typescript-config': specifier: workspace:* version: link:../typescript-config From 10e2827bf560c97a061d6449b03f7177342178fd Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Thu, 9 Oct 2025 10:30:02 -0600 Subject: [PATCH 3/3] upgrade test utils to use biome 2 --- biome2.json | 3 +++ packages/test-utils/biome.json | 6 +++--- packages/test-utils/env.d.ts | 2 +- packages/test-utils/package.json | 1 + packages/test-utils/src/database/chats/index.ts | 2 +- packages/test-utils/src/database/messages/index.ts | 2 +- .../src/database/organizations/createTestOrganization.ts | 4 +--- packages/test-utils/src/database/users/createTestUser.ts | 5 +---- packages/test-utils/src/envHelpers/env-helpers.test.ts | 4 ++-- packages/test-utils/src/envHelpers/env-helpers.ts | 3 +-- packages/test-utils/src/index.ts | 7 ++++--- packages/test-utils/src/mock-helpers.ts | 2 +- pnpm-lock.yaml | 3 +++ 13 files changed, 23 insertions(+), 21 deletions(-) diff --git a/biome2.json b/biome2.json index 715a762ed..252104ea3 100644 --- a/biome2.json +++ b/biome2.json @@ -78,6 +78,9 @@ "correctness": { "noUnusedFunctionParameters": "off", "noUnusedVariables": "off" + }, + "performance": { + "noDelete": "off" } } } diff --git a/packages/test-utils/biome.json b/packages/test-utils/biome.json index b242fa54d..fd4e132e2 100644 --- a/packages/test-utils/biome.json +++ b/packages/test-utils/biome.json @@ -1,7 +1,7 @@ { - "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", - "extends": ["../../biome.json"], + "$schema": "https://biomejs.dev/schemas/2.2.5/schema.json", + "extends": ["../../biome2.json"], "files": { - "include": ["src/**/*"] + "includes": ["src/**/*"] } } diff --git a/packages/test-utils/env.d.ts b/packages/test-utils/env.d.ts index 8a817e6a7..423737df3 100644 --- a/packages/test-utils/env.d.ts +++ b/packages/test-utils/env.d.ts @@ -10,4 +10,4 @@ declare global { } } -export {}; \ No newline at end of file +export {}; diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 8bfcfc3eb..96ef99251 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -30,6 +30,7 @@ "@buster/env-utils": "workspace:*", "@buster/typescript-config": "workspace:*", "@buster/vitest-config": "workspace:*", + "@biomejs/biome": "2.2.5", "uuid": "catalog:" } } diff --git a/packages/test-utils/src/database/chats/index.ts b/packages/test-utils/src/database/chats/index.ts index 28d6bd33a..ca2beabd0 100644 --- a/packages/test-utils/src/database/chats/index.ts +++ b/packages/test-utils/src/database/chats/index.ts @@ -1,2 +1,2 @@ -export * from './createTestChat'; export * from './cleanupTestChats'; +export * from './createTestChat'; diff --git a/packages/test-utils/src/database/messages/index.ts b/packages/test-utils/src/database/messages/index.ts index 919004cc3..2088c91b9 100644 --- a/packages/test-utils/src/database/messages/index.ts +++ b/packages/test-utils/src/database/messages/index.ts @@ -1,3 +1,3 @@ +export * from './cleanupTestMessages'; export * from './createTestMessage'; export * from './createTestMessageWithContext'; -export * from './cleanupTestMessages'; diff --git a/packages/test-utils/src/database/organizations/createTestOrganization.ts b/packages/test-utils/src/database/organizations/createTestOrganization.ts index 629860547..68aafab9d 100644 --- a/packages/test-utils/src/database/organizations/createTestOrganization.ts +++ b/packages/test-utils/src/database/organizations/createTestOrganization.ts @@ -7,9 +7,7 @@ import { v4 as uuidv4 } from 'uuid'; * @param params - Optional parameters to override defaults * @returns The organization ID */ -export async function createTestOrganization(params?: { - name?: string; -}): Promise { +export async function createTestOrganization(params?: { name?: string }): Promise { try { const organizationId = uuidv4(); const name = params?.name || `Test Organization ${uuidv4()}`; diff --git a/packages/test-utils/src/database/users/createTestUser.ts b/packages/test-utils/src/database/users/createTestUser.ts index 029957afb..9d8a71fad 100644 --- a/packages/test-utils/src/database/users/createTestUser.ts +++ b/packages/test-utils/src/database/users/createTestUser.ts @@ -7,10 +7,7 @@ import { v4 as uuidv4 } from 'uuid'; * @param params - Optional parameters to override defaults * @returns The user ID */ -export async function createTestUser(params?: { - email?: string; - name?: string; -}): Promise { +export async function createTestUser(params?: { email?: string; name?: string }): Promise { try { const userId = uuidv4(); const email = params?.email || `test-${uuidv4()}@example.com`; diff --git a/packages/test-utils/src/envHelpers/env-helpers.test.ts b/packages/test-utils/src/envHelpers/env-helpers.test.ts index f3ab051c8..955e8d7fa 100644 --- a/packages/test-utils/src/envHelpers/env-helpers.test.ts +++ b/packages/test-utils/src/envHelpers/env-helpers.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it, vi } from 'vitest'; import { - type TestEnvironment, cleanupTestEnvironment, setupTestEnvironment, + type TestEnvironment, withTestEnv, } from './env-helpers'; @@ -140,7 +140,7 @@ describe('env-helpers.ts - Unit Tests', () => { } if (originalCustomVar === undefined) { - delete process.env.CUSTOM_VAR; + process.env.CUSTOM_VAR = undefined; } }); diff --git a/packages/test-utils/src/envHelpers/env-helpers.ts b/packages/test-utils/src/envHelpers/env-helpers.ts index bd06f5742..5957f5fd2 100644 --- a/packages/test-utils/src/envHelpers/env-helpers.ts +++ b/packages/test-utils/src/envHelpers/env-helpers.ts @@ -31,8 +31,7 @@ export function withTestEnv(testFn: () => Promise): () => Promise { return async () => { const originalEnv = { ...process.env }; - // biome-ignore lint/correctness/noUnusedVariables: - const env = await setupTestEnvironment(); + await setupTestEnvironment(); try { return await testFn(); } finally { diff --git a/packages/test-utils/src/index.ts b/packages/test-utils/src/index.ts index f24ab8993..bd00767b1 100644 --- a/packages/test-utils/src/index.ts +++ b/packages/test-utils/src/index.ts @@ -1,9 +1,10 @@ // Database test helpers + +export * from './database/chats'; +export * from './database/dataSources'; +export * from './database/messages'; export * from './database/organizations'; export * from './database/users'; -export * from './database/chats'; -export * from './database/messages'; -export * from './database/dataSources'; export * from './envHelpers'; diff --git a/packages/test-utils/src/mock-helpers.ts b/packages/test-utils/src/mock-helpers.ts index cc6eb07e5..b43d0c6bd 100644 --- a/packages/test-utils/src/mock-helpers.ts +++ b/packages/test-utils/src/mock-helpers.ts @@ -40,7 +40,7 @@ export function createMockDate(fixedDate: string | Date) { const mockDate = new Date(fixedDate); const originalDate = Date; - // @ts-ignore + // @ts-expect-error global.Date = vi.fn(() => mockDate); global.Date.now = vi.fn(() => mockDate.getTime()); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3fefe6103..c1089e9ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1386,6 +1386,9 @@ importers: packages/test-utils: dependencies: + '@biomejs/biome': + specifier: 2.2.5 + version: 2.2.5 '@buster/database': specifier: workspace:* version: link:../database