Merge branch 'master' into upstream_master

Author: aminya

.github/pull.yml

@@ -0,0 +1,7 @@
+version: "1"
+rules:                      # Array of rules
+  - base: upstream_master   # Required. Target branch
+    upstream: atom:master   # Required. Must be in the same fork network.
+    mergeMethod: hardreset  # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
+    mergeUnstable: true     # Optional, merge pull request even when the mergeable_state is not clean. Default: false
+label: ":arrow_heading_down: pull upstream"  # Optional

apm/package-lock.json

@@ -6,6 +6,6 @@
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "2.5.2"
+    "atom-package-manager": "npm:@atom-ide-community/atom-package-manager@2.5.2-atomic.3.1"
   }
 }

apm/package.json

@@ -8,9 +8,7 @@ const childProcess = require('child_process')
 const cleanDependencies = require('./lib/clean-dependencies')
 const deleteMsbuildFromPath = require('./lib/delete-msbuild-from-path')
 const dependenciesFingerprint = require('./lib/dependencies-fingerprint')
-const installApm = require('./lib/install-apm')
-const runApmInstall = require('./lib/run-apm-install')
-const installScriptDependencies = require('./lib/install-script-dependencies')
+const installScriptRunnerDependencies = require('./lib/install-script-runner-dependencies')
 const verifyMachineRequirements = require('./lib/verify-machine-requirements')
 
 process.on('unhandledRejection', function (e) {
@@ -34,13 +32,26 @@ if (dependenciesFingerprint.isOutdated()) {
 
 if (process.platform === 'win32') deleteMsbuildFromPath()
 
-installScriptDependencies(ci)
-installApm(ci)
-childProcess.execFileSync(
-  CONFIG.getApmBinPath(),
-  ['--version'],
-  {stdio: 'inherit'}
-)
-runApmInstall(CONFIG.repositoryRootPath, ci)
+async function bootstrap() {
 
-dependenciesFingerprint.write()
+  installScriptRunnerDependencies()
+
+  const { spawn, Thread, Worker } = require(`${CONFIG.scriptRunnerModulesPath}/threads`)
+
+  const installScriptDependencies = await spawn(new Worker('./lib/install-script-dependencies'))
+  const installScriptDependenciesPromise = installScriptDependencies(ci)
+
+  const installApm = await spawn(new Worker('./lib/install-apm'))
+  await installApm(ci);
+  await Thread.terminate(installApm)
+
+  const runApmInstall = require('./lib/run-apm-install')
+  runApmInstall(CONFIG.repositoryRootPath, ci)
+
+  await installScriptDependenciesPromise;
+  await Thread.terminate(installScriptDependencies)
+
+  dependenciesFingerprint.write()
+}
+
+bootstrap().then(() => {process.exit(0)}).catch((e) =>  {throw e;})

script/bootstrap

@@ -2,12 +2,16 @@
 
 'use strict'
 
+const CONFIG = require('./config')
+
 if (process.argv.includes('--no-bootstrap')) {
   console.log('Skipping bootstrap')
 } else {
   // Bootstrap first to ensure all the dependencies used later in this script
   // are installed.
-  require('./bootstrap')
+  const path = require('path')
+  const childProcess = require('child_process')
+  childProcess.execFileSync(process.execPath, [path.join(CONFIG.scriptRootPath, 'bootstrap')], { env: process.env, cwd: CONFIG.repositoryRootPath, stdio: 'inherit' });
 }
 
 // Required to load CS files in this build script, such as those in `donna`
@@ -63,7 +67,6 @@ process.on('unhandledRejection', function (e) {
   process.exit(1)
 })
 
-const CONFIG = require('./config')
 process.env.ELECTRON_VERSION = CONFIG.appMetadata.electronVersion
 
 let binariesPromise = Promise.resolve()

script/build

@@ -10,6 +10,8 @@ const spawnSync = require('./lib/spawn-sync');
 const repositoryRootPath = path.resolve(__dirname, '..');
 const apmRootPath = path.join(repositoryRootPath, 'apm');
 const scriptRootPath = path.join(repositoryRootPath, 'script');
+const scriptRunnerRootPath = path.join(scriptRootPath, 'script-runner');
+const scriptRunnerModulesPath = path.join(scriptRunnerRootPath, 'node_modules');
 const buildOutputPath = path.join(repositoryRootPath, 'out');
 const docsOutputPath = path.join(repositoryRootPath, 'docs', 'output');
 const intermediateAppPath = path.join(buildOutputPath, 'app');
@@ -40,6 +42,8 @@ module.exports = {
   repositoryRootPath,
   apmRootPath,
   scriptRootPath,
+  scriptRunnerRootPath,
+  scriptRunnerModulesPath,
   buildOutputPath,
   docsOutputPath,
   intermediateAppPath,
@@ -121,3 +125,5 @@ function getNpmBinPath(external = false) {
     ? localNpmBinPath
     : npmBinName;
 }
+
+process.env.JOBS = 'max'; // parallel build in node-gyp

script/config.js

@@ -4,12 +4,19 @@ const childProcess = require('child_process');
 
 const CONFIG = require('../config');
 
-module.exports = function(ci) {
+function installApm(ci) {
   console.log('Installing apm');
   // npm ci leaves apm with a bunch of unmet dependencies
   childProcess.execFileSync(
     CONFIG.getNpmBinPath(),
     ['--global-style', '--loglevel=error', 'install'],
     { env: process.env, cwd: CONFIG.apmRootPath }
   );
-};
+  childProcess.execFileSync(CONFIG.getApmBinPath(), ['--version'], {
+    stdio: 'inherit'
+  });
+}
+
+const { expose } = require(`${CONFIG.scriptRunnerModulesPath}/threads/worker`);
+expose(installApm);
+module.exports = installApm;

script/lib/install-apm.js

@@ -6,11 +6,15 @@ const CONFIG = require('../config');
 
 process.env.ELECTRON_CUSTOM_VERSION = CONFIG.appMetadata.electronVersion;
 
-module.exports = function(ci) {
+function installScriptDependencies(ci) {
   console.log('Installing script dependencies');
   childProcess.execFileSync(
     CONFIG.getNpmBinPath(ci),
     ['--loglevel=error', ci ? 'ci' : 'install'],
     { env: process.env, cwd: CONFIG.scriptRootPath }
   );
-};
+}
+
+const { expose } = require(`${CONFIG.scriptRunnerModulesPath}/threads/worker`);
+expose(installScriptDependencies);
+module.exports = installScriptDependencies;

script/lib/install-script-dependencies.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const childProcess = require('child_process');
+
+const CONFIG = require('../config');
+
+process.env.ELECTRON_CUSTOM_VERSION = CONFIG.appMetadata.electronVersion;
+
+function installScriptRunnerDependencies(ci) {
+  console.log('Installing script runner dependencies');
+  childProcess.execFileSync(
+    CONFIG.getNpmBinPath(ci),
+    ['--loglevel=error', ci ? 'ci' : 'install'],
+    { env: process.env, cwd: CONFIG.scriptRunnerRootPath }
+  );
+}
+
+module.exports = installScriptRunnerDependencies;