@shelf/eslint-config 1.8.2 → 2.2.0

package/CHANGELOG.md

@@ -1,2 +1,8 @@
+## 2.0.0
+
+Removed separate file for testing-library, added testing-library rules to `frontend-typescript.js`.
+Extended `frontend.js` in `frontend-typescript.js` and `frontend-typescript-vue.js`.
+
 ## 1.0.0
+
 Breaking changes of the eslint-config-prettier 8.0.0

package/frontend-typescript-vue.js

@@ -1,34 +1,24 @@
-const importOrder = require('./rules/import-order.json');
-const sortImports = require('./rules/sort-imports.json');
 const {allowRequireInConfigs, noExplicitReturnTypeInTests} = require('./rules/overrides');
 const consistentTypeAssertions = require('./rules/consistent-type-assertions.json');
+const vueConfig = require('./frontend-vue');
 
 module.exports = {
   extends: [
-    '@shelf/eslint-config',
+    './frontend-vue',
     'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended',
-    'plugin:vue/essential',
   ],
-  plugins: ['@typescript-eslint', 'vue', 'babel', 'jsx', 'import'],
-  env: {
-    browser: true,
-  },
+  plugins: ['@typescript-eslint', ...vueConfig.plugins],
   parserOptions: {
+    ...vueConfig.parserOptions,
     parser: '@typescript-eslint/parser',
-    ecmaFeatures: {
-      jsx: true,
-    },
   },
   rules: {
-    ...importOrder,
-    ...sortImports,
+    ...vueConfig.rules,
     '@typescript-eslint/no-use-before-define': 0,
     '@typescript-eslint/camelcase': 0,
     '@typescript-eslint/explicit-member-accessibility': 0,
     'jest/lowercase-name': 'off',
-    'comma-dangle': 'off',
     ...consistentTypeAssertions,
   },
   overrides: [allowRequireInConfigs, noExplicitReturnTypeInTests],

package/frontend-typescript.js

@@ -1,28 +1,19 @@
 const commonExtends = require('./rules/extends-common.json');
 const commonPlugins = require('./common/plugins');
-const env = require('./common/env');
-const importOrder = require('./rules/import-order.json');
-const jestRules = require('./rules/jest.json');
-const paddingLineBetweenStatements = require('./rules/padding-line-between-statements');
-const preferDestructuring = require('./rules/prefer-destructuring');
-const sortImports = require('./rules/sort-imports.json');
 const tsParser = require('./common/ts-parser');
 const {allowRequireInConfigs, noExplicitReturnTypeInTests} = require('./rules/overrides');
 const consistentTypeAssertions = require('./rules/consistent-type-assertions.json');
+const frontendConfig = require('./frontend');
 
 module.exports = {
-  extends: [...commonExtends, 'plugin:react/recommended', 'plugin:react-hooks/recommended'],
+  extends: ['./frontend.js', ...commonExtends],
   globals: {
     DD_LOGS: true,
   },
-  plugins: [...commonPlugins, 'react'],
-  env: {
-    ...env,
-    browser: true,
-  },
+  plugins: [...commonPlugins, ...frontendConfig.plugins, 'testing-library'],
   ...tsParser,
   rules: {
-    'prettier/prettier': 'error',
+    ...frontendConfig.rules,
     '@typescript-eslint/no-use-before-define': 0,
     '@typescript-eslint/camelcase': 0,
     // it fail to compile TS on react static class properties (displayName | defaultProps | etc..)
@@ -33,17 +24,24 @@ module.exports = {
     '@typescript-eslint/no-empty-function': 'off',
     'react/prop-types': 'off',
     'react/display-name': 'warn',
-    'padding-line-between-statements': paddingLineBetweenStatements,
-    ...jestRules,
-    ...preferDestructuring,
-    'prefer-template': 'error',
-    'prefer-object-spread': 'error',
-    ...importOrder,
-    ...sortImports,
     '@typescript-eslint/no-unused-vars': 'error',
-    'comma-dangle': 'off',
-    'no-console': 'error',
     ...consistentTypeAssertions,
+    'testing-library/await-async-query': 'error',
+    'testing-library/no-await-sync-query': 'error',
+    'testing-library/no-debug': 'warn',
+    'testing-library/consistent-data-testid': [
+      2,
+      {
+        testIdPattern: '^(([a-z])+(-)*)+$',
+      },
+    ],
   },
-  overrides: [allowRequireInConfigs, noExplicitReturnTypeInTests],
+  overrides: [
+    allowRequireInConfigs,
+    noExplicitReturnTypeInTests,
+    {
+      files: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'],
+      extends: ['plugin:testing-library/react'],
+    },
+  ],
 };

package/frontend-vue.js

@@ -1,7 +1,5 @@
-const importOrder = require('./rules/import-order.json');
-
 module.exports = {
-  extends: ['@shelf/eslint-config', 'plugin:prettier/recommended', 'plugin:vue/essential'],
+  extends: ['./base.js', 'plugin:vue/essential'],
   plugins: ['vue', 'babel', 'jsx', 'import'],
   env: {
     browser: true,
@@ -12,8 +10,4 @@ module.exports = {
       jsx: true,
     },
   },
-  rules: {
-    ...importOrder,
-    'comma-dangle': 'off',
-  },
 };

package/frontend.js

@@ -1,13 +1,8 @@
-const importOrder = require('./rules/import-order.json');
 const env = require('./common/env');
+const baseConfig = require('./base');
 
 module.exports = {
-  extends: [
-    '@shelf/eslint-config',
-    'plugin:react/recommended',
-    'prettier',
-    'plugin:react-hooks/recommended',
-  ],
+  extends: ['./base.js', 'plugin:react/recommended', 'prettier', 'plugin:react-hooks/recommended'],
   plugins: ['react', 'import'],
   env: {
     browser: true,
@@ -20,8 +15,7 @@ module.exports = {
     },
   },
   rules: {
-    ...importOrder,
-    'comma-dangle': 'off',
+    ...baseConfig.rules,
     'no-console': 'error',
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shelf/eslint-config",
-  "version": "1.8.2",
+  "version": "2.2.0",
   "description": "ESLint Config for Shelf Projects",
   "license": "MIT",
   "repository": "shelfio/eslint-config",
@@ -23,7 +23,6 @@
     "frontend-vue.js",
     "frontend-typescript.js",
     "frontend-typescript-vue.js",
-    "frontend-testing-library.js",
     "meteor.js",
     "typescript.js"
   ],
@@ -34,13 +33,13 @@
   ],
   "dependencies": {
     "@babel/eslint-parser": "7.15.0",
-    "@typescript-eslint/eslint-plugin": "4.29.3",
-    "@typescript-eslint/parser": "4.29.3",
-    "eslint-config-next": "11.0.1",
+    "@typescript-eslint/eslint-plugin": "4.33.0",
+    "@typescript-eslint/parser": "4.33.0",
+    "eslint-config-next": "11.1.2",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-babel": "5.3.1",
     "eslint-plugin-import": "2.24.2",
-    "eslint-plugin-jest": "24.4.0",
+    "eslint-plugin-jest": "24.4.3",
     "eslint-plugin-jest-formatting": "3.0.0",
     "eslint-plugin-json-format": "2.0.1",
     "eslint-plugin-jsx": "0.1.0",
@@ -53,7 +52,7 @@
   "devDependencies": {
     "husky": "4.3.8",
     "lint-staged": "11.1.2",
-    "prettier": "2.3.2"
+    "prettier": "2.4.0"
   },
   "peerDependencies": {
     "eslint": "7.x",

package/typescript.js

@@ -16,7 +16,9 @@ module.exports = {
   env,
   ...tsParser,
   rules: {
-    complexity: ['warn', {max: 6}],
+    complexity: ['warn', {max: 5}],
+    curly: 'error',
+    'no-nested-ternary': 'error',
     'prettier/prettier': 'error',
     '@typescript-eslint/no-use-before-define': 0,
     '@typescript-eslint/camelcase': 0,

package/frontend-testing-library.js

@@ -1,15 +0,0 @@
-module.exports = {
-  extends: ['plugin:testing-library/react'],
-  plugins: ['testing-library'],
-  rules: {
-    'testing-library/await-async-query': 'error',
-    'testing-library/no-await-sync-query': 'error',
-    'testing-library/no-debug': 'warn',
-    'testing-library/consistent-data-testid': [
-      2,
-      {
-        testIdPattern: '^(([a-z])+(-)*)+$',
-      },
-    ],
-  },
-};