@nx/plugin 20.0.0-beta.4 → 20.0.0-beta.6

package/migrations.json

@@ -1,22 +1,3 @@
 {
-  "generators": {
-    "update-remove-cli-prop": {
-      "version": "16.0.0-beta.1",
-      "cli": "nx",
-      "description": "Removes CLI property within schema.json files and moves generators and schematics to the proper root node in migrations.json",
-      "factory": "./src/migrations/update-16-0-0/cli-in-schema-json"
-    },
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/nx-plugin with @nx/plugin",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-16-2-0-replace-e2e-executor": {
-      "cli": "nx",
-      "version": "16.2.0-beta.0",
-      "description": "Replace @nx/plugin:e2e with @nx/jest",
-      "implementation": "./src/migrations/update-16-2-0/replace-e2e-executor"
-    }
-  }
+  "generators": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "20.0.0-beta.4",
+  "version": "20.0.0-beta.6",
   "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": {
@@ -28,11 +28,10 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.0.0-beta.4",
-    "@nx/jest": "20.0.0-beta.4",
-    "@nx/js": "20.0.0-beta.4",
-    "@nx/eslint": "20.0.0-beta.4",
-    "@nrwl/nx-plugin": "20.0.0-beta.4"
+    "@nx/devkit": "20.0.0-beta.6",
+    "@nx/jest": "20.0.0-beta.6",
+    "@nx/js": "20.0.0-beta.6",
+    "@nx/eslint": "20.0.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

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

@@ -4,6 +4,7 @@ exports.createPackageGenerator = createPackageGenerator;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_tslib_dependencies_1 = require("@nx/js/src/utils/typescript/add-tslib-dependencies");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("nx/src/utils/versions");
 const generator_1 = require("../generator/generator");
 const normalize_schema_1 = require("./utils/normalize-schema");
@@ -11,6 +12,7 @@ const has_generator_1 = require("../../utils/has-generator");
 const path_1 = require("path");
 const versions_2 = require("@nx/js/src/utils/versions");
 async function createPackageGenerator(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'plugin', 'create-package');
     const tasks = [];
     const options = await (0, normalize_schema_1.normalizeSchema)(host, schema);
     const pluginPackageName = await addPresetGenerator(host, options);
@@ -41,10 +43,9 @@ async function addPresetGenerator(host, schema) {
     if (!(0, has_generator_1.hasGenerator)(host, schema.project, 'preset')) {
         await (0, generator_1.default)(host, {
             name: 'preset',
-            directory: (0, path_1.join)(projectRoot, 'src/generators/preset'),
+            path: (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;
@@ -52,6 +53,7 @@ async function addPresetGenerator(host, schema) {
 async function createCliPackage(host, options, pluginPackageName) {
     await (0, js_1.libraryGenerator)(host, {
         ...options,
+        directory: options.directory,
         rootProject: false,
         config: 'project',
         publishable: true,

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

@@ -1,13 +1,11 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface CreatePackageSchema {
   name: string;
   project: string;
+  directory: string;
 
   // options to create cli package, passed to js library generator
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   skipFormat: boolean;
   tags?: string;
   unitTestRunner: 'jest' | 'none';

package/src/generators/create-package/schema.json

@@ -7,14 +7,18 @@
   "examplesFile": "../../../docs/generators/create-package-examples.md",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "The package name of cli, e.g. `create-framework-package`. Note this must be a valid NPM name to be published.",
-      "pattern": "create-.+|^@.+/create(?:-.+)?",
+      "description": "A directory where the app is placed.",
       "$default": {
         "$source": "argv",
         "index": 0
-      },
+      }
+    },
+    "name": {
+      "type": "string",
+      "description": "The package name of cli, e.g. `create-framework-package`. Note this must be a valid NPM name to be published.",
+      "pattern": "create-.+|^@.+/create(?:-.+)?",
       "x-priority": "important"
     },
     "project": {
@@ -33,15 +37,6 @@
       "description": "Test runner to use for unit tests.",
       "default": "jest"
     },
-    "directory": {
-      "type": "string",
-      "description": "A directory where the app is placed."
-    },
-    "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"]
-    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
@@ -71,5 +66,5 @@
       "x-prompt": "What is the name of the e2e project? Leave blank to skip e2e tests"
     }
   },
-  "required": ["name", "project"]
+  "required": ["directory", "name", "project"]
 }

package/src/generators/create-package/utils/normalize-schema.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeSchema(host, schema) {
-    const { projectName, names: projectNames, projectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    if (!schema.directory) {
+        throw new Error(`Please provide the --directory option. It should be the directory containing the project '${schema.project}'.`);
+    }
+    const { projectName, names: projectNames, projectRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: schema.name,
         projectType: 'library',
         directory: schema.directory,
-        projectNameAndRootFormat: schema.projectNameAndRootFormat,
     });
-    schema.projectNameAndRootFormat = projectNameAndRootFormat;
     return {
         ...schema,
         bundler: schema.compiler ?? 'tsc',

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

@@ -8,6 +8,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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
 async function normalizeOptions(host, options) {
@@ -17,27 +18,14 @@ async function normalizeOptions(host, options) {
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
     let projectRoot;
-    if (options.projectNameAndRootFormat === 'as-provided') {
-        const projectNameAndRootOptions = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: projectName,
-            projectType: 'application',
-            directory: options.rootProject || !options.projectDirectory
-                ? projectName
-                : `${options.projectDirectory}-e2e`,
-            projectNameAndRootFormat: `as-provided`,
-        });
-        projectRoot = projectNameAndRootOptions.projectRoot;
-    }
-    else {
-        const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.projectDirectory);
-        const { appsDir: defaultAppsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-        const appsDir = layoutDirectory ?? defaultAppsDir;
-        projectRoot = options.rootProject
+    const projectNameAndRootOptions = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: projectName,
+        projectType: 'application',
+        directory: options.rootProject || !options.projectDirectory
             ? projectName
-            : projectDirectory
-                ? (0, devkit_1.joinPathFragments)(appsDir, `${projectDirectory}-e2e`)
-                : (0, devkit_1.joinPathFragments)(appsDir, projectName);
-    }
+            : `${options.projectDirectory}-e2e`,
+    });
+    projectRoot = projectNameAndRootOptions.projectRoot;
     const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
     return {
         ...options,
@@ -120,6 +108,7 @@ async function e2eProjectGenerator(host, schema) {
     });
 }
 async function e2eProjectGeneratorInternal(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'plugin', 'e2e-project');
     const tasks = [];
     validatePlugin(host, schema.pluginName);
     const options = await normalizeOptions(host, schema);

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

@@ -1,11 +1,9 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface Schema {
   pluginName: string;
   npmPackageName: string;
   projectDirectory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   pluginOutputPath?: string;
   jestConfig?: string;
   linter?: Linter | LinterType;

package/src/generators/e2e-project/schema.json

@@ -21,11 +21,6 @@
       "type": "string",
       "description": "the directory where the plugin is placed."
     },
-    "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"]
-    },
     "pluginOutputPath": {
       "type": "string",
       "description": "the output path of the plugin after it builds.",

package/src/generators/executor/executor.js

@@ -9,19 +9,19 @@ const versions_1 = require("../../utils/versions");
 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) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/executor'), options.directory, {
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/executor'), options.path, {
         ...options,
     });
     if (options.unitTestRunner === 'none') {
-        host.delete((0, devkit_1.joinPathFragments)(options.directory, `executor.spec.ts`));
+        host.delete((0, devkit_1.joinPathFragments)(options.path, `executor.spec.ts`));
     }
 }
 function addHasherFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/hasher'), options.directory, {
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/hasher'), options.path, {
         ...options,
     });
     if (options.unitTestRunner === 'none') {
-        host.delete((0, devkit_1.joinPathFragments)(options.directory, 'hasher.spec.ts'));
+        host.delete((0, devkit_1.joinPathFragments)(options.path, 'hasher.spec.ts'));
     }
 }
 async function createExecutorsJson(host, projectRoot, projectName, skipLintChecks) {
@@ -62,12 +62,12 @@ async function updateExecutorJson(host, options) {
         let executors = json.executors ?? json.builders;
         executors ||= {};
         executors[options.name] = {
-            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')}`,
+            implementation: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'executor')}`,
+            schema: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'schema.json')}`,
             description: options.description,
         };
         if (options.includeHasher) {
-            executors[options.name].hasher = `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'hasher')}`;
+            executors[options.name].hasher = `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'hasher')}`;
         }
         json.executors = executors;
         return json;
@@ -76,8 +76,7 @@ async function updateExecutorJson(host, options) {
 async function normalizeOptions(tree, options) {
     const { project, artifactName, filePath, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        directory: options.directory,
+        path: options.path,
         fileName: 'executor',
     });
     const { className, propertyName } = (0, devkit_1.names)(artifactName);

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

@@ -1,12 +1,9 @@
-import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface Schema {
-  name: string;
-  directory?: string;
+  path: string;
+  name?: string;
   description?: string;
   unitTestRunner: 'jest' | 'none';
   includeHasher: boolean;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
   skipLintChecks?: boolean;
   skipFormat?: boolean;
 }

package/src/generators/executor/schema.json

@@ -13,20 +13,20 @@
     }
   ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "Executor name.",
+      "description": "Path at which to generate the executor file.",
+      "x-prompt": "What path would you like to use for the executor?",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the executor?",
       "x-priority": "important"
     },
-    "directory": {
+    "name": {
       "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"],
+      "description": "Executor name.",
+      "x-prompt": "What name would you like to use for the executor?",
       "x-priority": "important"
     },
     "description": {
@@ -50,11 +50,6 @@
       "default": false,
       "description": "Do not add an eslint configuration for plugin json files."
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the executor in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files.",
@@ -62,6 +57,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"],
+  "required": ["path"],
   "additionalProperties": false
 }

package/src/generators/generator/generator.js

@@ -11,8 +11,7 @@ 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, {
         name: options.name,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        directory: options.directory,
+        path: options.path,
         fileName: 'generator',
     });
     const { className, propertyName } = (0, devkit_1.names)(artifactName);
@@ -26,8 +25,8 @@ async function normalizeOptions(tree, options) {
     }
     return {
         ...options,
-        project,
         directory,
+        project,
         fileName,
         className,
         propertyName,
@@ -37,17 +36,17 @@ async function normalizeOptions(tree, options) {
     };
 }
 function addFiles(host, options) {
-    const indexPath = (0, path_1.join)(options.directory, 'files/src/index.ts.template');
+    const indexPath = (0, path_1.join)(options.path, 'files/src/index.ts.template');
     if (!host.exists(indexPath)) {
         host.write(indexPath, 'const variable = "<%= name %>";');
     }
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files/generator'), options.directory, {
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files/generator'), options.path, {
         ...options,
         generatorFnName: `${options.propertyName}Generator`,
         schemaInterfaceName: `${options.className}GeneratorSchema`,
     });
     if (options.unitTestRunner === 'none') {
-        host.delete((0, path_1.join)(options.directory, `generator.spec.ts`));
+        host.delete((0, path_1.join)(options.path, `generator.spec.ts`));
     }
 }
 async function createGeneratorsJson(host, projectRoot, projectName, skipLintChecks, skipFormat) {
@@ -89,8 +88,8 @@ async function updateGeneratorJson(host, options) {
         let generators = json.generators ?? json.schematics;
         generators = generators || {};
         generators[options.name] = {
-            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')}`,
+            factory: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'generator')}`,
+            schema: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'schema.json')}`,
             description: options.description,
         };
         // @todo(v17): Remove this, prop is defunct.

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

@@ -1,11 +1,10 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  directory?: string;
-  name: string;
+  path: string;
+  name?: string;
   description?: string;
   unitTestRunner: 'jest' | 'none';
   skipLintChecks?: boolean;
   skipFormat?: boolean;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/generator/schema.json

@@ -7,25 +7,25 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g generator my-generator --project=my-plugin",
+      "command": "nx g generator libs/my-plugin/src/generators//my-generator",
       "description": "Generate `libs/my-plugin/src/generators/my-generator`"
     }
   ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "Generator name.",
+      "description": "Path where the generator will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the generator?",
+      "x-prompt": "Where should the generator be generated?",
       "x-priority": "important"
     },
-    "directory": {
+    "name": {
       "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"],
+      "description": "Generator name.",
+      "x-prompt": "What name would you like to use for the generator?",
       "x-priority": "important"
     },
     "description": {
@@ -49,13 +49,8 @@
       "default": false,
       "description": "Do not format files with prettier.",
       "x-priority": "internal"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the generator in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
     }
   },
-  "required": ["name"],
+  "required": ["path"],
   "additionalProperties": false
 }

package/src/generators/migration/migration.js

@@ -18,8 +18,7 @@ async function normalizeOptions(tree, options) {
     }
     const { project, fileName, artifactName, filePath, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: name,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        directory: options.directory,
+        path: options.path,
         fileName: name,
     });
     const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
@@ -28,9 +27,9 @@ async function normalizeOptions(tree, options) {
     //   readProjectConfiguration(host, options.project);
     const normalized = {
         ...options,
+        directory,
         project,
         name: artifactName,
-        directory,
         description,
         projectRoot,
         projectSourceRoot,
@@ -38,7 +37,10 @@ async function normalizeOptions(tree, options) {
     return normalized;
 }
 function addFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/migration'), options.directory, { ...options, tmpl: '' });
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/migration'), options.path, {
+        ...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;
@@ -50,7 +52,7 @@ function updateMigrationsJson(host, options) {
     generators[options.name] = {
         version: options.packageVersion,
         description: options.description,
-        implementation: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), options.name)}`,
+        implementation: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), options.name)}`,
     };
     migrations.generators = generators;
     if (options.packageJsonUpdates) {

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

@@ -1,11 +1,10 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
+  path: string;
   name?: string;
-  directory?: string;
   description?: string;
   packageVersion: string;
   packageJsonUpdates?: boolean;
   skipFormat?: boolean;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/migration/schema.json

@@ -7,24 +7,25 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g migration my-migration --project=my-plugin --version=1.0.0",
-      "description": "Adds a new migration to the project `my-plugin`, which will be triggered when migrating to version 1.0.0 or above from a previous version."
+      "command": "nx g migration my-plugin/my-migration --version=1.0.0",
+      "description": "Adds a new migration inside `my-plugin`, which will be triggered when migrating to version 1.0.0 or above from a previous version."
     }
   ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "Migration name.",
+      "description": "Path where the migration will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "x-prompt": "Where should the migration be generated?",
       "x-priority": "important"
     },
-    "directory": {
+    "name": {
       "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": "Migration name.",
+      "x-priority": "important"
     },
     "description": {
       "type": "string",
@@ -47,13 +48,8 @@
       "type": "boolean",
       "default": false,
       "description": "Do not eslint configuration for plugin json files."
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the migration in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
     }
   },
-  "required": ["packageVersion"],
+  "required": ["packageVersion", "path"],
   "additionalProperties": false
 }

package/src/generators/plugin/plugin.js

@@ -4,6 +4,7 @@ exports.pluginGenerator = pluginGenerator;
 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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const eslint_1 = require("@nx/eslint");
 const path = require("path");
 const e2e_1 = require("../e2e-project/e2e");
@@ -51,6 +52,7 @@ function updatePluginConfig(host, options) {
     }
 }
 async function pluginGenerator(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'plugin', 'plugin');
     const options = await (0, normalize_schema_1.normalizeOptions)(host, schema);
     const tasks = [];
     tasks.push(await (0, js_1.libraryGenerator)(host, {
@@ -61,7 +63,6 @@ async function pluginGenerator(host, schema) {
         bundler: options.bundler,
         publishable: options.publishable,
         importPath: options.npmPackageName,
-        projectNameAndRootFormat: 'as-provided',
         skipFormat: true,
     }));
     if (options.bundler === 'tsc') {
@@ -88,7 +89,6 @@ async function pluginGenerator(host, schema) {
             npmPackageName: options.npmPackageName,
             skipFormat: true,
             rootProject: options.rootProject,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
         }));
     }
     if (options.linter === eslint_1.Linter.EsLint && !options.skipLintChecks) {

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

@@ -1,10 +1,8 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
+  name?: string;
   importPath?: string;
   skipTsConfig?: boolean; // default is false
   skipFormat?: boolean; // default is false

package/src/generators/plugin/schema.json

@@ -12,25 +12,19 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Plugin name",
+      "description": "A directory where the plugin is placed.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the plugin?",
-      "x-priority": "important",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
+      "x-prompt": "Which directory do you want to create the plugin in?"
     },
-    "directory": {
-      "type": "string",
-      "description": "A directory where the plugin is placed."
-    },
-    "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`).",
+    "name": {
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "description": "Plugin name",
+      "x-priority": "important"
     },
     "importPath": {
       "type": "string",
@@ -100,5 +94,5 @@
       "default": false
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/plugin/utils/normalize-schema.js

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeOptions(host, options) {
-    const { projectName, projectRoot, importPath: npmPackageName, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName, projectRoot, importPath: npmPackageName, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     options.rootProject = projectRoot === '.';
     const projectDirectory = projectRoot;
     const parsedTags = options.tags

package/src/generators/preset/generator.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../plugin/plugin");
 const create_package_1 = require("../create-package/create-package");
 async function default_1(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'plugin', 'preset');
     const tasks = [];
     const pluginProjectName = (0, devkit_1.names)(options.pluginName.includes('/')
         ? options.pluginName.split('/')[1]
@@ -17,7 +19,6 @@ async function default_1(tree, options) {
     const pluginTask = await (0, plugin_1.pluginGenerator)(tree, {
         compiler: 'tsc',
         linter: eslint_1.Linter.EsLint,
-        name: pluginProjectName,
         skipFormat: true,
         unitTestRunner: 'jest',
         importPath: options.pluginName,
@@ -26,7 +27,7 @@ async function default_1(tree, options) {
         // when creating a CLI package, the plugin will be in the packages folder
         directory: options.createPackageName && options.createPackageName !== 'false'
             ? `packages/${pluginProjectName}`
-            : undefined,
+            : pluginProjectName,
         rootProject: options.createPackageName ? false : true,
     });
     tasks.push(pluginTask);

package/src/migrations/update-16-0-0/cli-in-schema-json.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function updateCliPropsForPlugins(tree: Tree): void;
-export default updateCliPropsForPlugins;

package/src/migrations/update-16-0-0/cli-in-schema-json.js

@@ -1,134 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateCliPropsForPlugins = updateCliPropsForPlugins;
-const devkit_1 = require("@nx/devkit");
-const package_json_1 = require("nx/src/utils/package-json");
-const path_1 = require("path");
-function updateCliPropsForPlugins(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const project of projects.values()) {
-        if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'package.json'))) {
-            const packageJson = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
-            const migrateConfig = (0, package_json_1.readNxMigrateConfig)(packageJson);
-            if (migrateConfig.migrations) {
-                const migrationsPath = (0, devkit_1.joinPathFragments)(project.root, migrateConfig.migrations);
-                if (tree.exists(migrationsPath)) {
-                    updateMigrationsJsonForPlugin(tree, migrationsPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Migrations file specified for ${packageJson.name} does not exist: ${migrationsPath}`,
-                        bodyLines: [
-                            'Please ensure that migrations that use the Angular Devkit are placed inside the `schematics` property, and migrations that use the Nx Devkit are placed inside the `generators` property.',
-                        ],
-                    });
-                }
-            }
-            if (packageJson.generators) {
-                const generatorsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.generators);
-                if (tree.exists(generatorsPath)) {
-                    removeCliFromGeneratorSchemaJsonFiles(tree, generatorsPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Generators file specified for ${packageJson.name} does not exist: ${generatorsPath}`,
-                        bodyLines: [
-                            "The `cli` property inside generator's `schema.json` files is no longer supported.",
-                        ],
-                    });
-                }
-            }
-            if (packageJson.executors) {
-                const executorsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.executors);
-                if (tree.exists(executorsPath)) {
-                    removeCliFromExecutorSchemaJsonFiles(tree, executorsPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Executors file specified for ${packageJson.name} does not exist: ${executorsPath}`,
-                        bodyLines: [
-                            "The `cli` property inside executor's `schema.json` files is no longer supported.",
-                        ],
-                    });
-                }
-            }
-            if (packageJson.builders) {
-                const buildersPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.builders);
-                if (tree.exists(buildersPath)) {
-                    removeCliFromExecutorSchemaJsonFiles(tree, buildersPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Builders file specified for ${packageJson.name} does not exist: ${buildersPath}`,
-                        bodyLines: [
-                            "The `cli` property inside builder's `schema.json` files is no longer supported.",
-                        ],
-                    });
-                }
-            }
-            if (packageJson.schematics) {
-                const schematicsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.schematics);
-                if (tree.exists(schematicsPath)) {
-                    removeCliFromGeneratorSchemaJsonFiles(tree, schematicsPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Schematics file specified for ${packageJson.name} does not exist: ${schematicsPath}`,
-                        bodyLines: [
-                            "The `cli` property inside schematic's `schema.json` files is no longer supported.",
-                        ],
-                    });
-                }
-            }
-        }
-    }
-}
-function removeCliFromExecutorSchemaJsonFiles(tree, collectionPath) {
-    const collection = (0, devkit_1.readJson)(tree, collectionPath);
-    for (const [name, entry] of Object.entries(collection.executors ?? {}).concat(Object.entries(collection.builders ?? {}))) {
-        deleteCliPropFromSchemaFile(collectionPath, entry, tree);
-    }
-}
-function removeCliFromGeneratorSchemaJsonFiles(tree, collectionPath) {
-    const collection = (0, devkit_1.readJson)(tree, collectionPath);
-    for (const [name, entry] of Object.entries(collection.generators ?? {}).concat(Object.entries(collection.schematics ?? {}))) {
-        deleteCliPropFromSchemaFile(collectionPath, entry, tree);
-    }
-}
-function updateMigrationsJsonForPlugin(tree, collectionPath) {
-    (0, devkit_1.updateJson)(tree, collectionPath, (json) => {
-        for (const migration in json.generators ?? {}) {
-            if (!(json.generators[migration].cli === 'nx')) {
-                json.schematics ??= {};
-                json.schematics[migration] = json.generators[migration];
-                delete json.generators[migration];
-            }
-        }
-        for (const migration in json.schematics ?? {}) {
-            if (json.schematics[migration].cli === 'nx') {
-                json.generators ??= {};
-                json.generators[migration] = json.schematics[migration];
-                delete json.schematics[migration];
-            }
-        }
-        return json;
-    });
-}
-exports.default = updateCliPropsForPlugins;
-function deleteCliPropFromSchemaFile(collectionPath, entry, tree) {
-    if (typeof entry === 'string' || !entry.schema) {
-        return;
-    }
-    const schemaPath = (0, devkit_1.joinPathFragments)((0, path_1.dirname)(collectionPath), entry.schema);
-    if (tree.exists(schemaPath)) {
-        (0, devkit_1.updateJson)(tree, schemaPath, (json) => {
-            if (json.cli) {
-                delete json.cli;
-            }
-            return json;
-        });
-    }
-    else {
-        console.warn(`Could not find schema file ${schemaPath}`);
-    }
-}

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/nx-plugin', '@nx/plugin');
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-2-0/replace-e2e-executor.d.ts

@@ -1,7 +0,0 @@
-import { Tree } from '@nx/devkit';
-import { JestExecutorOptions } from '@nx/jest/src/executors/jest/schema';
-export interface NxPluginE2EExecutorOptions extends JestExecutorOptions {
-    target: string;
-    jestConfig: string;
-}
-export default function replaceE2EExecutor(tree: Tree): Promise<void>;

package/src/migrations/update-16-2-0/replace-e2e-executor.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replaceE2EExecutor;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function replaceE2EExecutor(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const executor of ['@nx/plugin:e2e', '@nrwl/nx-plugin:e2e']) {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
-            const projectConfiguration = projects.get(project);
-            const config = {
-                ...options,
-                target: undefined,
-                runInBand: true,
-            };
-            if (configuration) {
-                projectConfiguration.targets[target].configurations[configuration] =
-                    config;
-            }
-            else {
-                projectConfiguration.targets[target].dependsOn = [
-                    ...(projectConfiguration.targets[target].dependsOn ?? []),
-                    options.target,
-                ];
-                projectConfiguration.targets[target].executor = '@nx/jest:jest';
-                projectConfiguration.targets[target].options = config;
-            }
-            (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfiguration);
-        });
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}