Merge pull request #819 from RooVetGit/3.3.14

3.3.14

Author: mrubens

.changeset/yellow-garlics-tap.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Oops

.env.e2e.example .env.integration.example.env.e2e.example renamed to .env.integration.example

@@ -17,7 +17,8 @@
 		"@typescript-eslint/semi": "off",
 		"eqeqeq": "warn",
 		"no-throw-literal": "warn",
-		"semi": "off"
+		"semi": "off",
+		"react-hooks/exhaustive-deps": "off"
 	},
 	"ignorePatterns": ["out", "dist", "**/*.d.ts"]
 }

.eslintrc.json

@@ -9,7 +9,7 @@ on:
     branches: [main]
 
 jobs:
-  qa:
+  compile:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -21,8 +21,12 @@ jobs:
           cache: 'npm'
       - name: Install dependencies
         run: npm run install:all
-      - name: Run lint, check types, and esbuild
-        run: npm run qa
+      - name: Compile
+        run: npm run compile
+      - name: Check types
+        run: npm run check-types
+      - name: Lint
+        run: npm run lint
 
   unit-test:
     runs-on: ubuntu-latest
@@ -66,9 +70,9 @@ jobs:
         with:
           node-version: '18'
           cache: 'npm'
-      - name: Create env.e2e file
-        run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.e2e
+      - name: Create env.integration file
+        run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.integration
       - name: Install dependencies
         run: npm run install:all
-      - name: Run end-to-end tests
-        run: xvfb-run -a npm run e2e
+      - name: Run integration tests
+        run: xvfb-run -a npm run test:integration

.github/workflows/code-qa.yml

@@ -1,6 +1,6 @@
 dist
 out
-out-*
+out-integration
 node_modules
 coverage/
 
@@ -21,4 +21,4 @@ roo-cline-*.vsix
 docs/_site/
 
 # Dotenv
-.env.e2e
+.env.integration

.gitignore

@@ -6,3 +6,7 @@ if [ "$branch" = "main" ]; then
 fi
 
 npx lint-staged
+
+npm run compile
+npm run lint
+npm run check-types

.husky/pre-commit

@@ -5,14 +5,13 @@ if [ "$branch" = "main" ]; then
   exit 1
 fi
 
-npm run qa
+npm run compile
 
-# Check for new changesets.
+# Check for new changesets
 NEW_CHANGESETS=$(find .changeset -name "*.md" ! -name "README.md" | wc -l | tr -d ' ')
 echo "Changeset files: $NEW_CHANGESETS"
-
 if [ "$NEW_CHANGESETS" == "0" ]; then
   echo "-------------------------------------------------------------------------------------"
   echo "Changes detected. Please run 'npm run changeset' to create a changeset if applicable."
   echo "-------------------------------------------------------------------------------------"
-fi
+fi

.husky/pre-push

@@ -5,8 +5,8 @@
 import { defineConfig } from '@vscode/test-cli';
 
 export default defineConfig({
-	label: 'e2e',
-	files: 'out-e2e/test/**/*.test.js',
+	label: 'integrationTest',
+	files: 'out-integration/test/**/*.test.js',
 	workspaceFolder: '.',
 	mocha: {
 		ui: 'tdd',

.vscode-test.mjs

@@ -13,7 +13,7 @@
 			"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
 			"sourceMaps": true,
 			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
-			"preLaunchTask": "${defaultBuildTask}",
+			"preLaunchTask": "debug-mode",
 			"env": {
 				"NODE_ENV": "development",
 				"VSCODE_DEBUG_MODE": "true"

.vscode/launch.json

@@ -3,15 +3,42 @@
 {
 	"version": "2.0.0",
 	"tasks": [
+		{
+			"label": "compile",
+			"type": "npm",
+			"script": "compile",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"presentation": {
+				"reveal": "silent",
+				"panel": "shared"
+			},
+			"problemMatcher": ["$tsc", "$eslint-stylish"]
+		},
 		{
 			"label": "watch",
-			"dependsOn": ["npm: dev", "npm: watch:tsc", "npm: watch:esbuild"],
+			"dependsOn": ["npm: build:webview", "npm: watch:tsc", "npm: watch:esbuild"],
 			"presentation": {
 				"reveal": "never"
 			},
 			"group": {
 				"kind": "build",
-				"isDefault": true
+				"isDefault": false
+			}
+		},
+		{
+			"label": "debug-mode",
+			"dependsOn": ["compile", "npm: dev"],
+			"group": {
+				"kind": "build",
+				"isDefault": false
+			},
+			"dependsOrder": "parallel",
+			"presentation": {
+				"reveal": "always",
+				"panel": "new"
 			}
 		},
 		{
@@ -32,8 +59,20 @@
 			},
 			"isBackground": true,
 			"presentation": {
-				"group": "webview-ui",
-				"reveal": "always"
+				"group": "watch",
+				"reveal": "never"
+			}
+		},
+		{
+			"label": "npm: build:webview",
+			"type": "npm",
+			"script": "build:webview",
+			"group": "build",
+			"problemMatcher": [],
+			"isBackground": true,
+			"presentation": {
+				"group": "watch",
+				"reveal": "never"
 			}
 		},
 		{
@@ -45,7 +84,7 @@
 			"isBackground": true,
 			"presentation": {
 				"group": "watch",
-				"reveal": "always"
+				"reveal": "never"
 			}
 		},
 		{
@@ -57,7 +96,7 @@
 			"isBackground": true,
 			"presentation": {
 				"group": "watch",
-				"reveal": "always"
+				"reveal": "never"
 			}
 		}
 	]