From 56d2577d72c14d9bec1700029d31acc30c62fc26 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 20 Dec 2021 17:58:36 +0000 Subject: [PATCH 1/3] chore(NA): splits types from code on @kbn/securitysolution-list-api --- package.json | 1 + packages/BUILD.bazel | 1 + .../kbn-securitysolution-list-api/BUILD.bazel | 27 +++++++++++++++---- .../package.json | 1 - .../src/list_api/index.ts | 8 ++++++ .../BUILD.bazel | 2 +- yarn.lock | 6 ++++- 7 files changed, 38 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 6dd026150cb11..ffa0c6d3016e8 100644 --- a/package.json +++ b/package.json @@ -580,6 +580,7 @@ "@types/kbn__optimizer": "link:bazel-bin/packages/kbn-optimizer/npm_module_types", "@types/kbn__plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator/npm_module_types", "@types/kbn__plugin-helpers": "link:bazel-bin/packages/kbn-plugin-helpers/npm_module_types", + "@types/kbn__securitysolution-list-api": "link:bazel-bin/packages/kbn-securitysolution-list-api/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 index 64936ba71fcf2..fe8829f9cb673 100644 --- a/packages/BUILD.bazel +++ b/packages/BUILD.bazel @@ -98,6 +98,7 @@ filegroup( "//packages/kbn-optimizer:build_types", "//packages/kbn-plugin-generator:build_types", "//packages/kbn-plugin-helpers:build_types", + "//packages/kbn-securitysolution-list-api:build_types", ], ) diff --git a/packages/kbn-securitysolution-list-api/BUILD.bazel b/packages/kbn-securitysolution-list-api/BUILD.bazel index 52a134456cdd9..3c051aa129816 100644 --- a/packages/kbn-securitysolution-list-api/BUILD.bazel +++ b/packages/kbn-securitysolution-list-api/BUILD.bazel @@ -1,10 +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-securitysolution-list-api" - PKG_REQUIRE_NAME = "@kbn/securitysolution-list-api" +TYPES_PKG_REQUIRE_NAME = "@types/kbn__securitysolution-list-api" SOURCE_FILES = glob( [ @@ -85,7 +85,7 @@ ts_project( js_library( name = PKG_BASE_NAME, srcs = NPM_MODULE_EXTRA_FILES, - deps = RUNTIME_DEPS + [":target_node", ":target_web", ":tsc_types"], + deps = RUNTIME_DEPS + [":target_node", ":target_web"], package_name = PKG_REQUIRE_NAME, visibility = ["//visibility:public"], ) @@ -104,3 +104,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-securitysolution-list-api/package.json b/packages/kbn-securitysolution-list-api/package.json index 8454f13d841b4..d243f71127c1f 100644 --- a/packages/kbn-securitysolution-list-api/package.json +++ b/packages/kbn-securitysolution-list-api/package.json @@ -5,6 +5,5 @@ "license": "SSPL-1.0 OR Elastic License 2.0", "browser": "./target_web/index.js", "main": "./target_node/index.js", - "types": "./target_types/index.d.ts", "private": true } diff --git a/packages/kbn-securitysolution-list-api/src/list_api/index.ts b/packages/kbn-securitysolution-list-api/src/list_api/index.ts index b9d5417f761c0..8622423233e4a 100644 --- a/packages/kbn-securitysolution-list-api/src/list_api/index.ts +++ b/packages/kbn-securitysolution-list-api/src/list_api/index.ts @@ -46,6 +46,14 @@ import { ImportListParams, } from './types'; +export { + ApiParams, + DeleteListParams, + ExportListParams, + FindListsParams, + ImportListParams, +} from './types'; + const findLists = async ({ http, cursor, diff --git a/packages/kbn-securitysolution-list-hooks/BUILD.bazel b/packages/kbn-securitysolution-list-hooks/BUILD.bazel index 2a9666bd1429e..4407c0021b6e5 100644 --- a/packages/kbn-securitysolution-list-hooks/BUILD.bazel +++ b/packages/kbn-securitysolution-list-hooks/BUILD.bazel @@ -42,7 +42,7 @@ RUNTIME_DEPS = [ TYPES_DEPS = [ "//packages/kbn-securitysolution-hook-utils", "//packages/kbn-securitysolution-io-ts-list-types", - "//packages/kbn-securitysolution-list-api", + "//packages/kbn-securitysolution-list-api:npm_module_types", "//packages/kbn-securitysolution-list-constants", "//packages/kbn-securitysolution-list-utils", "//packages/kbn-securitysolution-utils", diff --git a/yarn.lock b/yarn.lock index 3d2f64513ad9f..63b631079b342 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5884,6 +5884,10 @@ version "0.0.0" uid "" +"@types/kbn__securitysolution-list-api@link:bazel-bin/packages/kbn-securitysolution-list-api/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" @@ -10461,7 +10465,7 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.9: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== -core-js@^3.19.3, core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2, core-js@^3.8.3: +core-js@^3.0.4, core-js@^3.19.3, core-js@^3.6.5, core-js@^3.8.2, core-js@^3.8.3: version "3.19.3" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.3.tgz#6df8142a996337503019ff3235a7022d7cdf4559" integrity sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g== From 78aeae55e64a15d69937911f60ddfddfca5458c9 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 20 Dec 2021 18:21:26 +0000 Subject: [PATCH 2/3] chore(NA): export type only --- packages/kbn-securitysolution-list-api/src/list_api/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kbn-securitysolution-list-api/src/list_api/index.ts b/packages/kbn-securitysolution-list-api/src/list_api/index.ts index 8622423233e4a..f489b9292dc87 100644 --- a/packages/kbn-securitysolution-list-api/src/list_api/index.ts +++ b/packages/kbn-securitysolution-list-api/src/list_api/index.ts @@ -46,7 +46,7 @@ import { ImportListParams, } from './types'; -export { +export type { ApiParams, DeleteListParams, ExportListParams, From bc844a0bc163eb5324d6bf9087cce1017c1ee01d Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Tue, 21 Dec 2021 03:45:38 +0000 Subject: [PATCH 3/3] chore(NA): merge and solve conflicts wth main --- packages/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel index e73c10ef24422..dbd5a661b5f1b 100644 --- a/packages/BUILD.bazel +++ b/packages/BUILD.bazel @@ -105,7 +105,7 @@ filegroup( "//packages/kbn-securitysolution-hook-utils:build_types", "//packages/kbn-securitysolution-io-ts-alerting-types:build_types", "//packages/kbn-securitysolution-io-ts-list-types:build_types", - "//packages/kbn-securitysolution-io-ts-types", + "//packages/kbn-securitysolution-io-ts-types:build_types", "//packages/kbn-securitysolution-list-api:build_types", ], )