diff --git a/packages/cli/config/eslint.backend.js b/packages/cli/config/eslint.backend.js index ef6e513cf5..619d3c72e0 100644 --- a/packages/cli/config/eslint.backend.js +++ b/packages/cli/config/eslint.backend.js @@ -46,6 +46,8 @@ module.exports = { bundledDependencies: true, }, ], + 'no-unused-expressions': 'off', + '@typescript-eslint/no-unused-expressions': 'error', '@typescript-eslint/no-unused-vars': [ 'warn', { vars: 'all', args: 'after-used', ignoreRestSiblings: true }, diff --git a/packages/cli/config/eslint.js b/packages/cli/config/eslint.js index 230a95c324..6de2cf75d5 100644 --- a/packages/cli/config/eslint.js +++ b/packages/cli/config/eslint.js @@ -51,6 +51,8 @@ module.exports = { bundledDependencies: true, }, ], + 'no-unused-expressions': 'off', + '@typescript-eslint/no-unused-expressions': 'error', '@typescript-eslint/no-unused-vars': [ 'warn', { vars: 'all', args: 'after-used', ignoreRestSiblings: true }, diff --git a/plugins/scaffolder-backend/.eslintrc.js b/plugins/scaffolder-backend/.eslintrc.js index 56b9c0bb2e..8475cfd0b8 100644 --- a/plugins/scaffolder-backend/.eslintrc.js +++ b/plugins/scaffolder-backend/.eslintrc.js @@ -1,8 +1,9 @@ module.exports = { - extends: [require.resolve('@backstage/cli/config/eslint')], + extends: [require.resolve('@backstage/cli/config/eslint.backend')], ignorePatterns: ['sample-templates/'], rules: { 'no-console': 0, // Permitted in console programs 'new-cap': ['error', { capIsNew: false }], // Because Express constructs things e.g. like 'const r = express.Router()' + }, }; diff --git a/plugins/scaffolder-backend/src/scaffolder/storage/disk.test.ts b/plugins/scaffolder-backend/src/scaffolder/storage/disk.test.ts index 92c9d3c37f..a8120a1798 100644 --- a/plugins/scaffolder-backend/src/scaffolder/storage/disk.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/storage/disk.test.ts @@ -15,7 +15,7 @@ */ import { DiskStorage } from './disk'; import * as path from 'path'; -import { Logger } from 'winston'; + describe('Disk Storage', () => { it('should load a simple template from a simple directory', async () => { const testTemplateDir = path.resolve(