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.

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

Core: Fix bundling of React #30003

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Core: Fix bundling of React #30003

merged 1 commit into from
Dec 11, 2024

Conversation

yannbf
Copy link
Member

@yannbf yannbf commented Dec 10, 2024

Relates to #29805

What I did

This PR undoes the work done in #28541 which actually caused the react globalization logic to stop working in Storybook 8. This should allow users to use React 19 in preview while React 18 is used in the manager.

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

  • Build a react 19 sandbox
  • Add a manager.tsx file with the following content:
import React from 'react';
import { addons, types } from '@storybook/manager-api';

addons.register('test', () => {
  addons.add('test', {
    type: types.TOOLEXTRA,
    title: 'test',
    paramKey: 'test',
    render: () => {
      return <>test</>
    },
  });
});
  • Inspect the generated manager-bundle file, make sure React is globalized and not bundled in

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-storybook/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>

Greptile Summary

This PR reverts changes to JSX compilation settings in the React addon to fix React globalization logic in Storybook 8, enabling React 19 support in preview while maintaining React 18 compatibility in the manager.

  • Modified code/core/assets/server/addon.tsconfig.json to revert JSX compilation mode from 'react-jsx' back to 'react'
  • Maintains jsxImportSource setting as 'react' for compatibility
  • Undoes changes from PR Core: Fix manager-builder tsconfig to emit react-jsx #28541 that broke React globalization logic
  • Enables React 19 support in preview while keeping React 18 in manager

@yannbf yannbf added bug ci:merged Run the CI jobs that normally run when merged. builder-manager labels Dec 10, 2024
Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

1 file(s) reviewed, no comment(s)
Edit PR Review Bot Settings | Greptile

Copy link

nx-cloud bot commented Dec 10, 2024

☁️ Nx Cloud Report

CI is running/has finished running commands for commit 23b9834. 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

Sent with 💌 from NxCloud.

@yannbf yannbf mentioned this pull request Dec 10, 2024
12 tasks
@yannbf yannbf merged commit 133a414 into next Dec 11, 2024
8 of 10 checks passed
@yannbf yannbf deleted the yann/fix-react-bundling branch December 11, 2024 12:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug builder-manager ci:merged Run the CI jobs that normally run when merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants