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

…6951) * fix(pnp): make sure pnp module is again the first preloaded module. * Update CHANGELOG.md
yarnpkg · Jan 29, 2019 · c149410 · c149410
1 parent dc5945d
commit c149410
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/src/util/execute-lifecycle-script.js b/src/util/execute-lifecycle-script.js
@@ -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));