Revert "Merge pull request RooVetGit#799 from RooVetGit/cte/package-json-cleanup"

This reverts commit 00ec57a, reversing
changes made to b83442e.

Author: mrubens

.env.e2e.example .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"
 			}
 		}
 	]

.vscode/tasks.json

@@ -264,34 +264,55 @@
 		}
 	},
 	"scripts": {
-		"prepare": "husky",
-		"install:all": "npm run install:extension && npm run install:webview",
-		"install:extension": "npm install",
-		"install:webview": "cd webview-ui && npm install",
-		"lint": "npm-run-all -l -p lint:*",
-		"lint:extension": "eslint src --ext ts",
-		"lint:webview": "cd webview-ui && npm run lint",
-		"check-types": "npm-run-all -l -p check-types:*",
-		"check-types:extension": "tsc --noEmit",
-		"check-types:webview": "cd webview-ui && npm run check-types",
-		"test": "npm-run-all -l -s test:*",
-		"test:extension": "jest",
-		"test:webview": "cd webview-ui && npm run test",
-		"build": "npm-run-all -l -s build:webview build:extension",
-		"build:extension": "mkdir -p bin && npx vsce package --out bin",
+		"build": "npm run build:webview && npm run vsix",
 		"build:webview": "cd webview-ui && npm run build",
+		"changeset": "changeset",
+		"check-types": "tsc --noEmit",
+		"compile": "tsc -p . --outDir out && node esbuild.js",
+		"compile:integration": "tsc -p tsconfig.integration.json",
+		"install:all": "npm install && cd webview-ui && npm install",
+		"lint": "eslint src --ext ts && npm run lint --prefix webview-ui",
+		"package": "npm run build:webview && npm run check-types && npm run lint && node esbuild.js --production",
+		"pretest": "npm run compile && npm run compile:integration",
 		"dev": "cd webview-ui && npm run dev",
-		"qa": "npm-run-all -l -p lint check-types && node esbuild.js",
-		"e2e": "npm run build && tsc -p tsconfig.e2e.json && npx dotenvx run -f .env.e2e -- vscode-test",
+		"test": "jest && npm run test:webview",
+		"test:webview": "cd webview-ui && npm run test",
+		"test:integration": "npm run build && npm run compile:integration && npx dotenvx run -f .env.integration -- vscode-test",
+		"prepare": "husky",
+		"publish:marketplace": "vsce publish && ovsx publish",
+		"publish": "npm run build && changeset publish && npm install --package-lock-only",
+		"version-packages": "changeset version && npm install --package-lock-only",
 		"vscode:prepublish": "npm run package",
+		"vsix": "mkdir -p bin && npx vsce package --out bin",
 		"watch": "npm-run-all -p watch:*",
 		"watch:esbuild": "node esbuild.js --watch",
 		"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
-		"package": "npm-run-all -l -p lint check-types && node esbuild.js --production",
-		"changeset": "changeset",
-		"version-packages": "changeset version && npm install --package-lock-only",
-		"publish": "npm run build && changeset publish && npm install --package-lock-only",
-		"publish:marketplace": "vsce publish && ovsx publish"
+		"watch-tests": "tsc -p . -w --outDir out"
+	},
+	"devDependencies": {
+		"@changesets/cli": "^2.27.10",
+		"@changesets/types": "^6.0.0",
+		"@dotenvx/dotenvx": "^1.34.0",
+		"@types/diff": "^5.2.1",
+		"@types/diff-match-patch": "^1.0.36",
+		"@types/jest": "^29.5.14",
+		"@types/mocha": "^10.0.7",
+		"@types/node": "20.x",
+		"@types/string-similarity": "^4.0.2",
+		"@typescript-eslint/eslint-plugin": "^7.14.1",
+		"@typescript-eslint/parser": "^7.11.0",
+		"@vscode/test-cli": "^0.0.9",
+		"@vscode/test-electron": "^2.4.0",
+		"esbuild": "^0.24.0",
+		"eslint": "^8.57.0",
+		"husky": "^9.1.7",
+		"jest": "^29.7.0",
+		"jest-simple-dot-reporter": "^1.0.5",
+		"lint-staged": "^15.2.11",
+		"npm-run-all": "^4.1.5",
+		"prettier": "^3.4.2",
+		"ts-jest": "^29.2.5",
+		"typescript": "^5.4.5"
 	},
 	"dependencies": {
 		"@anthropic-ai/bedrock-sdk": "^0.10.2",
@@ -338,41 +359,13 @@
 		"web-tree-sitter": "^0.22.6",
 		"zod": "^3.23.8"
 	},
-	"devDependencies": {
-		"@changesets/cli": "^2.27.10",
-		"@changesets/types": "^6.0.0",
-		"@dotenvx/dotenvx": "^1.34.0",
-		"@types/debug": "^4.1.12",
-		"@types/diff": "^5.2.1",
-		"@types/diff-match-patch": "^1.0.36",
-		"@types/jest": "^29.5.14",
-		"@types/mocha": "^10.0.7",
-		"@types/node": "20.x",
-		"@types/string-similarity": "^4.0.2",
-		"@typescript-eslint/eslint-plugin": "^7.14.1",
-		"@typescript-eslint/parser": "^7.11.0",
-		"@vscode/test-cli": "^0.0.9",
-		"@vscode/test-electron": "^2.4.0",
-		"esbuild": "^0.24.0",
-		"eslint": "^8.57.0",
-		"husky": "^9.1.7",
-		"jest": "^29.7.0",
-		"jest-simple-dot-reporter": "^1.0.5",
-		"lint-staged": "^15.2.11",
-		"npm-run-all": "^4.1.5",
-		"prettier": "^3.4.2",
-		"ts-jest": "^29.2.5",
-		"typescript": "^5.4.5"
-	},
 	"lint-staged": {
 		"*.{js,jsx,ts,tsx,json,css,md}": [
 			"prettier --write"
 		],
 		"src/**/*.{ts,tsx}": [
-			"npx eslint -c .eslintrc.json --max-warnings=0 --fix"
-		],
-		"webview-ui/**/*.{ts,tsx}": [
-			"npx eslint -c webview-ui/.eslintrc.json --max-warnings=0 --fix"
+			"prettier --write",
+			"npx eslint -c .eslintrc.json --fix"
 		]
 	}
 }

package-lock.json

@@ -10,8 +10,8 @@
 		"skipLibCheck": true,
 		"useUnknownInCatchVariables": false,
 		"rootDir": "src",
-		"outDir": "out-e2e"
+		"outDir": "out-integration"
 	},
 	"include": ["**/*.ts"],
-	"exclude": [".vscode-test", "benchmark", "dist", "**/node_modules/**", "out", "out-e2e", "webview-ui"]
+	"exclude": [".vscode-test", "benchmark", "dist", "**/node_modules/**", "out", "out-integration", "webview-ui"]
 }