From f2842533918bfa00e33600054a9b21e992f435ea Mon Sep 17 00:00:00 2001 From: spalger Date: Fri, 6 Sep 2019 11:10:18 -0700 Subject: [PATCH 1/2] add src/plugins to the list of plugin dirs to watch --- src/cli/cluster/cluster_manager.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index 342f838e4ee7a..6186cffa722b5 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -24,6 +24,7 @@ import opn from 'opn'; import { debounce, invoke, bindAll, once, uniq } from 'lodash'; import * as Rx from 'rxjs'; import { first, mapTo, filter, map, take } from 'rxjs/operators'; +import { REPO_ROOT } from '@kbn/dev-utils'; import Log from '../log'; import Worker from './worker'; @@ -102,8 +103,14 @@ export default class ClusterManager { if (opts.watch) { const pluginPaths = config.get('plugins.paths'); - const scanDirs = config.get('plugins.scanDirs'); - const extraPaths = [...pluginPaths, ...scanDirs]; + const scanDirs = [ + ...config.get('plugins.scanDirs'), + resolve(REPO_ROOT, 'src/plugins'), + ]; + const extraPaths = [ + ...pluginPaths, + ...scanDirs, + ]; const extraIgnores = scanDirs .map(scanDir => resolve(scanDir, '*')) From 63bcc15bc9973c7b4f40ff434b7c9e9ec688c6b9 Mon Sep 17 00:00:00 2001 From: spalger Date: Fri, 6 Sep 2019 12:03:48 -0700 Subject: [PATCH 2/2] include x-pack/plugins too --- src/cli/cluster/cluster_manager.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index 6186cffa722b5..bd32c5b9803a3 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -106,6 +106,7 @@ export default class ClusterManager { const scanDirs = [ ...config.get('plugins.scanDirs'), resolve(REPO_ROOT, 'src/plugins'), + resolve(REPO_ROOT, 'x-pack/plugins'), ]; const extraPaths = [ ...pluginPaths,