Merge branch 'master' of github.com:elastic/kibana into breaking/remo…

…veDashboardOnlyMode
elastic · Aug 20, 2021 · a0963aa · a0963aa
2 parents 637a527 + ff17140
commit a0963aa
Show file tree

Hide file tree

Showing 624 changed files with 6,199 additions and 6,082 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -29,9 +29,9 @@
 /src/plugins/vis_type_timelion/ @elastic/kibana-app
 /src/plugins/vis_type_timeseries/ @elastic/kibana-app
 /src/plugins/vis_type_vega/ @elastic/kibana-app
-/src/plugins/vis_type_vislib/ @elastic/kibana-app
-/src/plugins/vis_type_xy/ @elastic/kibana-app
-/src/plugins/vis_type_pie/ @elastic/kibana-app
+/src/plugins/vis_types/vislib/ @elastic/kibana-app
+/src/plugins/vis_types/xy/ @elastic/kibana-app
+/src/plugins/vis_types/pie/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/visualizations/ @elastic/kibana-app
 /src/plugins/url_forwarding/ @elastic/kibana-app

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -63,9 +63,9 @@
     "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
     "visTypeTimeseries": "src/plugins/vis_type_timeseries",
     "visTypeVega": "src/plugins/vis_type_vega",
-    "visTypeVislib": "src/plugins/vis_type_vislib",
-    "visTypeXy": "src/plugins/vis_type_xy",
-    "visTypePie": "src/plugins/vis_type_pie",
+    "visTypeVislib": "src/plugins/vis_types/vislib",
+    "visTypeXy": "src/plugins/vis_types/xy",
+    "visTypePie": "src/plugins/vis_types/pie",
     "visualizations": "src/plugins/visualizations",
     "visualize": "src/plugins/visualize",
     "apmOss": "src/plugins/apm_oss",

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -290,7 +290,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_pie[visTypePie]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/pie[visTypePie]
 |WARNING: Missing README.
 
 
@@ -314,11 +314,11 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_vislib[visTypeVislib]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/vislib[visTypeVislib]
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_xy[visTypeXy]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/xy[visTypeXy]
 |WARNING: Missing README.
 
 

diff --git a/jest.config.js b/jest.config.js
@@ -13,6 +13,7 @@ module.exports = {
     '<rootDir>/packages/*/jest.config.js',
     '<rootDir>/src/*/jest.config.js',
     '<rootDir>/src/plugins/*/jest.config.js',
+    '<rootDir>/src/plugins/vis_types/*/jest.config.js',
     '<rootDir>/test/*/jest.config.js',
     '<rootDir>/x-pack/plugins/*/jest.config.js',
   ],

diff --git a/packages/kbn-config/src/config_service.test.ts b/packages/kbn-config/src/config_service.test.ts
@@ -13,7 +13,7 @@ import { mockApplyDeprecations, mockedChangedPaths } from './config_service.test
 import { rawConfigServiceMock } from './raw/raw_config_service.mock';
 
 import { schema } from '@kbn/config-schema';
-import { MockedLogger, loggerMock } from '@kbn/logging/target/mocks';
+import { MockedLogger, loggerMock } from '@kbn/logging/mocks';
 
 import { ConfigService, Env, RawPackageInfo } from '.';
 

diff --git a/packages/kbn-interpreter/.babelrc b/packages/kbn-interpreter/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@kbn/babel-preset/node_preset"]
+}
diff --git a/packages/kbn-interpreter/BUILD.bazel b/packages/kbn-interpreter/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
 load("@npm//peggy:index.bzl", "peggy")
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler")
 
 PKG_BASE_NAME = "kbn-interpreter"
 PKG_REQUIRE_NAME = "@kbn/interpreter"
@@ -25,7 +26,7 @@ NPM_MODULE_EXTRA_FILES = [
   "package.json",
 ]
 
-SRC_DEPS = [
+RUNTIME_DEPS = [
   "@npm//lodash",
 ]
 
@@ -35,7 +36,11 @@ TYPES_DEPS = [
   "@npm//@types/node",
 ]
 
-DEPS = SRC_DEPS + TYPES_DEPS
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
 
 peggy(
   name = "grammar",
@@ -62,14 +67,15 @@ ts_config(
 )
 
 ts_project(
-  name = "tsc",
+  name = "tsc_types",
   args = ['--pretty'],
   srcs = SRCS,
-  deps = DEPS,
+  deps = TYPES_DEPS,
   allow_js = True,
   declaration = True,
   declaration_map = True,
-  out_dir = "target",
+  emit_declaration_only = True,
+  out_dir = "target_types",
   source_map = True,
   root_dir = "src",
   tsconfig = ":tsconfig",
@@ -78,7 +84,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES + [":grammar"],
-  deps = DEPS + [":tsc"],
+  deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )

diff --git a/packages/kbn-interpreter/common/package.json b/packages/kbn-interpreter/common/package.json
@@ -1,5 +1,5 @@
 {
   "private": true,
-  "main": "../target/common/index.js",
-  "types": "../target/common/index.d.ts"
+  "main": "../target_node/common/index.js",
+  "types": "../target_types/common/index.d.ts"
 }
diff --git a/packages/kbn-interpreter/src/common/lib/ast.from_expression.test.js b/packages/kbn-interpreter/src/common/lib/ast.from_expression.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { fromExpression } from '@kbn/interpreter/target/common/lib/ast';
+import { fromExpression } from '@kbn/interpreter/common';
 import { getType } from './get_type';
 
 describe('ast fromExpression', () => {

diff --git a/packages/kbn-interpreter/tsconfig.json b/packages/kbn-interpreter/tsconfig.json
@@ -2,9 +2,10 @@
   "extends": "../../tsconfig.bazel.json",
   "compilerOptions": {
     "allowJs": true,
-    "outDir": "./target/types",
     "declaration": true,
     "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "./target_types",
     "rootDir": "src",
     "sourceMap": true,
     "sourceRoot": "../../../../packages/kbn-interpreter/src",

diff --git a/packages/kbn-logging/.babelrc b/packages/kbn-logging/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@kbn/babel-preset/node_preset"]
+}
diff --git a/packages/kbn-logging/BUILD.bazel b/packages/kbn-logging/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-logging"
 PKG_REQUIRE_NAME = "@kbn/logging"
@@ -21,20 +22,26 @@ filegroup(
 )
 
 NPM_MODULE_EXTRA_FILES = [
+  "mocks/package.json",
   "package.json",
   "README.md"
 ]
 
-SRC_DEPS = [
+RUNTIME_DEPS = [
   "//packages/kbn-std"
 ]
 
 TYPES_DEPS = [
+  "//packages/kbn-std",
   "@npm//@types/jest",
   "@npm//@types/node",
 ]
 
-DEPS = SRC_DEPS + TYPES_DEPS
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
 
 ts_config(
   name = "tsconfig",
@@ -46,13 +53,14 @@ ts_config(
 )
 
 ts_project(
-  name = "tsc",
+  name = "tsc_types",
   args = ['--pretty'],
   srcs = SRCS,
-  deps = DEPS,
+  deps = TYPES_DEPS,
   declaration = True,
   declaration_map = True,
-  out_dir = "target",
+  emit_declaration_only = True,
+  out_dir = "target_types",
   source_map = True,
   root_dir = "src",
   tsconfig = ":tsconfig",
@@ -61,7 +69,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-logging/mocks/package.json b/packages/kbn-logging/mocks/package.json
@@ -0,0 +1,5 @@
+{
+  "private": true,
+  "main": "../target_node/mocks/index.js",
+  "types": "../target_types/mocks/index.d.ts"
+}
diff --git a/packages/kbn-logging/package.json b/packages/kbn-logging/package.json
@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "private": true,
   "license": "SSPL-1.0 OR Elastic License 2.0",
-  "main": "./target/index.js",
-  "types": "./target/index.d.ts"
+  "main": "./target_node/index.js",
+  "types": "./target_types/index.d.ts"
 }
diff --git a/packages/kbn-logging/tsconfig.json b/packages/kbn-logging/tsconfig.json
@@ -1,13 +1,14 @@
 {
   "extends": "../../tsconfig.bazel.json",
   "compilerOptions": {
-    "outDir": "target",
-    "stripInternal": false,
     "declaration": true,
     "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
     "rootDir": "src",
     "sourceMap": true,
     "sourceRoot": "../../../../packages/kbn-logging/src",
+    "stripInternal": false,
     "types": [
       "jest",
       "node"

diff --git a/src/core/server/http/integration_tests/router.test.ts b/src/core/server/http/integration_tests/router.test.ts
@@ -17,7 +17,7 @@ import { loggingSystemMock } from '../../logging/logging_system.mock';
 import { createHttpServer } from '../test_utils';
 import { HttpService } from '../http_service';
 import { Router } from '../router';
-import { loggerMock } from '@kbn/logging/target/mocks';
+import { loggerMock } from '@kbn/logging/mocks';
 
 let server: HttpService;
 let logger: ReturnType<typeof loggingSystemMock.create>;

diff --git a/src/core/server/logging/logger.mock.ts b/src/core/server/logging/logger.mock.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export { loggerMock } from '@kbn/logging/target/mocks';
-export type { MockedLogger } from '@kbn/logging/target/mocks';
+export { loggerMock } from '@kbn/logging/mocks';
+export type { MockedLogger } from '@kbn/logging/mocks';
diff --git a/src/core/server/metrics/collectors/cgroup.test.ts b/src/core/server/metrics/collectors/cgroup.test.ts
@@ -7,7 +7,7 @@
  */
 
 import mockFs from 'mock-fs';
-import { loggerMock } from '@kbn/logging/target/mocks';
+import { loggerMock } from '@kbn/logging/mocks';
 import { OsCgroupMetricsCollector } from './cgroup';
 
 describe('OsCgroupMetricsCollector', () => {

diff --git a/src/core/server/metrics/collectors/os.test.ts b/src/core/server/metrics/collectors/os.test.ts
@@ -8,7 +8,7 @@
 
 jest.mock('getos', () => (cb: Function) => cb(null, { dist: 'distrib', release: 'release' }));
 
-import { loggerMock } from '@kbn/logging/target/mocks';
+import { loggerMock } from '@kbn/logging/mocks';
 import os from 'os';
 import { cgroupCollectorMock } from './os.test.mocks';
 import { OsMetricsCollector } from './os';

diff --git a/src/core/server/metrics/ops_metrics_collector.test.ts b/src/core/server/metrics/ops_metrics_collector.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { loggerMock } from '@kbn/logging/target/mocks';
+import { loggerMock } from '@kbn/logging/mocks';
 import {
   mockOsCollector,
   mockProcessCollector,

diff --git a/src/dev/typescript/projects.ts b/src/dev/typescript/projects.ts
@@ -70,6 +70,7 @@ export const PROJECTS = [
 
   ...findProjects('packages/*/tsconfig.json'),
   ...findProjects('src/plugins/*/tsconfig.json'),
+  ...findProjects('src/plugins/vis_types/*/tsconfig.json'),
   ...findProjects('x-pack/plugins/*/tsconfig.json'),
   ...findProjects('examples/*/tsconfig.json'),
   ...findProjects('x-pack/examples/*/tsconfig.json'),