fix: improve some configs

ClarkSource · May 7, 2019 · eaaaf9d · eaaaf9d
1 parent 0afff8a
commit eaaaf9d
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 15 deletions.
diff --git a/packages/eslint-config-browser/index.js b/packages/eslint-config-browser/index.js
@@ -1,12 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: [require.resolve('./lib/common'), '@clark'],
-  rules: {
-    'unicorn/prefer-add-event-listener': 'error',
-    'unicorn/prefer-node-append': 'error',
-    'unicorn/prefer-node-remove': 'error',
-    'unicorn/prefer-query-selector': 'error',
-    'unicorn/prefer-text-content': 'error'
-  }
+  extends: [require.resolve('./lib/common'), '@clark']
 };
diff --git a/packages/eslint-config-browser/legacy.js b/packages/eslint-config-browser/legacy.js
@@ -8,8 +8,8 @@ module.exports = {
   },
   rules: {
     'unicorn/prefer-exponentiation-operator': 'off',
+    'unicorn/prefer-node-remove': 'off',
     'unicorn/prefer-node-append': 'off',
     'unicorn/prefer-query-selector': 'off'
-    // 'unicorn/prefer-node-remove': 'off'
   }
 };
diff --git a/packages/eslint-config-ember/index.js b/packages/eslint-config-ember/index.js
@@ -1,5 +1,14 @@
 'use strict';
 
+const merge = require('lodash.merge');
+
+const [
+  BASE_ABBREVIATIONS_LEVEL,
+  BASE_ABBREVIATIONS_CONFIG
+] = require('@clark/eslint-config/lib/common').rules[
+  'unicorn/prevent-abbreviations'
+];
+
 const {
   DEFAULT_IGNORED_PROPERTIES
 } = require('eslint-plugin-ember/lib/rules/avoid-leaking-state-in-ember-objects');
@@ -8,7 +17,7 @@ module.exports = {
   plugins: ['ember', 'ember-best-practices'],
   extends: [
     '@clark/browser',
-    '@clark/ember-order-imports',
+    // '@clark/ember-order-imports',
     'plugin:ember/recommended',
     'plugin:ember-best-practices/recommended',
     require.resolve('@clark/eslint-config/lib/parser-config')
@@ -193,7 +202,16 @@ module.exports = {
      * @see https://github.com/ember-cli/eslint-plugin-ember/blob/master/docs/rules/closure-actions.md
      */
     'ember-best-practices/no-send-action': 'off',
-    'ember/closure-actions': 'error'
+    'ember/closure-actions': 'error',
+
+    'unicorn/prevent-abbreviations': [
+      BASE_ABBREVIATIONS_LEVEL,
+      merge(BASE_ABBREVIATIONS_CONFIG, {
+        whitelist: {
+          didReceiveAttrs: true
+        }
+      })
+    ]
   },
   overrides: [
     {

diff --git a/packages/eslint-config-ember/package.json b/packages/eslint-config-ember/package.json
@@ -27,6 +27,7 @@
     "@clark/eslint-config-browser": "^1.0.0",
     "@clark/eslint-config-ember-order-imports": "^1.1.0",
     "eslint-plugin-ember": "^6.4.1",
-    "eslint-plugin-ember-best-practices": "^1.1.1"
+    "eslint-plugin-ember-best-practices": "^1.1.1",
+    "lodash.merge": "^4.6.1"
   }
 }
diff --git a/packages/eslint-config-node/index.js b/packages/eslint-config-node/index.js
@@ -1,11 +1,51 @@
 'use strict';
 
+const merge = require('lodash.merge');
+
+const [
+  BASE_ABBREVIATIONS_LEVEL,
+  BASE_ABBREVIATIONS_CONFIG
+] = require('@clark/eslint-config/lib/common').rules[
+  'unicorn/prevent-abbreviations'
+];
+
 module.exports = {
   plugins: ['node'],
   extends: ['@clark', 'plugin:node/recommended'],
   // eslint-disable-next-line unicorn/prevent-abbreviations
   env: {
     node: true,
     browser: false
-  }
+  },
+  overrides: [
+    /* eslint-disable unicorn/prevent-abbreviations */
+    {
+      files: ['environment.js'],
+      rules: {
+        'unicorn/prevent-abbreviations': [
+          BASE_ABBREVIATIONS_LEVEL,
+          merge(BASE_ABBREVIATIONS_CONFIG, {
+            whitelist: {
+              EmberENV: true
+            }
+          })
+        ]
+      }
+    },
+    {
+      files: ['ember-try.js'],
+      rules: {
+        'unicorn/prevent-abbreviations': [
+          BASE_ABBREVIATIONS_LEVEL,
+          merge(BASE_ABBREVIATIONS_CONFIG, {
+            whitelist: {
+              devDependencies: true,
+              env: true
+            }
+          })
+        ]
+      }
+    }
+    /* eslint-enable unicorn/prevent-abbreviations */
+  ]
 };
diff --git a/packages/eslint-config-node/package.json b/packages/eslint-config-node/package.json
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@clark/eslint-config": "^1.0.0",
-    "eslint-plugin-node": "^9.0.1"
+    "eslint-plugin-node": "^9.0.1",
+    "lodash.merge": "^4.6.1"
   }
 }
diff --git a/packages/eslint-config/lib/common.js b/packages/eslint-config/lib/common.js
@@ -70,6 +70,17 @@ module.exports = {
 
     'no-empty-function': 'warn',
 
-    'consistent-return': 'off'
+    'consistent-return': 'off',
+
+    'unicorn/prevent-abbreviations': [
+      'warn',
+      {
+        replacements: {
+          args: {
+            arguments: false
+          }
+        }
+      }
+    ]
   }
 };
diff --git a/yarn.lock b/yarn.lock
@@ -3188,6 +3188,11 @@ lodash.kebabcase@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
   integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=
 
+lodash.merge@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
+  integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
+
 lodash.set@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"