[es6Modules] handle simple case

src/cli/Command.js

@@ -1,9 +1,9 @@
-let _ = require('lodash');
+import _ from 'lodash';
 let Command = require('commander').Command;
 
 let red = require('./color').red;
 let yellow = require('./color').yellow;
-let help = require('./help');
+import help from './help';
 
 Command.prototype.error = function (err) {
   if (err && err.message) err = err.message;

src/cli/Log.js

@@ -1,11 +1,11 @@
-let _ = require('lodash');
-let ansicolors = require('ansicolors');
+import _ from 'lodash';
+import ansicolors from 'ansicolors';
 
 let log = _.restParam(function (color, label, rest1) {
   console.log.apply(console, [color(` ${_.trim(label)} `)].concat(rest1));
 });
 
-let color = require('./color');
+import color from './color';
 
 module.exports = class Log {
   constructor(quiet, silent) {

src/cli/cli.js

@@ -1,8 +1,8 @@
-let _ = require('lodash');
+import _ from 'lodash';
 
 let utils = require('requirefrom')('src/utils');
 let pkg = utils('packageJson');
-let Command = require('./Command');
+import Command from './Command';
 
 let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
 let program = new Command('bin/kibana');

src/cli/cluster/cluster_manager.js

@@ -1,12 +1,12 @@
-const cluster = require('cluster');
+import cluster from 'cluster';
 const { join } = require('path');
 const { format: formatUrl } = require('url');
-const Hapi = require('hapi');
+import Hapi from 'hapi';
 const { debounce, compact, get, invoke, bindAll, once, sample } = require('lodash');
 
-const Log = require('../Log');
-const Worker = require('./worker');
-const BasePathProxy = require('./base_path_proxy');
+import Log from '../Log';
+import Worker from './worker';
+import BasePathProxy from './base_path_proxy';
 
 process.env.kbnWorkerType = 'managr';
 

src/cli/cluster/worker.js

@@ -1,9 +1,9 @@
-let _ = require('lodash');
-let cluster = require('cluster');
+import _ from 'lodash';
+import cluster from 'cluster';
 let { resolve } = require('path');
 let { EventEmitter } = require('events');
 
-let fromRoot = require('../../utils/fromRoot');
+import fromRoot from '../../utils/fromRoot';
 
 let cliPath = fromRoot('src/cli');
 let baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);

src/cli/color.js

@@ -1,6 +1,6 @@
 
-var _ = require('lodash');
-var ansicolors = require('ansicolors');
+import _ from 'lodash';
+import ansicolors from 'ansicolors';
 
 exports.green = _.flow(ansicolors.black, ansicolors.bgGreen);
 exports.red = _.flow(ansicolors.white, ansicolors.bgRed);

src/cli/help.js

@@ -1,4 +1,4 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function (command, spaces) {
   if (!_.size(command.commands)) {

src/cli/plugin/__tests__/plugin.js

@@ -1,6 +1,6 @@
-const expect = require('expect.js');
-const sinon = require('sinon');
-const plugin = require('../plugin');
+import expect from 'expect.js';
+import sinon from 'sinon';
+import plugin from '../plugin';
 
 describe('kibana cli', function () {
 

src/cli/plugin/__tests__/plugin_cleaner.js

@@ -1,10 +1,10 @@
-const expect = require('expect.js');
-const sinon = require('sinon');
-const fs = require('fs');
-const rimraf = require('rimraf');
+import expect from 'expect.js';
+import sinon from 'sinon';
+import fs from 'fs';
+import rimraf from 'rimraf';
 
-const pluginCleaner = require('../plugin_cleaner');
-const pluginLogger = require('../plugin_logger');
+import pluginCleaner from '../plugin_cleaner';
+import pluginLogger from '../plugin_logger';
 
 describe('kibana cli', function () {
 

src/cli/plugin/__tests__/plugin_downloader.js

@@ -1,12 +1,12 @@
-const expect = require('expect.js');
-const sinon = require('sinon');
-const nock = require('nock');
-const glob = require('glob');
-const rimraf = require('rimraf');
+import expect from 'expect.js';
+import sinon from 'sinon';
+import nock from 'nock';
+import glob from 'glob';
+import rimraf from 'rimraf';
 const { join } = require('path');
-const mkdirp = require('mkdirp');
-const pluginLogger = require('../plugin_logger');
-const pluginDownloader = require('../plugin_downloader');
+import mkdirp from 'mkdirp';
+import pluginLogger from '../plugin_logger';
+import pluginDownloader from '../plugin_downloader';
 
 describe('kibana cli', function () {
 

src/cli/plugin/__tests__/plugin_extractor.js

@@ -1,13 +1,13 @@
-const expect = require('expect.js');
-const sinon = require('sinon');
-const glob = require('glob');
-const rimraf = require('rimraf');
+import expect from 'expect.js';
+import sinon from 'sinon';
+import glob from 'glob';
+import rimraf from 'rimraf';
 const { join } = require('path');
-const mkdirp = require('mkdirp');
+import mkdirp from 'mkdirp';
 
-const pluginLogger = require('../plugin_logger');
-const extract = require('../plugin_extractor');
-const pluginDownloader = require('../plugin_downloader');
+import pluginLogger from '../plugin_logger';
+import extract from '../plugin_extractor';
+import pluginDownloader from '../plugin_downloader';
 
 describe('kibana cli', function () {
 

src/cli/plugin/__tests__/plugin_installer.js

@@ -1,10 +1,10 @@
-const expect = require('expect.js');
-const sinon = require('sinon');
-const rimraf = require('rimraf');
+import expect from 'expect.js';
+import sinon from 'sinon';
+import rimraf from 'rimraf';
 const { mkdirSync } = require('fs');
 const { join } = require('path');
-const pluginLogger = require('../plugin_logger');
-const pluginInstaller = require('../plugin_installer');
+import pluginLogger from '../plugin_logger';
+import pluginInstaller from '../plugin_installer';
 
 describe('kibana cli', function () {
 

src/cli/plugin/__tests__/plugin_logger.js

@@ -1,6 +1,6 @@
-const expect = require('expect.js');
-const sinon = require('sinon');
-const pluginLogger = require('../plugin_logger');
+import expect from 'expect.js';
+import sinon from 'sinon';
+import pluginLogger from '../plugin_logger';
 
 describe('kibana cli', function () {
 

src/cli/plugin/__tests__/progress_reporter.js

@@ -1,7 +1,7 @@
-const expect = require('expect.js');
-const sinon = require('sinon');
-const progressReporter = require('../progress_reporter');
-const pluginLogger = require('../plugin_logger');
+import expect from 'expect.js';
+import sinon from 'sinon';
+import progressReporter from '../progress_reporter';
+import pluginLogger from '../plugin_logger';
 
 describe('kibana cli', function () {
 

src/cli/plugin/__tests__/setting_parser.js

@@ -1,9 +1,9 @@
-var path = require('path');
-var expect = require('expect.js');
+import path from 'path';
+import expect from 'expect.js';
 
 var utils = require('requirefrom')('src/utils');
 var fromRoot = utils('fromRoot');
-var settingParser = require('../setting_parser');
+import settingParser from '../setting_parser';
 
 describe('kibana cli', function () {
 

src/cli/plugin/downloaders/file.js

@@ -1,5 +1,5 @@
 const { createWriteStream, createReadStream, unlinkSync, statSync } = require('fs');
-const getProgressReporter = require('../progress_reporter');
+import getProgressReporter from '../progress_reporter';
 
 function openSourceFile({ sourcePath }) {
   try {

src/cli/plugin/downloaders/http.js

@@ -1,7 +1,7 @@
 const { fromNode: fn } = require('bluebird');
 const { createWriteStream, unlinkSync } = require('fs');
-const Wreck = require('wreck');
-const getProgressReporter = require('../progress_reporter');
+import Wreck from 'wreck';
+import getProgressReporter from '../progress_reporter';
 
 function sendRequest({ sourceUrl, timeout }) {
   const maxRedirects = 11; //Because this one goes to 11.

src/cli/plugin/extractors/tar_gz.js

@@ -1,6 +1,6 @@
-const zlib = require('zlib');
-const fs = require('fs');
-const tar = require('tar');
+import zlib from 'zlib';
+import fs from 'fs';
+import tar from 'tar';
 
 async function extractArchive(settings) {
   await new Promise((resolve, reject) => {

src/cli/plugin/extractors/zip.js

@@ -1,4 +1,4 @@
-const DecompressZip = require('@bigfunger/decompress-zip');
+import DecompressZip from '@bigfunger/decompress-zip';
 
 async function extractArchive(settings) {
   await new Promise((resolve, reject) => {

src/cli/plugin/plugin.js

@@ -1,10 +1,10 @@
 const utils = require('requirefrom')('src/utils');
 const fromRoot = utils('fromRoot');
-const settingParser = require('./setting_parser');
-const installer = require('./plugin_installer');
-const remover = require('./plugin_remover');
-const lister = require('./plugin_lister');
-const pluginLogger = require('./plugin_logger');
+import settingParser from './setting_parser';
+import installer from './plugin_installer';
+import remover from './plugin_remover';
+import lister from './plugin_lister';
+import pluginLogger from './plugin_logger';
 
 export default function pluginCli(program) {
   function processCommand(command, options) {

src/cli/plugin/plugin_cleaner.js

@@ -1,5 +1,5 @@
-const rimraf = require('rimraf');
-const fs = require('fs');
+import rimraf from 'rimraf';
+import fs from 'fs';
 
 export default function createPluginCleaner(settings, logger) {
   function cleanPrevious() {

src/cli/plugin/plugin_downloader.js

@@ -1,7 +1,7 @@
-const _ = require('lodash');
+import _ from 'lodash';
 const urlParse = require('url').parse;
-const downloadHttpFile = require('./downloaders/http');
-const downloadLocalFile = require('./downloaders/file');
+import downloadHttpFile from './downloaders/http';
+import downloadLocalFile from './downloaders/file';
 
 export default function createPluginDownloader(settings, logger) {
   let archiveType;

src/cli/plugin/plugin_extractor.js

@@ -1,5 +1,5 @@
-const zipExtract = require('./extractors/zip');
-const tarGzExtract = require('./extractors/tar_gz');
+import zipExtract from './extractors/zip';
+import tarGzExtract from './extractors/tar_gz';
 
 export default function extractArchive(settings, logger, archiveType) {
   switch (archiveType) {

src/cli/plugin/plugin_installer.js

@@ -1,13 +1,13 @@
-const _ = require('lodash');
+import _ from 'lodash';
 const utils = require('requirefrom')('src/utils');
 const fromRoot = utils('fromRoot');
-const pluginDownloader = require('./plugin_downloader');
-const pluginCleaner = require('./plugin_cleaner');
-const pluginExtractor = require('./plugin_extractor');
-const KbnServer = require('../../server/KbnServer');
-const readYamlConfig = require('../serve/read_yaml_config');
+import pluginDownloader from './plugin_downloader';
+import pluginCleaner from './plugin_cleaner';
+import pluginExtractor from './plugin_extractor';
+import KbnServer from '../../server/KbnServer';
+import readYamlConfig from '../serve/read_yaml_config';
 const { statSync, renameSync } = require('fs');
-const Promise = require('bluebird');
+import Promise from 'bluebird';
 const rimrafSync = require('rimraf').sync;
 const mkdirp = Promise.promisify(require('mkdirp'));
 

src/cli/plugin/plugin_lister.js

@@ -1,4 +1,4 @@
-const fs = require('fs');
+import fs from 'fs';
 
 export function list(settings, logger) {
   fs.readdirSync(settings.pluginDir)

src/cli/plugin/plugin_remover.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const rimraf = require('rimraf');
+import fs from 'fs';
+import rimraf from 'rimraf';
 
 module.exports = {
   remove: remove

src/cli/plugin/setting_parser.js

@@ -1,5 +1,5 @@
 const { resolve } = require('path');
-const expiry = require('expiry-js');
+import expiry from 'expiry-js';
 import { intersection } from 'lodash';
 
 export default function createSettingParser(options) {

src/cli/serve/read_yaml_config.js

@@ -1,6 +1,6 @@
-let _ = require('lodash');
-let fs = require('fs');
-let yaml = require('js-yaml');
+import _ from 'lodash';
+import fs from 'fs';
+import yaml from 'js-yaml';
 
 let utils = require('requirefrom')('src/utils');
 let fromRoot = utils('fromRoot');

src/cli/serve/serve.js

@@ -1,4 +1,4 @@
-const _ = require('lodash');
+import _ from 'lodash';
 const { isWorker } = require('cluster');
 const { resolve } = require('path');
 

src/fixtures/vislib/_vis_fixture.js

@@ -1,5 +1,5 @@
 var $ = require('jquery');
-var _ = require('lodash');
+import _ from 'lodash';
 
 var $visCanvas = $('<div>').attr('id', 'vislib-vis-fixtures').appendTo('body');
 var count = 0;

src/fixtures/vislib/mock_data/date_histogram/_columns.js

@@ -1,4 +1,4 @@
-var moment = require('moment');
+import moment from 'moment';
 
 module.exports = {
   'columns': [

src/fixtures/vislib/mock_data/date_histogram/_rows.js

@@ -1,4 +1,4 @@
-var moment = require('moment');
+import moment from 'moment';
 
 module.exports = {
   'rows': [

src/fixtures/vislib/mock_data/date_histogram/_series.js

@@ -1,4 +1,4 @@
-var moment = require('moment');
+import moment from 'moment';
 
 module.exports = {
   'label': '',

src/fixtures/vislib/mock_data/date_histogram/_series_neg.js

@@ -1,4 +1,4 @@
-var moment = require('moment');
+import moment from 'moment';
 
 module.exports = {
   'label': '',

src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js

@@ -1,4 +1,4 @@
-var moment = require('moment');
+import moment from 'moment';
 
 module.exports = {
   'label': '',

src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js

@@ -1,4 +1,4 @@
-var moment = require('moment');
+import moment from 'moment';
 
 module.exports = {
   'label': '',

src/fixtures/vislib/mock_data/filters/_columns.js

@@ -1,4 +1,4 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = {
   'columns': [

src/fixtures/vislib/mock_data/filters/_rows.js

@@ -1,4 +1,4 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = {
   'rows': [

src/fixtures/vislib/mock_data/filters/_series.js

@@ -1,4 +1,4 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = {
   'label': '',