test: use local yarn instead of depending on global npm

Author: jbedard

tests/legacy-cli/e2e/setup/002-npm-sandbox.ts

@@ -1,13 +1,14 @@
 import { mkdir, writeFile } from 'fs/promises';
 import { join } from 'path';
-import { getGlobalVariable } from '../utils/env';
+import { getGlobalVariable, setGlobalVariable } from '../utils/env';
 
 /**
  * Configure npm to use a unique sandboxed environment.
  */
 export default async function () {
   const tempRoot: string = getGlobalVariable('tmp-root');
   const npmModulesPrefix = join(tempRoot, 'npm-global');
+  const yarnModulesPrefix = join(tempRoot, 'yarn-global');
   const npmRegistry: string = getGlobalVariable('package-registry');
   const npmrc = join(tempRoot, '.npmrc');
 
@@ -25,9 +26,13 @@ export default async function () {
     process.env['NPM_CONFIG_legacy_peer_deps'] = 'true';
   }
 
-  // Configure the registry and prefix used within the test sandbox
+  // Configure the registry and create the prefix directories
   await writeFile(npmrc, `registry=${npmRegistry}\nprefix=${npmModulesPrefix}`);
   await mkdir(npmModulesPrefix);
+  await mkdir(yarnModulesPrefix);
+
+  setGlobalVariable('npm-global', npmModulesPrefix);
+  setGlobalVariable('yarn-global', yarnModulesPrefix);
 
   console.log(`  Using "${npmModulesPrefix}" as e2e test global npm cache.`);
 }

tests/legacy-cli/e2e/setup/010-local-publish.ts

@@ -1,11 +1,10 @@
 import { getGlobalVariable } from '../utils/env';
-import { execWithEnv, extractNpmEnv } from '../utils/process';
+import { globalYarn, extractNpmEnv } from '../utils/process';
 import { isPrereleaseCli } from '../utils/project';
 
 export default async function () {
   const testRegistry: string = getGlobalVariable('package-registry');
-  await execWithEnv(
-    'npm',
+  await globalYarn(
     [
       'run',
       'admin',

tests/legacy-cli/e2e/setup/100-global-cli.ts

@@ -1,5 +1,5 @@
 import { getGlobalVariable } from '../utils/env';
-import { silentNpm } from '../utils/process';
+import { globalYarn } from '../utils/process';
 
 const NPM_VERSION = '7.24.0';
 const YARN_VERSION = '1.22.18';
@@ -13,12 +13,12 @@ export default async function () {
   const testRegistry: string = getGlobalVariable('package-registry');
 
   // Install global Angular CLI being tested, npm+yarn used by e2e tests.
-  await silentNpm(
-    'install',
-    '--global',
+  await globalYarn([
+    'global',
+    'add',
     `--registry=${testRegistry}`,
     '@angular/cli',
     `npm@${NPM_VERSION}`,
     `yarn@${YARN_VERSION}`,
-  );
+  ]);
 }

tests/legacy-cli/e2e/utils/process.ts

@@ -322,6 +322,24 @@ export function silentYarn(...args: string[]) {
   return _exec({ silent: true }, 'yarn', args);
 }
 
+const YARN = join(__dirname, '../../../../.yarn/releases/yarn-1.22.17.cjs');
+
+export function globalYarn(args: string[], env?: NodeJS.ProcessEnv) {
+  if (!process.env.LEGACY_CLI_RUNNER) {
+    throw new Error('The global yarn should only be executed from the primary e2e runner process');
+  }
+
+  // Use the yarn global cache when executing yarn
+  const npmPrefix = process.env.NPM_CONFIG_PREFIX;
+  try {
+    process.env.NPM_CONFIG_PREFIX = getGlobalVariable('yarn-global');
+
+    return _exec({ silent: true, env }, 'node', [YARN, ...args]);
+  } finally {
+    process.env.NPM_CONFIG_PREFIX = npmPrefix;
+  }
+}
+
 export function npm(...args: string[]) {
   return _exec({}, 'npm', args);
 }
@@ -361,12 +379,14 @@ export async function launchTestProcess(entry: string, ...args: any[]) {
   // non angular-cli paths such as /usr/bin for generic commands.
   paths = paths.filter((p) => p.startsWith(tempRoot) || !p.includes('angular-cli'));
 
-  // Ensure the custom npm global bin is on the PATH
+  // Ensure the custom npm and yarn global bin is on the PATH
   // https://docs.npmjs.com/cli/v8/configuring-npm/folders#executables
   if (process.platform.startsWith('win')) {
-    paths.unshift(env.NPM_CONFIG_PREFIX!);
+    paths.unshift(getGlobalVariable('npm-global'));
+    paths.unshift(getGlobalVariable('yarn-global'));
   } else {
-    paths.unshift(join(env.NPM_CONFIG_PREFIX!, 'bin'));
+    paths.unshift(join(getGlobalVariable('npm-global'), 'bin'));
+    paths.unshift(join(getGlobalVariable('yarn-global'), 'bin'));
   }
 
   env.PATH = paths.join(delimiter);

tests/legacy-cli/e2e_runner.ts

@@ -58,6 +58,11 @@ const argv = yargsParser(process.argv.slice(2), {
  */
 process.exitCode = 255;
 
+/**
+ * Mark this process as the main e2e_runner
+ */
+process.env.LEGACY_CLI_RUNNER = '1';
+
 const logger = createConsoleLogger(argv.verbose, process.stdout, process.stderr, {
   info: (s) => s,
   debug: (s) => s,