Theming: Fix self-referencing type

[SimenB]

Closes #

What I did

Renamed the imported value so it doesn't clash. The bundling causes the import to be removed, and leads to a self reference.

Checklist for Contributors

Testing

The changes in this PR are covered in the following automated tests:

• stories
• unit tests
• integration tests
• end-to-end tests

Manual testing

This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!

Documentation

• Add or update documentation reflecting your changes
• If you are deprecating/removing a feature, make sure to update
  MIGRATION.MD

Checklist for Maintainers

• When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/lib/cli/src/sandbox-templates.ts

• Make sure this PR contains one of the labels below:

  Available labels

  • bug: Internal changes that fixes incorrect behavior.
  • maintenance: User-facing maintenance tasks.
  • dependencies: Upgrading (sometimes downgrading) dependencies.
  • build: Internal-facing build tooling & test updates. Will not show up in release changelog.
  • cleanup: Minor cleanup style change. Will not show up in release changelog.
  • documentation: Documentation only changes. Will not show up in release changelog.
  • feature request: Introducing a new feature.
  • BREAKING CHANGE: Changes that break compatibility in some way with current major version.
  • other: Changes that don't fit in the above categories.

🦋 Canary release

This PR does not have a canary release associated. You can request a canary release of this pull request by mentioning the @storybookjs/core team here.

core team members can create a canary release here or locally with gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=<PR_NUMBER>

[nx-cloud]

☁️ Nx Cloud Report

CI is running/has finished running commands for commit ea5a059. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this CI Pipeline Execution

---

✅ Successfully ran 1 target

• nx run-many -t build -c production --parallel=3

---

Sent with 💌 from NxCloud.

[shilman]

Thanks @SimenB ! This looks reasonable to me

[oleksandr-danylchenko]

‼️ Unfortunately, after this change, custom overrides for the @emotion/react Theme stopped working properly ‼️

I have the following override:

type CombinedTheme = MuiTheme & CompanyTheme;
declare module '@emotion/react' {
	// eslint-disable-next-line @typescript-eslint/no-empty-interface
	export interface Theme extends CombinedTheme {}
}

Which worked completely fine for the following custom theme definition:

import type { Theme } from '@emotion/react';

export const getCombinedTheme = (themeName: ThemeName): Theme => ({
	...companyMuiTheme,
	...themes[themeName]
});

But after switching to the 8.1.5 storybook version - it immediately broke and started complaining about missing properties on the Theme object:

 error TS2740: Type '{ name: ThemeName; }; ... 43 more ...; applyStyles: ApplyStyles<...>; }' is missing the following properties from type 'Theme': color, background, animation, easing, and 10 more.

[oleksandr-danylchenko]

UPD: The issue I mentioned seems to be resolved in some newer versions. After upgrading from the 8.1.4 I don't experience any Theme mismatches anymore 🙌🏻