Merge branch 'master' of github.com:elastic/kibana into chore/updateEslint

CONTRIBUTING.md

@@ -35,10 +35,10 @@ Please make sure you have signed the [Contributor License Agreement](http://www.
   npm install
   ```
 
-- Start elasticsearch, you can use [esvm](https://github.com/simianhacker/esvm) to make that easier.
+- Start elasticsearch
 
   ```sh
-  grunt esvm:dev:keepalive
+  npm run elasticsearch
   ```
 
 - Start the development server.

package.json

@@ -42,7 +42,8 @@
     "build": "grunt build",
     "start": "./bin/kibana --dev",
     "precommit": "grunt lintStagedFiles",
-    "karma": "karma start"
+    "karma": "karma start",
+    "elasticsearch": "grunt esvm:dev:keepalive"
   },
   "repository": {
     "type": "git",

src/optimize/BaseOptimizer.js

@@ -78,8 +78,6 @@ class BaseOptimizer {
         devtoolModuleFilenameTemplate: '[absolute-resource-path]'
       },
 
-      recordsPath: resolve(this.env.workingDir, 'webpack.records'),
-
       plugins: [
         new webpack.ResolverPlugin([
           new DirectoryNameAsMain()

src/ui/public/chrome/TabCollection.js

@@ -12,7 +12,7 @@ var parse = _.wrap(require('url').parse, function (parse, path) {
 
 function TabCollection() {
 
-  var tabs = null;
+  var tabs = [];
   var specs = null;
   var defaults = null;
   var activeTab = null;

tasks/build/shrinkwrap.js

@@ -2,7 +2,7 @@ module.exports = function (grunt) {
   let { config } = grunt;
   let { statSync } = require('fs');
   let { join } = require('path');
-  let exec = (...args) => require('../utils/exec').silent(...args, { cwd: config.get('root') });
+  let exec = (...args) => require('../utils/exec')(...args, { cwd: config.get('root') });
   let newFiles = [];
   let shrinkwrapFile = join(config.get('root'), 'npm-shrinkwrap.json');
 
@@ -13,7 +13,7 @@ module.exports = function (grunt) {
       if (e.code !== 'ENOENT') throw e;
 
       if (createIfMissing) {
-        exec('npm', ['shrinkwrap', '--dev']);
+        exec('npm', ['shrinkwrap', '--dev', '--logLevel', 'error']);
         newFiles.push(shrinkwrapFile);
       }
       else grunt.fail.warn('Releases require an npm-shrinkwrap.json file to exist');
@@ -28,7 +28,7 @@ module.exports = function (grunt) {
     exec('cp', ['npm-shrinkwrap.json', join(config.get('root'), 'build', 'kibana', 'npm-shrinkwrap.build.json')]);
 
     // create shrinkwrap without dev dependencies and copy to build
-    exec('npm', ['shrinkwrap']);
+    exec('npm', ['shrinkwrap', '--logLevel', 'error']);
     exec('cp', ['npm-shrinkwrap.json', join(config.get('root'), 'build', 'kibana', 'npm-shrinkwrap.json')]);
 
     // restore the dev shrinkwrap
@@ -38,4 +38,4 @@ module.exports = function (grunt) {
   grunt.registerTask('_build:shrinkwrap:cleanup', function () {
     if (newFiles.length) exec('rm', newFiles.splice(0));
   });
-};
+};