@nx/plugin 17.0.0-beta.6 → 17.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "17.0.0-beta.6",
+  "version": "17.0.0-beta.8",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -31,11 +31,11 @@
     "@phenomnomnominal/tsquery": "~5.0.1",
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.0-beta.6",
-    "@nx/jest": "17.0.0-beta.6",
-    "@nx/js": "17.0.0-beta.6",
-    "@nx/linter": "17.0.0-beta.6",
-    "@nrwl/nx-plugin": "17.0.0-beta.6"
+    "@nx/devkit": "17.0.0-beta.8",
+    "@nx/jest": "17.0.0-beta.8",
+    "@nx/js": "17.0.0-beta.8",
+    "@nx/eslint": "17.0.0-beta.8",
+    "@nrwl/nx-plugin": "17.0.0-beta.8"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/create-package/create-package.js

@@ -44,9 +44,10 @@ async function addPresetGenerator(host, schema) {
     if (!(0, has_generator_1.hasGenerator)(host, schema.project, 'preset')) {
         await (0, generator_1.default)(host, {
             name: 'preset',
-            project: schema.project,
+            directory: (0, path_1.join)(projectRoot, 'src/generators/preset'),
             unitTestRunner: schema.unitTestRunner,
             skipFormat: true,
+            nameAndDirectoryFormat: 'as-provided',
         });
     }
     return (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))?.name;

package/src/generators/create-package/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-directory-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 
 export interface CreatePackageSchema {
   name: string;

package/src/generators/e2e-project/e2e.js

@@ -7,7 +7,7 @@ const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
 const generator_1 = require("@nx/js/src/generators/setup-verdaccio/generator");
 const add_local_registry_scripts_1 = require("@nx/js/src/utils/add-local-registry-scripts");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
 async function normalizeOptions(host, options) {
     const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
@@ -38,7 +38,7 @@ async function normalizeOptions(host, options) {
     return {
         ...options,
         projectName,
-        linter: options.linter ?? linter_1.Linter.EsLint,
+        linter: options.linter ?? eslint_1.Linter.EsLint,
         pluginPropertyName,
         projectRoot,
     };
@@ -97,7 +97,7 @@ async function addJest(host, options) {
     return jestTask;
 }
 async function addLintingToApplication(tree, options) {
-    const lintTask = await (0, linter_1.lintProjectGenerator)(tree, {
+    const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
         linter: options.linter,
         project: options.projectName,
         tsConfigPaths: [
@@ -126,7 +126,7 @@ async function e2eProjectGeneratorInternal(host, schema) {
         skipFormat: true,
     }));
     tasks.push(await addJest(host, options));
-    if (options.linter !== linter_1.Linter.None) {
+    if (options.linter !== eslint_1.Linter.None) {
         tasks.push(await addLintingToApplication(host, {
             ...options,
         }));

package/src/generators/e2e-project/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-directory-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 
 export interface Schema {
   pluginName: string;

package/src/generators/executor/executor.js

@@ -5,7 +5,6 @@ const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const generator_1 = require("../lint-checks/generator");
 const versions_1 = require("../../utils/versions");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const path_1 = require("path");
 function addFiles(host, options) {
@@ -63,20 +62,19 @@ async function updateExecutorJson(host, options) {
         let executors = json.executors ?? json.builders;
         executors ||= {};
         executors[options.name] = {
-            implementation: `./${(0, devkit_1.normalizePath)((0, path_1.relative)(options.projectRoot, (0, path_1.join)(options.directory, 'executor')))}`,
-            schema: `./${(0, devkit_1.normalizePath)((0, path_1.relative)(options.projectRoot, (0, path_1.join)(options.directory, 'schema.json')))}`,
+            implementation: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'executor')}`,
+            schema: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'schema.json')}`,
             description: options.description,
         };
         if (options.includeHasher) {
-            executors[options.name].hasher = `./${(0, devkit_1.normalizePath)((0, path_1.relative)(options.projectRoot, (0, path_1.join)(options.directory, 'hasher')))}`;
+            executors[options.name].hasher = `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'hasher')}`;
         }
         json.executors = executors;
         return json;
     });
 }
 async function normalizeOptions(tree, options) {
-    const npmScope = (0, get_npm_scope_1.getNpmScope)(tree);
-    const res = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { project, artifactName, filePath, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         artifactType: 'executor',
         callingGenerator: '@nx/plugin:executor',
         name: options.name,
@@ -86,7 +84,6 @@ async function normalizeOptions(tree, options) {
         fileName: 'executor',
         derivedDirectory: 'executors',
     });
-    const { project, fileName, artifactName, filePath, directory } = res;
     const { className, propertyName } = (0, devkit_1.names)(artifactName);
     const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
     let description;
@@ -101,12 +98,10 @@ async function normalizeOptions(tree, options) {
         filePath,
         project,
         directory,
-        fileName,
         className,
         propertyName,
         description,
         projectRoot,
-        npmScope,
     };
 }
 async function executorGenerator(tree, rawOptions) {

package/src/generators/executor/schema.d.ts

@@ -1,7 +1,6 @@
 import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  project?: string;
   name: string;
   directory?: string;
   description?: string;
@@ -10,4 +9,9 @@ export interface Schema {
   nameAndDirectoryFormat?: NameAndDirectoryFormat;
   skipLintChecks?: boolean;
   skipFormat?: boolean;
+
+  /**
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
+   */
+  project?: string;
 }

package/src/generators/executor/schema.json

@@ -13,14 +13,6 @@
     }
   ],
   "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      }
-    },
     "name": {
       "type": "string",
       "description": "Executor name.",
@@ -34,11 +26,13 @@
     "directory": {
       "type": "string",
       "description": "The directory at which to create the executor file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir"]
+      "aliases": ["dir"],
+      "x-priority": "important"
     },
     "description": {
       "type": "string",
-      "description": "Executor description."
+      "description": "Executor description.",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
@@ -61,6 +55,15 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "alias": "p",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
+    },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files.",

package/src/generators/generator/generator.d.ts

@@ -1,5 +1,6 @@
 import { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function createGeneratorsJson(host: Tree, projectRoot: string, projectName: string, skipLintChecks?: boolean, skipFormat?: boolean): Promise<void>;
-export declare function generatorGenerator(host: Tree, schema: Schema): Promise<void>;
+export declare function generatorGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
+export declare function generatorGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
 export default generatorGenerator;

package/src/generators/generator/generator.js

@@ -1,15 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatorGenerator = exports.createGeneratorsJson = void 0;
+exports.generatorGeneratorInternal = exports.generatorGenerator = exports.createGeneratorsJson = void 0;
 const devkit_1 = require("@nx/devkit");
-const path = require("path");
 const has_generator_1 = require("../../utils/has-generator");
 const generator_1 = require("../lint-checks/generator");
 const versions_1 = require("../../utils/versions");
-function normalizeOptions(host, options) {
-    const { npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
-    const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(host, options.project);
-    const npmPackageName = (0, devkit_1.readJson)(host, path.join(projectRoot, 'package.json')).name;
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const path_1 = require("path");
+async function normalizeOptions(tree, options) {
+    const { project, fileName, artifactName, filePath, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+        artifactType: 'generator',
+        callingGenerator: '@nx/plugin:generator',
+        name: options.name,
+        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        project: options.project,
+        directory: options.directory,
+        fileName: 'generator',
+        derivedDirectory: 'generators',
+    });
+    const { className, propertyName } = (0, devkit_1.names)(artifactName);
+    const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
     let description;
     if (options.description) {
         description = options.description;
@@ -19,26 +29,28 @@ function normalizeOptions(host, options) {
     }
     return {
         ...options,
-        ...(0, devkit_1.names)(options.name),
+        project,
+        directory,
+        fileName,
+        className,
+        propertyName,
         description,
         projectRoot,
         projectSourceRoot,
-        npmScope,
-        npmPackageName,
     };
 }
 function addFiles(host, options) {
-    const indexPath = `${options.projectSourceRoot}/generators/${options.fileName}/files/src/index.ts.template`;
+    const indexPath = (0, path_1.join)(options.directory, 'files/src/index.ts.template');
     if (!host.exists(indexPath)) {
         host.write(indexPath, 'const variable = "<%= name %>";');
     }
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, {
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files/generator'), options.directory, {
         ...options,
         generatorFnName: `${options.propertyName}Generator`,
         schemaInterfaceName: `${options.className}GeneratorSchema`,
     });
     if (options.unitTestRunner === 'none') {
-        host.delete(path.join(options.projectSourceRoot, 'generators', options.fileName, `generator.spec.ts`));
+        host.delete((0, path_1.join)(options.directory, `generator.spec.ts`));
     }
 }
 async function createGeneratorsJson(host, projectRoot, projectName, skipLintChecks, skipFormat) {
@@ -81,8 +93,8 @@ async function updateGeneratorJson(host, options) {
         let generators = json.generators ?? json.schematics;
         generators = generators || {};
         generators[options.name] = {
-            factory: `./src/generators/${options.fileName}/generator`,
-            schema: `./src/generators/${options.fileName}/schema.json`,
+            factory: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'generator')}`,
+            schema: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'schema.json')}`,
             description: options.description,
         };
         // @todo(v17): Remove this, prop is defunct.
@@ -93,8 +105,15 @@ async function updateGeneratorJson(host, options) {
         return json;
     });
 }
-async function generatorGenerator(host, schema) {
-    const options = normalizeOptions(host, schema);
+async function generatorGenerator(tree, rawOptions) {
+    await generatorGeneratorInternal(tree, {
+        nameAndDirectoryFormat: 'derived',
+        ...rawOptions,
+    });
+}
+exports.generatorGenerator = generatorGenerator;
+async function generatorGeneratorInternal(host, schema) {
+    const options = await normalizeOptions(host, schema);
     if ((0, has_generator_1.hasGenerator)(host, options.project, options.name)) {
         throw new Error(`Generator ${options.name} already exists.`);
     }
@@ -104,5 +123,5 @@ async function generatorGenerator(host, schema) {
         await (0, devkit_1.formatFiles)(host);
     }
 }
-exports.generatorGenerator = generatorGenerator;
+exports.generatorGeneratorInternal = generatorGeneratorInternal;
 exports.default = generatorGenerator;

package/src/generators/generator/schema.d.ts

@@ -1,8 +1,16 @@
+import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+
 export interface Schema {
-  project: string;
+  directory?: string;
   name: string;
   description?: string;
   unitTestRunner: 'jest' | 'none';
   skipLintChecks?: boolean;
   skipFormat?: boolean;
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+
+  /**
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
+   */
+  project?: string;
 }

package/src/generators/generator/schema.json

@@ -12,16 +12,6 @@
     }
   ],
   "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-prompt": "What is the name of the project for the generator?",
-      "x-priority": "important"
-    },
     "name": {
       "type": "string",
       "description": "Generator name.",
@@ -32,10 +22,17 @@
       "x-prompt": "What name would you like to use for the generator?",
       "x-priority": "important"
     },
+    "directory": {
+      "type": "string",
+      "description": "The directory at which to create the generator file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
+      "aliases": ["dir"],
+      "x-priority": "important"
+    },
     "description": {
       "type": "string",
       "description": "Generator description.",
-      "alias": "d"
+      "alias": "d",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
@@ -48,6 +45,15 @@
       "default": false,
       "description": "Do not add an eslint configuration for plugin json files."
     },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "alias": "p",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
+    },
     "skipFormat": {
       "type": "boolean",
       "default": false,
@@ -55,6 +61,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["project", "name"],
+  "required": ["name"],
   "additionalProperties": false
 }

package/src/generators/lint-checks/generator.d.ts

@@ -1,5 +1,5 @@
 import { ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
-import type { Schema as EsLintExecutorOptions } from '@nx/linter/src/executors/eslint/schema';
+import type { Schema as EsLintExecutorOptions } from '@nx/eslint/src/executors/lint/schema';
 import { PluginLintChecksGeneratorSchema } from './schema';
 import { PackageJson } from 'nx/src/utils/package-json';
 export default function pluginLintCheckGenerator(host: Tree, options: PluginLintChecksGeneratorSchema): Promise<void>;

package/src/generators/lint-checks/generator.js

@@ -4,8 +4,8 @@ exports.getEsLintOptions = exports.addMigrationJsonChecks = void 0;
 const devkit_1 = require("@nx/devkit");
 const logger_1 = require("nx/src/utils/logger");
 const package_json_1 = require("nx/src/utils/package-json");
-const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
-const flat_config_1 = require("@nx/linter/src/utils/flat-config");
+const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function pluginLintCheckGenerator(host, options) {
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
@@ -68,7 +68,8 @@ function updateProjectTarget(host, options, packageJson) {
         return;
     }
     for (const [target, configuration] of Object.entries(project.targets)) {
-        if (configuration.executor === '@nx/linter:eslint' ||
+        if (configuration.executor === '@nx/eslint:lint' ||
+            configuration.executor === '@nx/linter:eslint' ||
             configuration.executor === '@nrwl/linter:eslint') {
             const opts = configuration.options ?? {};
             opts.lintFilePatterns ??= [];
@@ -181,6 +182,8 @@ function projectIsEsLintEnabled(project) {
     return !!getEsLintOptions(project);
 }
 function getEsLintOptions(project) {
-    return Object.entries(project.targets || {}).find(([, x]) => x.executor === '@nx/linter:eslint' || x.executor === '@nrwl/linter:eslint');
+    return Object.entries(project.targets || {}).find(([, x]) => x.executor === '@nx/eslint:lint' ||
+        x.executor === '@nx/linter:eslint' ||
+        x.executor === '@nrwl/linter:eslint');
 }
 exports.getEsLintOptions = getEsLintOptions;

package/src/generators/migration/migration.d.ts

@@ -1,4 +1,5 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
-export declare function migrationGenerator(host: Tree, schema: Schema): Promise<void>;
+export declare function migrationGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
+export declare function migrationGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
 export default migrationGenerator;

package/src/generators/migration/migration.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrationGenerator = void 0;
+exports.migrationGeneratorInternal = exports.migrationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const generator_1 = require("../lint-checks/generator");
 const package_json_1 = require("nx/src/utils/package-json");
 const versions_1 = require("../../utils/versions");
-function normalizeOptions(host, options) {
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const path_1 = require("path");
+async function normalizeOptions(tree, options) {
     let name;
     if (options.name) {
         name = (0, devkit_1.names)(options.name).fileName;
@@ -14,11 +16,26 @@ function normalizeOptions(host, options) {
     else {
         name = (0, devkit_1.names)(`update-${options.packageVersion}`).fileName;
     }
-    const description = options.description ?? name;
-    const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(host, options.project);
+    const { project, fileName, artifactName, filePath, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+        artifactType: 'migration',
+        callingGenerator: '@nx/plugin:migration',
+        name: name,
+        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        project: options.project,
+        directory: options.directory,
+        fileName: name,
+        derivedDirectory: 'migrations',
+    });
+    const { className, propertyName } = (0, devkit_1.names)(artifactName);
+    const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    const description = options.description ?? `Migration for v${options.packageVersion}`;
+    // const { root: projectRoot, sourceRoot: projectSourceRoot } =
+    //   readProjectConfiguration(host, options.project);
     const normalized = {
         ...options,
-        name,
+        project,
+        name: artifactName,
+        directory,
         description,
         projectRoot,
         projectSourceRoot,
@@ -26,7 +43,7 @@ function normalizeOptions(host, options) {
     return normalized;
 }
 function addFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/migration'), `${options.projectSourceRoot}/migrations`, { ...options, tmpl: '' });
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/migration'), options.directory, { ...options, tmpl: '' });
 }
 function updateMigrationsJson(host, options) {
     const configuredMigrationPath = (0, package_json_1.readNxMigrateConfig)((0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'))).migrations;
@@ -38,7 +55,7 @@ function updateMigrationsJson(host, options) {
     generators[options.name] = {
         version: options.packageVersion,
         description: options.description,
-        implementation: `./src/migrations/${options.name}/${options.name}`,
+        implementation: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), options.name)}`,
     };
     migrations.generators = generators;
     if (options.packageJsonUpdates) {
@@ -76,7 +93,7 @@ function updatePackageJson(host, options) {
         return json;
     });
 }
-function updateWorkspaceJson(host, options) {
+function updateProjectConfig(host, options) {
     const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
     const assets = project.targets.build?.options?.assets;
     if (assets &&
@@ -92,20 +109,27 @@ function updateWorkspaceJson(host, options) {
         (0, devkit_1.updateProjectConfiguration)(host, options.project, project);
     }
 }
-async function migrationGenerator(host, schema) {
-    const options = normalizeOptions(host, schema);
+async function migrationGenerator(tree, rawOptions) {
+    await migrationGeneratorInternal(tree, {
+        nameAndDirectoryFormat: 'derived',
+        ...rawOptions,
+    });
+}
+exports.migrationGenerator = migrationGenerator;
+async function migrationGeneratorInternal(host, schema) {
+    const options = await normalizeOptions(host, schema);
     addFiles(host, options);
     updateMigrationsJson(host, options);
-    updateWorkspaceJson(host, options);
+    updateProjectConfig(host, options);
     updateMigrationsJson(host, options);
     updatePackageJson(host, options);
     if (!host.exists('migrations.json')) {
         const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
-        (0, generator_1.addMigrationJsonChecks)(host, { projectName: schema.project }, (0, devkit_1.readJson)(host, packageJsonPath));
+        (0, generator_1.addMigrationJsonChecks)(host, { projectName: options.project }, (0, devkit_1.readJson)(host, packageJsonPath));
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
 }
-exports.migrationGenerator = migrationGenerator;
+exports.migrationGeneratorInternal = migrationGeneratorInternal;
 exports.default = migrationGenerator;

package/src/generators/migration/schema.d.ts

@@ -1,8 +1,16 @@
+import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+
 export interface Schema {
-  project: string;
   name?: string;
+  directory?: string;
   description?: string;
   packageVersion: string;
   packageJsonUpdates?: boolean;
   skipFormat?: boolean;
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+
+  /**
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
+   */
+  project?: string;
 }

package/src/generators/migration/schema.json

@@ -12,16 +12,6 @@
     }
   ],
   "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-prompt": "What is the name of the project for the migration?",
-      "x-priority": "important"
-    },
     "name": {
       "type": "string",
       "description": "Migration name.",
@@ -31,6 +21,11 @@
       },
       "x-priority": "important"
     },
+    "directory": {
+      "type": "string",
+      "description": "The directory at which to create the migration file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
+      "aliases": ["dir"]
+    },
     "description": {
       "type": "string",
       "description": "Migration description."
@@ -42,6 +37,15 @@
       "x-prompt": "What version would you like to use for the migration?",
       "x-priority": "important"
     },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "alias": "p",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
+    },
     "packageJsonUpdates": {
       "type": "boolean",
       "description": "Whether or not to include `package.json` updates.",
@@ -54,6 +58,6 @@
       "description": "Do not eslint configuration for plugin json files."
     }
   },
-  "required": ["project", "packageVersion"],
+  "required": ["packageVersion"],
   "additionalProperties": false
 }

package/src/generators/plugin/plugin.js

@@ -4,7 +4,7 @@ exports.pluginGeneratorInternal = exports.pluginGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const path = require("path");
 const e2e_1 = require("../e2e-project/e2e");
 const generator_1 = require("../lint-checks/generator");
@@ -95,7 +95,7 @@ async function pluginGeneratorInternal(host, schema) {
             projectNameAndRootFormat: options.projectNameAndRootFormat,
         }));
     }
-    if (options.linter === linter_1.Linter.EsLint && !options.skipLintChecks) {
+    if (options.linter === eslint_1.Linter.EsLint && !options.skipLintChecks) {
         await (0, generator_1.default)(host, { projectName: options.name });
     }
     if (!options.skipFormat) {

package/src/generators/plugin/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-directory-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 
 export interface Schema {
   name: string;

package/src/generators/preset/generator.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const plugin_1 = require("../plugin/plugin");
 const create_package_1 = require("../create-package/create-package");
 async function default_1(tree, options) {
@@ -15,7 +15,7 @@ async function default_1(tree, options) {
             : options.createPackageName;
     const pluginTask = await (0, plugin_1.pluginGenerator)(tree, {
         compiler: 'tsc',
-        linter: linter_1.Linter.EsLint,
+        linter: eslint_1.Linter.EsLint,
         name: pluginProjectName,
         skipFormat: true,
         unitTestRunner: 'jest',
@@ -40,7 +40,7 @@ async function default_1(tree, options) {
             project: options.pluginName,
             skipFormat: true,
             unitTestRunner: 'jest',
-            linter: linter_1.Linter.EsLint,
+            linter: eslint_1.Linter.EsLint,
             compiler: 'tsc',
         });
         tasks.push(cliTask);