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

chore: upgrade to Node 6 #293

Merged
merged 17 commits into from
Feb 25, 2019

Conversation

carterbs
Copy link

@carterbs carterbs commented Feb 22, 2019

Resolves #291, #292.

I've added pify as an alternative to Bluebird.promisify as @malept requested. By updating ava, I was able to remove bluebird entirely.

I ran the tests in node 6.9, and they pass. I suspect the CI will still fail because it's using node 4.1. I don't know enough about the CI setup to change those values with any certainty.

Copy link
Member

@malept malept left a comment

Choose a reason for hiding this comment

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

I really appreciate the work you've put into this!

the module babel-plugin-transform-async-to-module-method will not work with babel 7.

I think this is what the Babel 7 version is: https://babeljs.io/docs/en/babel-plugin-transform-async-to-generator

.babelrc Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
src/fs-utils.js Outdated Show resolved Hide resolved
src/index.js Outdated Show resolved Hide resolved
src/index.js Outdated Show resolved Hide resolved
@carterbs
Copy link
Author

carterbs commented Feb 22, 2019 via email

@malept
Copy link
Member

malept commented Feb 22, 2019

I went with babelrc just because I thought it kept the package.json cleaner. Package.json is pretty small though so I can revert that if you want.

Yeah, I'd just keep the babel config where it is in package.json to keep the diff small.

@carterbs
Copy link
Author

@malept I've updated the PR description and pushed changes that resolve your suggestions.

@malept malept changed the title Asar 1.0.0 -- update fs extra and babel Upgrade to Node 6 Feb 22, 2019
Copy link
Member

@malept malept left a comment

Choose a reason for hiding this comment

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

We're almost there! Just a few things:

  • Can you update CI to run against Node 6?

node_js:
- "4.1"

environment:
matrix:
- nodejs_version: 4.3.2

Don't specify the minor/patch version, we just want to test against the latest Node 6.x version.

package.json Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
@carterbs
Copy link
Author

carterbs commented Feb 22, 2019 via email

@malept
Copy link
Member

malept commented Feb 22, 2019

Re: duplicate Babel. Agreed, it's bad. "inherit" wasn't working. Best I could tell, Ava will inherit from babelrc but not from package.json.

Ugh. If that's the case, move the babel config to .babelrc.

If you can't tackle this stuff let me know. I can probably finish it up tomorrow morning.

I don't know what my availability is for this PR within the next day, so if you don't see any commits by tomorrow morning, feel free to do it.

@malept malept changed the base branch from asar-1.0.0 to master February 25, 2019 06:37
@malept malept changed the base branch from master to asar-1.0.0 February 25, 2019 06:37
@malept malept changed the title Upgrade to Node 6 chore: upgrade to Node 6 Feb 25, 2019
@malept
Copy link
Member

malept commented Feb 25, 2019

I'm just going to merge this into my branch so the tests will actually run. Thanks for all your work!

@malept malept merged commit 7264004 into electron:asar-1.0.0 Feb 25, 2019
@carterbs
Copy link
Author

carterbs commented Feb 25, 2019 via email

MarshallOfSound pushed a commit that referenced this pull request Feb 28, 2019
* Update fs-extra to 7.0.0 and remove obsolete fs wrappers
* Update ava and babel
* Replace bluebird with pify
* Require the correct Node version in package.json
This was referenced Mar 1, 2019
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.

None yet

2 participants