[eslint] tighten up rules

Author: ljharb

.eslintrc

@@ -12,25 +12,66 @@
     "env": {
         "node": true,
         "es6": true,
+        "es2017": true,
     },
     "parserOptions": {
         "sourceType": "module",
         "ecmaVersion": 2020,
     },
     "rules": {
+        "arrow-body-style": [2, "as-needed"],
+        "arrow-parens": [2, "always"],
+        "arrow-spacing": [2, { "before": true, "after": true }],
+        "block-spacing": [2, "always"],
+        "brace-style": [2, "1tbs", { "allowSingleLine": true }],
         "comma-dangle": ["error", {
             "arrays": "always-multiline",
             "objects": "always-multiline",
             "imports": "always-multiline",
             "exports": "always-multiline",
             "functions": "always-multiline",
         }],
+        "comma-spacing": [2, { "before": false, "after": true }],
         "comma-style": [2, "last"],
-        "curly": [2, "multi-line"],
+        "computed-property-spacing": [2, "never"],
+        "curly": [2, "all"],
+        "default-case": [2, { "commentPattern": "(?:)" }],
+        "default-case-last": [2],
+        "default-param-last": [2],
+        "dot-location": [2, "property"],
+        "dot-notation": [2, { "allowKeywords": true, "allowPattern": "throws" }],
         "eol-last": [2, "always"],
         "eqeqeq": [2, "allow-null"],
-        "func-call-spacing": 2,
-        "indent": [2, 2],
+        "for-direction": [2],
+        "function-call-argument-newline": [2, "consistent"],
+        "func-call-spacing": [2, "never"],
+        "implicit-arrow-linebreak": [2, "beside"],
+        "indent": [2, 2, {
+            "SwitchCase": 1,
+            "VariableDeclarator": 1,
+            "outerIIFEBody": 1,
+            "FunctionDeclaration": {
+                "parameters": 1,
+                "body": 1
+            },
+            "FunctionExpression": {
+                "parameters": 1,
+                "body": 1
+            },
+            "CallExpression": {
+                "arguments": 1
+            },
+            "ArrayExpression": 1,
+            "ObjectExpression": 1,
+            "ImportDeclaration": 1,
+            "flatTernaryExpressions": false,
+        }],
+        "jsx-quotes": [2, "prefer-double"],
+        "key-spacing": [2, {
+            "beforeColon": false,
+            "afterColon": true,
+            "mode": "strict",
+        }],
         "keyword-spacing": ["error", {
           "before": true,
           "after": true,
@@ -40,27 +81,68 @@
             "case": { "after": true }
           }
         }],
+        "linebreak-style": [2, "unix"],
+        "lines-around-directive": [2, {
+            "before": "always",
+            "after": "always",
+        }],
         "max-len": 0,
+        "new-parens": 2,
+        "no-array-constructor": 2,
+        "no-compare-neg-zero": 2,
         "no-cond-assign": [2, "always"],
+        "no-extra-parens": 2,
+        "no-multiple-empty-lines": [2, { "max": 1, "maxEOF": 1, "maxBOF": 0 }],
         "no-return-assign": [2, "always"],
+        "no-trailing-spaces": 2,
         "no-var": 2,
         "object-curly-spacing": [2, "always"],
         "object-shorthand": ["error", "always", {
             "ignoreConstructors": false,
-            "avoidQuotes": true,
+            "avoidQuotes": false,
+            "avoidExplicitReturnArrows": true,
         }],
         "one-var": [2, "never"],
+        "operator-linebreak": [2, "none", {
+            "overrides": {
+              "?": "before",
+              ":": "before",
+              "&&": "before",
+              "||": "before",
+            },
+        }],
         "prefer-const": 2,
+        "prefer-object-spread": 2,
+        "prefer-rest-params": 2,
+        "prefer-template": 2,
+        "quote-props": [2, "as-needed", { "keywords": false }],
         "quotes": [2, "single", {
             "allowTemplateLiterals": true,
             "avoidEscape": true,
         }],
+        "rest-spread-spacing": [2, "never"],
         "semi": [2, "always"],
+        "semi-spacing": [2, { "before": false, "after": true }],
+        "semi-style": [2, "last"],
+        "space-before-blocks": [2, { "functions": "always", "keywords": "always", "classes": "always" }],
         "space-before-function-paren": ["error", {
             "anonymous": "always",
             "named": "never",
             "asyncArrow": "always",
         }],
+        "space-in-parens": [2, "never"],
+        "space-infix-ops": [2],
+        "space-unary-ops": [2, { "words": true, "nonwords": false }],
+        "switch-colon-spacing": [2, { "after": true, "before": false }],
+        "template-curly-spacing": [2, "never"],
+        "template-tag-spacing": [2, "never"],
+        "unicode-bom": [2, "never"],
+        "use-isnan": [2, { "enforceForSwitchCase": true }],
+        "valid-typeof": [2],
+        "wrap-iife": [2, "outside", { "functionPrototypeMethods": true }],
+        "wrap-regex": [2],
+        "yield-star-spacing": [2, { "before": false, "after": true }],
+        "yoda": [2, "never", { "exceptRange": true, "onlyEquality": false }],
 
         "eslint-plugin/consistent-output": [
             "error",
@@ -116,6 +198,9 @@
             "files": "resolvers/webpack/**",
             "rules": {
                 "no-console": 1,
+                "prefer-template": 0,
+                "prefer-object-spread": 0,
+                "prefer-rest-params": 0,
             },
             "env": {
                 "es6": true,
@@ -143,6 +228,8 @@
                     "exports": "always-multiline",
                     "functions": "never"
                 }],
+                "prefer-object-spread": "off",
+                "prefer-template": "off",
                 "no-console": 1,
             },
         },

config/typescript.js

@@ -16,8 +16,8 @@ module.exports = {
       '@typescript-eslint/parser': ['.ts', '.tsx'],
     },
     'import/resolver': {
-      'node': {
-        'extensions': allExtensions,
+      node: {
+        extensions: allExtensions,
       },
     },
   },

memo-parser/index.js

@@ -17,7 +17,7 @@ const parserOptions = {
 };
 
 exports.parse = function parse(content, options) {
-  options = Object.assign({}, options, parserOptions);
+  options = { ...options, ...parserOptions };
 
   if (!options.filePath) {
     throw new Error('no file path provided!');
@@ -30,7 +30,7 @@ exports.parse = function parse(content, options) {
   const key = keyHash.digest('hex');
 
   let ast = cache.get(key);
-  if (ast != null) return ast;
+  if (ast != null) { return ast; }
 
   const realParser = moduleRequire(options.parser);
 

resolvers/node/index.js

@@ -29,17 +29,14 @@ exports.resolve = function (source, file, config) {
 };
 
 function opts(file, config, packageFilter) {
-  return Object.assign({
-    // more closely matches Node (#333)
+  return { // more closely matches Node (#333)
     // plus 'mjs' for native modules! (#939)
     extensions: ['.mjs', '.js', '.json', '.node'],
-  },
-  config,
-  {
+    ...config,
     // path.resolve will handle paths relative to CWD
     basedir: path.dirname(path.resolve(file)),
     packageFilter,
-  });
+  };
 }
 
 function identity(x) { return x; }

resolvers/node/test/packageMains.js

@@ -8,7 +8,6 @@ const resolver = require('../');
 
 const file = path.join(__dirname, 'package-mains', 'dummy.js');
 
-
 describe('packageMains', function () {
   it('captures module', function () {
     expect(resolver.resolve('./module', file)).property('path')

resolvers/node/test/paths.js

@@ -11,7 +11,6 @@ describe('paths', function () {
   });
 });
 
-
 describe('core', function () {
   it('returns found, but null path, for core Node modules', function () {
     const resolved = node.resolve('fs', './test/file.js');
@@ -20,7 +19,6 @@ describe('core', function () {
   });
 });
 
-
 describe('default options', function () {
 
   it('finds .json files', function () {

resolvers/webpack/index.js

@@ -75,7 +75,7 @@ exports.resolve = function (source, file, settings) {
     if (!configPath || !path.isAbsolute(configPath)) {
       // if not, find ancestral package.json and use its directory as base for the path
       packageDir = findRoot(path.resolve(file));
-      if (!packageDir) throw new Error('package not found above ' + file);
+      if (!packageDir) { throw new Error('package not found above ' + file); }
     }
 
     configPath = findConfigPath(configPath, packageDir);
@@ -108,7 +108,7 @@ exports.resolve = function (source, file, settings) {
   }
 
   if (Array.isArray(webpackConfig)) {
-    webpackConfig = webpackConfig.map(cfg => {
+    webpackConfig = webpackConfig.map((cfg) => {
       if (typeof cfg === 'function') {
         return cfg(env, argv);
       }
@@ -284,16 +284,15 @@ function createWebpack1ResolveSync(webpackRequire, resolveConfig, plugins) {
     new ResultSymlinkPlugin(),
   );
 
-
   const resolvePlugins = [];
 
   // support webpack.ResolverPlugin
   if (plugins) {
     plugins.forEach(function (plugin) {
       if (
-        plugin.constructor &&
-        plugin.constructor.name === 'ResolverPlugin' &&
-        Array.isArray(plugin.plugins)
+        plugin.constructor
+        && plugin.constructor.name === 'ResolverPlugin'
+        && Array.isArray(plugin.plugins)
       ) {
         resolvePlugins.push.apply(resolvePlugins, plugin.plugins);
       }
@@ -324,10 +323,10 @@ function makeRootPlugin(ModulesInRootPlugin, name, root) {
 /* eslint-enable */
 
 function findExternal(source, externals, context, resolveSync) {
-  if (!externals) return false;
+  if (!externals) { return false; }
 
   // string match
-  if (typeof externals === 'string') return (source === externals);
+  if (typeof externals === 'string') { return source === externals; }
 
   // array: recurse
   if (Array.isArray(externals)) {
@@ -384,8 +383,8 @@ function findExternal(source, externals, context, resolveSync) {
 
   // else, vanilla object
   for (const key in externals) {
-    if (!has(externals, key)) continue;
-    if (source === key) return true;
+    if (!has(externals, key)) { continue; }
+    if (source === key) { return true; }
   }
   return false;
 }
@@ -396,7 +395,6 @@ function findConfigPath(configPath, packageDir) {
   });
   let extension;
 
-
   if (configPath) {
     // extensions is not reused below, so safe to mutate it here.
     extensions.reverse();

resolvers/webpack/test/config-extensions/webpack.config.babel.js

@@ -3,7 +3,7 @@ import path from 'path';
 export default {
   resolve: {
     alias: {
-      'foo': path.join(__dirname, 'some', 'goofy', 'path', 'foo.js'),
+      foo: path.join(__dirname, 'some', 'goofy', 'path', 'foo.js'),
     },
     modules: [
       path.join(__dirname, 'src'),
@@ -17,7 +17,7 @@ export default {
   },
 
   externals: [
-    { 'jquery': 'jQuery' },
+    { jquery: 'jQuery' },
     'bootstrap',
   ],
 };

resolvers/webpack/test/extensions.js

@@ -6,7 +6,6 @@ const path = require('path');
 
 const resolve = require('../index').resolve;
 
-
 const file = path.join(__dirname, 'files', 'dummy.js');
 const extensions = path.join(__dirname, 'custom-extensions', 'dummy.js');
 

resolvers/webpack/test/fallback.js

@@ -6,7 +6,6 @@ const path = require('path');
 
 const resolve = require('../index').resolve;
 
-
 const file = path.join(__dirname, 'files', 'src', 'dummy.js');
 
 describe('fallback', function () {

resolvers/webpack/test/loaders.js

@@ -6,7 +6,6 @@ const path = require('path');
 
 const resolve = require('../index').resolve;
 
-
 const file = path.join(__dirname, 'files', 'dummy.js');
 
 describe('inline loader syntax', function () {

resolvers/webpack/test/packageMains.js

@@ -8,7 +8,6 @@ const resolver = require('../');
 
 const file = path.join(__dirname, 'package-mains', 'dummy.js');
 
-
 describe('packageMains', function () {
 
   it('captures module', function () {

resolvers/webpack/test/root.js

@@ -6,7 +6,6 @@ const path = require('path');
 
 const resolve = require('../index').resolve;
 
-
 const file = path.join(__dirname, 'files', 'src', 'dummy.js');
 const webpackDir = path.join(__dirname, 'different-package-location');
 

scripts/testAll.js

@@ -10,11 +10,11 @@ const spawnOptions = {
 spawnSync(
   npmPath,
   ['test'],
-  Object.assign({ cwd: __dirname }, spawnOptions));
+  { cwd: __dirname, ...spawnOptions });
 
 for (const resolverDir of resolverDirectories) {
   spawnSync(
     npmPath,
     ['test'],
-    Object.assign({ cwd: resolverDir }, spawnOptions));
+    { cwd: resolverDir, ...spawnOptions });
 }