From 4a3798d520926b96f03c03bc4fb9510825d5e321 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Tue, 20 Apr 2021 20:20:59 +0100
Subject: [PATCH] chore(NA): upgrades iBazel to v0.15.10 (#97489)

* chore(NA): upgrade into last ibazel version

* chore(NA): upgrade into latest ibazel version

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 package.json                                |  2 +-
 packages/kbn-pm/dist/index.js               | 10 ++++++++--
 packages/kbn-pm/src/commands/watch_bazel.ts |  5 ++++-
 packages/kbn-pm/src/utils/bazel/run.ts      |  3 ++-
 yarn.lock                                   |  8 ++++----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 73cfa96d3e57537..01ac34415801460 100644
--- a/package.json
+++ b/package.json
@@ -427,7 +427,7 @@
     "@babel/runtime": "^7.12.5",
     "@babel/traverse": "^7.12.12",
     "@babel/types": "^7.12.12",
-    "@bazel/ibazel": "^0.14.0",
+    "@bazel/ibazel": "^0.15.10",
     "@bazel/typescript": "^3.2.3",
     "@cypress/snapshot": "^2.1.7",
     "@cypress/webpack-preprocessor": "^5.6.0",
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index e6cdd52686656a9..c0afb92b859cd24 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -48512,7 +48512,13 @@ async function runBazel(bazelArgs, offline = false, runOpts = {}) {
   await runBazelCommandWithRunner('bazel', bazelArgs, offline, runOpts);
 }
 async function runIBazel(bazelArgs, offline = false, runOpts = {}) {
-  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts);
+  const extendedEnv = _objectSpread({
+    IBAZEL_USE_LEGACY_WATCHER: '0'
+  }, runOpts === null || runOpts === void 0 ? void 0 : runOpts.env);
+
+  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, _objectSpread(_objectSpread({}, runOpts), {}, {
+    env: extendedEnv
+  }));
 }
 
 /***/ }),
@@ -59743,7 +59749,7 @@ const WatchBazelCommand = {
     // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
     // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
 
-    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build'], runOffline);
+    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build', '--show_result=1'], runOffline);
   }
 
 };
diff --git a/packages/kbn-pm/src/commands/watch_bazel.ts b/packages/kbn-pm/src/commands/watch_bazel.ts
index 1273562dd25116d..6d57ce66854fdcc 100644
--- a/packages/kbn-pm/src/commands/watch_bazel.ts
+++ b/packages/kbn-pm/src/commands/watch_bazel.ts
@@ -20,6 +20,9 @@ export const WatchBazelCommand: ICommand = {
     //
     // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
     // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
-    await runIBazel(['--run_output=false', 'build', '//packages:build'], runOffline);
+    await runIBazel(
+      ['--run_output=false', 'build', '//packages:build', '--show_result=1'],
+      runOffline
+    );
   },
 };
diff --git a/packages/kbn-pm/src/utils/bazel/run.ts b/packages/kbn-pm/src/utils/bazel/run.ts
index 34718606db98e4d..7b20ea43982e6a7 100644
--- a/packages/kbn-pm/src/utils/bazel/run.ts
+++ b/packages/kbn-pm/src/utils/bazel/run.ts
@@ -71,5 +71,6 @@ export async function runIBazel(
   offline: boolean = false,
   runOpts: execa.Options = {}
 ) {
-  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts);
+  const extendedEnv = { IBAZEL_USE_LEGACY_WATCHER: '0', ...runOpts?.env };
+  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, { ...runOpts, env: extendedEnv });
 }
diff --git a/yarn.lock b/yarn.lock
index a84940723821624..4b7d3aee4d3f1aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1192,10 +1192,10 @@
   resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047"
   integrity sha512-4Th98KlMHr5+JkxfcoDT//6vY8vM+iSPrLNpHhRyLx2CFYi8e2RfqPLdpbnpo0Q5lQC5hNB79yes07zb02fvCw==
 
-"@bazel/ibazel@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.14.0.tgz#86fa0002bed2ce1123b7ad98d4dd4623a0d93244"
-  integrity sha512-s0gyec6lArcRDwVfIP6xpY8iEaFpzrSpyErSppd3r2O49pOEg7n6HGS/qJ8ncvme56vrDk6crl/kQ6VAdEO+rg==
+"@bazel/ibazel@^0.15.10":
+  version "0.15.10"
+  resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.15.10.tgz#cf0cff1aec6d8e7bb23e1fc618d09fbd39b7a13f"
+  integrity sha512-0v+OwCQ6fsGFa50r6MXWbUkSGuWOoZ22K4pMSdtWiL5LKFIE4kfmMmtQS+M7/ICNwk2EIYob+NRreyi/DGUz5A==
 
 "@bazel/typescript@^3.2.3":
   version "3.2.3"