From a17cc27abb24310a3ac0a71613a189e842a20993 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 6 Mar 2022 10:15:57 +0100 Subject: [PATCH] Simplify eslint configuration MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .eslintrc.js | 35 +++++++------- .github/workflows/codeql-analysis.yml | 58 ++++++++++++------------ tests/worker-files/cluster/echoWorker.js | 2 +- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index a6a077fa..97308150 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -23,24 +23,14 @@ module.exports = defineConfig({ extends: [ 'standard', 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', 'plugin:import/errors', 'plugin:import/warnings', - 'plugin:import/typescript', 'plugin:promise/recommended', 'plugin:prettierx/standardx' ], rules: { 'no-void': 'off', - // We have some intentionally empty functions - '@typescript-eslint/no-empty-function': 'off', - - '@typescript-eslint/no-inferrable-types': [ - 'error', - { ignoreProperties: true } - ], - 'sort-imports': [ 'warn', { @@ -71,9 +61,21 @@ module.exports = defineConfig({ }, overrides: [ { - files: ['src/**/*.ts'], - extends: 'plugin:jsdoc/recommended', + files: ['**/*.ts'], + extends: [ + 'plugin:jsdoc/recommended', + 'plugin:@typescript-eslint/recommended', + 'plugin:import/typescript' + ], rules: { + // We have some intentionally empty functions + '@typescript-eslint/no-empty-function': 'off', + + '@typescript-eslint/no-inferrable-types': [ + 'error', + { ignoreProperties: true } + ], + 'no-useless-constructor': 'off', 'jsdoc/match-description': [ @@ -113,16 +115,13 @@ module.exports = defineConfig({ }, { files: ['**/*.js'], - extends: 'plugin:node/recommended', - rules: { - '@typescript-eslint/no-unused-vars': 'off', - '@typescript-eslint/no-var-requires': 'off' - } + extends: 'plugin:node/recommended' }, { files: ['examples/typescript/**/*.ts'], rules: { - 'import/no-unresolved': 'off' + 'import/no-unresolved': 'off', + 'jsdoc/require-jsdoc': 'off' } }, { diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4cf2aa3c..27be68f6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,14 +9,14 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "CodeQL" +name: 'CodeQL' on: push: - branches: [ master ] + branches: [master] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [master] schedule: - cron: '44 9 * * 3' @@ -32,39 +32,39 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'javascript' ] + language: ['javascript'] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] # Learn more about CodeQL language support at https://git.io/codeql-language-support steps: - - name: Checkout repository - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v2 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language - #- run: | - # make bootstrap - # make release + # - run: | + # make bootstrap + # make release - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/tests/worker-files/cluster/echoWorker.js b/tests/worker-files/cluster/echoWorker.js index 685d971e..cd20753e 100644 --- a/tests/worker-files/cluster/echoWorker.js +++ b/tests/worker-files/cluster/echoWorker.js @@ -1,5 +1,5 @@ 'use strict' -const { ClusterWorker, KillBehaviors } = require('../../../lib/index') +const { ClusterWorker } = require('../../../lib/index') function echo (data) { return data -- 2.34.1