commit to the ui/ module prefix

STYLEGUIDE.md

@@ -812,7 +812,7 @@ Kibana is written in Angular, and uses several utility methods to make using Ang
 Angular modules are defined using a custom require module named `module`. It is used as follows:
 
 ```js
-var app = require('modules').get('app/namespace');
+var app = require('ui/modules').get('app/namespace');
 ```
 
 `app` above is a reference to an Angular module, and can be used to define controllers, providers and anything else used in Angular.
@@ -849,7 +849,7 @@ app.service('CustomService', function(Promise, otherDeps) {
 Angular routes are defined using a custom require modules named `routes` that remove much of the required boilerplate.
 
 ```js
-require('routes')
+require('ui/routes')
 .when('/my/object/route/:id?', {
   // angular route code goes here
 });

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

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

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

@@ -1,7 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   require('ui/directives/inequality');
 
   module.directive('pointSeriesOptions', function ($parse, $compile) {

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

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

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

@@ -1,7 +1,7 @@
 define(function (require) {
   var moment = require('moment');
   var $ = require('jquery');
-  require('modules')
+  require('ui/modules')
   .get('app/dashboard')
   .directive('dashboardPanel', function (savedVisualizations, savedSearches, Notifier, Private, $injector) {
     var _ = require('lodash');

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

@@ -4,7 +4,7 @@ define(function (require) {
 
   require('gridster');
 
-  var app = require('modules').get('app/dashboard');
+  var app = require('ui/modules').get('app/dashboard');
 
   app.directive('dashboardGrid', function ($compile, Notifier) {
     return {

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

@@ -16,7 +16,7 @@ define(function (require) {
   require('plugins/kibana/dashboard/services/saved_dashboards');
   require('plugins/kibana/dashboard/styles/main.less');
 
-  var app = require('modules').get('app/dashboard', [
+  var app = require('ui/modules').get('app/dashboard', [
     'elasticsearch',
     'ngRoute',
     'kibana/courier',
@@ -25,7 +25,7 @@ define(function (require) {
     'kibana/typeahead'
   ]);
 
-  require('routes')
+  require('ui/routes')
   .when('/dashboard', {
     template: require('plugins/kibana/dashboard/index.html'),
     resolve: {

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

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('app/dashboard');
+  var module = require('ui/modules').get('app/dashboard');
   var _ = require('lodash');
   var moment = require('moment');
 

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

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('app/dashboard');
+  var module = require('ui/modules').get('app/dashboard');
   var _ = require('lodash');
   // bring in the factory
   require('plugins/kibana/dashboard/services/_saved_dashboard');

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

@@ -1,6 +1,6 @@
 define(function (require) {
   var $ = require('jquery');
-  var app = require('modules').get('apps/discover');
+  var app = require('ui/modules').get('apps/discover');
   var html = require('plugins/kibana/discover/components/field_chooser/discover_field.html');
   var _ = require('lodash');
 

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

@@ -1,5 +1,5 @@
 define(function (require) {
-  var app = require('modules').get('apps/discover');
+  var app = require('ui/modules').get('apps/discover');
 
   require('ui/directives/css_truncate');
   require('ui/directives/field_name');

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

@@ -22,13 +22,13 @@ define(function (require) {
   require('ui/timefilter/timefilter');
   require('ui/highlight/highlight_tags');
 
-  var app = require('modules').get('apps/discover', [
+  var app = require('ui/modules').get('apps/discover', [
     'kibana/notify',
     'kibana/courier',
     'kibana/index_patterns'
   ]);
 
-  require('routes')
+  require('ui/routes')
   .when('/discover/:id?', {
     template: require('plugins/kibana/discover/index.html'),
     reloadOnSearch: false,

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

@@ -3,7 +3,7 @@ define(function (require) {
   var $ = require('jquery');
   var vislib = require('ui/vislib/index');
 
-  var app = require('modules').get('apps/discover');
+  var app = require('ui/modules').get('apps/discover');
 
   app.directive('discoverTimechart', function ($compile) {
     return {

src/plugins/kibana/public/discover/saved_searches/_saved_search.js

@@ -3,7 +3,7 @@ define(function (require) {
 
   require('ui/notify/notify');
 
-  var module = require('modules').get('discover/saved_searches', [
+  var module = require('ui/modules').get('discover/saved_searches', [
     'kibana/notify',
     'kibana/courier'
   ]);

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

@@ -4,7 +4,7 @@ define(function (require) {
   require('plugins/kibana/discover/saved_searches/_saved_search');
   require('ui/notify/notify');
 
-  var module = require('modules').get('discover/saved_searches', [
+  var module = require('ui/modules').get('discover/saved_searches', [
     'kibana/notify'
   ]);
 

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

@@ -7,7 +7,7 @@ define(function (require) {
   require('ui/doc_viewer/doc_viewer');
   require('ui/index_patterns/index_patterns');
 
-  var app = require('modules').get('apps/doc', [
+  var app = require('ui/modules').get('apps/doc', [
     'kibana/notify',
     'kibana/courier',
     'kibana/index_patterns'
@@ -21,7 +21,7 @@ define(function (require) {
     }
   };
 
-  require('routes')
+  require('ui/routes')
   .when('/doc/:indexPattern/:index/:type/:id', {
     template: html,
     resolve: resolveIndexPattern

src/plugins/kibana/public/kibana.js

@@ -5,7 +5,16 @@ define(function (require) {
   require('plugins/kibana/settings/index');
   require('plugins/kibana/doc/index');
 
-  require('routes')
+  // enable prefetching for faster webpack builds
+  require('ui/vislib/index');
+  require('ui/vislib/vis');
+  require('ui/vislib/lib/handler/handler');
+  require('ui/vislib/lib/layout/layout');
+  require('ui/vislib/visualizations/tile_map');
+  require('ui/vislib/lib/handler/types/point_series');
+  // end prefetching
+
+  require('ui/routes')
   .otherwise({
     redirectTo: '/discover'
   });

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

@@ -4,14 +4,14 @@ define(function (require, module, exports) {
   require('plugins/kibana/settings/styles/main.less');
   require('ui/filters/start_from');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings', {
     redirectTo: '/settings/indices'
   });
 
   var sections = require('plugins/kibana/settings/sections/index');
 
-  require('modules')
+  require('ui/modules')
   .get('apps/settings')
   .directive('kbnSettingsApp', function (Private, $route, timefilter) {
     return {

src/plugins/kibana/public/settings/sections/about/index.js

@@ -1,12 +1,12 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/about', {
     template: require('plugins/kibana/settings/sections/about/index.html')
   });
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .controller('settingsAbout', function ($scope, kbnVersion, buildNum, commitSha) {
     $scope.kbnVersion = kbnVersion;
     $scope.buildNum = buildNum;

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

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   require('ui/elastic_textarea');
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('advancedRow', function (config, Notifier, Private) {
     return {
       restrict: 'A',

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

@@ -5,12 +5,12 @@ define(function (require) {
 
   require('plugins/kibana/settings/sections/advanced/advanced_row');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/advanced', {
     template: require('plugins/kibana/settings/sections/advanced/index.html')
   });
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('kbnSettingsAdvanced', function (config, Notifier, Private, $rootScope) {
     return {
       restrict: 'E',

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

@@ -1,17 +1,17 @@
 define(function (require) {
   var _ = require('lodash');
   var moment = require('moment');
-  var errors = require('errors');
+  var errors = require('ui/errors');
 
   require('ui/directives/validate_index_name');
   require('ui/directives/auto_select_if_only_one');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/indices/', {
     template: require('plugins/kibana/settings/sections/indices/_create.html')
   });
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .controller('settingsIndicesCreate', function ($scope, kbnUrl, Private, Notifier, indexPatterns, es, config, Promise) {
     var notify = new Notifier();
     var MissingIndices = errors.IndexPatternMissingIndices;

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

@@ -4,7 +4,7 @@ define(function (require) {
   require('plugins/kibana/settings/sections/indices/_scripted_fields');
   require('plugins/kibana/settings/sections/indices/_index_header');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/indices/:indexPatternId', {
     template: require('plugins/kibana/settings/sections/indices/_edit.html'),
     resolve: {
@@ -15,7 +15,7 @@ define(function (require) {
     }
   });
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .controller('settingsIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private, AppState, docTitle) {
 
     var notify = new Notifier();

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

@@ -2,7 +2,7 @@ define(function (require) {
   require('ui/field_editor/field_editor');
   require('plugins/kibana/settings/sections/indices/_index_header');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/indices/:indexPatternId/field/:fieldName', { mode: 'edit' })
   .when('/settings/indices/:indexPatternId/create-field/', { mode: 'create' })
   .defaults(/settings\/indices\/[^\/]+\/(field|create-field)(\/|$)/, {

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

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('apps/settings')
   .directive('kbnSettingsIndexHeader', function (config) {
     return {

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

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   require('ui/paginated_table/paginated_table');
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('indexedFields', function ($filter) {
     var yesTemplate = '<i class="fa fa-check" aria-label="yes"></i>';
     var noTemplate = '';

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

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   require('ui/paginated_table/paginated_table');
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('scriptedFields', function (kbnUrl, Notifier, $filter) {
     var rowScopes = []; // track row scopes, so they can be destroyed as needed
     var popularityHtml = require('plugins/kibana/settings/sections/indices/_field_popularity.html');

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

@@ -6,7 +6,7 @@ define(function (require) {
   require('plugins/kibana/settings/sections/indices/_field_editor');
 
   // add a dependency to all of the subsection routes
-  require('routes')
+  require('ui/routes')
   .defaults(/settings\/indices/, {
     resolve: {
       indexPatternIds: function (courier) {
@@ -16,7 +16,7 @@ define(function (require) {
   });
 
   // wrapper directive, which sets some global stuff up like the left nav
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('kbnSettingsIndices', function ($route, config, kbnUrl) {
     return {
       restrict: 'E',

src/plugins/kibana/public/settings/sections/objects/_objects.js

@@ -7,12 +7,12 @@ define(function (require) {
 
   require('ui/directives/file_upload');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/objects', {
     template: objectIndexHTML
   });
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('kbnSettingsObjects', function (kbnIndex, Notifier, Private, kbnUrl) {
     return {
       restrict: 'E',

src/plugins/kibana/public/settings/sections/objects/_view.js

@@ -5,12 +5,12 @@ define(function (require) {
   var registry = require('plugins/kibana/settings/saved_object_registry');
   var objectViewHTML = require('plugins/kibana/settings/sections/objects/_view.html');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/objects/:service/:id', {
     template: objectViewHTML
   });
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('kbnSettingsObjectsView', function (kbnIndex, Notifier) {
     return {
       restrict: 'E',

src/plugins/kibana/public/settings/sections/objects/index.js

@@ -7,7 +7,7 @@ define(function (require) {
   require('ui/directives/confirm_click');
 
   // add the module deps to this module
-  require('modules').get('apps/settings', ['ui.ace', 'monospaced.elastic']);
+  require('ui/modules').get('apps/settings', ['ui.ace', 'monospaced.elastic']);
 
   return {
     name: 'objects',

src/plugins/kibana/public/visualize/editor/agg.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visEditorAgg', function ($compile, $parse, $filter, Private, Notifier) {
     require('plugins/kibana/visualize/editor/agg_params');

src/plugins/kibana/public/visualize/editor/agg_add.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('visEditorAggAdd', function (Private) {
     var AggConfig = Private(require('ui/vis/AggConfig'));

src/plugins/kibana/public/visualize/editor/agg_filter.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var propFilter = require('ui/filters/_prop_filter');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .filter('aggFilter', function () {
     return propFilter('name');

src/plugins/kibana/public/visualize/editor/agg_group.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visEditorAggGroup', function (Private) {
     require('plugins/kibana/visualize/editor/agg');

src/plugins/kibana/public/visualize/editor/agg_param.js

@@ -1,7 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visAggParamEditor', function (config, $parse, Private) {
     return {

src/plugins/kibana/public/visualize/editor/agg_params.js

@@ -1,7 +1,7 @@
 define(function (require) {
   var IndexedArray = require('ui/indexed_array/index');
 
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visEditorAggParams', function ($compile, $parse, Private, Notifier, $filter) {
     var _ = require('lodash');

src/plugins/kibana/public/visualize/editor/editor.js

@@ -7,7 +7,7 @@ define(function (require) {
   require('ui/visualize/visualize');
   require('ui/clipboard/clipboard');
 
-  require('routes')
+  require('ui/routes')
   .when('/visualize/create', {
     template: require('plugins/kibana/visualize/editor/editor.html'),
     resolve: {
@@ -40,7 +40,7 @@ define(function (require) {
     }
   });
 
-  require('modules')
+  require('ui/modules')
   .get('app/visualize', [
     'kibana/notify',
     'kibana/courier'

src/plugins/kibana/public/visualize/editor/nesting_indicator.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('nestingIndicator', function ($rootScope, $parse, Private) {
     var _ = require('lodash');

src/plugins/kibana/public/visualize/editor/sidebar.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visEditorSidebar', function () {
     var _ = require('lodash');

src/plugins/kibana/public/visualize/editor/vis_options.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
 
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visEditorVisOptions', function (Private, $timeout, $compile) {
     return {

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

@@ -4,7 +4,7 @@ define(function (require) {
   require('plugins/kibana/visualize/editor/editor');
   require('plugins/kibana/visualize/wizard/wizard');
 
-  require('routes')
+  require('ui/routes')
   .when('/visualize', {
     redirectTo: '/visualize/step/1'
   });

src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .factory('SavedVis', function (config, $injector, courier, Promise, savedSearches, Private, Notifier) {
     var _ = require('lodash');

src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var app = require('modules').get('app/visualize');
+  var app = require('ui/modules').get('app/visualize');
   var _ = require('lodash');
 
   require('plugins/kibana/visualize/saved_visualizations/_saved_vis');

src/plugins/kibana/public/visualize/wizard/wizard.js

@@ -9,8 +9,8 @@ define(function (require) {
     return '<div ng-controller="VisualizeWizardStep' + num + '" class="container vis-wizard">' + txt + '</div>';
   };
 
-  var module = require('modules').get('app/visualize', ['kibana/courier']);
-  var routes = require('routes');
+  var module = require('ui/modules').get('app/visualize', ['kibana/courier']);
+  var routes = require('ui/routes');
 
   /********
   /** Wizard Step 1

src/plugins/markdown_vis/public/markdown_vis_controller.js

@@ -5,7 +5,7 @@ define(function (require) {
     sanitize: true // Sanitize HTML tags
   });
 
-  var module = require('modules').get('kibana/markdown_vis', ['kibana']);
+  var module = require('ui/modules').get('kibana/markdown_vis', ['kibana']);
   module.controller('KbnMarkdownVisController', function ($scope, $sce) {
     $scope.$watch('vis.params.markdown', function (html) {
       if (!html) return;

src/plugins/metric_vis/public/metric_vis_controller.js

@@ -1,7 +1,7 @@
 define(function (require) {
   // get the kibana/metric_vis module, and make sure that it requires the "kibana" module if it
   // didn't already
-  var module = require('modules').get('kibana/metric_vis', ['kibana']);
+  var module = require('ui/modules').get('kibana/metric_vis', ['kibana']);
 
   module.controller('KbnMetricVisController', function ($scope, Private) {
     var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));

src/plugins/statusPage/public/statusPageMetric.js

@@ -17,7 +17,7 @@ function calcAvg(metricList, metricNumberType) {
   });
 }
 
-require('modules')
+require('ui/modules')
 .get('kibana', ['nvd3'])
 .directive('statusPageMetric', function () {
   return {

src/plugins/table_vis/public/table_vis_controller.js

@@ -1,7 +1,7 @@
 define(function (require) {
   // get the kibana/table_vis module, and make sure that it requires the "kibana" module if it
   // didn't already
-  var module = require('modules').get('kibana/table_vis', ['kibana']);
+  var module = require('ui/modules').get('kibana/table_vis', ['kibana']);
 
   // add a controller to tha module, which will transform the esResponse into a
   // tabular format that we can pass to the table directive

src/plugins/table_vis/public/table_vis_params.js

@@ -1,7 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('modules').get('kibana/table_vis')
+  require('ui/modules').get('kibana/table_vis')
   .directive('tableVisParams', function () {
     return {
       restrict: 'E',

src/server/optimize/OptmzUiModules.js

@@ -1,7 +1,6 @@
 var _ = require('lodash');
 var join = require('path').join;
 
-var uiRoot = require('../ui/assets').root;
 var asRegExp = _.flow(
   _.escapeRegExp,
   function (path) {
@@ -15,16 +14,14 @@ function OptmzUiExports(plugins) {
   var noParse = this.noParse = [];
 
   // webpack aliases, like require paths, mapping a prefix to a directory
-  var aliases = this.aliases = {
-    ui: uiRoot
-  };
+  var aliases = this.aliases = {};
 
   // webpack loaders map loader configuration to regexps
   var loaders = this.loaders = [];
 
   var claimedModuleIds = {};
   _.each(plugins, function (plugin) {
-    var exports = plugin.uiExportSpecs;
+    var exports = plugin.uiExportsSpecs;
 
     // add an alias for this plugins public directory
     if (plugin.publicDir) {

src/server/ui/UiExports.js

@@ -17,7 +17,7 @@ class UiExports {
 
   consumePlugin(plugin) {
     var self = this;
-    var types = _.keys(plugin.uiExportSpecs);
+    var types = _.keys(plugin.uiExportsSpecs);
 
     if (!types) return false;
 
@@ -27,7 +27,7 @@ class UiExports {
     }
 
     types.forEach(function (type) {
-      self.exportConsumer(type)(plugin, plugin.uiExportSpecs[type]);
+      self.exportConsumer(type)(plugin, plugin.uiExportsSpecs[type]);
     });
   }
 
@@ -50,7 +50,7 @@ class UiExports {
     case 'modules':
     case 'loaders':
       return function (plugin, spec) {
-        plugin.uiExportSpecs[type] = spec;
+        plugin.uiExportsSpecs[type] = spec;
       };
 
     case 'aliases':

src/ui/agg_table/agg_table.js

@@ -3,7 +3,7 @@ define(function (require) {
   require('ui/compile_recursive_directive');
   require('ui/agg_table/agg_table.less');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('kbnAggTable', function ($filter, config, Private, compileRecursiveDirective) {
     var _ = require('lodash');

src/ui/agg_table/agg_table_group.js

@@ -2,7 +2,7 @@ define(function (require) {
   require('ui/compile_recursive_directive');
   require('ui/agg_table/agg_table');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('kbnAggTableGroup', function (compileRecursiveDirective) {
     return {

src/ui/agg_types/param_types/field.js

@@ -4,7 +4,7 @@ define(function (require) {
 
     var editorHtml = require('ui/agg_types/controls/field.html');
     var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
-    var SavedObjectNotFound = require('errors').SavedObjectNotFound;
+    var SavedObjectNotFound = require('ui/errors').SavedObjectNotFound;
 
     _.class(FieldAggParam).inherits(BaseAggParam);
     function FieldAggParam(config) {

src/ui/bind/bind.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var angular = require('angular');
 
-  require('modules').get('kibana')
+  require('ui/modules').get('kibana')
   .config(function ($provide) {
 
     function strictEquality(a, b) {

src/ui/chrome/chrome.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
   var angular = require('angular');
-  var modules = require('modules');
+  var modules = require('ui/modules');
 
   require('ui/timefilter/timefilter');
   require('ui/private');
@@ -236,7 +236,7 @@ define(function (require) {
   };
 
   // build a kbn-chrome directive that will bind our service to the dom
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('kbnChrome', function ($rootScope) {
     return {

src/ui/chrome/context.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var ConfigTemplate = require('utils/config_template');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('chromeContext', function (timefilter, globalState) {
 

src/ui/clipboard/clipboard.js

@@ -5,7 +5,7 @@ define(function (require) {
 
   var $ = require('jquery');
   var html = require('ui/clipboard/clipboard.html');
-  var module = require('modules').get('kibana', ['ngClipboard']);
+  var module = require('ui/modules').get('kibana', ['ngClipboard']);
 
   module
   .config(function (ngClipProvider) {

src/ui/collapsible_sidebar/collapsible_sidebar.js

@@ -4,7 +4,7 @@ define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('collapsibleSidebar', function () {
     // simply a list of all of all of angulars .col-md-* classes except 12

src/ui/compile_recursive_directive.js

@@ -6,7 +6,7 @@ define(function (require) {
    * http://stackoverflow.com/a/18609594/296172
    */
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .service('compileRecursiveDirective', function ($compile) {
     return {

src/ui/config/config.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana/config', [
+  var module = require('ui/modules').get('kibana/config', [
     'kibana/notify'
   ]);
 

src/ui/courier/_redirect_when_missing.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var errors = require('errors');
+  var errors = require('ui/errors');
   var qs = require('utils/query_string');
 
   return function RedirectWhenMissingFn($location, kbnUrl, Notifier, Promise) {

src/ui/courier/courier.js

@@ -1,12 +1,12 @@
 define(function (require) {
-  var errors = require('errors');
+  var errors = require('ui/errors');
   var _ = require('lodash');
 
   require('ui/es');
   require('ui/promises');
   require('ui/index_patterns/index_patterns');
 
-  require('modules').get('kibana/courier')
+  require('ui/modules').get('kibana/courier')
   .service('courier', function ($rootScope, Private, Promise, indexPatterns, Notifier) {
     function Courier() {
       var self = this;

src/ui/courier/data_source/_doc_send_to_es.js

@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  var errors = require('errors');
+  var errors = require('ui/errors');
 
   return function (Promise, Private, es) {
     var requestQueue = Private(require('ui/courier/_request_queue'));

src/ui/courier/fetch/_call_response_handlers.js

@@ -4,9 +4,9 @@ define(function (require) {
     var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
     var notify = Private(require('ui/courier/fetch/_notifier'));
 
-    var SearchTimeout = require('errors').SearchTimeout;
-    var RequestFailure = require('errors').RequestFailure;
-    var ShardFailure = require('errors').ShardFailure;
+    var SearchTimeout = require('ui/errors').SearchTimeout;
+    var RequestFailure = require('ui/errors').RequestFailure;
+    var ShardFailure = require('ui/errors').ShardFailure;
 
     function callResponseHandlers(requests, responses) {
       return Promise.map(requests, function (req, i) {

src/ui/courier/fetch/request/request.js

@@ -2,7 +2,7 @@ define(function (require) {
   return function AbstractReqProvider(Private, Promise) {
     var _ = require('lodash');
     var moment = require('moment');
-    var errors = require('errors');
+    var errors = require('ui/errors');
     var requestQueue = Private(require('ui/courier/_request_queue'));
     var requestErrorHandler = Private(require('ui/courier/fetch/request/_error_handler'));
 

src/ui/courier/saved_object/saved_object.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function SavedObjectFactory(es, kbnIndex, Promise, Private, Notifier, indexPatterns) {
     var angular = require('angular');
-    var errors = require('errors');
+    var errors = require('ui/errors');
     var _ = require('lodash');
     var slugifyId = require('utils/slugify_id');
 

src/ui/debounce/debounce.js

@@ -3,7 +3,7 @@
 
 define(function (require) {
   var _ = require('lodash');
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   module.service('debounce', ['$timeout', function ($timeout) {
     return function (func, wait, options) {

src/ui/directives/auto_select_if_only_one.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   module.directive('autoSelectIfOnlyOne', function ($parse) {
     return {

src/ui/directives/click_focus.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var _ = require('lodash');
   var $ = require('jquery');
 

src/ui/directives/config.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var ConfigTemplate = require('utils/config_template');
   var angular = require('angular');
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   require('ui/directives/input_focus');
 

src/ui/directives/confirm_click.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
     .get('kibana')
     .directive('confirmClick', function () {
       return {

src/ui/directives/css_truncate.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var $ = require('jquery');
   var _ = require('lodash');
 

src/ui/directives/field_name.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   require('ui/filters/short_dots');
 
   module.directive('fieldName', function ($compile, $rootScope, $filter) {

src/ui/directives/file_upload.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var $ = require('jquery');
 
   module.directive('fileUpload', function ($parse) {

src/ui/directives/inequality.js

@@ -29,7 +29,7 @@ define(function (require) {
     };
   }
 
-  require('modules')
+  require('ui/modules')
     .get('kibana')
     .directive('greaterThan', makeDirectiveDef('greaterThan', function (a, b) {
       return a > b;

src/ui/directives/infinite_scroll.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var $ = require('jquery');
 
   module.directive('kbnInfiniteScroll', function () {

src/ui/directives/info.js

@@ -1,7 +1,7 @@
 define(function (require) {
   var html = require('partials/info.html');
 
-  require('modules')
+  require('ui/modules')
     .get('kibana')
     .directive('kbnInfo', function () {
       return {

src/ui/directives/input_datetime.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var $ = require('jquery');
   var _ = require('lodash');
   var moment = require('moment');

src/ui/directives/input_focus.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   module.directive('inputFocus', function ($timeout) {
     return {

src/ui/directives/input_whole_number.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   module.directive('inputWholeNumber', function () {
     return {

src/ui/directives/paginate.js

@@ -3,7 +3,7 @@ define(function (require) {
 
   var PER_PAGE_DEFAULT = 10;
 
-  require('modules').get('kibana')
+  require('ui/modules').get('kibana')
   .directive('paginate', function ($parse, $compile) {
     return {
       restrict: 'E',

src/ui/directives/pretty_duration.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var _ = require('lodash');
   var datemath = require('utils/datemath');
   var moment = require('moment');

src/ui/directives/rows.js

@@ -1,7 +1,7 @@
 define(function (require) {
   var $ = require('jquery');
   var _ = require('lodash');
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var AggConfigResult = require('ui/vis/AggConfigResult');
 
   module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private) {

src/ui/directives/saved_object_finder.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var _ = require('lodash');
   var rison = require('utils/rison');
   var keymap = require('utils/key_map');

src/ui/directives/spinner.js

@@ -1,6 +1,6 @@
 define(function (require) {
   var html = '<div class="bounce1"></div> <div class="bounce2"></div> <div class="bounce3"></div>';
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   module.directive('spinner', function () {
     return {

src/ui/directives/truncated.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var $ = require('jquery');
 
   module.directive('kbnTruncated', function ($compile) {

src/ui/directives/validate_cidr_mask.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var CidrMask = require('utils/cidr_mask');
 
-  require('modules').get('kibana').directive('validateCidrMask', function () {
+  require('ui/modules').get('kibana').directive('validateCidrMask', function () {
     return {
       restrict: 'A',
       require: 'ngModel',

src/ui/directives/validate_date_math.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var DateMath = require('utils/datemath');
 
-  require('modules').get('kibana').directive('validateDateMath', function () {
+  require('ui/modules').get('kibana').directive('validateDateMath', function () {
     return {
       restrict: 'A',
       require: 'ngModel',

src/ui/directives/validate_index_name.js

@@ -2,7 +2,7 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('modules')
+  require('ui/modules')
     .get('kibana')
     .directive('validateIndexName', function () {
       return {

src/ui/directives/validate_ip.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var Ipv4Address = require('utils/ipv4_address');
 
-  require('modules')
+  require('ui/modules')
     .get('kibana')
     .directive('validateIp', function () {
       return {

src/ui/directives/validate_json.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
 
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   module.directive('validateJson', function ($compile) {
     return {

src/ui/doc_table/components/table_header.js

@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  var module = require('modules').get('app/discover');
+  var module = require('ui/modules').get('app/discover');
 
   require('ui/filters/short_dots');
 

src/ui/doc_table/components/table_row.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
   var addWordBreaks = require('utils/add_word_breaks');
-  var module = require('modules').get('app/discover');
+  var module = require('ui/modules').get('app/discover');
 
   require('ui/highlight/highlight');
   require('ui/highlight/highlight_tags');

src/ui/doc_table/doc_table.js

@@ -10,7 +10,7 @@ define(function (require) {
   require('ui/doc_table/components/table_header');
   require('ui/doc_table/components/table_row');
 
-  require('modules').get('kibana')
+  require('ui/modules').get('kibana')
   .directive('docTable', function (config, Notifier, getAppState) {
     return {
       restrict: 'E',

src/ui/doc_title/doc_title.js

@@ -1,7 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('modules').get('kibana')
+  require('ui/modules').get('kibana')
   .run(function ($rootScope, docTitle) {
     // always bind to the route events
     $rootScope.$on('$routeChangeStart', docTitle.reset);

src/ui/doc_viewer/doc_viewer.js

@@ -6,7 +6,7 @@ define(function (require) {
   var html = require('ui/doc_viewer/doc_viewer.html');
   require('ui/doc_viewer/doc_viewer.less');
 
-  require('modules').get('kibana')
+  require('ui/modules').get('kibana')
   .directive('docViewer', function (config, Private) {
     return {
       restrict: 'E',

src/ui/elastic_textarea.js

@@ -3,7 +3,7 @@ define(function (require) {
   var NL_RE = /\n/g;
   var events = 'keydown keypress keyup change';
 
-  require('modules').get('kibana')
+  require('ui/modules').get('kibana')
   .directive('elasticTextarea', function () {
     return {
       restrict: 'A',

src/ui/es.js

@@ -3,7 +3,7 @@ define(function (require) {
   var _ = require('lodash');
 
   var es; // share the client amoungst all apps
-  require('modules')
+  require('ui/modules')
     .get('kibana', ['elasticsearch', 'kibana/config'])
     .service('es', function (esFactory, esUrl, $q) {
       if (es) return es;