diff --git a/src/core_plugins/console/public/src/input.js b/src/core_plugins/console/public/src/input.js
index f6bee06e8533e8..441879fea27f87 100644
--- a/src/core_plugins/console/public/src/input.js
+++ b/src/core_plugins/console/public/src/input.js
@@ -7,7 +7,7 @@ let settings = require('./settings');
let utils = require('./utils');
let es = require('./es');
let history = require('./history');
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
let input;
export function initializeInput($el, $actionsEl, $copyAsCurlEl, output) {
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js
index 5ffd1fb924e4ca..c8e9ea524b74d0 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import heatmapOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/heatmap_options.html';
import _ from 'lodash';
const module = uiModules.get('kibana');
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
index 2159713cf1937a..cd21a174a1c324 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import lineInterpolationOptionTemplate from 'plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html';
const module = uiModules.get('kibana');
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.js
index c54951c9c183c6..fc48d074657fb5 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import vislibValueAxesTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/category_axis.html';
const module = uiModules.get('kibana');
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/grid.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/grid.js
index 3a4fdb35f4b32b..9e000b4aff933d 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/grid.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/grid.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import vislibGridTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/grid.html';
const module = uiModules.get('kibana');
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.js
index faea5450c5e23b..b0512ff20cebc6 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import vislibSeriesTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/series.html';
const module = uiModules.get('kibana');
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.js
index f21f2dea9a3c10..f618febf76f132 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import vislibValueAxesTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/value_axes.html';
const module = uiModules.get('kibana');
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
index 88b92f760b07c2..2fa6dfe038b977 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
@@ -1,5 +1,5 @@
import 'ui/directives/inequality';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import pointSeriesOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series_options.html';
const module = uiModules.get('kibana');
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
index 4f160429e94931..00de3af1dbef59 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import vislibBasicOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html';
const module = uiModules.get('kibana');
diff --git a/src/core_plugins/kibana/public/context/app.js b/src/core_plugins/kibana/public/context/app.js
index 697e3bec5b1c13..87af3d3de47ee6 100644
--- a/src/core_plugins/kibana/public/context/app.js
+++ b/src/core_plugins/kibana/public/context/app.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import contextAppTemplate from './app.html';
import './components/loading_button';
import './components/size_picker/size_picker';
diff --git a/src/core_plugins/kibana/public/context/components/loading_button/loading_button.js b/src/core_plugins/kibana/public/context/components/loading_button/loading_button.js
index 70a07649596852..6a378fc0e6d28a 100644
--- a/src/core_plugins/kibana/public/context/components/loading_button/loading_button.js
+++ b/src/core_plugins/kibana/public/context/components/loading_button/loading_button.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import contextLoadingButtonTemplate from './loading_button.html';
diff --git a/src/core_plugins/kibana/public/context/components/size_picker/size_picker.js b/src/core_plugins/kibana/public/context/components/size_picker/size_picker.js
index 1cadca59639d44..a79272a2a8338d 100644
--- a/src/core_plugins/kibana/public/context/components/size_picker/size_picker.js
+++ b/src/core_plugins/kibana/public/context/components/size_picker/size_picker.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import contextSizePickerTemplate from './size_picker.html';
import './size_picker.less';
diff --git a/src/core_plugins/kibana/public/dashboard/dashboard.js b/src/core_plugins/kibana/public/dashboard/dashboard.js
index 7718f15cd9f2d8..0358f22d4c5e66 100644
--- a/src/core_plugins/kibana/public/dashboard/dashboard.js
+++ b/src/core_plugins/kibana/public/dashboard/dashboard.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import angular from 'angular';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import uiRoutes from 'ui/routes';
import chrome from 'ui/chrome';
diff --git a/src/core_plugins/kibana/public/dashboard/grid.js b/src/core_plugins/kibana/public/dashboard/grid.js
index a788f4bd058a93..650b255ec79750 100644
--- a/src/core_plugins/kibana/public/dashboard/grid.js
+++ b/src/core_plugins/kibana/public/dashboard/grid.js
@@ -3,7 +3,7 @@ import $ from 'jquery';
import { Binder } from 'ui/binder';
import chrome from 'ui/chrome';
import 'gridster';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { DashboardViewMode } from 'plugins/kibana/dashboard/dashboard_view_mode';
import { PanelUtils } from 'plugins/kibana/dashboard/panel/panel_utils';
diff --git a/src/core_plugins/kibana/public/dashboard/panel/get_object_loaders_for_dashboard.js b/src/core_plugins/kibana/public/dashboard/panel/get_object_loaders_for_dashboard.js
index 3d865c738cc109..40c99b3c293723 100644
--- a/src/core_plugins/kibana/public/dashboard/panel/get_object_loaders_for_dashboard.js
+++ b/src/core_plugins/kibana/public/dashboard/panel/get_object_loaders_for_dashboard.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('app/dashboard');
/**
diff --git a/src/core_plugins/kibana/public/dashboard/panel/panel.js b/src/core_plugins/kibana/public/dashboard/panel/panel.js
index dd6d077ae019f8..390fd11170cb6a 100644
--- a/src/core_plugins/kibana/public/dashboard/panel/panel.js
+++ b/src/core_plugins/kibana/public/dashboard/panel/panel.js
@@ -4,7 +4,7 @@ import 'ui/doc_table';
import * as columnActions from 'ui/doc_table/actions/columns';
import 'plugins/kibana/dashboard/panel/get_object_loaders_for_dashboard';
import { FilterManagerProvider } from 'ui/filter_manager';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import panelTemplate from 'plugins/kibana/dashboard/panel/panel.html';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
import { getPersistedStateId } from 'plugins/kibana/dashboard/panel/panel_state';
diff --git a/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js b/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js
index 5432d4c5df4329..377a7130d2001a 100644
--- a/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js
+++ b/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('app/dashboard');
// Used only by the savedDashboards service, usually no reason to change this
diff --git a/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js b/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js
index 31f6f417f98197..5eb6b53a67c7c7 100644
--- a/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js
+++ b/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js
@@ -1,5 +1,5 @@
import 'plugins/kibana/dashboard/saved_dashboard/saved_dashboard';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { SavedObjectLoader } from 'ui/courier/saved_object/saved_object_loader';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
diff --git a/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js b/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js
index 176238ff50103a..fe6bda459c714b 100644
--- a/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js
+++ b/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';
import template from 'plugins/kibana/dev_tools/partials/dev_tools_app.html';
import 'plugins/kibana/dev_tools/styles/dev_tools_app.less';
diff --git a/src/core_plugins/kibana/public/dev_tools/hacks/hide_empty_tools.js b/src/core_plugins/kibana/public/dev_tools/hacks/hide_empty_tools.js
index d1d5ebd7035653..eb0f25faaf92b3 100644
--- a/src/core_plugins/kibana/public/dev_tools/hacks/hide_empty_tools.js
+++ b/src/core_plugins/kibana/public/dev_tools/hacks/hide_empty_tools.js
@@ -1,4 +1,4 @@
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import chrome from 'ui/chrome';
import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';
@@ -10,4 +10,4 @@ export function hideEmptyDevTools(Private) {
}
}
-modules.get('kibana').run(hideEmptyDevTools);
+uiModules.get('kibana').run(hideEmptyDevTools);
diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
index 0268ccc061e3e9..0029eb5c6059b1 100644
--- a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
+++ b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
@@ -4,7 +4,7 @@ import _ from 'lodash';
import 'ui/directives/css_truncate';
import 'ui/directives/field_name';
import detailsHtml from 'plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const app = uiModules.get('apps/discover');
diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
index d8de60e7cfe35e..5e45d053f460ed 100644
--- a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
+++ b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
@@ -8,7 +8,7 @@ import $ from 'jquery';
import rison from 'rison-node';
import { fieldCalculator } from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
import { IndexPatternsFieldListProvider } from 'ui/index_patterns/_field_list';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import fieldChooserTemplate from 'plugins/kibana/discover/components/field_chooser/field_chooser.html';
const app = uiModules.get('apps/discover');
diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js
index 8ee4c058cb3682..0d22fe5864440a 100644
--- a/src/core_plugins/kibana/public/discover/controllers/discover.js
+++ b/src/core_plugins/kibana/public/discover/controllers/discover.js
@@ -24,7 +24,7 @@ import { FilterManagerProvider } from 'ui/filter_manager';
import { AggTypesBucketsIntervalOptionsProvider } from 'ui/agg_types/buckets/_interval_options';
import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import indexTemplate from 'plugins/kibana/discover/index.html';
import { StateProvider } from 'ui/state_management/state';
diff --git a/src/core_plugins/kibana/public/discover/directives/no_results.js b/src/core_plugins/kibana/public/discover/directives/no_results.js
index 73366a6642621c..5710691017907d 100644
--- a/src/core_plugins/kibana/public/discover/directives/no_results.js
+++ b/src/core_plugins/kibana/public/discover/directives/no_results.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import noResultsTemplate from '../partials/no_results.html';
uiModules
diff --git a/src/core_plugins/kibana/public/discover/directives/timechart.js b/src/core_plugins/kibana/public/discover/directives/timechart.js
index 16dd54483da71d..30ca7beba8e10c 100644
--- a/src/core_plugins/kibana/public/discover/directives/timechart.js
+++ b/src/core_plugins/kibana/public/discover/directives/timechart.js
@@ -1,5 +1,5 @@
import VislibProvider from 'ui/vislib';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('apps/discover')
.directive('discoverTimechart', function (Private) {
diff --git a/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js b/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js
index 6102371bba043b..4250026e26acb8 100644
--- a/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js
+++ b/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import 'ui/notify';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('discover/saved_searches', [
diff --git a/src/core_plugins/kibana/public/discover/saved_searches/saved_searches.js b/src/core_plugins/kibana/public/discover/saved_searches/saved_searches.js
index 65fee5fc95c3ab..1076ed06b161e8 100644
--- a/src/core_plugins/kibana/public/discover/saved_searches/saved_searches.js
+++ b/src/core_plugins/kibana/public/discover/saved_searches/saved_searches.js
@@ -1,6 +1,6 @@
import 'plugins/kibana/discover/saved_searches/_saved_search';
import 'ui/notify';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { SavedObjectLoader } from 'ui/courier/saved_object/saved_object_loader';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
const module = uiModules.get('discover/saved_searches', [
diff --git a/src/core_plugins/kibana/public/doc/controllers/doc.js b/src/core_plugins/kibana/public/doc/controllers/doc.js
index 4bf5e80b9a146f..2d1ac03cfbfb52 100644
--- a/src/core_plugins/kibana/public/doc/controllers/doc.js
+++ b/src/core_plugins/kibana/public/doc/controllers/doc.js
@@ -4,7 +4,7 @@ import 'ui/doc_viewer';
import 'ui/index_patterns';
import html from 'plugins/kibana/doc/index.html';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const app = uiModules.get('apps/doc', [
diff --git a/src/core_plugins/kibana/public/kibana.js b/src/core_plugins/kibana/public/kibana.js
index 899438675c1736..a95c455643a544 100644
--- a/src/core_plugins/kibana/public/kibana.js
+++ b/src/core_plugins/kibana/public/kibana.js
@@ -4,7 +4,7 @@
import moment from 'moment-timezone';
import chrome from 'ui/chrome';
import routes from 'ui/routes';
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import 'ui/autoload/all';
import 'plugins/kibana/discover/index';
@@ -48,4 +48,4 @@ chrome
}
});
-modules.get('kibana').run(Notifier.pullMessageFromUrl);
+uiModules.get('kibana').run(Notifier.pullMessageFromUrl);
diff --git a/src/core_plugins/kibana/public/management/index.js b/src/core_plugins/kibana/public/management/index.js
index 9109dd37e2071c..391d70fb9193b2 100644
--- a/src/core_plugins/kibana/public/management/index.js
+++ b/src/core_plugins/kibana/public/management/index.js
@@ -3,7 +3,7 @@ import 'plugins/kibana/management/styles/main.less';
import 'ui/filters/start_from';
import 'ui/field_editor';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import appTemplate from 'plugins/kibana/management/app.html';
import landingTemplate from 'plugins/kibana/management/landing.html';
import { management } from 'ui/management';
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern/create_index_pattern.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern/create_index_pattern.js
index 77e5ee38d18f1e..7785304c85a7b1 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern/create_index_pattern.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern/create_index_pattern.js
@@ -4,7 +4,7 @@ import 'ui/directives/validate_index_name';
import 'ui/directives/auto_select_if_only_one';
import { RefreshKibanaIndex } from '../refresh_kibana_index';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './create_index_pattern.html';
import { getDefaultPatternForInterval } from './get_default_pattern_for_interval';
import { sendCreateIndexPatternRequest } from './send_create_index_pattern_request';
diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js
index 2605f21ae8191d..6b03a7ff0eca07 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js
@@ -8,7 +8,7 @@ import { RefreshKibanaIndex } from '../refresh_kibana_index';
import UrlProvider from 'ui/url';
import { IndicesEditSectionsProvider } from './edit_sections';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './edit_index_pattern.html';
uiRoutes
diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/index_header/index_header.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/index_header/index_header.js
index f24638593f046e..4a4808f36b83ac 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/index_header/index_header.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/index_header/index_header.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './index_header.html';
uiModules
.get('apps/management')
diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/indexed_fields_table.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/indexed_fields_table.js
index 74dbd900405f4a..5218ff2bf67de7 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/indexed_fields_table.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/indexed_fields_table.js
@@ -3,7 +3,7 @@ import 'ui/paginated_table';
import fieldNameHtml from './field_name.html';
import fieldTypeHtml from './field_type.html';
import fieldControlsHtml from '../field_controls.html';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { FieldWildcardProvider } from 'ui/field_wildcard';
import template from './indexed_fields_table.html';
diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.js
index 99aeb7efb119f0..39e91f7a16ffa5 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import 'ui/paginated_table';
import fieldControlsHtml from '../field_controls.html';
import { dateScripts } from './date_scripts';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './scripted_fields_table.html';
uiModules.get('apps/management')
diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/source_filters_table.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/source_filters_table.js
index 53a991e0924275..959ad244a7fddf 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/source_filters_table.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/source_filters_table.js
@@ -1,6 +1,6 @@
import { find, each, escape, invoke, size, without } from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { Notifier } from 'ui/notify/notifier';
import { FieldWildcardProvider } from 'ui/field_wildcard';
diff --git a/src/core_plugins/kibana/public/management/sections/indices/index.js b/src/core_plugins/kibana/public/management/sections/indices/index.js
index 51d996f11234e5..f53024a762411a 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/index.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/index.js
@@ -2,7 +2,7 @@ import { management } from 'ui/management';
import './create_index_pattern';
import './edit_index_pattern';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import indexTemplate from 'plugins/kibana/management/sections/indices/index.html';
const indexPatternsResolutions = {
diff --git a/src/core_plugins/kibana/public/management/sections/objects/_objects.js b/src/core_plugins/kibana/public/management/sections/objects/_objects.js
index 987add407d1c40..1a4c83f012e3c9 100644
--- a/src/core_plugins/kibana/public/management/sections/objects/_objects.js
+++ b/src/core_plugins/kibana/public/management/sections/objects/_objects.js
@@ -5,7 +5,7 @@ import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_o
import objectIndexHTML from 'plugins/kibana/management/sections/objects/_objects.html';
import 'ui/directives/file_upload';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiRoutes
.when('/management/kibana/objects', {
diff --git a/src/core_plugins/kibana/public/management/sections/objects/_view.js b/src/core_plugins/kibana/public/management/sections/objects/_view.js
index 961535244d3661..62a33ac05f1a95 100644
--- a/src/core_plugins/kibana/public/management/sections/objects/_view.js
+++ b/src/core_plugins/kibana/public/management/sections/objects/_view.js
@@ -5,7 +5,7 @@ import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_o
import objectViewHTML from 'plugins/kibana/management/sections/objects/_view.html';
import { IndexPatternsCastMappingTypeProvider } from 'ui/index_patterns/_cast_mapping_type';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiRoutes
.when('/management/kibana/objects/:service/:id', {
diff --git a/src/core_plugins/kibana/public/management/sections/objects/index.js b/src/core_plugins/kibana/public/management/sections/objects/index.js
index f99047a73d3b57..8edc4df15971cc 100644
--- a/src/core_plugins/kibana/public/management/sections/objects/index.js
+++ b/src/core_plugins/kibana/public/management/sections/objects/index.js
@@ -3,7 +3,7 @@ import 'plugins/kibana/management/sections/objects/_view';
import 'plugins/kibana/management/sections/objects/_objects';
import 'ace';
import 'ui/directives/confirm_click';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
// add the module deps to this module
uiModules.get('apps/management');
diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_row.js b/src/core_plugins/kibana/public/management/sections/settings/advanced_row.js
index e079f74053c919..338c1d4f50ef0b 100644
--- a/src/core_plugins/kibana/public/management/sections/settings/advanced_row.js
+++ b/src/core_plugins/kibana/public/management/sections/settings/advanced_row.js
@@ -1,6 +1,6 @@
import 'ui/elastic_textarea';
import 'ui/filters/markdown';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import advancedRowTemplate from 'plugins/kibana/management/sections/settings/advanced_row.html';
uiModules.get('apps/management')
diff --git a/src/core_plugins/kibana/public/management/sections/settings/index.js b/src/core_plugins/kibana/public/management/sections/settings/index.js
index 1da2245f85cbac..ddc721841a8744 100644
--- a/src/core_plugins/kibana/public/management/sections/settings/index.js
+++ b/src/core_plugins/kibana/public/management/sections/settings/index.js
@@ -3,7 +3,7 @@ import { toEditableConfig } from 'plugins/kibana/management/sections/settings/li
import 'plugins/kibana/management/sections/settings/advanced_row';
import { management } from 'ui/management';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import indexTemplate from 'plugins/kibana/management/sections/settings/index.html';
uiRoutes
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg.js b/src/core_plugins/kibana/public/visualize/editor/agg.js
index 42c84c37d1c83f..cd5edf85755569 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg.js
@@ -1,7 +1,7 @@
import 'plugins/kibana/visualize/editor/agg_params';
import 'plugins/kibana/visualize/editor/agg_add';
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import aggTemplate from 'plugins/kibana/visualize/editor/agg.html';
uiModules
.get('app/visualize')
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_add.js b/src/core_plugins/kibana/public/visualize/editor/agg_add.js
index 033725a096c417..ca04d4f213e2bd 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg_add.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg_add.js
@@ -1,5 +1,5 @@
import { VisAggConfigProvider } from 'ui/vis/agg_config';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import aggAddTemplate from 'plugins/kibana/visualize/editor/agg_add.html';
uiModules
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_filter.js b/src/core_plugins/kibana/public/visualize/editor/agg_filter.js
index ca2cdf36b6d0d0..537a9f474b0f04 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg_filter.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg_filter.js
@@ -1,5 +1,5 @@
import { propFilter } from 'ui/filters/_prop_filter';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_group.js b/src/core_plugins/kibana/public/visualize/editor/agg_group.js
index 5c7e7b881d80d2..a845e181710ecf 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg_group.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg_group.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import 'plugins/kibana/visualize/editor/agg';
import 'plugins/kibana/visualize/editor/agg_add';
import 'plugins/kibana/visualize/editor/nesting_indicator';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import aggGroupTemplate from 'plugins/kibana/visualize/editor/agg_group.html';
uiModules
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_param.js b/src/core_plugins/kibana/public/visualize/editor/agg_param.js
index 9030b9a249ed45..650bfb7774a0a0 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg_param.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg_param.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('app/visualize')
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_params.js b/src/core_plugins/kibana/public/visualize/editor/agg_params.js
index ab9ab02d1de02b..3b87ac96c4509e 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg_params.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg_params.js
@@ -4,7 +4,7 @@ import advancedToggleHtml from 'plugins/kibana/visualize/editor/advanced_toggle.
import 'ui/filters/match_any';
import 'plugins/kibana/visualize/editor/agg_param';
import { AggTypesIndexProvider } from 'ui/agg_types/index';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import aggParamsTemplate from 'plugins/kibana/visualize/editor/agg_params.html';
uiModules
diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
index 3219f0f715a3b5..8ea39785aa9355 100644
--- a/src/core_plugins/kibana/public/visualize/editor/editor.js
+++ b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -15,7 +15,7 @@ import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
import { FilterBarClickHandlerProvider } from 'ui/filter_bar/filter_bar_click_handler';
import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import editorTemplate from 'plugins/kibana/visualize/editor/editor.html';
import { DashboardConstants } from 'plugins/kibana/dashboard/dashboard_constants';
import { VisualizeConstants } from '../visualize_constants';
diff --git a/src/core_plugins/kibana/public/visualize/editor/nesting_indicator.js b/src/core_plugins/kibana/public/visualize/editor/nesting_indicator.js
index 2f33660add983f..f9a6420f4cef53 100644
--- a/src/core_plugins/kibana/public/visualize/editor/nesting_indicator.js
+++ b/src/core_plugins/kibana/public/visualize/editor/nesting_indicator.js
@@ -1,6 +1,6 @@
import $ from 'jquery';
import { createColorPalette } from 'ui/vis/components/color/color_palette';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/core_plugins/kibana/public/visualize/editor/sidebar.js b/src/core_plugins/kibana/public/visualize/editor/sidebar.js
index 7ee69830100a6f..73f98224d6c92e 100644
--- a/src/core_plugins/kibana/public/visualize/editor/sidebar.js
+++ b/src/core_plugins/kibana/public/visualize/editor/sidebar.js
@@ -1,6 +1,6 @@
import 'plugins/kibana/visualize/editor/agg_group';
import 'plugins/kibana/visualize/editor/vis_options';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import sidebarTemplate from 'plugins/kibana/visualize/editor/sidebar.html';
uiModules
.get('app/visualize')
diff --git a/src/core_plugins/kibana/public/visualize/editor/vis_options.js b/src/core_plugins/kibana/public/visualize/editor/vis_options.js
index 53b0e823923197..607eaf60fcfe18 100644
--- a/src/core_plugins/kibana/public/visualize/editor/vis_options.js
+++ b/src/core_plugins/kibana/public/visualize/editor/vis_options.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import visOptionsTemplate from 'plugins/kibana/visualize/editor/vis_options.html';
uiModules
diff --git a/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
index 88987d3966fe93..9ba5ef4375a80c 100644
--- a/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
+++ b/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
@@ -8,7 +8,7 @@
import _ from 'lodash';
import { VisProvider } from 'ui/vis';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('app/visualize')
diff --git a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
index 3c85b1a8143331..e09e70350ebde8 100644
--- a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
+++ b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
@@ -1,6 +1,6 @@
import 'plugins/kibana/visualize/saved_visualizations/_saved_vis';
import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { SavedObjectLoader } from 'ui/courier/saved_object/saved_object_loader';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
diff --git a/src/core_plugins/kibana/public/visualize/wizard/wizard.js b/src/core_plugins/kibana/public/visualize/wizard/wizard.js
index e367a306b51b54..776b1174b53ca0 100644
--- a/src/core_plugins/kibana/public/visualize/wizard/wizard.js
+++ b/src/core_plugins/kibana/public/visualize/wizard/wizard.js
@@ -10,7 +10,7 @@ import { DashboardConstants } from 'plugins/kibana/dashboard/dashboard_constants
import { VisualizeConstants } from '../visualize_constants';
import routes from 'ui/routes';
import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import visualizeWizardStep1Template from './step_1.html';
import visualizeWizardStep2Template from './step_2.html';
diff --git a/src/core_plugins/markdown_vis/public/markdown_vis_controller.js b/src/core_plugins/markdown_vis/public/markdown_vis_controller.js
index 69138336405407..0a37e4c30d5f5b 100644
--- a/src/core_plugins/markdown_vis/public/markdown_vis_controller.js
+++ b/src/core_plugins/markdown_vis/public/markdown_vis_controller.js
@@ -1,5 +1,5 @@
import marked from 'marked';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import 'angular-sanitize';
marked.setOptions({
diff --git a/src/core_plugins/metric_vis/public/metric_vis_controller.js b/src/core_plugins/metric_vis/public/metric_vis_controller.js
index 94a425298890f5..2f98c3f9ae20f3 100644
--- a/src/core_plugins/metric_vis/public/metric_vis_controller.js
+++ b/src/core_plugins/metric_vis/public/metric_vis_controller.js
@@ -1,5 +1,5 @@
import { AggResponseTabifyProvider } from 'ui/agg_response/tabify/tabify';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
// get the kibana/metric_vis module, and make sure that it requires the "kibana" module if it
// didn't already
const module = uiModules.get('kibana/metric_vis', ['kibana']);
diff --git a/src/core_plugins/metrics/public/directives/vis_editor.js b/src/core_plugins/metrics/public/directives/vis_editor.js
index b712220505e804..429e2e9721d354 100644
--- a/src/core_plugins/metrics/public/directives/vis_editor.js
+++ b/src/core_plugins/metrics/public/directives/vis_editor.js
@@ -1,11 +1,11 @@
import React from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import VisEditor from '../components/vis_editor';
import addScope from '../lib/add_scope';
import angular from 'angular';
import createBrushHandler from '../lib/create_brush_handler';
-const app = modules.get('apps/metrics/directives');
+const app = uiModules.get('apps/metrics/directives');
app.directive('metricsVisEditor', (timefilter) => {
return {
restrict: 'E',
diff --git a/src/core_plugins/metrics/public/directives/visualization.js b/src/core_plugins/metrics/public/directives/visualization.js
index 75c8214eb4b7a6..a0e7630f710ba2 100644
--- a/src/core_plugins/metrics/public/directives/visualization.js
+++ b/src/core_plugins/metrics/public/directives/visualization.js
@@ -4,9 +4,10 @@ import React from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
import Visualization from '../components/visualization';
import addScope from '../lib/add_scope';
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import createBrushHandler from '../lib/create_brush_handler';
-const app = modules.get('apps/metrics/directives');
+
+const app = uiModules.get('apps/metrics/directives');
app.directive('metricsVisualization', (timefilter, $timeout) => {
return {
restrict: 'E',
diff --git a/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js b/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js
index 8a71b4252f6db3..9c775bcc256d33 100644
--- a/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js
+++ b/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js
@@ -1,4 +1,4 @@
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import '../services/executor';
import createNewPanel from '../lib/create_new_panel';
import '../directives/vis_editor';
@@ -6,7 +6,7 @@ import _ from 'lodash';
import angular from 'angular';
import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
-const app = modules.get('kibana/metrics_vis', ['kibana']);
+const app = uiModules.get('kibana/metrics_vis', ['kibana']);
app.controller('MetricsEditorController', (
$location,
$element,
diff --git a/src/core_plugins/metrics/public/kbn_vis_types/vis_controller.js b/src/core_plugins/metrics/public/kbn_vis_types/vis_controller.js
index 4c57bb3e982d47..dff2b669c6daf4 100644
--- a/src/core_plugins/metrics/public/kbn_vis_types/vis_controller.js
+++ b/src/core_plugins/metrics/public/kbn_vis_types/vis_controller.js
@@ -1,9 +1,9 @@
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import 'ui/state_management/app_state';
import '../directives/visualization';
import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
-const app = modules.get('kibana/metrics_vis');
+const app = uiModules.get('kibana/metrics_vis');
app.controller('MetricsVisController', (
$scope,
diff --git a/src/core_plugins/metrics/public/services/executor.js b/src/core_plugins/metrics/public/services/executor.js
index 98b5e06586e6e9..d42004c83efc03 100644
--- a/src/core_plugins/metrics/public/services/executor.js
+++ b/src/core_plugins/metrics/public/services/executor.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import executorProvider from './executor_provider';
const uiModule = uiModules.get('kibana/metrics_vis/executor', []);
uiModule.service('metricsExecutor', executorProvider);
diff --git a/src/core_plugins/status_page/public/status_page.js b/src/core_plugins/status_page/public/status_page.js
index 129374b824f4b7..413208065a5cd2 100644
--- a/src/core_plugins/status_page/public/status_page.js
+++ b/src/core_plugins/status_page/public/status_page.js
@@ -3,7 +3,7 @@ import { notify } from 'ui/notify';
import 'ui/autoload/styles';
import 'plugins/status_page/status_page_metric';
import 'plugins/status_page/status_page.less';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const chrome = require('ui/chrome')
diff --git a/src/core_plugins/status_page/public/status_page_metric.js b/src/core_plugins/status_page/public/status_page_metric.js
index ea28a5b5d7b754..172382cab85f0e 100644
--- a/src/core_plugins/status_page/public/status_page_metric.js
+++ b/src/core_plugins/status_page/public/status_page_metric.js
@@ -1,5 +1,5 @@
import formatNumber from './lib/format_number';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import statusPageMetricTemplate from 'plugins/status_page/status_page_metric.html';
uiModules
diff --git a/src/core_plugins/table_vis/public/table_vis_controller.js b/src/core_plugins/table_vis/public/table_vis_controller.js
index f65790653a5ab5..8620a3712e4346 100644
--- a/src/core_plugins/table_vis/public/table_vis_controller.js
+++ b/src/core_plugins/table_vis/public/table_vis_controller.js
@@ -1,5 +1,5 @@
import { AggResponseTabifyProvider } from 'ui/agg_response/tabify/tabify';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { assign } from 'lodash';
// get the kibana/table_vis module, and make sure that it requires the "kibana" module if it
diff --git a/src/core_plugins/table_vis/public/table_vis_params.js b/src/core_plugins/table_vis/public/table_vis_params.js
index 54f5d44e01ba29..dab8ad34f76df5 100644
--- a/src/core_plugins/table_vis/public/table_vis_params.js
+++ b/src/core_plugins/table_vis/public/table_vis_params.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import tableVisParamsTemplate from 'plugins/table_vis/table_vis_params.html';
uiModules.get('kibana/table_vis')
diff --git a/src/core_plugins/tagcloud/public/tag_cloud_controller.js b/src/core_plugins/tagcloud/public/tag_cloud_controller.js
index 565b04a4f368b7..fe4de66c3b7d8d 100644
--- a/src/core_plugins/tagcloud/public/tag_cloud_controller.js
+++ b/src/core_plugins/tagcloud/public/tag_cloud_controller.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import TagCloud from 'plugins/tagcloud/tag_cloud';
import AggConfigResult from 'ui/vis/agg_config_result';
import { FilterBarClickHandlerProvider } from 'ui/filter_bar/filter_bar_click_handler';
diff --git a/src/core_plugins/tagcloud/public/tag_cloud_vis_params.js b/src/core_plugins/tagcloud/public/tag_cloud_vis_params.js
index 582e61a3bab37a..f10c0b6100c466 100644
--- a/src/core_plugins/tagcloud/public/tag_cloud_vis_params.js
+++ b/src/core_plugins/tagcloud/public/tag_cloud_vis_params.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import tagCloudVisParamsTemplate from 'plugins/tagcloud/tag_cloud_vis_params.html';
import noUiSlider from 'no-ui-slider';
import 'no-ui-slider/css/nouislider.css';
diff --git a/src/core_plugins/timelion/public/app.js b/src/core_plugins/timelion/public/app.js
index 70b411dacac58d..29c95a630bb61d 100644
--- a/src/core_plugins/timelion/public/app.js
+++ b/src/core_plugins/timelion/public/app.js
@@ -3,6 +3,7 @@ import moment from 'moment-timezone';
import { DocTitleProvider } from 'ui/doc_title';
import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+import { notify } from 'ui/notify';
require('plugins/timelion/directives/cells/cells');
require('plugins/timelion/directives/fullscreen/fullscreen');
@@ -28,8 +29,7 @@ require('./vis');
SavedObjectRegistryProvider.register(require('plugins/timelion/services/saved_sheet_register'));
-// TODO: Expose an api for dismissing notifications
-const unsafeNotifications = require('ui/notify').default._notifs;
+const unsafeNotifications = notify._notifs;
require('ui/routes').enable();
diff --git a/src/core_plugins/timelion/public/services/_saved_sheet.js b/src/core_plugins/timelion/public/services/_saved_sheet.js
index fd358f17b39be7..89f9691954ac2e 100644
--- a/src/core_plugins/timelion/public/services/_saved_sheet.js
+++ b/src/core_plugins/timelion/public/services/_saved_sheet.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import _ from 'lodash';
const module = uiModules.get('app/timelion');
diff --git a/src/test_utils/no_digest_promises.js b/src/test_utils/no_digest_promises.js
index 38a4203ab1b455..98121d640de22b 100644
--- a/src/test_utils/no_digest_promises.js
+++ b/src/test_utils/no_digest_promises.js
@@ -1,6 +1,6 @@
import Bluebird from 'bluebird';
import 'ui/promises';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
Bluebird.longStackTraces();
diff --git a/src/ui/public/.eslintrc b/src/ui/public/.eslintrc
index b7d7d2a31c13d7..cf35c871090171 100644
--- a/src/ui/public/.eslintrc
+++ b/src/ui/public/.eslintrc
@@ -1,2 +1,6 @@
+plugins: [
+ '@elastic/kibana-custom'
+]
rules:
no-console: 2
+ kibana-custom/no-default-export: error
diff --git a/src/ui/public/agg_table/agg_table.js b/src/ui/public/agg_table/agg_table.js
index 97fe6532001aae..f511451facd0e1 100644
--- a/src/ui/public/agg_table/agg_table.js
+++ b/src/ui/public/agg_table/agg_table.js
@@ -2,7 +2,7 @@ import 'ui/paginated_table';
import 'ui/compile_recursive_directive';
import 'ui/agg_table/agg_table.less';
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import aggTableTemplate from 'ui/agg_table/agg_table.html';
import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
diff --git a/src/ui/public/agg_table/agg_table_group.js b/src/ui/public/agg_table/agg_table_group.js
index cff0e1180f9517..bf33b25d007a0b 100644
--- a/src/ui/public/agg_table/agg_table_group.js
+++ b/src/ui/public/agg_table/agg_table_group.js
@@ -1,6 +1,6 @@
import 'ui/compile_recursive_directive';
import 'ui/agg_table';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import aggTableGroupTemplate from 'ui/agg_table/agg_table_group.html';
uiModules
diff --git a/src/ui/public/agg_types/index.js b/src/ui/public/agg_types/index.js
index b898d9a8433dd8..4603aa3187a917 100644
--- a/src/ui/public/agg_types/index.js
+++ b/src/ui/public/agg_types/index.js
@@ -99,6 +99,3 @@ export function AggTypesIndexProvider(Private) {
});
}
-export default AggTypesIndexProvider;
-
-// preload
diff --git a/src/ui/public/bind/bind.js b/src/ui/public/bind/bind.js
index 24ed2c8e6fff67..c12f0429b096bb 100644
--- a/src/ui/public/bind/bind.js
+++ b/src/ui/public/bind/bind.js
@@ -1,5 +1,5 @@
import angular from 'angular';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules.get('kibana')
.config(function ($provide) {
diff --git a/src/ui/public/chrome/api/angular.js b/src/ui/public/chrome/api/angular.js
index d1910de899f031..6e7180c16e0bdf 100644
--- a/src/ui/public/chrome/api/angular.js
+++ b/src/ui/public/chrome/api/angular.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import { format as formatUrl, parse as parseUrl } from 'url';
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { Notifier } from 'ui/notify/notifier';
import { UrlOverflowServiceProvider } from '../../error_url_overflow';
@@ -14,7 +14,7 @@ export function initAngularApi(chrome, internals) {
chrome.getBreadcrumbs = _.noop;
chrome.setupAngular = function () {
- const kibana = modules.get('kibana');
+ const kibana = uiModules.get('kibana');
_.forOwn(chrome.getInjected(), function (val, name) {
kibana.value(name, val);
@@ -100,7 +100,7 @@ export function initAngularApi(chrome, internals) {
directivesProvider(chrome, internals);
- modules.link(kibana);
+ uiModules.link(kibana);
};
}
diff --git a/src/ui/public/chrome/directives/append_nav_controls.js b/src/ui/public/chrome/directives/append_nav_controls.js
index c086cbe9a46b1d..12fe0ad6cb688e 100644
--- a/src/ui/public/chrome/directives/append_nav_controls.js
+++ b/src/ui/public/chrome/directives/append_nav_controls.js
@@ -1,9 +1,9 @@
import { chromeNavControlsRegistry } from 'ui/registry/chrome_nav_controls';
-import UiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
export function kbnAppendChromeNavControls() {
- UiModules
+ uiModules
.get('kibana')
.directive('kbnChromeAppendNavControls', function (Private) {
return {
diff --git a/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js b/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js
index 8eac22a1ebec91..a92d1a1095223a 100644
--- a/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js
+++ b/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js
@@ -1,6 +1,6 @@
import { DomLocationProvider } from 'ui/dom_location';
import { parse } from 'url';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import appSwitcherTemplate from './app_switcher.html';
uiModules
diff --git a/src/ui/public/chrome/directives/global_nav/global_nav.js b/src/ui/public/chrome/directives/global_nav/global_nav.js
index b688982cba5116..7b36d825059a61 100644
--- a/src/ui/public/chrome/directives/global_nav/global_nav.js
+++ b/src/ui/public/chrome/directives/global_nav/global_nav.js
@@ -4,7 +4,7 @@ import './global_nav_link';
import globalNavTemplate from './global_nav.html';
import './global_nav.less';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.js b/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.js
index c8a20668fb5bba..7a2d84df09d7a5 100644
--- a/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.js
+++ b/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.js
@@ -1,7 +1,7 @@
import globalNavLinkTemplate from './global_nav_link.html';
import './global_nav_link.less';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/chrome/directives/kbn_chrome.js b/src/ui/public/chrome/directives/kbn_chrome.js
index e267df8068536c..0c5cbe2e9503ff 100644
--- a/src/ui/public/chrome/directives/kbn_chrome.js
+++ b/src/ui/public/chrome/directives/kbn_chrome.js
@@ -2,17 +2,17 @@ import $ from 'jquery';
import { remove } from 'lodash';
import './kbn_chrome.less';
-import UiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { isSystemApiRequest } from 'ui/system_api';
import {
getUnhashableStatesProvider,
unhashUrl,
} from 'ui/state_management/state_hashing';
-import Notifier from 'ui/notify';
+import { notify } from 'ui/notify';
export function kbnChromeProvider(chrome, internals) {
- UiModules
+ uiModules
.get('kibana')
.directive('kbnChrome', () => {
return {
@@ -56,7 +56,7 @@ export function kbnChromeProvider(chrome, internals) {
// and some local values
chrome.httpActive = $http.pendingRequests;
- $scope.notifList = Notifier._notifs;
+ $scope.notifList = notify._notifs;
return chrome;
}
diff --git a/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js b/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js
index 8ecdb079d260dc..e1c41ab4f0c579 100644
--- a/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js
+++ b/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js
@@ -1,8 +1,8 @@
-import UiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './loading_indicator.html';
import './loading_indicator.less';
-UiModules
+uiModules
.get('ui/kibana')
.directive('kbnLoadingIndicator', function () {
return {
diff --git a/src/ui/public/chrome/services/global_nav_state.js b/src/ui/public/chrome/services/global_nav_state.js
index 16e4d69fa95790..315a7984ec1e25 100644
--- a/src/ui/public/chrome/services/global_nav_state.js
+++ b/src/ui/public/chrome/services/global_nav_state.js
@@ -1,7 +1,7 @@
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
-modules.get('kibana')
+uiModules.get('kibana')
.service('globalNavState', (localStorage, $rootScope) => {
return {
isOpen: () => {
diff --git a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
index fb99712ac49f75..7c88e447221f2a 100644
--- a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
+++ b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
@@ -1,7 +1,7 @@
import 'ui/collapsible_sidebar/collapsible_sidebar.less';
import _ from 'lodash';
import $ from 'jquery';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
diff --git a/src/ui/public/compile_recursive_directive.js b/src/ui/public/compile_recursive_directive.js
index 0ce8b611740f48..2124701e574b0f 100644
--- a/src/ui/public/compile_recursive_directive.js
+++ b/src/ui/public/compile_recursive_directive.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
/**
* Angular can't render directives that render themselves recursively:
diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js
index 887612a8db9153..3fd17770526cd0 100644
--- a/src/ui/public/config/config.js
+++ b/src/ui/public/config/config.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import { cloneDeep, defaultsDeep, isPlainObject } from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { Notifier } from 'ui/notify/notifier';
import { ConfigDelayedUpdaterProvider } from 'ui/config/_delayed_updater';
const module = uiModules.get('kibana/config');
diff --git a/src/ui/public/courier/courier.js b/src/ui/public/courier/courier.js
index 293a2ce0235b71..390c567b4a2163 100644
--- a/src/ui/public/courier/courier.js
+++ b/src/ui/public/courier/courier.js
@@ -3,7 +3,7 @@ import _ from 'lodash';
import 'ui/es';
import 'ui/promises';
import 'ui/index_patterns';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { Notifier } from 'ui/notify/notifier';
import { DocSourceProvider } from './data_source/doc_source';
diff --git a/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js b/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js
index 5d159fbf234a6c..ee7fc1ee849605 100644
--- a/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js
+++ b/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import saveObjectSaveAsCheckboxTemplate from './saved_object_save_as_checkbox.html';
uiModules
diff --git a/src/ui/public/debounce/debounce.js b/src/ui/public/debounce/debounce.js
index d0feee78613ebc..a3afaf43da0d9f 100644
--- a/src/ui/public/debounce/debounce.js
+++ b/src/ui/public/debounce/debounce.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
// Debounce service, angularized version of lodash debounce
// borrowed heavily from https://github.com/shahata/angular-debounce
diff --git a/src/ui/public/directives/auto_select_if_only_one.js b/src/ui/public/directives/auto_select_if_only_one.js
index a9f1628ea565d7..14fedcaa38ae7f 100644
--- a/src/ui/public/directives/auto_select_if_only_one.js
+++ b/src/ui/public/directives/auto_select_if_only_one.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.directive('autoSelectIfOnlyOne', function () {
diff --git a/src/ui/public/directives/click_focus.js b/src/ui/public/directives/click_focus.js
index 1c84249a131af1..50d9ec5bf3070f 100644
--- a/src/ui/public/directives/click_focus.js
+++ b/src/ui/public/directives/click_focus.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import $ from 'jquery';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.directive('clickFocus', function () {
diff --git a/src/ui/public/directives/confirm_click.js b/src/ui/public/directives/confirm_click.js
index 86c8d7c39808a8..d8bcd501c9f890 100644
--- a/src/ui/public/directives/confirm_click.js
+++ b/src/ui/public/directives/confirm_click.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
.directive('confirmClick', function ($window) {
diff --git a/src/ui/public/directives/css_truncate.js b/src/ui/public/directives/css_truncate.js
index 37d03a374a8548..98b7b521635659 100644
--- a/src/ui/public/directives/css_truncate.js
+++ b/src/ui/public/directives/css_truncate.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.directive('cssTruncate', function () {
diff --git a/src/ui/public/directives/field_name.js b/src/ui/public/directives/field_name.js
index 2a1837f610b2e6..3274cf0d30e619 100644
--- a/src/ui/public/directives/field_name.js
+++ b/src/ui/public/directives/field_name.js
@@ -1,6 +1,6 @@
import $ from 'jquery';
import 'ui/filters/short_dots';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.directive('fieldName', function ($compile, $rootScope, $filter) {
diff --git a/src/ui/public/directives/file_upload.js b/src/ui/public/directives/file_upload.js
index 98a3db61cf3903..c6a9676b0b9c9e 100644
--- a/src/ui/public/directives/file_upload.js
+++ b/src/ui/public/directives/file_upload.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import $ from 'jquery';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
const html = '';
diff --git a/src/ui/public/directives/inequality.js b/src/ui/public/directives/inequality.js
index 372cf5f5d2bc3c..7e574347f5d653 100644
--- a/src/ui/public/directives/inequality.js
+++ b/src/ui/public/directives/inequality.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
function makeDirectiveDef(id, compare) {
return function ($parse) {
diff --git a/src/ui/public/directives/infinite_scroll.js b/src/ui/public/directives/infinite_scroll.js
index a78fbb96f36328..479c996bfd3aca 100644
--- a/src/ui/public/directives/infinite_scroll.js
+++ b/src/ui/public/directives/infinite_scroll.js
@@ -1,5 +1,5 @@
import $ from 'jquery';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.directive('kbnInfiniteScroll', function () {
diff --git a/src/ui/public/directives/info.js b/src/ui/public/directives/info.js
index c856b34fa7b4b3..ee0ccbf1eb0ef4 100644
--- a/src/ui/public/directives/info.js
+++ b/src/ui/public/directives/info.js
@@ -1,5 +1,5 @@
import html from 'ui/partials/info.html';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/directives/input_datetime.js b/src/ui/public/directives/input_datetime.js
index 53c2f21dca72fb..82448ab182d308 100644
--- a/src/ui/public/directives/input_datetime.js
+++ b/src/ui/public/directives/input_datetime.js
@@ -1,5 +1,5 @@
import moment from 'moment';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.directive('inputDatetime', function () {
diff --git a/src/ui/public/directives/input_focus.js b/src/ui/public/directives/input_focus.js
index ce904b459e0f11..d94c0814e0c698 100644
--- a/src/ui/public/directives/input_focus.js
+++ b/src/ui/public/directives/input_focus.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.directive('inputFocus', function ($timeout) {
diff --git a/src/ui/public/directives/input_number.js b/src/ui/public/directives/input_number.js
index d7b3b79794d7e9..29ce612db3c9d3 100644
--- a/src/ui/public/directives/input_number.js
+++ b/src/ui/public/directives/input_number.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.directive('inputNumber', function () {
diff --git a/src/ui/public/directives/json_input.js b/src/ui/public/directives/json_input.js
index 35066233018b81..49a93505949a19 100644
--- a/src/ui/public/directives/json_input.js
+++ b/src/ui/public/directives/json_input.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import angular from 'angular';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/directives/kbn_href.js b/src/ui/public/directives/kbn_href.js
index 9b05fe4701a7e7..4cc2abde174d95 100644
--- a/src/ui/public/directives/kbn_href.js
+++ b/src/ui/public/directives/kbn_href.js
@@ -1,10 +1,10 @@
-import UiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { words, kebabCase } from 'lodash';
export function kbnUrlDirective(name) {
const attr = kebabCase(words(name).slice(1));
- UiModules
+ uiModules
.get('kibana')
.directive(name, function (Private, chrome) {
return {
diff --git a/src/ui/public/directives/paginate.js b/src/ui/public/directives/paginate.js
index 3f661bba3ac10f..8140b17d2b380b 100644
--- a/src/ui/public/directives/paginate.js
+++ b/src/ui/public/directives/paginate.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import paginateControlsTemplate from 'ui/partials/paginate_controls.html';
uiModules.get('kibana')
diff --git a/src/ui/public/directives/paginated_selectable_list.js b/src/ui/public/directives/paginated_selectable_list.js
index 207c68300c3306..53822840248707 100644
--- a/src/ui/public/directives/paginated_selectable_list.js
+++ b/src/ui/public/directives/paginated_selectable_list.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import paginatedSelectableListTemplate from 'ui/partials/paginated_selectable_list.html';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/pretty_duration.js b/src/ui/public/directives/pretty_duration.js
index 7c0bb5563ddf84..c8f57257023832 100644
--- a/src/ui/public/directives/pretty_duration.js
+++ b/src/ui/public/directives/pretty_duration.js
@@ -3,7 +3,7 @@ import dateMath from '@elastic/datemath';
import moment from 'moment';
import 'ui/timepicker/quick_ranges';
import 'ui/timepicker/time_units';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/render_counter.js b/src/ui/public/directives/render_counter.js
index 0a2ec78574f992..0c2e571b997783 100644
--- a/src/ui/public/directives/render_counter.js
+++ b/src/ui/public/directives/render_counter.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/directives/rows.js b/src/ui/public/directives/rows.js
index 933e95e0116987..11e1e143f41802 100644
--- a/src/ui/public/directives/rows.js
+++ b/src/ui/public/directives/rows.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
import _ from 'lodash';
import AggConfigResult from 'ui/vis/agg_config_result';
import { FilterBarClickHandlerProvider } from 'ui/filter_bar/filter_bar_click_handler';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import tableCellFilterHtml from './partials/table_cell_filter.html';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/saved_object_finder.js b/src/ui/public/directives/saved_object_finder.js
index 38228e9d8d284f..3114aa7bba6292 100644
--- a/src/ui/public/directives/saved_object_finder.js
+++ b/src/ui/public/directives/saved_object_finder.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import rison from 'rison-node';
import { keyMap } from 'ui/utils/key_map';
import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import savedObjectFinderTemplate from 'ui/partials/saved_object_finder.html';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/truncated.js b/src/ui/public/directives/truncated.js
index 75ac91c969d3d9..d2fae2739ca022 100644
--- a/src/ui/public/directives/truncated.js
+++ b/src/ui/public/directives/truncated.js
@@ -1,6 +1,6 @@
import truncText from 'trunc-text';
import truncHTML from 'trunc-html';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import truncatedTemplate from 'ui/directives/partials/truncated.html';
import 'angular-sanitize';
diff --git a/src/ui/public/directives/validate_cidr_mask.js b/src/ui/public/directives/validate_cidr_mask.js
index c7d48baf21e965..b40fba00d95355 100644
--- a/src/ui/public/directives/validate_cidr_mask.js
+++ b/src/ui/public/directives/validate_cidr_mask.js
@@ -1,5 +1,5 @@
import { CidrMask } from 'ui/utils/cidr_mask';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules.get('kibana').directive('validateCidrMask', function () {
return {
diff --git a/src/ui/public/directives/validate_date_math.js b/src/ui/public/directives/validate_date_math.js
index ded809c8ac7237..f63ed51904bd20 100644
--- a/src/ui/public/directives/validate_date_math.js
+++ b/src/ui/public/directives/validate_date_math.js
@@ -1,5 +1,5 @@
import dateMath from '@elastic/datemath';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules.get('kibana').directive('validateDateMath', function () {
return {
diff --git a/src/ui/public/directives/validate_index_name.js b/src/ui/public/directives/validate_index_name.js
index 8bc697ad7e5754..9d727885f5272b 100644
--- a/src/ui/public/directives/validate_index_name.js
+++ b/src/ui/public/directives/validate_index_name.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
// See https://github.com/elastic/elasticsearch/issues/6736
uiModules
diff --git a/src/ui/public/directives/validate_ip.js b/src/ui/public/directives/validate_ip.js
index 2dcd7772e099c5..7b11574e291d22 100644
--- a/src/ui/public/directives/validate_ip.js
+++ b/src/ui/public/directives/validate_ip.js
@@ -1,5 +1,5 @@
import Ipv4Address from 'ui/utils/ipv4_address';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/directives/validate_json.js b/src/ui/public/directives/validate_json.js
index 99938c5f6f88ad..e692c60b0c8476 100644
--- a/src/ui/public/directives/validate_json.js
+++ b/src/ui/public/directives/validate_json.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/validate_lowercase.js b/src/ui/public/directives/validate_lowercase.js
index fb37841ee6319f..5c072b1760eeca 100644
--- a/src/ui/public/directives/validate_lowercase.js
+++ b/src/ui/public/directives/validate_lowercase.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/doc_table/components/table_header.js b/src/ui/public/doc_table/components/table_header.js
index b71fab4edf3a69..e8cea37c7c1955 100644
--- a/src/ui/public/doc_table/components/table_header.js
+++ b/src/ui/public/doc_table/components/table_header.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import 'ui/filters/short_dots';
import headerHtml from 'ui/doc_table/components/table_header.html';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('app/discover');
diff --git a/src/ui/public/doc_table/components/table_row.js b/src/ui/public/doc_table/components/table_row.js
index f24fdc4ac10837..f474e35011adad 100644
--- a/src/ui/public/doc_table/components/table_row.js
+++ b/src/ui/public/doc_table/components/table_row.js
@@ -10,7 +10,7 @@ import './table_row.less';
import { noWhiteSpace } from 'ui/utils/no_white_space';
import openRowHtml from 'ui/doc_table/components/table_row/open.html';
import detailsHtml from 'ui/doc_table/components/table_row/details.html';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('app/discover');
diff --git a/src/ui/public/doc_table/doc_table.js b/src/ui/public/doc_table/doc_table.js
index 3475f7a9bb58b1..98589f5aa90696 100644
--- a/src/ui/public/doc_table/doc_table.js
+++ b/src/ui/public/doc_table/doc_table.js
@@ -6,7 +6,7 @@ import 'ui/directives/truncated';
import 'ui/directives/infinite_scroll';
import 'ui/doc_table/components/table_header';
import 'ui/doc_table/components/table_row';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { getLimitedSearchResultsMessage } from './doc_table_strings';
diff --git a/src/ui/public/doc_title/doc_title.js b/src/ui/public/doc_title/doc_title.js
index d82788a8875f50..18d41599f52ec0 100644
--- a/src/ui/public/doc_title/doc_title.js
+++ b/src/ui/public/doc_title/doc_title.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules.get('kibana')
.run(function ($rootScope, docTitle) {
@@ -43,5 +43,3 @@ export function DocTitleProvider(docTitle) {
return docTitle;
}
-// Default export used in x-pack. TODO: cleanup.
-export default DocTitleProvider;
diff --git a/src/ui/public/doc_viewer/doc_viewer.js b/src/ui/public/doc_viewer/doc_viewer.js
index fc204d122176b6..cb0283028f2c0f 100644
--- a/src/ui/public/doc_viewer/doc_viewer.js
+++ b/src/ui/public/doc_viewer/doc_viewer.js
@@ -1,5 +1,5 @@
import $ from 'jquery';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { DocViewsRegistryProvider } from 'ui/registry/doc_views';
import 'ui/render_directive';
diff --git a/src/ui/public/draggable/draggable_container.js b/src/ui/public/draggable/draggable_container.js
index 194ce9df39fdf5..f3dcd15b7aef64 100644
--- a/src/ui/public/draggable/draggable_container.js
+++ b/src/ui/public/draggable/draggable_container.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import dragula from 'dragula';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/draggable/draggable_handle.js b/src/ui/public/draggable/draggable_handle.js
index db7fda67bcf11d..6a291a57fd59f7 100644
--- a/src/ui/public/draggable/draggable_handle.js
+++ b/src/ui/public/draggable/draggable_handle.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/draggable/draggable_item.js b/src/ui/public/draggable/draggable_item.js
index 2c11c3b3154552..0c76257b23aca3 100644
--- a/src/ui/public/draggable/draggable_item.js
+++ b/src/ui/public/draggable/draggable_item.js
@@ -1,5 +1,5 @@
import $ from 'jquery';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/elastic_textarea.js b/src/ui/public/elastic_textarea.js
index efc3c87b7b10bd..e4937ce3b64331 100644
--- a/src/ui/public/elastic_textarea.js
+++ b/src/ui/public/elastic_textarea.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const NL_RE = /\n/g;
const events = 'keydown keypress keyup change';
diff --git a/src/ui/public/es.js b/src/ui/public/es.js
index 7bab5006cc1e52..c2a427c01cbfab 100644
--- a/src/ui/public/es.js
+++ b/src/ui/public/es.js
@@ -7,7 +7,7 @@
import 'elasticsearch-browser';
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const plugins = [function (Client, config) {
// esFactory automatically injects the AngularConnector to the config
diff --git a/src/ui/public/fancy_forms/fancy_forms.js b/src/ui/public/fancy_forms/fancy_forms.js
index 72c598fabbb7a7..a5e5d067af30d7 100644
--- a/src/ui/public/fancy_forms/fancy_forms.js
+++ b/src/ui/public/fancy_forms/fancy_forms.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import { KbnFormController } from 'ui/fancy_forms/kbn_form_controller';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
diff --git a/src/ui/public/field_editor/field_editor.js b/src/ui/public/field_editor/field_editor.js
index 1aebc4fc995d8c..da48d63de95111 100644
--- a/src/ui/public/field_editor/field_editor.js
+++ b/src/ui/public/field_editor/field_editor.js
@@ -4,7 +4,7 @@ import 'angular-bootstrap-colorpicker/css/colorpicker.css';
import _ from 'lodash';
import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
import { IndexPatternsFieldProvider } from 'ui/index_patterns/_field';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import fieldEditorTemplate from 'ui/field_editor/field_editor.html';
import { IndexPatternsCastMappingTypeProvider } from 'ui/index_patterns/_cast_mapping_type';
import { scriptedFields as docLinks } from '../documentation_links/documentation_links';
diff --git a/src/ui/public/field_format_editor/field_format_editor.js b/src/ui/public/field_format_editor/field_format_editor.js
index 85092ba9c6fe3a..d5ffa7e6c92a44 100644
--- a/src/ui/public/field_format_editor/field_format_editor.js
+++ b/src/ui/public/field_format_editor/field_format_editor.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import $ from 'jquery';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('app/management')
diff --git a/src/ui/public/field_format_editor/numeral/numeral.js b/src/ui/public/field_format_editor/numeral/numeral.js
index 355822e8686f72..7b555e933b9a5e 100644
--- a/src/ui/public/field_format_editor/numeral/numeral.js
+++ b/src/ui/public/field_format_editor/numeral/numeral.js
@@ -1,5 +1,5 @@
import 'ui/field_format_editor/pattern/pattern';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import numeralTemplate from 'ui/field_format_editor/numeral/numeral.html';
uiModules
diff --git a/src/ui/public/field_format_editor/pattern/pattern.js b/src/ui/public/field_format_editor/pattern/pattern.js
index 5e493c9a6807c4..8682a8166f4c68 100644
--- a/src/ui/public/field_format_editor/pattern/pattern.js
+++ b/src/ui/public/field_format_editor/pattern/pattern.js
@@ -1,5 +1,5 @@
import 'ui/field_format_editor/samples/samples';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import patternTemplate from 'ui/field_format_editor/pattern/pattern.html';
uiModules
diff --git a/src/ui/public/field_format_editor/samples/samples.js b/src/ui/public/field_format_editor/samples/samples.js
index a0090bbc0e060f..79893969f106a5 100644
--- a/src/ui/public/field_format_editor/samples/samples.js
+++ b/src/ui/public/field_format_editor/samples/samples.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import samplesTemplate from 'ui/field_format_editor/samples/samples.html';
uiModules
diff --git a/src/ui/public/filter_bar/filter_bar.js b/src/ui/public/filter_bar/filter_bar.js
index 11528edf94ad4e..a0de162c95a2c4 100644
--- a/src/ui/public/filter_bar/filter_bar.js
+++ b/src/ui/public/filter_bar/filter_bar.js
@@ -9,7 +9,7 @@ import { FilterBarLibFilterOutTimeBasedFilterProvider } from 'ui/filter_bar/lib/
import { FilterBarLibChangeTimeFilterProvider } from 'ui/filter_bar/lib/change_time_filter';
import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
import { compareFilters } from './lib/compare_filters';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/filter_bar/filter_bar_click_handler.js b/src/ui/public/filter_bar/filter_bar_click_handler.js
index b21d4b988efed9..f183a6ee878cf0 100644
--- a/src/ui/public/filter_bar/filter_bar_click_handler.js
+++ b/src/ui/public/filter_bar/filter_bar_click_handler.js
@@ -68,5 +68,3 @@ export function FilterBarClickHandlerProvider(Notifier) {
};
}
-// Used in xpack. TODO: remove and cleanup.
-export default FilterBarClickHandlerProvider;
diff --git a/src/ui/public/filter_bar/query_filter.js b/src/ui/public/filter_bar/query_filter.js
index 7b29b34cd78d02..12f67fc445adc7 100644
--- a/src/ui/public/filter_bar/query_filter.js
+++ b/src/ui/public/filter_bar/query_filter.js
@@ -384,4 +384,3 @@ export function FilterBarQueryFilterProvider(Private, $rootScope, getAppState, g
}
}
-export default FilterBarQueryFilterProvider;
diff --git a/src/ui/public/filter_manager/filter_manager.js b/src/ui/public/filter_manager/filter_manager.js
index 2010a4ec275957..677c5193dbe315 100644
--- a/src/ui/public/filter_manager/filter_manager.js
+++ b/src/ui/public/filter_manager/filter_manager.js
@@ -85,5 +85,4 @@ export function FilterManagerProvider(Private) {
return filterManager;
}
-export default FilterManagerProvider;
diff --git a/src/ui/public/filters/comma_list.js b/src/ui/public/filters/comma_list.js
index 2b5943dae3100e..b55f0cbd918e77 100644
--- a/src/ui/public/filters/comma_list.js
+++ b/src/ui/public/filters/comma_list.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/filters/field_type.js b/src/ui/public/filters/field_type.js
index f35462a2183b6a..ede588da6edd72 100644
--- a/src/ui/public/filters/field_type.js
+++ b/src/ui/public/filters/field_type.js
@@ -1,5 +1,5 @@
import { propFilter } from 'ui/filters/_prop_filter';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
// Gets all fields of a given type.
// You may also pass "*" to get all types
// Or an array of types to get all fields of that type
diff --git a/src/ui/public/filters/label.js b/src/ui/public/filters/label.js
index 7c471d96c6e97b..7eb7d7adb042cd 100644
--- a/src/ui/public/filters/label.js
+++ b/src/ui/public/filters/label.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { words, capitalize } from 'lodash';
uiModules
diff --git a/src/ui/public/filters/markdown.js b/src/ui/public/filters/markdown.js
index 210aa4e75f3b79..14d9ff7c4a98aa 100644
--- a/src/ui/public/filters/markdown.js
+++ b/src/ui/public/filters/markdown.js
@@ -1,5 +1,5 @@
import marked from 'marked';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import 'angular-sanitize';
marked.setOptions({
diff --git a/src/ui/public/filters/match_any.js b/src/ui/public/filters/match_any.js
index 5d7ff8329091c7..098c7d372c8c12 100644
--- a/src/ui/public/filters/match_any.js
+++ b/src/ui/public/filters/match_any.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
// Gets all fields of a given type.
// You may also pass "*" to get all types
// Or an array of types to get all fields of that type
diff --git a/src/ui/public/filters/moment.js b/src/ui/public/filters/moment.js
index 4f6d498d8391a8..f90ceb8ba85856 100644
--- a/src/ui/public/filters/moment.js
+++ b/src/ui/public/filters/moment.js
@@ -1,6 +1,6 @@
import moment from 'moment';
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/filters/rison.js b/src/ui/public/filters/rison.js
index 264fef2373a78b..37713991f6fb2b 100644
--- a/src/ui/public/filters/rison.js
+++ b/src/ui/public/filters/rison.js
@@ -1,5 +1,5 @@
import rison from 'rison-node';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.filter('rison', function () {
diff --git a/src/ui/public/filters/short_dots.js b/src/ui/public/filters/short_dots.js
index be6e667ebd7971..ca657c855ee23a 100644
--- a/src/ui/public/filters/short_dots.js
+++ b/src/ui/public/filters/short_dots.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
// Shorts dot notated strings
// eg: foo.bar.baz becomes f.b.baz
// 'foo.bar.baz'.replace(/(.+?\.)/g,function(v) {return v[0]+'.';});
diff --git a/src/ui/public/filters/start_from.js b/src/ui/public/filters/start_from.js
index 92676ea6b0a6ed..044a8c7feaa44d 100644
--- a/src/ui/public/filters/start_from.js
+++ b/src/ui/public/filters/start_from.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
.filter('startFrom', function () {
diff --git a/src/ui/public/filters/trust_as_html.js b/src/ui/public/filters/trust_as_html.js
index 9ad90d604fe3c8..30585c91599395 100644
--- a/src/ui/public/filters/trust_as_html.js
+++ b/src/ui/public/filters/trust_as_html.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
// Simple filter to allow using ng-bind-html without explicitly calling $sce.trustAsHtml in a controller
diff --git a/src/ui/public/filters/unique.js b/src/ui/public/filters/unique.js
index e85087ecb1ba8b..f5dd3382731d0f 100644
--- a/src/ui/public/filters/unique.js
+++ b/src/ui/public/filters/unique.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
// Filters out all duplicate items in an array
uiModules
diff --git a/src/ui/public/filters/uriescape.js b/src/ui/public/filters/uriescape.js
index cf441f0a4d3e65..afbf08444d7e10 100644
--- a/src/ui/public/filters/uriescape.js
+++ b/src/ui/public/filters/uriescape.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
.filter('uriescape', function () {
diff --git a/src/ui/public/fixed_scroll.js b/src/ui/public/fixed_scroll.js
index 5f5676e2f4a5dc..b1815e8642c537 100644
--- a/src/ui/public/fixed_scroll.js
+++ b/src/ui/public/fixed_scroll.js
@@ -1,6 +1,6 @@
import $ from 'jquery';
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const SCROLLER_HEIGHT = 20;
diff --git a/src/ui/public/index_patterns/index_patterns.js b/src/ui/public/index_patterns/index_patterns.js
index 597e2609f3741a..24dd22e0a92a0a 100644
--- a/src/ui/public/index_patterns/index_patterns.js
+++ b/src/ui/public/index_patterns/index_patterns.js
@@ -7,7 +7,7 @@ import { IndexPatternsIntervalsProvider } from 'ui/index_patterns/_intervals';
import { IndexPatternsMapperProvider } from 'ui/index_patterns/_mapper';
import { IndexPatternsPatternToWildcardProvider } from 'ui/index_patterns/_pattern_to_wildcard';
import { RegistryFieldFormatsProvider } from 'ui/registry/field_formats';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana/index_patterns');
export function IndexPatternsProvider(esAdmin, Notifier, Private, Promise, kbnIndex) {
@@ -53,4 +53,3 @@ export function IndexPatternsProvider(esAdmin, Notifier, Private, Promise, kbnIn
module.service('indexPatterns', Private => Private(IndexPatternsProvider));
-export default IndexPatternsProvider;
diff --git a/src/ui/public/kbn_top_nav/bread_crumbs/bread_crumbs.js b/src/ui/public/kbn_top_nav/bread_crumbs/bread_crumbs.js
index eff1ecfa43c800..e264d475be1555 100644
--- a/src/ui/public/kbn_top_nav/bread_crumbs/bread_crumbs.js
+++ b/src/ui/public/kbn_top_nav/bread_crumbs/bread_crumbs.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import chrome from 'ui/chrome/chrome';
import breadCrumbsTemplate from './bread_crumbs.html';
import { getBreadCrumbUrls } from './bread_crumb_urls';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
module.directive('breadCrumbs', function ($location) {
diff --git a/src/ui/public/kbn_top_nav/kbn_top_nav.js b/src/ui/public/kbn_top_nav/kbn_top_nav.js
index 251664f85f69c5..7855d5a2c97419 100644
--- a/src/ui/public/kbn_top_nav/kbn_top_nav.js
+++ b/src/ui/public/kbn_top_nav/kbn_top_nav.js
@@ -37,7 +37,7 @@ import _ from 'lodash';
import angular from 'angular';
import 'ui/watch_multi';
import 'ui/directives/input_focus';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './kbn_top_nav.html';
import { KbnTopNavControllerProvider } from './kbn_top_nav_controller';
import { NavBarExtensionsRegistryProvider } from 'ui/registry/navbar_extensions';
diff --git a/src/ui/public/listen/listen.js b/src/ui/public/listen/listen.js
index 93d681d9a71568..09ed8c8a80c1b6 100644
--- a/src/ui/public/listen/listen.js
+++ b/src/ui/public/listen/listen.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules.get('kibana')
.run(function ($rootScope) {
diff --git a/src/ui/public/management/index.js b/src/ui/public/management/index.js
index e039403a6d8a0c..e83c87f9936cfb 100644
--- a/src/ui/public/management/index.js
+++ b/src/ui/public/management/index.js
@@ -20,5 +20,3 @@ management.register('kibana', {
order: 20,
});
-// Default export style used in x-pack. TODO: convert to named and remove.
-export default management;
diff --git a/src/ui/public/modals/confirm_modal.js b/src/ui/public/modals/confirm_modal.js
index 47eed983886901..6e9048803b76ed 100644
--- a/src/ui/public/modals/confirm_modal.js
+++ b/src/ui/public/modals/confirm_modal.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import { noop } from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './confirm_modal.html';
import { ModalOverlay } from './modal_overlay';
diff --git a/src/ui/public/modals/confirm_modal_promise.js b/src/ui/public/modals/confirm_modal_promise.js
index cda08608c0abcc..fa6463f8ee22d1 100644
--- a/src/ui/public/modals/confirm_modal_promise.js
+++ b/src/ui/public/modals/confirm_modal_promise.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import 'ui/modals';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/modules.js b/src/ui/public/modules.js
index f8200c67eb1647..0af6941d84905b 100644
--- a/src/ui/public/modules.js
+++ b/src/ui/public/modules.js
@@ -122,4 +122,3 @@ export function close(moduleName) {
export const uiModules = { link, get, close };
-export default uiModules;
diff --git a/src/ui/public/notify/directives.js b/src/ui/public/notify/directives.js
index 7a13c02eda55f3..a52f6a0df79987 100644
--- a/src/ui/public/notify/directives.js
+++ b/src/ui/public/notify/directives.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import toasterTemplate from 'ui/notify/partials/toaster.html';
import 'ui/notify/notify.less';
import 'ui/filters/markdown';
diff --git a/src/ui/public/notify/notifier.js b/src/ui/public/notify/notifier.js
index 95503501fa91a9..214766b57d3a9c 100644
--- a/src/ui/public/notify/notifier.js
+++ b/src/ui/public/notify/notifier.js
@@ -662,5 +662,3 @@ function createGroupLogger(type, opts) {
};
}
-// Used in x-pack. TODO: convert to named and remove.
-export default Notifier;
diff --git a/src/ui/public/notify/notify.js b/src/ui/public/notify/notify.js
index 41da16f05ce70d..5116ed0c07075a 100644
--- a/src/ui/public/notify/notify.js
+++ b/src/ui/public/notify/notify.js
@@ -1,8 +1,9 @@
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { Notifier } from 'ui/notify/notifier';
import 'ui/notify/directives';
import { metadata } from 'ui/metadata';
-const module = modules.get('kibana/notify');
+
+const module = uiModules.get('kibana/notify');
export const notify = new Notifier();
module.factory('createNotifier', function () {
@@ -59,5 +60,3 @@ if (window.addEventListener) {
});
}
-// Used in x-pack. TODO: convert to named and remove.
-export default notify;
diff --git a/src/ui/public/number_list/number_list.js b/src/ui/public/number_list/number_list.js
index 9f653e24faaa85..cae2aa88992ece 100644
--- a/src/ui/public/number_list/number_list.js
+++ b/src/ui/public/number_list/number_list.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import { parseRange } from 'ui/utils/range';
import 'ui/number_list/number_list_input';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import numberListTemplate from 'ui/number_list/number_list.html';
uiModules
diff --git a/src/ui/public/number_list/number_list_input.js b/src/ui/public/number_list/number_list_input.js
index 11810026984102..138cbfe6243ff2 100644
--- a/src/ui/public/number_list/number_list_input.js
+++ b/src/ui/public/number_list/number_list_input.js
@@ -1,5 +1,5 @@
import { keyMap } from 'ui/utils/key_map';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const INVALID = {}; // invalid flag
const FLOATABLE = /^[\d\.e\-\+]+$/i;
diff --git a/src/ui/public/pager/pager_factory.js b/src/ui/public/pager/pager_factory.js
index 957c219fe3478c..1f2765ed6fddd7 100644
--- a/src/ui/public/pager/pager_factory.js
+++ b/src/ui/public/pager/pager_factory.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { Pager } from './pager';
const app = uiModules.get('kibana');
diff --git a/src/ui/public/pager_control/components/tool_bar_pager_buttons/tool_bar_pager_buttons.js b/src/ui/public/pager_control/components/tool_bar_pager_buttons/tool_bar_pager_buttons.js
index 302f1382357af5..efee7c33278372 100644
--- a/src/ui/public/pager_control/components/tool_bar_pager_buttons/tool_bar_pager_buttons.js
+++ b/src/ui/public/pager_control/components/tool_bar_pager_buttons/tool_bar_pager_buttons.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './tool_bar_pager_buttons.html';
const app = uiModules.get('kibana');
diff --git a/src/ui/public/pager_control/components/tool_bar_pager_text/tool_bar_pager_text.js b/src/ui/public/pager_control/components/tool_bar_pager_text/tool_bar_pager_text.js
index 873bdb597d0fb0..fcb09b80aa2605 100644
--- a/src/ui/public/pager_control/components/tool_bar_pager_text/tool_bar_pager_text.js
+++ b/src/ui/public/pager_control/components/tool_bar_pager_text/tool_bar_pager_text.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './tool_bar_pager_text.html';
const app = uiModules.get('kibana');
diff --git a/src/ui/public/paginated_table/paginated_table.js b/src/ui/public/paginated_table/paginated_table.js
index 5136e6c8aaa837..cb536df8fdfe03 100644
--- a/src/ui/public/paginated_table/paginated_table.js
+++ b/src/ui/public/paginated_table/paginated_table.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import AggConfigResult from 'ui/vis/agg_config_result';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import paginatedTableTemplate from 'ui/paginated_table/paginated_table.html';
uiModules
.get('kibana')
diff --git a/src/ui/public/parse_query/parse_query.js b/src/ui/public/parse_query/parse_query.js
index d7360b838876b7..d5c4fa0a9dd670 100644
--- a/src/ui/public/parse_query/parse_query.js
+++ b/src/ui/public/parse_query/parse_query.js
@@ -1,7 +1,7 @@
import { toUser } from 'ui/parse_query/lib/to_user';
import { ParseQueryLibFromUserProvider } from 'ui/parse_query/lib/from_user';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
uiModules
.get('kibana')
.directive('parseQuery', function (Private) {
diff --git a/src/ui/public/pattern_checker/pattern_checker.js b/src/ui/public/pattern_checker/pattern_checker.js
index bec93a9471ce3a..61a3893334c772 100644
--- a/src/ui/public/pattern_checker/pattern_checker.js
+++ b/src/ui/public/pattern_checker/pattern_checker.js
@@ -1,4 +1,4 @@
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import template from './pattern_checker.html';
import './pattern_checker.less';
import chrome from 'ui/chrome';
diff --git a/src/ui/public/persisted_log/persisted_log.js b/src/ui/public/persisted_log/persisted_log.js
index 09607d49668b42..2d2b92ffd4e229 100644
--- a/src/ui/public/persisted_log/persisted_log.js
+++ b/src/ui/public/persisted_log/persisted_log.js
@@ -1,7 +1,7 @@
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import _ from 'lodash';
-modules.get('kibana/persisted_log')
+uiModules.get('kibana/persisted_log')
.factory('PersistedLog', function ($window, localStorage) {
function PersistedLog(name, options) {
options = options || {};
diff --git a/src/ui/public/persisted_state/persisted_state.factory.js b/src/ui/public/persisted_state/persisted_state.factory.js
index 8624da4819b463..79237764c796d8 100644
--- a/src/ui/public/persisted_state/persisted_state.factory.js
+++ b/src/ui/public/persisted_state/persisted_state.factory.js
@@ -14,7 +14,7 @@
import { EventsProvider } from 'ui/events';
import { PersistedState } from './persisted_state';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/private/private.js b/src/ui/public/private/private.js
index 58f25198aeda76..e4f2660866c7da 100644
--- a/src/ui/public/private/private.js
+++ b/src/ui/public/private/private.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
/**
* # `Private()`
* Private module loader, used to merge angular and require js dependency styles
diff --git a/src/ui/public/promises/promises.js b/src/ui/public/promises/promises.js
index 1b1465e92249ef..ad77030c7c3715 100644
--- a/src/ui/public/promises/promises.js
+++ b/src/ui/public/promises/promises.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/registry/chrome_nav_controls.js b/src/ui/public/registry/chrome_nav_controls.js
index 6d80516a240c64..5e7471bc5a2922 100644
--- a/src/ui/public/registry/chrome_nav_controls.js
+++ b/src/ui/public/registry/chrome_nav_controls.js
@@ -5,5 +5,3 @@ export const chromeNavControlsRegistry = uiRegistry({
order: ['order']
});
-// Used in x-pack. TODO: use named version and remove.
-export default chromeNavControlsRegistry;
diff --git a/src/ui/public/registry/dev_tools.js b/src/ui/public/registry/dev_tools.js
index ee6b17115bfc0c..e6011e553561b3 100644
--- a/src/ui/public/registry/dev_tools.js
+++ b/src/ui/public/registry/dev_tools.js
@@ -6,4 +6,3 @@ export const DevToolsRegistryProvider = uiRegistry({
order: ['order']
});
-export default DevToolsRegistryProvider;
diff --git a/src/ui/public/registry/navbar_extensions.js b/src/ui/public/registry/navbar_extensions.js
index bf1d48315c1992..06347e0f8fbfd9 100644
--- a/src/ui/public/registry/navbar_extensions.js
+++ b/src/ui/public/registry/navbar_extensions.js
@@ -7,4 +7,3 @@ export const NavBarExtensionsRegistryProvider = uiRegistry({
order: ['order']
});
-export default NavBarExtensionsRegistryProvider;
diff --git a/src/ui/public/registry/vis_types.js b/src/ui/public/registry/vis_types.js
index 82116e21551f7f..a7782b280108d7 100644
--- a/src/ui/public/registry/vis_types.js
+++ b/src/ui/public/registry/vis_types.js
@@ -5,5 +5,3 @@ export const VisTypesRegistryProvider = uiRegistry({
index: ['name'],
order: ['title']
});
-
-export default VisTypesRegistryProvider;
diff --git a/src/ui/public/render_directive/render_directive.js b/src/ui/public/render_directive/render_directive.js
index c13b5ae3670ef5..81c595b432a9ab 100644
--- a/src/ui/public/render_directive/render_directive.js
+++ b/src/ui/public/render_directive/render_directive.js
@@ -1,5 +1,5 @@
import { isPlainObject } from 'lodash';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { ApplyScopeBindingsProvider } from './apply_scope_bindings';
/**
diff --git a/src/ui/public/routes/routes.js b/src/ui/public/routes/routes.js
index 077590cafa6427..5ef29d7e045c9d 100644
--- a/src/ui/public/routes/routes.js
+++ b/src/ui/public/routes/routes.js
@@ -1,6 +1,6 @@
import RouteManager from './route_manager';
import 'angular-route/angular-route';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const defaultRouteManager = new RouteManager();
module.exports = {
diff --git a/src/ui/public/saved_objects/saved_object_registry.js b/src/ui/public/saved_objects/saved_object_registry.js
index bf17da0e366e75..105a2a75f02de3 100644
--- a/src/ui/public/saved_objects/saved_object_registry.js
+++ b/src/ui/public/saved_objects/saved_object_registry.js
@@ -5,5 +5,3 @@ export const SavedObjectRegistryProvider = uiRegistry({
index: ['loaderProperties.name'],
order: ['loaderProperties.name']
});
-
-export default SavedObjectRegistryProvider;
diff --git a/src/ui/public/share/directives/share.js b/src/ui/public/share/directives/share.js
index b5e7c2f8d908da..cc804664e92a8f 100644
--- a/src/ui/public/share/directives/share.js
+++ b/src/ui/public/share/directives/share.js
@@ -11,7 +11,7 @@ import { Notifier } from 'ui/notify/notifier';
import { UrlShortenerProvider } from '../lib/url_shortener';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import shareTemplate from 'ui/share/views/share.html';
const app = uiModules.get('kibana');
diff --git a/src/ui/public/state_management/app_state.js b/src/ui/public/state_management/app_state.js
index dcdf640543b350..4c78d57ee673bb 100644
--- a/src/ui/public/state_management/app_state.js
+++ b/src/ui/public/state_management/app_state.js
@@ -9,7 +9,7 @@
*/
import _ from 'lodash';
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import { StateProvider } from 'ui/state_management/state';
import 'ui/persisted_state';
@@ -107,7 +107,7 @@ export function AppStateProvider(Private, $rootScope, $location, $injector) {
return AppState;
}
-modules.get('kibana/global_state')
+uiModules.get('kibana/global_state')
.factory('AppState', function (Private) {
return Private(AppStateProvider);
})
diff --git a/src/ui/public/state_management/global_state.js b/src/ui/public/state_management/global_state.js
index c5d8b563211bda..a4c18c99e3e64c 100644
--- a/src/ui/public/state_management/global_state.js
+++ b/src/ui/public/state_management/global_state.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import { QueryString } from 'ui/utils/query_string';
import { StateProvider } from 'ui/state_management/state';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const module = uiModules.get('kibana/global_state');
diff --git a/src/ui/public/storage/storage.js b/src/ui/public/storage/storage.js
index eaa243ed5be1d8..e6ac9dc3fc4594 100644
--- a/src/ui/public/storage/storage.js
+++ b/src/ui/public/storage/storage.js
@@ -1,4 +1,4 @@
-import modules from 'ui/modules';
+import { uiModules } from 'ui/modules';
import angular from 'angular';
function Storage(store) {
@@ -36,6 +36,6 @@ const createService = function (type) {
};
};
-modules.get('kibana/storage')
+uiModules.get('kibana/storage')
.service('localStorage', createService('localStorage'))
.service('sessionStorage', createService('sessionStorage'));
diff --git a/src/ui/public/style_compile/style_compile.js b/src/ui/public/style_compile/style_compile.js
index 90fc2e09fecbd2..aabef69d981d81 100644
--- a/src/ui/public/style_compile/style_compile.js
+++ b/src/ui/public/style_compile/style_compile.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import $ from 'jquery';
import 'ui/config';
-import uiModules from 'ui/modules';
+import { uiModules } from 'ui/modules';
const $style = $('