From 5528dd992780f520b0074480004a10710446c362 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Fri, 3 Dec 2021 02:48:51 +0000
Subject: [PATCH] chore(NA): splits types from code on @kbn/config (#120267)

---
 package.json                          |  1 +
 packages/BUILD.bazel                  |  1 +
 packages/kbn-cli-dev-mode/BUILD.bazel |  2 +-
 packages/kbn-config/BUILD.bazel       | 26 ++++++++++++++++++++++----
 packages/kbn-config/package.json      |  1 -
 packages/kbn-docs-utils/BUILD.bazel   |  2 +-
 packages/kbn-optimizer/BUILD.bazel    |  4 +++-
 yarn.lock                             |  4 ++++
 8 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index d8145032676ab..45b8c3e5e38fd 100644
--- a/package.json
+++ b/package.json
@@ -559,6 +559,7 @@
     "@types/kbn__apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader/npm_module_types",
     "@types/kbn__apm-utils": "link:bazel-bin/packages/kbn-apm-utils/npm_module_types",
     "@types/kbn__cli-dev-mode": "link:bazel-bin/packages/kbn-cli-dev-mode/npm_module_types",
+    "@types/kbn__config": "link:bazel-bin/packages/kbn-config/npm_module_types",
     "@types/kbn__i18n": "link:bazel-bin/packages/kbn-i18n/npm_module_types",
     "@types/kbn__i18n-react": "link:bazel-bin/packages/kbn-i18n-react/npm_module_types",
     "@types/license-checker": "15.0.0",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index 26a3ed4b1ea47..3502f42b9037b 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -82,6 +82,7 @@ filegroup(
       "//packages/kbn-apm-config-loader:build_types",
       "//packages/kbn-apm-utils:build_types",
       "//packages/kbn-cli-dev-mode:build_types",
+      "//packages/kbn-config:build_types",
       "//packages/kbn-i18n:build_types",
       "//packages/kbn-i18n-react:build_types",
   ],
diff --git a/packages/kbn-cli-dev-mode/BUILD.bazel b/packages/kbn-cli-dev-mode/BUILD.bazel
index 686866ce7bc88..c6611e71e35ab 100644
--- a/packages/kbn-cli-dev-mode/BUILD.bazel
+++ b/packages/kbn-cli-dev-mode/BUILD.bazel
@@ -48,7 +48,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config",
+  "//packages/kbn-config:npm_module_types",
   "//packages/kbn-config-schema",
   "//packages/kbn-dev-utils",
   "//packages/kbn-logging",
diff --git a/packages/kbn-config/BUILD.bazel b/packages/kbn-config/BUILD.bazel
index 061b8306bcc6f..c0b75ab491ac0 100644
--- a/packages/kbn-config/BUILD.bazel
+++ b/packages/kbn-config/BUILD.bazel
@@ -1,9 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
-load("//src/dev/bazel:index.bzl", "jsts_transpiler")
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
 
 PKG_BASE_NAME = "kbn-config"
 PKG_REQUIRE_NAME = "@kbn/config"
+TYPES_PKG_REQUIRE_NAME = "@types/kbn__config"
 
 SOURCE_FILES = glob(
   [
@@ -91,7 +92,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
+  deps = RUNTIME_DEPS + [":target_node"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )
@@ -110,3 +111,20 @@ filegroup(
   ],
   visibility = ["//visibility:public"],
 )
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = TYPES_PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [
+    ":npm_module_types",
+  ],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-config/package.json b/packages/kbn-config/package.json
index e30db61ae0c28..012b39d733a78 100644
--- a/packages/kbn-config/package.json
+++ b/packages/kbn-config/package.json
@@ -1,7 +1,6 @@
 {
   "name": "@kbn/config",
   "main": "./target_node/index.js",
-  "types": "./target_types/index.d.ts",
   "version": "1.0.0",
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "private": true
diff --git a/packages/kbn-docs-utils/BUILD.bazel b/packages/kbn-docs-utils/BUILD.bazel
index ab018a0ab73b0..6bb37b3500152 100644
--- a/packages/kbn-docs-utils/BUILD.bazel
+++ b/packages/kbn-docs-utils/BUILD.bazel
@@ -36,7 +36,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config",
+  "//packages/kbn-config:npm_module_types",
   "//packages/kbn-dev-utils",
   "//packages/kbn-utils",
   "@npm//ts-morph",
diff --git a/packages/kbn-optimizer/BUILD.bazel b/packages/kbn-optimizer/BUILD.bazel
index 485e5f1044aa3..6e057b9179bec 100644
--- a/packages/kbn-optimizer/BUILD.bazel
+++ b/packages/kbn-optimizer/BUILD.bazel
@@ -46,6 +46,7 @@ RUNTIME_DEPS = [
   "@npm//execa",
   "@npm//jest-diff",
   "@npm//json-stable-stringify",
+  "@npm//js-yaml",
   "@npm//lmdb-store",
   "@npm//loader-utils",
   "@npm//node-sass",
@@ -62,7 +63,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config",
+  "//packages/kbn-config:npm_module_types",
   "//packages/kbn-config-schema",
   "//packages/kbn-dev-utils",
   "//packages/kbn-std",
@@ -83,6 +84,7 @@ TYPES_DEPS = [
   "@npm//@types/compression-webpack-plugin",
   "@npm//@types/jest",
   "@npm//@types/json-stable-stringify",
+  "@npm//@types/js-yaml",
   "@npm//@types/loader-utils",
   "@npm//@types/node",
   "@npm//@types/normalize-path",
diff --git a/yarn.lock b/yarn.lock
index ec125be4f4591..895d4084804f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5802,6 +5802,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__config@link:bazel-bin/packages/kbn-config/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__i18n-react@link:bazel-bin/packages/kbn-i18n-react/npm_module_types":
   version "0.0.0"
   uid ""