From 4f8cad5a0d20e349ae0ce554587d67d8868f434e Mon Sep 17 00:00:00 2001
From: spalger <email@spalger.com>
Date: Thu, 13 Aug 2015 23:14:22 -0700
Subject: [PATCH] [webpack] switch to rjs-repack-loader for shorter id and
 smaller dep tree

---
 package.json                  | 2 +-
 src/optimize/BaseOptimizer.js | 2 +-
 tasks/build/downloadNodes.js  | 3 ++-
 tasks/config/run.js           | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index bdf417bf7aa2a..322ec0636a86f 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,6 @@
     "angular-nvd3": "panda01/angular-nvd3#kibana",
     "angular-route": "1.2.28",
     "ansicolors": "^0.3.2",
-    "auto-preload-rjscommon-deps-loader": "^1.0.4",
     "autoprefixer": "^5.2.0",
     "autoprefixer-loader": "^2.0.0",
     "babel": "^5.8.21",
@@ -109,6 +108,7 @@
     "raw-loader": "^0.5.1",
     "requirefrom": "^0.2.0",
     "rimraf": "^2.4.1",
+    "rjs-repack-loader": "^1.0.6",
     "script-loader": "^0.6.1",
     "semver": "^4.3.6",
     "style-loader": "^0.12.3",
diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js
index 170a892f59b3f..f30f7b863cad7 100644
--- a/src/optimize/BaseOptimizer.js
+++ b/src/optimize/BaseOptimizer.js
@@ -108,7 +108,7 @@ class BaseOptimizer {
           { test: /\.(html|tmpl)$/, loader: 'raw' },
           { test: /\.png$/, loader: 'url?limit=10000&name=[path][name].[ext]' },
           { test: /\.(woff|woff2|ttf|eot|svg|ico)(\?|$)/, loader: 'file?name=[path][name].[ext]' },
-          { test: /[\/\\]src[\/\\](plugins|ui)[\/\\].+\.js$/, loader: `auto-preload-rjscommon-deps${mapQ}` },
+          { test: /[\/\\]src[\/\\](plugins|ui)[\/\\].+\.js$/, loader: `rjs-repack${mapQ}` },
           {
             test: /\.js$/,
             exclude: /[\/\\](node_modules|bower_components)[\/\\]/,
diff --git a/tasks/build/downloadNodes.js b/tasks/build/downloadNodes.js
index 6de387ff122e4..cc829d4a14392 100644
--- a/tasks/build/downloadNodes.js
+++ b/tasks/build/downloadNodes.js
@@ -1,6 +1,7 @@
 module.exports = function (grunt) {
   let { map, fromNode, promisify } = require('bluebird');
   let { resolve } = require('path');
+  let { pluck } = require('lodash');
   let { createWriteStream } = require('fs');
   let { createGunzip } = require('zlib');
   let { Extract } = require('tar');
@@ -79,7 +80,7 @@ module.exports = function (grunt) {
   grunt.registerTask('build:downloadNodes:start', start);
   grunt.registerTask('build:downloadNodes:finish', function () {
     start().then(() => {
-      grunt.log.ok(`node binaries for ${platforms.join(', ')} downloaded`);
+      grunt.log.ok(`node binaries for ${pluck(platforms, 'name').join(', ')} downloaded`);
     })
     .nodeify(this.async());
   });
diff --git a/tasks/config/run.js b/tasks/config/run.js
index a2727f3502580..3927a1532463e 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -22,7 +22,7 @@ module.exports = function (grunt) {
     optimizeBuild: {
       options: {
         wait: false,
-        ready: /Server running/,
+        ready: /Optimization .+ complete/,
         quiet: false
       },
       cmd: './build/kibana/bin/kibana',