Skip to content

Fix bootstrap.js always excluded #1217

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

Closed
wants to merge 2 commits into from

Conversation

SaintPeter
Copy link
Contributor

Added test for filters.uibootstrap === true to exclude bootstrap.js.

Fixes #565

Added test for `filters.uibootstrap` to exclude `bootstrap.js`
@kingcody
Copy link
Member

@SaintPeter thanks, just two things to mention.

This template formatting will output a clean syntax with or without the regexp:

exclude: [<% if(filters.uibootstrap) { %>
  /bootstrap.js/,<% } %>
  '/json3/',

Second, we use grunt-conventional-changelog to generate our CHANGELOG.md. An example of a commit message that would be correctly parsed by that task might look something like this:

fix(wiredep): only exclude bootstrap.js when ui-bootstrap is chosen

If you have any questions about the above format, contributing.md has a pretty good explanation.

@Awk34 Awk34 added the bug label Aug 27, 2015
@Awk34 Awk34 added this to the 3.0.0 milestone Aug 27, 2015
@SaintPeter
Copy link
Contributor Author

ok, would you like me to fix it and re-submit?

@kingcody
Copy link
Member

You could --amend your commit and force an update with git push -f. That should be fine.

@kingcody
Copy link
Member

In other words, you can overwrite your current commit, then we can just use this PR.

@SaintPeter
Copy link
Contributor Author

SaintPeter commented Aug 27, 2015 via email

@kingcody
Copy link
Member

@SaintPeter
Copy link
Contributor Author

I made the changes as requested, but I've got a bit of a problem: I am running windows and you have a file named "!yeoman.png", which is not legal on windows. I updated the commit but cannot rebase/squash the old commit because the file shows as modified.

Sorry, that's the best I can do, short of resubmitting.

kingcody added a commit that referenced this pull request Aug 27, 2015
fix(wiredep): only exclude bootstrap.js when ui-bootstrap is chosen

closes #1217
@kingcody
Copy link
Member

@SaintPeter I merged your commit into canary here since this PR was targeting master. Thanks again for you help!

@kingcody kingcody closed this Aug 27, 2015
@SaintPeter
Copy link
Contributor Author

Excellent! Sorry for the trouble.

@kingcody
Copy link
Member

No problem at all, I'm always glad to see people contribute (:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants