unwrap watch directory

src/commands/serve/serve.js

@@ -56,7 +56,7 @@ module.exports = function (program) {
 
     if (opts.dev && opts.watch && !isWorker) {
       // stop processing the action and handoff to watch cluster manager
-      return require('./watch/watch');
+      return require('../watch/watch');
     }
 
     let settings = readYamlConfig(opts.config || fromRoot('config/kibana.yml'));

src/commands/serve/watch/log.js

@@ -1,13 +0,0 @@
-'use strict';
-
-let _ = require('lodash');
-let ansicolors = require('ansicolors');
-
-let log = _.restParam(function (color, label, rest1) {
-  console.log.apply(console, [color(` ${_.trim(label)} `)].concat(rest1));
-});
-
-let color = require('../../../cli/color');
-exports.green = _.partial(log, color.green);
-exports.red = _.partial(log, color.red);
-exports.yellow = _.partial(log, color.yellow);

src/commands/watch/Worker.js

@@ -5,9 +5,10 @@ let cluster = require('cluster');
 let resolve = require('path').resolve;
 let EventEmitter = require('events').EventEmitter;
 
-let log = require('./log');
+let log = require('../../cli/log');
+let fromRoot = require('../../utils/fromRoot');
 
-let cliPath = resolve(__dirname, '../../../cli/cli.js');
+let cliPath = fromRoot('src/cli/cli.js');
 let baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);
 let baseArgv = [process.execPath, cliPath].concat(baseArgs);
 

src/commands/watch/watch.js

@@ -1,20 +1,23 @@
 'use strict';
 
+let cluster = require('cluster');
+let join = require('path').join;
+
 let _ = require('lodash');
 let Gaze = require('gaze').Gaze;
-let join = require('path').join;
 
-let log = require('./log');
-let cluster = require('cluster');
+let log = require('../../cli/log');
+let fromRoot = require('../../utils/fromRoot');
+
 let Worker = require('./Worker');
 
 let gaze = new Gaze([
-  'src/**/*',
+  'src/{cli,commands,server,utils}/**/*',
+  'src/plugins/*/*', // files at the root of a plugin
+  'src/plugins/*/lib/**/*', // files within a lib directory for a plugin
   'config/**/*',
-  '!src/**/public/**/*',
-  '!src/ui/**/*',
 ], {
-  cwd: join(__dirname, '..', '..', '..'),
+  cwd: fromRoot('.'),
   debounceDelay: 200
 });