es6 module - hoist private module providers

src/fixtures/mock_courier.js

@@ -1,9 +1,10 @@
 import _ from 'lodash';
 import sinon from 'auto-release-sinon';
+import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 define(function (require) {
 
   return function (Private, Promise) {
-    var indexPatterns = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    var indexPatterns = Private(FixturesStubbedLogstashIndexPatternProvider);
     var getIndexPatternStub = sinon.stub();
     getIndexPatternStub.returns(Promise.resolve(indexPatterns));
 

src/fixtures/stubbed_doc_source_response.js

@@ -1,6 +1,8 @@
+import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields';
+
 define(function (require) {
   function stubbedDocSourceResponse(Private) {
-    var mockLogstashFields = Private(require('fixtures/logstash_fields'));
+    var mockLogstashFields = Private(FixturesLogstashFieldsProvider);
 
     return function (id, index) {
       index = index || '.kibana';

src/fixtures/stubbed_logstash_index_pattern.js

@@ -1,9 +1,12 @@
 import _ from 'lodash';
+import TestUtilsStubIndexPatternProvider from 'testUtils/stub_index_pattern';
+import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types';
+import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields';
 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 StubIndexPattern = Private(TestUtilsStubIndexPatternProvider);
+    var fieldTypes = Private(IndexPatternsFieldTypesProvider);
+    var mockLogstashFields = Private(FixturesLogstashFieldsProvider);
 
 
     var fields = mockLogstashFields.map(function (field) {

src/fixtures/stubbed_search_source.js

@@ -1,10 +1,11 @@
 import sinon from 'auto-release-sinon';
 import searchResponse from 'fixtures/search_response';
+import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 define(function (require) {
 
   return function stubSearchSource(Private, $q, Promise) {
     var deferedResult = $q.defer();
-    var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    var indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
 
     return {
       sort: sinon.spy(),

src/fixtures/vislib/_vis_fixture.js

@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import $ from 'jquery';
+import VislibVisProvider from 'ui/vislib/vis';
 
 var $visCanvas = $('<div>').attr('id', 'vislib-vis-fixtures').appendTo('body');
 var count = 0;
@@ -19,7 +20,7 @@ afterEach(function () {
 
 module.exports = function VislibFixtures(Private) {
   return function (visLibParams) {
-    var Vis = Private(require('ui/vislib/vis'));
+    var Vis = Private(VislibVisProvider);
     return new Vis($visCanvas.new(), _.defaults({}, visLibParams || {}, {
       shareYAxis: true,
       addTooltip: true,

src/plugins/kbn_vislib_vis_types/public/area.js

@@ -1,7 +1,10 @@
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
+import VisSchemasProvider from 'ui/Vis/Schemas';
+
 define(function (require) {
   return function HistogramVisType(Private) {
-    const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    const Schemas = Private(require('ui/Vis/Schemas'));
+    const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider);
+    const Schemas = Private(VisSchemasProvider);
 
     return new VislibVisType({
       name: 'area',

src/plugins/kbn_vislib_vis_types/public/histogram.js

@@ -1,7 +1,10 @@
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
+import VisSchemasProvider from 'ui/Vis/Schemas';
+
 define(function (require) {
   return function HistogramVisType(Private) {
-    const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    const Schemas = Private(require('ui/Vis/Schemas'));
+    const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider);
+    const Schemas = Private(VisSchemasProvider);
 
     return new VislibVisType({
       name: 'histogram',

src/plugins/kbn_vislib_vis_types/public/line.js

@@ -1,7 +1,10 @@
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
+import VisSchemasProvider from 'ui/Vis/Schemas';
+
 define(function (require) {
   return function HistogramVisType(Private) {
-    const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    const Schemas = Private(require('ui/Vis/Schemas'));
+    const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider);
+    const Schemas = Private(VisSchemasProvider);
 
     return new VislibVisType({
       name: 'line',

src/plugins/kbn_vislib_vis_types/public/pie.js

@@ -1,7 +1,10 @@
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
+import VisSchemasProvider from 'ui/Vis/Schemas';
+
 define(function (require) {
   return function HistogramVisType(Private) {
-    const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    const Schemas = Private(require('ui/Vis/Schemas'));
+    const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider);
+    const Schemas = Private(VisSchemasProvider);
 
     return new VislibVisType({
       name: 'pie',

src/plugins/kbn_vislib_vis_types/public/tileMap.js

@@ -1,10 +1,14 @@
 import _ from 'lodash';
 import supports from 'ui/utils/supports';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
+import VisSchemasProvider from 'ui/Vis/Schemas';
+import AggResponseGeoJsonGeoJsonProvider from 'ui/agg_response/geo_json/geo_json';
+import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter';
 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 VislibVisType = Private(VislibVisTypeVislibVisTypeProvider);
+    const Schemas = Private(VisSchemasProvider);
+    const geoJsonConverter = Private(AggResponseGeoJsonGeoJsonProvider);
 
     return new VislibVisType({
       name: 'tile_map',
@@ -33,7 +37,7 @@ define(function (require) {
           const agg = _.get(event, 'chart.geohashGridAgg');
           if (!agg) return;
 
-          const pushFilter = Private(require('ui/filter_bar/push_filter'))(getAppState());
+          const pushFilter = Private(FilterBarPushFilterProvider)(getAppState());
           const indexPatternName = agg.vis.indexPattern.id;
           const field = agg.fieldName();
           const filter = {geo_bounding_box: {}};

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

@@ -1,10 +1,12 @@
 import _ from 'lodash';
+import PluginsKibanaDashboardComponentsPanelLibVisualizationProvider from 'plugins/kibana/dashboard/components/panel/lib/visualization';
+import PluginsKibanaDashboardComponentsPanelLibSearchProvider from 'plugins/kibana/dashboard/components/panel/lib/search';
 define(function (require) {
   return function loadPanelFunction(Private) { // Inject services here
     return function (panel, $scope) { // Function parameters here
       const panelTypes = {
-        visualization: Private(require('plugins/kibana/dashboard/components/panel/lib/visualization')),
-        search: Private(require('plugins/kibana/dashboard/components/panel/lib/search'))
+        visualization: Private(PluginsKibanaDashboardComponentsPanelLibVisualizationProvider),
+        search: Private(PluginsKibanaDashboardComponentsPanelLibSearchProvider)
       };
 
       try {

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

@@ -1,7 +1,10 @@
+import UtilsBrushEventProvider from 'ui/utils/brush_event';
+import FilterBarFilterBarClickHandlerProvider from 'ui/filter_bar/filter_bar_click_handler';
+
 define(function (require) {
   return function visualizationLoader(savedVisualizations, Private) { // Inject services here
-    const brushEvent = Private(require('ui/utils/brush_event'));
-    const filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
+    const brushEvent = Private(UtilsBrushEventProvider);
+    const filterBarClickHandler = Private(FilterBarFilterBarClickHandlerProvider);
 
     return function (panel, $scope) { // Function parameters here
       return savedVisualizations.get(panel.id)

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

@@ -3,12 +3,15 @@ import $ from 'jquery';
 import _ from 'lodash';
 import 'ui/visualize';
 import 'ui/doc_table';
+import PluginsKibanaDashboardComponentsPanelLibLoadPanelProvider from 'plugins/kibana/dashboard/components/panel/lib/load_panel';
+import FilterManagerProvider from 'ui/filter_manager';
+import UtilsBrushEventProvider from 'ui/utils/brush_event';
 define(function (require) {
   require('ui/modules')
   .get('app/dashboard')
   .directive('dashboardPanel', function (savedVisualizations, savedSearches, Notifier, Private, $injector) {
-    const loadPanel = Private(require('plugins/kibana/dashboard/components/panel/lib/load_panel'));
-    const filterManager = Private(require('ui/filter_manager'));
+    const loadPanel = Private(PluginsKibanaDashboardComponentsPanelLibLoadPanelProvider);
+    const filterManager = Private(FilterManagerProvider);
     const notify = new Notifier();
 
     const services = require('plugins/kibana/settings/saved_object_registry').all().map(function (serviceObj) {
@@ -20,7 +23,7 @@ define(function (require) {
     });
 
 
-    const brushEvent = Private(require('ui/utils/brush_event'));
+    const brushEvent = Private(UtilsBrushEventProvider);
 
     const getPanelId = function (panel) {
       return ['P', panel.panelIndex].join('-');

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

@@ -14,6 +14,8 @@ import 'plugins/kibana/dashboard/directives/grid';
 import 'plugins/kibana/dashboard/components/panel/panel';
 import 'plugins/kibana/dashboard/services/saved_dashboards';
 import 'plugins/kibana/dashboard/styles/main.less';
+import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
+import DocTitleProvider from 'ui/doc_title';
 define(function (require) {
 
 
@@ -55,7 +57,7 @@ define(function (require) {
     return {
       controller: function ($scope, $rootScope, $route, $routeParams, $location, Private, getAppState) {
 
-        const queryFilter = Private(require('ui/filter_bar/query_filter'));
+        const queryFilter = Private(FilterBarQueryFilterProvider);
 
         const notify = new Notifier({
           location: 'Dashboard'
@@ -115,7 +117,7 @@ define(function (require) {
         function init() {
           updateQueryOnRootSource();
 
-          const docTitle = Private(require('ui/doc_title'));
+          const docTitle = Private(DocTitleProvider);
           if (dash.id) {
             docTitle.change(dash.title);
           }

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

@@ -7,6 +7,7 @@ import expect from 'expect.js';
 import $ from 'jquery';
 import 'ui/private';
 import 'plugins/kibana/discover/components/field_chooser/discover_field';
+import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 // Load the kibana app dependencies.
 
@@ -18,7 +19,7 @@ describe('discoverField', function () {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $rootScope, $compile) {
     $elem = angular.element('<discover-field></discover-field>');
-    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
 
     _.assign($rootScope, {
       field: indexPattern.fields.byName.extension,

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

@@ -4,6 +4,7 @@ import ngMock from 'ngMock';
 import fieldCalculator from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
 import expect from 'expect.js';
 import 'ui/private';
+import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 // Load the kibana app dependencies.
 
@@ -12,7 +13,7 @@ let indexPattern;
 describe('fieldCalculator', function () {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
   }));
 
 

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

@@ -7,6 +7,8 @@ import expect from 'expect.js';
 import $ from 'jquery';
 import 'ui/private';
 import 'plugins/kibana/discover/components/field_chooser/field_chooser';
+import FixturesHitsProvider from 'fixtures/hits';
+import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 // Load the kibana app dependencies.
 
@@ -55,8 +57,8 @@ describe('discover field chooser directives', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    hits = Private(require('fixtures/hits'));
-    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    hits = Private(FixturesHitsProvider);
+    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
     indexPatternList = [ 'b', 'a', 'c' ];
 
     const fieldCounts = _.transform(hits, function (counts, hit) {

src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js

@@ -2,13 +2,14 @@
 import _ from 'lodash';
 import ngMock from 'ngMock';
 import expect from 'expect.js';
+import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';
 
 describe('hit sort function', function () {
   let createHitSortFn;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    createHitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn'));
+    createHitSortFn = Private(PluginsKibanaDiscoverHitSortFnProvider);
   }));
 
 

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

@@ -6,13 +6,14 @@ import _ from 'lodash';
 import $ from 'jquery';
 import rison from 'ui/utils/rison';
 import fieldCalculator from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
+import IndexPatternsFieldListProvider from 'ui/index_patterns/_field_list';
 define(function (require) {
   const app = require('ui/modules').get('apps/discover');
 
 
 
   app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) {
-    const FieldList = Private(require('ui/index_patterns/_field_list'));
+    const FieldList = Private(IndexPatternsFieldListProvider);
 
     return {
       restrict: 'E',

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

@@ -17,6 +17,13 @@ import 'ui/state_management/app_state';
 import 'ui/timefilter';
 import 'ui/highlight/highlight_tags';
 import 'ui/share';
+import VisProvider from 'ui/Vis';
+import DocTitleProvider from 'ui/doc_title';
+import UtilsBrushEventProvider from 'ui/utils/brush_event';
+import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';
+import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
+import FilterManagerProvider from 'ui/filter_manager';
+import AggTypesBucketsIntervalOptionsProvider from 'ui/agg_types/buckets/_interval_options';
 define(function (require) {
 
 
@@ -66,18 +73,18 @@ define(function (require) {
   app.controller('discover', function ($scope, config, courier, $route, $window, Notifier,
     AppState, timefilter, Promise, Private, kbnUrl, highlightTags) {
 
-    const Vis = Private(require('ui/Vis'));
-    const docTitle = Private(require('ui/doc_title'));
-    const brushEvent = Private(require('ui/utils/brush_event'));
-    const HitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn'));
-    const queryFilter = Private(require('ui/filter_bar/query_filter'));
-    const filterManager = Private(require('ui/filter_manager'));
+    const Vis = Private(VisProvider);
+    const docTitle = Private(DocTitleProvider);
+    const brushEvent = Private(UtilsBrushEventProvider);
+    const HitSortFn = Private(PluginsKibanaDiscoverHitSortFnProvider);
+    const queryFilter = Private(FilterBarQueryFilterProvider);
+    const filterManager = Private(FilterManagerProvider);
 
     const notify = new Notifier({
       location: 'Discover'
     });
 
-    $scope.intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
+    $scope.intervalOptions = Private(AggTypesBucketsIntervalOptionsProvider);
     $scope.showInterval = false;
 
     $scope.intervalEnabled = function (interval) {

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

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

src/plugins/kibana/public/doc/__tests__/doc.js

@@ -2,6 +2,7 @@
 import ngMock from 'ngMock';
 import expect from 'expect.js';
 import 'plugins/kibana/doc/index';
+import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 let $scope;
 let createController;
@@ -16,7 +17,7 @@ const init = function (index, type, id) {
     $provide.service('$route', function (Private) {
       this.current = {
         locals: {
-          indexPattern: Private(require('fixtures/stubbed_logstash_index_pattern'))
+          indexPattern: Private(FixturesStubbedLogstashIndexPatternProvider)
         },
         params: {
           index: index || 'myIndex',

src/plugins/kibana/public/settings/sections/advanced/advanced_row.js

@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import 'ui/elastic_textarea';
+import ConfigDefaultsProvider from 'ui/config/defaults';
 define(function (require) {
 
   require('ui/modules').get('apps/settings')
@@ -13,7 +14,7 @@ define(function (require) {
         configs: '='
       },
       link: function ($scope) {
-        const configDefaults = Private(require('ui/config/defaults'));
+        const configDefaults = Private(ConfigDefaultsProvider);
         const notify = new Notifier();
         const keyCodes = {
           ESC: 27