Merge branch 'master' into transpile-kbn-securitysolution-es-utils-wi…

…th-babel
elastic · Aug 22, 2021 · 3ed99f9 · 3ed99f9
2 parents b118cba + 08e47c8
commit 3ed99f9
Show file tree

Hide file tree

Showing 25 changed files with 261 additions and 237 deletions.
diff --git a/packages/kbn-alerts/.babelrc b/packages/kbn-alerts/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets": ["@kbn/babel-preset/node_preset"],
+  "ignore": ["**/*.test.ts", "**/*.test.tsx"]
+}
diff --git a/packages/kbn-alerts/.babelrc.browser b/packages/kbn-alerts/.babelrc.browser
@@ -0,0 +1,4 @@
+{
+  "presets": ["@kbn/babel-preset/webpack_preset"],
+  "ignore": ["**/*.test.ts", "**/*.test.tsx"]
+}
diff --git a/packages/kbn-alerts/BUILD.bazel b/packages/kbn-alerts/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-alerts"
 
@@ -12,8 +13,7 @@ SOURCE_FILES = glob(
   ],
   exclude = [
     "**/*.test.*",
-    "**/*.mock.*",
-    "**/*.mocks.*",
+    "**/__snapshots__"
   ],
 )
 
@@ -25,32 +25,40 @@ filegroup(
 )
 
 NPM_MODULE_EXTRA_FILES = [
-  "react/package.json",
   "package.json",
   "README.md",
 ]
 
-SRC_DEPS = [
-  "//packages/kbn-babel-preset",
-  "//packages/kbn-dev-utils",
+RUNTIME_DEPS = [
   "//packages/kbn-i18n",
-  "@npm//@babel/core",
-  "@npm//babel-loader",
   "@npm//@elastic/eui",
+  "@npm//enzyme",
   "@npm//react",
   "@npm//resize-observer-polyfill",
-  "@npm//rxjs",
-  "@npm//tslib",
 ]
 
 TYPES_DEPS = [
-  "@npm//typescript",
+  "//packages/kbn-i18n",
+  "@npm//@elastic/eui",
+  "@npm//resize-observer-polyfill",
+  "@npm//@types/enzyme",
   "@npm//@types/jest",
   "@npm//@types/node",
   "@npm//@types/react",
 ]
 
-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",
@@ -61,50 +69,26 @@ ts_config(
   ],
 )
 
-ts_config(
-  name = "tsconfig_browser",
-  src = "tsconfig.browser.json",
-  deps = [
-    "//:tsconfig.base.json",
-    "//:tsconfig.browser.json",
-    "//:tsconfig.browser_bazel.json",
-  ],
-)
-
 ts_project(
-  name = "tsc",
+  name = "tsc_types",
   args = ["--pretty"],
   srcs = SRCS,
-  deps = DEPS,
-  allow_js = True,
+  deps = TYPES_DEPS,
   declaration = True,
-  declaration_dir = "target_types",
   declaration_map = True,
-  out_dir = "target_node",
+  emit_declaration_only = True,
+  out_dir = "target_types",
   root_dir = "src",
   source_map = True,
   tsconfig = ":tsconfig",
 )
 
-ts_project(
-  name = "tsc_browser",
-  args = ['--pretty'],
-  srcs = SRCS,
-  deps = DEPS,
-  allow_js = True,
-  declaration = False,
-  out_dir = "target_web",
-  source_map = True,
-  root_dir = "src",
-  tsconfig = ":tsconfig_browser",
-)
-
 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 = [":tsc", ":tsc_browser"] + DEPS,
 )
 
 pkg_npm(
@@ -120,4 +104,4 @@ filegroup(
     ":npm_module",
   ],
   visibility = ["//visibility:public"],
-)
+)
diff --git a/packages/kbn-alerts/babel.config.js b/packages/kbn-alerts/babel.config.js
diff --git a/packages/kbn-alerts/react/package.json b/packages/kbn-alerts/react/package.json
diff --git a/packages/kbn-alerts/tsconfig.browser.json b/packages/kbn-alerts/tsconfig.browser.json
diff --git a/packages/kbn-alerts/tsconfig.json b/packages/kbn-alerts/tsconfig.json
@@ -1,15 +1,14 @@
 {
   "extends": "../../tsconfig.bazel.json",
   "compilerOptions": {
-    "allowJs": true,
-    "declarationDir": "./target_types",
-    "outDir": "target_node",
     "declaration": true,
     "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
     "sourceMap": true,
     "sourceRoot": "../../../../packages/kbn-alerts/src",
-    "rootDir": "src",
     "types": ["jest", "node", "resize-observer-polyfill"]
   },
-  "include": ["src/**/*"]
-}
+  "include": ["src/**/*"],
+}
diff --git a/packages/kbn-securitysolution-autocomplete/.babelrc b/packages/kbn-securitysolution-autocomplete/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets": ["@kbn/babel-preset/node_preset"],
+  "ignore": ["**/*.test.ts", "**/*.test.tsx"]
+}
diff --git a/packages/kbn-securitysolution-autocomplete/.babelrc.browser b/packages/kbn-securitysolution-autocomplete/.babelrc.browser
@@ -0,0 +1,4 @@
+{
+  "presets": ["@kbn/babel-preset/webpack_preset"],
+  "ignore": ["**/*.test.ts", "**/*.test.tsx"]
+}
diff --git a/packages/kbn-securitysolution-autocomplete/BUILD.bazel b/packages/kbn-securitysolution-autocomplete/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-autocomplete"
 
@@ -25,35 +26,54 @@ filegroup(
 )
 
 NPM_MODULE_EXTRA_FILES = [
-  "react/package.json",
   "package.json",
   "README.md",
 ]
 
-SRC_DEPS = [
-  "//packages/kbn-babel-preset",
-  "//packages/kbn-dev-utils",
+RUNTIME_DEPS = [
+  "//packages/kbn-es-query",
   "//packages/kbn-i18n",
-  "//packages/kbn-securitysolution-io-ts-list-types",
   "//packages/kbn-securitysolution-list-hooks",
-  "//packages/kbn-es-query",
-  "@npm//@babel/core",
-  "@npm//babel-loader",
+  "//packages/kbn-securitysolution-list-utils",
+  "//packages/kbn-securitysolution-io-ts-list-types",
   "@npm//@elastic/eui",
+  "@npm//@testing-library/react",
+  "@npm//@testing-library/react-hooks",
+  "@npm//enzyme",
+  "@npm//moment",
   "@npm//react",
   "@npm//resize-observer-polyfill",
-  "@npm//rxjs",
-  "@npm//tslib",
 ]
 
 TYPES_DEPS = [
-  "@npm//typescript",
+  "//packages/kbn-es-query",
+  "//packages/kbn-i18n",
+  "//packages/kbn-securitysolution-list-hooks",
+  "//packages/kbn-securitysolution-list-utils",
+  "//packages/kbn-securitysolution-io-ts-list-types",
+  "@npm//@elastic/eui",
+  "@npm//@testing-library/react",
+  "@npm//@testing-library/react-hooks",
+  "@npm//moment",
+  "@npm//resize-observer-polyfill",
+  "@npm//@types/enzyme",
   "@npm//@types/jest",
   "@npm//@types/node",
   "@npm//@types/react",
 ]
 
-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",
@@ -64,50 +84,26 @@ ts_config(
   ],
 )
 
-ts_config(
-  name = "tsconfig_browser",
-  src = "tsconfig.browser.json",
-  deps = [
-    "//:tsconfig.base.json",
-    "//:tsconfig.browser.json",
-    "//:tsconfig.browser_bazel.json",
-  ],
-)
-
 ts_project(
-  name = "tsc",
+  name = "tsc_types",
   args = ["--pretty"],
   srcs = SRCS,
-  deps = DEPS,
-  allow_js = True,
+  deps = TYPES_DEPS,
   declaration = True,
-  declaration_dir = "target_types",
   declaration_map = True,
-  out_dir = "target_node",
+  emit_declaration_only = True,
+  out_dir = "target_types",
   root_dir = "src",
   source_map = True,
   tsconfig = ":tsconfig",
 )
 
-ts_project(
-  name = "tsc_browser",
-  args = ['--pretty'],
-  srcs = SRCS,
-  deps = DEPS,
-  allow_js = True,
-  declaration = False,
-  out_dir = "target_web",
-  source_map = True,
-  root_dir = "src",
-  tsconfig = ":tsconfig_browser",
-)
-
 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 = [":tsc", ":tsc_browser"] + DEPS,
 )
 
 pkg_npm(

diff --git a/packages/kbn-securitysolution-autocomplete/babel.config.js b/packages/kbn-securitysolution-autocomplete/babel.config.js
diff --git a/packages/kbn-securitysolution-autocomplete/react/package.json b/packages/kbn-securitysolution-autocomplete/react/package.json