Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies for React 19 type compatibility #30031

Open
wants to merge 6 commits into
base: next
Choose a base branch
from
+376 −104
Open

Update dependencies for React 19 type compatibility #30031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b47ea8
Update @radix-ui/react-dialog
mrginglymus Dec 11, 2024
f49dbd9
Update @emotion packages to react19 type compatible versions
mrginglymus Dec 11, 2024
844ef0e
Update @storybook/theme types to remove reference to global JSX names…
mrginglymus Dec 11, 2024
9738e9a
Fix mdx.tsx build error
mrginglymus Dec 14, 2024
cb01d31
Update markdown-t-jsx to a _nearly_ compatible version
mrginglymus Dec 14, 2024
5acb6e1
Patch markdown-to-jsx to fix ReactChild references
mrginglymus Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions code/.yarn/patches/markdown-to-jsx-npm-7.7.1-6038885620.patch
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions code/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,16 +295,16 @@
"@babel/traverse": "^7.24.1",
"@babel/types": "^7.24.0",
"@discoveryjs/json-ext": "^0.5.3",
"@emotion/cache": "^11.11.0",
"@emotion/is-prop-valid": "^1.2.2",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
"@emotion/cache": "^11.14.0",
"@emotion/is-prop-valid": "^1.3.1",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@emotion/use-insertion-effect-with-fallbacks": "^1.2.0",
"@fal-works/esbuild-plugin-global-externals": "^2.1.2",
"@ndelangen/get-tarball": "^3.0.7",
"@polka/compression": "^1.0.0-next.28",
"@popperjs/core": "^2.6.0",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-scroll-area": "1.2.0-rc.7",
"@radix-ui/react-slot": "^1.0.2",
"@storybook/docs-mdx": "4.0.0-next.1",
Expand Down Expand Up @@ -368,7 +368,7 @@
"js-yaml": "^4.1.0",
"lazy-universal-dotenv": "^4.0.0",
"leven": "^4.0.0",
"markdown-to-jsx": "^7.4.5",
"markdown-to-jsx": "patch:markdown-to-jsx@npm%3A7.7.1#~/.yarn/patches/markdown-to-jsx-npm-7.7.1-6038885620.patch",
"memfs": "^4.11.1",
"memoizerific": "^1.11.3",
"nanoid": "^4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/blocks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@types/color-convert": "^2.0.0",
"color-convert": "^2.0.1",
"es-toolkit": "^1.22.0",
"markdown-to-jsx": "^7.4.5",
"markdown-to-jsx": "patch:markdown-to-jsx@npm%3A7.7.1#~/.yarn/patches/markdown-to-jsx-npm-7.7.1-6038885620.patch",
"memoizerific": "^1.11.3",
"polished": "^4.2.2",
"react-colorful": "^5.1.2",
Expand Down
19 changes: 11 additions & 8 deletions code/lib/blocks/src/blocks/mdx.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,17 @@ const OcticonHeaders = SUPPORTED_MDX_HEADERS.reduce(
{}
);

const OcticonAnchor = styled.a(() => ({
float: 'left',
lineHeight: 'inherit',
paddingRight: '10px',
marginLeft: '-24px',
// Allow the theme's text color to override the default link color.
color: 'inherit',
}));
const OcticonAnchor = styled.a(
() =>
({
float: 'left',
lineHeight: 'inherit',
paddingRight: '10px',
marginLeft: '-24px',
// Allow the theme's text color to override the default link color.
color: 'inherit',
}) as const
);

interface HeaderWithOcticonAnchorProps {
as: string;
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/react/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ComponentType } from 'react';
import type { ComponentType, JSX } from 'react';

import type { Canvas, WebRenderer } from 'storybook/internal/types';

Expand Down
Loading
Loading