Backport eslint updates to 5.x

.eslintrc

@@ -2,7 +2,3 @@
 extends: '@elastic/kibana'
 rules:
   no-unused-vars: off
-  no-var: off
-  prefer-const: off
-  no-extra-semi: off
-  quotes: off

package.json

@@ -168,7 +168,7 @@
     "wreck": "6.2.0"
   },
   "devDependencies": {
-    "@elastic/eslint-config-kibana": "0.2.1",
+    "@elastic/eslint-config-kibana": "0.3.0",
     "angular-mocks": "1.4.7",
     "auto-release-sinon": "1.0.3",
     "babel-eslint": "6.1.2",
@@ -180,6 +180,7 @@
     "del": "1.2.1",
     "elasticdump": "2.1.1",
     "eslint": "3.11.1",
+    "eslint-plugin-babel": "4.0.0",
     "eslint-plugin-mocha": "4.7.0",
     "event-stream": "3.3.2",
     "expect.js": "0.3.1",

src/cli/cluster/base_path_proxy.js

@@ -110,7 +110,7 @@ export default class BasePathProxy {
       method: '*',
       path: `/{oldBasePath}/{kbnPath*}`,
       handler(req, reply) {
-        const {oldBasePath, kbnPath = ''} = req.params;
+        const { oldBasePath, kbnPath = '' } = req.params;
 
         const isGet = req.method === 'get';
         const isBasePath = oldBasePath.length === 3;

src/cli/cluster/worker.js

@@ -5,16 +5,16 @@ import { EventEmitter } from 'events';
 
 import { BinderFor, fromRoot } from '../../utils';
 
-let cliPath = fromRoot('src/cli');
-let baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);
-let baseArgv = [process.execPath, cliPath].concat(baseArgs);
+const cliPath = fromRoot('src/cli');
+const baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);
+const baseArgv = [process.execPath, cliPath].concat(baseArgs);
 
 cluster.setupMaster({
   exec: cliPath,
   silent: false
 });
 
-let dead = fork => {
+const dead = fork => {
   return fork.isDead() || fork.killed;
 };
 
@@ -40,7 +40,7 @@ module.exports = class Worker extends EventEmitter {
     this.clusterBinder = new BinderFor(cluster);
     this.processBinder = new BinderFor(process);
 
-    let argv = _.union(baseArgv, opts.argv || []);
+    const argv = _.union(baseArgv, opts.argv || []);
     this.env = {
       kbnWorkerType: this.type,
       kbnWorkerArgv: JSON.stringify(argv)
@@ -124,8 +124,8 @@ module.exports = class Worker extends EventEmitter {
   }
 
   flushChangeBuffer() {
-    let files = _.unique(this.changes.splice(0));
-    let prefix = files.length > 1 ? '\n - ' : '';
+    const files = _.unique(this.changes.splice(0));
+    const prefix = files.length > 1 ? '\n - ' : '';
     return files.reduce(function (list, file) {
       return `${list || ''}${prefix}"${file}"`;
     }, '');

src/cli/command.js

@@ -40,15 +40,15 @@ Command.prototype.unknownArgv = function (argv) {
  * @return {[type]} [description]
  */
 Command.prototype.collectUnknownOptions = function () {
-  let title = `Extra ${this._name} options`;
+  const title = `Extra ${this._name} options`;
 
   this.allowUnknownOption();
   this.getUnknownOptions = function () {
-    let opts = {};
-    let unknowns = this.unknownArgv();
+    const opts = {};
+    const unknowns = this.unknownArgv();
 
     while (unknowns.length) {
-      let opt = unknowns.shift().split('=');
+      const opt = unknowns.shift().split('=');
       if (opt[0].slice(0, 2) !== '--') {
         this.error(`${title} "${opt[0]}" must start with "--"`);
       }
@@ -75,14 +75,14 @@ Command.prototype.collectUnknownOptions = function () {
 };
 
 Command.prototype.parseOptions = _.wrap(Command.prototype.parseOptions, function (parse, argv) {
-  let opts = parse.call(this, argv);
+  const opts = parse.call(this, argv);
   this.unknownArgv(opts.unknown);
   return opts;
 });
 
 Command.prototype.action = _.wrap(Command.prototype.action, function (action, fn) {
   return action.call(this, function (...args) {
-    let ret = fn.apply(this, args);
+    const ret = fn.apply(this, args);
     if (ret && typeof ret.then === 'function') {
       ret.then(null, function (e) {
         console.log('FATAL CLI ERROR', e.stack);

src/cli/help.js

@@ -5,12 +5,12 @@ module.exports = function (command, spaces) {
     return command.outputHelp();
   }
 
-  let defCmd = _.find(command.commands, function (cmd) {
+  const defCmd = _.find(command.commands, function (cmd) {
     return cmd._name === 'serve';
   });
 
-  let desc = !command.description() ? '' : command.description();
-  let cmdDef = !defCmd ? '' : `=${defCmd._name}`;
+  const desc = !command.description() ? '' : command.description();
+  const cmdDef = !defCmd ? '' : `=${defCmd._name}`;
 
   return (
 `
@@ -31,11 +31,11 @@ function indent(str, n) {
 }
 
 function commandsSummary(program) {
-  let cmds = _.compact(program.commands.map(function (cmd) {
-    let name = cmd._name;
+  const cmds = _.compact(program.commands.map(function (cmd) {
+    const name = cmd._name;
     if (name === '*') return;
-    let opts = cmd.options.length ? ' [options]' : '';
-    let args = cmd._args.map(function (arg) {
+    const opts = cmd.options.length ? ' [options]' : '';
+    const args = cmd._args.map(function (arg) {
       return humanReadableArgName(arg);
     }).join(' ');
 
@@ -45,7 +45,7 @@ function commandsSummary(program) {
     ];
   }));
 
-  let cmdLColWidth = cmds.reduce(function (width, cmd) {
+  const cmdLColWidth = cmds.reduce(function (width, cmd) {
     return Math.max(width, cmd[0].length);
   }, 0);
 
@@ -69,6 +69,6 @@ ${indent(cmd.optionHelp(), 2)}
 }
 
 function humanReadableArgName(arg) {
-  let nameOutput = arg.name + (arg.variadic === true ? '...' : '');
+  const nameOutput = arg.name + (arg.variadic === true ? '...' : '');
   return arg.required ? '<' + nameOutput + '>' : '[' + nameOutput + ']';
 }

src/cli/log.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import ansicolors from 'ansicolors';
 
-let log = _.restParam(function (color, label, rest1) {
+const log = _.restParam(function (color, label, rest1) {
   console.log.apply(console, [color(` ${_.trim(label)} `)].concat(rest1));
 });
 

src/cli_plugin/cli.js

@@ -5,8 +5,8 @@ import listCommand from './list';
 import installCommand from './install';
 import removeCommand from './remove';
 
-let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
-let program = new Command('bin/kibana-plugin');
+const argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
+const program = new Command('bin/kibana-plugin');
 
 program
 .version(pkg.version)
@@ -23,7 +23,7 @@ program
 .command('help <command>')
 .description('get the help for a specific command')
 .action(function (cmdName) {
-  let cmd = _.find(program.commands, { _name: cmdName });
+  const cmd = _.find(program.commands, { _name: cmdName });
   if (!cmd) return program.error(`unknown command ${cmdName}`);
   cmd.help();
 });
@@ -35,7 +35,7 @@ program
 });
 
 // check for no command name
-let subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
+const subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
 if (!subCommand) {
   program.defaultHelp();
 }

src/cli_plugin/install/__tests__/index.js

@@ -8,7 +8,7 @@ describe('kibana cli', function () {
 
     describe('commander options', function () {
 
-      let program = {
+      const program = {
         command: function () { return program; },
         description: function () { return program; },
         option: function () { return program; },

src/cli_plugin/install/cleanup.js

@@ -19,7 +19,7 @@ export function cleanPrevious(settings, logger) {
       resolve();
     }
   });
-};
+}
 
 export function cleanArtifacts(settings) {
   // delete the working directory.
@@ -29,4 +29,4 @@ export function cleanArtifacts(settings) {
     rimraf.sync(settings.plugins[0].path);
   }
   catch (e) {} // eslint-disable-line no-empty
-};
+}

src/cli_plugin/install/download.js

@@ -42,4 +42,4 @@ export function download(settings, logger) {
   }
 
   return tryNext();
-};
+}

src/cli_plugin/install/downloaders/file.js

@@ -3,7 +3,7 @@ import { createWriteStream, createReadStream, unlinkSync, statSync } from 'fs';
 
 function openSourceFile({ sourcePath }) {
   try {
-    let fileInfo = statSync(sourcePath);
+    const fileInfo = statSync(sourcePath);
 
     const readStream = createReadStream(sourcePath);
 

src/cli_plugin/install/downloaders/http.js

@@ -53,7 +53,7 @@ export default async function downloadUrl(logger, sourceUrl, targetPath, timeout
     const { req, resp } = await sendRequest({ sourceUrl, timeout });
 
     try {
-      let totalSize = parseFloat(resp.headers['content-length']) || 0;
+      const totalSize = parseFloat(resp.headers['content-length']) || 0;
       const progress = new Progress(logger);
       progress.init(totalSize);
 

src/cli_plugin/install/index.js

@@ -49,4 +49,4 @@ export default function pluginInstall(program) {
   install file:///Path/to/my/x-pack.zip
   install https://path.to/my/x-pack.zip`)
   .action(processCommand);
-};
+}

src/cli_plugin/install/pack.js

@@ -140,4 +140,4 @@ export async function extract(settings, logger) {
     logger.error(err);
     throw new Error('Error extracting plugin archive');
   }
-};
+}

src/cli_plugin/install/settings.js

@@ -21,7 +21,7 @@ export function parseMilliseconds(val) {
   }
 
   return result;
-};
+}
 
 export function parse(command, options, kbnPackage) {
   const settings = {
@@ -44,4 +44,4 @@ export function parse(command, options, kbnPackage) {
   };
 
   return settings;
-};
+}

src/cli_plugin/lib/errors.js

@@ -1 +1 @@
-export class UnsupportedProtocolError extends Error {};
+export class UnsupportedProtocolError extends Error {}

src/cli_plugin/lib/logger.js

@@ -41,6 +41,6 @@ export default class Logger {
     }
     process.stderr.write(`${data}\n`);
     this.previousLineEnded = true;
-  };
+  }
 
 }

src/cli_plugin/list/index.js

@@ -29,4 +29,4 @@ export default function pluginList(program) {
     )
     .description('list installed plugins')
     .action(processCommand);
-};
+}

src/cli_plugin/list/settings.js

@@ -6,4 +6,4 @@ export function parse(command, options) {
   };
 
   return settings;
-};
+}

src/cli_plugin/remove/index.js

@@ -39,4 +39,4 @@ export default function pluginRemove(program) {
 `common examples:
   remove x-pack`)
   .action(processCommand);
-};
+}

src/cli_plugin/remove/settings.js

@@ -12,4 +12,4 @@ export function parse(command, options) {
   settings.pluginPath = resolve(settings.pluginDir, settings.plugin);
 
   return settings;
-};
+}

src/core_plugins/console/api_server/es_5_0.js

@@ -29,7 +29,7 @@ function ES_5_0() {
   }, this);
 }
 
-ES_5_0.prototype = _.create(Api.prototype, {'constructor': ES_5_0});
+ES_5_0.prototype = _.create(Api.prototype, { 'constructor': ES_5_0 });
 
 (function (cls) {
   cls.addEndpointDescription = function (endpoint, description) {