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

Pug support #93

Closed
wants to merge 4 commits into from
Closed

Pug support #93

wants to merge 4 commits into from

Conversation

tyriker
Copy link

@tyriker tyriker commented Jan 18, 2017

This is @bennorwood's work from his original PR #89 (thanks Ben!)

I took his fork and made sure it worked for me (I need Pug processing in html2js), then rebased it with the latest from rquadling/grunt-html2js/master to resolve the existing conflicts, then made sure it still worked.

Submitting this PR to hopefully get Pug support added officially (even if still in beta), and partially resolve #83 (it doesn't remove Jade).

This PR may be easier to merge since PR #89 now contains conflicts.

Benjamin Norwood and others added 4 commits January 17, 2017 17:27
…ease package.json update reflects the addition). Alphabetized dependency list and added pugg as an optional dependency.
…maintains compatibility with jade template rendering.
@bennorwood
Copy link
Contributor

Thanks? It was pretty trivial to fix the merge issues; you could have commented on my PR for the update.

@tyriker
Copy link
Author

tyriker commented Jan 18, 2017

No problem... In my experience, maintainers often don't consider PRs with merge conflicts, and since I'd pulled your fork down already for testing, I simply rebased it, resolved, and pushed it back upstream. The commits are all still yours! 😄

@Sjors
Copy link

Sjors commented Feb 24, 2017

Fwiw, I was able to use this succesfully by putting "grunt-html2js": "WeWriteCode/grunt-html2js#pug-support", in my package.json file.

@rquadling
Copy link
Owner

@tyriker Can you please handle the merge conflicts for this pull request.

@bennorwood
Copy link
Contributor

@rquadling this is the same work in #89

@tyriker
Copy link
Author

tyriker commented May 25, 2017

@rquadling @bennorwood
It looks like #89 has already been merged, which is the same fix/code. This can just be closed.

@tyriker tyriker closed this May 25, 2017
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.

Jade is depricated
4 participants