[Status] Gave the Status page it's own require config. also reverted …

…the old kibana one
elastic · Jun 29, 2015 · 8d33e9f · 8d33e9f
1 parent f076bca
commit 8d33e9f
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 20 deletions.
diff --git a/src/kibana/require.config.js b/src/kibana/require.config.js
@@ -6,7 +6,7 @@ require.config({
     routes: 'utils/routes/index',
     errors: 'components/errors',
     modules: 'utils/modules',
-    lodash: '/utils/lodash-mixins/index',
+    lodash: 'utils/lodash-mixins/index',
 
     // bower_components
     'angular-bindonce': 'bower_components/angular-bindonce/bindonce',
@@ -16,28 +16,26 @@ require.config({
     'angular-ui-ace': 'bower_components/angular-ui-ace/ui-ace',
     ace: 'bower_components/ace-builds/src-noconflict/ace',
     'ace-json': 'bower_components/ace-builds/src-noconflict/mode-json',
-    angular: '/bower_components/angular/angular',
+    angular: 'bower_components/angular/angular',
     async: 'bower_components/async/lib/async',
     bower_components: 'bower_components',
-    css: '/bower_components/require-css/css',
-    d3: '/bower_components/d3/d3',
-    nvd3: '/bower_components/nvd3/build/nv.d3',
-    nvd3_directives: '/bower_components/angular-nvd3/dist/angular-nvd3',
+    css: 'bower_components/require-css/css',
+    d3: 'bower_components/d3/d3',
     elasticsearch: 'bower_components/elasticsearch/elasticsearch.angular',
     faker: 'bower_components/Faker/faker',
     file_saver: 'bower_components/FileSaver/FileSaver',
     gridster: 'bower_components/gridster/dist/jquery.gridster',
     'leaflet-heat': 'bower_components/Leaflet.heat/dist/leaflet-heat',
-    jquery: '/bower_components/jquery/dist/jquery',
+    jquery: 'bower_components/jquery/dist/jquery',
     leaflet: 'bower_components/leaflet/dist/leaflet',
     'leaflet-draw': 'bower_components/leaflet-draw/dist/leaflet.draw',
-    lodash_src: '/bower_components/lodash/lodash',
-    moment: '/bower_components/moment/moment',
+    lodash_src: 'bower_components/lodash/lodash',
+    moment: 'bower_components/moment/moment',
     'ng-clip': 'bower_components/ng-clip/src/ngClip',
     text: 'bower_components/requirejs-text/text',
     zeroclipboard: 'bower_components/zeroclipboard/dist/ZeroClipboard',
     marked: 'bower_components/marked/lib/marked',
-    numeral: '/bower_components/numeral/numeral'
+    numeral: 'bower_components/numeral/numeral'
   },
   shim: {
     angular: {
@@ -66,9 +64,7 @@ require.config({
     },
     marked: {
       exports: 'marked'
-    },
-    nvd3: ['css!/bower_components/nvd3/build/nv.d3.css', 'd3'],
-    nvd3_directives: ['angular', 'd3', 'nvd3']
+    }
   },
   waitSeconds: 60
 });
diff --git a/src/kibana/utils/lodash-mixins/index.js b/src/kibana/utils/lodash-mixins/index.js
@@ -10,11 +10,11 @@ define(function (require) {
    * of lodash.
    */
   var _ = require('lodash_src').runInContext();
-  require('/utils/lodash-mixins/string.js')(_);
-  require('/utils/lodash-mixins/lang.js')(_);
-  require('/utils/lodash-mixins/object.js')(_);
-  require('/utils/lodash-mixins/collection.js')(_);
-  require('/utils/lodash-mixins/function.js')(_);
-  require('/utils/lodash-mixins/oop.js')(_);
+  require('utils/lodash-mixins/string')(_);
+  require('utils/lodash-mixins/lang')(_);
+  require('utils/lodash-mixins/object')(_);
+  require('utils/lodash-mixins/collection')(_);
+  require('utils/lodash-mixins/function')(_);
+  require('utils/lodash-mixins/oop')(_);
   return _;
 });
diff --git a/src/server/plugins/status/public/index.html b/src/server/plugins/status/public/index.html
@@ -54,7 +54,7 @@ <h4 class="average">
       <footer></footer>
     </div>
     <script type="text/javascript" src="/bower_components/requirejs/require.js?_b=@@buildNum"></script>
-    <script type="text/javascript" src="/require.config.js?_b=@@buildNum"></script>
+    <script type="text/javascript" src="/status/require.config.js?_b=@@buildNum"></script>
     <script type="text/javascript">
       require(['/status/index.js'], function(kibanaStatus) { kibanaStatus.init(); });
     </script>

diff --git a/src/server/plugins/status/public/require.config.js b/src/server/plugins/status/public/require.config.js
@@ -0,0 +1,23 @@
+require.config({
+  baseUrl: '/',
+  paths: {
+    angular: '/bower_components/angular/angular',
+    css: '/bower_components/require-css/css',
+    d3: '/bower_components/d3/d3',
+    jquery: '/bower_components/jquery/dist/jquery',
+    lodash: '/utils/lodash-mixins/index',
+    lodash_src: '/bower_components/lodash/lodash',
+    moment: '/bower_components/moment/moment',
+    nvd3: '/bower_components/nvd3/build/nv.d3',
+    nvd3_directives: '/bower_components/angular-nvd3/dist/angular-nvd3',
+    numeral: '/bower_components/numeral/numeral'
+  },
+  shim: {
+    angular: {
+      deps: ['jquery'],
+      exports: 'angular'
+    },
+    nvd3: ['css!bower_components/nvd3/build/nv.d3.css', 'd3'],
+    nvd3_directives: ['angular', 'nvd3']
+  }
+});