test: fix e2e tests

e2e/nx-flutter-e2e/tests/create-nx-flutter.spec.ts

@@ -24,7 +24,7 @@ describe('create-nx-flutter', () => {
   `('should be installed with Nx Wrapper=$useNxWrapper', ({ useNxWrapper }) => {
     projectDirectory = createCLITestProject(
       'create-nx-flutter',
-      `--prjName=flutapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive`
+      `--directory=flutapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive`
     );
 
     // npm ls will fail if the package is not installed properly

e2e/nx-flutter-e2e/tests/nx-flutter.spec.ts

@@ -1,12 +1,16 @@
+import { uniq } from '@nx/plugin/testing';
 import {
-  uniq,
-} from '@nx/plugin/testing';
-import { checkFilesExist, createTestProject, readJson, runNxCommandAsync } from '@nxrocks/common/testing';
+  checkFilesExist,
+  createTestProject,
+  readJson,
+  runNxCommandAsync,
+} from '@nxrocks/common/testing';
 import { execSync } from 'child_process';
 import { rmSync } from 'fs-extra';
 
 //jest.mock('enquirer'); // we mock 'enquirer' to bypass the interactive prompt
 import * as enquirer from 'enquirer';
+import { getPackageManagerCommand } from '@nx/devkit';
 
 describe('nx-flutter e2e', () => {
   let projectDirectory: string;
@@ -16,24 +20,28 @@ describe('nx-flutter e2e', () => {
 
     // The plugin has been built and published to a local registry in the jest globalSetup
     // Install the plugin built with the latest source code into the test repo
-    execSync(`npm install @nxrocks/[email protected]`, {
-      cwd: projectDirectory,
-      stdio: 'inherit',
-      env: process.env,
-    });
+    execSync(
+      `${getPackageManagerCommand().addDev} @nxrocks/[email protected]`,
+      {
+        cwd: projectDirectory,
+        stdio: 'inherit',
+        env: process.env,
+      }
+    );
   });
 
   afterAll(() => {
     // Cleanup the test project
-    projectDirectory && rmSync(projectDirectory, {
-      recursive: true,
-      force: true,
-    });
+    projectDirectory &&
+      rmSync(projectDirectory, {
+        recursive: true,
+        force: true,
+      });
   });
 
   it('should be installed', () => {
     // npm ls will fail if the package is not installed properly
-    execSync('npm ls @nxrocks/nx-flutter', {
+    execSync(`${getPackageManagerCommand().list} @nxrocks/nx-flutter`, {
       cwd: projectDirectory,
       stdio: 'inherit',
     });
@@ -154,7 +162,7 @@ describe('nx-flutter e2e', () => {
       const appName = uniq('nx-flutter');
 
       await runNxCommandAsync(
-        `generate @nxrocks/nx-flutter:create ${appName} --directory subdir --no-interactive`
+        `generate @nxrocks/nx-flutter:new --directory subdir/${appName}  --no-interactive`
       );
       expect(() =>
         checkFilesExist(`subdir/${appName}/pubspec.yaml`)

e2e/nx-ktor-e2e/tests/create-nx-ktor.spec.ts

@@ -24,7 +24,7 @@ describe('create-nx-ktor', () => {
   `('should be installed with Nx Wrapper=$useNxWrapper', ({ useNxWrapper }) => {
     projectDirectory = createCLITestProject(
       'create-nx-ktor',
-      `--prjName=bootapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive --verbose=true`
+      `--directory=ktapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive --verbose=true`
     );
 
     // npm ls will fail if the package is not installed properly

e2e/nx-ktor-e2e/tests/nx-ktor.spec.ts

@@ -21,7 +21,7 @@ describe('nx-ktor e2e', () => {
     // The plugin has been built and published to a local registry in the jest globalSetup
     // Install the plugin built with the latest source code into the test repo
     execSync(
-      `${getPackageManagerCommand().install} @nxrocks/[email protected]`,
+      `${getPackageManagerCommand().addDev} @nxrocks/[email protected]`,
       {
         cwd: projectDirectory,
         stdio: 'inherit',
@@ -78,7 +78,7 @@ describe('nx-ktor e2e', () => {
     it('should create src in the specified directory', async () => {
       const prjName = uniq('nx-ktor');
       await runNxCommandAsync(
-        `generate @nxrocks/nx-ktor:new ${prjName} --directory subdir --no-interactive`
+        `generate @nxrocks/nx-ktor:new --directory subdir/${prjName} --no-interactive`
       );
       expect(() =>
         checkFilesExist(

e2e/nx-melos-e2e/tests/nx-melos.spec.ts

@@ -16,7 +16,7 @@ describe('nx-melos e2e', () => {
     // The plugin has been built and published to a local registry in the jest globalSetup
     // Install the plugin built with the latest source code into the test repo
     execSync(
-      `${getPackageManagerCommand().install} @nxrocks/[email protected]`,
+      `${getPackageManagerCommand().addDev} @nxrocks/[email protected]`,
       {
         cwd: projectDirectory,
         stdio: 'inherit',

e2e/nx-micronaut-e2e/tests/create-nx-micronaut.spec.ts

@@ -24,7 +24,7 @@ describe('create-nx-micronaut', () => {
   `('should be installed with Nx Wrapper=$useNxWrapper', ({ useNxWrapper }) => {
     projectDirectory = createCLITestProject(
       'create-nx-micronaut',
-      `--prjName=bootapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive`
+      `--directory=mnapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive`
     );
 
     // npm ls will fail if the package is not installed properly

e2e/nx-micronaut-e2e/tests/nx-micronaut.spec.ts

@@ -22,7 +22,7 @@ describe('nx-micronaut e2e', () => {
     // The plugin has been built and published to a local registry in the jest globalSetup
     // Install the plugin built with the latest source code into the test repo
     execSync(
-      `${getPackageManagerCommand().install} @nxrocks/[email protected]`,
+      `${getPackageManagerCommand().addDev} @nxrocks/[email protected]`,
       {
         cwd: projectDirectory,
         stdio: 'inherit',
@@ -206,7 +206,7 @@ describe('nx-micronaut e2e', () => {
     it('should create src in the specified directory', async () => {
       const prjName = uniq('nx-micronaut');
       await runNxCommandAsync(
-        `generate @nxrocks/nx-micronaut:new ${prjName} --directory subdir --no-interactive`
+        `generate @nxrocks/nx-micronaut:new --directory subdir/${prjName} --no-interactive`
       );
       expect(() =>
         checkFilesExist(

e2e/nx-quarkus-e2e/tests/create-nx-quarkus.spec.ts

@@ -24,7 +24,7 @@ describe('create-nx-quarkus', () => {
   `('should be installed with Nx Wrapper=$useNxWrapper', ({ useNxWrapper }) => {
     projectDirectory = createCLITestProject(
       'create-nx-quarkus',
-      `--prjName=bootapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive`
+      `--directory=qkapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive`
     );
 
     // npm ls will fail if the package is not installed properly

e2e/nx-quarkus-e2e/tests/nx-quarkus.spec.ts

@@ -23,7 +23,7 @@ describe('nx-quarkus e2e', () => {
     // The plugin has been built and published to a local registry in the jest globalSetup
     // Install the plugin built with the latest source code into the test repo
     execSync(
-      `${getPackageManagerCommand().add} @nxrocks/[email protected]`,
+      `${getPackageManagerCommand().addDev} @nxrocks/[email protected]`,
       {
         cwd: projectDirectory,
         stdio: 'inherit',
@@ -222,7 +222,7 @@ describe('nx-quarkus e2e', () => {
         const prjName = uniq('nx-quarkus');
 
         await runNxCommandAsync(
-          `generate @nxrocks/nx-quarkus:new ${prjName} --projectType ${projectType} --directory subdir --no-interactive`
+          `generate @nxrocks/nx-quarkus:new --directory subdir/${prjName} --projectType ${projectType} --no-interactive`
         );
         expect(() =>
           checkFilesExist(

e2e/nx-spring-boot-e2e/tests/create-nx-spring-boot.spec.ts

@@ -17,14 +17,11 @@ describe('create-nx-spring-boot', () => {
       });
   });
 
-  it.each`
-    useNxWrapper
-    ${true}
-    ${false}
-  `('should be installed with Nx Wrapper=$useNxWrapper', ({ useNxWrapper }) => {
+  it('should be installed with Nx Wrapper=$useNxWrapper', () => {
+    const useNxWrapper = false;
     projectDirectory = createCLITestProject(
       'create-nx-spring-boot',
-      `--prjName=bootapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive`
+      `--directory=bootapp --useNxWrapper=${useNxWrapper} --nxCloud=skip --useGitHub=false --no-interactive`
     );
 
     // npm ls will fail if the package is not installed properly

e2e/nx-spring-boot-e2e/tests/nx-spring-boot.spec.ts

@@ -23,7 +23,7 @@ describe('nx-spring-boot e2e', () => {
     // The plugin has been built and published to a local registry in the jest globalSetup
     // Install the plugin built with the latest source code into the test repo
     execSync(
-      `${getPackageManagerCommand().install} @nxrocks/[email protected]`,
+      `${getPackageManagerCommand().addDev} @nxrocks/[email protected]`,
       {
         cwd: projectDirectory,
         stdio: 'inherit',
@@ -291,7 +291,7 @@ describe('nx-spring-boot e2e', () => {
         const prjName = uniq('nx-spring-boot');
 
         await runNxCommandAsync(
-          `generate @nxrocks/nx-spring-boot:new ${prjName} --projectType ${projectType} --directory subdir  --no-interactive`
+          `generate @nxrocks/nx-spring-boot:new  --directory subdir/${prjName} --projectType ${projectType}  --no-interactive`
         );
         expect(() =>
           checkFilesExist(

packages/common-cli/src/lib/main.ts

@@ -17,10 +17,8 @@ import {
   createWorkspaceWithNxWrapper,
   getNxCommand,
 } from './utils';
-
-// change type to ('yes' | 'github' | 'gitlab' | 'azure' | 'bitbucket-pipelines' | 'circleci' | 'skip');
-// and uncomment below prompt options, once https://github.com/nrwl/nx/pull/29008 is merged
-export type NxCloud = 'yes' | 'github' | 'circleci' | 'skip';
+import { NxCloud } from 'create-nx-workspace/src/utils/nx/nx-cloud';
+import { detectPackageManager } from '@nx/devkit';
 
 export async function mainCLI(pkgName: string, stackName: string) {
   const pkgFolderName = pkgName.replace('@nxrocks/', '');
@@ -60,12 +58,25 @@ export async function mainCLI(pkgName: string, stackName: string) {
               type: 'boolean',
               default: process.env['NX_VERBOSE_LOGGING'] === 'true',
             })
+            .option('presetVersion', {
+              describe: 'Enable more logging information',
+              type: 'string',
+              default: 'latest',
+            })
       )
       .help('help', 'Show help') as yargs.Argv<CLIArguments>
   ).parseSync();
 
-  let { name, useNxWrapper, nxCloud, useGitHub } = options;
-  const { _, $0, name: ignoredName, verbose, ...restArgs } = options;
+  /*eslint prefer-const: ["error", {"destructuring": "all"}]*/
+  let {
+    name,
+    useNxWrapper,
+    nxCloud,
+    useGitHub,
+    presetVersion,
+    verbose,
+    ...restArgs
+  } = options;
 
   name ||= (await text({
     message: 'Where would you like to create your workspace?',
@@ -106,7 +117,7 @@ export async function mainCLI(pkgName: string, stackName: string) {
       initialValue: false,
     })) as boolean);
 
-  const presetVersion = 'latest';
+  presetVersion ??= 'latest';
 
   let directory: string;
 
@@ -155,7 +166,7 @@ export async function mainCLI(pkgName: string, stackName: string) {
         name,
         nxCloud,
         useGitHub,
-        packageManager: 'npm',
+        packageManager: detectPackageManager(process.cwd()),
       })
     )?.directory;
   }

packages/common-cli/src/lib/models.ts

@@ -1,13 +1,9 @@
 import { CreateWorkspaceOptions } from 'create-nx-workspace';
 
-
 export interface CLIArguments extends CreateWorkspaceOptions {
-    name: string;
-    useNxWrapper?: boolean;
-    nxCloud: 'yes' | 'github' | 'circleci' | 'skip';
-    interactive: boolean;
-    verbose: boolean;
-    $0?: string;
-    _?: string[]
-  }
-
+  useNxWrapper?: boolean;
+  verbose?: boolean;
+  presetVersion?: string;
+  $0?: string;
+  _?: string[];
+}

packages/common/testing/e2e/index.ts

@@ -86,7 +86,7 @@ export function createCLITestProject(
   execSync(
     `${
       getPackageManagerCommand(pkgManager).dlx
-    }${confirm} ${createPkgName}@${createPkgVersion} ${projectName} ${extraArgs}`,
+    }${confirm} ${createPkgName}@${createPkgVersion} ${projectName} ${extraArgs} --presetVersion=${createPkgVersion}`,
     {
       cwd: dirname(projectDirectory),
       stdio: 'inherit',

packages/nx-flutter/src/generators/preset/generator.spec.ts

@@ -15,7 +15,7 @@ describe('preset generator', () => {
   let tree: Tree;
   const options: PresetGeneratorSchema = {
     directory: 'testapp',
-    prjName: 'testapp',
+    name: 'testapp',
     template: 'app',
   };
 

packages/nx-flutter/src/generators/preset/generator.ts

@@ -1,18 +1,14 @@
-import {
-  Tree,
-} from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { PresetGeneratorSchema } from './schema';
 import projectGenerator from '../project/generator';
 
 export async function presetGenerator(
   tree: Tree,
   options: PresetGeneratorSchema
 ) {
-  const { prjName } = options;
-
   await projectGenerator(tree, {
     ...options,
-    name: prjName
+    directory: options.directory ?? options.name,
   });
 }
 

packages/nx-flutter/src/generators/preset/schema.d.ts

@@ -1,6 +1,3 @@
 import { ProjectGeneratorOptions } from '../project/schema';
 
-export interface PresetGeneratorSchema
-  extends Omit<ProjectGeneratorOptions, 'name'> {
-  prjName?: string; // we cannot use "projectName" nor "name" because they have special meanings in Nx
-}
+export type PresetGeneratorSchema = ProjectGeneratorOptions;

packages/nx-flutter/src/generators/preset/schema.json

@@ -6,23 +6,24 @@
   "cli": "nx",
   "outputCapture": "pipe",
   "properties": {
-    "prjName": {
-      "type": "string",
-      "description": "Name of the project to generate.",
-      "x-prompt": "What is the name of your project?",
-      "pattern": "^[a-zA-Z][^:]*$",
-      "x-priority": "important"
-    },
     "directory": {
       "type": "string",
       "description": "The directory of the new project.",
-      "alias": "d",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
       "x-prompt": "Which directory do you want to create the project in?"
     },
+    "name": {
+      "type": "string",
+      "description": "Name of the project to generate.",
+      "alias": "projectName",
+      "x-prompt": "What name would you like to use?",
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
+    },
     "org": {
       "description": "name of the ",
       "type": "string",
@@ -105,11 +106,6 @@
       "type": "string",
       "description": "Add tags to the project (used for linting)."
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "pub": {
       "type": "boolean",
       "description": "Whether or not to run 'flutter pub get' after the project has been created."
@@ -123,5 +119,5 @@
       "description": "Whether or not to overwrite existing files when performing operations."
     }
   },
-  "required": ["prjName", "directory"]
+  "required": ["directory"]
 }