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

Fix Angular global style imports #5776

Merged
merged 3 commits into from
Feb 27, 2019
Merged

Fix Angular global style imports #5776

merged 3 commits into from
Feb 27, 2019

Conversation

shilman
Copy link
Member

@shilman shilman commented Feb 26, 2019

Issue: #4378 #5239

This is @yjcxy12 's PR #5525 with the conflicts resolved. I was unable to push the resolution to his branch due to some github bug around github actions (since the merge contained edits to main.workflow ... don't ask). So I branched and resolved conflicts here. Please direct any further discussion to that PR.

@shilman shilman added bug angular patch:yes Bugfix & documentation PR that need to be picked to main branch release labels Feb 26, 2019
@shilman shilman merged commit a5d7082 into next Feb 27, 2019
@shilman shilman deleted the 5525-resolve-merge-conflicts branch February 27, 2019 14:19
shilman added a commit that referenced this pull request Feb 27, 2019
shilman added a commit that referenced this pull request Feb 27, 2019
@mikepaggi
Copy link

mikepaggi commented Feb 27, 2019

@shilman This seems like it is a fix for Angular 6 and up with notes of only looking at angular.json? what about pre angular 6 with using ".angular-cli.json"?

@shilman
Copy link
Member Author

shilman commented Mar 1, 2019

@mikepaggi AFAIK @storybook/angular has peer deps on angular 6.0+?

@mikepaggi
Copy link

@mikepaggi AFAIK @storybook/angular has peer deps on angular 6.0+?

Where is that mentioned anywhere in the documentation? All I see is Angular support with support with using the CLI. So far I haven't seen anything spit out errors when i was installing initially or when running it. As much as there is support for Angular...the docs are very lacking :-(

@shilman shilman added the patch:done Patch/release PRs already cherry-picked to main/release branch label Mar 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
angular bug patch:done Patch/release PRs already cherry-picked to main/release branch patch:yes Bugfix & documentation PR that need to be picked to main branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants