destructuring assignment ftw

src/cli/plugin/__tests__/npmInstall.js

@@ -3,7 +3,7 @@ var nock = require('nock');
 var glob = require('glob');
 var rimraf = require('rimraf');
 var fs = require('fs');
-var join = require('path').join;
+var { join } = require('path');
 var sinon = require('sinon');
 
 var pluginLogger = require('../pluginLogger');

src/cli/plugin/__tests__/pluginDownloader.js

@@ -3,7 +3,7 @@ var sinon = require('sinon');
 var nock = require('nock');
 var glob = require('glob');
 var rimraf = require('rimraf');
-var join = require('path').join;
+var { join } = require('path');
 
 var pluginLogger = require('../pluginLogger');
 var pluginDownloader = require('../pluginDownloader');

src/cli/plugin/__tests__/pluginInstaller.js

@@ -4,7 +4,7 @@ var nock = require('nock');
 var glob = require('glob');
 var rimraf = require('rimraf');
 var fs = require('fs');
-var join = require('path').join;
+var { join } = require('path');
 var Promise = require('bluebird');
 
 var pluginLogger = require('../pluginLogger');

src/cli/plugin/settingParser.js

@@ -1,4 +1,4 @@
-var resolve = require('path').resolve;
+var { resolve } = require('path');
 var expiry = require('expiry-js');
 
 module.exports = function (options) {

src/cli/serve/serve.js

@@ -1,6 +1,6 @@
 let _ = require('lodash');
-let isWorker = require('cluster').isWorker;
-let resolve = require('path').resolve;
+let { isWorker } = require('cluster');
+let { resolve } = require('path');
 
 let cwd = process.cwd();
 let readYamlConfig = require('./readYamlConfig');

src/cli/watch/Worker.js

@@ -1,7 +1,7 @@
 let _ = require('lodash');
 let cluster = require('cluster');
-let resolve = require('path').resolve;
-let EventEmitter = require('events').EventEmitter;
+let { resolve } = require('path');
+let { EventEmitter } = require('events');
 
 let fromRoot = require('../../utils/fromRoot');
 

src/cli/watch/watch.js

@@ -1,5 +1,5 @@
 let cluster = require('cluster');
-let join = require('path').join;
+let { join } = require('path');
 let _ = require('lodash');
 var chokidar = require('chokidar');
 

src/optimize/BaseOptimizer.js

@@ -1,7 +1,7 @@
-let EventEmitter = require('events').EventEmitter;
-let inherits = require('util').inherits;
+let { EventEmitter } = require('events');
+let { inherits } = require('util');
 let _ = require('lodash');
-let join = require('path').join;
+let { join } = require('path');
 let write = require('fs').writeFileSync;
 let webpack = require('webpack');
 let DirectoryNameAsMain = require('webpack-directory-name-as-main');

src/optimize/LiveOptimizer.js

@@ -1,10 +1,9 @@
 let _ = require('lodash');
-let join = require('path').join;
-let promify = require('bluebird').promisify;
+let { join } = require('path');
+let { promisify } = require('bluebird');
 let webpack = require('webpack');
 let MemoryFileSystem = require('memory-fs');
 let BaseOptimizer = require('./BaseOptimizer');
-let writeFileSync = require('fs').writeFileSync;
 
 module.exports = class LiveOptimizer extends BaseOptimizer {
   constructor(opts) {
@@ -18,7 +17,7 @@ module.exports = class LiveOptimizer extends BaseOptimizer {
 
     _.bindAll(this, 'get', 'init');
 
-    this.compile = promify(this.compiler.run, this.compiler);
+    this.compile = promisify(this.compiler.run, this.compiler);
   }
 
   init() {
@@ -44,8 +43,6 @@ module.exports = class LiveOptimizer extends BaseOptimizer {
         return null;
       }
 
-      // writeFileSync('liveBuildStats.json', JSON.stringify(stats.toJson()));
-
       return {
         bundle: fs.readFileSync(filename),
         sourceMap: self.sourceMaps ? fs.readFileSync(mapFilename) : false,

src/optimize/OptmzBundles.js

@@ -1,15 +1,13 @@
 let _ = require('lodash');
-let join = require('path').join;
-let resolve = require('bluebird').resolve;
-let promify = require('bluebird').promisify;
-let rimraf = promify(require('rimraf'));
-let mkdirp = promify(require('mkdirp'));
-
-let stat = promify(require('fs').stat);
-let read = promify(require('fs').readFile);
-let write = promify(require('fs').writeFile);
-let unlink = promify(require('fs').unlink);
-let readdir = promify(require('fs').readdir);
+let { join } = require('path');
+let { resolve, promisify } = require('bluebird');
+let rimraf = promisify(require('rimraf'));
+let mkdirp = promisify(require('mkdirp'));
+let stat = promisify(require('fs').stat);
+let read = promisify(require('fs').readFile);
+let write = promisify(require('fs').writeFile);
+let unlink = promisify(require('fs').unlink);
+let readdir = promisify(require('fs').readdir);
 let readSync = require('fs').readFileSync;
 
 let entryFileTemplate = _.template(readSync(join(__dirname, 'entry.js.tmpl')));

src/optimize/browserTests/TestBundler.js

@@ -1,6 +1,6 @@
 let _ = require('lodash');
-let resolve = require('path').resolve;
-let readFileSync = require('fs').readFileSync;
+let { resolve } = require('path');
+let { readFileSync } = require('fs');
 
 let src = require('requirefrom')('src');
 let fromRoot = src('utils/fromRoot');

src/optimize/browserTests/globAll.js

@@ -1,8 +1,8 @@
 let _ = require('lodash');
-let resolve = require('path').resolve;
-let promify = require('bluebird').promisify;
-let all = require('bluebird').all;
-let glob = promify(require('glob'));
+let { resolve } = require('path');
+let { promisify } = require('bluebird');
+let { all } = require('bluebird');
+let glob = promisify(require('glob'));
 
 module.exports = function (path, patterns) {
   return all([].concat(patterns || []))

src/optimize/index.js

@@ -2,7 +2,7 @@ module.exports = function (kbnServer, server, config) {
   if (!config.get('optimize.enabled')) return;
 
   var _ = require('lodash');
-  var resolve = require('path').resolve;
+  var { resolve } = require('path');
   var fromRoot = require('../utils/fromRoot');
 
   var CachedOptimizer = require('./CachedOptimizer');
@@ -59,19 +59,13 @@ module.exports = function (kbnServer, server, config) {
   let optmzr = kbnServer.optimizer = new Optimizer({
     sourceMaps: config.get('optimize.sourceMaps'),
     bundleDir: bundleDir,
-    entries: _.map(
-      [].concat(
-        kbnServer.uiExports.apps,
-        kbnServer.uiExports.apps.hidden
-      ),
-      function (app) {
-        return {
-          id: app.id,
-          deps: app.getRelatedPlugins(),
-          modules: app.getModules()
-        };
-      }
-    ),
+    entries: _.map(kbnServer.uiExports.allApps(), function (app) {
+      return {
+        id: app.id,
+        deps: app.getRelatedPlugins(),
+        modules: app.getModules()
+      };
+    }),
     plugins: kbnServer.plugins
   });
 

src/plugins/bundledLibs/index.js

@@ -1,13 +1,12 @@
 module.exports = function (kibana) {
   let _ = require('lodash');
-  let resolve = require('path').resolve;
-  let basename = require('path').basename;
-  let readdir = require('fs').readdirSync;
   let fromRoot = require('../../utils/fromRoot');
+  let { readdirSync } = require('fs');
+  let { resolve, basename } = require('path');
 
   let modules = {};
   let metaLibs = resolve(__dirname, 'metaLibs');
-  readdir(metaLibs).forEach(function (file) {
+  readdirSync(metaLibs).forEach(function (file) {
     if (file[0] === '.') return;
     let name = basename(file, '.js') + '$';
     modules[name] = resolve(metaLibs, file);

src/server/KbnServer.js

@@ -1,8 +1,6 @@
 let _ = require('lodash');
-let EventEmitter = require('events').EventEmitter;
-let promify = require('bluebird').promisify;
-let resolve = require('bluebird').resolve;
-let fromNode = require('bluebird').fromNode;
+let { EventEmitter } = require('events');
+let { promisify, resolve, fromNode } = require('bluebird');
 let Hapi = require('hapi');
 
 let utils = require('requirefrom')('src/utils');

src/server/plugins/Plugin.js

@@ -1,8 +1,8 @@
 let _ = require('lodash');
-let inherits = require('util').inherits;
 let Joi = require('joi');
 let Promise = require('bluebird');
-let resolve = require('path').resolve;
+let { resolve } = require('path');
+let { inherits } = require('util');
 
 const defaultConfigSchema = Joi.object({
   enabled: Joi.boolean().default(true)

src/server/plugins/PluginApi.js

@@ -1,7 +1,6 @@
 let _ = require('lodash');
 let Plugin = require('./Plugin');
-let basename = require('path').basename;
-let join = require('path').join;
+let { basename, join } = require('path');
 
 module.exports = class PluginApi {
   constructor(kibana, pluginPath) {

src/server/plugins/index.js

@@ -2,7 +2,7 @@ module.exports = function (kbnServer, server, config) {
   var _ = require('lodash');
   var Promise = require('bluebird');
   var Boom = require('boom');
-  var join = require('path').join;
+  var { join } = require('path');
 
   server.exposeStaticDir('/plugins/{id}/{path*}', function (req) {
     var id = req.params.id;

src/server/status/index.js

@@ -2,7 +2,7 @@ module.exports = function (kbnServer) {
   var _ = require('lodash');
   var Samples = require('./Samples');
   var ServerStatus = require('./ServerStatus');
-  var join = require('path').join;
+  var { join } = require('path');
 
   var server = kbnServer.server;
   var config = server.config();

src/ui/UiApp.js

@@ -1,5 +1,5 @@
 var _ = require('lodash');
-var join = require('path').join;
+var { join } = require('path');
 var autoload = require('./autoload');
 
 class UiApp {

src/ui/UiExports.js

@@ -80,6 +80,10 @@ class UiExports {
     }, [])
     .value();
   }
+
+  allApps() {
+    return _.union(this.apps, this.apps.hidden);
+  }
 }
 
 module.exports = UiExports;

src/ui/index.js

@@ -1,10 +1,8 @@
 module.exports = function (kbnServer, server, config) {
   let _ = require('lodash');
-  let join = require('path').join;
   let Boom = require('boom');
   let formatUrl = require('url').format;
-  let resolve = require('path').resolve;
-
+  let { join, resolve } = require('path');
   let UiExports = require('./UiExports');
 
   let uiExports = kbnServer.uiExports = new UiExports(kbnServer);

src/utils/fromRoot.js

@@ -1,7 +1,9 @@
 var _ = require('lodash');
-var dirname = require('path').dirname;
-var join = require('path').join;
-var normalize = require('path').normalize;
 var root = require('./packageJson').__dirname;
+var {
+  join,
+  dirname,
+  normalize
+} = require('path');
 
 module.exports = _.flow(_.partial(join, root), normalize);

src/utils/packageJson.js

@@ -1,4 +1,4 @@
-var join = require('path').join;
+var { join } = require('path');
 var existsSync = require('fs').existsSync;
 
 var packageDir;

tasks/config/replace.js

@@ -1,5 +1,6 @@
-var join = require('path').join;
 module.exports = function (grunt) {
+  var { join } = require('path');
+
   var build = grunt.config.get('build');
   var src = grunt.config.get('src');
   var app = grunt.config.get('app');

tasks/create_packages.js

@@ -1,6 +1,6 @@
 var child_process = require('child_process');
 var Promise = require('bluebird');
-var join = require('path').join;
+var { join } = require('path');
 var mkdirp = Promise.promisifyAll(require('mkdirp'));
 
 var execFile = Promise.promisify(child_process.execFile);

tasks/create_services.js

@@ -1,6 +1,6 @@
 var child_process = require('child_process');
 var Promise = require('bluebird');
-var join = require('path').join;
+var { join } = require('path');
 var mkdirp = Promise.promisifyAll(require('mkdirp'));
 var execFile = Promise.promisify(child_process.execFile);
 

tasks/dist_readme.js

@@ -1,6 +1,6 @@
 var marked = require('marked');
 var Promise = require('bluebird');
-var join = require('path').join;
+var { join } = require('path');
 var TextRenderer = require('marked-text-renderer');
 var _ = require('lodash');
 var fs = require('fs');

tasks/download_node_binaries.js

@@ -4,7 +4,7 @@ var tar = require('tar');
 var request = require('request');
 var mkdirp = require('mkdirp');
 var fs = require('fs');
-var join = require('path').join;
+var { join } = require('path');
 var filesPatern = _.template('node-v<%- version %>-<%- platform %>.tar.gz');
 var urlPattern = _.template('http://nodejs.org/dist/v<%- version %>/<%- file %>');
 var Promise = require('bluebird');

tasks/npm_install_kibana.js

@@ -1,6 +1,7 @@
-var child_process = require('child_process');
-var join = require('path').join;
 module.exports = function (grunt) {
+  var child_process = require('child_process');
+  var { join } = require('path');
+
   grunt.registerTask('npm_install_kibana', 'NPM install kibana server into dist', function () {
     var done = this.async();
     var cwd = join(grunt.config.get('build'), 'dist', 'kibana', 'src');