elastic · mshustov · Aug 27, 2020 · Jul 31, 2020 · Jul 31, 2020 · Jul 31, 2020
diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "**/@types/chai": "^4.2.11",
     "**/cypress/@types/lodash": "^4.14.159",
     "**/cypress/lodash": "^4.17.20",
-    "**/typescript": "3.9.5",
+    "**/typescript": "4.0.2",
     "**/graphql-toolkit/lodash": "^4.17.15",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/isomorphic-git/**/base64-js": "^1.2.1",
@@ -337,8 +337,8 @@
     "@types/vinyl": "^2.0.4",
     "@types/vinyl-fs": "^2.4.11",
     "@types/zen-observable": "^0.8.0",
-    "@typescript-eslint/eslint-plugin": "^3.7.1",
-    "@typescript-eslint/parser": "^3.7.1",
+    "@typescript-eslint/eslint-plugin": "^3.10.0",
+    "@typescript-eslint/parser": "^3.10.0",
     "angular-aria": "^1.8.0",
     "angular-mocks": "^1.7.9",
     "angular-recursion": "^1.0.5",
@@ -380,7 +380,7 @@
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.20.3",
     "eslint-plugin-react-hooks": "^4.0.4",
     "eslint-plugin-react-perf": "^3.2.3",
@@ -442,7 +442,7 @@
     "pkg-up": "^2.0.0",
     "pngjs": "^3.4.0",
     "postcss": "^7.0.32",
-    "prettier": "^2.0.5",
+    "prettier": "^2.1.1",
     "prop-types": "15.6.0",
     "proxyquire": "1.8.0",
     "react-grid-layout": "^0.16.2",
@@ -468,7 +468,7 @@
     "tape": "^4.13.0",
     "topojson-client": "3.0.0",
     "tree-kill": "^1.2.2",
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "typings-tester": "^0.3.2",
     "ui-select": "0.19.8",
     "vega": "^5.13.0",

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/kibana/tree/master/packages/eslint-config-kibana",
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "^3.7.1",
-    "@typescript-eslint/parser": "^3.7.1",
+    "@typescript-eslint/eslint-plugin": "^3.10.0",
+    "@typescript-eslint/parser": "^3.10.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.8.0",
     "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.10.5",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/babel-preset": "1.0.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.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.9.5",
+    "typescript": "4.0.2",
     "tsd": "^0.7.4"
   },
   "peerDependencies": {

diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json
@@ -25,7 +25,7 @@
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "@kbn/expect": "1.0.0",
     "chance": "1.0.18"
   }

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": "^7.0.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "dependencies": {
     "intl-format-cache": "^2.1.0",

diff --git a/packages/kbn-monaco/package.json b/packages/kbn-monaco/package.json
@@ -20,7 +20,7 @@
     "del": "^5.1.0",
     "raw-loader": "3.1.0",
     "supports-color": "^7.0.0",
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "webpack": "^4.41.5",
     "webpack-cli": "^3.3.10"
   }

diff --git a/packages/kbn-plugin-generator/package.json b/packages/kbn-plugin-generator/package.json
@@ -14,7 +14,7 @@
     "execa": "^4.0.2",
     "inquirer": "^7.3.3",
     "normalize-path": "^3.0.0",
-    "prettier": "^2.0.5",
+    "prettier": "^2.1.1",
     "vinyl": "^2.2.0",
     "vinyl-fs": "^3.0.3"
   },

diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
@@ -35,7 +35,7 @@
     "@types/through2": "^2.0.35",
     "@types/through2-map": "^3.0.0",
     "@types/vinyl": "^2.0.4",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "peerDependencies": {
     "@kbn/babel-preset": "1.0.0"

diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
@@ -562,6 +562,7 @@ module.exports = require("path");
  * under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ToolingLogCollectingWriter = exports.parseLogLevel = exports.pickLevelFromFlags = exports.ToolingLogTextWriter = exports.ToolingLog = void 0;
 var tooling_log_1 = __webpack_require__(6);
 Object.defineProperty(exports, "ToolingLog", { enumerable: true, get: function () { return tooling_log_1.ToolingLog; } });
 var tooling_log_text_writer_1 = __webpack_require__(110);

diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json
@@ -51,15 +51,15 @@
     "multimatch": "^4.0.0",
     "ncp": "^2.0.0",
     "ora": "^1.4.0",
-    "prettier": "^2.0.5",
+    "prettier": "^2.1.1",
     "read-pkg": "^5.2.0",
     "rxjs": "^6.5.5",
     "spawn-sync": "^1.0.15",
     "string-replace-loader": "^2.2.0",
     "strip-ansi": "^4.0.0",
     "strong-log-transformer": "^2.1.0",
     "tempy": "^0.3.0",
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "unlazy-loader": "^0.1.3",
     "webpack": "^4.41.5",
     "webpack-cli": "^3.3.10",

diff --git a/packages/kbn-release-notes/package.json b/packages/kbn-release-notes/package.json
@@ -18,6 +18,6 @@
   },
   "devDependencies": {
     "markdown-it": "^10.0.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
-}
+}
diff --git a/packages/kbn-spec-to-console/package.json b/packages/kbn-spec-to-console/package.json
@@ -18,7 +18,7 @@
   "homepage": "https://github.com/jbudz/spec-to-console#readme",
   "devDependencies": {
     "jest": "^25.5.4",
-    "prettier": "^2.0.5"
+    "prettier": "^2.1.1"
   },
   "dependencies": {
     "commander": "^3.0.0",

diff --git a/packages/kbn-telemetry-tools/package.json b/packages/kbn-telemetry-tools/package.json
@@ -17,6 +17,6 @@
     "normalize-path": "^3.0.0",
     "@types/lodash": "^3.10.1",
     "moment": "^2.24.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap
diff --git a/packages/kbn-telemetry-tools/src/tools/serializer.ts b/packages/kbn-telemetry-tools/src/tools/serializer.ts
@@ -142,14 +142,11 @@ export function getDescriptor(node: ts.Node, program: ts.Program): Descriptor |
   }
 
   if (ts.isUnionTypeNode(node)) {
-    const types = node.types.filter((typeNode) => {
-      return (
-        typeNode.kind !== ts.SyntaxKind.NullKeyword &&
-        typeNode.kind !== ts.SyntaxKind.UndefinedKeyword
-      );
-    });
+    const types = node.types.filter(discardNullOrUndefined);
 
-    const kinds = types.map((typeNode) => getDescriptor(typeNode, program));
+    const kinds = types
+      .map((typeNode) => getDescriptor(typeNode, program))
+      .filter(discardNullOrUndefined);
 
     const uniqueKinds = uniq(kinds, 'kind');
 
@@ -172,3 +169,9 @@ export function getDescriptor(node: ts.Node, program: ts.Program): Descriptor |
       throw new Error(`Unknown type ${ts.SyntaxKind[node.kind]}; ${node.getText()}`);
   }
 }
+
+function discardNullOrUndefined(typeNode: ts.TypeNode | Descriptor | DescriptorValue) {
+  return (
+    typeNode.kind !== ts.SyntaxKind.NullKeyword && typeNode.kind !== ts.SyntaxKind.UndefinedKeyword
+  );
+}
diff --git a/src/fixtures/agg_resp/date_histogram.js b/src/fixtures/agg_resp/date_histogram.js
@@ -31,7 +31,7 @@ export default {
     hits: [],
   },
   aggregations: {
-    '1': {
+    1: {
       buckets: [
         {
           key_as_string: '2015-01-30T01:00:00.000Z',

diff --git a/src/fixtures/agg_resp/range.js b/src/fixtures/agg_resp/range.js
@@ -31,7 +31,7 @@ export default {
     hits: [],
   },
   aggregations: {
-    '1': {
+    1: {
       buckets: {
         '*-1024.0': {
           to: 1024,

diff --git a/src/legacy/server/status/lib/metrics.test.js b/src/legacy/server/status/lib/metrics.test.js
@@ -100,8 +100,8 @@ describe('Metrics', function () {
       Object.defineProperty(process, 'pid', { get: pidMock }); //
 
       const hapiEvent = {
-        requests: { '5603': { total: 22, disconnects: 0, statusCodes: { '200': 22 } } },
-        responseTimes: { '5603': { avg: 1.8636363636363635, max: 4 } },
+        requests: { 5603: { total: 22, disconnects: 0, statusCodes: { 200: 22 } } },
+        responseTimes: { 5603: { avg: 1.8636363636363635, max: 4 } },
         osload: [2.20751953125, 2.02294921875, 1.89794921875],
         osmem: { total: 17179869184, free: 102318080 },
         osup: 1008991,
@@ -150,9 +150,9 @@ describe('Metrics', function () {
     it('parses event with missing fields / NaN for responseTimes.avg', async () => {
       const hapiEvent = {
         requests: {
-          '5603': { total: 22, disconnects: 0, statusCodes: { '200': 22 } },
+          5603: { total: 22, disconnects: 0, statusCodes: { 200: 22 } },
         },
-        responseTimes: { '5603': { avg: NaN, max: 4 } },
+        responseTimes: { 5603: { avg: NaN, max: 4 } },
         host: 'blahblah.local',
       };
 

diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
@@ -228,7 +228,7 @@ export class AdvancedSettingsComponent extends Component<
 }
 
 export const AdvancedSettings = (props: AdvancedSettingsProps) => {
-  const { query } = useParams();
+  const { query } = useParams<{ query: string }>();
   return (
     <AdvancedSettingsComponent
       queryText={query || ''}