@nx/plugin 19.8.0 → 20.0.0-beta.0

package/generators.json

@@ -4,12 +4,12 @@
   "extends": ["@nx/workspace"],
   "generators": {
     "plugin": {
-      "factory": "./src/generators/plugin/plugin#pluginGeneratorInternal",
+      "factory": "./src/generators/plugin/plugin",
       "schema": "./src/generators/plugin/schema.json",
       "description": "Create a Nx Plugin."
     },
     "create-package": {
-      "factory": "./src/generators/create-package/create-package#createPackageGeneratorInternal",
+      "factory": "./src/generators/create-package/create-package",
       "schema": "./src/generators/create-package/schema.json",
       "description": "Create a package which can be used by npx to create a new workspace"
     },
@@ -19,17 +19,17 @@
       "description": "Create a E2E application for a Nx Plugin."
     },
     "migration": {
-      "factory": "./src/generators/migration/migration#migrationGeneratorInternal",
+      "factory": "./src/generators/migration/migration",
       "schema": "./src/generators/migration/schema.json",
       "description": "Create a migration for an Nx Plugin."
     },
     "generator": {
-      "factory": "./src/generators/generator/generator#generatorGeneratorInternal",
+      "factory": "./src/generators/generator/generator",
       "schema": "./src/generators/generator/schema.json",
       "description": "Create a generator for an Nx Plugin."
     },
     "executor": {
-      "factory": "./src/generators/executor/executor#executorGeneratorInternal",
+      "factory": "./src/generators/executor/executor",
       "schema": "./src/generators/executor/schema.json",
       "description": "Create an executor for an Nx Plugin."
     },

package/package.json

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

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

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { CreatePackageSchema } from './schema';
 export declare function createPackageGenerator(host: Tree, schema: CreatePackageSchema): Promise<GeneratorCallback>;
-export declare function createPackageGeneratorInternal(host: Tree, schema: CreatePackageSchema): Promise<GeneratorCallback>;
 export default createPackageGenerator;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackageGenerator = createPackageGenerator;
-exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
 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");
@@ -12,12 +11,6 @@ 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) {
-    return await createPackageGeneratorInternal(host, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function createPackageGeneratorInternal(host, schema) {
     const tasks = [];
     const options = await (0, normalize_schema_1.normalizeSchema)(host, schema);
     const pluginPackageName = await addPresetGenerator(host, options);

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

@@ -8,7 +8,6 @@ async function normalizeSchema(host, schema) {
         projectType: 'library',
         directory: schema.directory,
         projectNameAndRootFormat: schema.projectNameAndRootFormat,
-        callingGenerator: '@nx/plugin:create-package',
     });
     schema.projectNameAndRootFormat = projectNameAndRootFormat;
     return {

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

@@ -25,7 +25,6 @@ async function normalizeOptions(host, options) {
                 ? projectName
                 : `${options.projectDirectory}-e2e`,
             projectNameAndRootFormat: `as-provided`,
-            callingGenerator: '@nx/plugin:e2e-project',
         });
         projectRoot = projectNameAndRootOptions.projectRoot;
     }
@@ -117,7 +116,6 @@ async function addLintingToApplication(tree, options) {
 async function e2eProjectGenerator(host, schema) {
     return await e2eProjectGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }

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

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

package/src/generators/executor/executor.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createExecutorsJson = createExecutorsJson;
 exports.executorGenerator = executorGenerator;
-exports.executorGeneratorInternal = executorGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const generator_1 = require("../lint-checks/generator");
@@ -76,14 +75,10 @@ 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, {
-        artifactType: 'executor',
-        callingGenerator: '@nx/plugin:executor',
         name: options.name,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         directory: options.directory,
         fileName: 'executor',
-        derivedDirectory: 'executors',
     });
     const { className, propertyName } = (0, devkit_1.names)(artifactName);
     const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
@@ -105,13 +100,7 @@ async function normalizeOptions(tree, options) {
         projectRoot,
     };
 }
-async function executorGenerator(tree, rawOptions) {
-    await executorGeneratorInternal(tree, {
-        nameAndDirectoryFormat: 'derived',
-        ...rawOptions,
-    });
-}
-async function executorGeneratorInternal(host, schema) {
+async function executorGenerator(host, schema) {
     const options = await normalizeOptions(host, schema);
     addFiles(host, options);
     if (options.includeHasher) {

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

@@ -9,9 +9,4 @@ 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 v20.
-   */
-  project?: string;
 }

package/src/generators/executor/schema.json

@@ -55,15 +55,6 @@
       "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 v20."
-    },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files.",

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

@@ -1,6 +1,5 @@
 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(tree: Tree, rawOptions: Schema): Promise<void>;
-export declare function generatorGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
+export declare function generatorGenerator(host: Tree, schema: Schema): Promise<void>;
 export default generatorGenerator;

package/src/generators/generator/generator.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGeneratorsJson = createGeneratorsJson;
 exports.generatorGenerator = generatorGenerator;
-exports.generatorGeneratorInternal = generatorGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const has_generator_1 = require("../../utils/has-generator");
 const generator_1 = require("../lint-checks/generator");
@@ -11,14 +10,10 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 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);
@@ -106,13 +101,7 @@ async function updateGeneratorJson(host, options) {
         return json;
     });
 }
-async function generatorGenerator(tree, rawOptions) {
-    await generatorGeneratorInternal(tree, {
-        nameAndDirectoryFormat: 'derived',
-        ...rawOptions,
-    });
-}
-async function generatorGeneratorInternal(host, schema) {
+async function generatorGenerator(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.`);

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

@@ -8,9 +8,4 @@ export interface Schema {
   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 v20.
-   */
-  project?: string;
 }

package/src/generators/generator/schema.json

@@ -44,15 +44,6 @@
       "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 v20."
-    },
     "skipFormat": {
       "type": "boolean",
       "default": false,

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

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

package/src/generators/migration/migration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrationGenerator = migrationGenerator;
-exports.migrationGeneratorInternal = migrationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const path_1 = require("path");
@@ -18,16 +17,11 @@ async function normalizeOptions(tree, options) {
         name = (0, devkit_1.names)(`update-${options.packageVersion}`).fileName;
     }
     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 } =
@@ -110,13 +104,7 @@ function updateProjectConfig(host, options) {
         (0, devkit_1.updateProjectConfiguration)(host, options.project, project);
     }
 }
-async function migrationGenerator(tree, rawOptions) {
-    await migrationGeneratorInternal(tree, {
-        nameAndDirectoryFormat: 'derived',
-        ...rawOptions,
-    });
-}
-async function migrationGeneratorInternal(host, schema) {
+async function migrationGenerator(host, schema) {
     const options = await normalizeOptions(host, schema);
     addFiles(host, options);
     updateMigrationsJson(host, options);

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

@@ -8,9 +8,4 @@ export interface Schema {
   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 v20.
-   */
-  project?: string;
 }

package/src/generators/migration/schema.json

@@ -37,15 +37,6 @@
       "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 v20."
-    },
     "packageJsonUpdates": {
       "type": "boolean",
       "description": "Whether or not to include `package.json` updates.",

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

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

package/src/generators/plugin/plugin.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginGenerator = pluginGenerator;
-exports.pluginGeneratorInternal = pluginGeneratorInternal;
 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");
@@ -52,12 +51,6 @@ function updatePluginConfig(host, options) {
     }
 }
 async function pluginGenerator(host, schema) {
-    return await pluginGeneratorInternal(host, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function pluginGeneratorInternal(host, schema) {
     const options = await (0, normalize_schema_1.normalizeOptions)(host, schema);
     const tasks = [];
     tasks.push(await (0, js_1.libraryGenerator)(host, {

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const devkit_1 = require("@nx/devkit");
 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, {
@@ -11,21 +10,10 @@ async function normalizeOptions(host, options) {
         importPath: options.importPath,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator: '@nx/plugin:plugin',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
     options.rootProject = projectRoot === '.';
-    let projectDirectory = projectRoot;
-    if (options.projectNameAndRootFormat === 'derived') {
-        let { layoutDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-        if (!layoutDirectory) {
-            const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-            layoutDirectory = libsDir;
-        }
-        if (projectRoot.startsWith(`${layoutDirectory}/`)) {
-            projectDirectory = projectRoot.replace(`${layoutDirectory}/`, '');
-        }
-    }
+    const projectDirectory = projectRoot;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];

package/src/generators/preset/generator.js

@@ -25,7 +25,7 @@ async function default_1(tree, options) {
         publishable: true,
         // when creating a CLI package, the plugin will be in the packages folder
         directory: options.createPackageName && options.createPackageName !== 'false'
-            ? 'packages'
+            ? `packages/${pluginProjectName}`
             : undefined,
         rootProject: options.createPackageName ? false : true,
     });
@@ -34,7 +34,7 @@ async function default_1(tree, options) {
     if (options.createPackageName) {
         const e2eProject = `${options.pluginName}-e2e`;
         const cliTask = await (0, create_package_1.default)(tree, {
-            directory: 'packages',
+            directory: `packages/${options.createPackageName}`,
             name: options.createPackageName,
             e2eProject: e2eProject,
             project: options.pluginName,