Skip to content

Commit feb26ad

Browse files
authored
dependency updates and switch back to JS (#115)
1 parent 5aad9c1 commit feb26ad

File tree

10 files changed

+1139
-556
lines changed

10 files changed

+1139
-556
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
root = true
22

3+
[*.js]
4+
indent_style = tab
5+
indent_size = 4
6+
37
[*.md]
48
indent_style = space
59
indent_size = 3

.github/workflows/ci.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,26 @@ jobs:
2121
- uses: actions/checkout@v4
2222
- uses: actions/setup-node@v4
2323
with:
24-
node-version: 18.x
25-
- uses: pnpm/action-setup@v3
26-
with:
27-
version: 8
24+
node-version-file: package.json
25+
- uses: pnpm/action-setup@v4
2826
- name: Install dependencies
2927
run: pnpm install --frozen-lockfile
3028

3129
- name: Test
3230
run: pnpm run test
3331

3432

35-
compile-and-package:
33+
package:
3634
runs-on: ubuntu-latest
3735
steps:
3836
- uses: actions/checkout@v4
3937
- uses: actions/setup-node@v4
4038
with:
41-
node-version: 18.x
42-
- uses: pnpm/action-setup@v3
43-
with:
44-
version: 8
45-
- uses: bait-lang/setup-bait@main
39+
node-version-file: package.json
40+
- uses: pnpm/action-setup@v4
4641
- name: Install dependencies
4742
run: pnpm install --frozen-lockfile
4843

49-
- name: Compile
50-
run: pnpm run compile
51-
5244
- name: Package
5345
run: pnpm run package
5446

@@ -64,7 +56,7 @@ jobs:
6456
publish:
6557
needs:
6658
- test
67-
- compile-and-package
59+
- package
6860
if: startsWith(github.ref, 'refs/tags/')
6961
runs-on: ubuntu-latest
7062
steps:
@@ -74,7 +66,7 @@ jobs:
7466
name: ${{ env.VSIX_FILE }}
7567

7668
- name: Create Release
77-
uses: softprops/action-gh-release@v1
69+
uses: softprops/action-gh-release@v2
7870
with:
7971
fail_on_unmatched_files: true
8072
files: ${{ env.VSIX_FILE }}

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
out/
33
dist/
44
*.vsix
5-
*.js
65

76
# editor files
87
.vscode/

.vscodeignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# whitelist needed files
66
!package.json
77

8-
!out/*.js
8+
!src/*.js
99
!out/*.json
1010

1111
!images/icon.png

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
# Changelog
2+
## 0.11.0
3+
_unreleased_
4+
- Replace Bait with JS
5+
- Update dependencies
6+
7+
28
## 0.10.2
39
_2024-03-01_
410

11+
- Require VS Code >= `1.82`
512
- Add snippets related to `If-Else`, `Sub` and `Function`
613
- Change icon to match GitHub Explore
714
- Improve documentation

CONTRIBUTING.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ Follow these steps to set up your development environment:
6363
- The latest version should work fine
6464
- Otherwise use [NVM][nvm] for management: `nvm install 18 && nvm use 18`
6565
- [pnpm](https://pnpm.io/): `pnpm -v || npm install -g pnpm`
66-
- Bait programming language: [Installation guide][bait]
6766
2. Fork and clone the repository https://github.com/serkonda7/vscode-vba
6867
3. Install dependencies
6968
```sh
@@ -81,4 +80,3 @@ Follow these steps to set up your development environment:
8180
[docs-snippets]: https://code.visualstudio.com/docs/editor/userdefinedsnippets#_create-your-own-snippets
8281

8382
[nvm]: https://github.com/nvm-sh/nvm
84-
[bait]: https://github.com/bait-lang/bait#installation

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"publisher": "serkonda7",
1313
"engines": {
1414
"node": ">=18",
15-
"vscode": "^1.82.0",
16-
"pnpm": ">=8"
15+
"vscode": "^1.82.0"
1716
},
17+
"packageManager": "[email protected]+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903",
1818
"categories": [
1919
"Programming Languages",
2020
"Snippets",
@@ -29,7 +29,7 @@
2929
"onLanguage:wwb",
3030
"workspaceContains:**/*.{docm,xlsm,pptm,xlam,ppam}"
3131
],
32-
"main": "./out/extension.js",
32+
"main": "./src/main.js",
3333
"capabilities": {
3434
"untrustedWorkspaces": {
3535
"supported": true
@@ -115,18 +115,17 @@
115115
}
116116
},
117117
"scripts": {
118-
"compile": "bait --library -o out/extension.js src",
119118
"test": "pnpm run convert-yaml && pnpm run test-vba && pnpm run test-wwb",
120119
"test-vba": "vscode-tmgrammar-test -g ./out/vba.json \"syntaxes/tests/vba/*.bas\"",
121120
"test-wwb": "vscode-tmgrammar-test -g ./out/wwb.json \"syntaxes/tests/other/*.wwd\"",
122121
"install-dev-ext": "vsce package -o ./out/vscode-vba-dev.vsix && code --install-extension ./out/vscode-vba-dev.vsix --force",
123122
"package": "vsce package",
124123
"convert-yaml": "yaml2json language-configuration.yml \"syntaxes/*.yaml-tmlanguage\" \"snippets/*.yml\"",
125-
"vscode:prepublish": "pnpm run compile && pnpm run convert-yaml"
124+
"vscode:prepublish": "pnpm run convert-yaml"
126125
},
127126
"devDependencies": {
128127
"@serkonda7/yaml2json": "^0.9.0",
129-
"@vscode/vsce": "~2.24.0",
128+
"@vscode/vsce": "~2.30.0",
130129
"vscode-tmgrammar-test": "~0.1.3"
131130
}
132131
}

0 commit comments

Comments
 (0)