From fcb60cfaa49e5acb8a8289ee5fd6343a18bc4b53 Mon Sep 17 00:00:00 2001 From: cte Date: Wed, 28 May 2025 22:15:18 -0700 Subject: [PATCH] Fix Roo Code Nightly package.json generation --- packages/build/package.json | 2 +- packages/build/src/__tests__/index.test.ts | 12 +++++++++++- packages/build/src/esbuild.ts | 8 ++++---- packages/build/vitest.config.ts | 8 ++++++++ packages/cloud/package.json | 2 +- packages/cloud/src/__tests__/RefreshTimer.test.ts | 2 +- packages/telemetry/package.json | 2 +- packages/types/package.json | 2 +- .../providers/fetchers/__tests__/openrouter.spec.ts | 2 +- src/package.json | 2 +- 10 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 packages/build/vitest.config.ts diff --git a/packages/build/package.json b/packages/build/package.json index 578f5e1f33..b6897732db 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -8,7 +8,7 @@ "scripts": { "lint": "eslint src --ext=ts --max-warnings=0", "check-types": "tsc --noEmit", - "test": "vitest --globals --run", + "test": "vitest run", "build": "tsc", "clean": "rimraf dist .turbo" }, diff --git a/packages/build/src/__tests__/index.test.ts b/packages/build/src/__tests__/index.test.ts index 538957f3c7..0b38287cb0 100644 --- a/packages/build/src/__tests__/index.test.ts +++ b/packages/build/src/__tests__/index.test.ts @@ -1,4 +1,4 @@ -// npx vitest --globals run src/__tests__/index.test.ts +// npx vitest run src/__tests__/index.test.ts import { generatePackageJson } from "../index.js" @@ -67,6 +67,11 @@ describe("generatePackageJson", () => { group: "navigation@6", when: "activeWebviewPanelId == roo-cline.TabPanelProvider", }, + { + command: "roo-cline.accountButtonClicked", + group: "navigation@6", + when: "activeWebviewPanelId == roo-cline.TabPanelProvider && config.roo-cline.rooCodeCloudEnabled", + }, ], }, submenus: [ @@ -175,6 +180,11 @@ describe("generatePackageJson", () => { group: "navigation@6", when: "activeWebviewPanelId == roo-code-nightly.TabPanelProvider", }, + { + command: "roo-code-nightly.accountButtonClicked", + group: "navigation@6", + when: "activeWebviewPanelId == roo-code-nightly.TabPanelProvider && config.roo-code-nightly.rooCodeCloudEnabled", + }, ], }, submenus: [ diff --git a/packages/build/src/esbuild.ts b/packages/build/src/esbuild.ts index ab76ca2ff7..8bff64aea1 100644 --- a/packages/build/src/esbuild.ts +++ b/packages/build/src/esbuild.ts @@ -213,12 +213,12 @@ function transformArrayRecord(obj: Record, from: string, to: s return Object.entries(obj).reduce( (acc, [key, ary]) => ({ ...acc, - [key.replace(from, to)]: ary.map((item) => { + [key.replaceAll(from, to)]: ary.map((item) => { const transformedItem = { ...item } for (const prop of props) { if (prop in item && typeof item[prop] === "string") { - transformedItem[prop] = item[prop].replace(from, to) + transformedItem[prop] = item[prop].replaceAll(from, to) } } @@ -232,7 +232,7 @@ function transformArrayRecord(obj: Record, from: string, to: s // eslint-disable-next-line @typescript-eslint/no-explicit-any function transformArray(arr: any[], from: string, to: string, idProp: string): T[] { return arr.map(({ [idProp]: id, ...rest }) => ({ - [idProp]: id.replace(from, to), + [idProp]: id.replaceAll(from, to), ...rest, })) } @@ -242,7 +242,7 @@ function transformRecord(obj: Record, from: string, to: string): return Object.entries(obj).reduce( (acc, [key, value]) => ({ ...acc, - [key.replace(from, to)]: value, + [key.replaceAll(from, to)]: value, }), {} as T, ) diff --git a/packages/build/vitest.config.ts b/packages/build/vitest.config.ts new file mode 100644 index 0000000000..f749203bfc --- /dev/null +++ b/packages/build/vitest.config.ts @@ -0,0 +1,8 @@ +import { defineConfig } from "vitest/config" + +export default defineConfig({ + test: { + globals: true, + environment: "node", + }, +}) diff --git a/packages/cloud/package.json b/packages/cloud/package.json index 62eff7b694..b440b91382 100644 --- a/packages/cloud/package.json +++ b/packages/cloud/package.json @@ -7,7 +7,7 @@ "scripts": { "lint": "eslint src --ext=ts --max-warnings=0", "check-types": "tsc --noEmit", - "test": "vitest --globals --run", + "test": "vitest run", "clean": "rimraf dist .turbo" }, "dependencies": { diff --git a/packages/cloud/src/__tests__/RefreshTimer.test.ts b/packages/cloud/src/__tests__/RefreshTimer.test.ts index f8b306b716..4337ed71d4 100644 --- a/packages/cloud/src/__tests__/RefreshTimer.test.ts +++ b/packages/cloud/src/__tests__/RefreshTimer.test.ts @@ -1,4 +1,4 @@ -// npx vitest run --globals src/__tests__/RefreshTimer.test.ts +// npx vitest run src/__tests__/RefreshTimer.test.ts import { Mock } from "vitest" diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 229e676415..90b4c9d528 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -7,7 +7,7 @@ "scripts": { "lint": "eslint src --ext=ts --max-warnings=0", "check-types": "tsc --noEmit", - "test": "vitest --globals --run", + "test": "vitest run", "clean": "rimraf dist .turbo" }, "dependencies": { diff --git a/packages/types/package.json b/packages/types/package.json index db05e3921b..d35b9501df 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -16,7 +16,7 @@ "scripts": { "lint": "eslint src --ext=ts --max-warnings=0", "check-types": "tsc --noEmit", - "test": "vitest --globals --run", + "test": "vitest run", "build": "tsup", "npm:publish:test": "tsup --outDir npm/dist && cd npm && npm publish --dry-run", "npm:publish": "tsup --outDir npm/dist && cd npm && npm publish", diff --git a/src/api/providers/fetchers/__tests__/openrouter.spec.ts b/src/api/providers/fetchers/__tests__/openrouter.spec.ts index e7f9e7ddd2..5e6ced1b33 100644 --- a/src/api/providers/fetchers/__tests__/openrouter.spec.ts +++ b/src/api/providers/fetchers/__tests__/openrouter.spec.ts @@ -1,4 +1,4 @@ -// npx vitest run --globals api/providers/fetchers/__tests__/openrouter.spec.ts +// npx vitest run api/providers/fetchers/__tests__/openrouter.spec.ts import * as path from "path" diff --git a/src/package.json b/src/package.json index 5a201b80af..3a391be0af 100644 --- a/src/package.json +++ b/src/package.json @@ -342,7 +342,7 @@ "lint": "eslint . --ext=ts --max-warnings=0", "check-types": "tsc --noEmit", "pretest": "turbo run bundle --cwd ..", - "test": "jest -w=40% && vitest run --globals", + "test": "jest -w=40% && vitest run", "format": "prettier --write .", "bundle": "node esbuild.mjs", "vscode:prepublish": "pnpm bundle --production",