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: add CFA support #306

Merged
merged 34 commits into from
Nov 15, 2019
Merged

chore: add CFA support #306

merged 34 commits into from
Nov 15, 2019

Conversation

malept
Copy link
Member

@malept malept commented Jun 22, 2019

This is based on the asar PR.

Also refactors the "locate electron" code/tests so that they're more robust.

@malept
Copy link
Member Author

malept commented Jun 27, 2019

I gave up with Travis CI's Windows support and went back to AppVeyor. Need to re-add the project in AppVeyor, though.

@MarshallOfSound
Copy link
Member

node-gyp needs to be ^5.0.0 to work on CircleCI (VS2019)

@malept malept force-pushed the fix-electron-locator branch 2 times, most recently from 94d97a7 to 5923ede Compare August 16, 2019 05:59
@malept malept mentioned this pull request Nov 14, 2019
[
path.resolve(__dirname, 'prebuild-shim.js'),
path.resolve(__dirname, `prebuild-shim.${shimExt}`),
Copy link
Member Author

Choose a reason for hiding this comment

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

The prebuild shim wasn't correctly being run in tests because it assumed that the .js version was always in the same location as src/rebuild.ts.

@@ -329,7 +331,11 @@ class Rebuilder {
rebuildArgs.push('--debug');
}

Object.keys(modulePackageJson.binary || {}).forEach((binaryKey) => {
for (const binaryKey of Object.keys(modulePackageJson.binary || {})) {
Copy link
Member Author

Choose a reason for hiding this comment

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

Switching to for instead of .forEach is more idiomatic, plus it makes the stack trace smaller.


function packageCommand(command: string, packageName: string) {
return spawnPromise('npm', [command, packageName], {
return spawnPromise('npm', [command, '--no-save', packageName], {
Copy link
Member Author

Choose a reason for hiding this comment

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

--no-save prevents the top-level package.json from being overwritten. This is more apparent when developing locally, rather than in CI.

@MarshallOfSound MarshallOfSound merged commit 11cb8d9 into master Nov 15, 2019
@MarshallOfSound MarshallOfSound deleted the fix-electron-locator branch November 15, 2019 20:23
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