@apolitical/eslint-config 2.0.0-rc.2 → 2.0.0-rc.3

package/api.config.js

@@ -1,14 +1,16 @@
-"use strict";
-const { parserOptions, env, commonRules } = require('./eslint.settings');
-
-env.node = true
+'use strict';
+const { commonRules, env, rules, parserOptions } = require('./base.settings');
 
 module.exports = {
   parserOptions,
-  env,
-  "extends": [
+  'env': {
+    ...env,
+    node: true,
+  },
+  'extends': [
     ...commonRules,
-    "plugin:jest/recommended"
+    'plugin:jest/recommended'
   ],
-  "plugins": ["jest"]
+  'plugins': ['jest'],
+  rules,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apolitical/eslint-config",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.3",
   "description": "Apolitical ESLint and Prettier configurations",
   "author": "Apolitical Group Limited <engineering@apolitical.co>",
   "license": "MIT",
@@ -26,7 +26,7 @@
   "dependencies": {
     "eslint": "8.11.0",
     "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-jest": "26.1.1",
+    "eslint-plugin-jest": "26.1.3",
     "prettier": "2.6.0"
   },
   "peerDependencies": {

package/prettier.config.js

@@ -1,9 +1,9 @@
 'use strict';
 
 module.exports = {
-  "useTabs": false,
-  "printWidth": 120,
-  "tabWidth": 2,
-  "singleQuote": true,
-  "trailingComma": "all"
+  'useTabs': false,
+  'printWidth': 120,
+  'tabWidth': 2,
+  'singleQuote': true,
+  'trailingComma': 'all'
 };

package/ui.config.js

@@ -1,34 +1,33 @@
-"use strict";
+'use strict';
 
-const { parserOptions: ps, env, commonRules } = require('./eslint.settings');
+const { commonRules, env, parserOptions, rules } = require('./base.settings');
 
-const parserOptions = Object.assign(ps, 
-  {
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "jsx": true
+module.exports = {
+  parserOptions: {
+    ...parserOptions,
+    'sourceType': 'module',
+    'ecmaFeatures': {
+      'jsx': true
     }
-  }
-);
-
-env.browser = true;
 
-module.exports = {
-  parserOptions,
-  env,
-  "extends": [
+  },
+  env: {
+    ...env,
+    browser: true
+  },
+  'extends': [
     ...commonRules,
-    "react-app",
-    "react-app/jest"
+    'react-app',
+    'react-app/jest'
   ],
-  "rules": {
-    "strict": ["error", "never"],
-    "no-duplicate-imports": "warn",
-    "no-empty-function": "warn",
-    "no-return-await": "error",
-    "react-hooks/exhaustive-deps": "off",
-    "testing-library/no-render-in-setup": "warn",
-    "testing-library/prefer-screen-queries": "warn"
+  'rules': {
+    ...rules,
+    'strict': ['error', 'never'],
+    'no-duplicate-imports': 'warn',
+    'no-empty-function': 'warn',
+    'react-hooks/exhaustive-deps': 'off',
+    'testing-library/no-render-in-setup': 'warn',
+    'testing-library/prefer-screen-queries': 'warn'
   },
-  "ignorePatterns": ["locales"]
+  'ignorePatterns': ['locales']
 };

package/eslint.settings.js

@@ -1,12 +0,0 @@
-"use strict";
-
-module.exports = {
-  "env": {
-    "es2021": true,
-    "jest": true
-  }, 
-  "parserOptions": {
-    "ecmaVersion": 2021 
-  },
-  "commonRules": ["eslint:recommended", "eslint-config-prettier"]
-}