Skip to content

Commit

Permalink
Merge branch 'develop' into ui-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
samyakkkk committed Mar 12, 2024
2 parents 7c54068 + ac1d6cb commit 0d9b4f6
Show file tree
Hide file tree
Showing 11 changed files with 447 additions and 35 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jobs:
runs-on: ubuntu-latest # Host's operating system.
steps:
- name: Checkout commit # Download the code from triggering commit.
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: '20.x'

- name: Cache NPM # Leverage npm cache on repeated workflow runs if package.json didn't change.
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/vscode/package-lock.json') }} # Make sure to target the `vscode` directory.
Expand Down
5 changes: 3 additions & 2 deletions vscode/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ dist/
.env
user_config.json
.vscode-test/

*.vsix

#Ignore lock files

package-lock.json
yarn.lock
yarn.lock

3 changes: 2 additions & 1 deletion vscode/.vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"dbaeumer.vscode-eslint"
"dbaeumer.vscode-eslint",
"connor4312.esbuild-problem-matchers"
]
}
6 changes: 2 additions & 4 deletions vscode/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
{
"version": "0.2.0",
"configurations": [

{
"name": "Run Extension",
"type": "extensionHost",
Expand All @@ -16,8 +15,7 @@
"outFiles": [
"${workspaceFolder}/out/**/*.js"
],
"preLaunchTask": "${defaultBuildTask}",
"sourceMaps": true,
"preLaunchTask": "npm: watch"
},
{
"name": "Extension Tests",
Expand All @@ -30,7 +28,7 @@
"outFiles": [
"${workspaceFolder}/out/test/**/*.js"
],
"preLaunchTask": "${defaultBuildTask}"
"preLaunchTask": "npm: watch"
}
]
}
18 changes: 10 additions & 8 deletions vscode/.vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@
{
"type": "npm",
"script": "watch",
"problemMatcher": "$tsc-watch",
"group": "build",
"problemMatcher": "$esbuild-watch",
"isBackground": true,
"presentation": {
"reveal": "never"
},
"group": {
"kind": "build",
"isDefault": true
}
"label": "npm: watch",
},
{
"type": "npm",
"script": "build",
"group": "build",
"problemMatcher": "$esbuild",
"label": "npm: build",
}
]
}
11 changes: 8 additions & 3 deletions vscode/.vscodeignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
.vscode/**
.vscode-test/**
src/**
.vscode/
.vscode-test/
src/
.gitignore
.yarnrc
vsc-extension-quickstart.md
**/tsconfig.json
**/.eslintrc.json
**/*.map
**/*.ts
node_modules
out/*
!out/extension.js
tsconfig.json
webpack.config.js
Loading

0 comments on commit 0d9b4f6

Please sign in to comment.