Upgrade to TypeScript 3.7.2 (elastic#47188)

* Update TS to 3.7.0-beta * Upgrade to TypeScript 3.7.2 * Upgrade cypress to 3.5.0 * Upgrade apollo-link-http * Update prettier * Fix expression types * Fix Lens test typings * Fix ML breakage * Fix APM breakage * Fix sinon stub typing * Fix beats management types * Fix WMSOptions types * Fix ui_filters in APM * APM: Explicitly type Setup to prevent hitting TS limits * Change file name to correct case * Add styleguide rule for optional chaining * Update typescript-eslint packages * Revert changes in ui filters routes that are no longer needed
timroes · Nov 15, 2019 · 759168b · 759168b
1 parent 69631cd
commit 759168b
Show file tree

Hide file tree

Showing 27 changed files with 145 additions and 92 deletions.
diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
@@ -120,6 +120,7 @@ You should prefer modern language features in a lot of cases, e.g.:
 * Prefer arrow function over storing `this` (no `const self = this;`)
 * Prefer template strings over string concatenation
 * Prefer the spread operator for copying arrays (`[...arr]`) over `arr.slice()`
+* Use optional chaining (`?.`) and nullish Coalescing (`??`) over `lodash.get` (and similar utilities)
 
 ### Avoid mutability and state
 

diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "**/@types/react": "16.8.3",
     "**/@types/hapi": "^17.0.18",
     "**/@types/angular": "^1.6.56",
-    "**/typescript": "3.5.3",
+    "**/typescript": "3.7.2",
     "**/graphql-toolkit/lodash": "^4.17.13",
     "**/isomorphic-git/**/base64-js": "^1.2.1",
     "**/image-diff/gm/debug": "^2.6.9"
@@ -342,8 +342,8 @@
     "@types/uuid": "^3.4.4",
     "@types/vinyl-fs": "^2.4.11",
     "@types/zen-observable": "^0.8.0",
-    "@typescript-eslint/eslint-plugin": "^2.5.0",
-    "@typescript-eslint/parser": "^2.5.0",
+    "@typescript-eslint/eslint-plugin": "^2.7.0",
+    "@typescript-eslint/parser": "^2.7.0",
     "angular-mocks": "^1.7.8",
     "archiver": "^3.1.1",
     "babel-eslint": "^10.0.3",
@@ -438,7 +438,7 @@
     "supertest": "^3.1.0",
     "supertest-as-promised": "^4.0.2",
     "tree-kill": "^1.2.1",
-    "typescript": "3.5.3",
+    "typescript": "3.7.2",
     "typings-tester": "^0.3.2",
     "vinyl-fs": "^3.0.3",
     "xml2js": "^0.4.22",

diff --git a/packages/eslint-config-kibana/package.json b/packages/eslint-config-kibana/package.json
@@ -15,8 +15,8 @@
   },
   "homepage": "https://github.com/elastic/eslint-config-kibana#readme",
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.5.0",
-    "@typescript-eslint/parser": "^2.5.0",
+    "@typescript-eslint/eslint-plugin": "^2.7.0",
+    "@typescript-eslint/parser": "^2.7.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.5.1",
     "eslint-plugin-babel": "^5.3.0",

diff --git a/packages/kbn-analytics/package.json b/packages/kbn-analytics/package.json
@@ -17,6 +17,6 @@
     "@babel/cli": "7.5.5",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/babel-preset": "1.0.0",
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   }
 }
diff --git a/packages/kbn-config-schema/package.json b/packages/kbn-config-schema/package.json
@@ -10,7 +10,7 @@
     "kbn:bootstrap": "yarn build"
   },
   "devDependencies": {
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   },
   "peerDependencies": {
     "joi": "^13.5.2",

diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json
@@ -21,7 +21,7 @@
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "typescript": "3.5.3",
+    "typescript": "3.7.2",
     "@kbn/expect": "1.0.0",
     "chance": "1.0.18"
   }

diff --git a/packages/kbn-elastic-idx/package.json b/packages/kbn-elastic-idx/package.json
@@ -20,7 +20,7 @@
     "@babel/core": "^7.5.5",
     "@babel/plugin-transform-async-to-generator": "^7.5.0",
     "jest": "^24.9.0",
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   },
   "jest": {
     "testEnvironment": "node"

diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json
@@ -21,7 +21,7 @@
     "del": "^5.1.0",
     "getopts": "^2.2.4",
     "supports-color": "^6.1.0",
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   },
   "dependencies": {
     "intl-format-cache": "^2.1.0",

diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json
@@ -58,7 +58,7 @@
     "strip-ansi": "^4.0.0",
     "strong-log-transformer": "^2.1.0",
     "tempy": "^0.3.0",
-    "typescript": "3.5.3",
+    "typescript": "3.7.2",
     "unlazy-loader": "^0.1.3",
     "webpack": "^4.41.0",
     "webpack-cli": "^3.3.9",

diff --git a/src/legacy/core_plugins/console/server/request.test.ts b/src/legacy/core_plugins/console/server/request.test.ts
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import http from 'http';
+import http, { ClientRequest } from 'http';
 import * as sinon from 'sinon';
 import { sendRequest } from './request';
 import { URL } from 'url';
 import { fail } from 'assert';
 
 describe(`Console's send request`, () => {
   let sandbox: sinon.SinonSandbox;
-  let stub: sinon.SinonStub;
+  let stub: sinon.SinonStub<Parameters<typeof http['request']>, ClientRequest>;
   let fakeRequest: http.ClientRequest;
 
   beforeEach(() => {

diff --git a/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx b/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
@@ -23,23 +23,26 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { TmsLayer } from 'ui/vis/map/service_settings';
+import { Vis } from 'ui/vis';
+import { RegionMapVisParams } from '../../../region_map/public/types';
 import { SelectOption, SwitchOption } from '../../../kbn_vislib_vis_types/public/components';
-import { RegionMapOptionsProps } from '../../../region_map/public/components/region_map_options';
 import { WmsInternalOptions } from './wms_internal_options';
-import { TileMapOptionsProps } from './tile_map_options';
-import { TileMapVisParams } from '../types';
+import { WMSOptions, TileMapVisParams } from '../types';
+
+interface Props {
+  stateParams: TileMapVisParams | RegionMapVisParams;
+  setValue: (title: 'wms', options: WMSOptions) => void;
+  vis: Vis;
+}
 
 const mapLayerForOption = ({ id }: TmsLayer) => ({ text: id, value: id });
 
-function WmsOptions({ stateParams, setValue, vis }: TileMapOptionsProps | RegionMapOptionsProps) {
+function WmsOptions({ stateParams, setValue, vis }: Props) {
   const { wms } = stateParams;
   const { tmsLayers } = vis.type.editorConfig.collections;
   const tmsLayerOptions = useMemo(() => tmsLayers.map(mapLayerForOption), [tmsLayers]);
 
-  const setWmsOption = <T extends keyof TileMapVisParams['wms']>(
-    paramName: T,
-    value: TileMapVisParams['wms'][T]
-  ) =>
+  const setWmsOption = <T extends keyof WMSOptions>(paramName: T, value: WMSOptions[T]) =>
     setValue('wms', {
       ...wms,
       [paramName]: value,

diff --git a/src/plugins/expressions/public/types/index.ts b/src/plugins/expressions/public/types/index.ts
@@ -21,8 +21,6 @@ import { ExpressionInterpret } from '../interpreter_provider';
 import { TimeRange } from '../../../data/public';
 import { Adapters } from '../../../inspector/public';
 import { Query } from '../../../data/public';
-import { ExpressionAST } from '../../../expressions/public';
-import { ExpressionArgAST } from '../../../../plugins/expressions/public';
 import { esFilters } from '../../../../plugins/data/public';
 
 export { ArgumentType } from './arguments';

diff --git a/test/plugin_functional/plugins/core_plugin_a/package.json b/test/plugin_functional/plugins/core_plugin_a/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_plugin_b/package.json b/test/plugin_functional/plugins/core_plugin_b/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_plugin_legacy/package.json b/test/plugin_functional/plugins/core_plugin_legacy/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "@kbn/plugin-helpers": "9.0.2",
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "@kbn/plugin-helpers": "9.0.2",
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   }
 }
diff --git a/x-pack/legacy/plugins/apm/cypress/package.json b/x-pack/legacy/plugins/apm/cypress/package.json
@@ -11,11 +11,11 @@
     "@cypress/snapshot": "^2.1.3",
     "@cypress/webpack-preprocessor": "^4.1.0",
     "@types/js-yaml": "^3.12.1",
-    "cypress": "^3.4.1",
+    "cypress": "^3.5.0",
     "js-yaml": "^3.13.1",
     "p-limit": "^2.2.1",
     "ts-loader": "^6.1.0",
-    "typescript": "^3.6.3",
+    "typescript": "3.7.2",
     "webpack": "^4.40.2"
   }
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts
@@ -7,10 +7,15 @@
 import { Legacy } from 'kibana';
 import { Server } from 'hapi';
 import moment from 'moment';
+import { KibanaConfig } from 'src/legacy/server/kbn_server';
 import { getESClient } from './es_client';
 import { getUiFiltersES } from './convert_ui_filters/get_ui_filters_es';
-import { PromiseReturnType } from '../../../typings/common';
-import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
+import {
+  getApmIndices,
+  ApmIndicesConfig
+} from '../settings/apm_indices/get_apm_indices';
+import { ESFilter } from '../../../typings/elasticsearch';
+import { ESClient } from './es_client';
 
 function decodeUiFilters(server: Server, uiFiltersEncoded?: string) {
   if (!uiFiltersEncoded) {
@@ -26,9 +31,20 @@ export interface APMRequestQuery {
   end?: string;
   uiFilters?: string;
 }
+// Explicitly type Setup to prevent TS initialization errors
+// https://github.com/microsoft/TypeScript/issues/34933
 
-export type Setup = PromiseReturnType<typeof setupRequest>;
-export async function setupRequest(req: Legacy.Request) {
+export interface Setup {
+  start: number;
+  end: number;
+  uiFiltersES: ESFilter[];
+  client: ESClient;
+  internalClient: ESClient;
+  config: KibanaConfig;
+  indices: ApmIndicesConfig;
+}
+
+export async function setupRequest(req: Legacy.Request): Promise<Setup> {
   const query = (req.query as unknown) as APMRequestQuery;
   const { server } = req;
   const savedObjectsClient = server.savedObjects.getScopedSavedObjectsClient(

diff --git a/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts b/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts
@@ -48,9 +48,10 @@ type GenericMetricsRequest = Overwrite<
   }
 >;
 
-export function transformDataToMetricsChart<
-  TRequest extends GenericMetricsRequest
->(result: ESSearchResponse<unknown, TRequest>, chartBase: ChartBase) {
+export function transformDataToMetricsChart(
+  result: ESSearchResponse<unknown, GenericMetricsRequest>,
+  chartBase: ChartBase
+) {
   const { aggregations, hits } = result;
   const timeseriesData = idx(aggregations, _ => _.timeseriesData);
 

diff --git a/x-pack/legacy/plugins/beats_management/public/utils/typed_react.ts b/x-pack/legacy/plugins/beats_management/public/utils/typed_react.ts
@@ -43,7 +43,9 @@ export const asChildFunctionRenderer = <InjectedProps, OwnProps>(
       }
 
       public render() {
-        return this.props.children(this.getRendererArgs());
+        return (this.props.children as ChildFunctionRendererProps<InjectedProps>['children'])(
+          this.getRendererArgs()
+        );
       }
 
       private getRendererArgs = () =>

diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx
@@ -329,10 +329,10 @@ describe('IndexPattern Data Panel', () => {
         act(() => {
           ((inst.setProps as unknown) as (props: unknown) => {})({
             ...props,
-            ...(propChanges || {}),
+            ...((propChanges as object) || {}),
             state: {
               ...props.state,
-              ...(stateChanges || {}),
+              ...((stateChanges as object) || {}),
             },
           });
           inst.update();

diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/analytics.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/analytics.ts
@@ -11,7 +11,6 @@ import { Subscription } from 'rxjs';
 import { idx } from '@kbn/elastic-idx';
 import { ml } from '../../services/ml_api_service';
 import { getErrorMessage } from '../pages/analytics_management/hooks/use_create_analytics_form';
-import { RegressionEvaluateResponse } from '../common';
 
 export type IndexName = string;
 export type IndexPattern = string;

diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/__tests__/hit_iterator.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/__tests__/hit_iterator.ts
@@ -22,7 +22,7 @@ const mockCallEndpoint = sinon.stub();
 const mockSearchRequest = {};
 const mockConfig: ScrollConfig = { duration: '2s', size: 123 };
 let realCancellationToken = new CancellationToken();
-let isCancelledStub: sinon.SinonStub;
+let isCancelledStub: sinon.SinonStub<[], boolean>;
 
 describe('hitIterator', function() {
   beforeEach(() => {

diff --git a/x-pack/package.json b/x-pack/package.json
@@ -121,7 +121,7 @@
     "cheerio": "0.22.0",
     "commander": "2.20.0",
     "copy-webpack-plugin": "^5.0.4",
-    "cypress": "^3.4.1",
+    "cypress": "^3.5.5",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
     "enzyme-adapter-utils": "^1.12.0",
@@ -170,7 +170,7 @@
     "tmp": "0.1.0",
     "tree-kill": "^1.2.1",
     "ts-loader": "^6.0.4",
-    "typescript": "3.5.3",
+    "typescript": "3.7.2",
     "vinyl-fs": "^3.0.3",
     "whatwg-fetch": "^3.0.0",
     "xml-crypto": "^1.4.0",
@@ -208,7 +208,7 @@
     "apollo-client": "^2.3.8",
     "apollo-link": "^1.2.3",
     "apollo-link-error": "^1.1.7",
-    "apollo-link-http": "^1.5.4",
+    "apollo-link-http": "^1.5.16",
     "apollo-link-schema": "^1.1.0",
     "apollo-link-state": "^0.4.1",
     "apollo-server-errors": "^2.0.2",

diff --git a/x-pack/typings/global_fetch.d.ts b/x-pack/typings/global_fetch.d.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// This type needs to still exist due to apollo-link-http-common hasn't yet updated
+// it's usage (https://github.com/apollographql/apollo-link/issues/1131)
+declare type GlobalFetch = WindowOrWorkerGlobalScope;