-
-
Notifications
You must be signed in to change notification settings - Fork 9.4k
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.
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
Future - Drop Emotion 10 types in lib/theming #18598
Conversation
☁️ Nx Cloud ReportCI is running/has finished running commands for commit 5571712. As they complete they will appear below. Click to see the status, the terminal output, and the build insights. 📂 See all runs for this branch ✅ Successfully ran 1 targetSent with 💌 from NxCloud. |
# Conflicts: # lib/theming/src/emotion10types.ts
# Conflicts: # docs/snippets/html/button-story-with-args.ts.mdx
@Andarist OK, this is getting into shape now, I think. I think it's prepped for a proper integration now. But the outputted types aren;t correct. We're getting the empty Theme interface in our components now, not the Theme interface we define. We have some time to get this sorted, but I think it's a requirement for |
# Conflicts: # lib/theming/package.json
# Conflicts: # lib/theming/package.json
I believe that I got it working - both for prod bundles and for the dev environment. Please retest if it matches your expectations. |
import { background, typography, color } from './base'; | ||
import { Theme, Color, ThemeVars } from './types'; | ||
import { StorybookTheme, Color, ThemeVars } from './types'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note that within the theming
package you have to reference StorybookTheme
and not Theme
because Theme
doesn't exist yet - it's only added after bundling and into the reexporting file
@@ -0,0 +1,9 @@ | |||
// this file is only actually used in development |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Believe it or not but this has to be in a separate file and I can't reuse src/typings.d.ts
- I've already stumbled upon a problem like this in the past, TS rules are weird when it comes to those d.ts
files and I don't fully understand them. When put in the other file I couldn't use import
at the top-level and without it, the tsup didn't recognize other Emotion exports (such as keyframes
, css
etc). This way I only touch what I actually want and leave the rest as-is
I'll take a look tomorrow! |
# Conflicts: # scripts/prepare/bundle.ts
|
@shilman can we take a look at the doc blocks UI changes being detected? Som flacky styling (there's a underline underneath the "raw" text. |
# Conflicts: # lib/blocks/src/blocks/DocsContainer.tsx # lib/blocks/src/blocks/SourceContainer.tsx # lib/blocks/src/blocks/Subtitle.tsx # lib/blocks/src/blocks/Title.tsx # lib/blocks/src/components/ColorPalette.tsx # lib/blocks/src/components/IconGallery.tsx # lib/blocks/src/components/Source.tsx # lib/blocks/src/components/Story.tsx # lib/components/src/placeholder/placeholder.tsx # lib/ui/src/components/preview/toolbar.tsx # lib/ui/src/components/preview/utils/types.tsx # lib/ui/src/components/sidebar/Sidebar.tsx # lib/ui/src/components/sidebar/TreeNode.tsx
No description provided.