diff --git a/e2e_server/server/mocks/use_global_parameters.ts b/e2e_server/server/mocks/use_global_parameters.ts index 27417aff1f..d7e551de35 100644 --- a/e2e_server/server/mocks/use_global_parameters.ts +++ b/e2e_server/server/mocks/use_global_parameters.ts @@ -7,10 +7,10 @@ */ import { useMemo, useState } from 'react'; +import { BackgroundParameter } from 'storybook-addon-background-toggle'; +import { ThemeParameter } from 'storybook-addon-theme-toggle'; import type { StoryGlobals, StoryParameters } from './../../../storybook/types'; -import { BackgroundParameter } from '../../../storybook/node_modules/storybook-addon-background-toggle'; -import { ThemeParameter } from '../../../storybook/node_modules/storybook-addon-theme-toggle'; import { storybookParameters as globalParams } from '../../../storybook/parameters'; import { ThemeId } from '../../../storybook/use_base_theme'; diff --git a/package.json b/package.json index ba00a66b19..6ae4751954 100644 --- a/package.json +++ b/package.json @@ -150,11 +150,8 @@ "postcss-loader": "^4.2.0", "prettier": "^3.2.5", "pretty-quick": "^4.0.0", - "react": "^16.13.0", "react-docgen-typescript-loader": "^3.7.2", "react-docgen-typescript-webpack-plugin": "^1.1.0", - "react-dom": "^16.13.0", - "react-is": "^16.13.0", "sass": "^1.49.9", "sass-graph": "^3.0.5", "seedrandom": "^3.0.5", diff --git a/packages/charts/api/charts.api.md b/packages/charts/api/charts.api.md index fd0dab43ec..08996c2141 100644 --- a/packages/charts/api/charts.api.md +++ b/packages/charts/api/charts.api.md @@ -639,7 +639,7 @@ export class Chart extends React_2.Component { browser: 'IE11' | 'other'; } | null; // (undocumented) - render(): JSX.Element; + render(): React_2.JSX.Element; } // @public @@ -3139,7 +3139,7 @@ export type TooltipCellStyle = Pick(props: PropsWithChildren_2<{ className?: string; -}>) => JSX.Element; +}>) => React_2.JSX.Element; // @public (undocumented) export interface TooltipContext { @@ -3172,15 +3172,15 @@ export interface TooltipContext JSX.Element; +export const TooltipDivider: ({ margin }: TooltipDividerProps) => React_2.JSX.Element; // Warning: (ae-forgotten-export) The symbol "TooltipFooterProps" needs to be exported by the entry point index.d.ts // // @public (undocumented) -export const TooltipFooter: ({ children }: TooltipFooterProps) => JSX.Element; +export const TooltipFooter: ({ children }: TooltipFooterProps) => React_2.JSX.Element; // @public (undocumented) -export const TooltipHeader: (props: TooltipHeaderProps) => JSX.Element | null; +export const TooltipHeader: (props: TooltipHeaderProps) => React_2.JSX.Element | null; // @public export type TooltipHeaderFormatter = (data: PointerValue) => JSX.Element | string; @@ -3200,7 +3200,7 @@ export interface TooltipInfo JSX.Element>; +export const TooltipMetricRow: React_2.MemoExoticComponent<({ label, metric }: TooltipMetricRowProps) => React_2.JSX.Element>; // @public export interface TooltipPortalSettings { @@ -3274,15 +3274,15 @@ export interface TooltipStyle { // Warning: (ae-forgotten-export) The symbol "TooltipTableProps" needs to be exported by the entry point index.d.ts // // @public (undocumented) -export const TooltipTable: ({ className, ...props }: TooltipTableProps) => JSX.Element; +export const TooltipTable: ({ className, ...props }: TooltipTableProps) => React_2.JSX.Element; // Warning: (ae-forgotten-export) The symbol "TooltipTableBodyProps" needs to be exported by the entry point index.d.ts // // @public (undocumented) -export const TooltipTableBody: ({ className, ...props }: TooltipTableBodyProps) => JSX.Element; +export const TooltipTableBody: ({ className, ...props }: TooltipTableBodyProps) => React_2.JSX.Element; // @public (undocumented) -export const TooltipTableCell: ({ style, truncate, tagName, className, children, title: manualTitle, }: TooltipTableCellProps) => JSX.Element; +export const TooltipTableCell: ({ style, truncate, tagName, className, children, title: manualTitle, }: TooltipTableCellProps) => React_2.JSX.Element; // @public (undocumented) export type TooltipTableCellProps = PropsWithChildren_2<{ @@ -3345,17 +3345,17 @@ export interface TooltipTableColumnText({ className, ...props }: TooltipTableFooterProps) => JSX.Element | null; +export const TooltipTableFooter: ({ className, ...props }: TooltipTableFooterProps) => React_2.JSX.Element | null; // Warning: (ae-forgotten-export) The symbol "TooltipTableHeaderProps" needs to be exported by the entry point index.d.ts // // @public (undocumented) -export const TooltipTableHeader: ({ className, ...props }: TooltipTableHeaderProps) => JSX.Element | null; +export const TooltipTableHeader: ({ className, ...props }: TooltipTableHeaderProps) => React_2.JSX.Element | null; // Warning: (ae-forgotten-export) The symbol "TooltipTableRowProps" needs to be exported by the entry point index.d.ts // // @public (undocumented) -export const TooltipTableRow: ({ id, isHighlighted, isSelected, children, onSelect, className, }: TooltipTableRowProps) => JSX.Element; +export const TooltipTableRow: ({ id, isHighlighted, isSelected, children, onSelect, className, }: TooltipTableRowProps) => React_2.JSX.Element; // @public export const TooltipType: Readonly<{ diff --git a/packages/charts/package.json b/packages/charts/package.json index c308fc8396..786d87fda8 100644 --- a/packages/charts/package.json +++ b/packages/charts/package.json @@ -58,6 +58,10 @@ "react": "^16.12 || ^17.0 || ^18.0", "react-dom": "^16.12 || ^17.0 || ^18.0" }, + "devDependencies": { + "@types/react": "^16", + "@types/react-dom": "^16" + }, "browserslist": [ "last 2 versions", "ie 11" diff --git a/packages/charts/tsconfig.json b/packages/charts/tsconfig.json new file mode 100644 index 0000000000..41716a7dd5 --- /dev/null +++ b/packages/charts/tsconfig.json @@ -0,0 +1,3 @@ +{ + "extends": "../../tsconfig" +} diff --git a/yarn.lock b/yarn.lock index 1bf3f285d8..cc15212f0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6920,12 +6920,12 @@ dependencies: "@types/react" "*" -"@types/react-dom@^16.9.8": - version "16.9.8" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423" - integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA== +"@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" "*" + "@types/react" "^16" "@types/react-redux@^7.1.1": version "7.1.4" @@ -6951,12 +6951,13 @@ dependencies: "@types/react" "*" -"@types/react@*": - version "16.9.49" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz#09db021cf8089aba0cdb12a49f8021a69cce4872" - integrity sha512-DtLFjSj0OYAdVLBbyjhuV9CdGVHCkHn2R+xr3XkBvK2rS1Y1tkc14XSGjYgm5Fjjr90AxH9tiSzc1pCFMGO06g== +"@types/react@*", "@types/react@^16": + version "16.14.60" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.60.tgz#f7ab62a329b82826f12d02bc8031d4ef4b5e0d81" + integrity sha512-wIFmnczGsTcgwCBeIYOuy2mdXEiKZ5znU/jNOnMZPQyCcIxauMGWlX0TNG4lZ7NxRKj7YUIZRneJQSSdB2jKgg== dependencies: "@types/prop-types" "*" + "@types/scheduler" "^0.16" csstype "^3.0.2" "@types/refractor@^3.4.0": @@ -6971,6 +6972,11 @@ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== +"@types/scheduler@^0.16": + version "0.16.8" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" + integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A== + "@types/seedrandom@^2.4.28": version "2.4.28" resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.28.tgz#9ce8fa048c1e8c85cb71d7fe4d704e000226036f" @@ -11781,7 +11787,8 @@ eslint-module-utils@^2.8.0: debug "^3.2.7" "eslint-plugin-elastic-charts@link:./packages/eslint-plugin-elastic-charts": - version "1.0.0" + version "0.0.0" + uid "" eslint-plugin-eslint-comments@^3.2.0: version "3.2.0" @@ -19676,16 +19683,6 @@ react-dom@^16.12.0: prop-types "^15.6.2" scheduler "^0.19.1" -react-dom@^16.13.0: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" - integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" - react-draggable@^4.4.3: version "4.4.3" resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3" @@ -19779,7 +19776,7 @@ 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.13.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: +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== @@ -19954,7 +19951,7 @@ react-window@^1.8.10: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react@^16.12.0, react@^16.13.0: +react@^16.12.0: version "16.14.0" resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==