From 78774e49255da90ae1876eca8e94000ee4ce90be Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 16 Sep 2020 16:50:45 +0200
Subject: [PATCH] [APM] Disable incremental builds for APM-only type check
 (#77581)

---
 x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js | 8 +++++++-
 x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js    | 1 +
 x-pack/plugins/apm/server/lib/traces/get_trace_items.ts  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js b/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js
index f6f64db164f9..1de98515e1aa 100644
--- a/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js
+++ b/x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js
@@ -11,6 +11,7 @@ const { promisify } = require('util');
 const path = require('path');
 const json5 = require('json5');
 const execa = require('execa');
+const { omit } = require('lodash');
 
 const readFile = promisify(fs.readFile);
 const writeFile = promisify(fs.writeFile);
@@ -27,6 +28,7 @@ function prepareParentTsConfigs() {
   return Promise.all(
     [
       path.resolve(xpackRoot, 'tsconfig.json'),
+      path.resolve(kibanaRoot, 'tsconfig.base.json'),
       path.resolve(kibanaRoot, 'tsconfig.json'),
     ].map(async (filename) => {
       const config = json5.parse(await readFile(filename, 'utf-8'));
@@ -35,7 +37,11 @@ function prepareParentTsConfigs() {
         filename,
         JSON.stringify(
           {
-            ...config,
+            ...omit(config, 'references'),
+            compilerOptions: {
+              ...config.compilerOptions,
+              incremental: false,
+            },
             include: [],
           },
           null,
diff --git a/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js b/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js
index c75e16f74b93..b32bb9b20796 100644
--- a/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js
+++ b/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js
@@ -13,6 +13,7 @@ const tsconfigTpl = path.resolve(__dirname, './tsconfig.json');
 const filesToIgnore = [
   path.resolve(xpackRoot, 'tsconfig.json'),
   path.resolve(kibanaRoot, 'tsconfig.json'),
+  path.resolve(kibanaRoot, 'tsconfig.base.json'),
 ];
 
 module.exports = {
diff --git a/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts b/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
index 17f9743ae9f0..9aebadba23b2 100644
--- a/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
+++ b/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
@@ -88,7 +88,7 @@ export async function getTraceItems(
     // explicit intermediary types to avoid TS "excessively deep" error
     PromiseValueType<typeof errorResponsePromise>,
     PromiseValueType<typeof traceResponsePromise>
-  ] = await Promise.all([errorResponsePromise, traceResponsePromise]);
+  ] = (await Promise.all([errorResponsePromise, traceResponsePromise])) as any;
 
   const exceedsMax = traceResponse.hits.total.value > maxTraceItems;