From 19a3fc87190b6c4894540c91b04a7309b5983b92 Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Mon, 18 Aug 2025 10:21:21 -0500 Subject: [PATCH 01/10] upgrade-react --- .../server/generate/vrt_page_template.js | 8 ++- package.json | 3 +- packages/charts/package.json | 4 +- playground/index.tsx | 9 ++-- storybook/package.json | 4 +- yarn.lock | 51 ++++++++++--------- 6 files changed, 44 insertions(+), 35 deletions(-) diff --git a/e2e_server/server/generate/vrt_page_template.js b/e2e_server/server/generate/vrt_page_template.js index 0f0d872f82d..bc2e41a26bb 100644 --- a/e2e_server/server/generate/vrt_page_template.js +++ b/e2e_server/server/generate/vrt_page_template.js @@ -16,7 +16,7 @@ function indexTemplate() { return ` import '../../storybook/style.scss'; import React from 'react'; -import ReactDOM from 'react-dom'; +import { createRoot } from 'react-dom/client'; import { VRTPage } from './vrt_page'; import { appendIconComponentCache } from '@elastic/eui/es/components/icon/icon'; @@ -35,7 +35,11 @@ appendIconComponentCache({ const path = new URL(window.location.toString()).searchParams.get('path'); document.getElementsByTagName('body')[0].style.overflow = path ? 'hidden' : 'scroll'; -ReactDOM.render(, document.getElementById('root') as HTMLElement); + +const container = document.getElementById('root')!; +const root = createRoot(container); + +root.render(); `.trim(); } diff --git a/package.json b/package.json index acf783e5ab9..5d92665f14a 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,8 @@ "@types/luxon": "^1.25.0", "@types/marked": "^2.0.1", "@types/moment-timezone": "^0.5.30", - "@types/react-dom": "^16.9.8", + "@types/react": "^18.2.0", + "@types/react-dom": "^18.2.0", "@types/react-redux": "^7.1.20", "@types/seedrandom": "^2.4.28", "@types/url-parse": "^1.4.3", diff --git a/packages/charts/package.json b/packages/charts/package.json index 632cf6f8651..31bf5cb49be 100644 --- a/packages/charts/package.json +++ b/packages/charts/package.json @@ -60,8 +60,8 @@ "react-dom": "^16.12 || ^17.0 || ^18.0" }, "devDependencies": { - "@types/react": "^16", - "@types/react-dom": "^16" + "@types/react": "^18", + "@types/react-dom": "^18" }, "browserslist": [ "last 2 versions", diff --git a/playground/index.tsx b/playground/index.tsx index 05812064127..9da8c366000 100644 --- a/playground/index.tsx +++ b/playground/index.tsx @@ -7,10 +7,13 @@ */ import React from 'react'; -import ReactDOM from 'react-dom'; +import { createRoot } from 'react-dom/client'; -import '../packages/charts/src/theme_light.scss'; +import '../packages/charts/src/styles/theme_light.scss'; import { Playground } from './playground'; -ReactDOM.render(, document.getElementById('root') as HTMLElement); +const container = document.getElementById('root')!; +const root = createRoot(container); + +root.render(); diff --git a/storybook/package.json b/storybook/package.json index cf237f97f98..195c724a1b7 100644 --- a/storybook/package.json +++ b/storybook/package.json @@ -18,8 +18,8 @@ "luxon": "^1.27.0", "moment": "^2.29.1", "moment-timezone": "^0.5.32", - "react": "^16.12.0", - "react-dom": "^16.12.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "seedrandom": "^3.0.5" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index c4df519abfd..23428b012e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7119,12 +7119,10 @@ dependencies: "@types/react" "*" -"@types/react-dom@^16", "@types/react-dom@^16.9.8": - version "16.9.24" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.24.tgz#4d193d7d011267fca842e8a10a2d738f92ec5c30" - integrity sha512-Gcmq2JTDheyWn/1eteqyzzWKSqDjYU6KYsIvH7thb7CR5OYInAWOX+7WnKf6PaU/cbdOc4szJItcDEJO7UGmfA== - dependencies: - "@types/react" "^16" +"@types/react-dom@^18", "@types/react-dom@^18.2.0": + version "18.3.7" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.7.tgz#b89ddf2cd83b4feafcc4e2ea41afdfb95a0d194f" + integrity sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ== "@types/react-redux@^7.1.20": version "7.1.34" @@ -7150,7 +7148,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16": +"@types/react@*": version "16.14.60" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.60.tgz#f7ab62a329b82826f12d02bc8031d4ef4b5e0d81" integrity sha512-wIFmnczGsTcgwCBeIYOuy2mdXEiKZ5znU/jNOnMZPQyCcIxauMGWlX0TNG4lZ7NxRKj7YUIZRneJQSSdB2jKgg== @@ -7159,6 +7157,14 @@ "@types/scheduler" "^0.16" csstype "^3.0.2" +"@types/react@^18", "@types/react@^18.2.0": + version "18.3.23" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.23.tgz#86ae6f6b95a48c418fecdaccc8069e0fbb63696a" + integrity sha512-/LDXMQh55EzZQ0uVAZmKKhfENivEvWz6E+EYzh+/MCjMhNsotd+ZHhBGIjFDTi6+fz0OhQQQLbTgdQIxxCsC0w== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + "@types/refractor@^3.4.0": version "3.4.1" resolved "https://registry.yarnpkg.com/@types/refractor/-/refractor-3.4.1.tgz#8b109804f77b3da8fad543d3f575fef1ece8835a" @@ -20265,15 +20271,13 @@ react-docgen@^5.0.0: node-dir "^0.1.10" strip-indent "^3.0.0" -react-dom@^16.12.0: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" - integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== +react-dom@^18.2.0: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4" + integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" + scheduler "^0.23.2" react-draggable@^4.4.3: version "4.4.3" @@ -20549,14 +20553,12 @@ react-window@^1.8.10: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react@^16.12.0: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" - integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== +react@^18.2.0: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" + integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" read-cache@^1.0.0: version "1.0.0" @@ -21588,13 +21590,12 @@ scheduler@^0.16.2: loose-envify "^1.1.0" object-assign "^4.1.1" -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== +scheduler@^0.23.2: + version "0.23.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" + integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" schema-utils@2.7.0, schema-utils@^2.6.5: version "2.7.0" From 5f910d210dc15985ce350ac46b884dd04ba18e94 Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Mon, 18 Aug 2025 11:12:54 -0500 Subject: [PATCH 02/10] upgrade `react-redux` --- packages/charts/package.json | 2 +- .../src/chart_types/metric/renderer/dom/text.tsx | 2 +- packages/charts/src/components/no_results.tsx | 6 ++++-- packages/charts/src/specs/settings.tsx | 4 ++-- .../annotations/lines/7_tooltip_options.story.tsx | 2 +- .../annotations/rects/5_tooltip_options.story.tsx | 2 +- .../stories/test_cases/14_error_boundary.story.tsx | 7 +++++-- storybook/stories/utils/use_heatmap_selection.ts | 7 ++++--- yarn.lock | 14 +------------- 9 files changed, 20 insertions(+), 26 deletions(-) diff --git a/packages/charts/package.json b/packages/charts/package.json index 31bf5cb49be..c1540ab0e37 100644 --- a/packages/charts/package.json +++ b/packages/charts/package.json @@ -46,7 +46,7 @@ "immer": "^9.0.21", "prop-types": "^15.7.2", "re-reselect": "^4.0.1", - "react-redux": "^7.2.8", + "react-redux": "^8.1.3", "redux": "^4.2.1", "ts-debounce": "^4.0.0", "utility-types": "^3.10.0", diff --git a/packages/charts/src/chart_types/metric/renderer/dom/text.tsx b/packages/charts/src/chart_types/metric/renderer/dom/text.tsx index 14ca79d48b3..2db91f8ade3 100644 --- a/packages/charts/src/chart_types/metric/renderer/dom/text.tsx +++ b/packages/charts/src/chart_types/metric/renderer/dom/text.tsx @@ -213,7 +213,7 @@ export const MetricText: React.FC = ({ width: sizes.valuePartFontSize, height: sizes.valuePartFontSize, color: datum.valueColor ?? colors.highContrast, - verticalAlign: 'middle', + verticalAlign: 'middle' as const, })}

)} diff --git a/packages/charts/src/components/no_results.tsx b/packages/charts/src/components/no_results.tsx index b6f5d7b96dd..01ba2b4db8f 100644 --- a/packages/charts/src/components/no_results.tsx +++ b/packages/charts/src/components/no_results.tsx @@ -17,7 +17,9 @@ interface NoResultsProps { /** @internal */ export const NoResults: FC = ({ renderFn }) => ( - null}> -
{renderFn ??

No data to display

}
+ +
+ {typeof renderFn === 'function' ? React.createElement(renderFn) : renderFn ??

No data to display

} +
); diff --git a/packages/charts/src/specs/settings.tsx b/packages/charts/src/specs/settings.tsx index 1ddf4d79eca..ccc59d7a403 100644 --- a/packages/charts/src/specs/settings.tsx +++ b/packages/charts/src/specs/settings.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import type { ComponentProps, ComponentType, ReactChild } from 'react'; +import type { ComponentProps, ComponentType, ReactNode } from 'react'; import type { CustomXDomain, GroupByAccessor } from '.'; import type { BrushAxis } from './brush_axis'; @@ -633,7 +633,7 @@ export interface SettingsSpec extends Spec, LegendSpec { /** * Render component for no results UI */ - noResults?: ComponentType | ReactChild; + noResults?: ComponentType | ReactNode; /** * User can specify the heading level for the label * @defaultValue 'p' diff --git a/storybook/stories/annotations/lines/7_tooltip_options.story.tsx b/storybook/stories/annotations/lines/7_tooltip_options.story.tsx index dfdbac551a4..b5a7be77d62 100644 --- a/storybook/stories/annotations/lines/7_tooltip_options.story.tsx +++ b/storybook/stories/annotations/lines/7_tooltip_options.story.tsx @@ -43,7 +43,7 @@ export const Example: ChartsStory = (_, { title, description }) => { ) : undefined; const customTooltipDetails: AnnotationTooltipFormatter | undefined = showCustomDetails - ? (details) => ( + ? ({ details }) => (

custom Details

{details}

diff --git a/storybook/stories/annotations/rects/5_tooltip_options.story.tsx b/storybook/stories/annotations/rects/5_tooltip_options.story.tsx index f037cc1468f..52ac9c98a98 100644 --- a/storybook/stories/annotations/rects/5_tooltip_options.story.tsx +++ b/storybook/stories/annotations/rects/5_tooltip_options.story.tsx @@ -55,7 +55,7 @@ export const Example: ChartsStory = (_, { title, description }) => { ) : undefined; const customTooltipDetails: AnnotationTooltipFormatter | undefined = showCustomDetails - ? (details) => ( + ? ({ details }) => (

custom Details

{details}

diff --git a/storybook/stories/test_cases/14_error_boundary.story.tsx b/storybook/stories/test_cases/14_error_boundary.story.tsx index 0eea249af6e..d2aa09f3e6b 100644 --- a/storybook/stories/test_cases/14_error_boundary.story.tsx +++ b/storybook/stories/test_cases/14_error_boundary.story.tsx @@ -8,14 +8,17 @@ import { action } from '@storybook/addon-actions'; import { boolean } from '@storybook/addon-knobs'; -import React from 'react'; +import React, { PropsWithChildren } from 'react'; import { Chart, Settings, Axis, Position, BarSeries, ScaleType } from '@elastic/charts'; import type { ChartsStory } from '../../types'; import { useBaseTheme } from '../../use_base_theme'; -class SimpleErrorBoundary extends React.Component<{ onError?: (error: Error) => void }, { hasError: boolean }> { +type Props = PropsWithChildren<{ onError?: (error: Error) => void }>; +type State = { hasError: boolean }; + +class SimpleErrorBoundary extends React.Component { onError?: (error: Error) => void; constructor(props: { onError: (error: Error) => void }) { super(props); diff --git a/storybook/stories/utils/use_heatmap_selection.ts b/storybook/stories/utils/use_heatmap_selection.ts index 4fe2df16c2a..52e8dace0f8 100644 --- a/storybook/stories/utils/use_heatmap_selection.ts +++ b/storybook/stories/utils/use_heatmap_selection.ts @@ -11,6 +11,7 @@ import { boolean, button } from '@storybook/addon-knobs'; import { useEffect, useCallback, useState } from 'react'; import type { + BrushEndListener, ElementClickListener, HeatmapBrushEvent, HeatmapElementEvent, @@ -34,12 +35,12 @@ export const useHeatmapSelection = (disableActions = false) => { [disableActions], ); const onBrushEnd = useCallback( - (e) => { + (e: HeatmapBrushEvent) => { if (!disableActions) action('brushEvent')(e); - setSelection(e as HeatmapBrushEvent); + setSelection(e); }, [disableActions], - ); + ) as BrushEndListener; useEffect(() => { document.addEventListener('keyup', ({ key }) => { if (key === 'Escape') clearSelection(); diff --git a/yarn.lock b/yarn.lock index 23428b012e7..85a19e32de0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2677,7 +2677,7 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.0", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.1", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.1", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.27.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6" integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q== @@ -20419,18 +20419,6 @@ react-popper@^2.2.4: react-fast-compare "^3.0.1" warning "^4.0.2" -react-redux@^7.2.8: - version "7.2.9" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d" - integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ== - dependencies: - "@babel/runtime" "^7.15.4" - "@types/react-redux" "^7.1.20" - hoist-non-react-statics "^3.3.2" - loose-envify "^1.4.0" - prop-types "^15.7.2" - react-is "^17.0.2" - react-redux@^8.1.3: version "8.1.3" resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.1.3.tgz#4fdc0462d0acb59af29a13c27ffef6f49ab4df46" From f3c5d08d8ffc87a73a302833d311aec1ce0192ed Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Mon, 18 Aug 2025 11:53:38 -0500 Subject: [PATCH 03/10] add missing dependencey --- package.json | 4 ++-- storybook/package.json | 1 + yarn.lock | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5d92665f14a..c1e422217e3 100644 --- a/package.json +++ b/package.json @@ -73,8 +73,8 @@ "@elastic/eui": "^99.2.0", "@elastic/eui-theme-borealis": "^3.3.0", "@elastic/eui-theme-common": "^3.1.0", - "@emotion/react": "^11.10.5", "@emotion/css": "^11.10.5", + "@emotion/react": "^11.10.5", "@mdx-js/loader": "^1.6.6", "@microsoft/api-documenter": "^7.25.4", "@microsoft/api-extractor": "^7.47.0", @@ -110,8 +110,8 @@ "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^7.16.1", "@typescript-eslint/parser": "^7.16.1", - "babel-loader": "^8.3.0", "autoprefixer": "^9.0.0", + "babel-loader": "^8.3.0", "backport": "^5.6.6", "change-case": "^4.1.2", "commitizen": "^4.2.3", diff --git a/storybook/package.json b/storybook/package.json index 195c724a1b7..8aa89967f06 100644 --- a/storybook/package.json +++ b/storybook/package.json @@ -23,6 +23,7 @@ "seedrandom": "^3.0.5" }, "devDependencies": { + "@babel/helper-globals": "^7.28.0", "@storybook/addon-actions": "^6.3.7", "@storybook/addon-docs": "^6.3.7", "@storybook/addon-knobs": "^6.3.0", diff --git a/yarn.lock b/yarn.lock index 85a19e32de0..a41ab9c1a85 100644 --- a/yarn.lock +++ b/yarn.lock @@ -641,6 +641,11 @@ dependencies: "@babel/types" "^7.14.5" +"@babel/helper-globals@^7.28.0": + version "7.28.0" + resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674" + integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw== + "@babel/helper-hoist-variables@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" From 48bc9247238178e811c9c07aa138b69b7802a6ed Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Mon, 18 Aug 2025 12:54:59 -0500 Subject: [PATCH 04/10] fix api changes --- packages/charts/api/charts.api.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/charts/api/charts.api.md b/packages/charts/api/charts.api.md index b1bb671aa2d..c4ba638c837 100644 --- a/packages/charts/api/charts.api.md +++ b/packages/charts/api/charts.api.md @@ -16,7 +16,6 @@ import type { Optional } from 'utility-types'; import type { OptionalKeys } from 'utility-types'; import type { PropsWithChildren as PropsWithChildren_2 } from 'react'; import { default as React_2 } from 'react'; -import type { ReactChild } from 'react'; import type { ReactElement } from 'react'; import type { ReactNode } from 'react'; import type { Required as Required_2 } from 'utility-types'; @@ -2848,7 +2847,7 @@ export interface SettingsSpec extends Spec, LegendSpec { externalPointerEvents: ExternalPointerEventsSettings; locale: string; minBrushDelta?: number; - noResults?: ComponentType | ReactChild; + noResults?: ComponentType | ReactNode; onAnnotationClick?: AnnotationClickListener; // (undocumented) onBrushEnd?: BrushEndListener; From 495272d4cf7e775103fda60958a9970d7ab8b120 Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Mon, 18 Aug 2025 12:55:27 -0500 Subject: [PATCH 05/10] temp fix to enzyme adapter --- package.json | 3 +- scripts/setup_enzyme.ts | 2 +- .../test_cases/14_error_boundary.story.tsx | 2 +- yarn.lock | 173 +++++------------- 4 files changed, 52 insertions(+), 128 deletions(-) diff --git a/package.json b/package.json index c1e422217e3..e09a090669f 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,6 @@ "@types/d3-scale": "^3.3.0", "@types/d3-shape": "^2.0.0", "@types/enzyme": "^3.9.0", - "@types/enzyme-adapter-react-16": "^1.0.5", "@types/jest": "^30.0.0", "@types/lodash": "^4.14.121", "@types/luxon": "^1.25.0", @@ -118,7 +117,7 @@ "cross-env": "^7.0.2", "cz-conventional-changelog": "^3.3.0", "enzyme": "^3.11.0", - "enzyme-adapter-react-16": "^1.15.5", + "@cfaester/enzyme-adapter-react-18": "^0.8.0", "eslint": "^8.57.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^18.0.0", diff --git a/scripts/setup_enzyme.ts b/scripts/setup_enzyme.ts index 7a7174a76e8..9f1be401b91 100644 --- a/scripts/setup_enzyme.ts +++ b/scripts/setup_enzyme.ts @@ -7,7 +7,7 @@ */ import { configure } from 'enzyme'; -import Adapter from 'enzyme-adapter-react-16'; +import Adapter from '@cfaester/enzyme-adapter-react-18'; configure({ adapter: new Adapter() }); diff --git a/storybook/stories/test_cases/14_error_boundary.story.tsx b/storybook/stories/test_cases/14_error_boundary.story.tsx index d2aa09f3e6b..eeadb16e1c4 100644 --- a/storybook/stories/test_cases/14_error_boundary.story.tsx +++ b/storybook/stories/test_cases/14_error_boundary.story.tsx @@ -8,7 +8,7 @@ import { action } from '@storybook/addon-actions'; import { boolean } from '@storybook/addon-knobs'; -import React, { PropsWithChildren } from 'react'; +import React, { type PropsWithChildren } from 'react'; import { Chart, Settings, Axis, Position, BarSeries, ScaleType } from '@elastic/charts'; diff --git a/yarn.lock b/yarn.lock index a41ab9c1a85..7fc46023737 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2939,6 +2939,17 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@cfaester/enzyme-adapter-react-18@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@cfaester/enzyme-adapter-react-18/-/enzyme-adapter-react-18-0.8.0.tgz#313814eb79658a6e74209f9f1743bcefff14a46f" + integrity sha512-3Z3ThTUouHwz8oIyhTYQljEMNRFtlVyc3VOOHCbxs47U6cnXs8K9ygi/c1tv49s7MBlTXeIcuN+Ttd9aPtILFQ== + dependencies: + enzyme-shallow-equal "^1.0.0" + function.prototype.name "^1.1.6" + has "^1.0.4" + react-is "^18.2.0" + react-shallow-renderer "^16.15.0" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -6799,14 +6810,7 @@ resolved "https://registry.yarnpkg.com/@types/d3/-/d3-3.5.45.tgz#cceb1cd8f468b0ed1c96546ddefff3408d7463a7" integrity sha512-wLICfMtjDEoAJie1MF6OuksAzOapRXgJy+l5HQVpyC1yMAlvHz2QKrrasUHru8xD6cbgQNGeO+CeyjOlKtly2A== -"@types/enzyme-adapter-react-16@^1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.5.tgz#1bf30a166f49be69eeda4b81e3f24113c8b4e9d5" - integrity sha512-K7HLFTkBDN5RyRmU90JuYt8OWEY2iKUn43SDWEoBOXd/PowUWjLZ3Q6qMBiQuZeFYK/TOstaZxsnI0fXoAfLpg== - dependencies: - "@types/enzyme" "*" - -"@types/enzyme@*", "@types/enzyme@^3.9.0": +"@types/enzyme@^3.9.0": version "3.10.3" resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.3.tgz#02b6c5ac7d0472005944a652e79045e2f6c66804" integrity sha512-f/Kcb84sZOSZiBPCkr4He9/cpuSLcKRyQaEE20Q30Prx0Dn6wcyMAWI0yofL6yvd9Ht9G7EVkQeRqK0n5w8ILw== @@ -7845,21 +7849,6 @@ airbnb-js-shims@^2.2.1: string.prototype.padstart "^3.0.0" symbol.prototype.description "^1.0.0" -airbnb-prop-types@^2.16.0: - version "2.16.0" - resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2" - integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg== - dependencies: - array.prototype.find "^2.1.1" - function.prototype.name "^1.1.2" - is-regex "^1.1.0" - object-is "^1.1.2" - object.assign "^4.1.0" - object.entries "^1.1.2" - prop-types "^15.7.2" - prop-types-exact "^1.2.0" - react-is "^16.13.1" - ajv-draft-04@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz#3b64761b268ba0b9e668f0b41ba53fce0ad77fc8" @@ -8298,14 +8287,6 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -array.prototype.find@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c" - integrity sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.4" - array.prototype.findlast@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.4.tgz#eeb9e45fc894055c82e5675c463e8077b827ad36" @@ -11721,35 +11702,15 @@ envinfo@^7.7.3, envinfo@^7.7.4: resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== -enzyme-adapter-react-16@^1.15.5: - version "1.15.5" - resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.5.tgz#7a6f0093d3edd2f7025b36e7fbf290695473ee04" - integrity sha512-33yUJGT1nHFQlbVI5qdo5Pfqvu/h4qPwi1o0a6ZZsjpiqq92a3HjynDhwd1IeED+Su60HDWV8mxJqkTnLYdGkw== - dependencies: - enzyme-adapter-utils "^1.13.1" - enzyme-shallow-equal "^1.0.4" - has "^1.0.3" - object.assign "^4.1.0" - object.values "^1.1.1" - prop-types "^15.7.2" - react-is "^16.13.1" - react-test-renderer "^16.0.0-0" - semver "^5.7.0" - -enzyme-adapter-utils@^1.13.1: - version "1.14.0" - resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz#afbb0485e8033aa50c744efb5f5711e64fbf1ad0" - integrity sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg== +enzyme-shallow-equal@^1.0.0: + version "1.0.7" + resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.7.tgz#4e3aa678022387a68e6c47aff200587851885b5e" + integrity sha512-/um0GFqUXnpM9SvKtje+9Tjoz3f1fpBC3eXRFrNs8kpYn69JljciYP7KZTqM/YQbUY9KUjvKB4jo/q+L6WGGvg== dependencies: - airbnb-prop-types "^2.16.0" - function.prototype.name "^1.1.3" - has "^1.0.3" - object.assign "^4.1.2" - object.fromentries "^2.0.3" - prop-types "^15.7.2" - semver "^5.7.1" + hasown "^2.0.0" + object-is "^1.1.5" -enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.4: +enzyme-shallow-equal@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz#b9256cb25a5f430f9bfe073a84808c1d74fced2e" integrity sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q== @@ -11844,7 +11805,7 @@ es-abstract@^1.17.0: string.prototype.trimleft "^2.1.1" string.prototype.trimright "^2.1.1" -es-abstract@^1.17.0-next.1, es-abstract@^1.17.4: +es-abstract@^1.17.0-next.1: version "1.17.7" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== @@ -13339,7 +13300,7 @@ function.prototype.name@^1.1.0: functions-have-names "^1.1.1" is-callable "^1.1.4" -function.prototype.name@^1.1.2, function.prototype.name@^1.1.3: +function.prototype.name@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.3.tgz#0bb034bb308e7682826f215eb6b2ae64918847fe" integrity sha512-H51qkbNSp8mtkJt+nyW1gyStBiKZxfRqySNUR99ylq6BPXHKI4SEvIlTKp4odLfjRKJV04DFWMU3G/YRlQOsag== @@ -14103,6 +14064,11 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +has@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6" + integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ== + hash-base@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1" @@ -15441,7 +15407,7 @@ is-potential-custom-element-name@^1.0.1: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-regex@^1.0.4, is-regex@^1.1.0, is-regex@^1.1.1: +is-regex@^1.0.4, is-regex@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== @@ -18688,6 +18654,14 @@ object-is@^1.0.2, object-is@^1.1.2: call-bind "^1.0.0" define-properties "^1.1.3" +object-is@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07" + integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -18750,16 +18724,6 @@ object.entries@^1.1.1: function-bind "^1.1.1" has "^1.0.3" -object.entries@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6" - integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - has "^1.0.3" - object.entries@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" @@ -18788,16 +18752,6 @@ object.entries@^1.1.7: function-bind "^1.1.1" has "^1.0.3" -object.fromentries@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072" - integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - has "^1.0.3" - object.fromentries@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" @@ -19940,15 +19894,6 @@ promzard@^0.3.0: dependencies: read "1" -prop-types-exact@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869" - integrity sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA== - dependencies: - has "^1.0.3" - object.assign "^4.1.0" - reflect.ownkeys "^0.2.0" - prop-types@^15.0.0, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" @@ -20377,16 +20322,16 @@ react-is@18.1.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67" integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg== +"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.2.0, react-is@^18.3.1: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" + integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== + react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^16.8.6: - version "16.10.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz#984120fd4d16800e9a738208ab1fba422d23b5ab" - integrity sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA== - react-is@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" @@ -20397,11 +20342,6 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== -react-is@^18.3.1: - version "18.3.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" - integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== - react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -20474,6 +20414,14 @@ react-select@^3.2.0: react-input-autosize "^3.0.0" react-transition-group "^4.3.0" +react-shallow-renderer@^16.15.0: + version "16.15.0" + resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" + integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== + dependencies: + object-assign "^4.1.1" + react-is "^16.12.0 || ^17.0.0 || ^18.0.0" + react-sizeme@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-3.0.1.tgz#4d12f4244e0e6a0fb97253e7af0314dc7c83a5a0" @@ -20504,16 +20452,6 @@ react-syntax-highlighter@^13.5.3: prismjs "^1.21.0" refractor "^3.1.0" -react-test-renderer@^16.0.0-0: - version "16.10.2" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.10.2.tgz#4d8492f8678c9b43b721a7d79ed0840fdae7c518" - integrity sha512-k9Qzyev6cTIcIfrhgrFlYQAFxh5EEDO6ALNqYqmKsWVA7Q/rUMTay5nD3nthi6COmYsd4ghVYyi8U86aoeMqYQ== - dependencies: - object-assign "^4.1.1" - prop-types "^15.6.2" - react-is "^16.8.6" - scheduler "^0.16.2" - react-textarea-autosize@^8.3.0: version "8.3.3" resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8" @@ -20759,11 +20697,6 @@ reflect.getprototypeof@^1.0.4: globalthis "^1.0.3" which-builtin-type "^1.1.3" -reflect.ownkeys@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" - integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA= - refractor@^3.1.0: version "3.4.0" resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.4.0.tgz#62bd274b06c942041f390c371b676eb67cb0a678" @@ -21575,14 +21508,6 @@ saxes@^6.0.0: dependencies: xmlchars "^2.2.0" -scheduler@^0.16.2: - version "0.16.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.2.tgz#f74cd9d33eff6fc554edfb79864868e4819132c1" - integrity sha512-BqYVWqwz6s1wZMhjFvLfVR5WXP7ZY32M/wYPo04CcuPM7XZEbV2TBNW7Z0UkguPTl0dWMA59VbNXxK6q+pHItg== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler@^0.23.2: version "0.23.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" @@ -21731,7 +21656,7 @@ semver-regex@^3.1.2: resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.4.tgz#13053c0d4aa11d070a2f2872b6b1e3ae1e1971b4" integrity sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA== -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: version "5.7.2" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== From eac2e9f5f74be4e2d891d7d321a746eb3985e41a Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Mon, 18 Aug 2025 14:07:28 -0500 Subject: [PATCH 06/10] fix more errors --- .../__snapshots__/chart.test.tsx.snap | 6 +-- .../src/components/error_boundary.test.tsx | 6 ++- .../legend/__snapshots__/legend.test.tsx.snap | 48 +++++++++---------- scripts/setup_enzyme.ts | 2 +- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/packages/charts/src/components/__snapshots__/chart.test.tsx.snap b/packages/charts/src/components/__snapshots__/chart.test.tsx.snap index 8223ead44c2..ae668e816b3 100644 --- a/packages/charts/src/components/__snapshots__/chart.test.tsx.snap +++ b/packages/charts/src/components/__snapshots__/chart.test.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[`Chart should render the legend name test 1`] = ` " @@ -30,7 +30,7 @@ exports[`Chart should render the legend name test 1`] = `
  • - +
    @@ -40,7 +40,7 @@ exports[`Chart should render the legend name test 1`] = `
    -     +
  • - + - +
  • - + - +
  • - + - +
  • - + - +
  • - + - +
  • - + - +
  • - + - +
  • - + - +
  • - + - +
  • - + - +
  • - + - +
  • - + - +