relocated some tests, fixed others, moved more modules to CamelCase names, and shortened many module ids

.jshintrc

@@ -13,7 +13,8 @@
     "-name": true,
     "-Promise": true,
     "-Worker": true,
-    "-status": true
+    "-status": true,
+    "-fetch": true
   },
 
   // shared with .jshintrc files for browser and node

package.json

@@ -64,6 +64,7 @@
     "d3": "^3.5.6",
     "debug": "^2.1.1",
     "elasticsearch": "^5.0.0",
+    "es5-shim": "^4.1.10",
     "expiry-js": "^0.1.7",
     "exports-loader": "^0.6.2",
     "expose-loader": "^0.7.0",
@@ -149,7 +150,9 @@
     "progress": "^1.1.8",
     "simple-git": "^1.3.0",
     "sinon": "^1.15.4",
-    "tar": "^2.1.1"
+    "source-map": "^0.4.4",
+    "tar": "^2.1.1",
+    "whatwg-fetch": "^0.9.0"
   },
   "engines": {
     "node": ">=2"

src/fixtures/vislib/_vis_fixture.js

@@ -1,15 +1,26 @@
-module.exports = function VislibFixtures(Private) {
-  var $ = require('jquery');
-  var _ = require('lodash');
+var $ = require('jquery');
+var _ = require('lodash');
 
+var $visCanvas = $('<div>').attr('id', 'vislib-vis-fixtures').appendTo('body');
+var count = 0;
+var visHeight = $visCanvas.height();
+
+$visCanvas.new = function () {
+  count += 1;
+  if (count > 1) $visCanvas.height(visHeight * count);
+  return $('<div>').addClass('visualize-chart').appendTo($visCanvas);
+};
+
+afterEach(function () {
+  $visCanvas.empty();
+  if (count > 1) $visCanvas.height(visHeight);
+  count = 0;
+});
+
+module.exports = function VislibFixtures(Private) {
   return function (visLibParams) {
     var Vis = Private(require('ui/vislib/vis'));
-
-    var $el = $('<div class="visualize-chart"></div>')
-    .css({ width: 1024, height: 300 })
-    .appendTo('body');
-
-    var config = _.defaults(visLibParams || {}, {
+    return new Vis($visCanvas.new(), _.defaults({}, visLibParams || {}, {
       shareYAxis: true,
       addTooltip: true,
       addLegend: true,
@@ -17,8 +28,6 @@ module.exports = function VislibFixtures(Private) {
       setYExtents: false,
       yAxis: {},
       type: 'histogram'
-    });
-
-    return new Vis($el, config);
+    }));
   };
 };

src/plugins/devMode/index.js

@@ -30,21 +30,11 @@ module.exports = function devModePlugin(kibana) {
         ngMock$: 'plugins/devMode/ngMock',
         fixtures: fromRoot('src/fixtures'),
         testUtils: fromRoot('src/testUtils'),
-        mocha$: {
-          path: fromRoot('node_modules/mocha/mocha.js'),
-          exports: 'window.mocha',
-          imports: 'mochaStyles'
-        },
-        mochaStyles$: fromRoot('node_modules/mocha/mocha.css'),
         'angular-mocks': {
           path: require.resolve('angular-mocks'),
-          imports: 'angular,mocha'
+          imports: 'angular'
         },
-      },
-
-      loaders: [
-        { test: /\/__tests__\//, loader: 'imports?mocha' }
-      ]
+      }
     }
   });
 };

src/plugins/devMode/public/bootstrapTests.js

@@ -1,12 +1,13 @@
-
+/* global mocha */
 var Nonsense = require('Nonsense');
 var sinon = require('sinon');
-var mocha = require('mocha');
-var chrome = require('ui/chrome');
 var $ = require('jquery');
 var _ = require('lodash');
 var parse = require('url').parse;
+require('es5-shim');
+var StackTraceMapper = require('ui/StackTraceMapper');
 
+var chrome = require('ui/chrome');
 var getFailedSpecsFromMochaRunner = require('./getFailedSpecsFromMochaRunner');
 require('./testHarness.less');
 
@@ -25,7 +26,8 @@ console.log('Random-ness seed: ' + seed);
 /*** Setup mocha ***/
 mocha.setup({
   ui: 'bdd',
-  timeout: 5000
+  timeout: 5000,
+  reporter: 'html'
 });
 
 
@@ -35,23 +37,42 @@ if (coverage) {
   mocha.reporter(require('testUtils/istanbul_reporter/reporter'));
 }
 
-
 /*** Setup auto releasing stubs and spys ***/
 require('auto-release-sinon').setupAutoRelease(sinon, window.afterEach);
 
 /*** Make sure that angular-mocks gets setup in the global suite **/
 require('ngMock');
 
+/*** manually map error stack traces using the sourcemap ***/
+before(function () {
+  // before the tests start, load the sourcemap and hook into error generation for the mocha reporter
+  this.timeout(30000);
+
+  var mapper;
+  var Runner = window.Mocha.Runner;
+
+  Runner.prototype.emit = _.wrap(Runner.prototype.emit, function (emit, event, test, err) {
+    if (err && mapper) err = mapper.mapError(err);
+    return emit.call(this, event, test, err);
+  });
+
+  return StackTraceMapper.getInstance().then(function (instance) {
+    mapper = instance;
+  });
+});
+
+before(function () {
+  sinon.useFakeXMLHttpRequest();
+});
+
+
 /*** Kick off mocha, called at the end of test entry files ***/
 exports.bootstrap = function () {
   $('#mocha').html('');
 
   chrome.setupAngular();
-
-  var xhr = sinon.useFakeXMLHttpRequest();
-  window.mochaRunner = mocha.run().on('end', function () {
-    window.mochaResults = this.stats;
-    window.mochaResults.details = getFailedSpecsFromMochaRunner(this);
-    xhr.restore();
-  });
+  // Only tests run in real browser, injected script run if options.run == true
+  if (navigator.userAgent.indexOf('PhantomJS') < 0) {
+    mocha.run();
+  }
 };

src/plugins/devMode/public/testHarness.jade

@@ -1,8 +1,13 @@
 extends ../../../server/ui/views/chrome.jade
 
+block vars
+  - appName = 'test-harness'
+
 block head
-  link(rel='stylesheet', href='/tests/style.css')
-  script(src='/tests/bundle.js')
+  link(rel='stylesheet', href='/tests/mocha.css')
+  script(src='/tests/mocha.js')
 
 block content
   #mocha
+  script(src='/tests/bundle.js' src-map='/tests/a6b5151f.bundle.js.map')
+  link(rel='stylesheet', href='/tests/style.css')

src/plugins/devMode/public/testHarness.less

@@ -1,15 +1,26 @@
-body {
+body#test-harness-body {
   // now that tests include the kibana styles, we have
   // to override the body { display: flex; } rule as it
   // prevents the visualizations from properly testing
   // their sizing
-  display: block !important;
-}
+  display: block;
 
-#mocha-stats .progress {
-  // bootstrap thinks it is the only one who will use ".progress"
-  height: auto;
-  background-color: transparent;
-  overflow: auto;
-  border-radius: 0;
+  #mocha-stats .progress {
+    // bootstrap thinks it is the only one who will use ".progress"
+    height: auto;
+    background-color: transparent;
+    overflow: auto;
+    border-radius: 0;
+  }
+
+
+  #vislib-vis-fixtures {
+    height: 500px;
+    width: 1024px;
+    display: flex;
+    position: fixed;
+    top: 0;
+    left: 0;
+    overflow: hidden;
+  }
 }

src/plugins/devMode/public/visDebugSpyPanel.js

@@ -3,7 +3,7 @@ define(function (require) {
   require('ui/registry/spy_modes').register(VisDetailsSpyProvider);
 
   function VisDetailsSpyProvider(Notifier, $filter, $rootScope, config) {
-    require('ui/clipboard/clipboard');
+    require('ui/clipboard');
 
     return {
       name: 'debug',

src/plugins/devMode/testHarness/TestBundler.js

@@ -96,7 +96,7 @@ module.exports = function (server, kbnServer) {
 
       return self.init()
       .then(function () {
-        server.log(['optimize', 'testHarness', first ? 'info' : 'debug'], 'Test harness build complete');
+        server.log(['optimize', 'testHarness', first ? 'info' : 'debug'], 'Test harness built, compiling test bundle');
         return self.optimizer.get(self.id);
       });
     }

src/plugins/devMode/testHarness/routes.js

@@ -3,12 +3,15 @@
 module.exports = function (server, kbnServer) {
   let resolve = require('path').resolve;
 
-  let fromRoot = require('../../../utils/fromRoot');
-  let UiApp = require('../../../server/ui/UiApp');
+  let src = require('requirefrom')('src');
+  let fromRoot = src('utils/fromRoot');
+  let UiApp = src('server/ui/UiApp');
 
   let srcPath = fromRoot('src');
 
   server.redirectToSlash('/tests/plugins/{pluginId}');
+  server.exposeStaticFile('/tests/mocha.js', fromRoot('node_modules/mocha/mocha.js'));
+  server.exposeStaticFile('/tests/mocha.css', fromRoot('node_modules/mocha/mocha.css'));
 
   server.route({
     path: '/tests',

src/plugins/kbn_vislib_vis_types/public/area.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function HistogramVisType(Private) {
     var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/vis/Schemas'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'area',

src/plugins/kbn_vislib_vis_types/public/histogram.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function HistogramVisType(Private) {
     var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/vis/Schemas'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'histogram',

src/plugins/kbn_vislib_vis_types/public/line.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function HistogramVisType(Private) {
     var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/vis/Schemas'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'line',

src/plugins/kbn_vislib_vis_types/public/pie.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function HistogramVisType(Private) {
     var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/vis/Schemas'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'pie',

src/plugins/kbn_vislib_vis_types/public/tileMap.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function TileMapVisType(Private, getAppState, courier, config) {
     var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/vis/Schemas'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
     var geoJsonConverter = Private(require('ui/agg_response/geo_json/geo_json'));
     var _ = require('lodash');
     var supports = require('ui/utils/supports');

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

@@ -6,7 +6,7 @@ define(function (require) {
   .directive('dashboardPanel', function (savedVisualizations, savedSearches, Notifier, Private, $injector) {
     var _ = require('lodash');
     var loadPanel = Private(require('plugins/kibana/dashboard/components/panel/lib/load_panel'));
-    var filterManager = Private(require('ui/filter_manager/filter_manager'));
+    var filterManager = Private(require('ui/filter_manager'));
     var notify = new Notifier();
 
     var services = require('plugins/kibana/settings/saved_object_registry').all().map(function (serviceObj) {
@@ -17,8 +17,8 @@ define(function (require) {
       };
     });
 
-    require('ui/visualize/visualize');
-    require('ui/doc_table/doc_table');
+    require('ui/visualize');
+    require('ui/doc_table');
 
     var brushEvent = Private(require('ui/utils/brush_event'));
 

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

@@ -2,14 +2,14 @@ define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
   var angular = require('angular');
-  var ConfigTemplate = require('ui/utils/config_template');
+  var ConfigTemplate = require('ui/ConfigTemplate');
 
   require('ui/directives/config');
-  require('ui/courier/courier');
-  require('ui/config/config');
-  require('ui/notify/notify');
-  require('ui/typeahead/typeahead');
-  require('ui/clipboard/clipboard');
+  require('ui/courier');
+  require('ui/config');
+  require('ui/notify');
+  require('ui/typeahead');
+  require('ui/clipboard');
 
   require('plugins/kibana/dashboard/directives/grid');
   require('plugins/kibana/dashboard/components/panel/panel');
@@ -100,7 +100,7 @@ define(function (require) {
         function init() {
           updateQueryOnRootSource();
 
-          var docTitle = Private(require('ui/doc_title/doc_title'));
+          var docTitle = Private(require('ui/doc_title'));
           if (dash.id) {
             docTitle.change(dash.title);
           }

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

@@ -2,24 +2,24 @@ define(function (require) {
   var _ = require('lodash');
   var angular = require('angular');
   var moment = require('moment');
-  var ConfigTemplate = require('ui/utils/config_template');
+  var ConfigTemplate = require('ui/ConfigTemplate');
   var getSort = require('ui/doc_table/lib/get_sort');
   var rison = require('ui/utils/rison');
 
-  var datemath = require('ui/utils/datemath');
+  var dateMath = require('ui/utils/dateMath');
 
-  require('ui/doc_table/doc_table');
-  require('ui/visualize/visualize');
-  require('ui/notify/notify');
-  require('ui/timepicker/timepicker');
+  require('ui/doc_table');
+  require('ui/visualize');
+  require('ui/notify');
+  require('ui/timepicker');
   require('ui/fixedScroll');
   require('ui/directives/validate_json');
-  require('ui/validate_query/validate_query');
+  require('ui/validate_query');
   require('ui/filters/moment');
-  require('ui/courier/courier');
-  require('ui/index_patterns/index_patterns');
+  require('ui/courier');
+  require('ui/index_patterns');
   require('ui/state_management/app_state');
-  require('ui/timefilter/timefilter');
+  require('ui/timefilter');
   require('ui/highlight/highlight_tags');
 
   var app = require('ui/modules').get('apps/discover', [
@@ -66,12 +66,12 @@ define(function (require) {
   app.controller('discover', function ($scope, config, courier, $route, $window, Notifier,
     AppState, timefilter, Promise, Private, kbnUrl, highlightTags) {
 
-    var Vis = Private(require('ui/vis/vis'));
-    var docTitle = Private(require('ui/doc_title/doc_title'));
+    var Vis = Private(require('ui/Vis'));
+    var docTitle = Private(require('ui/doc_title'));
     var brushEvent = Private(require('ui/utils/brush_event'));
     var HitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn'));
     var queryFilter = Private(require('ui/filter_bar/query_filter'));
-    var filterManager = Private(require('ui/filter_manager/filter_manager'));
+    var filterManager = Private(require('ui/filter_manager'));
 
     var notify = new Notifier({
       location: 'Discover'
@@ -406,8 +406,8 @@ define(function (require) {
 
     $scope.updateTime = function () {
       $scope.timeRange = {
-        from: datemath.parse(timefilter.time.from),
-        to: datemath.parse(timefilter.time.to, true)
+        from: dateMath.parse(timefilter.time.from),
+        to: dateMath.parse(timefilter.time.to, true)
       };
     };
 

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

@@ -1,7 +1,7 @@
 define(function (require, module, exports) {
   require('plugins/kibana/discover/saved_searches/saved_searches');
   require('plugins/kibana/discover/directives/timechart');
-  require('ui/collapsible_sidebar/collapsible_sidebar');
+  require('ui/collapsible_sidebar');
   require('plugins/kibana/discover/components/field_chooser/field_chooser');
   require('plugins/kibana/discover/controllers/discover');
   require('plugins/kibana/discover/styles/main.less');

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

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

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

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

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

@@ -2,10 +2,10 @@ define(function (require) {
   var _ = require('lodash');
   var angular = require('angular');
 
-  require('ui/notify/notify');
-  require('ui/courier/courier');
-  require('ui/doc_viewer/doc_viewer');
-  require('ui/index_patterns/index_patterns');
+  require('ui/notify');
+  require('ui/courier');
+  require('ui/doc_viewer');
+  require('ui/index_patterns');
 
   var app = require('ui/modules').get('apps/doc', [
     'kibana/notify',

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

@@ -22,7 +22,7 @@ define(function (require) {
     var $state = $scope.state = new AppState();
     var refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index'));
 
-    $scope.kbnUrl = Private(require('ui/url/url'));
+    $scope.kbnUrl = Private(require('ui/url'));
     $scope.indexPattern = $route.current.locals.indexPattern;
     docTitle.change($scope.indexPattern.id);
     var otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id);

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

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('ui/field_editor/field_editor');
+  require('ui/field_editor');
   require('plugins/kibana/settings/sections/indices/_index_header');
 
   require('ui/routes')
@@ -17,7 +17,7 @@ define(function (require) {
     controller: function FieldEditorPageController($route, Private, Notifier, docTitle) {
       var Field = Private(require('ui/index_patterns/_field'));
       var notify = new Notifier({ location: 'Field Editor' });
-      var kbnUrl = Private(require('ui/url/url'));
+      var kbnUrl = Private(require('ui/url'));
 
 
       this.mode = $route.current.mode;

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

@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  require('ui/paginated_table/paginated_table');
+  require('ui/paginated_table');
 
   require('ui/modules').get('apps/settings')
   .directive('indexedFields', function ($filter) {

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

@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  require('ui/paginated_table/paginated_table');
+  require('ui/paginated_table');
 
   require('ui/modules').get('apps/settings')
   .directive('scriptedFields', function (kbnUrl, Notifier, $filter) {

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

@@ -2,7 +2,7 @@ define(function (require) {
   require('ui/modules')
   .get('kibana')
   .directive('visEditorAggAdd', function (Private) {
-    var AggConfig = Private(require('ui/vis/AggConfig'));
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
 
     return {
       restrict: 'E',

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

@@ -1,5 +1,5 @@
 define(function (require) {
-  var IndexedArray = require('ui/indexed_array/index');
+  var IndexedArray = require('ui/IndexedArray');
 
   require('ui/modules')
   .get('app/visualize')

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

@@ -4,8 +4,8 @@ define(function (require) {
   require('plugins/kibana/visualize/editor/sidebar');
   require('plugins/kibana/visualize/editor/agg_filter');
 
-  require('ui/visualize/visualize');
-  require('ui/clipboard/clipboard');
+  require('ui/visualize');
+  require('ui/clipboard');
 
   require('ui/routes')
   .when('/visualize/create', {
@@ -49,9 +49,9 @@ define(function (require) {
 
     var _ = require('lodash');
     var angular = require('angular');
-    var ConfigTemplate = require('ui/utils/config_template');
-    var Notifier = require('ui/notify/_notifier');
-    var docTitle = Private(require('ui/doc_title/doc_title'));
+    var ConfigTemplate = require('ui/ConfigTemplate');
+    var Notifier = require('ui/notify/Notifier');
+    var docTitle = Private(require('ui/doc_title'));
     var brushEvent = Private(require('ui/utils/brush_event'));
     var queryFilter = Private(require('ui/filter_bar/query_filter'));
     var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));

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

@@ -3,7 +3,7 @@ define(function (require) {
   .get('app/visualize')
   .factory('SavedVis', function (config, $injector, courier, Promise, savedSearches, Private, Notifier) {
     var _ = require('lodash');
-    var Vis = Private(require('ui/vis/vis'));
+    var Vis = Private(require('ui/Vis'));
 
     var notify = new Notifier({
       location: 'SavedVis'

src/plugins/metric_vis/public/metric_vis.js

@@ -10,7 +10,7 @@ define(function (require) {
 
   function MetricVisProvider(Private) {
     var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
-    var Schemas = Private(require('ui/vis/Schemas'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
 
     // return the visType object, which kibana will use to display and configure new
     // Vis object of this type.

src/plugins/spyModes/public/tableSpyMode.js

@@ -6,7 +6,7 @@ define(function (require) {
 
     var PER_PAGE_DEFAULT = 10;
 
-    require('ui/agg_table/agg_table');
+    require('ui/agg_table');
 
     return {
       name: 'table',

src/plugins/table_vis/public/__tests__/_table_vis.js

@@ -20,7 +20,7 @@ describe('Integration', function () {
     $compile = $injector.get('$compile');
     fixtures = require('fixtures/fake_hierarchical_data');
     TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
   }));
 

src/plugins/table_vis/public/__tests__/_table_vis_controller.js

@@ -21,7 +21,7 @@ describe('Controller', function () {
     $compile = $injector.get('$compile');
     fixtures = require('fixtures/fake_hierarchical_data');
     TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
   }));
 
   function OneRangeVis(params) {

src/plugins/table_vis/public/table_vis.js

@@ -9,7 +9,7 @@ define(function (require) {
   require('plugins/table_vis/table_vis_params');
 
   // require the directives that we use as well
-  require('ui/agg_table/agg_table');
+  require('ui/agg_table');
   require('ui/agg_table/agg_table_group');
 
   // register the provider with the visTypes registry
@@ -18,7 +18,7 @@ define(function (require) {
   // define the TableVisType
   function TableVisTypeProvider(Private) {
     var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
-    var Schemas = Private(require('ui/vis/Schemas'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
 
     // define the TableVisController which is used in the template
     // by angular's ng-controller directive

src/server/ui/autoload.js

@@ -19,34 +19,34 @@ exports.reload = function () {
     'ui/chrome/context',
     'ui/bind',
     'ui/bound_to_config_obj',
-    'ui/config/config',
-    'ui/courier/courier',
+    'ui/config',
+    'ui/courier',
     'ui/debounce',
-    'ui/doc_title/doc_title',
+    'ui/doc_title',
     'ui/elastic_textarea',
     'ui/es',
     'ui/events',
-    'ui/fancy_forms/fancy_forms',
-    'ui/filter_bar/filter_bar',
-    'ui/filter_manager/filter_manager',
-    'ui/index_patterns/index_patterns',
+    'ui/fancy_forms',
+    'ui/filter_bar',
+    'ui/filter_manager',
+    'ui/index_patterns',
     'ui/listen',
-    'ui/notify/notify',
-    'ui/persisted_log/persisted_log',
+    'ui/notify',
+    'ui/persisted_log',
     'ui/private',
     'ui/promises',
     'ui/state_management/app_state',
     'ui/state_management/global_state',
-    'ui/storage/storage',
+    'ui/storage',
     'ui/stringify/register',
-    'ui/style_compile/style_compile',
-    'ui/timefilter/timefilter',
-    'ui/timepicker/timepicker',
-    'ui/tooltip/tooltip',
-    'ui/typeahead/typeahead',
-    'ui/url/url',
+    'ui/styleCompile',
+    'ui/timefilter',
+    'ui/timepicker',
+    'ui/tooltip',
+    'ui/typeahead',
+    'ui/url',
     'ui/validateDateInterval',
-    'ui/validate_query/validate_query',
+    'ui/validate_query',
     'ui/watch_multi'
   ];
 

src/server/ui/views/chrome.jade

@@ -1,4 +1,7 @@
 - var j = function (o) { return JSON.stringify(o); }
+- var appName = 'kibana';
+
+block vars
 
 doctype html
 html(lang='en')
@@ -9,6 +12,6 @@ html(lang='en')
     link(rel='shortcut icon', href='/ui/images/elk.ico')
     title Kibana
     block head
-  body(kbn-chrome)
+  body(kbn-chrome, id='#{appName}-body')
     script window.__KBN__ = !{j(kibanaPayload)};
     block content

src/server/ui/views/uiApp.jade

@@ -4,4 +4,4 @@ block head
   link(rel='stylesheet', href='/bundles/#{app.id}.style.css')
 
 block content
-  script(src='/bundles/#{app.id}.bundle.js')
+  script(src='/bundles/#{app.id}.bundle.js' src-map='/bundles/#{app.id}.bundle.js.map')

src/testUtils/stubIndexPattern.js

@@ -2,7 +2,7 @@ define(function (require) {
   return function (Private) {
     var _ = require('lodash');
     var sinon = require('sinon');
-    var IndexedArray = require('ui/indexed_array/index');
+    var IndexedArray = require('ui/IndexedArray');
     var IndexPattern = require('ui/index_patterns/_index_pattern');
     var fieldFormats = Private(require('ui/registry/field_formats'));
     var flattenHit = Private(require('ui/index_patterns/_flatten_hit'));

src/ui/IndexedArray/IndexedArray.js

@@ -2,9 +2,8 @@ define(function (require) {
 
   var _ = require('lodash');
 
-  var pathGetter = require('ui/indexed_array/_path_getter');
-  var inflector = require('ui/indexed_array/_inflector');
-
+  var inflector = require('ui/IndexedArray/inflector');
+  var pathGetter = _(_.get).rearg(1, 0).ary(2);
   var inflectIndex = inflector('by');
   var inflectOrder = inflector('in', 'Order');
 
@@ -74,7 +73,7 @@ define(function (require) {
     var self = this;
     return props.map(function (prop) {
 
-      var from = pathGetter(prop);
+      var from = pathGetter.partial(prop).value();
       var to = inflect(prop);
       var cache;
 

src/ui/IndexedArray/__tests__/IndexedArray.js

@@ -1,7 +1,7 @@
 
 var _ = require('lodash');
 var expect = require('expect.js');
-var IndexedArray = require('ui/indexed_array/index');
+var IndexedArray = require('ui/IndexedArray');
 
 // this is generally a data-structure that IndexedArray is good for managing
 var users = [
@@ -147,7 +147,4 @@ describe('IndexedArray', function () {
       expect(reg.byUsername).to.not.be(index);
     });
   });
-
-  require('./_inflector');
-  require('./_path_getter');
 });

src/ui/IndexedArray/__tests__/inflector.js

@@ -1,7 +1,7 @@
-var inflector = require('ui/indexed_array/_inflector');
+var inflector = require('ui/IndexedArray/inflector');
 var expect = require('expect.js');
 
-describe('Inflector', function () {
+describe('IndexedArray Inflector', function () {
   it('returns a function', function () {
     var getter = inflector();
     expect(getter).to.be.a('function');

src/ui/StackTraceMapper/StackTraceMapper.js

@@ -0,0 +1,143 @@
+var _ = require('lodash');
+var $ = require('jquery');
+var resolve = require('bluebird').resolve;
+var fetch = require('exports?window.fetch!imports?Promise=bluebird!whatwg-fetch');
+var SourceMapConsumer = require('source-map/lib/source-map/source-map-consumer').SourceMapConsumer;
+var parse = require('url').parse;
+
+var stackLineRE = (function () {
+  var opts = [
+    /@((?:[!#$&-;=?-\[\]_a-z~]|%[0-9a-f]{2})+\.js)\:(\d+)(?:\:(\d+)|())/ig,
+    /(?: \(|at )((?:[!#$&-;=?-\[\]_a-z~]|%[0-9a-f]{2})+\.js)\:(\d+)(?:\:(\d+)|())/ig
+  ];
+  var sample;
+  try { throw new Error('msg'); } catch (e) { sample = e.stack; }
+  var format = _.find(opts, function (format) { return format.test(sample); });
+
+  if (!format && window.console && window.console.log) {
+    window.console.log('unable to pick format with stack trace sample ' + sample);
+  }
+
+  return format;
+}());
+
+function StackTraceMapper() {
+  this.maps = [];
+
+  this.init = _.once(this.init);
+  this.getMapFor = _.memoize(this.getMapFor);
+  _.bindAll(this, 'init', 'mapError', 'getMapFor', 'mapLine', 'loadMaps');
+}
+
+StackTraceMapper.prototype.init = function () {
+  return this.loadMaps().return(this);
+};
+
+StackTraceMapper.prototype.mapError = function (err) {
+  if (!stackLineRE || !err.stack) return err;
+
+  // err.stack is not always writeable, so we
+  // have to replace the error. In order for the error
+  // to also serialize properly we copy all enumerable properties
+  // and extend the err object so it is still an instanceof Error
+
+  var props = _.mapValues(err, function (val) {
+    return {
+      enumerable: true,
+      value: val
+    };
+  });
+
+  props.stack = {
+    enumerable: true,
+    value: err.stack.replace(stackLineRE, this.mapLine)
+  };
+
+  return Object.create(err, props);
+};
+
+StackTraceMapper.prototype.getMapFor = function (url) {
+  return _.find(this.maps, function (map) {
+    return map.matchUrl(url);
+  });
+};
+
+StackTraceMapper.prototype.mapLine = function (match, url, urlLine, urlCol) {
+  var map = this.getMapFor(url);
+  if (!map) return match;
+
+  var position = {
+    line: parseFloat(urlLine) || 0,
+    column: parseFloat(urlCol) || 0
+  };
+  var orig = map.smc.originalPositionFor(position);
+
+  if (!orig || !orig.source) return match;
+
+  var source = orig.source;
+  var line = orig.line;
+  var column = orig.column;
+  if (column === 0 && position.column) {
+    // since our url isn't minified, we might need to remove this eventually
+    column = position.column;
+  }
+
+  // fold the components into the original match, so that supporting
+  // characters (parens, periods, etc) from the format are kept, and so
+  // we don't accidentally replace the wrong part we use splitting and consumption
+  var folds = _.compact([
+    [url, source],
+    [urlLine, line],
+    urlCol ? [urlCol, column] : false
+  ]);
+
+  var remains = match;
+  var resp = '';
+  while (folds.length) {
+    var fold = folds.shift();
+    var wrappingContent = remains.split(fold[0]);
+    resp += wrappingContent.shift() + fold[1];
+    remains = wrappingContent.join(fold[0]);
+  }
+
+  return resp;
+};
+
+StackTraceMapper.prototype.loadMaps = function () {
+  var maps = this.maps;
+
+  return resolve($('script[src][src-map]').toArray())
+  .map(function (el) {
+    var $el = $(el);
+    var url = $el.attr('src');
+    var mapUrl = $el.attr('src-map');
+    $el = null;
+
+    return fetch(mapUrl)
+    .then(function (resp) { return resp.json(); })
+    .then(function (map) {
+      maps.push(new SourceMapReader(url, map));
+    });
+  });
+};
+
+StackTraceMapper.getInstance = _.once(function () {
+  return (new StackTraceMapper()).init();
+});
+
+function SourceMapReader(url, map) {
+  this.smc = new SourceMapConsumer(map);
+  this.url = parse(url);
+  this.re = new RegExp('(^|/)' + _.escapeRegExp(this.url.pathname.slice(1)) + '($|\\?|#)');
+}
+
+SourceMapReader.prototype.matchUrl = function (stackFileName) {
+  return this.re.test(stackFileName);
+};
+
+SourceMapReader.prototype.transform = function (match, line, col) {
+
+};
+
+
+module.exports = StackTraceMapper;

src/ui/agg_response/geo_json/__tests__/geo_json.js

@@ -12,7 +12,7 @@ describe('GeoJson Agg Response Converter', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    var Vis = Private(require('ui/vis/vis'));
+    var Vis = Private(require('ui/Vis'));
     var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
 
     esResponse = Private(require('fixtures/agg_resp/geohash_grid'));

src/ui/agg_response/geo_json/rowsToFeatures.js

@@ -1,6 +1,6 @@
 define(function (require) {
   var decodeGeoHash = require('ui/utils/decode_geo_hash');
-  var AggConfigResult = require('ui/vis/AggConfigResult');
+  var AggConfigResult = require('ui/Vis/AggConfigResult');
   var _ = require('lodash');
 
   function getAcr(val) {

src/ui/agg_response/hierarchical/__tests__/build_hierarchical_data.js

@@ -19,8 +19,8 @@ describe('buildHierarchicalData()', function () {
     Notifier = $injector.get('Notifier');
     sinon.stub(Notifier.prototype, 'error');
 
-    Vis = Private(require('ui/vis/vis'));
-    AggConfigs = Private(require('ui/vis/AggConfigs'));
+    Vis = Private(require('ui/Vis'));
+    AggConfigs = Private(require('ui/Vis/AggConfigs'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
     buildHierarchicalData = Private(require('ui/agg_response/hierarchical/build_hierarchical_data'));
   }));

src/ui/agg_response/hierarchical/__tests__/create_raw_data.js

@@ -17,8 +17,8 @@ describe('buildHierarchicalData()', function () {
     beforeEach(ngMock.module('kibana'));
 
     beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(require('ui/vis/vis'));
-      AggConfigs = Private(require('ui/vis/AggConfigs'));
+      Vis = Private(require('ui/Vis'));
+      AggConfigs = Private(require('ui/Vis/AggConfigs'));
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
     }));
 

src/ui/agg_response/hierarchical/_transform_aggregation.js

@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
   return function transformAggregationProvider(Private) {
-    var AggConfigResult = require('ui/vis/AggConfigResult');
+    var AggConfigResult = require('ui/Vis/AggConfigResult');
     return function transformAggregation(agg, metric, aggData, parent) {
       return _.map(extractBuckets(aggData), function (bucket) {
         var aggConfigResult = new AggConfigResult(

src/ui/agg_response/hierarchical/build_hierarchical_data.js

@@ -7,7 +7,7 @@ define(function (require) {
     var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
     var tooltipFormatter = Private(require('ui/agg_response/hierarchical/_hierarchical_tooltip_formatter'));
 
-    var AggConfigResult = require('ui/vis/AggConfigResult');
+    var AggConfigResult = require('ui/Vis/AggConfigResult');
 
     var notify = new Notifier({
       location: 'Pie chart response converter'

src/ui/agg_response/point_series/__tests__/_fake_x_aspect.js

@@ -10,10 +10,10 @@ describe('makeFakeXAspect', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    Vis = Private(require('ui/vis/vis'));
-    AggConfig = Private(require('ui/vis/AggConfig'));
-    AggType = Private(require('ui/agg_types/_agg_type'));
-    indexPattern = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
+    AggType = Private(require('ui/agg_types/AggType'));
+    indexPattern = Private(require('ui/Vis'));
     makeFakeXAspect = Private(require('ui/agg_response/point_series/_fake_x_aspect'));
   }));
 

src/ui/agg_response/point_series/__tests__/_get_aspects.js

@@ -12,9 +12,9 @@ describe('getAspects', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
     Table = Private(require('ui/agg_response/point_series/_add_to_siri'));
-    AggConfig = Private(require('ui/vis/AggConfig'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
     getAspects = Private(require('ui/agg_response/point_series/_get_aspects'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
   }));

src/ui/agg_response/point_series/__tests__/_main.js

@@ -3,7 +3,7 @@ describe('pointSeriesChartDataFromTable', function () {
 
   var _ = require('lodash');
   var moment = require('moment');
-  var AggConfigResult = require('ui/vis/AggConfigResult');
+  var AggConfigResult = require('ui/Vis/AggConfigResult');
   var expect = require('expect.js');
   var ngMock = require('ngMock');
 
@@ -14,7 +14,7 @@ describe('pointSeriesChartDataFromTable', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
     Table = Private(require('ui/agg_response/tabify/_table'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
     pointSeriesChartDataFromTable = Private(require('ui/agg_response/point_series/point_series'));

src/ui/agg_response/point_series/_fake_x_aspect.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function PointSeriesFakeXAxis(Private) {
-    var AggConfig = Private(require('ui/vis/AggConfig'));
-    var AggType = Private(require('ui/agg_types/_agg_type'));
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
+    var AggType = Private(require('ui/agg_types/AggType'));
 
     var allAgg = new AggType({
       name: 'all',

src/ui/agg_response/tabify/__tests__/_get_columns.js

@@ -8,7 +8,7 @@ describe('get columns', function () {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
     getColumns = Private(require('ui/agg_response/tabify/_get_columns'));
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
   }));
 

src/ui/agg_response/tabify/__tests__/_integration.js

@@ -12,7 +12,7 @@ describe('tabifyAggResponse Integration', function () {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
     tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
   }));
 

src/ui/agg_response/tabify/__tests__/_response_writer.js

@@ -27,7 +27,7 @@ describe('ResponseWriter class', function () {
       TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
       Buckets = Private(require('ui/agg_response/tabify/_buckets'));
       Table = Private(require('ui/agg_response/tabify/_table'));
-      Vis = Private(require('ui/vis/vis'));
+      Vis = Private(require('ui/Vis'));
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
     }));
   }

src/ui/agg_response/tabify/_get_columns.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function GetColumnsProvider(Private) {
     var _ = require('lodash');
-    var AggConfig = Private(require('ui/vis/AggConfig'));
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
 
     return function getColumns(vis, minimal) {
       var aggs = vis.aggs.getResponseAggs();

src/ui/agg_response/tabify/_response_writer.js

@@ -5,7 +5,7 @@ define(function (require) {
     var TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
     var getColumns = Private(require('ui/agg_response/tabify/_get_columns'));
 
-    var AggConfigResult = require('ui/vis/AggConfigResult');
+    var AggConfigResult = require('ui/Vis/AggConfigResult');
 
     _.class(SplitAcr).inherits(AggConfigResult);
     function SplitAcr(agg, parent, key) {

src/ui/agg_response/tabify/tabify.js

@@ -2,7 +2,7 @@ define(function (require) {
   return function tabifyAggResponseProvider(Private, Notifier) {
     var _ = require('lodash');
 
-    var AggConfig = Private(require('ui/vis/AggConfig'));
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
     var TabbedAggResponseWriter = Private(require('ui/agg_response/tabify/_response_writer'));
     var Buckets = Private(require('ui/agg_response/tabify/_buckets'));
     var notify = new Notifier({ location: 'agg_response/tabify'});

src/ui/agg_table/__tests__/_group.js

@@ -15,7 +15,7 @@ describe('AggTableGroup Directive', function () {
   beforeEach(ngMock.inject(function ($injector, Private) {
     tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
 
     $rootScope = $injector.get('$rootScope');
     $compile = $injector.get('$compile');

src/ui/agg_table/__tests__/_table.js

@@ -16,7 +16,7 @@ describe('AggTable Directive', function () {
   beforeEach(ngMock.inject(function ($injector, Private) {
     tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
 
     $rootScope = $injector.get('$rootScope');
     $compile = $injector.get('$compile');

src/ui/agg_table/agg_table.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  require('ui/paginated_table/paginated_table');
+  require('ui/paginated_table');
   require('ui/compile_recursive_directive');
   require('ui/agg_table/agg_table.less');
 

src/ui/agg_table/agg_table_group.js

@@ -1,6 +1,6 @@
 define(function (require) {
   require('ui/compile_recursive_directive');
-  require('ui/agg_table/agg_table');
+  require('ui/agg_table');
 
   require('ui/modules')
   .get('kibana')

src/ui/agg_types/AggParams.js

@@ -3,7 +3,7 @@ define(function (require) {
     require('ui/filters/label');
 
     var _ = require('lodash');
-    var IndexedArray = require('ui/indexed_array/index');
+    var IndexedArray = require('ui/IndexedArray');
 
     var paramTypeMap = {
       field: Private(require('ui/agg_types/param_types/field')),

src/ui/agg_types/AggType.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function AggTypeFactory(Private) {
     var _ = require('lodash');
-    var AggParams = Private(require('ui/agg_types/_agg_params'));
+    var AggParams = Private(require('ui/agg_types/AggParams'));
     var fieldFormats = Private(require('ui/registry/field_formats'));
 
     /**

src/ui/agg_types/README.md

@@ -1,18 +0,0 @@
-| Private | module id |
-| --- | --- |
-| `true` | `ui/agg_config/index` |
-
-```js
-var aggTypes = Private(require('ui/agg_types/index'));
-```
-
-Collection of `AggType` definition objects. See the [Vis component](../vis) for an overall explaination of how `AggTypes` are used.
-
-### Included
-
-  - [`AggType`](_agg_type.js)
-  - `AggParam`
-    - [`BaseAggParam`](param_types/base.js)
-    - [`FieldAggParam`](param_types/field.js)
-    - [`OptionedAggParam`](param_types/optioned.js)
-  - [`AggParams`](_agg_params.js)

src/ui/agg_types/__tests__/AggParams.js

@@ -14,7 +14,7 @@ describe('AggParams class', function () {
   beforeEach(ngMock.inject(require('./utils/_stub_agg_params')));
   // fetch out deps
   beforeEach(ngMock.inject(function (Private) {
-    AggParams = Private(require('ui/agg_types/_agg_params'));
+    AggParams = Private(require('ui/agg_types/AggParams'));
     BaseAggParam = Private(require('ui/agg_types/param_types/base'));
     FieldAggParam = Private(require('ui/agg_types/param_types/field'));
     OptionedAggParam = Private(require('ui/agg_types/param_types/optioned'));

src/ui/agg_types/__tests__/AggType.js

@@ -14,14 +14,14 @@ describe('AggType Class', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    var AggParamsPM = require('ui/agg_types/_agg_params');
+    var AggParamsPM = require('ui/agg_types/AggParams');
     AggParams = sinon.spy(Private(AggParamsPM));
     Private.stub(AggParamsPM, AggParams);
 
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
     fieldFormat = Private(require('ui/registry/field_formats'));
-    AggType = Private(require('ui/agg_types/_agg_type'));
-    AggConfig = Private(require('ui/vis/AggConfig'));
+    AggType = Private(require('ui/agg_types/AggType'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
   }));
 

src/ui/agg_types/__tests__/aggParamWriter.js

@@ -1,6 +1,6 @@
 module.exports = function AggParamWriterHelper(Private) {
   var _ = require('lodash');
-  var Vis = Private(require('ui/vis/vis'));
+  var Vis = Private(require('ui/Vis'));
   var aggTypes = Private(require('ui/agg_types/index'));
   var visTypes = Private(require('ui/registry/vis_types'));
   var stubbedLogstashIndexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

src/ui/agg_types/__tests__/bucketCountBetween.js

@@ -18,10 +18,10 @@ describe('bucketCountBetween util', function () {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
     visTypes = Private(require('ui/registry/vis_types'));
     aggTypes = Private(require('ui/agg_types/index'));
-    AggConfig = Private(require('ui/vis/AggConfig'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
     bucketCountBetween = Private(require('ui/agg_types/buckets/_bucket_count_between'));
   }));
 

src/ui/agg_types/__tests__/buckets/_histogram.js

@@ -26,7 +26,7 @@ describe('Histogram Agg', function () {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      var AggParamWriter = Private(require('../aggParamWriter'));
+      var AggParamWriter = Private(require('../AggParamWriter'));
       paramWriter = new AggParamWriter({ aggType: 'histogram' });
     }));
 

src/ui/agg_types/__tests__/buckets/create_filter/date_histogram.js

@@ -21,10 +21,10 @@ describe('AggConfig Filters', function () {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private, $injector) {
-      var Vis = Private(require('ui/vis/vis'));
+      var Vis = Private(require('ui/Vis'));
       var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
       var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
-      var TimeBuckets = Private(require('ui/time_buckets/time_buckets'));
+      var TimeBuckets = Private(require('ui/time_buckets'));
       intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
 
       init = function (interval, duration) {

src/ui/agg_types/__tests__/buckets/create_filter/date_range.js

@@ -12,8 +12,8 @@ describe('AggConfig Filters', function () {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(require('ui/vis/vis'));
-      AggConfig = Private(require('ui/vis/AggConfig'));
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
       createFilter = Private(require('ui/agg_types/buckets/create_filter/date_range'));
     }));

src/ui/agg_types/__tests__/buckets/create_filter/filters.js

@@ -12,8 +12,8 @@ describe('AggConfig Filters', function () {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(require('ui/vis/vis'));
-      AggConfig = Private(require('ui/vis/AggConfig'));
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
       createFilter = Private(require('ui/agg_types/buckets/create_filter/filters'));
     }));

src/ui/agg_types/__tests__/buckets/create_filter/histogram.js

@@ -12,8 +12,8 @@ describe('AggConfig Filters', function () {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(require('ui/vis/vis'));
-      AggConfig = Private(require('ui/vis/AggConfig'));
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
       createFilter = Private(require('ui/agg_types/buckets/create_filter/histogram'));
     }));

src/ui/agg_types/__tests__/buckets/create_filter/ip_range.js

@@ -11,8 +11,8 @@ describe('AggConfig Filters', function () {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(require('ui/vis/vis'));
-      AggConfig = Private(require('ui/vis/AggConfig'));
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
       createFilter = Private(require('ui/agg_types/buckets/create_filter/ip_range'));
     }));

src/ui/agg_types/__tests__/buckets/create_filter/range.js

@@ -11,8 +11,8 @@ describe('AggConfig Filters', function () {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(require('ui/vis/vis'));
-      AggConfig = Private(require('ui/vis/AggConfig'));
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
       createFilter = Private(require('ui/agg_types/buckets/create_filter/range'));
     }));

src/ui/agg_types/__tests__/buckets/create_filter/terms.js

@@ -11,8 +11,8 @@ describe('AggConfig Filters', function () {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(require('ui/vis/vis'));
-      AggConfig = Private(require('ui/vis/AggConfig'));
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
       createFilter = Private(require('ui/agg_types/buckets/create_filter/terms'));
     }));

src/ui/agg_types/__tests__/buckets/date_histogram/_editor.js

@@ -14,7 +14,7 @@ describe('editor', function () {
   beforeEach(ngMock.inject(function (Private, $injector, $compile) {
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
 
-    var Vis = Private(require('ui/vis/vis'));
+    var Vis = Private(require('ui/Vis'));
 
     /**
      * Render the AggParams editor for the date histogram aggregation

src/ui/agg_types/__tests__/buckets/date_histogram/_params.js

@@ -14,13 +14,13 @@ describe('params', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
-    var AggParamWriter = Private(require('../../aggParamWriter'));
+    var AggParamWriter = Private(require('../../AggParamWriter'));
     var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
     var timefilter = $injector.get('timefilter');
 
     timeField = indexPattern.timeFieldName;
     aggTypes = Private(require('ui/agg_types/index'));
-    AggConfig = Private(require('ui/vis/AggConfig'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
 
     paramWriter = new AggParamWriter({ aggType: 'date_histogram' });
     writeInterval = function (interval) {

src/ui/agg_types/__tests__/controls/number_list.js

@@ -6,7 +6,7 @@ describe('NumberList directive', function () {
   var simulateKeys = require('testUtils/simulateKeys');
   var ngMock = require('ngMock');
 
-  require('ui/number_list/number_list');
+  require('ui/number_list');
 
   var $el;
   var $scope;

src/ui/agg_types/__tests__/index.js

@@ -2,9 +2,9 @@ var expect = require('expect.js');
 var ngMock = require('ngMock');
 
 describe('AggTypesComponent', function () {
-  require('./_agg_type');
-  require('./_agg_params');
-  require('./_bucket_count_between');
+  require('./AggType');
+  require('./AggParams');
+  require('./bucketCountBetween');
   require('./buckets/_histogram');
 
   describe('bucket aggs', function () {
@@ -31,7 +31,7 @@ describe('AggTypesComponent', function () {
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       metricAggs = Private(require('ui/agg_types/index')).byType.metrics;
-      MetricAggType = Private(require('ui/agg_types/metrics/_metric_agg_type'));
+      MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
     }));
 
     it('all extend MetricAggType', function () {

src/ui/agg_types/__tests__/param_types/_calculate_interval.js

@@ -12,8 +12,8 @@ describe('calculateInterval()', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    Vis = Private(require('ui/vis/vis'));
-    AggConfig = Private(require('ui/vis/AggConfig'));
+    Vis = Private(require('ui/Vis'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
     calculateInterval = Private(require('ui/agg_types/param_types/_calculate_interval'));
   }));

src/ui/agg_types/__tests__/param_types/_regex.js

@@ -13,7 +13,7 @@ describe('Regex', function () {
   beforeEach(ngMock.inject(function (Private) {
     BaseAggParam = Private(require('ui/agg_types/param_types/base'));
     RegexAggParam = Private(require('ui/agg_types/param_types/regex'));
-    Vis = Private(require('ui/vis/vis'));
+    Vis = Private(require('ui/Vis'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
   }));
 

src/ui/agg_types/buckets/_bucket_agg_type.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function BucketAggTypeProvider(Private) {
     var _ = require('lodash');
-    var AggType = Private(require('ui/agg_types/_agg_type'));
+    var AggType = Private(require('ui/agg_types/AggType'));
 
     _.class(BucketAggType).inherits(AggType);
     function BucketAggType(config) {

src/ui/agg_types/buckets/_bucket_count_between.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  return function BucketCountBetweenUtil() {
+  return function BucketCountBetweenProvider() {
 
     /**
      * Count the number of bucket aggs between two agg config objects owned
@@ -41,4 +41,4 @@ define(function (require) {
 
     return bucketCountBetween;
   };
-});
+});

src/ui/agg_types/buckets/create_filter/ip_range.js

@@ -1,5 +1,5 @@
 define(function (require) {
-  var CidrMask = require('ui/utils/cidr_mask');
+  var CidrMask = require('ui/utils/CidrMask');
   var buildRangeFilter = require('ui/filter_manager/lib/range');
   return function createIpRangeFilterProvider() {
     return function (aggConfig, key) {
@@ -17,4 +17,4 @@ define(function (require) {
       return buildRangeFilter(aggConfig.params.field, {gte: range.from, lte: range.to}, aggConfig.vis.indexPattern);
     };
   };
-});
+});

src/ui/agg_types/buckets/date_histogram.js

@@ -3,7 +3,7 @@ define(function (require) {
     var _ = require('lodash');
     var moment = require('moment');
     var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var TimeBuckets = Private(require('ui/time_buckets/time_buckets'));
+    var TimeBuckets = Private(require('ui/time_buckets'));
     var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
     var intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
 

src/ui/agg_types/buckets/terms.js

@@ -3,8 +3,8 @@ define(function (require) {
     var _ = require('lodash');
     var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
     var bucketCountBetween = Private(require('ui/agg_types/buckets/_bucket_count_between'));
-    var AggConfig = Private(require('ui/vis/AggConfig'));
-    var Schemas = Private(require('ui/vis/Schemas'));
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
     var createFilter = Private(require('ui/agg_types/buckets/create_filter/terms'));
 
     var orderAggSchema = (new Schemas([

src/ui/agg_types/index.js

@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeService(Private) {
-    var IndexedArray = require('ui/indexed_array/index');
+    var IndexedArray = require('ui/IndexedArray');
 
     var aggs = {
       metrics: [
@@ -10,7 +10,7 @@ define(function (require) {
         Private(require('ui/agg_types/metrics/median')),
         Private(require('ui/agg_types/metrics/min')),
         Private(require('ui/agg_types/metrics/max')),
-        Private(require('ui/agg_types/metrics/std_deviation')),
+        Private(require('ui/agg_types/metrics/stdDeviation')),
         Private(require('ui/agg_types/metrics/cardinality')),
         Private(require('ui/agg_types/metrics/percentiles')),
         Private(require('ui/agg_types/metrics/percentile_ranks'))

src/ui/agg_types/metrics/MetricAggType.js

@@ -1,7 +1,7 @@
 define(function (require) {
   return function MetricAggTypeProvider(Private) {
     var _ = require('lodash');
-    var AggType = Private(require('ui/agg_types/_agg_type'));
+    var AggType = Private(require('ui/agg_types/AggType'));
     var fieldFormats = Private(require('ui/registry/field_formats'));
 
     _.class(MetricAggType).inherits(AggType);

src/ui/agg_types/metrics/avg.js

@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricAvgProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/_metric_agg_type'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'avg',

src/ui/agg_types/metrics/cardinality.js

@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricCardinalityProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/_metric_agg_type'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
     var fieldFormats = Private(require('ui/registry/field_formats'));
 
     return new MetricAggType({

src/ui/agg_types/metrics/count.js

@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricCountProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/_metric_agg_type'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
     var fieldFormats = Private(require('ui/registry/field_formats'));
 
     return new MetricAggType({

src/ui/agg_types/metrics/max.js

@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricMaxProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/_metric_agg_type'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'max',

src/ui/agg_types/metrics/median.js

@@ -1,8 +1,8 @@
 define(function (require) {
   return function AggTypeMetricMaxProvider(Private) {
     var _ = require('lodash');
-    var MetricAggType = Private(require('ui/agg_types/metrics/_metric_agg_type'));
-    var getResponseAggConfig = Private(require('ui/agg_types/metrics/_get_response_agg_config'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
     var percentiles = Private(require('ui/agg_types/metrics/percentiles'));
 
     return new MetricAggType({

src/ui/agg_types/metrics/min.js

@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricMinProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/_metric_agg_type'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'min',