@nx/plugin 17.0.0-rc.0 → 17.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "17.0.0-rc.0",
+  "version": "17.0.0-rc.2",
   "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-rc.0",
-    "@nx/jest": "17.0.0-rc.0",
-    "@nx/js": "17.0.0-rc.0",
-    "@nx/eslint": "17.0.0-rc.0",
-    "@nrwl/nx-plugin": "17.0.0-rc.0"
+    "@nx/devkit": "17.0.0-rc.2",
+    "@nx/jest": "17.0.0-rc.2",
+    "@nx/js": "17.0.0-rc.2",
+    "@nx/eslint": "17.0.0-rc.2",
+    "@nrwl/nx-plugin": "17.0.0-rc.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/executor/schema.json

@@ -51,7 +51,7 @@
       "description": "Do not add an eslint configuration for plugin json files."
     },
     "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component 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`).",
+      "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"]
     },

package/src/generators/generator/schema.json

@@ -58,6 +58,11 @@
       "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"],

package/src/generators/migration/schema.json

@@ -56,6 +56,11 @@
       "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"],

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

@@ -1,3 +1,3 @@
-import { Tree, GeneratorCallback } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { PresetGeneratorSchema } from './schema';
 export default function (tree: Tree, options: PresetGeneratorSchema): Promise<GeneratorCallback>;

package/src/generators/preset/generator.js

@@ -29,7 +29,6 @@ async function default_1(tree, options) {
         rootProject: options.createPackageName ? false : true,
     });
     tasks.push(pluginTask);
-    removeNpmScope(tree);
     moveNxPluginToDevDeps(tree);
     if (options.createPackageName) {
         const e2eProject = `${options.pluginName}-e2e`;
@@ -49,9 +48,6 @@ async function default_1(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.default = default_1;
-function removeNpmScope(tree) {
-    (0, devkit_1.updateNxJson)(tree, { ...(0, devkit_1.readNxJson)(tree), npmScope: undefined });
-}
 function moveNxPluginToDevDeps(tree) {
     (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
         const nxPluginEntry = json.dependencies['@nx/plugin'];