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

[ember] add dependencies to root application #4309

Merged

Conversation

gabrielcsapo
Copy link
Contributor

Issue: #4289

What I did

Add dependencies to the top level @storybook/ember application

app/ember/package.json Outdated Show resolved Hide resolved
@@ -28,12 +28,15 @@
"@babel/runtime": "^7.0.0",
"@ember/test-helpers": "^0.7.25",
"@storybook/core": "4.0.0-alpha.24",
"common-tags": "^1.8.0",
Copy link
Member

Choose a reason for hiding this comment

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

Why is this moved?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is used in @storybook/ember and that's it.

Copy link
Member

Choose a reason for hiding this comment

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

Doesn't ember itself depend on this dep?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, it is used for outputting error information in the render function

@storybook-safe-bot
Copy link
Contributor

Fails
🚫

PR is not labeled with one of: ["cleanup","BREAKING CHANGE","feature request","bug","documentation","maintenance","dependencies:update","dependencies","other"]

Generated by 🚫 dangerJS

@codecov
Copy link

codecov bot commented Oct 7, 2018

Codecov Report

Merging #4309 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #4309   +/-   ##
=======================================
  Coverage   40.23%   40.23%           
=======================================
  Files         510      510           
  Lines        5952     5952           
  Branches      795      795           
=======================================
  Hits         2395     2395           
  Misses       3172     3172           
  Partials      385      385

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a115420...abe6d8f. Read the comment docs.

@pksunkara pksunkara merged commit cb2dff3 into storybookjs:master Oct 7, 2018
@fran-worley
Copy link
Contributor

@igor-dv since adding react and react-dom to my app dependencies it is now being recognised as a react app by storybook init.

Does the order of if statements in the app detection need reworking so ember is detected before react?

@igor-dv
Copy link
Member

igor-dv commented Oct 8, 2018

@Keraito is working on a CLI improvement where you will be able to pass a flag of the wanted framework. Probably react is one of the first apps to be checked...

@fran-worley
Copy link
Contributor

@igor-dv I figured a simple solution would be to move the react clause to the end here

As I side note I see that ember isn't included here is that likely to cause issues for full ember support?

@igor-dv
Copy link
Member

igor-dv commented Oct 8, 2018

I figured a simple solution would be to move the react clause to the end here

yes, it will probably help, want to PR ?

As I side note I see that ember isn't included here is that likely to cause issues for full ember support?

I am less familiar with the CLI part. @Keraito @gabrielcsapo do you have something to say about this ?

@fran-worley
Copy link
Contributor

@igor-dv compiling PR now.

As I side note I see that ember isn't included here is that likely to cause issues for full ember support?

Having now added 'ember' to that list, it is correctly detecting when storybook is already setup so I think it needs to be in there and I'll add to my PR in a separate commit.

gabrielcsapo added a commit that referenced this pull request Oct 8, 2018
Fixes to cli ember support (followup on #4309)
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants