diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts
index 41323a82f4ee0..e44fb903ef042 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts
@@ -10,7 +10,7 @@ import {
   Style,
   ExpressionFunctionDefinition,
 } from 'src/plugins/expressions/common';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { Handlebars } from '../../../common/lib/handlebars';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts
index e952faca1d5eb..8a28f71ee1b47 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts
@@ -59,25 +59,25 @@ export function compare(): ExpressionFunctionDefinition<'compare', Context, Argu
           return a !== b;
         case Operation.LT:
           if (typesMatch) {
-            // @ts-ignore #35433 This is a wonky comparison for nulls
+            // @ts-expect-error #35433 This is a wonky comparison for nulls
             return a < b;
           }
           return false;
         case Operation.LTE:
           if (typesMatch) {
-            // @ts-ignore #35433 This is a wonky comparison for nulls
+            // @ts-expect-error #35433 This is a wonky comparison for nulls
             return a <= b;
           }
           return false;
         case Operation.GT:
           if (typesMatch) {
-            // @ts-ignore #35433 This is a wonky comparison for nulls
+            // @ts-expect-error #35433 This is a wonky comparison for nulls
             return a > b;
           }
           return false;
         case Operation.GTE:
           if (typesMatch) {
-            // @ts-ignore #35433 This is a wonky comparison for nulls
+            // @ts-expect-error #35433 This is a wonky comparison for nulls
             return a >= b;
           }
           return false;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts
index b841fde284ab6..09ce2b2bf1755 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts
@@ -6,7 +6,7 @@
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
 import { ContainerStyle, Overflow, BackgroundRepeat, BackgroundSize } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { isValidUrl } from '../../../common/lib/url';
 
 interface Output extends ContainerStyle {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts
index c43ff6373ea0f..3ef956b41ce20 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts
@@ -6,9 +6,9 @@
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { resolveWithMissingImage } from '../../../common/lib/resolve_dataurl';
-// @ts-ignore .png file
+// @ts-expect-error .png file
 import { elasticLogo } from '../../lib/elastic_logo';
 
 export enum ImageMode {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/math.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/math.ts
index 7f84dc54d8092..e36644530eae8 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/math.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/math.ts
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore no @typed def; Elastic library
+// @ts-expect-error no @typed def; Elastic library
 import { evaluate } from 'tinymath';
-// @ts-ignore untyped local
 import { pivotObjectArray } from '../../../common/lib/pivot_object_array';
 import { Datatable, isDatatable, ExpressionFunctionDefinition } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.ts
index 63cd663d2ac4c..f27abe261e2e2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.ts
@@ -5,7 +5,7 @@
  */
 
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { palettes } from '../../../common/lib/palettes';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts
index 6cb64a43ea582..b568f18924869 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts
@@ -5,11 +5,11 @@
  */
 
 import { get, map, groupBy } from 'lodash';
-// @ts-ignore lodash.keyby imports invalid member from @types/lodash
+// @ts-expect-error lodash.keyby imports invalid member from @types/lodash
 import keyBy from 'lodash.keyby';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { getColorsFromPalette } from '../../../common/lib/get_colors_from_palette';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { getLegendConfig } from '../../../common/lib/get_legend_config';
 import { getFunctionHelp } from '../../../i18n';
 import {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts
index e8214ca8eaf9f..0b4583f4581ae 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore no @typed def
+// @ts-expect-error no @typed def
 import keyBy from 'lodash.keyby';
 import { groupBy, get, set, map, sortBy } from 'lodash';
 import { ExpressionFunctionDefinition, Style } from 'src/plugins/expressions';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { getColorsFromPalette } from '../../../../common/lib/get_colors_from_palette';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { getLegendConfig } from '../../../../common/lib/get_legend_config';
 import { getFlotAxisConfig } from './get_flot_axis_config';
 import { getFontSpec } from './get_font_spec';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts
index da50195480c68..f8eeabfccde6d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts
@@ -7,7 +7,6 @@
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
 import { Render, ContainerStyle } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
-// @ts-ignore unconverted local file
 import { DEFAULT_ELEMENT_CSS } from '../../../common/lib/constants';
 
 interface ContainerStyleArgument extends ContainerStyle {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeatImage.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeatImage.ts
index f91fd3dfc5522..9e296f2b9a92a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeatImage.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeatImage.ts
@@ -5,9 +5,9 @@
  */
 
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { resolveWithMissingImage } from '../../../common/lib/resolve_dataurl';
-// @ts-ignore .png file
+// @ts-expect-error .png file
 import { elasticOutline } from '../../lib/elastic_outline';
 import { Render } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts
index d961227a302b8..3e721cc49b411 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts
@@ -5,9 +5,9 @@
  */
 
 import { ExpressionFunctionDefinition, ExpressionValueRender } from 'src/plugins/expressions';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { resolveWithMissingImage } from '../../../common/lib/resolve_dataurl';
-// @ts-ignore .png file
+// @ts-expect-error .png file
 import { elasticOutline } from '../../lib/elastic_outline';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
index 62328556b45e3..da441bc3266c1 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
@@ -79,7 +79,7 @@ export function savedVisualization(): ExpressionFunctionDefinition<
       }
 
       if (hideLegend === true) {
-        // @ts-ignore LegendOpen missing on VisualizeInput
+        // @ts-expect-error LegendOpen missing on VisualizeInput
         visOptions.legendOpen = false;
       }
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts
index 9dd38dd57c677..4fa4be0a2f09f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore untyped Elastic library
 import { getType } from '@kbn/interpreter/common';
 import {
   ExpressionFunctionDefinition,
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts
index 843e2bda47e12..60d5edeb10483 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts
@@ -6,7 +6,7 @@
 
 import { sortBy } from 'lodash';
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
-// @ts-ignore unconverted lib file
+// @ts-expect-error unconverted lib file
 import { queryDatatable } from '../../../../common/lib/datatable/query';
 import { DemoRows } from './demo_rows_types';
 import { getDemoRows } from './get_demo_rows';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.ts
index 142331aabf351..26f651e770363 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.ts
@@ -9,7 +9,7 @@ import {
   ExpressionValueFilter,
 } from 'src/plugins/expressions/common';
 /* eslint-disable */
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { buildESRequest } from '../../../server/lib/build_es_request';
 /* eslint-enable */
 import { getFunctionHelp } from '../../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts
index 2b229b8957ec1..a090f09a76ea2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts
@@ -7,7 +7,7 @@
 import squel from 'squel';
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
 /* eslint-disable */
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { queryEsSQL } from '../../../server/lib/query_es_sql';
 /* eslint-enable */
 import { ExpressionValueFilter } from '../../../types';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql.ts
index c64398d4b3a18..5ac91bec849c2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql.ts
@@ -6,7 +6,7 @@
 
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
 /* eslint-disable */
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { queryEsSQL } from '../../../server/lib/query_es_sql';
 /* eslint-enable */
 import { ExpressionValueFilter } from '../../../types';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/get_field_names.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/get_field_names.test.ts
index c25628e5cf2b9..7dee587895485 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/get_field_names.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/get_field_names.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore untyped library
+// @ts-expect-error untyped library
 import { parse } from 'tinymath';
 import { getFieldNames } from './pointseries/lib/get_field_names';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts
index 54e48c8abf04b..bae80d3c33510 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore Untyped library
+// @ts-expect-error untyped library
 import uniqBy from 'lodash.uniqby';
-// @ts-ignore Untyped Elastic library
+// @ts-expect-error untyped Elastic library
 import { evaluate } from 'tinymath';
 import { groupBy, zipObject, omit } from 'lodash';
 import moment from 'moment';
@@ -18,13 +18,10 @@ import {
   PointSeriesColumnName,
   PointSeriesColumns,
 } from 'src/plugins/expressions/common';
-// @ts-ignore Untyped local
 import { pivotObjectArray } from '../../../../common/lib/pivot_object_array';
-// @ts-ignore Untyped local
 import { unquoteString } from '../../../../common/lib/unquote_string';
-// @ts-ignore Untyped local
 import { isColumnReference } from './lib/is_column_reference';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { getExpressionType } from './lib/get_expression_type';
 import { getFunctionHelp, getFunctionErrors } from '../../../../i18n';
 
@@ -125,7 +122,7 @@ export function pointseries(): ExpressionFunctionDefinition<
             col.role = 'measure';
           }
 
-          // @ts-ignore untyped local: get_expression_type
+          // @ts-expect-error untyped local: get_expression_type
           columns[argName] = col;
         }
       });
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.ts
index 0ecc135ba9042..aed9861e1250c 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore Untyped Library
+// @ts-expect-error untyped library
 import { parse } from 'tinymath';
 
 export function isColumnReference(mathExpression: string | null): boolean {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
index c9ce4d065968a..4fbb5d0069e51 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
@@ -12,17 +12,16 @@ import { Start as InspectorStart } from '../../../../src/plugins/inspector/publi
 
 import { functions } from './functions/browser';
 import { typeFunctions } from './expression_types';
-// @ts-ignore: untyped local
+// @ts-expect-error: untyped local
 import { renderFunctions, renderFunctionFactories } from './renderers';
 import { initializeElements } from './elements';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { transformSpecs } from './uis/transforms';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { datasourceSpecs } from './uis/datasources';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { modelSpecs } from './uis/models';
 import { initializeViews } from './uis/views';
-// @ts-ignore Untyped Local
 import { initializeArgs } from './uis/arguments';
 import { tagSpecs } from './uis/tags';
 import { templateSpecs } from './templates';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
index 4c8de2afd81ad..f03c10e2d424e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
@@ -26,7 +26,7 @@ export function toExpression(input: VisualizeInput): string {
       .reduce((_, part) => expressionParts.push(part), 0);
   }
 
-  // @ts-ignore LegendOpen missing on VisualizeInput type
+  // @ts-expect-error LegendOpen missing on VisualizeInput type
   if (input.vis?.legendOpen !== undefined && input.vis.legendOpen === false) {
     expressionParts.push(`hideLegend=true`);
   }
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/index.ts
index fce9b21fa0387..e972928fe20b0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/index.ts
@@ -7,7 +7,6 @@
 import { compose, withProps } from 'recompose';
 import moment from 'moment';
 import { DateFormatArgInput as Component, Props as ComponentProps } from './date_format';
-// @ts-ignore untyped local lib
 import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
 import { ArgumentFactory } from '../../../../types/arguments';
 import { ArgumentStrings } from '../../../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/index.ts
index 2f9a21d8a009f..94a9cf28aef69 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/index.ts
@@ -5,31 +5,31 @@
  */
 
 import { axisConfig } from './axis_config';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { datacolumn } from './datacolumn';
 import { dateFormatInitializer } from './date_format';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { filterGroup } from './filter_group';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { imageUpload } from './image_upload';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { number } from './number';
 import { numberFormatInitializer } from './number_format';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { palette } from './palette';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { percentage } from './percentage';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { range } from './range';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { select } from './select';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { shape } from './shape';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { string } from './string';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { textarea } from './textarea';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { toggle } from './toggle';
 
 import { SetupInitializer } from '../../plugin';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts
index 5a3e3904f4f23..17d630f0ab9e2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts
@@ -6,7 +6,6 @@
 
 import { compose, withProps } from 'recompose';
 import { NumberFormatArgInput as Component, Props as ComponentProps } from './number_format';
-// @ts-ignore untyped local lib
 import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
 import { ArgumentFactory } from '../../../../types/arguments';
 import { ArgumentStrings } from '../../../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.ts
index 34877f2fd551b..19f10628a90cb 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.ts
@@ -4,33 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { dropdownControl } from './dropdownControl';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { getCell } from './getCell';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { image } from './image';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { markdown } from './markdown';
-// @ts-ignore untyped local
 import { metricInitializer } from './metric';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { pie } from './pie';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { plot } from './plot';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { progress } from './progress';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { repeatImage } from './repeatImage';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { revealImage } from './revealImage';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { render } from './render';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { shape } from './shape';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { table } from './table';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { timefilterControl } from './timefilterControl';
 
 import { SetupInitializer } from '../../plugin';
diff --git a/x-pack/plugins/canvas/common/lib/autocomplete.ts b/x-pack/plugins/canvas/common/lib/autocomplete.ts
index c97879de2137e..0a30b2e2f598e 100644
--- a/x-pack/plugins/canvas/common/lib/autocomplete.ts
+++ b/x-pack/plugins/canvas/common/lib/autocomplete.ts
@@ -5,7 +5,7 @@
  */
 
 import { uniq } from 'lodash';
-// @ts-ignore Untyped Library
+// @ts-expect-error untyped library
 import { parse } from '@kbn/interpreter/common';
 import {
   ExpressionAstExpression,
diff --git a/x-pack/plugins/canvas/common/lib/dataurl.ts b/x-pack/plugins/canvas/common/lib/dataurl.ts
index ea5a26b27e423..60e65a6d3ca1c 100644
--- a/x-pack/plugins/canvas/common/lib/dataurl.ts
+++ b/x-pack/plugins/canvas/common/lib/dataurl.ts
@@ -6,7 +6,7 @@
 
 import { fromByteArray } from 'base64-js';
 
-// @ts-ignore @types/mime doesn't resolve mime/lite for some reason.
+// @ts-expect-error @types/mime doesn't resolve mime/lite for some reason.
 import mime from 'mime/lite';
 
 const dataurlRegex = /^data:([a-z]+\/[a-z0-9-+.]+)(;[a-z-]+=[a-z0-9-]+)?(;([a-z0-9]+))?,/;
diff --git a/x-pack/plugins/canvas/common/lib/index.ts b/x-pack/plugins/canvas/common/lib/index.ts
index 5ab29c290c3da..4cb3cbbb9b4e6 100644
--- a/x-pack/plugins/canvas/common/lib/index.ts
+++ b/x-pack/plugins/canvas/common/lib/index.ts
@@ -4,39 +4,33 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './datatable';
-// @ts-ignore missing local definition
 export * from './autocomplete';
 export * from './constants';
 export * from './dataurl';
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './errors';
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './expression_form_handlers';
-// @ts-ignore missing local definition
 export * from './fetch';
 export * from './fonts';
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './get_colors_from_palette';
-// @ts-ignore missing local definition
 export * from './get_field_type';
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './get_legend_config';
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './handlebars';
 export * from './hex_to_rgb';
-// @ts-ignore missing local definition
 export * from './httpurl';
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './missing_asset';
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './palettes';
-// @ts-ignore missing local definition
 export * from './pivot_object_array';
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './resolve_dataurl';
-// @ts-ignore missing local definition
 export * from './unquote_string';
-// @ts-ignore missing local definition
+// @ts-expect-error missing local definition
 export * from './url';
diff --git a/x-pack/plugins/canvas/common/lib/pivot_object_array.test.ts b/x-pack/plugins/canvas/common/lib/pivot_object_array.test.ts
index faf319769cab0..0fbc2fa6b0f38 100644
--- a/x-pack/plugins/canvas/common/lib/pivot_object_array.test.ts
+++ b/x-pack/plugins/canvas/common/lib/pivot_object_array.test.ts
@@ -55,7 +55,7 @@ describe('pivotObjectArray', () => {
   });
 
   it('throws when given an invalid column list', () => {
-    // @ts-ignore testing potential calls from legacy code that should throw
+    // @ts-expect-error testing potential calls from legacy code that should throw
     const check = () => pivotObjectArray(rows, [{ name: 'price' }, { name: 'missing' }]);
     expect(check).toThrowError('Columns should be an array of strings');
   });
diff --git a/x-pack/plugins/canvas/public/application.tsx b/x-pack/plugins/canvas/public/application.tsx
index c799f36a283c1..b2c836fe4805f 100644
--- a/x-pack/plugins/canvas/public/application.tsx
+++ b/x-pack/plugins/canvas/public/application.tsx
@@ -15,14 +15,14 @@ import { BehaviorSubject } from 'rxjs';
 import { AppMountParameters, CoreStart, CoreSetup, AppUpdater } from 'kibana/public';
 
 import { CanvasStartDeps, CanvasSetupDeps } from './plugin';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { App } from './components/app';
 import { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
 import { registerLanguage } from './lib/monaco_language_def';
 import { SetupRegistries } from './plugin_api';
 import { initRegistries, populateRegistries, destroyRegistries } from './registries';
 import { getDocumentationLinks } from './lib/documentation_links';
-// @ts-ignore untyped component
+// @ts-expect-error untyped component
 import { HelpMenu } from './components/help_menu/help_menu';
 import { createStore } from './store';
 
@@ -32,12 +32,12 @@ import { init as initStatsReporter } from './lib/ui_metric';
 import { CapabilitiesStrings } from '../i18n';
 
 import { startServices, services } from './services';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { createHistory, destroyHistory } from './lib/history_provider';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { stopRouter } from './lib/router_provider';
 import { initFunctions } from './functions';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { appUnload } from './state/actions/app';
 
 import './style/index.scss';
diff --git a/x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx b/x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx
index 7f5b53df4ba52..b0a8d1e990e75 100644
--- a/x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx
+++ b/x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { ExportApp } from '../export_app';
 
 jest.mock('style-it', () => ({
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx
index 3014369d94857..981334ff8d9f2 100644
--- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx
+++ b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx
@@ -6,11 +6,8 @@
 
 import React, { useState, useEffect } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
-// @ts-ignore: Local Untyped
 import { trackCanvasUiMetric, METRIC_TYPE } from '../../../lib/ui_metric';
-// @ts-ignore: Local Untyped
 import { getElementCounts } from '../../../state/selectors/workpad';
-// @ts-ignore: Local Untyped
 import { getArgs } from '../../../state/selectors/resolved_args';
 
 const WorkpadLoadedMetric = 'workpad-loaded';
diff --git a/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx b/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx
index c26fdb8c46d0f..26295acecd920 100644
--- a/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx
+++ b/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx
@@ -7,11 +7,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonIcon } from '@elastic/eui';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { Popover, PopoverChildrenProps } from '../popover';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { ArgAdd } from '../arg_add';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { Arg } from '../../expression_types/arg';
 
 import { ComponentStrings } from '../../../i18n';
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/asset.tsx b/x-pack/plugins/canvas/public/components/asset_manager/asset.tsx
index cb7ec1aba8f59..b0eaecc7b5203 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/asset.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_manager/asset.tsx
@@ -7,7 +7,6 @@ import {
   EuiButtonIcon,
   EuiFlexGroup,
   EuiFlexItem,
-  // @ts-ignore (elastic/eui#1262) EuiImage is not exported yet
   EuiImage,
   EuiPanel,
   EuiSpacer,
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/asset_modal.tsx b/x-pack/plugins/canvas/public/components/asset_manager/asset_modal.tsx
index bf34f60ce75b3..ebc398a805b62 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/asset_modal.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_manager/asset_modal.tsx
@@ -6,7 +6,6 @@
 import {
   EuiButton,
   EuiEmptyPrompt,
-  // @ts-ignore (elastic/eui#1557) EuiFilePicker is not exported yet
   EuiFilePicker,
   EuiFlexGrid,
   EuiFlexGroup,
@@ -26,7 +25,6 @@ import React, { FunctionComponent } from 'react';
 
 import { ComponentStrings } from '../../../i18n';
 
-// @ts-ignore
 import { ASSET_MAX_SIZE } from '../../../common/lib/constants';
 import { Loading } from '../loading';
 import { Asset } from './asset';
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/index.ts b/x-pack/plugins/canvas/public/components/asset_manager/index.ts
index 23dbe3df085d4..b07857f13f6c6 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/index.ts
+++ b/x-pack/plugins/canvas/public/components/asset_manager/index.ts
@@ -9,16 +9,16 @@ import { compose, withProps } from 'recompose';
 import { set, get } from 'lodash';
 import { fromExpression, toExpression } from '@kbn/interpreter/common';
 import { getAssets } from '../../state/selectors/assets';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { removeAsset, createAsset } from '../../state/actions/assets';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { elementsRegistry } from '../../lib/elements_registry';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { addElement } from '../../state/actions/elements';
 import { getSelectedPage } from '../../state/selectors/workpad';
 import { encode } from '../../../common/lib/dataurl';
 import { getId } from '../../lib/get_id';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { findExistingAsset } from '../../lib/find_existing_asset';
 import { VALID_IMAGE_TYPES } from '../../../common/lib/constants';
 import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
diff --git a/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx b/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx
index 4489e877abf88..1f49e9ae14f5c 100644
--- a/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx
@@ -6,14 +6,7 @@
 
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import {
-  EuiFlexGrid,
-  EuiFlexItem,
-  EuiLink,
-  // @ts-ignore (elastic/eui#1557) EuiImage is not exported yet
-  EuiImage,
-  EuiIcon,
-} from '@elastic/eui';
+import { EuiFlexGrid, EuiFlexItem, EuiLink, EuiImage, EuiIcon } from '@elastic/eui';
 
 import { CanvasAsset } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
index 8f73939de69a6..ceb7c83f3cab5 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
@@ -12,7 +12,6 @@ import {
   EuiButton,
   EuiButtonEmpty,
   EuiFieldText,
-  // @ts-ignore hasn't been converted to TypeScript yet
   EuiFilePicker,
   EuiFlexGroup,
   EuiFlexItem,
@@ -27,7 +26,6 @@ import {
   EuiTextArea,
   EuiTitle,
 } from '@elastic/eui';
-// @ts-ignore converting /libs/constants to TS breaks CI
 import { VALID_IMAGE_TYPES } from '../../../common/lib/constants';
 import { encode } from '../../../common/lib/dataurl';
 import { ElementCard } from '../element_card';
diff --git a/x-pack/plugins/canvas/public/components/embeddable_flyout/index.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/index.tsx
index 8e69396f67c2e..9462ba0411de4 100644
--- a/x-pack/plugins/canvas/public/components/embeddable_flyout/index.tsx
+++ b/x-pack/plugins/canvas/public/components/embeddable_flyout/index.tsx
@@ -10,7 +10,7 @@ import { compose } from 'recompose';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { AddEmbeddableFlyout, Props } from './flyout';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { addElement } from '../../state/actions/elements';
 import { getSelectedPage } from '../../state/selectors/workpad';
 import { EmbeddableTypes } from '../../../canvas_plugin_src/expression_types/embeddable';
diff --git a/x-pack/plugins/canvas/public/components/file_upload/file_upload.tsx b/x-pack/plugins/canvas/public/components/file_upload/file_upload.tsx
index 993ee8bde2653..22fa32606407b 100644
--- a/x-pack/plugins/canvas/public/components/file_upload/file_upload.tsx
+++ b/x-pack/plugins/canvas/public/components/file_upload/file_upload.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore (elastic/eui#1262) EuiFilePicker is not exported yet
 import { EuiFilePicker } from '@elastic/eui';
 import PropTypes from 'prop-types';
 import React, { FunctionComponent } from 'react';
diff --git a/x-pack/plugins/canvas/public/components/font_picker/font_picker.tsx b/x-pack/plugins/canvas/public/components/font_picker/font_picker.tsx
index 4340430829342..556a3c5452160 100644
--- a/x-pack/plugins/canvas/public/components/font_picker/font_picker.tsx
+++ b/x-pack/plugins/canvas/public/components/font_picker/font_picker.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore (elastic/eui#1262) EuiSuperSelect is not exported yet
 import { EuiSuperSelect } from '@elastic/eui';
 import PropTypes from 'prop-types';
 import React, { FunctionComponent } from 'react';
diff --git a/x-pack/plugins/canvas/public/components/router/index.ts b/x-pack/plugins/canvas/public/components/router/index.ts
index fa857c6f0cd3c..561ad0e9401f5 100644
--- a/x-pack/plugins/canvas/public/components/router/index.ts
+++ b/x-pack/plugins/canvas/public/components/router/index.ts
@@ -5,14 +5,14 @@
  */
 
 import { connect } from 'react-redux';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { setFullscreen } from '../../state/actions/transient';
 import {
   enableAutoplay,
   setRefreshInterval,
   setAutoplayInterval,
 } from '../../state/actions/workpad';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { Router as Component } from './router';
 import { State } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/index.ts b/x-pack/plugins/canvas/public/components/saved_elements_modal/index.ts
index f14fc92e028db..c5c1dbc2fdd6e 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/index.ts
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/index.ts
@@ -8,14 +8,13 @@ import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { compose, withState } from 'recompose';
 import { camelCase } from 'lodash';
-// @ts-ignore Untyped local
 import { cloneSubgraphs } from '../../lib/clone_subgraphs';
 import * as customElementService from '../../lib/custom_element_service';
 import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { WithKibanaProps } from '../../';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { selectToplevelNodes } from '../../state/actions/transient';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { insertNodes } from '../../state/actions/elements';
 import { getSelectedPage } from '../../state/selectors/workpad';
 import { trackCanvasUiMetric, METRIC_TYPE } from '../../lib/ui_metric';
diff --git a/x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.tsx b/x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.tsx
index 74f4887601d30..e3f4e00f4de01 100644
--- a/x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.tsx
+++ b/x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.tsx
@@ -7,9 +7,9 @@
 import React, { FunctionComponent } from 'react';
 import PropTypes from 'prop-types';
 import { EuiTabbedContent } from '@elastic/eui';
-// @ts-ignore unconverted component
+// @ts-expect-error unconverted component
 import { Datasource } from '../../datasource';
-// @ts-ignore unconverted component
+// @ts-expect-error unconverted component
 import { FunctionFormList } from '../../function_form_list';
 import { PositionedElement } from '../../../../types';
 import { ComponentStrings } from '../../../../i18n';
diff --git a/x-pack/plugins/canvas/public/components/sidebar/global_config.tsx b/x-pack/plugins/canvas/public/components/sidebar/global_config.tsx
index 2e241681ccc6a..f89ab79a086cf 100644
--- a/x-pack/plugins/canvas/public/components/sidebar/global_config.tsx
+++ b/x-pack/plugins/canvas/public/components/sidebar/global_config.tsx
@@ -5,13 +5,12 @@
  */
 
 import React, { Fragment, FunctionComponent } from 'react';
-// @ts-ignore unconverted component
+// @ts-expect-error unconverted component
 import { ElementConfig } from '../element_config';
-// @ts-ignore unconverted component
+// @ts-expect-error unconverted component
 import { PageConfig } from '../page_config';
-// @ts-ignore unconverted component
 import { WorkpadConfig } from '../workpad_config';
-// @ts-ignore unconverted component
+// @ts-expect-error unconverted component
 import { SidebarSection } from './sidebar_section';
 
 export const GlobalConfig: FunctionComponent = () => (
diff --git a/x-pack/plugins/canvas/public/components/sidebar/sidebar.tsx b/x-pack/plugins/canvas/public/components/sidebar/sidebar.tsx
index 26f106911e015..9f1936fdc143b 100644
--- a/x-pack/plugins/canvas/public/components/sidebar/sidebar.tsx
+++ b/x-pack/plugins/canvas/public/components/sidebar/sidebar.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { FunctionComponent } from 'react';
-// @ts-ignore unconverted component
+// @ts-expect-error unconverted component
 import { SidebarContent } from './sidebar_content';
 
 interface Props {
diff --git a/x-pack/plugins/canvas/public/components/toolbar/toolbar.tsx b/x-pack/plugins/canvas/public/components/toolbar/toolbar.tsx
index 0f8204e6bc261..9a26b438e17c3 100644
--- a/x-pack/plugins/canvas/public/components/toolbar/toolbar.tsx
+++ b/x-pack/plugins/canvas/public/components/toolbar/toolbar.tsx
@@ -20,13 +20,13 @@ import { CanvasElement } from '../../../types';
 
 import { ComponentStrings } from '../../../i18n';
 
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { Navbar } from '../navbar';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { WorkpadManager } from '../workpad_manager';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { PageManager } from '../page_manager';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { Expression } from '../expression';
 import { Tray } from './tray';
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/index.ts
index 75bdcd2b0ada1..8f013f70aefcd 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/index.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/index.ts
@@ -9,17 +9,17 @@ import { compose, withHandlers, withProps } from 'recompose';
 import { Dispatch } from 'redux';
 import { State, PositionedElement } from '../../../../types';
 import { getClipboardData } from '../../../lib/clipboard';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { flatten } from '../../../lib/aeroelastic/functional';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { globalStateUpdater } from '../../workpad_page/integration_utils';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { crawlTree } from '../../workpad_page/integration_utils';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { insertNodes, elementLayer, removeElements } from '../../../state/actions/elements';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { undoHistory, redoHistory } from '../../../state/actions/history';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { selectToplevelNodes } from '../../../state/actions/transient';
 import {
   getSelectedPage,
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.tsx
index fbb5d70dfc55c..6d9233aaba22b 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.tsx
@@ -19,7 +19,6 @@ import { ElementSpec } from '../../../../types';
 import { flattenPanelTree } from '../../../lib/flatten_panel_tree';
 import { getId } from '../../../lib/get_id';
 import { Popover, ClosePopoverFn } from '../../popover';
-// @ts-ignore Untyped local
 import { AssetManager } from '../../asset_manager';
 import { SavedElementsModal } from '../../saved_elements_modal';
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.tsx b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.tsx
index a1227b3394678..13b2cace13a40 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.tsx
@@ -10,10 +10,10 @@ import { compose, withProps } from 'recompose';
 import { Dispatch } from 'redux';
 import { withKibana } from '../../../../../../../src/plugins/kibana_react/public/';
 import { State, ElementSpec } from '../../../../types';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { elementsRegistry } from '../../../lib/elements_registry';
 import { ElementMenu as Component, Props as ComponentProps } from './element_menu';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { addElement } from '../../../state/actions/elements';
 import { getSelectedPage } from '../../../state/selectors/workpad';
 import { AddEmbeddablePanel } from '../../embeddable_flyout';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx b/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx
index 5ffa712abee13..77edf9d2264d4 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx
@@ -6,7 +6,7 @@
 
 import React, { ReactNode, KeyboardEvent } from 'react';
 import PropTypes from 'prop-types';
-// @ts-ignore no @types definition
+// @ts-expect-error no @types definition
 import { Shortcuts } from 'react-shortcuts';
 import { isTextInput } from '../../../lib/is_text_input';
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/index.tsx b/x-pack/plugins/canvas/public/components/workpad_header/index.tsx
index d2fece567a8ad..407b4ff932811 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/index.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/index.tsx
@@ -6,11 +6,8 @@
 
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
-// @ts-ignore untyped local
 import { canUserWrite } from '../../state/selectors/app';
-// @ts-ignore untyped local
 import { getSelectedPage, isWriteable } from '../../state/selectors/workpad';
-// @ts-ignore untyped local
 import { setWriteable } from '../../state/actions/workpad';
 import { State } from '../../../types';
 import { WorkpadHeader as Component, Props as ComponentProps } from './workpad_header';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/index.ts
index 53c053811a273..87b926d93ccb9 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/index.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/index.ts
@@ -5,9 +5,8 @@
  */
 
 import { connect } from 'react-redux';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { fetchAllRenderables } from '../../../state/actions/elements';
-// @ts-ignore untyped local
 import { getInFlight } from '../../../state/selectors/resolved_args';
 import { State } from '../../../../types';
 import { RefreshControl as Component } from './refresh_control';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts
index 64712f0df8d6c..1e1eac2a1dcf3 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts
@@ -11,7 +11,6 @@ import {
   getRenderedWorkpad,
   getRenderedWorkpadExpressions,
 } from '../../../../state/selectors/workpad';
-// @ts-ignore Untyped local
 import {
   downloadRenderedWorkpad,
   downloadRuntime,
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
index 8a3438e89e846..45257cd4fe308 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
@@ -5,7 +5,6 @@
  */
 
 import rison from 'rison-node';
-// @ts-ignore Untyped local.
 import { IBasePath } from 'kibana/public';
 import { fetch } from '../../../../common/lib/fetch';
 import { CanvasWorkpad } from '../../../../types';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/index.ts
index 0765973915f77..ddf1a12775cae 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/index.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/index.ts
@@ -10,9 +10,9 @@ import { Dispatch } from 'redux';
 import { withKibana } from '../../../../../../../src/plugins/kibana_react/public/';
 import { zoomHandlerCreators } from '../../../lib/app_handler_creators';
 import { State, CanvasWorkpadBoundingBox } from '../../../../types';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { fetchAllRenderables } from '../../../state/actions/elements';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { setZoomScale, setFullscreen, selectToplevelNodes } from '../../../state/actions/transient';
 import {
   setWriteable,
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx
index 4aab8280a9f24..eb4b451896b46 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx
@@ -6,14 +6,13 @@
 
 import React, { FunctionComponent } from 'react';
 import PropTypes from 'prop-types';
-// @ts-ignore no @types definition
+// @ts-expect-error no @types definition
 import { Shortcuts } from 'react-shortcuts';
 import { EuiFlexItem, EuiFlexGroup, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import { ComponentStrings } from '../../../i18n';
 import { ToolTipShortcut } from '../tool_tip_shortcut/';
-// @ts-ignore untyped local
 import { RefreshControl } from './refresh_control';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { FullscreenControl } from './fullscreen_control';
 import { EditMenu } from './edit_menu';
 import { ElementMenu } from './element_menu';
diff --git a/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx b/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx
index d5841a1069ea1..e1ed7c7db84a0 100644
--- a/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { CSSProperties, PureComponent } from 'react';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { WORKPAD_CONTAINER_ID } from '../../../apps/workpad/workpad_app';
 
 interface State {
diff --git a/x-pack/plugins/canvas/public/components/workpad_shortcuts/workpad_shortcuts.tsx b/x-pack/plugins/canvas/public/components/workpad_shortcuts/workpad_shortcuts.tsx
index f9e0ec8a8a541..1bb3ef330f846 100644
--- a/x-pack/plugins/canvas/public/components/workpad_shortcuts/workpad_shortcuts.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_shortcuts/workpad_shortcuts.tsx
@@ -7,7 +7,7 @@
 import React, { Component, KeyboardEvent } from 'react';
 
 import isEqual from 'react-fast-compare';
-// @ts-ignore no @types definition
+// @ts-expect-error no @types definition
 import { Shortcuts } from 'react-shortcuts';
 import { isTextInput } from '../../lib/is_text_input';
 
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/extended_template.examples.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/extended_template.examples.tsx
index 5fdc88ed62406..863cdd88163c2 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/extended_template.examples.tsx
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/extended_template.examples.tsx
@@ -7,7 +7,7 @@
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { getDefaultWorkpad } from '../../../../state/defaults';
 
 import { Arguments, ArgumentTypes, BorderStyle, ExtendedTemplate } from '../extended_template';
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/simple_template.examples.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/simple_template.examples.tsx
index 4ef17fbe87616..2dbff1b4d916b 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/simple_template.examples.tsx
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/simple_template.examples.tsx
@@ -7,7 +7,7 @@
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { getDefaultWorkpad } from '../../../../state/defaults';
 
 import { Argument, Arguments, SimpleTemplate } from '../simple_template';
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/simple_template.examples.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/simple_template.examples.tsx
index f9b175e84ec8e..fa1b2420d46d2 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/simple_template.examples.tsx
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/simple_template.examples.tsx
@@ -7,7 +7,7 @@
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { getDefaultWorkpad } from '../../../../state/defaults';
 
 import { SimpleTemplate } from '../simple_template';
diff --git a/x-pack/plugins/canvas/public/functions/asset.ts b/x-pack/plugins/canvas/public/functions/asset.ts
index 2f2ad181b264c..ebd3fd2abdcbb 100644
--- a/x-pack/plugins/canvas/public/functions/asset.ts
+++ b/x-pack/plugins/canvas/public/functions/asset.ts
@@ -5,7 +5,7 @@
  */
 
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
-// @ts-ignore unconverted local lib
+// @ts-expect-error unconverted local lib
 import { getState } from '../state/store';
 import { getAssetById } from '../state/selectors/assets';
 import { getFunctionHelp, getFunctionErrors } from '../../i18n';
diff --git a/x-pack/plugins/canvas/public/functions/filters.ts b/x-pack/plugins/canvas/public/functions/filters.ts
index 78cd742b44b26..48f4a41c7690a 100644
--- a/x-pack/plugins/canvas/public/functions/filters.ts
+++ b/x-pack/plugins/canvas/public/functions/filters.ts
@@ -8,7 +8,7 @@ import { fromExpression } from '@kbn/interpreter/common';
 import { get } from 'lodash';
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
 import { interpretAst } from '../lib/run_interpreter';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { getState } from '../state/store';
 import { getGlobalFilters } from '../state/selectors/workpad';
 import { ExpressionValueFilter } from '../../types';
diff --git a/x-pack/plugins/canvas/public/functions/timelion.ts b/x-pack/plugins/canvas/public/functions/timelion.ts
index abb294d9cc110..4eb34e838d18a 100644
--- a/x-pack/plugins/canvas/public/functions/timelion.ts
+++ b/x-pack/plugins/canvas/public/functions/timelion.ts
@@ -9,7 +9,7 @@ import moment from 'moment-timezone';
 import { TimeRange } from 'src/plugins/data/common';
 import { ExpressionFunctionDefinition, DatatableRow } from 'src/plugins/expressions/public';
 import { fetch } from '../../common/lib/fetch';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { buildBoolArray } from '../../public/lib/build_bool_array';
 import { Datatable, ExpressionValueFilter } from '../../types';
 import { getFunctionHelp } from '../../i18n';
diff --git a/x-pack/plugins/canvas/public/functions/to.ts b/x-pack/plugins/canvas/public/functions/to.ts
index 64d25b28a8aa0..032873dfa6cf2 100644
--- a/x-pack/plugins/canvas/public/functions/to.ts
+++ b/x-pack/plugins/canvas/public/functions/to.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore untyped Elastic library
+// @ts-expect-error untyped Elastic library
 import { castProvider } from '@kbn/interpreter/common';
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
 import { getFunctionHelp, getFunctionErrors } from '../../i18n';
diff --git a/x-pack/plugins/canvas/public/lib/app_state.ts b/x-pack/plugins/canvas/public/lib/app_state.ts
index d431202ba75a4..a09df3c8cb87d 100644
--- a/x-pack/plugins/canvas/public/lib/app_state.ts
+++ b/x-pack/plugins/canvas/public/lib/app_state.ts
@@ -6,12 +6,12 @@
 
 import { parse } from 'query-string';
 import { get } from 'lodash';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { getInitialState } from '../state/initial_state';
 import { getWindow } from './get_window';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { historyProvider } from './history_provider';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { routerProvider } from './router_provider';
 import { createTimeInterval, isValidTimeInterval, getTimeInterval } from './time_interval';
 import { AppState, AppStateKeys } from '../../types';
diff --git a/x-pack/plugins/canvas/public/lib/build_embeddable_filters.ts b/x-pack/plugins/canvas/public/lib/build_embeddable_filters.ts
index c847bfb6516bf..94d0d16bf79f6 100644
--- a/x-pack/plugins/canvas/public/lib/build_embeddable_filters.ts
+++ b/x-pack/plugins/canvas/public/lib/build_embeddable_filters.ts
@@ -5,7 +5,7 @@
  */
 
 import { ExpressionValueFilter } from '../../types';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { buildBoolArray } from './build_bool_array';
 import { TimeRange, esFilters, Filter as DataFilter } from '../../../../../src/plugins/data/public';
 
diff --git a/x-pack/plugins/canvas/public/lib/clipboard.test.ts b/x-pack/plugins/canvas/public/lib/clipboard.test.ts
index d10964003ed39..53f92e2184edc 100644
--- a/x-pack/plugins/canvas/public/lib/clipboard.test.ts
+++ b/x-pack/plugins/canvas/public/lib/clipboard.test.ts
@@ -15,7 +15,7 @@ const get = jest.fn();
 
 describe('clipboard', () => {
   beforeAll(() => {
-    // @ts-ignore
+    // @ts-expect-error
     Storage.mockImplementation(() => ({
       set,
       get,
diff --git a/x-pack/plugins/canvas/public/lib/clone_subgraphs.ts b/x-pack/plugins/canvas/public/lib/clone_subgraphs.ts
index c3a3933e06a6d..7168272211d44 100644
--- a/x-pack/plugins/canvas/public/lib/clone_subgraphs.ts
+++ b/x-pack/plugins/canvas/public/lib/clone_subgraphs.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { arrayToMap } from './aeroelastic/functional';
 import { getId } from './get_id';
 import { PositionedElement } from '../../types';
diff --git a/x-pack/plugins/canvas/public/lib/create_thunk.ts b/x-pack/plugins/canvas/public/lib/create_thunk.ts
index cbcaeeccc8b93..8ce912246ad6f 100644
--- a/x-pack/plugins/canvas/public/lib/create_thunk.ts
+++ b/x-pack/plugins/canvas/public/lib/create_thunk.ts
@@ -5,7 +5,7 @@
  */
 
 import { Dispatch, Action } from 'redux';
-// @ts-ignore untyped dependency
+// @ts-expect-error untyped dependency
 import { createThunk as createThunkFn } from 'redux-thunks/cjs';
 import { State } from '../../types';
 
diff --git a/x-pack/plugins/canvas/public/lib/download_workpad.ts b/x-pack/plugins/canvas/public/lib/download_workpad.ts
index fb038d8b6ace2..d0a63cf3fb5c4 100644
--- a/x-pack/plugins/canvas/public/lib/download_workpad.ts
+++ b/x-pack/plugins/canvas/public/lib/download_workpad.ts
@@ -7,7 +7,7 @@ import fileSaver from 'file-saver';
 import { API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD } from '../../common/lib/constants';
 import { ErrorStrings } from '../../i18n';
 import { notifyService } from '../services';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import * as workpadService from './workpad_service';
 import { CanvasRenderedWorkpad } from '../../shareable_runtime/types';
 
diff --git a/x-pack/plugins/canvas/public/lib/element_handler_creators.ts b/x-pack/plugins/canvas/public/lib/element_handler_creators.ts
index a2bf5a62ec1f7..8f1a0f0ecf08f 100644
--- a/x-pack/plugins/canvas/public/lib/element_handler_creators.ts
+++ b/x-pack/plugins/canvas/public/lib/element_handler_creators.ts
@@ -5,9 +5,7 @@
  */
 
 import { camelCase } from 'lodash';
-// @ts-ignore unconverted local file
 import { getClipboardData, setClipboardData } from './clipboard';
-// @ts-ignore unconverted local file
 import { cloneSubgraphs } from './clone_subgraphs';
 import { notifyService } from '../services';
 import * as customElementService from './custom_element_service';
diff --git a/x-pack/plugins/canvas/public/lib/es_service.ts b/x-pack/plugins/canvas/public/lib/es_service.ts
index 496751a874b21..5c1131d5fbe35 100644
--- a/x-pack/plugins/canvas/public/lib/es_service.ts
+++ b/x-pack/plugins/canvas/public/lib/es_service.ts
@@ -7,7 +7,6 @@
 import { IndexPatternAttributes } from 'src/plugins/data/public';
 
 import { API_ROUTE } from '../../common/lib/constants';
-// @ts-ignore untyped local
 import { fetch } from '../../common/lib/fetch';
 import { ErrorStrings } from '../../i18n';
 import { notifyService } from '../services';
diff --git a/x-pack/plugins/canvas/public/lib/sync_filter_expression.ts b/x-pack/plugins/canvas/public/lib/sync_filter_expression.ts
index dc70f778f0e52..4bfe6ff4b141f 100644
--- a/x-pack/plugins/canvas/public/lib/sync_filter_expression.ts
+++ b/x-pack/plugins/canvas/public/lib/sync_filter_expression.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore internal untyped
 import { fromExpression } from '@kbn/interpreter/common';
 import immutable from 'object-path-immutable';
 import { get } from 'lodash';
diff --git a/x-pack/plugins/canvas/public/plugin.tsx b/x-pack/plugins/canvas/public/plugin.tsx
index 9d2a6b3fdf4f4..4829a94bb0db8 100644
--- a/x-pack/plugins/canvas/public/plugin.tsx
+++ b/x-pack/plugins/canvas/public/plugin.tsx
@@ -24,7 +24,7 @@ import { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
 import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
 import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 import { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { argTypeSpecs } from './expression_types/arg_types';
 import { transitions } from './transitions';
 import { getPluginApi, CanvasApi } from './plugin_api';
diff --git a/x-pack/plugins/canvas/public/registries.ts b/x-pack/plugins/canvas/public/registries.ts
index 99f309a917329..b2881fc0b7799 100644
--- a/x-pack/plugins/canvas/public/registries.ts
+++ b/x-pack/plugins/canvas/public/registries.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore untyped module
+// @ts-expect-error untyped module
 import { addRegistries, register } from '@kbn/interpreter/common';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { elementsRegistry } from './lib/elements_registry';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { templatesRegistry } from './lib/templates_registry';
 import { tagsRegistry } from './lib/tags_registry';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { transitionsRegistry } from './lib/transitions_registry';
 
 import {
@@ -20,7 +20,7 @@ import {
   modelRegistry,
   transformRegistry,
   viewRegistry,
-  // @ts-ignore untyped local
+  // @ts-expect-error untyped local
 } from './expression_types';
 import { SetupRegistries } from './plugin_api';
 
diff --git a/x-pack/plugins/canvas/public/state/actions/embeddable.ts b/x-pack/plugins/canvas/public/state/actions/embeddable.ts
index a153cb7f4354d..874d390277320 100644
--- a/x-pack/plugins/canvas/public/state/actions/embeddable.ts
+++ b/x-pack/plugins/canvas/public/state/actions/embeddable.ts
@@ -7,7 +7,7 @@
 import { Dispatch } from 'redux';
 import { createAction } from 'redux-actions';
 import { createThunk } from '../../lib/create_thunk';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { fetchRenderable } from './elements';
 import { State } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/public/state/actions/workpad.ts b/x-pack/plugins/canvas/public/state/actions/workpad.ts
index 47df38838f890..419832e404594 100644
--- a/x-pack/plugins/canvas/public/state/actions/workpad.ts
+++ b/x-pack/plugins/canvas/public/state/actions/workpad.ts
@@ -8,7 +8,7 @@ import { createAction } from 'redux-actions';
 import { without, includes } from 'lodash';
 import { createThunk } from '../../lib/create_thunk';
 import { getWorkpadColors } from '../selectors/workpad';
-// @ts-ignore
+// @ts-expect-error
 import { fetchAllRenderables } from './elements';
 import { CanvasWorkpad } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts b/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts
index 11ebdcdc51d4d..bb7b26919ef20 100644
--- a/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts
+++ b/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts
@@ -10,7 +10,7 @@ jest.mock('../../../lib/router_provider');
 import { workpadAutoplay } from '../workpad_autoplay';
 import { setAutoplayInterval } from '../../../lib/app_state';
 import { createTimeInterval } from '../../../lib/time_interval';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { routerProvider } from '../../../lib/router_provider';
 
 const next = jest.fn();
diff --git a/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts b/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts
index f90f570bc6ebf..bf69a862d5c30 100644
--- a/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts
+++ b/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts
@@ -9,7 +9,6 @@ jest.mock('../../../lib/app_state');
 
 import { workpadRefresh } from '../workpad_refresh';
 import { inFlightComplete } from '../../actions/resolved_args';
-// @ts-ignore untyped local
 import { setRefreshInterval } from '../../actions/workpad';
 import { setRefreshInterval as setAppStateRefreshInterval } from '../../../lib/app_state';
 
diff --git a/x-pack/plugins/canvas/public/state/middleware/in_flight.ts b/x-pack/plugins/canvas/public/state/middleware/in_flight.ts
index 7ad6f8aee15ed..028b9f214133f 100644
--- a/x-pack/plugins/canvas/public/state/middleware/in_flight.ts
+++ b/x-pack/plugins/canvas/public/state/middleware/in_flight.ts
@@ -9,7 +9,7 @@ import {
   loadingIndicator as defaultLoadingIndicator,
   LoadingIndicatorInterface,
 } from '../../lib/loading_indicator';
-// @ts-ignore
+// @ts-expect-error
 import { convert } from '../../lib/modify_path';
 
 interface InFlightMiddlewareOptions {
diff --git a/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.ts b/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.ts
index dd484521c1b35..f77a1e1ba3295 100644
--- a/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.ts
+++ b/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.ts
@@ -9,9 +9,9 @@ import { State } from '../../../types';
 import { getFullscreen } from '../selectors/app';
 import { getInFlight } from '../selectors/resolved_args';
 import { getWorkpad, getPages, getSelectedPageIndex, getAutoplay } from '../selectors/workpad';
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { appUnload } from '../actions/app';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { routerProvider } from '../../lib/router_provider';
 import { setAutoplayInterval } from '../../lib/app_state';
 import { createTimeInterval } from '../../lib/time_interval';
diff --git a/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.ts b/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.ts
index 96a84b22cfccc..4a17ffb464532 100644
--- a/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.ts
+++ b/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.ts
@@ -6,11 +6,10 @@
 
 import { Middleware } from 'redux';
 import { State } from '../../../types';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { fetchAllRenderables } from '../actions/elements';
-// @ts-ignore Untyped Local
 import { setRefreshInterval } from '../actions/workpad';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { appUnload } from '../actions/app';
 import { inFlightComplete } from '../actions/resolved_args';
 import { getInFlight } from '../selectors/resolved_args';
diff --git a/x-pack/plugins/canvas/public/state/reducers/embeddable.ts b/x-pack/plugins/canvas/public/state/reducers/embeddable.ts
index 8642239fa10d3..fdeb5087f26e1 100644
--- a/x-pack/plugins/canvas/public/state/reducers/embeddable.ts
+++ b/x-pack/plugins/canvas/public/state/reducers/embeddable.ts
@@ -13,7 +13,7 @@ import {
   UpdateEmbeddableExpressionPayload,
 } from '../actions/embeddable';
 
-// @ts-ignore untyped local
+// @ts-expect-error untyped local
 import { assignNodeProperties } from './elements';
 
 export const embeddableReducer = handleActions<
diff --git a/x-pack/plugins/canvas/public/state/selectors/resolved_args.ts b/x-pack/plugins/canvas/public/state/selectors/resolved_args.ts
index 9e2036e02f2b9..766e27d95da9b 100644
--- a/x-pack/plugins/canvas/public/state/selectors/resolved_args.ts
+++ b/x-pack/plugins/canvas/public/state/selectors/resolved_args.ts
@@ -5,9 +5,9 @@
  */
 
 import { get } from 'lodash';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import * as argHelper from '../../lib/resolved_arg';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { prepend } from '../../lib/modify_path';
 import { State } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/public/state/selectors/workpad.ts b/x-pack/plugins/canvas/public/state/selectors/workpad.ts
index 55bf2a7ea31f7..0f4953ff56d98 100644
--- a/x-pack/plugins/canvas/public/state/selectors/workpad.ts
+++ b/x-pack/plugins/canvas/public/state/selectors/workpad.ts
@@ -5,9 +5,9 @@
  */
 
 import { get, omit } from 'lodash';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { safeElementFromExpression, fromExpression } from '@kbn/interpreter/common';
-// @ts-ignore Untyped Local
+// @ts-expect-error untyped local
 import { append } from '../../lib/modify_path';
 import { getAssets } from './assets';
 import { State, CanvasWorkpad, CanvasPage, CanvasElement, ResolvedArgType } from '../../../types';
diff --git a/x-pack/plugins/canvas/public/store.ts b/x-pack/plugins/canvas/public/store.ts
index 81edec6ec539c..ef93a34296da2 100644
--- a/x-pack/plugins/canvas/public/store.ts
+++ b/x-pack/plugins/canvas/public/store.ts
@@ -9,9 +9,9 @@ import {
   destroyStore as destroy,
   getStore,
   cloneStore,
-  // @ts-ignore Untyped local
+  // @ts-expect-error untyped local
 } from './state/store';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { getInitialState } from './state/initial_state';
 
 import { CoreSetup } from '../../../../src/core/public';
diff --git a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts
index 8f3ced13895f6..7a9830124e305 100644
--- a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts
+++ b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts
@@ -8,7 +8,7 @@ import { mapValues, keys } from 'lodash';
 import { schema } from '@kbn/config-schema';
 import { API_ROUTE } from '../../../common/lib';
 import { catchErrorHandler } from '../catch_error_handler';
-// @ts-ignore unconverted lib
+// @ts-expect-error unconverted lib
 import { normalizeType } from '../../lib/normalize_type';
 import { RouteInitializerDeps } from '..';
 
diff --git a/x-pack/plugins/canvas/server/routes/shareables/download.ts b/x-pack/plugins/canvas/server/routes/shareables/download.ts
index 3f331c1635e16..0c86f8472c791 100644
--- a/x-pack/plugins/canvas/server/routes/shareables/download.ts
+++ b/x-pack/plugins/canvas/server/routes/shareables/download.ts
@@ -21,7 +21,6 @@ export function initializeDownloadShareableWorkpadRoute(deps: RouteInitializerDe
       //
       // The option setting is not for typical use.  We're using it here to avoid
       // problems in Cloud environments.  See elastic/kibana#47405.
-      // @ts-ignore No type for inert Hapi handler
       // const file = handler.file(SHAREABLE_RUNTIME_FILE, { confine: false });
       const file = readFileSync(SHAREABLE_RUNTIME_FILE);
       return response.ok({
diff --git a/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts b/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts
index f58111000859a..f5dcf59dcf45b 100644
--- a/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts
+++ b/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts
@@ -6,7 +6,6 @@
 
 import { SampleDataRegistrySetup } from 'src/plugins/home/server';
 import { CANVAS as label } from '../../i18n';
-// @ts-ignore Untyped local
 import { ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects } from './index';
 
 export function loadSampleData(
@@ -16,9 +15,9 @@ export function loadSampleData(
   const now = new Date();
   const nowTimestamp = now.toISOString();
 
-  // @ts-ignore: Untyped local
+  // @ts-expect-error: untyped local
   function updateCanvasWorkpadTimestamps(savedObjects) {
-    // @ts-ignore: Untyped local
+    // @ts-expect-error: untyped local
     return savedObjects.map((savedObject) => {
       if (savedObject.type === 'canvas-workpad') {
         savedObject.attributes['@timestamp'] = nowTimestamp;
diff --git a/x-pack/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx b/x-pack/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx
index d99c9b190f83d..4b3aa8dc2fb6e 100644
--- a/x-pack/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx
@@ -15,7 +15,7 @@ jest.mock('../../supported_renderers');
 describe('Canvas Shareable Workpad API', () => {
   // Mock the AJAX load of the workpad.
   beforeEach(function () {
-    // @ts-ignore Applying a global in Jest is alright.
+    // @ts-expect-error Applying a global in Jest is alright.
     global.fetch = jest.fn().mockImplementation(() => {
       const p = new Promise((resolve, _reject) => {
         resolve({
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/__examples__/rendered_element.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__examples__/rendered_element.examples.tsx
index 7b5a5080ae790..899edee7f0481 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/__examples__/rendered_element.examples.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/components/__examples__/rendered_element.examples.tsx
@@ -7,7 +7,7 @@ import { storiesOf } from '@storybook/react';
 import React from 'react';
 import { ExampleContext } from '../../test/context_example';
 
-// @ts-ignore
+// @ts-expect-error
 import { image } from '../../../canvas_plugin_src/renderers/image';
 import { sharedWorkpads } from '../../test';
 import { RenderedElement, RenderedElementComponent } from '../rendered_element';
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/autoplay_settings.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/autoplay_settings.tsx
index 1650cbad3a237..4c7c65511698d 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/autoplay_settings.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/autoplay_settings.tsx
@@ -12,7 +12,6 @@ import {
   setAutoplayIntervalAction,
 } from '../../../context';
 import { createTimeInterval } from '../../../../public/lib/time_interval';
-// @ts-ignore Untyped local
 import { CustomInterval } from '../../../../public/components/workpad_header/view_menu/custom_interval';
 
 export type onSetAutoplayFn = (autoplay: boolean) => void;
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx
index c4a009db3a376..5741f5f2d698c 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx
@@ -5,11 +5,11 @@
  */
 
 import React, { FC, PureComponent } from 'react';
-// @ts-ignore Untyped library
+// @ts-expect-error untyped library
 import Style from 'style-it';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { Positionable } from '../../public/components/positionable/positionable';
-// @ts-ignore Untyped local
+// @ts-expect-error untyped local
 import { elementToShape } from '../../public/components/workpad_page/utils';
 import { CanvasRenderedElement } from '../types';
 import { CanvasShareableContext, useCanvasShareableState } from '../context';
diff --git a/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js b/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js
index 6238aaf5c2fe4..340d1fb418b4c 100644
--- a/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js
+++ b/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js
@@ -4,10 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// This is a JS file because the renderers are not strongly-typed yet. Tagging for
-// visibility.
-// @ts-ignore Untyped local
-
 import { debug } from '../canvas_plugin_src/renderers/debug';
 import { error } from '../canvas_plugin_src/renderers/error';
 import { image } from '../canvas_plugin_src/renderers/image';
diff --git a/x-pack/plugins/canvas/shareable_runtime/types.ts b/x-pack/plugins/canvas/shareable_runtime/types.ts
index 191c0405d2e2d..040062346c74f 100644
--- a/x-pack/plugins/canvas/shareable_runtime/types.ts
+++ b/x-pack/plugins/canvas/shareable_runtime/types.ts
@@ -5,7 +5,7 @@
  */
 
 import { RefObject } from 'react';
-// @ts-ignore Unlinked Webpack Type
+// @ts-expect-error Unlinked Webpack Type
 import ContainerStyle from 'types/interpreter';
 import { SavedObject, SavedObjectAttributes } from 'src/core/public';