Fix vsix builds

Author: cte

.github/workflows/changeset-release.yml

@@ -55,7 +55,7 @@ jobs:
         with:
           commit: "changeset version bump"
           title: "Changeset version bump"
-          version: pnpm --filter @roo-code/vscode version-packages # This performs the changeset version bump
+          version: pnpm --filter roo-cline version-packages # This performs the changeset version bump
         env:
           GITHUB_TOKEN: ${{ secrets.CROSS_REPO_ACCESS_TOKEN }}
 

.husky/pre-commit

@@ -12,10 +12,10 @@ else
   pnpm_cmd="pnpm"
 fi
 
-"$pnpm_cmd" --filter @roo-code/vscode generate-types
+"$pnpm_cmd" --filter roo-cline generate-types
 
 if [ -n "$(git diff --name-only src/exports/roo-code.d.ts)" ]; then
-  echo "Error: There are unstaged changes to roo-code.d.ts after running 'pnpm --filter @roo-code/vscode generate-types'."
+  echo "Error: There are unstaged changes to roo-code.d.ts after running 'pnpm --filter roo-cline generate-types'."
   echo "Please review and stage the changes before committing."
   exit 1
 fi

.vscodeignore

@@ -1,2 +1,70 @@
-*
-!dist
+# Default
+.changeset/**
+.github/**
+.husky/**
+.vscode/**
+coverage/**
+node_modules/**
+src/**
+scripts/**
+.gitignore
+esbuild.js
+jest.*
+**/tsconfig.json
+**/.eslintrc.json
+.prettierignore
+**/*.map
+**/*.ts
+**/.gitignore
+
+# Custom
+.env.sample
+.git-blame-ignore-revs
+.gitconfig
+.gitattributes
+.tool-versions
+.vite-port
+.nvmrc
+.clinerules*
+.roomodes
+.rooignore
+.roo/**
+benchmark/**
+cline_docs/**
+e2e/**
+evals/**
+locales/**
+out/**
+ellipsis.yaml
+knip.json
+
+# Ignore all webview-ui files except the build directory.
+# https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/frameworks/hello-world-react-cra/.vscodeignore
+webview-ui/src/**
+webview-ui/public/**
+webview-ui/scripts/**
+webview-ui/index.html
+webview-ui/README.md
+webview-ui/package.json
+webview-ui/package-lock.json
+webview-ui/node_modules/**
+
+# Include codicons
+!node_modules/@vscode/codicons/dist/codicon.css
+!node_modules/@vscode/codicons/dist/codicon.ttf
+
+# Include material icons
+!node_modules/vscode-material-icons/generated/**
+
+# Include default themes JSON files used in getTheme
+!src/integrations/theme/default-themes/**
+
+# Ignore doc assets
+assets/docs/**
+
+# Include icons and images
+!assets/icons/**
+!assets/images/**
+
+# Include .env file for telemetry
+!.env

e2e/package.json

@@ -5,7 +5,7 @@
 		"lint": "eslint --max-warnings=0 src/**/*.ts",
 		"check-types": "tsc --noEmit",
 		"format": "prettier --write src",
-		"test:ci": "pnpm --filter @roo-code/vscode package:development && pnpm test:run",
+		"test:ci": "pnpm --filter roo-cline build:development && pnpm test:run",
 		"test:run": "rimraf out && tsc -p tsconfig.json && npx dotenvx run -f .env.local -- node ./out/runTest.js"
 	},
 	"devDependencies": {

e2e/src/runTest.ts

@@ -6,7 +6,7 @@ async function main() {
 	try {
 		// The folder containing the Extension Manifest package.json
 		// Passed to `--extensionDevelopmentPath`
-		const extensionDevelopmentPath = path.resolve(__dirname, "../../dist")
+		const extensionDevelopmentPath = path.resolve(__dirname, "../../src")
 
 		// The path to the extension test script
 		// Passed to --extensionTestsPath

evals/scripts/setup.sh

@@ -28,8 +28,7 @@ build_extension() {
   echo "🔨 Building the Roo Code extension..."
   cd ..
   mkdir -p bin
-  pnpm --filter @roo-code/vscode compile || exit 1
-  pnpm --filter @roo-code/vscode-webview build || exit 1
+  pnpm build:development || exit 1
   npx vsce package --out bin/roo-code-latest.vsix || exit 1
   code --install-extension bin/roo-code-latest.vsix || exit 1
   cd evals

package.json

@@ -12,7 +12,8 @@
 		"test": "turbo test --log-order grouped --output-logs new-only",
 		"format": "turbo format --log-order grouped --output-logs new-only",
 		"dev": "pnpm --filter @roo-code/vscode-webview dev",
-		"build": "pnpm --filter @roo-code/vscode build",
+		"build": "pnpm --filter roo-cline vsix",
+		"build:development": "pnpm --filter roo-cline build:development",
 		"changeset": "changeset",
 		"knip": "knip --include files",
 		"update-contributors": "node scripts/update-contributors.js"

src/.gitignore

@@ -0,0 +1 @@
+webview-ui

src/esbuild.js

@@ -5,10 +5,6 @@ const path = require("path")
 const production = process.argv.includes("--production")
 const watch = process.argv.includes("--watch")
 
-const ROOT_DIR_RELATIVE = "../dist"
-const ROOT_DIR = path.join(__dirname, ROOT_DIR_RELATIVE)
-const DIST_DIR = path.join(ROOT_DIR, "dist")
-
 /**
  * @type {import('esbuild').Plugin}
  */
@@ -33,7 +29,7 @@ const copyWasmFiles = {
 	setup(build) {
 		build.onEnd(() => {
 			const nodeModulesDir = path.join(__dirname, "node_modules")
-			const distDir = DIST_DIR
+			const distDir = path.join(__dirname, "dist")
 
 			fs.mkdirSync(distDir, { recursive: true })
 
@@ -74,7 +70,7 @@ const copyWasmFiles = {
 
 function copyLocaleFiles() {
 	const srcDir = path.join(__dirname, "i18n", "locales")
-	const destDir = path.join(DIST_DIR, "i18n", "locales")
+	const destDir = path.join(path.join(__dirname, "dist"), "i18n", "locales")
 
 	if (!fs.existsSync(srcDir)) {
 		throw new Error(`Directory does not exist: ${srcDir}`)
@@ -153,91 +149,6 @@ const copyLocalesFiles = {
 	},
 }
 
-/**
- * @type {import('esbuild').Plugin}
- */
-const copyAssets = {
-	name: "copy-assets",
-	setup(build) {
-		build.onEnd(() => {
-			const copyPaths = [
-				["assets/icons", "assets/icons"],
-				["assets/images", "assets/images"],
-				["integrations/theme/default-themes", "src/integrations/theme/default-themes"],
-				["node_modules/vscode-material-icons/generated", "node_modules/vscode-material-icons/generated"],
-				["node_modules/@vscode/codicons/dist", "node_modules/@vscode/codicons/dist"],
-			]
-
-			for (const [srcRelPath, dstRelPath] of copyPaths) {
-				const srcDir = path.join(__dirname, srcRelPath)
-				const dstDir = path.join(ROOT_DIR, dstRelPath)
-
-				if (!fs.existsSync(srcDir)) {
-					throw new Error(`Directory does not exist: ${srcDir}`)
-				}
-
-				fs.mkdirSync(dstDir, { recursive: true })
-				let count = 0
-
-				function copyDir(src, dest) {
-					const entries = fs.readdirSync(src, { withFileTypes: true })
-
-					for (const entry of entries) {
-						const srcPath = path.join(src, entry.name)
-						const dstDir = path.join(dest, entry.name)
-
-						if (entry.isDirectory()) {
-							fs.mkdirSync(dstDir, { recursive: true })
-							copyDir(srcPath, dstDir)
-						} else {
-							fs.copyFileSync(srcPath, dstDir)
-							count++
-						}
-					}
-				}
-
-				copyDir(srcDir, dstDir)
-				console.log(`[copy-assets] Copied ${count} files from ${srcDir} to ${dstDir}`)
-			}
-		})
-	},
-}
-
-/**
- * @type {import('esbuild').Plugin}
- */
-const copyPackageJson = {
-	name: "copy-package-json",
-	setup(build) {
-		build.onEnd(() => {
-			const srcDir = __dirname
-			const srcPath = path.join(srcDir, "package.json")
-			const dstDir = ROOT_DIR
-
-			if (!fs.existsSync(dstDir)) {
-				throw new Error(`Directory does not exist: ${dstDir}`)
-			}
-
-			// Copy package.json to the dist directory and rename the extension to "roo-cline".
-			const packageJson = JSON.parse(fs.readFileSync(srcPath, "utf8"))
-			packageJson.name = "roo-cline"
-			fs.writeFileSync(path.join(dstDir, "package.json"), JSON.stringify(packageJson, null, 2), "utf8")
-			console.log(`[copy-package-json] Copied package.json to ${dstDir}`)
-
-			// Copy all package.nls.* files to the dist directory.
-			const nlsFiles = fs.readdirSync(srcDir).filter((file) => file.startsWith("package.nls."))
-			let count = 0
-
-			for (const nlsFile of nlsFiles) {
-				fs.copyFileSync(path.join(srcDir, nlsFile), path.join(dstDir, nlsFile))
-				count++
-			}
-
-			console.log(`[copy-package-json] Copied ${count} package.nls.*.json files to ${dstDir}`)
-		})
-	},
-}
-
 /**
  * @type {import('esbuild').BuildOptions}
  */
@@ -249,8 +160,6 @@ const extensionConfig = {
 	plugins: [
 		copyWasmFiles,
 		copyLocalesFiles,
-		copyAssets,
-		copyPackageJson,
 		esbuildProblemMatcherPlugin,
 		{
 			name: "alias-plugin",
@@ -265,7 +174,7 @@ const extensionConfig = {
 	format: "cjs",
 	sourcesContent: false,
 	platform: "node",
-	outfile: ROOT_DIR_RELATIVE + "/dist/extension.js",
+	outfile: "dist/extension.js",
 	external: ["vscode"],
 }
 
@@ -281,7 +190,7 @@ const workerConfig = {
 	format: "cjs",
 	sourcesContent: false,
 	platform: "node",
-	outdir: ROOT_DIR_RELATIVE + "/dist/workers",
+	outdir: "dist/workers",
 }
 
 async function main() {

src/package.json

@@ -1,5 +1,5 @@
 {
-	"name": "@roo-code/vscode",
+	"name": "roo-cline",
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
@@ -323,15 +323,13 @@
 		"pretest": "node esbuild.js",
 		"test": "jest -w=40% && vitest run",
 		"format": "prettier --write .",
-		"build": "node esbuild.js --production --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
-		"build:development": "node esbuild.js",
-		"package": "pnpm lint && pnpm check-types && pnpm build && pnpm --filter @roo-code/vscode-webview build",
-		"package:development": "pnpm lint && pnpm check-types && pnpm build:development && pnpm --filter @roo-code/vscode-webview build",
+		"build": "pnpm lint && pnpm check-types && node esbuild.js --production --bundle --external:vscode --format=cjs --platform=node && pnpm --filter @roo-code/vscode-webview build",
+		"build:development": "pnpm lint && pnpm check-types && node esbuild.js && pnpm --filter @roo-code/vscode-webview build",
 		"publish:marketplace": "vsce publish && ovsx publish",
 		"publish": "pnpm vsix && changeset publish && pnpm install --package-lock-only",
 		"version-packages": "changeset version && pnpm install --package-lock-only",
-		"vscode:prepublish": "pnpm package",
-		"vsix": "rimraf bin && mkdirp bin && npx vsce package --no-dependencies --out bin",
+		"vscode:prepublish": "pnpm build",
+		"vsix": "rimraf ../dist && rimraf ../bin && mkdirp ../bin && npx vsce package --no-dependencies --out ../bin",
 		"watch": "pnpm watch:esbuild watch:tsc",
 		"watch:esbuild": "node esbuild.js --watch",
 		"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",