diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 3d19691e5..8113ada52 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,28 +1,9 @@ /** @type {import('eslint').Linter.Config} */ module.exports = { root: true, - extends: [ - '@documenso/eslint-config', - 'plugin:package-json/recommended', - 'plugin:import/recommended', - ], - plugins: ['package-json', 'import', 'simple-import-sort'], + extends: ['@documenso/eslint-config'], rules: { '@next/next/no-img-element': 'off', - 'no-multi-spaces': [ - 'error', - { - ignoreEOLComments: false, - exceptions: { - BinaryExpression: false, - VariableDeclarator: false, - ImportDeclaration: false, - Property: false, - }, - }, - ], - 'import/named': 'off', - 'no-duplicate-imports': 'error', }, settings: { next: { diff --git a/packages/eslint-config/index.cjs b/packages/eslint-config/index.cjs index 9386fc7cb..60c58f89f 100644 --- a/packages/eslint-config/index.cjs +++ b/packages/eslint-config/index.cjs @@ -6,9 +6,11 @@ module.exports = { 'eslint:recommended', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended', + 'plugin:package-json/recommended', + 'plugin:import/recommended', ], - plugins: ['prettier'], + plugins: ['prettier', 'package-json', 'import', 'simple-import-sort'], env: { node: true, @@ -38,5 +40,21 @@ module.exports = { // To handle this we want this rule to catch usages and highlight them as // warnings so we can write appropriate interfaces and guards later. '@typescript-eslint/consistent-type-assertions': ['warn', { assertionStyle: 'never' }], + 'no-multi-spaces': [ + 'error', + { + ignoreEOLComments: false, + exceptions: { + BinaryExpression: false, + VariableDeclarator: false, + ImportDeclaration: false, + Property: false, + }, + }, + ], + 'import/named': 'error', + 'import/no-named-as-default': 'off', + 'import/namespace': 'off', + 'no-duplicate-imports': 'error', }, };