search

graingert / slimerjs

NPM wrapper for installing phantomjs
Other
29 stars 9 forks source link

merge upstream phantomjs into slimerjs #25

Closed thhalm-talkwalker closed 8 years ago

thhalm-talkwalker commented 8 years ago

Merged master from https://github.com/Medium/phantomjs.git (d281c9a7280eb5002a0158cd1f2978773fdb4b57) into slimerjs (see #17)

graingert commented 8 years ago

Looks good, can you add t.halm@talkwalker.com to https://github.com/settings/emails#new_user_email

What was your strategy to handle the differences between upstream and this repo?

thhalm-talkwalker commented 8 years ago

Ok. Email added.

Regarding the differences: I took the phantomjs/master code as "leading" and did just a search/replace "phantomjs => slimerjs" in first place.

Afterwards a copied the "download url" logic to the new method getDownloadUrl

graingert commented 8 years ago

Awesome, what about the other doc changes we've added?

thhalm-talkwalker commented 8 years ago

I did at merge for the README.md file.

Added two new sections (anlogical to changes from phantomjs/master)

No already existing documentation was changed or removed in that file.

As the merge commit only changed 3 files no other doc were changed...