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

fix(pnp): make sure pnp module is again the first preloaded module. #6951

Merged
merged 3 commits into from
Jan 29, 2019
Merged

fix(pnp): make sure pnp module is again the first preloaded module. #6951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d454a7a
fix(pnp): make sure pnp module is again the first preloaded module.
jdalton Jan 24, 2019
1143199
Update CHANGELOG.md
arcanis Jan 29, 2019
489497b
Merge branch 'master' into more-node-options-fix
arcanis Jan 29, 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

- Changes the location where the `--require ./.pnp.js` flag gets added into `NODE_OPTIONS`: now at the front (bis)

[#6951](https://github.com/yarnpkg/yarn/pull/6951) - [**John-David Dalton**](https://twitter.com/jdalton)

## 1.14.0

- Improves PnP compatibility with Node 6
Expand Down
2 changes: 1 addition & 1 deletion src/util/execute-lifecycle-script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export async function makeEnv(
// Note that NODE_OPTIONS doesn't support any style of quoting its arguments at the moment
// For this reason, it won't work if the user has a space inside its $PATH
env.NODE_OPTIONS = env.NODE_OPTIONS || '';
env.NODE_OPTIONS += ` --require ${pnpFile}`;
env.NODE_OPTIONS = `--require ${pnpFile} ${env.NODE_OPTIONS}`;
}

pathParts.unshift(await getWrappersFolder(config));
Expand Down