Support running the E2E test suite with yarn

.circleci/config.yml

@@ -199,6 +199,11 @@ jobs:
       - run:
           name: Execute CLI E2E Tests
           command: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ve >>--ve<</ parameters.ve >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --tmpdir=/mnt/ramdisk
+      - run:
+          name: Execute CLI E2E Tests Subset with Yarn
+          command: |
+            rm -rf /mnt/ramdisk/*test-project
+            PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ve >>--ve<</ parameters.ve >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --yarn --tmpdir=/mnt/ramdisk --glob="{tests/basic/**,tests/update/**}"
 
   e2e-cli-node-10:
     executor:

tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts

@@ -1,6 +1,7 @@
 import { getGlobalVariable } from '../../utils/env';
 import { appendToFile, expectFileToMatch } from '../../utils/fs';
-import { ng, silentNpm } from '../../utils/process';
+import { installPackage } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 
 const snapshots = require('../../ng-snapshot/package.json');
@@ -23,7 +24,7 @@ export default async function () {
     });
 
     for (const pkg of packagesToInstall) {
-      await silentNpm('install', pkg);
+      await installPackage(pkg);
     }
   }
 

tests/legacy-cli/e2e/tests/build/build-app-shell.ts

@@ -1,7 +1,8 @@
 import { stripIndent } from 'common-tags';
 import { getGlobalVariable } from '../../utils/env';
 import { expectFileToMatch, writeFile } from '../../utils/fs';
-import { ng, npm } from '../../utils/process';
+import { installWorkspacePackages } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { readNgVersion } from '../../utils/version';
 
@@ -159,7 +160,7 @@ export default function() {
       updateJsonFile('package.json', packageJson => {
         const dependencies = packageJson['dependencies'];
         dependencies['@angular/platform-server'] = platformServerVersion;
-      }).then(() => npm('install')),
+      }).then(() => installWorkspacePackages()),
     )
     .then(() => ng('run', 'test-project:app-shell'))
     .then(() => expectFileToMatch('dist/test-project/index.html', /shell Works!/));

tests/legacy-cli/e2e/tests/build/material.ts

@@ -1,6 +1,7 @@
 import { getGlobalVariable } from '../../utils/env';
 import { replaceInFile } from '../../utils/fs';
-import { ng, silentNpm } from '../../utils/process';
+import { installPackage, installWorkspacePackages } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { isPrereleaseCli, updateJsonFile } from '../../utils/project';
 
 const snapshots = require('../../ng-snapshot/package.json');
@@ -25,12 +26,12 @@ export default async function () {
         snapshots.dependencies['@angular/material-moment-adapter'];
     });
 
-    await silentNpm('install');
+    await installWorkspacePackages();
   } else {
-    await silentNpm('install', '@angular/material-moment-adapter');
+    await installPackage('@angular/material-moment-adapter');
   }
 
-  await silentNpm('install', 'moment');
+  await installPackage('moment');
 
   await ng('build', '--prod');
 

tests/legacy-cli/e2e/tests/build/platform-server.ts

@@ -1,6 +1,7 @@
 import { normalize } from 'path';
 import { getGlobalVariable } from '../../utils/env';
 import { appendToFile, expectFileToMatch, writeFile } from '../../utils/fs';
+import { installPackage } from '../../utils/packages';
 import { exec, ng, silentNpm } from '../../utils/process';
 import { isPrereleaseCli, updateJsonFile } from '../../utils/project';
 
@@ -37,7 +38,7 @@ export default async function () {
     });
 
     for (const pkg of packagesToInstall) {
-      await silentNpm('install', pkg);
+      await installPackage(pkg);
     }
   }
 

tests/legacy-cli/e2e/tests/build/service-worker.ts

@@ -1,7 +1,8 @@
 import {join} from 'path';
 import {getGlobalVariable} from '../../utils/env';
 import {expectFileNotToExist, expectFileToExist, expectFileToMatch, writeFile} from '../../utils/fs';
-import {ng, npm, silentNpm} from '../../utils/process';
+import { installPackage, uninstallPackage } from '../../utils/packages';
+import {ng} from '../../utils/process';
 
 const MANIFEST = {
   index: '/index.html',
@@ -25,8 +26,8 @@ const MANIFEST = {
 export default function() {
   // Can't use the `ng` helper because somewhere the environment gets
   // stuck to the first build done
-  return silentNpm('remove', '@angular/service-worker')
-    .then(() => silentNpm('install', '@angular/service-worker'))
+  return uninstallPackage('@angular/service-worker')
+    .then(() => installPackage('@angular/service-worker'))
     .then(() => ng('config', 'projects.test-project.architect.build.options.serviceWorker', 'true'))
     .then(() => writeFile('src/ngsw-config.json', JSON.stringify(MANIFEST, null, 2)))
     .then(() => ng('build', '--optimization'))

tests/legacy-cli/e2e/tests/build/styles/material-import.ts

@@ -4,7 +4,8 @@ import {
   replaceInFile,
   writeMultipleFiles,
 } from '../../../utils/fs';
-import { ng, silentNpm } from '../../../utils/process';
+import { installWorkspacePackages } from '../../../utils/packages';
+import { ng } from '../../../utils/process';
 import { updateJsonFile } from '../../../utils/project';
 
 const snapshots = require('../../../ng-snapshot/package.json');
@@ -19,7 +20,7 @@ export default async function () {
     dependencies['@angular/cdk'] = isSnapshotBuild ? snapshots.dependencies['@angular/cdk'] : 'latest';
   });
 
-  await silentNpm('install');
+  await installWorkspacePackages();
 
   for (const ext of ['css', 'scss', 'less', 'styl']) {
     await writeMultipleFiles({

tests/legacy-cli/e2e/tests/build/styles/node-sass.ts

@@ -4,7 +4,8 @@ import {
   replaceInFile,
   writeMultipleFiles,
 } from '../../../utils/fs';
-import { ng, silentExec, silentNpm } from '../../../utils/process';
+import { installPackage } from '../../../utils/packages';
+import { ng, silentExec } from '../../../utils/process';
 import { updateJsonFile } from '../../../utils/project';
 import { expectToFail } from '../../../utils/utils';
 
@@ -32,7 +33,7 @@ export default async function () {
   await silentExec('rm', '-rf', 'node_modules/sass');
   await expectToFail(() => ng('build', '--extract-css', '--source-map'));
 
-  await silentNpm('install', 'node-sass');
+  await installPackage('node-sass');
   await silentExec('rm', '-rf', 'node_modules/sass');
   await ng('build', '--extract-css', '--source-map');
 
@@ -41,9 +42,9 @@ export default async function () {
   await expectToFail(() => expectFileToMatch('dist/test-project/styles.css', '"mappings":""'));
   await expectFileToMatch('dist/test-project/main.js', /.outer.*.inner.*background:\s*#[fF]+/);
 
-  await silentNpm('install', 'node-gyp');
-  await silentNpm('install', 'fibers');
-  await silentNpm('install', 'sass');
+  await installPackage('node-gyp');
+  await installPackage('fibers');
+  await installPackage('sass');
   await silentExec('rm', '-rf', 'node_modules/node-sass');
   await ng('build', '--extract-css', '--source-map');
 

tests/legacy-cli/e2e/tests/commands/add/add-pwa-yarn.ts

@@ -1,8 +1,13 @@
 import { join } from 'path';
+import { getGlobalVariable } from '../../../utils/env';
 import { expectFileToExist, readFile, rimraf } from '../../../utils/fs';
 import { ng, npm } from '../../../utils/process';
 
 export default async function () {
+    if (getGlobalVariable('package-manager') === 'yarn') {
+      return;
+    }
+
     // forcibly remove in case another test doesn't clean itself up
     await rimraf('node_modules/@angular/pwa');
 

tests/legacy-cli/e2e/tests/i18n/extract-ivy-libraries.ts

@@ -1,6 +1,7 @@
 import { getGlobalVariable } from '../../utils/env';
 import { expectFileToMatch, replaceInFile, writeFile } from '../../utils/fs';
-import { ng, npm } from '../../utils/process';
+import { installPackage, uninstallPackage } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { readNgVersion } from '../../utils/version';
 
 export default async function() {
@@ -57,7 +58,7 @@ export default async function() {
   if (getGlobalVariable('argv')['ng-snapshots']) {
     localizeVersion = require('../../ng-snapshot/package.json').dependencies['@angular/localize'];
   }
-  await npm('install', `${localizeVersion}`);
+  await installPackage(localizeVersion);
 
   // Extract messages
   await ng('xi18n', '--ivy');
@@ -69,5 +70,5 @@ export default async function() {
     'projects/i18n-lib-test/src/lib/i18n-lib-test.component.ts',
   );
 
-  await npm('uninstall', '@angular/localize');
+  await uninstallPackage('@angular/localize');
 }

tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts

@@ -1,7 +1,8 @@
 import { join } from 'path';
 import { getGlobalVariable } from '../../utils/env';
 import { writeFile } from '../../utils/fs';
-import { ng, npm } from '../../utils/process';
+import { installPackage, uninstallPackage } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 import { readNgVersion } from '../../utils/version';
@@ -30,7 +31,7 @@ export default async function() {
   if (getGlobalVariable('argv')['ng-snapshots']) {
     localizeVersion = require('../../ng-snapshot/package.json').dependencies['@angular/localize'];
   }
-  await npm('install', `${localizeVersion}`);
+  await installPackage(localizeVersion);
 
   // Should show ivy enabled application warning without --ivy flag
   const { stderr: message3 } = await ng('xi18n', '--no-ivy');
@@ -57,5 +58,5 @@ export default async function() {
     throw new Error('Expected ivy disabled application warning');
   }
 
-  await npm('uninstall', '@angular/localize');
+  await uninstallPackage('@angular/localize');
 }

tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell.ts

@@ -7,7 +7,8 @@ import {
   replaceInFile,
   writeFile,
 } from '../../utils/fs';
-import { ng, silentNpm } from '../../utils/process';
+import { installWorkspacePackages } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { readNgVersion } from '../../utils/version';
 
@@ -38,7 +39,7 @@ export default async function () {
     });
   }
 
-  await silentNpm('install');
+  await installWorkspacePackages();
 
   const browserBaseDir = 'dist/test-project/browser';
 

tests/legacy-cli/e2e/tests/i18n/ivy-localize-server.ts

@@ -2,7 +2,8 @@ import * as express from 'express';
 import { join } from 'path';
 import { getGlobalVariable } from '../../utils/env';
 import { appendToFile, expectFileToMatch, writeFile } from '../../utils/fs';
-import { ng, silentNpm } from '../../utils/process';
+import { installWorkspacePackages } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 import { langTranslations, setupI18nConfig } from './legacy';
@@ -27,7 +28,7 @@ export default async function () {
     });
   }
 
-  await silentNpm('install');
+  await installWorkspacePackages();
 
   const serverbaseDir = 'dist/test-project/server';
   const serverBuildArgs = ['run', 'test-project:server'];

tests/legacy-cli/e2e/tests/i18n/ivy-localize-serviceworker.ts

@@ -8,7 +8,8 @@ import {
   replaceInFile,
   writeFile,
 } from '../../utils/fs';
-import { ng, npm } from '../../utils/process';
+import { installPackage } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 import { readNgVersion } from '../../utils/version';
@@ -22,15 +23,15 @@ export default async function() {
   if (getGlobalVariable('argv')['ng-snapshots']) {
     localizeVersion = require('../../ng-snapshot/package.json').dependencies['@angular/localize'];
   }
-  await npm('install', `${localizeVersion}`);
+  await installPackage(localizeVersion);
 
   let serviceWorkerVersion = '@angular/service-worker@' + readNgVersion();
   if (getGlobalVariable('argv')['ng-snapshots']) {
     serviceWorkerVersion = require('../../ng-snapshot/package.json').dependencies[
       '@angular/service-worker'
     ];
   }
-  await npm('install', `${serviceWorkerVersion}`);
+  await installPackage(serviceWorkerVersion);
 
   await updateJsonFile('tsconfig.json', config => {
     config.compilerOptions.target = 'es2015';

tests/legacy-cli/e2e/tests/i18n/legacy.ts

@@ -2,7 +2,8 @@ import * as express from 'express';
 import { resolve } from 'path';
 import { getGlobalVariable } from '../../utils/env';
 import { appendToFile, copyFile, expectFileToExist, expectFileToMatch, replaceInFile, writeFile } from '../../utils/fs';
-import { ng, npm } from '../../utils/process';
+import { installPackage } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 import { readNgVersion } from '../../utils/version';
@@ -213,7 +214,7 @@ export async function setupI18nConfig(useLocalize = true, format: keyof typeof f
     if (getGlobalVariable('argv')['ng-snapshots']) {
       localizeVersion = require('../../ng-snapshot/package.json').dependencies['@angular/localize'];
     }
-    await npm('install', `${localizeVersion}`);
+    await installPackage(localizeVersion);
   }
 
   // Extract the translation messages.

tests/legacy-cli/e2e/tests/i18n/ve-localize-es2015.ts

@@ -1,10 +1,11 @@
 import { getGlobalVariable } from '../../utils/env';
 import { expectFileToMatch, writeFile } from '../../utils/fs';
-import { execAndWaitForOutputToMatch, ng, npm } from '../../utils/process';
+import { installPackage } from '../../utils/packages';
+import { execAndWaitForOutputToMatch, ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 import { readNgVersion } from '../../utils/version';
-import { baseDir, externalServer, langTranslations, setupI18nConfig } from './legacy';
+import { externalServer, langTranslations, setupI18nConfig } from './legacy';
 
 export default async function() {
   if (!getGlobalVariable('argv')['ve']) {
@@ -19,7 +20,7 @@ export default async function() {
   if (getGlobalVariable('argv')['ng-snapshots']) {
     localizeVersion = require('../../ng-snapshot/package.json').dependencies['@angular/localize'];
   }
-  await npm('install', `${localizeVersion}`);
+  await installPackage(localizeVersion);
 
   // Ensure a ES2015 build is used.
   await writeFile('.browserslistrc', 'Chrome 65');

tests/legacy-cli/e2e/tests/misc/common-async.ts

@@ -1,7 +1,7 @@
 import {readdirSync} from 'fs';
 import {oneLine} from 'common-tags';
-
-import {ng, silentNpm} from '../../utils/process';
+import { installPackage } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import {appendToFile, expectFileToExist, prependToFile, replaceInFile} from '../../utils/fs';
 import {expectToFail} from '../../utils/utils';
 
@@ -32,7 +32,7 @@ export default function() {
       }
       oldNumberOfFiles = currentNumberOfDistFiles;
     })
-    .then(() => silentNpm('install', 'moment'))
+    .then(() => installPackage('moment'))
     .then(() => appendToFile('src/app/lazy-a/lazy-a.module.ts', `
       import * as moment from 'moment';
       console.log(moment);

tests/legacy-cli/e2e/tests/misc/dedupe-duplicate-modules.ts

@@ -1,5 +1,6 @@
 import { expectFileToMatch, writeFile } from '../../utils/fs';
-import { ng, silentNpm } from '../../utils/process';
+import { installWorkspacePackages } from '../../utils/packages';
+import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
@@ -14,7 +15,7 @@ export default async function () {
     };
   });
 
-  await silentNpm('install');
+  await installWorkspacePackages();
 
   await writeFile('./src/main.ts',
     `