@apolitical/eslint-config 2.0.0-rc.1 → 2.0.0

package/CHANGELOG.md

@@ -5,11 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.0.0] - 2022-03-18
+## [2.0.0] - 2022-04-01
 ### Added
 - eslint-config-prettier
 - eslint configurations for react
-- eslint.settings.js
+- eslint.config.js
 ### Deprecated
 - eslint-plugin-prettier
 ### Changed

package/api.config.js

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

package/base.config.js

@@ -0,0 +1,16 @@
+'use strict';
+
+module.exports = {
+  env: {
+    es2021: true,
+    jest: true,
+  },
+  parserOptions: {
+    ecmaVersion: 2021,
+  },
+  commonRules: ['eslint:recommended', 'eslint-config-prettier'],
+  rules: {
+    'no-return-await': 'error',
+    'jest/expect-expect': 'off',
+  },
+};

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@apolitical/eslint-config",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0",
   "description": "Apolitical ESLint and Prettier configurations",
   "author": "Apolitical Group Limited <engineering@apolitical.co>",
   "license": "MIT",
-  "main": "api.config.js",
+  "main": "base.config.js",
   "files": [
     "api.config.js",
+    "base.config.js",
     "prettier.config.js",
     "ui.config.js"
   ],
@@ -23,16 +24,16 @@
     "Node Modules"
   ],
   "dependencies": {
-    "eslint": "8.11.0",
+    "eslint": "8.12.0",
     "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-jest": "26.1.1",
-    "prettier": "2.6.0"
+    "eslint-plugin-jest": "26.1.3",
+    "prettier": "2.6.1"
   },
   "peerDependencies": {
-    "eslint": "8.11.0",
+    "eslint": "8.12.0",
     "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-jest": "26.1.1",
-    "prettier": "2.6.0"
+    "eslint-plugin-jest": "26.1.3",
+    "prettier": "2.6.1"
   },
   "engines": {
     "node": ">=16.13.0"

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,28 @@
-"use strict";
+'use strict';
 
-const { parserOptions: ps, env, commonRules } = require('./eslint.settings');
-
-const parserOptions = Object.assign(ps, 
-  {
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "jsx": true
-    }
-  }
-);
-
-env.browser = true;
+const { commonRules, env, parserOptions, rules } = require('./base.config');
 
 module.exports = {
-  parserOptions,
-  env,
-  "extends": [
-    ...commonRules,
-    "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"
+  parserOptions: {
+    ...parserOptions,
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  env: {
+    ...env,
+    browser: true,
+  },
+  extends: [...commonRules, 'react-app', 'react-app/jest'],
+  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'],
 };