ci: use current minimum Node.js v16 version to test snapshot builds

Node.js 16.10 is currently the minimum version of v16 supported by the Angular CLI
and is now used when executing the Angular snapshot E2E test suite to ensure
that the latest snapshots of Angular continue to function at this Node.js version.
Node.js v16 is the version currently used to develop the Angular CLI.
The npm 7+ workaround of installing npm 6 is also removed to more closely track
the behavior of Node.js 16.10 as well as any other Node.js version used during
testing.

Author: clydin

.circleci/config.yml

@@ -204,10 +204,8 @@ jobs:
       - browser-tools/install-chrome
       - run:
           name: Initialize Environment
-          # npm 7 currently does not properly publish the packages locally
           command: |
             ./.circleci/env.sh
-            sudo npm install --global npm@6
       - run:
           name: Execute CLI E2E Tests
           command: |
@@ -354,6 +352,7 @@ workflows:
             - build
       - e2e-cli:
           name: e2e-cli-ng-snapshots
+          nodeversion: '16.10'
           snapshots: true
           requires:
             - build

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

@@ -1,18 +1,27 @@
 import { getGlobalVariable } from '../utils/env';
-import { npm } from '../utils/process';
+import { execWithEnv } from '../utils/process';
 import { isPrereleaseCli } from '../utils/project';
 
 export default async function () {
   const testRegistry = getGlobalVariable('package-registry');
-  await npm(
-    'run',
-    'admin',
-    '--',
-    'publish',
-    '--no-versionCheck',
-    '--no-branchCheck',
-    `--registry=${testRegistry}`,
-    '--tag',
-    isPrereleaseCli() ? 'next' : 'latest',
+  await execWithEnv(
+    'npm',
+    [
+      'run',
+      'admin',
+      '--',
+      'publish',
+      '--no-versionCheck',
+      '--no-branchCheck',
+      `--registry=${testRegistry}`,
+      '--tag',
+      isPrereleaseCli() ? 'next' : 'latest',
+    ],
+    {
+      ...process.env,
+      // Also set an auth token value for the local test registry which is required by npm 7+
+      // even though it is never actually used.
+      'NPM_CONFIG__AUTH': 'e2e-testing',
+    },
   );
 }

tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts

@@ -1,29 +1,14 @@
 import { expectFileToMatch } from '../../utils/fs';
-import { ng, silentNpm } from '../../utils/process';
+import { execWithEnv, ng, silentNpm } from '../../utils/process';
 import { installPackage, uninstallPackage } from '../../utils/packages';
 import { isPrereleaseCli } from '../../utils/project';
 
 export default async function () {
   // Must publish old version to local registry to allow install. This is especially important
   // for release commits as npm will try to request tooling packages that are not on the npm registry yet
-  const { stdout: stdoutPack1 } = await silentNpm(
-    'pack',
-    '@schematics/angular@7',
-    '--registry=https://registry.npmjs.org',
-  );
-  await silentNpm('publish', stdoutPack1.trim(), '--tag=outdated');
-  const { stdout: stdoutPack2 } = await silentNpm(
-    'pack',
-    '@angular-devkit/core@7',
-    '--registry=https://registry.npmjs.org',
-  );
-  await silentNpm('publish', stdoutPack2.trim(), '--tag=outdated');
-  const { stdout: stdoutPack3 } = await silentNpm(
-    'pack',
-    '@angular-devkit/schematics@7',
-    '--registry=https://registry.npmjs.org',
-  );
-  await silentNpm('publish', stdoutPack3.trim(), '--tag=outdated');
+  await publishOutdated('@schematics/angular@7');
+  await publishOutdated('@angular-devkit/core@7');
+  await publishOutdated('@angular-devkit/schematics@7');
 
   // Install outdated and incompatible version
   await installPackage('@schematics/angular@7');
@@ -36,3 +21,17 @@ export default async function () {
   // Not doing so can cause adding material to fail if an incompatible cdk is present
   await uninstallPackage('@angular/cdk');
 }
+
+async function publishOutdated(npmSpecifier: string): Promise<void> {
+  const { stdout: stdoutPack } = await silentNpm(
+    'pack',
+    npmSpecifier,
+    '--registry=https://registry.npmjs.org',
+  );
+  await execWithEnv('npm', ['publish', stdoutPack.trim(), '--tag=outdated'], {
+    ...process.env,
+    // Also set an auth token value for the local test registry which is required by npm 7+
+    // even though it is never actually used.
+    'NPM_CONFIG__AUTH': 'e2e-testing',
+  });
+}

tests/legacy-cli/e2e/tests/misc/third-party-decorators.ts

@@ -15,7 +15,9 @@ export default async function () {
     packageJson['devDependencies']['typescript'] = '~4.6.2';
   });
 
-  await installWorkspacePackages();
+  // Force is need to prevent npm 7+ from failing due to potential peer dependency resolution range errors.
+  // This is especially common when testing snapshot builds for new prereleases.
+  await installWorkspacePackages({ force: true });
 
   // Create an app that uses ngrx decorators and has e2e tests.
   await writeMultipleFiles({

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

@@ -1,5 +1,4 @@
 import { getGlobalVariable } from './env';
-import { writeFile } from './fs';
 import { ProcessOutput, npm, silentNpm, silentYarn } from './process';
 
 export function getActivePackageManager(): 'npm' | 'yarn' {
@@ -11,10 +10,14 @@ export function getActivePackageManager(): 'npm' | 'yarn' {
   return value || 'npm';
 }
 
-export async function installWorkspacePackages(): Promise<void> {
+export async function installWorkspacePackages(options?: { force?: boolean }): Promise<void> {
   switch (getActivePackageManager()) {
     case 'npm':
-      await silentNpm('install');
+      const npmArgs = ['install'];
+      if (options?.force) {
+        npmArgs.push('--force');
+      }
+      await silentNpm(...npmArgs);
       break;
     case 'yarn':
       await silentYarn();
@@ -47,6 +50,7 @@ export async function setRegistry(useTestRegistry: boolean): Promise<void> {
     : 'https://registry.npmjs.org';
 
   const isCI = getGlobalVariable('ci');
+  const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
 
   // Ensure local test registry is used when outside a project
   if (isCI) {
@@ -56,4 +60,11 @@ export async function setRegistry(useTestRegistry: boolean): Promise<void> {
     // Yarn supports both `NPM_CONFIG_REGISTRY` and `YARN_REGISTRY`.
     process.env['NPM_CONFIG_REGISTRY'] = url;
   }
+
+  // Snapshot builds may contain versions that are not yet released (e.g., RC phase main branch).
+  // In this case peer dependency ranges may not resolve causing npm 7+ to fail during tests.
+  // To support this case, legacy peer dependency mode is enabled for snapshot builds.
+  if (isSnapshotBuild) {
+    process.env['NPM_CONFIG_legacy_peer_deps'] = 'true';
+  }
 }