feat: Set platform npm environment variable

Closes #1027

Author: develar

src/cli/install-app-deps.ts

@@ -10,9 +10,15 @@ import { installOrRebuild } from "../yarn"
 
 async function main() {
   const args: any = yargs
+    .option("platform", {
+      choices: ["linux", "darwin", "win32"],
+      default: process.platform,
+    })
     .option("arch", {
       choices: ["ia32", "x64", "all"],
-    }).argv
+      default: process.arch,
+    })
+    .argv
 
   const projectDir = process.cwd()
   const devPackageFile = path.join(projectDir, "package.json")
@@ -24,7 +30,7 @@ async function main() {
   ])
 
   // if two package.json — force full install (user wants to install/update app deps in addition to dev)
-  await installOrRebuild(devMetadata.build, results[0], results[1], args.arch, results[0] !== projectDir)
+  await installOrRebuild(devMetadata.build, results[0], results[1], args.platform, args.arch, results[0] !== projectDir)
 }
 
 main()

src/cli/node-gyp-rebuild.ts

@@ -8,18 +8,22 @@ import { log } from "../util/log"
 import { getGypEnv } from "../yarn"
 
 const args: any = yargs
+  .option("platform", {
+    choices: ["linux", "darwin", "win32"],
+    default: process.platform,
+  })
   .option("arch", {
     choices: ["ia32", "x64", "armv7l"],
+    default: process.arch,
   }).argv
 
 const projectDir = process.cwd()
 const devPackageFile = path.join(projectDir, "package.json")
 
 async function main() {
-  const arch = args.arch || process.arch
-  log(`Execute node-gyp rebuild for arch ${arch}`)
+  log(`Execute node-gyp rebuild for ${args.platform}:${args.arch}`)
   await exec(process.platform === "win32" ? "node-gyp.cmd" : "node-gyp", ["rebuild"], {
-    env: getGypEnv(await getElectronVersion(await readPackageJson(devPackageFile), devPackageFile), arch, true),
+    env: getGypEnv(await getElectronVersion(await readPackageJson(devPackageFile), devPackageFile), args.platform, args.arch, true),
   })
 }
 

src/packager.ts

@@ -245,7 +245,7 @@ export class Packager implements BuildInfo {
     if (options.nodeGypRebuild === true) {
       log(`Executing node-gyp rebuild for arch ${Arch[arch]}`)
       await exec(process.platform === "win32" ? "node-gyp.cmd" : "node-gyp", ["rebuild"], {
-        env: getGypEnv(this.electronVersion, Arch[arch], true),
+        env: getGypEnv(this.electronVersion, platform.nodeName, Arch[arch], true),
       })
     }
 
@@ -258,7 +258,7 @@ export class Packager implements BuildInfo {
       log("Skip app dependencies rebuild because platform is different")
     }
     else {
-      await installOrRebuild(options, this.appDir, this.electronVersion, Arch[arch])
+      await installOrRebuild(options, this.appDir, this.electronVersion, platform.nodeName, Arch[arch])
     }
   }
 }

src/yarn.ts

@@ -6,31 +6,32 @@ import { spawn, asArray } from "./util/util"
 import { BuildMetadata } from "./metadata"
 import { exists } from "./util/fs"
 
-export async function installOrRebuild(options: BuildMetadata, appDir: string, electronVersion: string, arch: string, forceInstall: boolean = false) {
+export async function installOrRebuild(options: BuildMetadata, appDir: string, electronVersion: string, platform: string, arch: string, forceInstall: boolean = false) {
   const args = asArray(options.npmArgs)
   if (forceInstall || !(await exists(path.join(appDir, "node_modules")))) {
-    await installDependencies(appDir, electronVersion, arch, args, !options.npmSkipBuildFromSource)
+    await installDependencies(appDir, electronVersion, platform, arch, args, !options.npmSkipBuildFromSource)
   }
   else {
-    await rebuild(appDir, electronVersion, arch, args, !options.npmSkipBuildFromSource)
+    await rebuild(appDir, electronVersion, arch, platform, args, !options.npmSkipBuildFromSource)
   }
 }
 
-export function getGypEnv(electronVersion: string, arch: string, buildFromSource: boolean) {
+export function getGypEnv(electronVersion: string, platform: string, arch: string, buildFromSource: boolean) {
   const gypHome = path.join(homedir(), ".electron-gyp")
   return Object.assign({}, process.env, {
     npm_config_disturl: "https://atom.io/download/electron",
     npm_config_target: electronVersion,
     npm_config_runtime: "electron",
     npm_config_arch: arch,
     npm_config_target_arch: arch,
+    npm_config_platform: platform,
     npm_config_build_from_source: buildFromSource,
     HOME: gypHome,
     USERPROFILE: gypHome,
   })
 }
 
-export function installDependencies(appDir: string, electronVersion: string, arch: string = process.arch, additionalArgs: Array<string>, buildFromSource: boolean): Promise<any> {
+function installDependencies(appDir: string, electronVersion: string, platform: string = process.platform, arch: string = process.arch, additionalArgs: Array<string>, buildFromSource: boolean): Promise<any> {
   log(`Installing app dependencies for arch ${arch} to ${appDir}`)
   let execPath = process.env.npm_execpath || process.env.NPM_CLI_JS
   const execArgs = ["install", "--production"]
@@ -54,7 +55,7 @@ export function installDependencies(appDir: string, electronVersion: string, arc
   execArgs.push(...additionalArgs)
   return spawn(execPath, execArgs, {
     cwd: appDir,
-    env: getGypEnv(electronVersion, arch, buildFromSource),
+    env: getGypEnv(electronVersion, arch, platform, buildFromSource),
   })
 }
 
@@ -109,16 +110,17 @@ function isYarnPath(execPath: string | null) {
   return execPath != null && path.basename(execPath).startsWith("yarn")
 }
 
-export async function rebuild(appDir: string, electronVersion: string, arch: string = process.arch, additionalArgs: Array<string>, buildFromSource: boolean) {
+export async function rebuild(appDir: string, electronVersion: string, arch: string = process.arch, platform: string = process.platform, additionalArgs: Array<string>, buildFromSource: boolean) {
   const deps = new Set<string>()
   await dependencies(appDir, false, deps)
   const nativeDeps = await BluebirdPromise.filter(deps, it => exists(path.join(it, "binding.gyp")), {concurrency: 8})
 
   if (nativeDeps.length === 0) {
+    log(`No native production dependencies`)
     return
   }
 
-  log(`Rebuilding native production dependencies for arch ${arch}`)
+  log(`Rebuilding native production dependencies for ${platform}:${arch}`)
 
   let execPath = process.env.npm_execpath || process.env.NPM_CLI_JS
   const isYarn = isYarnPath(execPath)
@@ -131,7 +133,7 @@ export async function rebuild(appDir: string, electronVersion: string, arch: str
     execPath = process.env.npm_node_execpath || process.env.NODE_EXE || "node"
   }
 
-  const env = getGypEnv(electronVersion, arch, buildFromSource)
+  const env = getGypEnv(electronVersion, arch, platform, buildFromSource)
   if (isYarn) {
     execArgs.push("run", "install", "--")
     execArgs.push(...additionalArgs)

test/yarn.js

@@ -33610,7 +33610,7 @@ function isDate (d) {
 module.exports = {
 	"name": "yarn",
 	"installationMethod": "unknown",
-	"version": "0.18.0",
+	"version": "0.18.1",
 	"license": "BSD-2-Clause",
 	"preferGlobal": true,
 	"dependencies": {
@@ -68041,7 +68041,7 @@ let historyCounter = 0;
 
 class HoistManifest {
   constructor(key, parts, pkg, loc, isIgnored) {
-    this.ignore = isIgnored;
+    this.isIgnored = isIgnored;
     this.loc = loc;
     this.pkg = pkg;
 
@@ -68155,13 +68155,17 @@ class PackageHoister {
 
     //
     let parentParts = [];
-    let isIgnored = ref.ignore;
+    let isIgnored = () => ref.ignore;
 
     if (parent) {
       if (!this.tree.get(parent.key)) {
         return null;
       }
-      isIgnored = isIgnored || parent.ignore;
+      // non ignored dependencies inherit parent's ignored status
+      // parent may transition from ignored to non ignored when hoisted if it is used in another non ignored branch
+      if (!isIgnored() && parent.isIgnored()) {
+        isIgnored = () => !!parent && parent.isIgnored();
+      }
       parentParts = parent.parts;
     }
 
@@ -68203,9 +68207,9 @@ class PackageHoister {
       const existing = this.tree.get(checkKey);
       if (existing) {
         if (existing.loc === info.loc) {
-          // deduping an unignored reference to an ignored one
-          if (existing.ignore && !info.ignore) {
-            existing.ignore = false;
+          // switch to non ignored if earlier deduped version was ignored
+          if (existing.isIgnored() && !info.isIgnored()) {
+            existing.isIgnored = info.isIgnored;
           }
 
           existing.addHistory(`Deduped ${ fullKey } to this item`);
@@ -68301,8 +68305,6 @@ class PackageHoister {
 
     this.tree.delete(key);
 
-    //
-
     var _getNewParts = this.getNewParts(key, info, rawParts.slice());
 
     const parts = _getNewParts.parts;
@@ -68423,7 +68425,7 @@ class PackageHoister {
       const ref = info.pkg._reference;
       invariant(ref, 'expected reference');
 
-      if (info.ignore) {
+      if (info.isIgnored()) {
         info.addHistory('Deleted as this module was ignored');
       } else {
         visibleFlatTree.push([loc, info]);

yarn.lock

@@ -786,12 +786,12 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
 concat-stream@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
-    inherits "~2.0.1"
-    readable-stream "~2.0.0"
-    typedarray "~0.0.5"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
 
 configstore@^2.0.0:
   version "2.1.0"
@@ -1657,7 +1657,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@~2.0.1:
+inherits@2, inherits@^2.0.3, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -2960,7 +2960,7 @@ readable-stream@^1.1.8, readable-stream@~1.1.9:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5:
+readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
   dependencies:
@@ -2972,7 +2972,7 @@ readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readable-stream@~2.0.0, readable-stream@~2.0.5:
+readable-stream@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
@@ -3487,7 +3487,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-typedarray@~0.0.5:
+typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"