unwrap ui source

Gruntfile.js

@@ -8,7 +8,7 @@ module.exports = function (grunt) {
     src: __dirname + '/src',
     build: __dirname + '/build', // temporary build directory
     plugins: __dirname + '/src/plugins',
-    server: __dirname + '/src/KbnServer',
+    server: __dirname + '/src/server',
     target: __dirname + '/target', // location of the compressed build targets
     configFile: __dirname + '/src/config/kibana.yml',
 

src/KbnServer/ui/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/bin/kibana.sh

@@ -15,7 +15,7 @@ done
 
 DIR=$(dirname "${SCRIPT}")/..
 NODE=${DIR}/node/bin/node
-SERVER=${DIR}/src/kibana/cli
+SERVER=${DIR}/src/server/cli
 
 CONFIG_PATH="${DIR}/config/kibana.yml" NODE_ENV="production" exec "${NODE}" ${SERVER} ${@}
 

src/dev_server/index.js

@@ -1,7 +1,7 @@
 var _ = require('lodash');
 var join = require('path').join;
 
-var KbnServer = require('../KbnServer/KbnServer');
+var KbnServer = require('../server/KbnServer');
 
 function run(port, quiet) {
   return (new KbnServer({

src/server/KbnServer.js

@@ -3,9 +3,8 @@ var Promise = require('bluebird');
 var Hapi = require('hapi');
 var dirname = require('path').dirname;
 
-var packagePath = require('./utils/closestPackageJson').findSync();
-var rootDir = dirname(packagePath);
-var package = require(packagePath);
+var rootDir = require('./utils/fromRoot')('.');
+var package = require('./utils/closestPackageJson').getSync();
 
 function KbnServer(settings) {
   this.name = package.name;

src/server/ui/findModuleIds.js

@@ -4,13 +4,14 @@ var basename = require('path').basename;
 var readdir = require('fs').readdirSync;
 var stat = require('fs').statSync;
 var exists = require('fs').existsSync;
+var uiDir = require('./uiDir');
 
 function hidden(name) {
   return name[0] !== '.' && name[0] !== '_';
 }
 
 function scan(type) {
-  var dir = join(__dirname, '..', 'public', type);
+  var dir = join(uiDir, type);
 
   return readdir(dir)
   .filter(hidden)

src/server/ui/index.js

@@ -6,11 +6,11 @@ module.exports = function (kibana, server, config) {
   var stat = require('fs').statSync;
   var relative = require('path').relative;
 
-  var UiExports = require('./lib/UiExports');
-  var defaultModuleIds = require('./lib/defaultModuleIds');
-  var findBowerComponents = require('./lib/findBowerComponents');
+  var UiExports = require('./UiExports');
+  var defaultModuleIds = require('./defaultModuleIds');
+  var findBowerComponents = require('./findBowerComponents');
 
-  var publicDir = join(__dirname, 'public');
+  var uiDir = require('./uiDir');
 
   // setup jade for templates
   server.views({
@@ -20,6 +20,7 @@ module.exports = function (kibana, server, config) {
     }
   });
 
+  // export manager
   kibana.uiExports = new UiExports(defaultModuleIds());
 
   server.decorate('server', 'getApps', function () {
@@ -72,11 +73,11 @@ module.exports = function (kibana, server, config) {
   // in this directory and moving out
   server.exposeStaticDir('/bower_components/{path*}', findBowerComponents(__dirname, kibana.rootDir));
 
-  // expose our public files at the server root
+  // expose our public files at the server root explicitly, rather than with a catch all route
   require('fs')
-  .readdirSync(publicDir)
+  .readdirSync(uiDir)
   .forEach(function (name) {
-    var path = join(publicDir, name);
+    var path = join(uiDir, name);
 
     if (stat(path).isDirectory()) {
       server.exposeStaticDir('/' + name + '/{path*}', path);

src/server/ui/uiDir.js

@@ -0,0 +1 @@
+module.exports = require('../utils/fromRoot')('src/ui');

src/server/utils/fromRoot.js

@@ -0,0 +1,7 @@
+var dirname = require('path').dirname;
+var join = require('path').join;
+var root = dirname(require('./closestPackageJson').findSync());
+
+module.exports = function (dir) {
+  return join(root, dir);
+};

src/ui/.jshintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.jshintrc.browser"
+}