es6 modules - enhanced simple requires

src/cli/cluster/cluster_manager.js

@@ -7,6 +7,8 @@ const { debounce, compact, get, invoke, bindAll, once, sample } = require('lodas
 import Log from '../Log';
 import Worker from './worker';
 import BasePathProxy from './base_path_proxy';
+import chokidar from 'chokidar';
+import readline from 'readline';
 
 process.env.kbnWorkerType = 'managr';
 
@@ -76,7 +78,6 @@ module.exports = class ClusterManager {
   }
 
   setupWatching() {
-    const chokidar = require('chokidar');
     const utils = require('requirefrom')('src/utils');
     const fromRoot = utils('fromRoot');
 
@@ -106,7 +107,6 @@ module.exports = class ClusterManager {
   }
 
   setupManualRestart() {
-    const readline = require('readline');
     const rl = readline.createInterface(process.stdin, process.stdout);
 
     let nls = 0;

src/cli/serve/serve.js

@@ -1,4 +1,6 @@
 import _ from 'lodash';
+import readYamlConfig from './read_yaml_config';
+import ClusterManager from '../cluster/cluster_manager';
 const { isWorker } = require('cluster');
 const { resolve } = require('path');
 
@@ -26,7 +28,6 @@ const pluginDirCollector = pathCollector();
 const pluginPathCollector = pathCollector();
 
 function initServerSettings(opts, extraCliOptions) {
-  const readYamlConfig = require('./read_yaml_config');
   const settings = readYamlConfig(opts.config);
   const set = _.partial(_.set, settings);
   const get = _.partial(_.get, settings);
@@ -117,7 +118,6 @@ module.exports = function (program) {
 
     if (canCluster && opts.dev && !isWorker) {
       // stop processing the action and handoff to cluster manager
-      const ClusterManager = require('../cluster/cluster_manager');
       new ClusterManager(opts, settings);
       return;
     }

src/fixtures/agg_resp/geohash_grid.js

@@ -1,7 +1,7 @@
+import _ from 'lodash';
 define(function (require) {
   return function GeoHashGridAggResponseFixture() {
 
-    var _ = require('lodash');
 
     // for vis:
     //

src/fixtures/fake_row.js

@@ -1,5 +1,5 @@
+import _ from 'lodash';
 define(function (require) {
-  var _ = require('lodash');
   var longString = Array(200).join('_');
 
   return function (id, mapping) {

src/fixtures/hits.js

@@ -1,5 +1,5 @@
+import _ from 'lodash';
 define(function (require) {
-  var _ = require('lodash');
   return function fitsFixture() {
     return _.map([
       {_source: {'@timestamp': 0, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 10, request: 'foo'}},

src/fixtures/mock_courier.js

@@ -1,6 +1,6 @@
+import _ from 'lodash';
+import sinon from 'auto-release-sinon';
 define(function (require) {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
 
   return function (Private, Promise) {
     var indexPatterns = Private(require('fixtures/stubbed_logstash_index_pattern'));

src/fixtures/mock_state.js

@@ -1,6 +1,6 @@
+import _ from 'lodash';
+import sinon from 'auto-release-sinon';
 define(function (require) {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
 
   function MockState(defaults) {
     this.on = _.noop;

src/fixtures/mock_ui_state.js

@@ -1,5 +1,5 @@
+import _ from 'lodash';
 define(function (require) {
-  var _ = require('lodash');
   var keys = {};
   return {
     get: function (path, def) {

src/fixtures/search_response.js

@@ -1,5 +1,5 @@
+import hits from 'fixtures/real_hits';
 define(function (require) {
-  var hits = require('fixtures/real_hits');
 
   return {
     took: 73,

src/fixtures/stubbed_logstash_index_pattern.js

@@ -1,10 +1,10 @@
+import _ from 'lodash';
 define(function (require) {
   return function stubbedLogstashIndexPatternService(Private) {
     var StubIndexPattern = Private(require('testUtils/stub_index_pattern'));
     var fieldTypes = Private(require('ui/index_patterns/_field_types'));
     var mockLogstashFields = Private(require('fixtures/logstash_fields'));
 
-    var _ = require('lodash');
 
     var fields = mockLogstashFields.map(function (field) {
       field.displayName = field.name;

src/fixtures/stubbed_search_source.js

@@ -1,6 +1,6 @@
+import sinon from 'auto-release-sinon';
+import searchResponse from 'fixtures/search_response';
 define(function (require) {
-  var sinon = require('auto-release-sinon');
-  var searchResponse = require('fixtures/search_response');
 
   return function stubSearchSource(Private, $q, Promise) {
     var deferedResult = $q.defer();

src/fixtures/tilemap_map.js

@@ -1,5 +1,5 @@
+import sinon from 'auto-release-sinon';
 define(function (require) {
-  var sinon = require('auto-release-sinon');
 
   function MockMap(container, chartData, params) {
     this.container = container;

src/fixtures/vislib/_vis_fixture.js

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

src/optimize/index.js

@@ -1,3 +1,4 @@
+import FsOptimizer from './FsOptimizer';
 module.exports = async (kbnServer, server, config) => {
   if (!config.get('optimize.enabled')) return;
 
@@ -33,7 +34,6 @@ module.exports = async (kbnServer, server, config) => {
   }
 
   // only require the FsOptimizer when we need to
-  let FsOptimizer = require('./FsOptimizer');
   let optimizer = new FsOptimizer({
     env: bundles.env,
     bundles: bundles,

src/optimize/lazy/optmzrRole.js

@@ -1,9 +1,9 @@
+import LazyServer from './LazyServer';
+import LazyOptimizer from './LazyOptimizer';
 module.exports = async (kbnServer, kibanaHapiServer, config) => {
 
   let src = require('requirefrom')('src');
   let fromRoot = src('utils/fromRoot');
-  let LazyServer = require('./LazyServer');
-  let LazyOptimizer = require('./LazyOptimizer');
 
   let server = new LazyServer(
     config.get('optimize.lazyHost'),

src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js

@@ -1,6 +1,6 @@
+import _ from 'lodash';
+import $ from 'jquery';
 define(function (require) {
-  const _ = require('lodash');
-  const $ = require('jquery');
   const module = require('ui/modules').get('kibana');
 
   module.directive('lineInterpolationOption', function ($parse, $compile) {

src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js

@@ -1,6 +1,6 @@
+import _ from 'lodash';
+import $ from 'jquery';
 define(function (require) {
-  const _ = require('lodash');
-  const $ = require('jquery');
   const module = require('ui/modules').get('kibana');
   require('ui/directives/inequality');
 

src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js

@@ -1,6 +1,6 @@
+import _ from 'lodash';
+import $ from 'jquery';
 define(function (require) {
-  const _ = require('lodash');
-  const $ = require('jquery');
   const module = require('ui/modules').get('kibana');
 
   module.directive('vislibBasicOptions', function ($parse, $compile) {

src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js

@@ -1,5 +1,5 @@
+import visTypes from 'ui/registry/vis_types';
 define(function (require) {
-  const visTypes = require('ui/registry/vis_types');
   visTypes.register(require('plugins/kbn_vislib_vis_types/histogram'));
   visTypes.register(require('plugins/kbn_vislib_vis_types/line'));
   visTypes.register(require('plugins/kbn_vislib_vis_types/pie'));

src/plugins/kbn_vislib_vis_types/public/tileMap.js

@@ -1,10 +1,10 @@
+import _ from 'lodash';
+import supports from 'ui/utils/supports';
 define(function (require) {
   return function TileMapVisType(Private, getAppState, courier, config) {
     const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
     const Schemas = Private(require('ui/Vis/Schemas'));
     const geoJsonConverter = Private(require('ui/agg_response/geo_json/geo_json'));
-    const _ = require('lodash');
-    const supports = require('ui/utils/supports');
 
     return new VislibVisType({
       name: 'tile_map',

src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js

@@ -1,5 +1,5 @@
+import _ from 'lodash';
 define(function (require) {
-  const _ = require('lodash');
   return function loadPanelFunction(Private) { // Inject services here
     return function (panel, $scope) { // Function parameters here
       const panelTypes = {

src/plugins/kibana/public/dashboard/components/panel/panel.js

@@ -1,10 +1,10 @@
+import moment from 'moment';
+import $ from 'jquery';
+import _ from 'lodash';
 define(function (require) {
-  const moment = require('moment');
-  const $ = require('jquery');
   require('ui/modules')
   .get('app/dashboard')
   .directive('dashboardPanel', function (savedVisualizations, savedSearches, Notifier, Private, $injector) {
-    const _ = require('lodash');
     const loadPanel = Private(require('plugins/kibana/dashboard/components/panel/lib/load_panel'));
     const filterManager = Private(require('ui/filter_manager'));
     const notify = new Notifier();

src/plugins/kibana/public/dashboard/directives/grid.js

@@ -1,7 +1,7 @@
+import _ from 'lodash';
+import $ from 'jquery';
+import Binder from 'ui/Binder';
 define(function (require) {
-  const _ = require('lodash');
-  const $ = require('jquery');
-  const Binder = require('ui/Binder');
   require('gridster');
 
   const app = require('ui/modules').get('app/dashboard');

src/plugins/kibana/public/dashboard/index.js

@@ -1,9 +1,9 @@
+import _ from 'lodash';
+import $ from 'jquery';
+import angular from 'angular';
+import ConfigTemplate from 'ui/ConfigTemplate';
+import chrome from 'ui/chrome';
 define(function (require) {
-  const _ = require('lodash');
-  const $ = require('jquery');
-  const angular = require('angular');
-  const ConfigTemplate = require('ui/ConfigTemplate');
-  const chrome = require('ui/chrome');
 
   require('ui/directives/config');
   require('ui/courier');

src/plugins/kibana/public/dashboard/services/_saved_dashboard.js

@@ -1,8 +1,8 @@
+import angular from 'angular';
+import _ from 'lodash';
+import moment from 'moment';
 define(function (require) {
   const module = require('ui/modules').get('app/dashboard');
-  const angular = require('angular');
-  const _ = require('lodash');
-  const moment = require('moment');
 
   // Used only by the savedDashboards service, usually no reason to change this
   module.factory('SavedDashboard', function (courier, config) {

src/plugins/kibana/public/dashboard/services/saved_dashboards.js

@@ -1,7 +1,7 @@
+import _ from 'lodash';
+import Scanner from 'ui/utils/scanner';
 define(function (require) {
   const module = require('ui/modules').get('app/dashboard');
-  const _ = require('lodash');
-  const Scanner = require('ui/utils/scanner');
 
   // bring in the factory
   require('plugins/kibana/dashboard/services/_saved_dashboard');

src/plugins/kibana/public/discover/__tests__/directives/discover_field.js

@@ -1,10 +1,10 @@
 
 import angular from 'angular';
-const $ = require('jquery');
 import _ from 'lodash';
 import sinon from 'auto-release-sinon';
 import ngMock from 'ngMock';
 import expect from 'expect.js';
+import $ from 'jquery';
 
 // Load the kibana app dependencies.
 require('ui/private');

src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js

@@ -1,10 +1,10 @@
 
 import angular from 'angular';
 import ngMock from 'ngMock';
-const $ = require('jquery');
 import _ from 'lodash';
 import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
+import $ from 'jquery';
 
 // Load the kibana app dependencies.
 require('ui/private');

src/plugins/kibana/public/discover/components/field_chooser/discover_field.js

@@ -1,8 +1,9 @@
+import $ from 'jquery';
+import html from 'plugins/kibana/discover/components/field_chooser/discover_field.html';
+import _ from 'lodash';
+import detailsHtml from 'plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html';
 define(function (require) {
-  const $ = require('jquery');
   const app = require('ui/modules').get('apps/discover');
-  const html = require('plugins/kibana/discover/components/field_chooser/discover_field.html');
-  const _ = require('lodash');
 
   require('ui/directives/css_truncate');
   require('ui/directives/field_name');
@@ -17,7 +18,6 @@ define(function (require) {
         let detailsElem;
         let detailScope = $scope.$new();
 
-        const detailsHtml = require('plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html');
 
         const init = function () {
           if ($scope.field.details) {

src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js

@@ -1,3 +1,7 @@
+import _ from 'lodash';
+import $ from 'jquery';
+import rison from 'ui/utils/rison';
+import fieldCalculator from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
 define(function (require) {
   const app = require('ui/modules').get('apps/discover');
 
@@ -8,10 +12,6 @@ define(function (require) {
   require('plugins/kibana/discover/components/field_chooser/discover_field');
 
   app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) {
-    const _ = require('lodash');
-    const $ = require('jquery');
-    const rison = require('ui/utils/rison');
-    const fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
     const FieldList = Private(require('ui/index_patterns/_field_list'));
 
     return {

src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js

@@ -1,5 +1,5 @@
+import _ from 'lodash';
 define(function (require) {
-  const _ = require('lodash');
 
   function getFieldValues(hits, field) {
     const name = field.name;

src/plugins/kibana/public/discover/controllers/discover.js

@@ -1,12 +1,12 @@
+import _ from 'lodash';
+import angular from 'angular';
+import moment from 'moment';
+import ConfigTemplate from 'ui/ConfigTemplate';
+import getSort from 'ui/doc_table/lib/get_sort';
+import rison from 'ui/utils/rison';
+import dateMath from 'ui/utils/dateMath';
 define(function (require) {
-  const _ = require('lodash');
-  const angular = require('angular');
-  const moment = require('moment');
-  const ConfigTemplate = require('ui/ConfigTemplate');
-  const getSort = require('ui/doc_table/lib/get_sort');
-  const rison = require('ui/utils/rison');
-
-  const dateMath = require('ui/utils/dateMath');
+
 
   require('ui/doc_table');
   require('ui/visualize');

src/plugins/kibana/public/discover/directives/timechart.js

@@ -1,8 +1,8 @@
+import _ from 'lodash';
+import $ from 'jquery';
 require('ui/modules')
 .get('apps/discover')
 .directive('discoverTimechart', function (Private, $compile) {
-  const _ = require('lodash');
-  const $ = require('jquery');
   const vislib = Private(require('ui/vislib'));
 
   return {

src/plugins/kibana/public/discover/index.js

@@ -1,3 +1,4 @@
+import savedObjectRegistry from 'ui/saved_objects/saved_object_registry';
 define(function (require) {
   require('plugins/kibana/discover/saved_searches/saved_searches');
   require('plugins/kibana/discover/directives/timechart');
@@ -10,6 +11,5 @@ define(function (require) {
   // preload
   require('ui/doc_table/components/table_row');
 
-  const savedObjectRegistry = require('ui/saved_objects/saved_object_registry');
   savedObjectRegistry.register(require('plugins/kibana/discover/saved_searches/saved_search_register'));
 });