diff --git a/packages/kbn-config-schema/.babelrc b/packages/kbn-config-schema/.babelrc new file mode 100644 index 000000000000..7da72d177912 --- /dev/null +++ b/packages/kbn-config-schema/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": ["@kbn/babel-preset/node_preset"] +} diff --git a/packages/kbn-config-schema/BUILD.bazel b/packages/kbn-config-schema/BUILD.bazel index 1ae4fa5eeeb2..2a4718b87df1 100644 --- a/packages/kbn-config-schema/BUILD.bazel +++ b/packages/kbn-config-schema/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-config-schema" PKG_REQUIRE_NAME = "@kbn/config-schema" @@ -21,7 +22,7 @@ NPM_MODULE_EXTRA_FILES = [ "README.md", ] -SRC_DEPS = [ +RUNTIME_DEPS = [ "@npm//joi", "@npm//lodash", "@npm//moment", @@ -30,6 +31,8 @@ SRC_DEPS = [ ] TYPES_DEPS = [ + "@npm//moment", + "@npm//tsd", "@npm//@types/jest", "@npm//@types/joi", "@npm//@types/lodash", @@ -37,7 +40,11 @@ TYPES_DEPS = [ "@npm//@types/type-detect", ] -DEPS = SRC_DEPS + TYPES_DEPS +jsts_transpiler( + name = "target_node", + srcs = SRCS, + build_pkg_name = package_name(), +) ts_config( name = "tsconfig", @@ -48,14 +55,15 @@ ts_config( ) ts_project( - name = "tsc", + name = "tsc_types", args = ['--pretty'], srcs = SRCS, - deps = DEPS, + deps = TYPES_DEPS, declaration = True, declaration_map = True, - incremental = True, - out_dir = "target", + emit_declaration_only = True, + incremental = False, + out_dir = "target_types", source_map = True, root_dir = "src", tsconfig = ":tsconfig", @@ -64,7 +72,7 @@ ts_project( js_library( name = PKG_BASE_NAME, srcs = NPM_MODULE_EXTRA_FILES, - deps = DEPS + [":tsc"], + deps = RUNTIME_DEPS + [":target_node", ":tsc_types"], package_name = PKG_REQUIRE_NAME, visibility = ["//visibility:public"], ) diff --git a/packages/kbn-config-schema/package.json b/packages/kbn-config-schema/package.json index 85b52f5d7553..a3b6880c3293 100644 --- a/packages/kbn-config-schema/package.json +++ b/packages/kbn-config-schema/package.json @@ -1,7 +1,7 @@ { "name": "@kbn/config-schema", - "main": "./target/index.js", - "types": "./target/index.d.ts", + "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-config-schema/tsconfig.json b/packages/kbn-config-schema/tsconfig.json index eee6900f0732..de9476bbbb35 100644 --- a/packages/kbn-config-schema/tsconfig.json +++ b/packages/kbn-config-schema/tsconfig.json @@ -3,8 +3,9 @@ "compilerOptions": { "declaration": true, "declarationMap": true, - "incremental": true, - "outDir": "target", + "emitDeclarationOnly": true, + "incremental": false, + "outDir": "target_types", "rootDir": "src", "sourceMap": true, "sourceRoot": "../../../../packages/kbn-config-schema/src", diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md index 6bc1bb5880e0..47782c2f98d3 100644 --- a/src/core/server/server.api.md +++ b/src/core/server/server.api.md @@ -372,7 +372,7 @@ export const config: { healthCheck: import("@kbn/config-schema").ObjectType<{ delay: Type; }>; - ignoreVersionMismatch: import("@kbn/config-schema/target/types").ConditionalType; + ignoreVersionMismatch: import("@kbn/config-schema/target_types/types").ConditionalType; }>; }; logging: {