Merge branch 'master' into es-ui-ts-project

package.json

@@ -195,7 +195,7 @@
     "dedent": "^0.7.0",
     "deep-freeze-strict": "^1.1.1",
     "del": "^5.1.0",
-    "elastic-apm-node": "^3.7.0",
+    "elastic-apm-node": "^3.10.0",
     "elasticsearch": "^16.7.0",
     "execa": "^4.0.2",
     "exit-hook": "^2.2.0",
@@ -440,6 +440,7 @@
     "@types/enzyme": "^3.10.5",
     "@types/eslint": "^6.1.3",
     "@types/extract-zip": "^1.6.2",
+    "@types/faker": "^5.1.5",
     "@types/fancy-log": "^1.3.1",
     "@types/fetch-mock": "^7.3.1",
     "@types/file-saver": "^2.0.0",
@@ -647,7 +648,7 @@
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-react-perf": "^3.2.3",
     "expose-loader": "^0.7.5",
-    "faker": "1.1.0",
+    "faker": "^5.1.0",
     "fancy-log": "^1.3.2",
     "fast-glob": "2.2.7",
     "fetch-mock": "^7.3.9",

src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts

@@ -127,7 +127,8 @@ describe('migration v2', () => {
     await new Promise((resolve) => setTimeout(resolve, 10000));
   };
 
-  describe('migrating from 7.3.0-xpack version', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/87968
+  describe.skip('migrating from 7.3.0-xpack version', () => {
     const migratedIndex = `.kibana_${kibanaVersion}_001`;
 
     beforeAll(async () => {

src/plugins/advanced_settings/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "public/**/*",
+    "server/**/*"
+  ],
+  "references": [
+    { "path": "../../core/tsconfig.json" },
+    { "path": "../management/tsconfig.json" },
+    { "path": "../home/tsconfig.json" },
+    { "path": "../usage_collection/tsconfig.json" },
+    { "path": "../kibana_react/tsconfig.json" },
+  ]
+}

src/plugins/charts/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": ["common/**/*", "public/**/*", "server/**/*"],
+  "references": [
+    { "path": "../../core/tsconfig.json" },
+    { "path": "../expressions/tsconfig.json" },
+    { "path": "../embeddable/tsconfig.json" }
+  ]
+}

src/plugins/dashboard/.storybook/storyshots.test.tsx

@@ -12,6 +12,7 @@ import 'moment-timezone';
 import ReactDOM from 'react-dom';
 
 import initStoryshots, { multiSnapshotWithOptions } from '@storybook/addon-storyshots';
+// @ts-ignore
 import styleSheetSerializer from 'jest-styled-components/src/styleSheetSerializer';
 import { addSerializer } from 'jest-specific-snapshot';
 
@@ -52,6 +53,7 @@ jest.mock('@elastic/eui/lib/components/overlay_mask/overlay_mask', () => {
   };
 });
 
+// @ts-ignore
 import { EuiObserver } from '@elastic/eui/test-env/components/observer/observer';
 jest.mock('@elastic/eui/test-env/components/observer/observer');
 EuiObserver.mockImplementation(() => 'EuiObserver');

src/plugins/dashboard/kibana.json

@@ -6,14 +6,21 @@
     "embeddable",
     "inspector",
     "kibanaLegacy",
-    "urlForwarding",
     "navigation",
-    "uiActions",
     "savedObjects",
-    "share"
+    "share",
+    "uiActions",
+    "urlForwarding"
   ],
-  "optionalPlugins": ["home", "usageCollection", "savedObjectsTaggingOss"],
+  "optionalPlugins": [
+    "home",
+    "savedObjectsTaggingOss",
+    "usageCollection"],
   "server": true,
   "ui": true,
-  "requiredBundles": ["kibanaUtils", "kibanaReact", "home"]
+  "requiredBundles": [
+    "home",
+    "kibanaReact",
+    "kibanaUtils"
+  ]
 }

src/plugins/dashboard/tsconfig.json

@@ -0,0 +1,34 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "*.ts",
+    ".storybook/**/*",
+    "common/**/*",
+    "public/**/*",
+    "server/**/*",
+  ],
+  "references": [
+    { "path": "../../core/tsconfig.json" },
+    { "path": "../inspector/tsconfig.json" },
+    { "path": "../kibana_legacy/tsconfig.json" },
+    { "path": "../kibana_react/tsconfig.json" },
+    { "path": "../kibana_utils/tsconfig.json" },
+    { "path": "../share/tsconfig.json" },
+    { "path": "../url_forwarding/tsconfig.json" },
+    { "path": "../usage_collection/tsconfig.json" },
+    { "path": "../data/tsconfig.json"},
+    { "path": "../embeddable/tsconfig.json" },
+    { "path": "../home/tsconfig.json" },
+    { "path": "../navigation/tsconfig.json" },
+    { "path": "../saved_objects_tagging_oss/tsconfig.json" },
+    { "path": "../saved_objects/tsconfig.json" },
+    { "path": "../ui_actions/tsconfig.json" },
+  ]
+}

src/plugins/discover/tsconfig.json

@@ -0,0 +1,28 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": ["common/**/*", "public/**/*", "server/**/*", "../../../typings/**/*"],
+  "references": [
+    { "path": "../../core/tsconfig.json" },
+    { "path": "../charts/tsconfig.json" },
+    { "path": "../data/tsconfig.json" },
+    { "path": "../embeddable/tsconfig.json" },
+    { "path": "../inspector/tsconfig.json" },
+    { "path": "../url_forwarding/tsconfig.json" },
+    { "path": "../saved_objects/tsconfig.json" },
+    { "path": "../navigation/tsconfig.json" },
+    { "path": "../ui_actions/tsconfig.json" },
+    { "path": "../home/tsconfig.json" },
+    { "path": "../share/tsconfig.json" },
+    { "path": "../usage_collection/tsconfig.json" },
+    { "path": "../kibana_utils/tsconfig.json" },
+    { "path": "../kibana_react/tsconfig.json" },
+    { "path": "../kibana_legacy/tsconfig.json" }
+  ]
+}

src/plugins/embeddable/README.asciidoc

@@ -22,7 +22,7 @@ There is also an example of rendering dashboard container outside of dashboard a
 
 === Docs
 
-(./docs/README.md)[Embeddable docs, guides & caveats]
+link:./docs/README.md[Embeddable docs, guides & caveats]
 
 === API docs
 

src/plugins/input_control_vis/kibana.json

@@ -4,6 +4,13 @@
   "kibanaVersion": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["data", "expressions", "visualizations", "visDefaultEditor"],
-  "requiredBundles": ["kibanaReact"]
+  "requiredPlugins": [
+    "data",
+    "expressions",
+    "visDefaultEditor",
+    "visualizations"
+  ],
+  "requiredBundles": [
+    "kibanaReact"
+  ]
 }

src/plugins/presentation_util/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": ["common/**/*", "public/**/*"],
+  "references": [
+    { "path": "../../core/tsconfig.json" },
+    { "path": "../dashboard/tsconfig.json" },
+    { "path": "../saved_objects/tsconfig.json" },
+  ]
+}

src/plugins/vis_type_markdown/kibana.json

@@ -3,6 +3,14 @@
     "version": "kibana",
     "ui": true,
     "server": true,
-    "requiredPlugins": ["expressions", "visualizations"],
-    "requiredBundles": ["kibanaReact", "visualizations", "expressions", "visDefaultEditor"]
+    "requiredPlugins": [
+      "expressions",
+      "visualizations"
+    ],
+    "requiredBundles": [
+      "expressions",
+      "kibanaReact",
+      "visDefaultEditor",
+      "visualizations"
+    ]
 }

src/plugins/vis_type_timeseries/common/agg_lookup.test.js → src/plugins/vis_type_timeseries/common/agg_lookup.test.ts

@@ -18,14 +18,15 @@
  */
 
 import { isBasicAgg } from './agg_lookup';
+import { MetricsItemsSchema } from './types';
 
 describe('aggLookup', () => {
   describe('isBasicAgg(metric)', () => {
     test('returns true for a basic metric (count)', () => {
-      expect(isBasicAgg({ type: 'count' })).toEqual(true);
+      expect(isBasicAgg({ type: 'count' } as MetricsItemsSchema)).toEqual(true);
     });
     test('returns false for a pipeline metric (derivative)', () => {
-      expect(isBasicAgg({ type: 'derivative' })).toEqual(false);
+      expect(isBasicAgg({ type: 'derivative' } as MetricsItemsSchema)).toEqual(false);
     });
   });
 });

src/plugins/vis_type_timeseries/common/agg_lookup.js → src/plugins/vis_type_timeseries/common/agg_lookup.ts

@@ -17,10 +17,11 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import { omit, pick, includes } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { MetricsItemsSchema } from './types';
 
-export const lookup = {
+export const lookup: Record<string, string> = {
   count: i18n.translate('visTypeTimeseries.aggLookup.countLabel', { defaultMessage: 'Count' }),
   calculation: i18n.translate('visTypeTimeseries.aggLookup.calculationLabel', {
     defaultMessage: 'Calculation',
@@ -122,11 +123,11 @@ const pipeline = [
 
 const byType = {
   _all: lookup,
-  pipeline: pipeline,
-  basic: _.omit(lookup, pipeline),
-  metrics: _.pick(lookup, ['count', 'avg', 'min', 'max', 'sum', 'cardinality', 'value_count']),
+  pipeline,
+  basic: omit(lookup, pipeline),
+  metrics: pick(lookup, ['count', 'avg', 'min', 'max', 'sum', 'cardinality', 'value_count']),
 };
 
-export function isBasicAgg(item) {
-  return _.includes(Object.keys(byType.basic), item.type);
+export function isBasicAgg(item: MetricsItemsSchema) {
+  return includes(Object.keys(byType.basic), item.type);
 }