fixup: cleaner packageEnvs

Author: wraithgar

lib/package-envs.js

@@ -1,4 +1,3 @@
-
 const packageEnvs = (env, vals, prefix) => {
   for (const [key, val] of Object.entries(vals)) {
     if (val === undefined) {
@@ -19,10 +18,12 @@ const packageEnvs = (env, vals, prefix) => {
 }
 
 // https://github.com/npm/rfcs/pull/183 defines which fields we put into the environment
-module.exports = (env, pkg) => packageEnvs({ ...env }, {
-  name: pkg.name,
-  version: pkg.version,
-  config: pkg.config,
-  engines: pkg.engines,
-  bin: pkg.bin,
-}, 'npm_package_')
+module.exports = pkg => {
+  return packageEnvs({}, {
+    name: pkg.name,
+    version: pkg.version,
+    config: pkg.config,
+    engines: pkg.engines,
+    bin: pkg.bin,
+  }, 'npm_package_')
+}

lib/run-script-pkg.js

@@ -69,7 +69,7 @@ const runScriptPkg = async options => {
     path,
     scriptShell,
     binPaths,
-    env: packageEnvs(env, pkg),
+    env: { ...env, ...packageEnvs(pkg) },
     stdio,
     cmd,
     args,