Skip to content
This repository has been archived by the owner on Aug 15, 2024. It is now read-only.

Chore: Convert to ES6 that is supported on Node 4, commonjs modules and remove Babel #14

Merged
merged 1 commit into from
Feb 11, 2017

Conversation

corbinu
Copy link
Contributor

@corbinu corbinu commented Feb 10, 2017

I appear to have messed up the rebase. Think the issue was I never should have merged first.

This removes Babel, converts to commonjs modules and removes other ES6 features not supported on Node 4. I think it was all destructuring.

Updated version of #8 which removes .defaults and rebased on master

@platinumazure
Copy link
Member

As you've no doubt figured out by now, it's generally better to rebase your topic on master rather than merge master into the topic branch. (Definitely do a fast-forward merge when you're pulling the main repo's master branch into your local master, though.) I'm sorry you've had a frustrating experience and I hope things go better in the future 😄

@corbinu
Copy link
Contributor Author

corbinu commented Feb 10, 2017

@platinumazure Ya the bigger issue appears to have been undoing that mistake. Thanks really wasn't to frustrating just hoping that I am not annoying everybody by closing and reopening as honestly I just find that easiest. :)

Copy link
Member

@nzakas nzakas left a comment

Choose a reason for hiding this comment

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

Nice work! Just would like another set of eyes on this before merging.

@nzakas
Copy link
Member

nzakas commented Feb 11, 2017

Note: this commit message should be prefixed with "Chore:" when merged to follow our commit message guidelines.

@corbinu corbinu changed the title Convert to ES6 that is supported on Node 4, commonjs modules and remove Babel Chore: Convert to ES6 that is supported on Node 4, commonjs modules and remove Babel Feb 11, 2017
@corbinu
Copy link
Contributor Author

corbinu commented Feb 11, 2017

@nzakas Sorry fixed!

@corbinu
Copy link
Contributor Author

corbinu commented Feb 11, 2017

@JamesHenry Should be all set!

@corbinu
Copy link
Contributor Author

corbinu commented Feb 11, 2017

@JamesHenry The travis work is still there this one is just the one that needs to come in first

@JamesHenry
Copy link
Member

Brilliant! Thanks @corbinu you've got it nailed now 😄

@JamesHenry JamesHenry merged commit 019441e into eslint:master Feb 11, 2017
@corbinu
Copy link
Contributor Author

corbinu commented Feb 11, 2017

Thanks for the help

@corbinu corbinu deleted the node-4 branch February 16, 2017 18:07
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.

4 participants