diff --git a/index.js b/index.js index 27784f2..ed1ca15 100644 --- a/index.js +++ b/index.js @@ -5,14 +5,11 @@ const config = Object.assign({}, require('eslint-config-standard')); config.plugins = [].concat(config.plugins || [], [ - 'unicorn', - 'compat', - 'promise', - 'es' + 'compat' ]); + config.extends = [].concat(config.extends || [], [ - 'plugin:unicorn/recommended', - 'plugin:promise/recommended' + '@hdsydsvenskan/eslint-config-hds-core' ]); config.env = { @@ -25,67 +22,15 @@ config.parserOptions = { sourceType: 'module' }; -config.settings = Object.assign({}, config.settings, { - jsdoc: Object.assign( - {}, - (config.settings || {}).jsdoc || {}, - { mode: 'typescript' } - ) -}); - config.rules = Object.assign({}, config.rules, { - 'semi': [2, 'always'], - 'no-extra-semi': 2, - 'compat/compat': 'error', - 'import/no-deprecated': 1, - - 'jsdoc/check-types': 0, - 'jsdoc/no-undefined-types': 0, - 'jsdoc/require-jsdoc': 0, - 'jsdoc/require-param-description': 0, - 'jsdoc/require-property-description': 0, - 'jsdoc/require-returns-description': 0, - 'jsdoc/valid-types': 0, - - 'comma-dangle': [1, { - 'arrays': 'ignore', - 'objects': 'ignore', - 'imports': 'ignore', - 'exports': 'ignore', - 'functions': 'never' - }], - 'func-style': [1, 'expression', { 'allowArrowFunctions': true }], - 'no-console': 1, - 'no-multi-spaces': [2, { 'ignoreEOLComments': true }], - 'no-unused-vars': [2, { 'args': 'after-used', 'ignoreRestSiblings': true }], - 'no-var': 2, - 'no-warning-comments': [1, { 'terms': ['fixme'] }], - 'object-shorthand': [2, 'properties'], - 'quote-props': [2, 'as-needed', { 'keywords': true, 'numbers': true, 'unnecessary': false }], - 'quotes': [2, 'single', { 'avoidEscape': true, 'allowTemplateLiterals': true }], - 'require-atomic-updates': 2, - - 'unicorn/catch-error-name': [1, { 'name': 'err' }], - 'unicorn/consistent-function-scoping': 0, - 'unicorn/expiring-todo-comments': [1, { - 'allowWarningComments': true, - 'ignoreDatesOnPullRequests': true - }], - 'unicorn/explicit-length-check': 0, 'unicorn/no-fn-reference-in-iterator': 0, - 'unicorn/prefer-add-event-listener': 1, 'unicorn/prefer-includes': 1, - 'unicorn/prefer-modern-dom-apis': 1, 'unicorn/prefer-node-append': 1, 'unicorn/prefer-node-remove': 1, 'unicorn/prefer-query-selector': 0, - 'unicorn/prefer-reflect-apply': 0, - 'unicorn/prefer-replace-all': 0, - 'unicorn/prefer-spread': 1, - 'unicorn/prevent-abbreviations': 0, - 'unicorn/better-regex': [1, { 'sortCharacterClasses': false }] + 'unicorn/prefer-reflect-apply': 0 }); module.exports = config; diff --git a/package.json b/package.json index e5c45e8..344e104 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,8 @@ }, "main": "index.js", "devDependencies": { - "@hdsydsvenskan/eslint-config-hds": "^18.0.0", + "@hdsydsvenskan/eslint-config-hds": "^19.0.0-1", + "@hdsydsvenskan/eslint-config-hds-core": "^1.0.0", "eslint": "^6.7.2", "eslint-config-standard": "^14.1.0", "eslint-plugin-es": "^3.0.0", @@ -41,15 +42,13 @@ "installed-check": "^3.0.0" }, "peerDependencies": { + "@hdsydsvenskan/eslint-config-hds-core": "^1.0.0", "eslint": "^6.7.2", "eslint-config-standard": "^14.1.0", "eslint-plugin-compat": "^3.0.0", - "eslint-plugin-es": "^3.0.0", "eslint-plugin-import": "^2.20.1", - "eslint-plugin-jsdoc": "^22.0.0", "eslint-plugin-node": "^11.0.0", "eslint-plugin-promise": "^4.0.0", - "eslint-plugin-standard": "^4.0.0", - "eslint-plugin-unicorn": "^17.2.0" + "eslint-plugin-standard": "^4.0.0" } }