From f9049c6d09d9e25c1ca8ff8f3ead1fcf3392e5fe Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Wed, 10 Nov 2021 18:18:21 +0000
Subject: [PATCH 1/2] fix(NA): wrongly added include key on tsconfig.json for
 @kbn/monaco

---
 packages/kbn-monaco/tsconfig.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kbn-monaco/tsconfig.json b/packages/kbn-monaco/tsconfig.json
index 4a373843c555a..959051b17b782 100644
--- a/packages/kbn-monaco/tsconfig.json
+++ b/packages/kbn-monaco/tsconfig.json
@@ -14,6 +14,5 @@
   },
   "include": [
     "src/**/*",
-    "__jest__/**/*",
   ]
 }

From b09b97aa6fe83060b5d4a393d3473e45ff5fcf6f Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Wed, 10 Nov 2021 18:32:40 +0000
Subject: [PATCH 2/2] fix(NA): @kbn/monaco structure to allow bazel build on
 windows

---
 packages/kbn-monaco/BUILD.bazel                              | 1 +
 packages/kbn-monaco/{ => src}/__jest__/jest.mocks.ts         | 4 ++--
 packages/kbn-monaco/{ => src}/__jest__/types.ts              | 0
 packages/kbn-monaco/src/painless/diagnostics_adapter.test.ts | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename packages/kbn-monaco/{ => src}/__jest__/jest.mocks.ts (94%)
 rename packages/kbn-monaco/{ => src}/__jest__/types.ts (100%)

diff --git a/packages/kbn-monaco/BUILD.bazel b/packages/kbn-monaco/BUILD.bazel
index caf5f7c25b569..b2efa79f7fb34 100644
--- a/packages/kbn-monaco/BUILD.bazel
+++ b/packages/kbn-monaco/BUILD.bazel
@@ -11,6 +11,7 @@ SOURCE_FILES = glob(
     "src/**/*",
   ],
   exclude = [
+    "**/__jest__",
     "**/*.test.*",
     "**/README.md",
   ],
diff --git a/packages/kbn-monaco/__jest__/jest.mocks.ts b/packages/kbn-monaco/src/__jest__/jest.mocks.ts
similarity index 94%
rename from packages/kbn-monaco/__jest__/jest.mocks.ts
rename to packages/kbn-monaco/src/__jest__/jest.mocks.ts
index a210d7e171aa8..1df4f9b115002 100644
--- a/packages/kbn-monaco/__jest__/jest.mocks.ts
+++ b/packages/kbn-monaco/src/__jest__/jest.mocks.ts
@@ -33,8 +33,8 @@ const createMockModel = (ID: string) => {
   return model;
 };
 
-jest.mock('../src/monaco_imports', () => {
-  const original = jest.requireActual('../src/monaco_imports');
+jest.mock('../monaco_imports', () => {
+  const original = jest.requireActual('../monaco_imports');
   const originalMonaco = original.monaco;
   const originalEditor = original.monaco.editor;
 
diff --git a/packages/kbn-monaco/__jest__/types.ts b/packages/kbn-monaco/src/__jest__/types.ts
similarity index 100%
rename from packages/kbn-monaco/__jest__/types.ts
rename to packages/kbn-monaco/src/__jest__/types.ts
diff --git a/packages/kbn-monaco/src/painless/diagnostics_adapter.test.ts b/packages/kbn-monaco/src/painless/diagnostics_adapter.test.ts
index 7c3a9b66a82e1..5d00ad726d031 100644
--- a/packages/kbn-monaco/src/painless/diagnostics_adapter.test.ts
+++ b/packages/kbn-monaco/src/painless/diagnostics_adapter.test.ts
@@ -5,11 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import '../../__jest__/jest.mocks'; // Make sure this is the first import
+import '../__jest__/jest.mocks'; // Make sure this is the first import
 
 import { Subscription } from 'rxjs';
 
-import { MockIModel } from '../../__jest__/types';
+import { MockIModel } from '../__jest__/types';
 import { LangValidation } from '../types';
 import { monaco } from '../monaco_imports';
 import { ID } from './constants';