From e3023800e3ee883953503aa999bd7bc26ad4a9e2 Mon Sep 17 00:00:00 2001 From: Kun Ren Date: Wed, 25 Mar 2020 23:43:58 +0800 Subject: [PATCH 1/5] Use eslint in GitHub Actions --- .github/workflows/main.yml | 9 +++------ package.json | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 65a3654c3..e9a87ea6e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,17 +13,14 @@ jobs: with: name: vscode-R.vsix path: vscode-R.vsix - tslint: + eslint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Prepare - run: npm ci - name: Lint - uses: mooyoul/tslint-actions@v1.1.1 + uses: stefanoeb/eslint-action@1.0.2 with: - token: ${{ secrets.GITHUB_TOKEN }} - pattern: "src/*.ts" + files: src/ lintr: runs-on: ubuntu-latest container: diff --git a/package.json b/package.json index a09d406ce..be70e13a7 100644 --- a/package.json +++ b/package.json @@ -443,6 +443,7 @@ "eslint": "^6.8.0", "eslint-config-standard": "^14.1.0", "eslint-plugin-import": "^2.20.1", + "eslint-plugin-jsdoc": "^22.1.0", "eslint-plugin-node": "^11.0.0", "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^4.0.1", From 499bc69053068fe77c235c1162b153f1b84dba7d Mon Sep 17 00:00:00 2001 From: Kun Ren Date: Wed, 25 Mar 2020 23:46:58 +0800 Subject: [PATCH 2/5] Update package-lock.json --- package-lock.json | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/package-lock.json b/package-lock.json index 4cf523b8f..9ace19a61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1203,6 +1203,12 @@ "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", "dev": true }, + "comment-parser": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.2.tgz", + "integrity": "sha512-4Rjb1FnxtOcv9qsfuaNuVsmmVn4ooVoBHzYfyKteiXwIU84PClyGA5jASoFMwPV93+FPh9spwueXauxFJZkGAg==", + "dev": true + }, "commondir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", @@ -2125,6 +2131,38 @@ } } }, + "eslint-plugin-jsdoc": { + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-22.1.0.tgz", + "integrity": "sha512-54NdbICM7KrxsGUqQsev9aIMqPXyvyBx2218Qcm0TQ16P9CtBI+YY4hayJR6adrxlq4Ej0JLpgfUXWaQVFqmQg==", + "dev": true, + "requires": { + "comment-parser": "^0.7.2", + "debug": "^4.1.1", + "jsdoctypeparser": "^6.1.0", + "lodash": "^4.17.15", + "regextras": "^0.7.0", + "semver": "^6.3.0", + "spdx-expression-parse": "^3.0.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, "eslint-plugin-node": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz", @@ -3680,6 +3718,12 @@ "esprima": "^4.0.0" } }, + "jsdoctypeparser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-6.1.0.tgz", + "integrity": "sha512-UCQBZ3xCUBv/PLfwKAJhp6jmGOSLFNKzrotXGNgbKhWvz27wPsCsVeP7gIcHPElQw2agBmynAitXqhxR58XAmA==", + "dev": true + }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -5215,6 +5259,12 @@ "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==", "dev": true }, + "regextras": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.0.tgz", + "integrity": "sha512-ds+fL+Vhl918gbAUb0k2gVKbTZLsg84Re3DI6p85Et0U0tYME3hyW4nMK8Px4dtDaBA2qNjvG5uWyW7eK5gfmw==", + "dev": true + }, "registry-auth-token": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", From 3315d2777bebf719dd999c26ecd2e64e2bf6b5e2 Mon Sep 17 00:00:00 2001 From: Kun Ren Date: Wed, 25 Mar 2020 23:49:50 +0800 Subject: [PATCH 3/5] Fix main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e9a87ea6e..f44a92808 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: - name: Lint uses: stefanoeb/eslint-action@1.0.2 with: - files: src/ + files: src/*.ts lintr: runs-on: ubuntu-latest container: From 1f2c03f230cffd0c80cde75f75f307baf4412034 Mon Sep 17 00:00:00 2001 From: Kun Ren Date: Tue, 31 Mar 2020 08:39:52 +0800 Subject: [PATCH 4/5] Use setup-node --- .github/workflows/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f44a92808..775f81dc9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,10 +17,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Lint - uses: stefanoeb/eslint-action@1.0.2 + - uses: actions/setup-node@v1 with: - files: src/*.ts + node-version: "13.x" + - run: npm ci + - run: eslint -c ./.eslintrc.js src/*.ts lintr: runs-on: ubuntu-latest container: From d99e2b0bfaf5b02e0350293b73aae1b02cb19b5f Mon Sep 17 00:00:00 2001 From: Kun Ren Date: Tue, 31 Mar 2020 08:42:12 +0800 Subject: [PATCH 5/5] Fix eslint --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 775f81dc9..60f654041 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,8 @@ jobs: with: node-version: "13.x" - run: npm ci - - run: eslint -c ./.eslintrc.js src/*.ts + - name: Run eslint + run: ./node_modules/.bin/eslint -c ./.eslintrc.js src/*.ts lintr: runs-on: ubuntu-latest container: