eslint 3.9.0 → 3.10.2

package/CHANGELOG.md

@@ -1,3 +1,62 @@
+v3.10.2 - November 15, 2016
+
+* 0643bfe Fix: correctly handle commented code in `indent` autofixer (fixes #7604) (#7606) (Teddy Katz)
+* bd0514c Fix: syntax error after `key-spacing` autofix with comment (fixes #7603) (#7607) (Teddy Katz)
+* f56c1ef Fix: `indent` crash on parenthesized global return values (fixes #7573) (#7596) (Teddy Katz)
+* 100c6e1 Docs: Fix example for curly "multi-or-nest" option (#7597) (Will Chen)
+* 6abb534 Docs: Update code of conduct link (#7599) (Nicholas C. Zakas)
+* 8302cdb Docs: Update no-tabs to match existing standards & improve readbility (#7590) (Matt Stow)
+
+v3.10.1 - November 14, 2016
+
+* 8a0e92a Fix: handle try/catch correctly in `no-return-await` (fixes #7581) (#7582) (Teddy Katz)
+* c4dd015 Fix: no-useless-return stack overflow on unreachable loops (fixes #7583) (#7584) (Teddy Katz)
+
+v3.10.0 - November 11, 2016
+
+* 7ee039b Update: Add comma-style options for calls, fns, imports (fixes #7470) (Max Englander)
+* 670e060 Chore: make the `object-shorthand` tests more readable (#7580) (Teddy Katz)
+* c3f4809 Update: Allow `func-names` to recognize inferred ES6 names (fixes #7235) (#7244) (Logan Smyth)
+* b8d6e48 Fix: syntax errors created by `object-shorthand` autofix (fixes #7574) (#7575) (Teddy Katz)
+* 1b3b65c Chore: ensure that files in tests/conf are linted (#7579) (Teddy Katz)
+* 2bd1dd7 Update: avoid creating extra whitespace in `arrow-body-style` fixer (#7504) (Teddy Katz)
+* 66fe9ff New: `no-return-await` rule. (fixes #7537) (#7547) (Jordan Harband)
+* 759525e Chore: Use process.exitCode instead of process.exit() in bin/eslint.js (#7569) (Teddy Katz)
+* 0d60db7 Fix: Curly rule doesn't account for leading comment (fixes #7538) (#7539) (Will Chen)
+* 5003b1c Update: fix in/instanceof handling with `space-infix-ops` (fixes #7525) (#7552) (Teddy Katz)
+* 3e6131e Docs: explain config option merging (#7499) (Danny Andrews)
+* 1766524 Update: "Error type should be" assertion in rule-tester (fixes 6106) (#7550) (Frans Jaspers)
+* 44eb274 Docs: Missing semicolon report was missing a comma (#7553) (James)
+* 6dbda15 Docs: Document the optional defaults argument for RuleTester (#7548) (Teddy Katz)
+* e117b80 Docs: typo fix (#7546) (oprogramador)
+* 25e5613 Chore: Remove incorrect test from indent.js. (#7531) (Scott Stern)
+* c0f4937 Fix: `arrow-parens` supports type annotations (fixes #7406) (#7436) (Toru Nagashima)
+* a838b8e Docs: `func-name-matching`: update with “always”/“never” option (#7536) (Jordan Harband)
+* 3c379ff Update: `no-restricted-{imports,modules}`: add “patterns” (fixes #6963) (#7433) (Jordan Harband)
+* f5764ee Docs: Update example of results returned from `executeOnFiles` (#7362) (Simen Bekkhus)
+* 4613ba0 Fix: Add support for escape char in JSX. (#7461) (Scott Stern)
+* ea0970d Fix: `curly` false positive with no-semicolon style (#7509) (Teddy Katz)
+* af1fde1 Update: fix `brace-style` false negative on multiline node (fixes #7493) (#7496) (Teddy Katz)
+* 3798aea Update: max-statements to report function name (refs #7260) (#7399) (Nicholas C. Zakas)
+* 0c215fa Update: Add `ArrowFunctionExpression` support to `require-jsdoc` rule (#7518) (Gyandeep Singh)
+* 578c373 Build: handle deprecated rules with no 'replacedBy' (refs #7471) (#7494) (Vitor Balocco)
+* a7f3976 Docs: Specify min ESLint version for new rule format (#7501) (cowchimp)
+* 8a3e717 Update: Fix `lines-around-directive` semicolon handling (fixes #7450) (#7483) (Teddy Katz)
+* e58cead Update: add a fixer for certain statically-verifiable `eqeqeq` cases (#7389) (Teddy Katz)
+* 0dea0ac Chore: Add Node 7 to travis ci build (#7506) (Gyandeep Singh)
+* 36338f0 Update: add fixer for `no-extra-boolean-cast` (#7387) (Teddy Katz)
+* 183def6 Chore: enable `prefer-arrow-callback` on ESLint codebase (fixes #6407) (#7503) (Teddy Katz)
+* 4f1fa67 Docs: Update copyright (#7497) (Nicholas C. Zakas)
+
+v3.9.1 - October 31, 2016
+
+* 2012258 Fix: incorrect `indent` check for array property access (fixes #7484) (#7485) (Teddy Katz)
+* 8a71d4a Fix: `no-useless-return` false positive on conditionals (fixes #7477) (#7482) (Teddy Katz)
+* 56a662b Fix: allow escaped backreferences in `no-useless-escape` (fixes #7472) (#7474) (Teddy Katz)
+* fffdf13 Build: Fix prefer-reflect rule to not crash site gen build (#7471) (Ilya Volodin)
+* 8ba68a3 Docs: Update broken link (#7490) (Devinsuit)
+* 65231d8 Docs: add the "fixable" icon for `no-useless-return` (#7480) (Teddy Katz)
+
 v3.9.0 - October 28, 2016
 
 * d933516 New: `no-useless-return` rule (fixes #7309) (#7441) (Toru Nagashima)
@@ -16,7 +75,7 @@ v3.9.0 - October 28, 2016
 * 16367a8 Fix: Return statement spacing. Fix for indent rule. (fixes #7164) (#7197) (Imad Elyafi)
 * 3813988 Update: fix false negative of `no-extra-parens` (fixes #7122) (#7432) (Toru Nagashima)
 * 23062e2 Docs: Fix typo in no-unexpected-multiline (fixes #7442) (#7447) (Denis Sikuler)
-* d257428 Update: `func-name-matching`: add “nameMatches” option (fixes #7391) (#7428) (Jordan Harband)
+* d257428 Update: `func-name-matching`: add “always”/“never” option (fixes #7391) (#7428) (Jordan Harband)
 * c710584 Fix: support for MemberExpression with function body. (#7400) (Scott Stern)
 * 2c8ed2d Build: ensure that all files are linted on bash (fixes #7426) (#7427) (Teddy Katz)
 * 18ff70f Chore: Enable `no-useless-escape` (#7403) (Vitor Balocco)

package/LICENSE

@@ -1,5 +1,5 @@
 ESLint
-Copyright jQuery Foundation and other contributors, https://jquery.org/
+Copyright JS Foundation and other contributors, https://js.foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -13,7 +13,7 @@
 [Rules](http://eslint.org/docs/rules/) |
 [Contributing](http://eslint.org/docs/developer-guide/contributing) |
 [Reporting Bugs](http://eslint.org/docs/developer-guide/contributing/reporting-bugs) |
-[Code of Conduct](https://jquery.org/conduct/) |
+[Code of Conduct](https://js.foundation/conduct/) |
 [Twitter](https://twitter.com/geteslint) |
 [Mailing List](https://groups.google.com/group/eslint) |
 [Chat Room](https://gitter.im/eslint/eslint)

package/bin/eslint.js

@@ -5,7 +5,7 @@
  * @author Nicholas C. Zakas
  */
 
-/* eslint no-console:off, no-process-exit:off */
+/* eslint no-console:off */
 
 "use strict";
 
@@ -36,7 +36,7 @@ const concat = require("concat-stream"),
 // Execution
 //------------------------------------------------------------------------------
 
-process.on("uncaughtException", function(err) {
+process.once("uncaughtException", err => {
 
     // lazy load
     const lodash = require("lodash");
@@ -51,17 +51,17 @@ process.on("uncaughtException", function(err) {
         console.log(err.stack);
     }
 
-    process.exit(1);
+    process.exitCode = 1;
 });
 
 if (useStdIn) {
-    process.stdin.pipe(concat({ encoding: "string" }, function(text) {
+    process.stdin.pipe(concat({ encoding: "string" }, text => {
         process.exitCode = cli.execute(process.argv, text);
     }));
 } else if (init) {
     const configInit = require("../lib/config/config-initializer");
 
-    configInit.initializeConfig(function(err) {
+    configInit.initializeConfig(err => {
         if (err) {
             process.exitCode = 1;
             console.error(err.message);

package/conf/eslint.json

@@ -91,6 +91,7 @@
         "no-restricted-properties": "off",
         "no-restricted-syntax": "off",
         "no-return-assign": "off",
+        "no-return-await": "off",
         "no-script-url": "off",
         "no-self-assign": "error",
         "no-self-compare": "off",

package/lib/ast-utils.js

@@ -176,9 +176,7 @@ function hasJSDocThisTag(node, sourceCode) {
     // because callbacks don't have its JSDoc comment.
     // e.g.
     //     sinon.test(/* @this sinon.Sandbox */function() { this.spy(); });
-    return sourceCode.getComments(node).leading.some(function(comment) {
-        return thisTagPattern.test(comment.value);
-    });
+    return sourceCode.getComments(node).leading.some(comment => thisTagPattern.test(comment.value));
 }
 
 /**

package/lib/cli-engine.js

@@ -90,7 +90,7 @@ const debug = require("debug")("eslint:cli-engine");
  * @private
  */
 function calculateStatsPerFile(messages) {
-    return messages.reduce(function(stat, message) {
+    return messages.reduce((stat, message) => {
         if (message.fatal || message.severity === 2) {
             stat.errorCount++;
         } else {
@@ -110,7 +110,7 @@ function calculateStatsPerFile(messages) {
  * @private
  */
 function calculateStatsPerRun(results) {
-    return results.reduce(function(stat, result) {
+    return results.reduce((stat, result) => {
         stat.errorCount += result.errorCount;
         stat.warningCount += result.warningCount;
         return stat;
@@ -241,7 +241,7 @@ function processText(text, configHelper, filename, fix, allowInlineConfig) {
         const parsedBlocks = processor.preprocess(text, filename);
         const unprocessedMessages = [];
 
-        parsedBlocks.forEach(function(block) {
+        parsedBlocks.forEach(block => {
             unprocessedMessages.push(eslint.verify(block, config, {
                 filename,
                 allowInlineConfig
@@ -466,15 +466,15 @@ function CLIEngine(options) {
     if (this.options.rulePaths) {
         const cwd = this.options.cwd;
 
-        this.options.rulePaths.forEach(function(rulesdir) {
+        this.options.rulePaths.forEach(rulesdir => {
             debug(`Loading rules from ${rulesdir}`);
             rules.load(rulesdir, cwd);
         });
     }
 
-    Object.keys(this.options.rules || {}).forEach(function(name) {
+    Object.keys(this.options.rules || {}).forEach(name => {
         validator.validateRuleOptions(name, this.options.rules[name], "CLI");
-    }.bind(this));
+    });
 }
 
 /**
@@ -526,7 +526,7 @@ CLIEngine.getFormatter = function(format) {
 CLIEngine.getErrorResults = function(results) {
     const filtered = [];
 
-    results.forEach(function(result) {
+    results.forEach(result => {
         const filteredMessages = result.messages.filter(isErrorMessage);
 
         if (filteredMessages.length > 0) {
@@ -549,9 +549,7 @@ CLIEngine.getErrorResults = function(results) {
  * @returns {void}
  */
 CLIEngine.outputFixes = function(report) {
-    report.results.filter(function(result) {
-        return result.hasOwnProperty("output");
-    }).forEach(function(result) {
+    report.results.filter(result => result.hasOwnProperty("output")).forEach(result => {
         fs.writeFileSync(result.filePath, result.output);
     });
 };
@@ -708,7 +706,7 @@ CLIEngine.prototype = {
         patterns = this.resolveFileGlobPatterns(patterns);
         const fileList = globUtil.listFilesToProcess(patterns, options);
 
-        fileList.forEach(function(fileInfo) {
+        fileList.forEach(fileInfo => {
             executeOnFile(fileInfo.filename, fileInfo.ignored);
         });
 

package/lib/code-path-analysis/debug-helpers.js

@@ -108,7 +108,7 @@ module.exports = {
             }
 
             if (segment.internal.nodes.length > 0) {
-                text += segment.internal.nodes.map(function(node) {
+                text += segment.internal.nodes.map(node => {
                     switch (node.type) {
                         case "Identifier": return `${node.type} (${node.name})`;
                         case "Literal": return `${node.type} (${node.value})`;
@@ -116,7 +116,7 @@ module.exports = {
                     }
                 }).join("\\n");
             } else if (segment.internal.exitNodes.length > 0) {
-                text += segment.internal.exitNodes.map(function(node) {
+                text += segment.internal.exitNodes.map(node => {
                     switch (node.type) {
                         case "Identifier": return `${node.type}:exit (${node.name})`;
                         case "Literal": return `${node.type}:exit (${node.value})`;
@@ -176,7 +176,7 @@ module.exports = {
             stack.push([nextSegment, 0]);
         }
 
-        codePath.returnedSegments.forEach(function(finalSegment) {
+        codePath.returnedSegments.forEach(finalSegment => {
             if (lastId === finalSegment.id) {
                 text += "->final";
             } else {
@@ -185,7 +185,7 @@ module.exports = {
             lastId = null;
         });
 
-        codePath.thrownSegments.forEach(function(finalSegment) {
+        codePath.thrownSegments.forEach(finalSegment => {
             if (lastId === finalSegment.id) {
                 text += "->thrown";
             } else {

package/lib/config/autoconfig.js

@@ -49,14 +49,12 @@ const MAX_CONFIG_COMBINATIONS = 17, // 16 combinations + 1 for severity only
  * @returns {Object}                  registryItems for each rule in provided rulesConfig
  */
 function makeRegistryItems(rulesConfig) {
-    return Object.keys(rulesConfig).reduce(function(accumulator, ruleId) {
-        accumulator[ruleId] = rulesConfig[ruleId].map(function(config) {
-            return {
-                config,
-                specificity: config.length || 1,
-                errorCount: void 0
-            };
-        });
+    return Object.keys(rulesConfig).reduce((accumulator, ruleId) => {
+        accumulator[ruleId] = rulesConfig[ruleId].map(config => ({
+            config,
+            specificity: config.length || 1,
+            errorCount: void 0
+        }));
         return accumulator;
     }, {});
 }
@@ -173,10 +171,8 @@ Registry.prototype = {
             newRegistry = new Registry();
 
         newRegistry.rules = Object.assign({}, this.rules);
-        ruleIds.forEach(function(ruleId) {
-            const errorFreeItems = newRegistry.rules[ruleId].filter(function(registryItem) {
-                return (registryItem.errorCount === 0);
-            });
+        ruleIds.forEach(ruleId => {
+            const errorFreeItems = newRegistry.rules[ruleId].filter(registryItem => (registryItem.errorCount === 0));
 
             if (errorFreeItems.length > 0) {
                 newRegistry.rules[ruleId] = errorFreeItems;
@@ -198,10 +194,8 @@ Registry.prototype = {
             newRegistry = new Registry();
 
         newRegistry.rules = Object.assign({}, this.rules);
-        ruleIds.forEach(function(ruleId) {
-            newRegistry.rules[ruleId] = newRegistry.rules[ruleId].filter(function(registryItem) {
-                return (typeof registryItem.errorCount !== "undefined");
-            });
+        ruleIds.forEach(ruleId => {
+            newRegistry.rules[ruleId] = newRegistry.rules[ruleId].filter(registryItem => (typeof registryItem.errorCount !== "undefined"));
         });
 
         return newRegistry;
@@ -218,15 +212,13 @@ Registry.prototype = {
         const ruleIds = Object.keys(this.rules),
             failingRegistry = new Registry();
 
-        ruleIds.forEach(function(ruleId) {
-            const failingConfigs = this.rules[ruleId].filter(function(registryItem) {
-                return (registryItem.errorCount > 0);
-            });
+        ruleIds.forEach(ruleId => {
+            const failingConfigs = this.rules[ruleId].filter(registryItem => (registryItem.errorCount > 0));
 
             if (failingConfigs && failingConfigs.length === this.rules[ruleId].length) {
                 failingRegistry.rules[ruleId] = failingConfigs;
             }
-        }.bind(this));
+        });
 
         return failingRegistry;
     },
@@ -241,11 +233,11 @@ Registry.prototype = {
         const ruleIds = Object.keys(this.rules),
             config = {rules: {}};
 
-        ruleIds.forEach(function(ruleId) {
+        ruleIds.forEach(ruleId => {
             if (this.rules[ruleId].length === 1) {
                 config.rules[ruleId] = this.rules[ruleId][0].config;
             }
-        }.bind(this));
+        });
 
         return config;
     },
@@ -261,11 +253,9 @@ Registry.prototype = {
             newRegistry = new Registry();
 
         newRegistry.rules = Object.assign({}, this.rules);
-        ruleIds.forEach(function(ruleId) {
-            newRegistry.rules[ruleId] = this.rules[ruleId].filter(function(registryItem) {
-                return (registryItem.specificity === specificity);
-            });
-        }.bind(this));
+        ruleIds.forEach(ruleId => {
+            newRegistry.rules[ruleId] = this.rules[ruleId].filter(registryItem => (registryItem.specificity === specificity));
+        });
 
         return newRegistry;
     },
@@ -294,16 +284,16 @@ Registry.prototype = {
         const filenames = Object.keys(sourceCodes);
         const totalFilesLinting = filenames.length * ruleSets.length;
 
-        filenames.forEach(function(filename) {
+        filenames.forEach(filename => {
             debug(`Linting file: ${filename}`);
 
             ruleSetIdx = 0;
 
-            ruleSets.forEach(function(ruleSet) {
+            ruleSets.forEach(ruleSet => {
                 const lintConfig = Object.assign({}, config, {rules: ruleSet});
                 const lintResults = eslint.verify(sourceCodes[filename], lintConfig);
 
-                lintResults.forEach(function(result) {
+                lintResults.forEach(result => {
 
                     // It is possible that the error is from a configuration comment
                     // in a linted file, in which case there may not be a config
@@ -342,11 +332,9 @@ function extendFromRecommended(config) {
 
     ConfigOps.normalizeToStrings(newConfig);
 
-    const recRules = Object.keys(recConfig.rules).filter(function(ruleId) {
-        return ConfigOps.isErrorSeverity(recConfig.rules[ruleId]);
-    });
+    const recRules = Object.keys(recConfig.rules).filter(ruleId => ConfigOps.isErrorSeverity(recConfig.rules[ruleId]));
 
-    recRules.forEach(function(ruleId) {
+    recRules.forEach(ruleId => {
         if (lodash.isEqual(recConfig.rules[ruleId], newConfig.rules[ruleId])) {
             delete newConfig.rules[ruleId];
         }

package/lib/config/config-file.js

@@ -359,7 +359,7 @@ function applyExtends(config, filePath, relativeTo) {
     }
 
     // Make the last element in an array take the highest precedence
-    config = configExtends.reduceRight(function(previousValue, parentPath) {
+    config = configExtends.reduceRight((previousValue, parentPath) => {
 
         if (parentPath === "eslint:recommended") {
 

package/lib/config/config-initializer.js

@@ -62,9 +62,7 @@ function installModules(config) {
 
     // Create a list of modules which should be installed based on config
     if (config.plugins) {
-        modules = modules.concat(config.plugins.map(function(name) {
-            return `eslint-plugin-${name}`;
-        }));
+        modules = modules.concat(config.plugins.map(name => `eslint-plugin-${name}`));
     }
     if (config.extends && config.extends.indexOf("eslint:") === -1) {
         modules.push(`eslint-config-${config.extends}`);
@@ -81,7 +79,7 @@ function installModules(config) {
     const installStatus = npmUtil.checkDevDeps(modules);
 
     // Install packages which aren't already installed
-    const modulesToInstall = Object.keys(installStatus).filter(function(module) {
+    const modulesToInstall = Object.keys(installStatus).filter(module => {
         const notInstalled = installStatus[module] === false;
 
         if (module === "eslint" && notInstalled) {
@@ -128,7 +126,7 @@ function configureRules(answers, config) {
     const patterns = answers.patterns.split(/[\s]+/);
 
     try {
-        sourceCodes = getSourceCodeOfFiles(patterns, { baseConfig: newConfig, useEslintrc: false }, function(total) {
+        sourceCodes = getSourceCodeOfFiles(patterns, { baseConfig: newConfig, useEslintrc: false }, total => {
             bar.tick((BAR_SOURCE_CODE_TOTAL / total));
         });
     } catch (e) {
@@ -147,20 +145,18 @@ function configureRules(answers, config) {
     registry.populateFromCoreRules();
 
     // Lint all files with each rule config in the registry
-    registry = registry.lintSourceCode(sourceCodes, newConfig, function(total) {
+    registry = registry.lintSourceCode(sourceCodes, newConfig, total => {
         bar.tick((BAR_TOTAL - BAR_SOURCE_CODE_TOTAL) / total); // Subtract out ticks used at beginning
     });
     debug(`\nRegistry: ${util.inspect(registry.rules, {depth: null})}`);
 
     // Create a list of recommended rules, because we don't want to disable them
-    const recRules = Object.keys(recConfig.rules).filter(function(ruleId) {
-        return ConfigOps.isErrorSeverity(recConfig.rules[ruleId]);
-    });
+    const recRules = Object.keys(recConfig.rules).filter(ruleId => ConfigOps.isErrorSeverity(recConfig.rules[ruleId]));
 
     // Find and disable rules which had no error-free configuration
     const failingRegistry = registry.getFailingRulesRegistry();
 
-    Object.keys(failingRegistry.rules).forEach(function(ruleId) {
+    Object.keys(failingRegistry.rules).forEach(ruleId => {
 
         // If the rule is recommended, set it to error, otherwise disable it
         disabledConfigs[ruleId] = (recRules.indexOf(ruleId) !== -1) ? 2 : 0;
@@ -194,9 +190,7 @@ function configureRules(answers, config) {
     // Log out some stats to let the user know what happened
     const finalRuleIds = Object.keys(newConfig.rules);
     const totalRules = finalRuleIds.length;
-    const enabledRules = finalRuleIds.filter(function(ruleId) {
-        return (newConfig.rules[ruleId] !== 0);
-    }).length;
+    const enabledRules = finalRuleIds.filter(ruleId => (newConfig.rules[ruleId] !== 0)).length;
     const resultMessage = [
         `\nEnabled ${enabledRules} out of ${totalRules}`,
         `rules based on ${fileQty}`,
@@ -227,7 +221,7 @@ function processAnswers(answers) {
     if (answers.commonjs) {
         config.env.commonjs = true;
     }
-    answers.env.forEach(function(env) {
+    answers.env.forEach(env => {
         config.env[env] = true;
     });
     if (answers.jsx) {
@@ -335,7 +329,7 @@ function promptUser(callback) {
                 return ((answers.source === "guide" && answers.packageJsonExists) || answers.source === "auto");
             }
         }
-    ], function(earlyAnswers) {
+    ], earlyAnswers => {
 
         // early exit if you are using a style guide
         if (earlyAnswers.source === "guide") {
@@ -384,9 +378,7 @@ function promptUser(callback) {
                 message: "Do you use CommonJS?",
                 default: false,
                 when(answers) {
-                    return answers.env.some(function(env) {
-                        return env === "browser";
-                    });
+                    return answers.env.some(env => env === "browser");
                 }
             },
             {
@@ -404,7 +396,7 @@ function promptUser(callback) {
                     return answers.jsx;
                 }
             }
-        ], function(secondAnswers) {
+        ], secondAnswers => {
 
             // early exit if you are using automatic style generation
             if (earlyAnswers.source === "auto") {
@@ -457,7 +449,7 @@ function promptUser(callback) {
                     default: "JavaScript",
                     choices: ["JavaScript", "YAML", "JSON"]
                 }
-            ], function(answers) {
+            ], answers => {
                 try {
                     const totalAnswers = Object.assign({}, earlyAnswers, secondAnswers, answers);
 

package/lib/config/config-ops.js

@@ -18,7 +18,7 @@ const debug = require("debug")("eslint:config-ops");
 //------------------------------------------------------------------------------
 
 const RULE_SEVERITY_STRINGS = ["off", "warn", "error"],
-    RULE_SEVERITY = RULE_SEVERITY_STRINGS.reduce(function(map, value, index) {
+    RULE_SEVERITY = RULE_SEVERITY_STRINGS.reduce((map, value, index) => {
         map[value] = index;
         return map;
     }, {}),
@@ -57,9 +57,7 @@ module.exports = {
 
             envConfig.env = env;
 
-            Object.keys(env).filter(function(name) {
-                return env[name];
-            }).forEach(function(name) {
+            Object.keys(env).filter(name => env[name]).forEach(name => {
                 const environment = Environments.get(name);
 
                 if (environment) {
@@ -149,7 +147,7 @@ module.exports = {
             if (typeof src !== "object" && !Array.isArray(src)) {
                 src = [src];
             }
-            Object.keys(src).forEach(function(e, i) {
+            Object.keys(src).forEach((e, i) => {
                 e = src[i];
                 if (typeof dst[i] === "undefined") {
                     dst[i] = e;
@@ -171,11 +169,11 @@ module.exports = {
             });
         } else {
             if (target && typeof target === "object") {
-                Object.keys(target).forEach(function(key) {
+                Object.keys(target).forEach(key => {
                     dst[key] = target[key];
                 });
             }
-            Object.keys(src).forEach(function(key) {
+            Object.keys(src).forEach(key => {
                 if (Array.isArray(src[key]) || Array.isArray(target[key])) {
                     dst[key] = deepmerge(target[key], src[key], key === "plugins", isRule);
                 } else if (typeof src[key] !== "object" || !src[key] || key === "exported" || key === "astGlobals") {
@@ -199,7 +197,7 @@ module.exports = {
     normalize(config) {
 
         if (config.rules) {
-            Object.keys(config.rules).forEach(function(ruleId) {
+            Object.keys(config.rules).forEach(ruleId => {
                 const ruleConfig = config.rules[ruleId];
 
                 if (typeof ruleConfig === "string") {
@@ -221,7 +219,7 @@ module.exports = {
     normalizeToStrings(config) {
 
         if (config.rules) {
-            Object.keys(config.rules).forEach(function(ruleId) {
+            Object.keys(config.rules).forEach(ruleId => {
                 const ruleConfig = config.rules[ruleId];
 
                 if (typeof ruleConfig === "number") {