chore(misc): update add-nx ci (#9398)

e2e/add-nx-to-monorepo/src/add-nx-to-monorepo.test.ts

@@ -4,11 +4,18 @@ import {
   runCommand,
   tmpProjPath,
   updateFile,
+  getPackageManagerCommand,
+  getSelectedPackageManager,
 } from '@nrwl/e2e/utils';
 import { Workspaces } from 'nx/src/shared/workspace';
 
-describe.each(['npx', 'pnpx --yes'])('%s add-nx-to-monorepo', (command) => {
+describe('add-nx-to-monorepo', () => {
+  const packageManagerCommand = getPackageManagerCommand({
+    packageManager: getSelectedPackageManager(),
+  }).runUninstalledPackage;
+
   it('should not throw', () => {
+    if (packageManagerCommand) {
       // Arrange
       createNonNxProjectDirectory();
       updateFile(
@@ -25,14 +32,18 @@ describe.each(['npx', 'pnpx --yes'])('%s add-nx-to-monorepo', (command) => {
       );
 
       // Act
-    const output = runCommand(`${command} add-nx-to-monorepo --nx-cloud false`);
+      const output = runCommand(
+        `${packageManagerCommand} add-nx-to-monorepo --nx-cloud false`
+      );
       // Assert
       expect(output).toContain('🎉 Done!');
       expect(readWorkspaceConfig().projects['package-a']).toBeTruthy();
       expect(readWorkspaceConfig().projects['package-b']).toBeTruthy();
+    }
   });
 
   it('should build', () => {
+    if (packageManagerCommand) {
       // Arrange
       createNonNxProjectDirectory();
       updateFile(
@@ -46,10 +57,13 @@ describe.each(['npx', 'pnpx --yes'])('%s add-nx-to-monorepo', (command) => {
       );
 
       // Act
-    runCommand(`${command} add-nx-to-monorepo --nx-cloud false`);
+      runCommand(
+        `${packageManagerCommand} add-nx-to-monorepo --nx-cloud false`
+      );
       const output = runCLI('build package-a');
       // Assert
       expect(output).toContain('build successful');
+    }
   });
 });
 

e2e/utils/index.ts

@@ -731,6 +731,7 @@ export function getPackageManagerCommand({
   createWorkspace: string;
   runNx: string;
   runNxSilent: string;
+  runUninstalledPackage?: string | undefined;
   addDev: string;
   list: string;
 } {
@@ -743,6 +744,7 @@ export function getPackageManagerCommand({
       } create-nx-workspace@${publishedVersion}`,
       runNx: `npx nx`,
       runNxSilent: `npx nx`,
+      runUninstalledPackage: `npx`,
       addDev: `npm install --legacy-peer-deps -D`,
       list: 'npm ls --depth 10',
     },
@@ -751,6 +753,7 @@ export function getPackageManagerCommand({
       createWorkspace: `yarn global add create-nx-workspace@${publishedVersion} && create-nx-workspace`,
       runNx: `yarn nx`,
       runNxSilent: `yarn --silent nx`,
+      runUninstalledPackage: 'npx',
       addDev: `yarn add -D`,
       list: 'npm ls --depth 10',
     },
@@ -759,6 +762,7 @@ export function getPackageManagerCommand({
       createWorkspace: `pnpx --yes create-nx-workspace@${publishedVersion}`,
       runNx: `pnpx nx`,
       runNxSilent: `pnpx nx`,
+      runUninstalledPackage: 'pnpx --yes',
       addDev: `pnpm add -D`,
       list: 'npm ls --depth 10',
     },