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 template minification to keep line breaks, remove html files from bindata #5023

Merged
merged 1 commit into from
Oct 10, 2015

Conversation

jwforres
Copy link
Member

@jwforres jwforres commented Oct 8, 2015

Fixes #4582

@jwforres
Copy link
Member Author

jwforres commented Oct 8, 2015

@spadgett @liggitt i made it work...

@jwforres
Copy link
Member Author

jwforres commented Oct 9, 2015

fyi @sg00dwin

htmlmin: '<%= htmlmin.dist.options %>',
usemin: 'scripts/scripts.js'
usemin: 'scripts/templates.js'
Copy link
Member

Choose a reason for hiding this comment

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

@jwforres if you take out the usemin option, does it still minify?

Copy link
Member

Choose a reason for hiding this comment

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

Just thinking if you set dest to the dist directory and take out usemin do you need the extra copy task below?

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually yeah we don't need usemin anymore. Since there will always be a file called scripts/templates.js we can just harcode it into index.html like we do with config.js

@jwforres
Copy link
Member Author

jwforres commented Oct 9, 2015

@spadgett updated to take out usemin and copy bits that weren't needed. Double checked both dev and built modes and they were working as expected.

@spadgett
Copy link
Member

spadgett commented Oct 9, 2015

LGTM, [merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/3557/) (Image: devenv-fedora_2455)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 06b1041

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/5610/)

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 06b1041

openshift-bot pushed a commit that referenced this pull request Oct 10, 2015
@openshift-bot openshift-bot merged commit f774db7 into openshift:master Oct 10, 2015
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.

3 participants