Skip to content
This repository has been archived by the owner on Oct 9, 2020. It is now read-only.

Add uglify.output option #820

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

CxRes
Copy link
Contributor

@CxRes CxRes commented Jul 15, 2017

Fixes #689! See commit message for more info.

guybedford and others added 3 commits March 16, 2017 13:43
`uglify` option in `build` now accepts `uglify.output` consistent with the Uglify2 API.

This change does NOT change existing behaviour as the inconsistent `uglify.beautify` option is still valid. Internally `uglify.output` is copied into `uglify.beautify`, when the latter is not specified. If `uglify.beautify` is specified, then `uglify.output` is ignored.
@guybedford
Copy link
Member

I guess the version upgrade from here should still go through. Would it be possible to rebase that?

@CxRes
Copy link
Contributor Author

CxRes commented Jul 18, 2017

I am not sure what to do here! The 0.15 branch is pointing to the point of branching and not the tip of the tree ie 0.15.36 tag. On my copy of the repo CxRes/builder, the fix-uglify-option branch sits correctly on top of 0.15.36 tag but I don't get what github does when I place a PR from that branch that leads to this conflict????

@guybedford guybedford changed the base branch from master to 0.15 July 22, 2017 09:55
@guybedford guybedford changed the base branch from 0.15 to master July 22, 2017 09:55
@guybedford
Copy link
Member

guybedford commented Jul 22, 2017

This is definitely a PR against the master branch not the 0.15 branch, and the code is a diff against that fine. If you're just looking to resolve the conflicts, a git pull --rebase origin master with possible conflict fixing may just be what is needed here?

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

Successfully merging this pull request may close these issues.

None yet

2 participants