wip: revert part

Author: jbedard

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

@@ -14,8 +14,8 @@ export default async function () {
   process.env.NPM_CONFIG_USERCONFIG = npmrc;
   process.env.NPM_CONFIG_PREFIX = npmModulesPrefix;
 
-  // Ensure the directory + files exists
-  await writeFile(npmrc, '');
+  // Ensure the directory + files exists, configure th registry in the npmrc
+  await writeFile(npmrc, 'registry=' + getGlobalVariable('package-registry'));
   await mkdir(npmModulesPrefix);
 
   // Ensure the custom npm global bin is first on the PATH

tests/legacy-cli/e2e/setup/500-create-project.ts

@@ -1,9 +1,9 @@
 import { join } from 'path';
 import { getGlobalVariable } from '../utils/env';
-import { expectFileToExist } from '../utils/fs';
+import { expectFileToExist, writeFile } from '../utils/fs';
 import { gitClean } from '../utils/git';
-import { setRegistry as setNPMConfigRegistry, setRegistry } from '../utils/packages';
-import { ng } from '../utils/process';
+import { setRegistry as setNPMConfigRegistry } from '../utils/packages';
+import { ng, npm } from '../utils/process';
 import { prepareProjectForE2e, updateJsonFile } from '../utils/project';
 
 export default async function () {
@@ -18,6 +18,8 @@ export default async function () {
     await gitClean();
   } else {
     const extraArgs = [];
+    const testRegistry = getGlobalVariable('package-registry');
+    const isCI = getGlobalVariable('ci');
 
     // Ensure local test registry is used when outside a project
     await setNPMConfigRegistry(true);
@@ -26,7 +28,11 @@ export default async function () {
     await expectFileToExist(join(process.cwd(), 'test-project'));
     process.chdir('./test-project');
 
-    setRegistry(true);
+    // If on CI, the user configuration set above will handle project usage
+    if (!isCI) {
+      // Ensure local test registry is used inside a project
+      await writeFile('.npmrc', `registry=${testRegistry}`);
+    }
 
     // Setup esbuild builder if requested on the commandline
     const useEsbuildBuilder = !!getGlobalVariable('argv')['esbuild'];

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

@@ -1,5 +1,5 @@
 import { getGlobalVariable } from './env';
-import { ProcessOutput, silentNpm, silentYarn } from './process';
+import { ProcessOutput, npm, silentNpm, silentYarn } from './process';
 
 export function getActivePackageManager(): 'npm' | 'yarn' {
   const value = getGlobalVariable('package-manager');
@@ -49,11 +49,17 @@ export async function setRegistry(useTestRegistry: boolean): Promise<void> {
     ? getGlobalVariable('package-registry')
     : 'https://registry.npmjs.org';
 
+  const isCI = getGlobalVariable('ci');
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
 
   // Ensure local test registry is used when outside a project
-  // Yarn supports both `NPM_CONFIG_REGISTRY` and `YARN_REGISTRY`.
-  process.env['NPM_CONFIG_REGISTRY'] = url;
+  if (isCI) {
+    // Safe to set a user configuration on CI
+    await npm('config', 'set', 'registry', url);
+  } else {
+    // 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.