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.

Sign up for GitHub

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

Jump to bottom

Clean up node path prepending #7057

Merged
merged 6 commits into from
Mar 8, 2019
Merged

Clean up node path prepending #7057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d75ef2f
Delete unused scriptsPrependNodePath config option.
jasongrout Feb 22, 2019
6098224
Do not prepend the node exec path.
jasongrout Feb 22, 2019
959c5c0
Update CHANGELOG.md
arcanis Feb 28, 2019
e18d959
Merge branch 'master' into no-node-path
arcanis Feb 28, 2019
24d50ec
Clarify in changelog the --scripts-prepend-node-path is removed becau…
jasongrout Mar 4, 2019
ef7fda4
Merge branch 'master' into no-node-path
arcanis Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Please add one entry in this file for each change in Yarn's behavior. Use the sa

## Master

- Removes `--scripts-prepend-node-path` as Yarn's default behavior makes this obsolete

[#7057](https://github.com/yarnpkg/yarn/pull/7057/files) - [**Jason Grout**](https://github.com/jasongrout)

- Fixes the advisory link printed by `yarn audit`

[#7091](https://github.com/yarnpkg/yarn/pull/7091) - [**Jakob Krigovsky**](https://github.com/sonicdoe)
Expand Down
5 changes: 0 additions & 5 deletions src/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export type ConfigOptions = {
nonInteractive?: boolean,
enablePnp?: boolean,
disablePnp?: boolean,
scriptsPrependNodePath?: boolean,
offlineCacheFolder?: string,

enableDefaultRc?: boolean,
Expand Down Expand Up @@ -177,8 +176,6 @@ export default class Config {
plugnplayUnplugged: Array<string>;
plugnplayPurgeUnpluggedPackages: boolean;

scriptsPrependNodePath: boolean;

workspacesEnabled: boolean;
workspacesNohoistEnabled: boolean;

Expand Down Expand Up @@ -484,8 +481,6 @@ export default class Config {
// $FlowFixMe$
this.nonInteractive = !!opts.nonInteractive || isCi || !process.stdout.isTTY;

this.scriptsPrependNodePath = !!opts.scriptsPrependNodePath;

this.requestManager.setOptions({
offline: !!opts.offline && !opts.preferOffline,
captureHar: !!opts.captureHar,
Expand Down
7 changes: 0 additions & 7 deletions src/util/execute-lifecycle-script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,6 @@ 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
const execBin = path.dirname(process.execPath);
if (pathParts.indexOf(execBin) === -1) {
pathParts.unshift(execBin);
}

// Include node-gyp version that was bundled with the current Node.js version,
// if available.
pathParts.unshift(path.join(path.dirname(process.execPath), 'node_modules', 'npm', 'bin', 'node-gyp-bin'));
Expand Down