diff --git a/es6.js b/es6.js index 96e9a2c..6a57fb7 100644 --- a/es6.js +++ b/es6.js @@ -75,7 +75,12 @@ module.exports = { 'no-undef': 'error', 'no-undefined': 'off', 'no-unused-vars': 'error', - 'no-use-before-define': ['error', 'nofunc'], + 'no-use-before-define': ['error', { + 'functions': true, + 'classes': false, + 'variables': true, + 'allowNamedExports': false + }], // ES6 'arrow-parens': ['error', 'always'], @@ -149,7 +154,7 @@ module.exports = { 'skipComments': true, 'skipBlankLines': true }], - 'max-params': ['warn', 3], + 'max-params': ['warn', 4], 'max-statements-per-line': 'error', 'max-statements': ['error', 30, { 'ignoreTopLevelFunctions': true diff --git a/package-lock.json b/package-lock.json index 209d9c7..a947eee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "eslint-config-greencoast", - "version": "0.0.3", + "version": "0.0.4", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index b4f5516..25ff5b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-greencoast", - "version": "0.0.3", + "version": "0.0.4", "description": "A shareable ESLint config used by Greencoast Studios.", "repository": { "type": "git", diff --git a/typescript.js b/typescript.js index 88e1f56..531ad71 100644 --- a/typescript.js +++ b/typescript.js @@ -9,6 +9,22 @@ module.exports = { 'greencoast/es6' ], rules: { - '@typescript-eslint/no-non-null-assertion': 'off' + '@typescript-eslint/no-non-null-assertion': 'off', + '@typescript-eslint/no-unsafe-declaration-merging': 'off', + + 'no-use-before-define': 'off', + '@typescript-eslint/no-use-before-define': ['error', { + 'functions': true, + 'classes': false, + 'variables': true, + 'allowNamedExports': false, + 'enums': true, + 'typedefs': true, + 'ignoreTypeReferences': true + }], + 'no-unused-vars': 'off', + '@typescript-eslint/no-unused-vars': 'error', + 'no-redeclare': 'off', + '@typescript-eslint/no-redeclare': 'error' } };