eslint 6.0.0 → 6.0.1

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+v6.0.1 - June 24, 2019
+
+* [`b5bde06`](https://github.com/eslint/eslint/commit/b5bde0669bd6a7a6b8e38cdf204d8d4b932cea63) Fix: --rulesdir option didn't work (fixes #11888) (#11890) (Toru Nagashima)
+* [`13f0418`](https://github.com/eslint/eslint/commit/13f041897ee31982808a57b4d06450b57c9b27dc) Fix: improve error message on --print-config (fixes #11874) (#11885) (Toru Nagashima)
+* [`056c2aa`](https://github.com/eslint/eslint/commit/056c2aaf39a5f8d06de24f06946dda95032a0361) Fix: improve diagnostics for shareable-config-missing errors (#11880) (Teddy Katz)
+* [`566b7aa`](https://github.com/eslint/eslint/commit/566b7aa5d61fb31cd47fe4da7820b07cf9bde1ec) Docs: Update no-confusing-arrow with the new default option (#11886) (Yuping Zuo)
+* [`d07f3fa`](https://github.com/eslint/eslint/commit/d07f3fae19b901c30cf4998f10722cb3182bd237) Fix: CLIEngine#getRules() contains plugin rules (fixes #11871) (#11872) (Toru Nagashima)
+* [`21f4a80`](https://github.com/eslint/eslint/commit/21f4a8057ccc941f72bb617ae3b5c135a774f6c0) Docs: Fix inconsistent linking in migration guide (#11881) (Teddy Katz)
+* [`f3a0774`](https://github.com/eslint/eslint/commit/f3a0774a8879b08777a4aedc76677f13d5156242) Docs: Fix typo in 6.0.0 migration guide (#11870) (Kevin Partington)
+
 v6.0.0 - June 21, 2019
 
 * [`81aa06b`](https://github.com/eslint/eslint/commit/81aa06b4cc49e9c15234a2c4d27659a03fea53d8) Upgrade: espree@6.0.0 (#11869) (Teddy Katz)

package/bin/eslint.js

@@ -45,7 +45,7 @@ process.once("uncaughtException", err => {
         const pkg = require("../package.json");
 
         console.error("\nOops! Something went wrong! :(");
-        console.error(`\nESLint: ${pkg.version}.\n${template(err.messageData || {})}`);
+        console.error(`\nESLint: ${pkg.version}.\n\n${template(err.messageData || {})}`);
     } else {
 
         console.error(err.stack);

package/lib/cli-engine/cascading-config-array-factory.js

@@ -27,7 +27,7 @@ const os = require("os");
 const path = require("path");
 const { validateConfigArray } = require("../shared/config-validator");
 const { ConfigArrayFactory } = require("./config-array-factory");
-const { ConfigDependency } = require("./config-array");
+const { ConfigArray, ConfigDependency } = require("./config-array");
 const loadRules = require("./load-rules");
 const debug = require("debug")("eslint:cascading-config-array-factory");
 
@@ -225,11 +225,22 @@ class CascadingConfigArrayFactory {
 
     /**
      * Get the config array of a given file.
-     * @param {string} filePath The file path to a file.
+     * If `filePath` was not given, it returns the config which contains only
+     * `baseConfigData` and `cliConfigData`.
+     * @param {string} [filePath] The file path to a file.
      * @returns {ConfigArray} The config array of the file.
      */
     getConfigArrayForFile(filePath) {
-        const { cwd } = internalSlotsMap.get(this);
+        const {
+            baseConfigArray,
+            cliConfigArray,
+            cwd
+        } = internalSlotsMap.get(this);
+
+        if (!filePath) {
+            return new ConfigArray(...baseConfigArray, ...cliConfigArray);
+        }
+
         const directoryPath = path.dirname(path.resolve(cwd, filePath));
 
         debug(`Load config files for ${directoryPath}.`);
@@ -302,6 +313,7 @@ class CascadingConfigArrayFactory {
 
         if (configArray.length > 0 && configArray.isRoot()) {
             debug("Stop traversing because of 'root:true'.");
+            configArray.unshift(...baseConfigArray);
             return this._cacheConfig(directoryPath, configArray);
         }
 

package/lib/cli-engine/cli-engine.js

@@ -573,7 +573,7 @@ class CLIEngine {
         const linter = new Linter();
 
         /** @type {ConfigArray[]} */
-        const lastConfigArrays = [];
+        const lastConfigArrays = [configArrayFactory.getConfigArrayForFile()];
 
         // Store private data.
         internalSlotsMap.set(this, {
@@ -904,6 +904,13 @@ class CLIEngine {
         const { configArrayFactory, options } = internalSlotsMap.get(this);
         const absolutePath = path.resolve(options.cwd, filePath);
 
+        if (directoryExists(absolutePath)) {
+            throw Object.assign(
+                new Error("'filePath' should not be a directory path."),
+                { messageTemplate: "print-config-with-directory-path" }
+            );
+        }
+
         return configArrayFactory
             .getConfigArrayForFile(absolutePath)
             .extractConfig(absolutePath)

package/lib/cli-engine/config-array-factory.js

@@ -224,15 +224,16 @@ function loadPackageJSONConfigFile(filePath) {
 /**
  * Creates an error to notify about a missing config to extend from.
  * @param {string} configName The name of the missing config.
+ * @param {string} importerName The name of the config that imported the missing config
  * @returns {Error} The error object to throw
  * @private
  */
-function configMissingError(configName) {
+function configMissingError(configName, importerName) {
     return Object.assign(
         new Error(`Failed to load config "${configName}" to extend from.`),
         {
             messageTemplate: "extend-config-missing",
-            messageData: { configName }
+            messageData: { configName, importerName }
         }
     );
 }
@@ -637,7 +638,7 @@ class ConfigArrayFactory {
             return this._loadConfigData(eslintAllPath, name);
         }
 
-        throw configMissingError(extendName);
+        throw configMissingError(extendName, importerName);
     }
 
     /**
@@ -670,7 +671,7 @@ class ConfigArrayFactory {
             );
         }
 
-        throw plugin.error || configMissingError(extendName);
+        throw plugin.error || configMissingError(extendName, importerPath);
     }
 
     /**
@@ -704,7 +705,7 @@ class ConfigArrayFactory {
         } catch (error) {
             /* istanbul ignore else */
             if (error && error.code === "MODULE_NOT_FOUND") {
-                throw configMissingError(extendName);
+                throw configMissingError(extendName, importerPath);
             }
             throw error;
         }

package/messages/extend-config-missing.txt

@@ -1,3 +1,5 @@
 ESLint couldn't find the config "<%- configName %>" to extend from. Please check that the name of the config is correct.
 
+The config "<%- configName %>" was referenced from the config file in "<%- importerName %>".
+
 If you still have problems, please stop by https://gitter.im/eslint/eslint to chat with the team.

package/messages/print-config-with-directory-path.txt

@@ -0,0 +1,2 @@
+The '--print-config' CLI option requires a path to a source code file rather than a directory.
+See also: https://eslint.org/docs/user-guide/command-line-interface#--print-config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {