Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependency updates and switch back to JS #115

Merged
merged 6 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
root = true

[*.js]
indent_style = tab
indent_size = 4

[*.md]
indent_style = space
indent_size = 3
Expand Down
22 changes: 7 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,26 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x
- uses: pnpm/action-setup@v3
with:
version: 8
node-version-file: package.json
- uses: pnpm/action-setup@v4
- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Test
run: pnpm run test


compile-and-package:
package:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: bait-lang/setup-bait@main
node-version-file: package.json
- uses: pnpm/action-setup@v4
- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Compile
run: pnpm run compile

- name: Package
run: pnpm run package

Expand All @@ -64,7 +56,7 @@ jobs:
publish:
needs:
- test
- compile-and-package
- package
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
steps:
Expand All @@ -74,7 +66,7 @@ jobs:
name: ${{ env.VSIX_FILE }}

- name: Create Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
fail_on_unmatched_files: true
files: ${{ env.VSIX_FILE }}
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
out/
dist/
*.vsix
*.js

# editor files
.vscode/
Expand Down
2 changes: 1 addition & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# whitelist needed files
!package.json

!out/*.js
!src/*.js
!out/*.json

!images/icon.png
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# Changelog
## 0.11.0
_unreleased_
- Replace Bait with JS
- Update dependencies


## 0.10.2
_2024-03-01_

- Require VS Code >= `1.82`
- Add snippets related to `If-Else`, `Sub` and `Function`
- Change icon to match GitHub Explore
- Improve documentation
Expand Down
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ Follow these steps to set up your development environment:
- The latest version should work fine
- Otherwise use [NVM][nvm] for management: `nvm install 18 && nvm use 18`
- [pnpm](https://pnpm.io/): `pnpm -v || npm install -g pnpm`
- Bait programming language: [Installation guide][bait]
2. Fork and clone the repository https://github.com/serkonda7/vscode-vba
3. Install dependencies
```sh
Expand All @@ -81,4 +80,3 @@ Follow these steps to set up your development environment:
[docs-snippets]: https://code.visualstudio.com/docs/editor/userdefinedsnippets#_create-your-own-snippets

[nvm]: https://github.com/nvm-sh/nvm
[bait]: https://github.com/bait-lang/bait#installation
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"publisher": "serkonda7",
"engines": {
"node": ">=18",
"vscode": "^1.82.0",
"pnpm": ">=8"
"vscode": "^1.82.0"
},
"packageManager": "[email protected]+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903",
"categories": [
"Programming Languages",
"Snippets",
Expand All @@ -29,7 +29,7 @@
"onLanguage:wwb",
"workspaceContains:**/*.{docm,xlsm,pptm,xlam,ppam}"
],
"main": "./out/extension.js",
"main": "./src/main.js",
"capabilities": {
"untrustedWorkspaces": {
"supported": true
Expand Down Expand Up @@ -115,18 +115,17 @@
}
},
"scripts": {
"compile": "bait --library -o out/extension.js src",
"test": "pnpm run convert-yaml && pnpm run test-vba && pnpm run test-wwb",
"test-vba": "vscode-tmgrammar-test -g ./out/vba.json \"syntaxes/tests/vba/*.bas\"",
"test-wwb": "vscode-tmgrammar-test -g ./out/wwb.json \"syntaxes/tests/other/*.wwd\"",
"install-dev-ext": "vsce package -o ./out/vscode-vba-dev.vsix && code --install-extension ./out/vscode-vba-dev.vsix --force",
"package": "vsce package",
"convert-yaml": "yaml2json language-configuration.yml \"syntaxes/*.yaml-tmlanguage\" \"snippets/*.yml\"",
"vscode:prepublish": "pnpm run compile && pnpm run convert-yaml"
"vscode:prepublish": "pnpm run convert-yaml"
},
"devDependencies": {
"@serkonda7/yaml2json": "^0.9.0",
"@vscode/vsce": "~2.24.0",
"@vscode/vsce": "~2.30.0",
"vscode-tmgrammar-test": "~0.1.3"
}
}
Loading