diff --git a/eslint-config-base/index.js b/eslint-config-base/index.js index 738df8a..cc7a9c3 100644 --- a/eslint-config-base/index.js +++ b/eslint-config-base/index.js @@ -150,9 +150,15 @@ module.exports = { groups: ['builtin', 'external', 'parent', 'sibling', 'index'], pathGroups: [ { - pattern: '*.+(png|svg|scss|sass|css)', + pattern: '*.+(png|svg)', group: 'sibling', - patternOptions: { matchBase: true }, // options: https://github.com/isaacs/minimatch + patternOptions: { matchBase: true }, + position: 'after', + }, + { + pattern: '*.+(scss|sass|css)', + group: 'sibling', + patternOptions: { matchBase: true }, position: 'after', }, ], diff --git a/eslint-config-base/package.json b/eslint-config-base/package.json index 7e91c0f..5b6444a 100644 --- a/eslint-config-base/package.json +++ b/eslint-config-base/package.json @@ -1,6 +1,6 @@ { "name": "@macpaw/eslint-config-base", - "version": "0.0.11", + "version": "0.0.12", "main": "index.js", "scripts": { "version:patch": "yarn version --patch --no-git-tag-version", diff --git a/eslint-config-react/index.js b/eslint-config-react/index.js index 10e44e7..69f3500 100644 --- a/eslint-config-react/index.js +++ b/eslint-config-react/index.js @@ -14,6 +14,7 @@ module.exports = { }, rules: { 'jsx-quotes': ['error', 'prefer-double'], + 'jsx-a11y/no-autofocus': 0, 'react/prop-types': 0, 'react/display-name': 0, 'react/jsx-max-props-per-line': ['error', { 'maximum': 1, 'when': 'multiline' }], diff --git a/eslint-config-react/package.json b/eslint-config-react/package.json index 4d87656..622a9dc 100644 --- a/eslint-config-react/package.json +++ b/eslint-config-react/package.json @@ -1,6 +1,6 @@ { "name": "@macpaw/eslint-config-react", - "version": "0.0.11", + "version": "0.0.12", "main": "index.js", "scripts": { "version:patch": "yarn version --patch --no-git-tag-version", diff --git a/eslint-config-typescript/index.js b/eslint-config-typescript/index.js index 423711d..d02afa4 100644 --- a/eslint-config-typescript/index.js +++ b/eslint-config-typescript/index.js @@ -10,6 +10,8 @@ module.exports = { '@typescript-eslint', ], rules: { + '@typescript-eslint/ban-ts-comment': 0, + '@typescript-eslint/no-non-null-assertion': 0, '@typescript-eslint/no-use-before-define': ['error', { 'functions': false }], '@typescript-eslint/member-delimiter-style': ['error', { 'multiline': { diff --git a/eslint-config-typescript/package.json b/eslint-config-typescript/package.json index e295203..3d180d9 100644 --- a/eslint-config-typescript/package.json +++ b/eslint-config-typescript/package.json @@ -1,6 +1,6 @@ { "name": "@macpaw/eslint-config-typescript", - "version": "0.0.11", + "version": "0.0.12", "main": "index.js", "scripts": { "version:patch": "yarn version --patch --no-git-tag-version",