Skip to content
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
26 changes: 13 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "13.x"
node-version: 16
- run: yarn install
- name: Run tests
uses: GabrielBB/xvfb-action@v1.0
Expand All @@ -24,29 +24,29 @@ jobs:
env:
VSIX_FILE: vscode-R.vsix
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: node $SCRIPT_DIR/enableWebpack.js
- run: yarn install
- uses: lannonbr/vsce-action@master
with:
args: "package -o $VSIX_FILE"
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
name: ${{ env.VSIX_FILE }}
path: ${{ env.VSIX_FILE }}
eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "13.x"
node-version: 16
- run: yarn install
- run: yarn run lint
markdownlint-cli:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: nosborn/github-action-markdown-cli@v1.1.1
with:
files: .
Expand All @@ -57,7 +57,7 @@ jobs:
container:
image: rocker/tidyverse:latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install apt-get dependencies
run: |
apt-get update
Expand All @@ -73,10 +73,10 @@ jobs:
devreplay:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "13.x"
node-version: 16
- run: yarn install
- name: Run devreplay
run: ./node_modules/.bin/devreplay ./src devreplay.json
6 changes: 3 additions & 3 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: node $SCRIPT_DIR/enableWebpack.js
- run: yarn install
- uses: lannonbr/vsce-action@master
with:
args: "package -o $FILE_OUT"
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
name: "${{ env.FILE_OUT }}"
path: "${{ env.FILE_OUT }}"
Expand All @@ -38,7 +38,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Download artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: "artifacts/"
- name: Upload artifacts
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: node $SCRIPT_DIR/enableWebpack.js
- run: yarn install
- uses: lannonbr/vsce-action@master
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Identify output file # can be retrieved as steps.filenames.outputs.file_out
id: filenames
run: echo "::set-output name=file_out::$(ls | grep "^.*\.vsix$" | head -1)"
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.filenames.outputs.file_out }}
path: ${{ steps.filenames.outputs.file_out }}
Expand All @@ -35,7 +35,7 @@ jobs:

steps:
- name: Download artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: "artifacts/"
- name: Get version from tag
Expand All @@ -55,7 +55,7 @@ jobs:
timeout-minutes: 30
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: node $SCRIPT_DIR/enableWebpack.js
- run: yarn install
# - name: Publish to Open VSX Registry
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"R Markdown"
],
"engines": {
"vscode": "^1.60.0"
"vscode": "^1.67.0"
},
"activationEvents": [
"onLanguage:r",
Expand Down Expand Up @@ -1908,28 +1908,28 @@
"@types/fs-extra": "^9.0.11",
"@types/js-yaml": "^4.0.2",
"@types/mocha": "^8.2.2",
"@types/node": "^14.17.3",
"@types/node": "^16.11.7",
"@types/node-fetch": "^2.5.10",
"@types/showdown": "^1.9.3",
"@types/vscode": "^1.60.0",
"@types/vscode": "^1.67.0",
"@types/winreg": "^1.2.31",
"@types/ws": "^7.4.4",
"@typescript-eslint/eslint-plugin": "4.25.0",
"@typescript-eslint/parser": "4.25.0",
"@typescript-eslint/eslint-plugin": "^5.30.0",
"@typescript-eslint/parser": "^5.30.0",
"copy-webpack-plugin": "^9.0.0",
"devreplay": "^1.9.31",
"eslint": "^7.28.0",
"eslint-plugin-jsdoc": "^35.1.3",
"mocha": "^8.4.0",
"ts-loader": "^9.2.3",
"typescript": "^4.3.2",
"mocha": "^9.1.0",
"ts-loader": "^9.3.1",
"typescript": "^4.7.2",
"vscode-test": "^1.5.2",
"webpack": "^5.38.1",
"webpack-cli": "^4.7.2",
"yamljs": "^0.3.0"
},
"dependencies": {
"ag-grid-community": "^28.0.0",
"ag-grid-community": "^28.1.1",
"cheerio": "1.0.0-rc.10",
"crypto": "^1.0.1",
"ejs": "^3.1.7",
Expand All @@ -1942,7 +1942,7 @@
"node-fetch": "^2.6.7",
"popper.js": "^1.16.1",
"showdown": "^1.9.1",
"vscode-languageclient": "^7.0.0",
"vscode-languageclient": "^8.0.2",
"vsls": "^1.0.4753",
"winreg": "^1.2.4",
"ws": "^7.4.6"
Expand Down
1 change: 1 addition & 0 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
// (help related commands are registered in rHelp.initializeHelp)
};
for (const key in commands) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
context.subscriptions.push(vscode.commands.registerCommand(key, commands[key]));
}

Expand Down
2 changes: 1 addition & 1 deletion src/helpViewer/helpProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ export class AliasProvider {
// try to make new aliases (returns undefined if unsuccessful):
const newAliases = await this.makeAllAliases();
this.aliases = newAliases;
this.persistentState?.update('r.helpPanel.cachedAliases', newAliases);
await this.persistentState?.update('r.helpPanel.cachedAliases', newAliases);
return newAliases;
}

Expand Down
1 change: 1 addition & 0 deletions src/helpViewer/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-unsafe-argument */
/* eslint-disable @typescript-eslint/no-explicit-any */

import * as vscode from 'vscode';
Expand Down
Loading