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

Jump to bottom

#7563 Support TSX in config folder #7566

Merged
merged 1 commit into from
Jul 28, 2019
Merged

#7563 Support TSX in config folder #7566

merged 1 commit into from
Jul 28, 2019

Conversation

Kamahl19
Copy link
Contributor

@Kamahl19 Kamahl19 commented Jul 25, 2019 •
edited by mrmckeb
Loading

Resolves #7201.

What I did

I have updated CRA mocked rules as per CRA 3.0.1 . Tests started to fail, because there are now 2 TS related rules. I rewrote 2 tests since they were not really testing anything and fixed the method to add proper paths to loaders

@vercel
Copy link

vercel bot commented Jul 25, 2019 •
edited
Loading

This pull request is automatically deployed with Now.
To access deployments, click Details below or on the icon next to each push.

Latest deployment for this branch: https://monorepo-git-fork-kamahl19-7563.storybook.now.sh

@shilman shilman added compatibility with other tools cra Prioritize create-react-app compatibility labels Jul 25, 2019
mrmckeb
mrmckeb reviewed Jul 28, 2019
View reviewed changes
Copy link
Member

@mrmckeb mrmckeb left a comment •
edited
Loading

Choose a reason for hiding this comment

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

[Edit: I had a chance to test locally]

app/react/src/server/cra-config.ts Show resolved Hide resolved
mrmckeb
mrmckeb approved these changes Jul 28, 2019
View reviewed changes
Copy link
Member

@mrmckeb mrmckeb left a comment

Choose a reason for hiding this comment

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

I've checked this out and it runs great locally. Thanks again!

@mrmckeb
Copy link
Member

mrmckeb commented Jul 28, 2019

Can you please squash these into a single commit titled "Add support for TSX in config folder for CRA" and I'll merge it in! :)

@Kamahl19
Copy link
Contributor Author

Sure will do in the evening. But i think github allows squash strategy when merging PR as well

@shilman
Copy link
Member

shilman commented Jul 28, 2019

We don't allow squash merges since it interferes with our release scripts FYI

@mrmckeb
Copy link
Member

mrmckeb commented Jul 28, 2019

Thanks @shilman, I noticed that ;) And yes @Kamahl19 that is the reason I asked you to squash - thanks again!

@Kamahl19
Copy link
Contributor Author

@mrmckeb done :)

@mrmckeb mrmckeb merged commit 0bff469 into storybookjs:next Jul 28, 2019
@mrmckeb
Copy link
Member

mrmckeb commented Jul 28, 2019

Thanks for your work on this!

@Kamahl19
Copy link
Contributor Author

Kamahl19 commented Jul 28, 2019 via email •
edited
Loading

@shilman shilman mentioned this pull request Jul 29, 2019
Closed
@dependencies dependencies bot mentioned this pull request Jan 15, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrmckeb mrmckeb mrmckeb approved these changes

@shilman shilman Awaiting requested review from shilman

@thomasbertet thomasbertet Awaiting requested review from thomasbertet

Assignees
No one assigned
Labels
compatibility with other tools cra Prioritize create-react-app compatibility feature request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

JSX not supported in config with CRA
3 participants
@Kamahl19 @mrmckeb @shilman