removed the dev server and cleaned up package.json

package.json

@@ -24,11 +24,10 @@
     "Lukas Olson <[email protected]>"
   ],
   "scripts": {
+    "test": "grunt test",
     "start": "node ./src/server/bin/kibana.js",
-    "test": "grunt test --use-jruby",
-    "server": "grunt server",
-    "precommit": "grunt hintStagedFiles",
-    "prepush": "echo"
+    "server": "node ./src/server/bin/kibana.js",
+    "precommit": "grunt hintStagedFiles"
   },
   "repository": {
     "type": "git",
@@ -93,17 +92,6 @@
     "simple-git": "^0.11.0",
     "tar": "^1.0.1"
   },
-  "scripts": {
-    "test": "grunt test --use-jruby",
-    "server": "grunt server",
-    "precommit": "grunt hintStagedFiles",
-    "prepush": "echo"
-  },
-  "repository": {
-    "type": "git",
-    "url": "[email protected]:elasticsearch/kibana.git"
-  },
-  "author": "",
   "license": "Apache 2.0",
   "bugs": {
     "url": "https://github.com/elasticsearch/kibana/issues"

src/server/app.js

@@ -19,6 +19,10 @@ app.set('view engine', 'jade');
 app.use(favicon(path.join(config.public_folder, 'styles', 'theme', 'elk.ico')));
 app.use(requestLogger());
 
+if (app.get('env') === 'development') {
+  require('./dev')(app);
+}
+
 // The proxy must be set up before all the other middleware.
 // TODO: WE might want to move the middleware to each of the individual routes
 // so we don't have weird conflicts in the future.

src/server/dev/index.js

@@ -0,0 +1,56 @@
+/* jshint node:true */
+
+var express = require('express');
+var instrumentationMiddleware = require('./_instrumentation');
+var amdRapperMiddleware = require('./_amd_rapper');
+
+var glob = require('glob');
+var path = require('path');
+var join = path.join;
+var rel = join.bind(null, __dirname);
+var ROOT = rel('../../../');
+var SRC = join(ROOT, 'src');
+var APP = join(SRC, 'kibana');
+var TEST = join(ROOT, 'test');
+
+module.exports = function (app) {
+  app.use(instrumentationMiddleware({
+    root: SRC,
+    displayRoot: SRC,
+    filter: function (filename) {
+      return filename.match(/.*\/src\/.*\.js$/)
+        && !filename.match(/.*\/src\/kibana\/bower_components\/.*\.js$/)
+        && !filename.match(/.*\/src\/kibana\/utils\/(event_emitter|next_tick|rison)\.js$/);
+    }
+  }));
+
+  app.use(instrumentationMiddleware({
+    root: APP,
+    displayRoot: SRC,
+    filter: function (filename) {
+      return filename.match(/.*\/src\/.*\.js$/)
+        && !filename.match(/.*\/src\/kibana\/bower_components\/.*\.js$/)
+        && !filename.match(/.*\/src\/kibana\/utils\/(event_emitter|next_tick|rison)\.js$/);
+    }
+  }));
+
+  app.use(amdRapperMiddleware({
+    root: ROOT
+  }));
+
+  app.use('/test', express.static(TEST));
+  app.use('/specs', function (req, res) {
+    var unit = join(ROOT, '/test/unit/');
+    glob(join(unit, 'specs/**/*.js'), function (er, files) {
+      var moduleIds = files
+      .filter(function (filename) {
+        return path.basename(filename).charAt(0) !== '_';
+      })
+      .map(function (filename) {
+        return path.relative(unit, filename).replace(/\.js$/, '');
+      });
+
+      res.end(JSON.stringify(moduleIds));
+    });
+  });
+};

tasks/dev.js

@@ -7,7 +7,6 @@ module.exports = function (grunt) {
       'jade',
       'esvm:dev',
       'maybe_start_kibana',
-      'maybe_start_server',
       'watch'
     ];
 

tasks/maybe_connect_dev.js

@@ -39,11 +39,6 @@ module.exports = function (grunt) {
       req.end();
     };
   };
-  grunt.registerTask('maybe_start_server', maybeStartServer({
-    name: 'connect-server',
-    port: 8000,
-    tasks: ['server']
-  }));
   grunt.registerTask('maybe_start_kibana', maybeStartServer({
     name: 'kibana-server',
     port: 5601,

tasks/test.js

@@ -25,7 +25,6 @@ module.exports = function (grunt) {
     var tasks = [
       'jshint',
       'maybe_start_kibana',
-      'maybe_start_server',
       'jade',
       'less',
       getTestTask()
@@ -36,7 +35,6 @@ module.exports = function (grunt) {
   grunt.registerTask('quick-test', function () {
     var tasks = [
       'maybe_start_kibana',
-      'maybe_start_server',
       getTestTask()
     ];
     grunt.task.run(tasks);
@@ -45,13 +43,11 @@ module.exports = function (grunt) {
   grunt.registerTask('coverage', [
     'blanket',
     'maybe_start_kibana',
-    'maybe_start_server',
     'mocha:coverage'
   ]);
 
   grunt.registerTask('test:watch', [
     'maybe_start_kibana',
-    'maybe_start_server',
     'watch:test'
   ]);
 };