From 545a304f0f8c08fade0edd2acfbe926ff1fbc9a4 Mon Sep 17 00:00:00 2001 From: Joe Fleming Date: Thu, 15 Dec 2016 13:15:36 -0700 Subject: [PATCH] Move require calls outside of task functions (elastic/kibana-plugin-helpers#23) * move require calls outside of task functions * fix default command value Original commit: elastic/kibana-plugin-helpers@846855e960a7e3add786f908132a87b9840e08dd --- .../kbn-plugin-helpers/tasks/build/build_action.js | 13 +++++++------ .../kbn-plugin-helpers/tasks/start/start_action.js | 4 +++- .../tasks/test/browser/test_browser_action.js | 3 ++- .../tasks/test/server/test_server_action.js | 8 ++++---- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/kbn-plugin-helpers/tasks/build/build_action.js b/packages/kbn-plugin-helpers/tasks/build/build_action.js index 030a8d69f98a..a780480674a4 100644 --- a/packages/kbn-plugin-helpers/tasks/build/build_action.js +++ b/packages/kbn-plugin-helpers/tasks/build/build_action.js @@ -1,11 +1,12 @@ +var vfs = require('vinyl-fs'); +var zip = require('gulp-zip'); +var map = require('through2-map').obj; +var rename = require('gulp-rename'); +var join = require('path').join; +var inquirer = require('inquirer'); + module.exports = function (plugin) { return new Promise(function (resolve, reject) { - var vfs = require('vinyl-fs'); - var zip = require('gulp-zip'); - var map = require('through2-map').obj; - var rename = require('gulp-rename'); - var join = require('path').join; - var inquirer = require('inquirer'); function main() { var kibanaVersion = (plugin.pkg.kibana && plugin.pkg.kibana.version) || plugin.pkg.version; diff --git a/packages/kbn-plugin-helpers/tasks/start/start_action.js b/packages/kbn-plugin-helpers/tasks/start/start_action.js index f5bc51c629f0..caa5aafe1f8e 100644 --- a/packages/kbn-plugin-helpers/tasks/start/start_action.js +++ b/packages/kbn-plugin-helpers/tasks/start/start_action.js @@ -1,5 +1,7 @@ +var execFileSync = require('child_process').execFileSync; + module.exports = function (plugin, run, command) { - var execFileSync = require('child_process').execFileSync; + command = command || {}; var cmd = (process.platform === 'win32') ? 'bin\\kibana.bat' : 'bin/kibana'; var args = ['--dev', '--plugin-path', plugin.root]; diff --git a/packages/kbn-plugin-helpers/tasks/test/browser/test_browser_action.js b/packages/kbn-plugin-helpers/tasks/test/browser/test_browser_action.js index 9a0dca3108cb..0da1a7cb57a9 100644 --- a/packages/kbn-plugin-helpers/tasks/test/browser/test_browser_action.js +++ b/packages/kbn-plugin-helpers/tasks/test/browser/test_browser_action.js @@ -1,5 +1,6 @@ +var execFileSync = require('child_process').execFileSync; + module.exports = function testBrowserAction(plugin, run, command) { - var execFileSync = require('child_process').execFileSync; command = command || {}; var kbnServerArgs = [ diff --git a/packages/kbn-plugin-helpers/tasks/test/server/test_server_action.js b/packages/kbn-plugin-helpers/tasks/test/server/test_server_action.js index 8aae6e6aa742..3a52ca8ac928 100644 --- a/packages/kbn-plugin-helpers/tasks/test/server/test_server_action.js +++ b/packages/kbn-plugin-helpers/tasks/test/server/test_server_action.js @@ -1,8 +1,8 @@ -module.exports = function (plugin) { - var resolve = require('path').resolve; - var delimiter = require('path').delimiter; - var execFileSync = require('child_process').execFileSync; +var resolve = require('path').resolve; +var delimiter = require('path').delimiter; +var execFileSync = require('child_process').execFileSync; +module.exports = function (plugin) { var kibanaBins = resolve(plugin.kibanaRoot, 'node_modules/.bin'); var mochaSetupJs = resolve(plugin.kibanaRoot, 'test/mocha_setup.js');