From d7806152af495f9b7436561962ab07fe9aa34113 Mon Sep 17 00:00:00 2001 From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Date: Fri, 27 Aug 2021 14:14:49 -0400 Subject: [PATCH] chore(NA): moving @kbn/securitysolution-list-api to babel transpiler (#110265) (#110406) * chore(NA): moving @kbn/securitysolution-list-api to babel transpiler * chore(NA): add web targets Co-authored-by: Tiago Costa --- .../kbn-securitysolution-list-api/.babelrc | 4 +++ .../.babelrc.browser | 4 +++ .../kbn-securitysolution-list-api/BUILD.bazel | 35 ++++++++++++++----- .../package.json | 5 +-- .../tsconfig.json | 3 +- 5 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 packages/kbn-securitysolution-list-api/.babelrc create mode 100644 packages/kbn-securitysolution-list-api/.babelrc.browser diff --git a/packages/kbn-securitysolution-list-api/.babelrc b/packages/kbn-securitysolution-list-api/.babelrc new file mode 100644 index 000000000000..40a198521b90 --- /dev/null +++ b/packages/kbn-securitysolution-list-api/.babelrc @@ -0,0 +1,4 @@ +{ + "presets": ["@kbn/babel-preset/node_preset"], + "ignore": ["**/*.test.ts", "**/*.test.tsx"] +} diff --git a/packages/kbn-securitysolution-list-api/.babelrc.browser b/packages/kbn-securitysolution-list-api/.babelrc.browser new file mode 100644 index 000000000000..71bbfbcd6eb2 --- /dev/null +++ b/packages/kbn-securitysolution-list-api/.babelrc.browser @@ -0,0 +1,4 @@ +{ + "presets": ["@kbn/babel-preset/webpack_preset"], + "ignore": ["**/*.test.ts", "**/*.test.tsx"] +} diff --git a/packages/kbn-securitysolution-list-api/BUILD.bazel b/packages/kbn-securitysolution-list-api/BUILD.bazel index 726d75d8c86b..6858a9389119 100644 --- a/packages/kbn-securitysolution-list-api/BUILD.bazel +++ b/packages/kbn-securitysolution-list-api/BUILD.bazel @@ -1,5 +1,6 @@ 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") PKG_BASE_NAME = "kbn-securitysolution-list-api" @@ -27,21 +28,36 @@ NPM_MODULE_EXTRA_FILES = [ "README.md", ] -SRC_DEPS = [ +RUNTIME_DEPS = [ + "//packages/kbn-securitysolution-io-ts-list-types", "//packages/kbn-securitysolution-io-ts-utils", "//packages/kbn-securitysolution-list-constants", - "//packages/kbn-securitysolution-io-ts-list-types", "@npm//fp-ts", "@npm//io-ts", - "@npm//tslib", ] TYPES_DEPS = [ + "//packages/kbn-securitysolution-io-ts-list-types", + "//packages/kbn-securitysolution-io-ts-utils", + "//packages/kbn-securitysolution-list-constants", + "@npm//fp-ts", + "@npm//io-ts", "@npm//@types/jest", "@npm//@types/node", ] -DEPS = SRC_DEPS + TYPES_DEPS +jsts_transpiler( + name = "target_node", + srcs = SRCS, + build_pkg_name = package_name(), +) + +jsts_transpiler( + name = "target_web", + srcs = SRCS, + build_pkg_name = package_name(), + config_file = ".babelrc.browser" +) ts_config( name = "tsconfig", @@ -53,24 +69,25 @@ ts_config( ) ts_project( - name = "tsc", + name = "tsc_types", srcs = SRCS, + deps = TYPES_DEPS, args = ["--pretty"], declaration = True, declaration_map = True, - out_dir = "target", + emit_declaration_only = True, + out_dir = "target_types", root_dir = "src", source_map = True, tsconfig = ":tsconfig", - deps = DEPS, ) js_library( name = PKG_BASE_NAME, - package_name = PKG_REQUIRE_NAME, srcs = NPM_MODULE_EXTRA_FILES, + deps = RUNTIME_DEPS + [":target_node", ":target_web", ":tsc_types"], + package_name = PKG_REQUIRE_NAME, visibility = ["//visibility:public"], - deps = DEPS + [":tsc"], ) pkg_npm( diff --git a/packages/kbn-securitysolution-list-api/package.json b/packages/kbn-securitysolution-list-api/package.json index 11108c61bfde..8454f13d841b 100644 --- a/packages/kbn-securitysolution-list-api/package.json +++ b/packages/kbn-securitysolution-list-api/package.json @@ -3,7 +3,8 @@ "version": "1.0.0", "description": "security solution list REST API", "license": "SSPL-1.0 OR Elastic License 2.0", - "main": "./target/index.js", - "types": "./target/index.d.ts", + "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/tsconfig.json b/packages/kbn-securitysolution-list-api/tsconfig.json index c2ac6d3d9228..d51cd3ac71d8 100644 --- a/packages/kbn-securitysolution-list-api/tsconfig.json +++ b/packages/kbn-securitysolution-list-api/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "declaration": true, "declarationMap": true, - "outDir": "target", + "emitDeclarationOnly": true, + "outDir": "target_types", "rootDir": "src", "sourceMap": true, "sourceRoot": "../../../../packages/kbn-securitysolution-list-api/src",