es6 modules - destructured requires

src/cli/cluster/cluster_manager.js

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

src/cli/cluster/worker.js

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

src/cli/plugin/__tests__/plugin_downloader.js

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

src/cli/plugin/__tests__/plugin_extractor.js

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

src/cli/plugin/__tests__/plugin_installer.js

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

src/cli/plugin/downloaders/file.js

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

src/cli/plugin/downloaders/http.js

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

src/cli/plugin/plugin_installer.js

@@ -6,8 +6,8 @@ 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');
 import Promise from 'bluebird';
+import { statSync, renameSync } from 'fs';
 const rimrafSync = require('rimraf').sync;
 const mkdirp = Promise.promisify(require('mkdirp'));
 

src/cli/plugin/setting_parser.js

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

src/cli/serve/serve.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
-const { isWorker } = require('cluster');
-const { resolve } = require('path');
+import { isWorker } from 'cluster';
+import { resolve } from 'path';
 
 const cwd = process.cwd();
 const src = require('requirefrom')('src');

src/optimize/BaseOptimizer.js

@@ -1,7 +1,3 @@
-let { inherits } = require('util');
-let { defaults } = require('lodash');
-let { resolve } = require('path');
-let { writeFile } = require('fs');
 import webpack from 'webpack';
 import Boom from 'boom';
 import DirectoryNameAsMain from 'webpack-directory-name-as-main';
@@ -11,6 +7,10 @@ import CommonsChunkPlugin from 'webpack/lib/optimize/CommonsChunkPlugin';
 let utils = require('requirefrom')('src/utils');
 let fromRoot = utils('fromRoot');
 import babelOptions from './babelOptions';
+import { inherits } from 'util';
+import { defaults } from 'lodash';
+import { resolve } from 'path';
+import { writeFile } from 'fs';
 let babelExclude = [/[\/\\](webpackShims|node_modules|bower_components)[\/\\]/];
 
 class BaseOptimizer {

src/optimize/FsOptimizer.js

@@ -1,8 +1,8 @@
-let { fromNode } = require('bluebird');
-let { writeFile } = require('fs');
 
 import BaseOptimizer from './BaseOptimizer';
 import fromRoot from '../utils/fromRoot';
+import { fromNode } from 'bluebird';
+import { writeFile } from 'fs';
 
 module.exports = class FsOptimizer extends BaseOptimizer {
   async init() {

src/optimize/lazy/LazyOptimizer.js

@@ -1,9 +1,9 @@
-let { once, pick, size } = require('lodash');
-let { join } = require('path');
 import Boom from 'boom';
 
 import BaseOptimizer from '../BaseOptimizer';
 import WeirdControlFlow from './WeirdControlFlow';
+import { once, pick, size } from 'lodash';
+import { join } from 'path';
 
 module.exports = class LazyOptimizer extends BaseOptimizer {
   constructor(opts) {

src/optimize/lazy/LazyServer.js

@@ -1,7 +1,7 @@
 
-let { Server } = require('hapi');
-let { fromNode } = require('bluebird');
 import Boom from 'boom';
+import { Server } from 'hapi';
+import { fromNode } from 'bluebird';
 
 
 module.exports = class LazyServer {

src/optimize/lazy/WeirdControlFlow.js

@@ -1,5 +1,5 @@
+import { fromNode } from 'bluebird';
 
-let { fromNode } = require('bluebird');
 
 module.exports = class WeirdControlFlow {
   constructor(work) {

src/optimize/lazy/lazy.js

@@ -1,6 +1,6 @@
+import { isWorker } from 'cluster';
 module.exports = async (kbnServer, server, config) => {
 
-  let { isWorker } = require('cluster');
 
   if (!isWorker) {
     throw new Error(`lazy optimization is only available in "watch" mode`);

src/optimize/lazy/proxyRole.js

@@ -1,5 +1,5 @@
-let { fromNode } = require('bluebird');
-let { get, once } = require('lodash');
+import { fromNode } from 'bluebird';
+import { get, once } from 'lodash';
 
 module.exports = (kbnServer, server, config) => {
 

src/plugins/elasticsearch/lib/create_proxy.js

@@ -1,6 +1,6 @@
 import createAgent from './create_agent';
 import mapUri from './map_uri';
-const { resolve } = require('url');
+import { resolve } from 'url';
 
 function createProxy(server, method, route, config) {
 

src/plugins/kibana/public/settings/sections/indices/_create.js

@@ -1,7 +1,7 @@
+import { IndexPatternMissingIndices } from 'ui/errors';
 define(function (require) {
   const _ = require('lodash');
   const moment = require('moment');
-  const { IndexPatternMissingIndices } = require('ui/errors');
 
   require('ui/directives/validate_index_name');
   require('ui/directives/auto_select_if_only_one');

src/plugins/kibana/server/lib/__tests__/case_conversion.js

@@ -1,6 +1,6 @@
 import expect from 'expect.js';
-const { keysToSnakeCaseShallow, keysToCamelCaseShallow } = require('../case_conversion');
 import _ from 'lodash';
+import { keysToSnakeCaseShallow, keysToCamelCaseShallow } from '../case_conversion';
 
 describe('keysToSnakeCaseShallow', function () {
 

src/plugins/kibana/server/lib/__tests__/convert_pattern_and_template_name.js

@@ -1,5 +1,5 @@
-const {templateToPattern, patternToTemplate} = require('../convert_pattern_and_template_name');
 import expect from 'expect.js';
+import {templateToPattern, patternToTemplate} from '../convert_pattern_and_template_name';
 
 describe('convertPatternAndTemplateName', function () {
 

src/plugins/kibana/server/routes/api/ingest/register_delete.js

@@ -1,6 +1,6 @@
 import Promise from 'bluebird';
 import handleESError from '../../../lib/handle_es_error';
-const {templateToPattern, patternToTemplate} = require('../../../lib/convert_pattern_and_template_name');
+import {templateToPattern, patternToTemplate} from '../../../lib/convert_pattern_and_template_name';
 
 module.exports = function registerDelete(server) {
   server.route({

src/plugins/kibana/server/routes/api/ingest/register_post.js

@@ -1,11 +1,11 @@
 import Boom from 'boom';
 import _ from 'lodash';
-const {templateToPattern, patternToTemplate} = require('../../../lib/convert_pattern_and_template_name');
 import indexPatternSchema from '../../../lib/schemas/resources/index_pattern_schema';
 import handleESError from '../../../lib/handle_es_error';
-const { keysToCamelCaseShallow } = require('../../../lib/case_conversion');
 import createMappingsFromPatternFields from '../../../lib/create_mappings_from_pattern_fields';
 import initDefaultFieldProps from '../../../lib/init_default_field_props';
+import {templateToPattern, patternToTemplate} from '../../../lib/convert_pattern_and_template_name';
+import { keysToCamelCaseShallow } from '../../../lib/case_conversion';
 
 module.exports = function registerPost(server) {
   server.route({

src/plugins/testsBundle/findSourceFiles.js

@@ -1,9 +1,9 @@
-let { chain, memoize } = require('lodash');
-let { resolve } = require('path');
-let { map, fromNode } = require('bluebird');
-let { Glob } = require('glob');
 
 import fromRoot from '../../utils/fromRoot';
+import { chain, memoize } from 'lodash';
+import { resolve } from 'path';
+import { map, fromNode } from 'bluebird';
+import { Glob } from 'glob';
 
 let findSourceFiles = async (patterns, cwd = fromRoot('.')) => {
   patterns = [].concat(patterns || []);

src/plugins/testsBundle/index.js

@@ -1,5 +1,5 @@
+import { union } from 'lodash';
 module.exports = (kibana) => {
-  let { union } = require('lodash');
 
   let utils = require('requirefrom')('src/utils');
   let fromRoot = utils('fromRoot');

src/server/KbnServer.js

@@ -1,6 +1,6 @@
-let { constant, once, compact, flatten } = require('lodash');
-let { promisify, resolve, fromNode } = require('bluebird');
 import Hapi from 'hapi';
+import { constant, once, compact, flatten } from 'lodash';
+import { promisify, resolve, fromNode } from 'bluebird';
 
 let utils = require('requirefrom')('src/utils');
 let rootDir = utils('fromRoot')('.');

src/server/config/config.js

@@ -1,11 +1,11 @@
 import Promise from 'bluebird';
 import Joi from 'joi';
 import _ from 'lodash';
-let { zipObject } = require('lodash');
 import override from './override';
 import createDefaultSchema from './schema';
 let pkg = require('requirefrom')('src/utils')('packageJson');
 import clone from './deepCloneWithBuffers';
+import { zipObject } from 'lodash';
 
 const schema = Symbol('Joi Schema');
 const schemaKeys = Symbol('Schema Extensions');

src/server/plugins/Plugin.js

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import Joi from 'joi';
-let { attempt, fromNode } = require('bluebird');
-let { basename, resolve } = require('path');
-let { inherits } = require('util');
+import { attempt, fromNode } from 'bluebird';
+import { basename, resolve } from 'path';
+import { inherits } from 'util';
 
 const defaultConfigSchema = Joi.object({
   enabled: Joi.boolean().default(true)

src/server/plugins/PluginApi.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import Plugin from './Plugin';
-let { basename, join } = require('path');
+import { basename, join } from 'path';
 
 module.exports = class PluginApi {
   constructor(kibana, pluginPath) {

src/server/plugins/PluginCollection.js

@@ -1,7 +1,7 @@
-let { get, indexBy } = require('lodash');
 let inspect = require('util').inspect;
 
 import PluginApi from './PluginApi';
+import { get, indexBy } from 'lodash';
 let Collection = require('requirefrom')('src')('utils/Collection');
 
 let byIdCache = Symbol('byIdCache');

src/server/plugins/initialize.js

@@ -1,5 +1,5 @@
+import { includes, keys } from 'lodash';
 module.exports = async function (kbnServer, server, config) {
-  let { includes, keys } = require('lodash');
 
   if (!config.get('plugins.initialize')) {
     server.log(['info'], 'Plugin initialization disabled.');

src/server/plugins/scan.js

@@ -1,9 +1,9 @@
+import { fromNode } from 'bluebird';
+import { readdir, stat } from 'fs';
+import { resolve } from 'path';
+import { each } from 'bluebird';
 module.exports = async (kbnServer, server, config) => {
   let _ = require('lodash');
-  let { fromNode } = require('bluebird');
-  let { readdir, stat } = require('fs');
-  let { resolve } = require('path');
-  let { each } = require('bluebird');
 
   var PluginCollection = require('./PluginCollection');
   var plugins = kbnServer.plugins = new PluginCollection(kbnServer);

src/server/status/index.js

@@ -1,7 +1,7 @@
+import { join } from 'path';
 module.exports = function (kbnServer, server, config) {
   var _ = require('lodash');
   var ServerStatus = require('./ServerStatus');
-  var { join } = require('path');
 
   kbnServer.status = new ServerStatus(kbnServer.server);
 

src/ui/index.js

@@ -1,8 +1,8 @@
+import { defaults } from 'lodash';
+import { resolve } from 'path';
 module.exports = async (kbnServer, server, config) => {
-  let { defaults } = require('lodash');
   let Boom = require('boom');
   let formatUrl = require('url').format;
-  let { resolve } = require('path');
   let readFile = require('fs').readFileSync;
 
   let fromRoot = require('../utils/fromRoot');

src/ui/public/chrome/Tab.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
+import { parse, format } from 'url';
 const reEsc = require('lodash').escapeRegExp;
-const { parse, format } = require('url');
 
 const urlJoin = (a, b) => {
   if (!b) return a;

src/ui/public/chrome/TabCollection.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
-var { startsWith, get, set, omit, wrap, pick } = require('lodash');
 import Tab from 'ui/chrome/Tab';
-var { parse } = require('url');
+import { startsWith, get, set, omit, wrap, pick } from 'lodash';
+import { parse } from 'url';
 
 function TabCollection(opts = {}) {
   var tabs = [];

src/ui/public/chrome/__tests__/TabCollection.js

@@ -1,9 +1,9 @@
 import expect from 'expect.js';
-const { indexBy, random } = require('lodash');
 
 import TabFakeStore from './_TabFakeStore';
 import TabCollection from '../TabCollection';
 import Tab from '../Tab';
+import { indexBy, random } from 'lodash';
 
 describe('Chrome TabCollection', function () {
   describe('empty state', function () {

src/ui/public/chrome/api/__tests__/xsrf.js

@@ -4,9 +4,9 @@ import { stub } from 'auto-release-sinon';
 import ngMock from 'ngMock';
 
 import xsrfChromeApi from '../xsrf';
+import { version } from '../../../../../../package.json';
 
 const xsrfHeader = 'kbn-version';
-const { version } = require('../../../../../../package.json');
 
 describe('chrome xsrf apis', function () {
   describe('#getXsrfToken()', function () {