chore(NA): splits types from code on @kbn/utils (#121924)

elastic · Dec 23, 2021 · 64468b7 · 64468b7
1 parent c3c9195
commit 64468b7
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -603,6 +603,7 @@
     "@types/kbn__std": "link:bazel-bin/packages/kbn-std/npm_module_types",
     "@types/kbn__telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools/npm_module_types",
     "@types/kbn__utility-types": "link:bazel-bin/packages/kbn-utility-types/npm_module_types",
+    "@types/kbn__utils": "link:bazel-bin/packages/kbn-utils/npm_module_types",
     "@types/license-checker": "15.0.0",
     "@types/listr": "^0.14.0",
     "@types/loader-utils": "^1.1.3",

diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
@@ -120,6 +120,7 @@ filegroup(
       "//packages/kbn-std:build_types",
       "//packages/kbn-telemetry-tools:build_types",
       "//packages/kbn-utility-types:build_types",
+      "//packages/kbn-utils:build_types",
   ],
 )
 

diff --git a/packages/kbn-apm-config-loader/BUILD.bazel b/packages/kbn-apm-config-loader/BUILD.bazel
@@ -36,7 +36,7 @@ RUNTIME_DEPS = [
 
 TYPES_DEPS = [
   "//packages/elastic-safer-lodash-set",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//@elastic/apm-rum",
   "@npm//@types/jest",
   "@npm//@types/js-yaml",

diff --git a/packages/kbn-cli-dev-mode/BUILD.bazel b/packages/kbn-cli-dev-mode/BUILD.bazel
@@ -55,7 +55,7 @@ TYPES_DEPS = [
   "//packages/kbn-optimizer:npm_module_types",
   "//packages/kbn-server-http-tools:npm_module_types",
   "//packages/kbn-std:npm_module_types",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//argsplit",
   "@npm//chokidar",
   "@npm//elastic-apm-node",

diff --git a/packages/kbn-dev-utils/BUILD.bazel b/packages/kbn-dev-utils/BUILD.bazel
@@ -66,7 +66,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//@babel/parser",
   "@npm//@babel/types",
   "@npm//@types/babel__core",

diff --git a/packages/kbn-docs-utils/BUILD.bazel b/packages/kbn-docs-utils/BUILD.bazel
@@ -39,7 +39,7 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-config:npm_module_types",
   "//packages/kbn-dev-utils:npm_module_types",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//ts-morph",
   "@npm//@types/dedent",
   "@npm//@types/jest",

diff --git a/packages/kbn-es-archiver/BUILD.bazel b/packages/kbn-es-archiver/BUILD.bazel
@@ -46,7 +46,7 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
   "//packages/kbn-test",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//@elastic/elasticsearch",
   "@npm//aggregate-error",
   "@npm//globby",

diff --git a/packages/kbn-optimizer/BUILD.bazel b/packages/kbn-optimizer/BUILD.bazel
@@ -71,7 +71,7 @@ TYPES_DEPS = [
   "//packages/kbn-std:npm_module_types",
   "//packages/kbn-ui-shared-deps-npm",
   "//packages/kbn-ui-shared-deps-src",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//chalk",
   "@npm//clean-webpack-plugin",
   "@npm//cpy",

diff --git a/packages/kbn-plugin-generator/BUILD.bazel b/packages/kbn-plugin-generator/BUILD.bazel
@@ -51,7 +51,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "//packages/kbn-dev-utils:npm_module_types",
   "@npm//del",
   "@npm//execa",

diff --git a/packages/kbn-plugin-helpers/BUILD.bazel b/packages/kbn-plugin-helpers/BUILD.bazel
@@ -45,7 +45,7 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
   "//packages/kbn-optimizer:npm_module_types",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//del",
   "@npm//execa",
   "@npm//globby",

diff --git a/packages/kbn-storybook/BUILD.bazel b/packages/kbn-storybook/BUILD.bazel
@@ -51,7 +51,7 @@ TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
   "//packages/kbn-ui-shared-deps-npm",
   "//packages/kbn-ui-shared-deps-src",
-  "//packages/kbn-utils",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//@storybook/addons",
   "@npm//@storybook/api",
   "@npm//@storybook/components",

diff --git a/packages/kbn-utils/BUILD.bazel b/packages/kbn-utils/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-utils"
 PKG_REQUIRE_NAME = "@kbn/utils"
+TYPES_PKG_REQUIRE_NAME = "@types/kbn__utils"
 
 SOURCE_FILES = glob(
   [
@@ -89,3 +90,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-utils/package.json b/packages/kbn-utils/package.json
@@ -1,7 +1,6 @@
 {
   "name": "@kbn/utils",
   "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/yarn.lock b/yarn.lock
@@ -6009,6 +6009,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__utils@link:bazel-bin/packages/kbn-utils/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/keyv@*":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7"