Skip to content

Commit 26baaf8

Browse files
Merge branch 'main' into WEB-1756
2 parents 18f1555 + c14de4f commit 26baaf8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+8714
-4702
lines changed

.changeset/blue-masks-camp.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/breezy-badgers-refuse.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.eslintrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"@typescript-eslint/semi": "off",
1818
"eqeqeq": "warn",
1919
"no-throw-literal": "warn",
20-
"semi": "off",
21-
"react-hooks/exhaustive-deps": "off"
20+
"semi": "off"
2221
},
2322
"ignorePatterns": ["out", "dist", "**/*.d.ts"]
2423
}

.github/workflows/marketplace-publish.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ jobs:
3939
OVSX_PAT: ${{ secrets.OVSX_PAT }}
4040
run: |
4141
current_package_version=$(node -p "require('./package.json').version")
42+
43+
npm run vsix
44+
package=$(unzip -l bin/roo-cline-${current_package_version}.vsix)
45+
echo "$package"
46+
echo "$package" | grep -q "dist/extension.js" || exit 1
47+
echo "$package" | grep -q "extension/webview-ui/build/assets/index.js" || exit 1
48+
echo "$package" | grep -q "extension/node_modules/@vscode/codicons/dist/codicon.ttf" || exit 1
49+
4250
npm run publish:marketplace
4351
echo "Successfully published version $current_package_version to VS Code Marketplace"
44-

.github/workflows/pages.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dist
22
out
3-
out-integration
3+
out-*
44
node_modules
55
coverage/
66

.husky/pre-commit

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,3 @@ if [ "$branch" = "main" ]; then
66
fi
77

88
npx lint-staged
9-
10-
npm run compile
11-
npm run lint
12-
npm run check-types

.husky/pre-push

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ fi
77

88
npm run compile
99

10-
# Check for new changesets
10+
# Check for new changesets.
1111
NEW_CHANGESETS=$(find .changeset -name "*.md" ! -name "README.md" | wc -l | tr -d ' ')
1212
echo "Changeset files: $NEW_CHANGESETS"
13+
1314
if [ "$NEW_CHANGESETS" == "0" ]; then
1415
echo "-------------------------------------------------------------------------------------"
1516
echo "Changes detected. Please run 'npm run changeset' to create a changeset if applicable."
1617
echo "-------------------------------------------------------------------------------------"
17-
fi
18+
fi

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
1414
"sourceMaps": true,
1515
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
16-
"preLaunchTask": "debug-mode",
16+
"preLaunchTask": "${defaultBuildTask}",
1717
"env": {
1818
"NODE_ENV": "development",
1919
"VSCODE_DEBUG_MODE": "true"

.vscode/tasks.json

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,15 @@
33
{
44
"version": "2.0.0",
55
"tasks": [
6-
{
7-
"label": "compile",
8-
"type": "npm",
9-
"script": "compile",
10-
"group": {
11-
"kind": "build",
12-
"isDefault": true
13-
},
14-
"presentation": {
15-
"reveal": "silent",
16-
"panel": "shared"
17-
},
18-
"problemMatcher": ["$tsc", "$eslint-stylish"]
19-
},
206
{
217
"label": "watch",
22-
"dependsOn": ["npm: build:webview", "npm: watch:tsc", "npm: watch:esbuild"],
8+
"dependsOn": ["npm: dev", "npm: watch:tsc", "npm: watch:esbuild"],
239
"presentation": {
2410
"reveal": "never"
2511
},
2612
"group": {
2713
"kind": "build",
28-
"isDefault": false
29-
}
30-
},
31-
{
32-
"label": "debug-mode",
33-
"dependsOn": ["compile", "npm: dev"],
34-
"group": {
35-
"kind": "build",
36-
"isDefault": false
37-
},
38-
"dependsOrder": "parallel",
39-
"presentation": {
40-
"reveal": "always",
41-
"panel": "new"
14+
"isDefault": true
4215
}
4316
},
4417
{
@@ -59,20 +32,8 @@
5932
},
6033
"isBackground": true,
6134
"presentation": {
62-
"group": "watch",
63-
"reveal": "never"
64-
}
65-
},
66-
{
67-
"label": "npm: build:webview",
68-
"type": "npm",
69-
"script": "build:webview",
70-
"group": "build",
71-
"problemMatcher": [],
72-
"isBackground": true,
73-
"presentation": {
74-
"group": "watch",
75-
"reveal": "never"
35+
"group": "webview-ui",
36+
"reveal": "always"
7637
}
7738
},
7839
{
@@ -84,7 +45,7 @@
8445
"isBackground": true,
8546
"presentation": {
8647
"group": "watch",
87-
"reveal": "never"
48+
"reveal": "always"
8849
}
8950
},
9051
{
@@ -96,7 +57,7 @@
9657
"isBackground": true,
9758
"presentation": {
9859
"group": "watch",
99-
"reveal": "never"
60+
"reveal": "always"
10061
}
10162
}
10263
]

0 commit comments

Comments
 (0)