search

helior / react-highlighter

:high_brightness: Highlight text using React
MIT License
157 stars 42 forks source link

Added react 16 support, added cross platform dev capability #51

Closed colindekker closed 7 years ago

coveralls commented 7 years ago

Coverage Status

Changes Unknown when pulling d4b9738513d58caeabf8e8655e3d2a67f3d3df09 on colindekker:master into on helior:master.

helior commented 7 years ago

Thanks for adding cross-platform compatibility @colindekker! I'll test this on the weekend and hopefully cut a new release before Monday. Cheers!

colindekker commented 7 years ago

The conflict is in package.json. There seems to be a similar commit with regards to the devdependencies section, i.e. both commits include package upgrades. I suggest keeping the react dependencies dual versioned, i.e. ^15.0.0 || ^16.0.0, the component works with both.

andreyvital commented 7 years ago

@colindekker @helior any updates?

helior commented 7 years ago

Thanks for updating your branch @colindekker — Just to share my process, I altered your merge commit to exclude manually bumping the package version. Then after merging your branch back to master I ran npm version patch to auto-bump the package version and add a corresponding git tag. I think because I didn't produce a merge commit that this PR wasn't auto-closed. But at any rate, THANK YOU!