Merge with master and resolce conflicts

elastic · Aug 11, 2021 · 92a6433 · 92a6433
2 parents 767522e + 65a5cb1
commit 92a6433
Show file tree

Hide file tree

Showing 1,725 changed files with 29,635 additions and 21,979 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -5,6 +5,10 @@
 # The #CC# prefix delineates Code Coverage,
 # used for the 'team' designator within Kibana Stats
 
+# Tech leads
+/dev_docs @elastic/kibana-tech-leads
+/packages/kbn-docs-utils/ @elastic/kibana-tech-leads @elastic/kibana-operations
+
 # App
 /x-pack/plugins/discover_enhanced/ @elastic/kibana-app
 /x-pack/plugins/lens/ @elastic/kibana-app
@@ -154,14 +158,17 @@
 
 # Maps
 #CC# /x-pack/plugins/maps/ @elastic/kibana-gis
+/x-pack/plugins/maps/ @elastic/kibana-gis
 /x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
 /x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
 /x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
 /x-pack/plugins/stack_alerts/server/alert_types/geo_containment @elastic/kibana-gis
 /x-pack/plugins/stack_alerts/public/alert_types/geo_containment @elastic/kibana-gis
 #CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
+/src/plugins/maps_legacy/ @elastic/kibana-gis
 #CC# /x-pack/plugins/file_upload @elastic/kibana-gis
+/x-pack/plugins/file_upload @elastic/kibana-gis
 /src/plugins/tile_map/ @elastic/kibana-gis
 /src/plugins/region_map/ @elastic/kibana-gis
 /packages/kbn-mapbox-gl @elastic/kibana-gis
@@ -201,6 +208,7 @@
 /test/functional/services/remote @elastic/kibana-qa
 
 # Core
+/examples/hello_world/ @elastic/kibana-core
 /src/core/  @elastic/kibana-core
 /src/plugins/saved_objects_tagging_oss  @elastic/kibana-core
 /config/kibana.yml @elastic/kibana-core

diff --git a/.gitignore b/.gitignore
@@ -75,6 +75,9 @@ report.asciidoc
 # TS incremental build cache
 *.tsbuildinfo
 
+# Automatically generated and user-modifiable
+/tsconfig.refs.json
+
 # Yarn local mirror content
 .yarn-local-mirror
 

diff --git a/BUILD.bazel b/BUILD.bazel
@@ -3,7 +3,9 @@
 exports_files(
   [
     "tsconfig.base.json",
+    "tsconfig.bazel.json",
     "tsconfig.browser.json",
+    "tsconfig.browser_bazel.json",
     "tsconfig.json",
     "package.json"
   ],

diff --git a/STYLEGUIDE.mdx b/STYLEGUIDE.mdx
@@ -35,7 +35,7 @@ remove it, don't simply comment it out.
 
 We are gradually moving the Kibana code base over to Prettier. All TypeScript code
 and some JavaScript code (check `.eslintrc.js`) is using Prettier to format code. You
-can run `node script/eslint --fix` to fix linting issues and apply Prettier formatting.
+can run `node scripts/eslint --fix` to fix linting issues and apply Prettier formatting.
 We recommend you to enable running ESLint via your IDE.
 
 Whenever possible we are trying to use Prettier and linting over written style guide rules.

diff --git a/api_docs/charts.json b/api_docs/charts.json
@@ -2539,7 +2539,7 @@
             "text": "Adapters"
           },
           ", ",
-          "SerializableState",
+          "Serializable",
           ">>"
         ],
         "path": "src/plugins/charts/common/palette.ts",
@@ -2597,7 +2597,7 @@
             "text": "Adapters"
           },
           ", ",
-          "SerializableState",
+          "Serializable",
           ">>"
         ],
         "path": "src/plugins/charts/common/palette.ts",

diff --git a/api_docs/dashboard.json b/api_docs/dashboard.json
@@ -1137,8 +1137,8 @@
             "pluginId": "kibanaUtils",
             "scope": "common",
             "docId": "kibKibanaUtilsPluginApi",
-            "section": "def-common.SerializableState",
-            "text": "SerializableState"
+            "section": "def-common.Serializable",
+            "text": "Serializable"
           }
         ],
         "path": "src/plugins/dashboard/public/locator.ts",
@@ -1204,8 +1204,8 @@
                 "pluginId": "kibanaUtils",
                 "scope": "common",
                 "docId": "kibKibanaUtilsPluginApi",
-                "section": "def-common.SerializableState",
-                "text": "SerializableState"
+                "section": "def-common.Serializable",
+                "text": "Serializable"
               },
               ") | undefined"
             ],
@@ -1334,8 +1334,8 @@
                 "pluginId": "kibanaUtils",
                 "scope": "common",
                 "docId": "kibKibanaUtilsPluginApi",
-                "section": "def-common.SerializableState",
-                "text": "SerializableState"
+                "section": "def-common.Serializable",
+                "text": "Serializable"
               },
               ") | undefined"
             ],