Adds the directory that contains Node to the PATH #5743
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BYK
approved these changes
Apr 26, 2018
| @@ -173,3 +173,15 @@ exports.readJson = async function readJson(source: string): Promise<any> { | |||
| throw new Error(`Invalid json file (${source})`); | |||
| } | |||
| }; | |||
|
|
|||
| exports.chmod = function chmod(target: string, mod: number): Promise<void> { | |||
| return fs.chmod(target, mod); | |||
There was a problem hiding this comment.
Why is the return type for this, is a promise?
There was a problem hiding this comment.
const fs = require('fs-extra');fs-extra exposes the fs functions but make them promise-ready.
| target: string, | ||
| {output = `Fake binary`, exitCode = 1}: {|output: string, exitCode: number|} = {}, | ||
| ): Promise<void> { | ||
| await exports.writeFile(target, `#!/bin/sh\necho "${output}"\nexit ${exitCode}\n`); |
There was a problem hiding this comment.
You should probably escape output properly.
There was a problem hiding this comment.
I think it's fine. These utilities aren't used with user input or anything really complex, so I prefer to keep them simple.
| @@ -142,6 +142,10 @@ export async function makeEnv( | |||
| const envPath = env[constants.ENV_PATH_KEY]; | |||
| const pathParts = envPath ? envPath.split(path.delimiter) : []; | |||
|
|
|||
| // Include the directory that contains node so that we can guarantee that the scripts | |||
| // will always run with the exact same Node release than the one use to run Yarn | |||
| pathParts.unshift(path.dirname(process.execPath)); | |||
There was a problem hiding this comment.
We should probably assign path.dirname(process.execPath) to a variable at this point since it is calculated over and over below.
There was a problem hiding this comment.
Yep, but I already plan to refactor this part in a followup!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This diff orders Yarn to run the lifecycle scripts with a PATH configured to offer in priority the same
nodebinary used to run Yarn itself. This change makes Yarn more coherent since we were previously doing this for node-gyp.Test plan
Added a test to pkg-tests