From 407ea23dee39794e032813233755c0b0fe631099 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Mon, 24 May 2021 17:37:46 +0100
Subject: [PATCH] fix(NA): kbn-mapbox-gl build

---
 packages/kbn-mapbox-gl/BUILD.bazel    | 14 +++++---------
 packages/kbn-mapbox-gl/package.json   |  3 ++-
 packages/kbn-mapbox-gl/src/index.ts   |  2 +-
 packages/kbn-mapbox-gl/src/typings.ts | 10 ++++++++++
 packages/kbn-mapbox-gl/tsconfig.json  |  7 +++++--
 5 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 packages/kbn-mapbox-gl/src/typings.ts

diff --git a/packages/kbn-mapbox-gl/BUILD.bazel b/packages/kbn-mapbox-gl/BUILD.bazel
index dea6670999b28b..7d7186068832ec 100644
--- a/packages/kbn-mapbox-gl/BUILD.bazel
+++ b/packages/kbn-mapbox-gl/BUILD.bazel
@@ -27,17 +27,13 @@ NPM_MODULE_EXTRA_FILES = [
 ]
 
 SRC_DEPS = [
-  "//packages/kbn-dev-utils",
-  "@npm//jest-styled-components",
-  "@npm//node-forge",
+  "@npm//@mapbox/mapbox-gl-rtl-text",
+  "@npm//file-loader",
+  "@npm//mapbox-gl",
 ]
 
 TYPES_DEPS = [
-  "@npm//@types/flot",
-  "@npm//@types/jest",
-  "@npm//@types/node",
-  "@npm//@types/node-forge",
-  "@npm//@types/testing-library__jest-dom",
+  "@npm//@types/mapbox-gl",
 ]
 
 DEPS = SRC_DEPS + TYPES_DEPS
@@ -67,7 +63,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = [":tsc"] + DEPS,
+  deps = DEPS + [":tsc"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )
diff --git a/packages/kbn-mapbox-gl/package.json b/packages/kbn-mapbox-gl/package.json
index e2e026f0283db4..9de88dac54a5ab 100644
--- a/packages/kbn-mapbox-gl/package.json
+++ b/packages/kbn-mapbox-gl/package.json
@@ -3,5 +3,6 @@
   "version": "1.0.0",
   "private": true,
   "license": "SSPL-1.0 OR Elastic License 2.0",
-  "main": "./target/index"
+  "main": "./target/index.js",
+  "types": "./target/index.d.ts"
 }
diff --git a/packages/kbn-mapbox-gl/src/index.ts b/packages/kbn-mapbox-gl/src/index.ts
index 2be9d992496611..117b874a28ffbd 100644
--- a/packages/kbn-mapbox-gl/src/index.ts
+++ b/packages/kbn-mapbox-gl/src/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-// @ts-expect-error
+import './typings';
 import mapboxgl from 'mapbox-gl/dist/mapbox-gl-csp';
 // @ts-expect-error
 import mbRtlPlugin from '!!file-loader!@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js';
diff --git a/packages/kbn-mapbox-gl/src/typings.ts b/packages/kbn-mapbox-gl/src/typings.ts
new file mode 100644
index 00000000000000..0cc6908aca4284
--- /dev/null
+++ b/packages/kbn-mapbox-gl/src/typings.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+// Mapbox-gl doesn't declare this type.
+declare module 'mapbox-gl/dist/mapbox-gl-csp';
diff --git a/packages/kbn-mapbox-gl/tsconfig.json b/packages/kbn-mapbox-gl/tsconfig.json
index 5522758a924ed5..cf1cca0f5a0fd1 100644
--- a/packages/kbn-mapbox-gl/tsconfig.json
+++ b/packages/kbn-mapbox-gl/tsconfig.json
@@ -7,7 +7,10 @@
     "declarationMap": true,
     "rootDir": "src",
     "sourceMap": true,
-    "sourceRoot": "../../../../packages/kbn-mapbox-gl/src"
+    "sourceRoot": "../../../../packages/kbn-mapbox-gl/src",
+    "types": []
   },
-  "include": ["src/**/*"]
+  "include": [
+    "src/**/*",
+  ]
 }