@nx/plugin 0.0.0-pr-29156-c171bae → 0.0.0-pr-29314-e664f92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "0.0.0-pr-29156-c171bae",
+  "version": "0.0.0-pr-29314-e664f92",
   "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,10 +28,10 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-29156-c171bae",
-    "@nx/jest": "0.0.0-pr-29156-c171bae",
-    "@nx/js": "0.0.0-pr-29156-c171bae",
-    "@nx/eslint": "0.0.0-pr-29156-c171bae"
+    "@nx/devkit": "0.0.0-pr-29314-e664f92",
+    "@nx/jest": "0.0.0-pr-29314-e664f92",
+    "@nx/js": "0.0.0-pr-29314-e664f92",
+    "@nx/eslint": "0.0.0-pr-29314-e664f92"
   },
   "publishConfig": {
     "access": "public"

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

@@ -140,7 +140,7 @@ function addE2eProject(host, options) {
     (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/e2e'), e2eProjectConfiguration.sourceRoot, {
         pluginName: options.project,
         cliName: options.name,
-        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)('npm'),
+        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)(),
         pluginPackageName,
         tmpl: '',
     });

package/src/generators/create-package/files/e2e/__cliName__.spec.ts__tmpl__

@@ -6,11 +6,13 @@ describe('<%= cliName %>', () => {
   let projectDirectory: string;
 
   afterAll(() => {
-    // Cleanup the test project
-    rmSync(projectDirectory, {
-      recursive: true,
-      force: true,
-    });
+    if (projectDirectory) {
+      // Cleanup the test project
+      rmSync(projectDirectory, {
+        recursive: true,
+        force: true,
+      });
+    }
   });
 
 
@@ -43,7 +45,7 @@ function createTestProject(extraArgs = '') {
   });
 
   execSync(
-    `<%= packageManagerCommands.exec %> --yes <%= cliName %>@e2e ${projectName} ${extraArgs}`,
+    `<%= packageManagerCommands.dlx %> <%= cliName %>@e2e ${projectName} ${extraArgs}`,
     {
       cwd: dirname(projectDirectory),
       stdio: 'inherit',

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

@@ -57,7 +57,7 @@ function addFiles(host, options) {
         ...options,
         tmpl: '',
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
-        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)('npm'),
+        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)(),
         pluginPackageName,
     });
 }

package/src/generators/e2e-project/files/src/__pluginName__.spec.ts__tmpl__

@@ -10,7 +10,7 @@ describe('<%= pluginName %>', () => {
 
     // The plugin has been built and published to a local registry in the jest globalSetup
     // Install the plugin built with the latest source code into the test repo
-    execSync(`<%= packageManagerCommands.install %> <%= pluginPackageName %>@e2e`, {
+    execSync(`<%= packageManagerCommands.addDev %> <%= pluginPackageName %>@e2e`, {
       cwd: projectDirectory,
       stdio: 'inherit',
       env: process.env,
@@ -18,11 +18,13 @@ describe('<%= pluginName %>', () => {
   });
 
   afterAll(() => {
-    // Cleanup the test project
-    rmSync(projectDirectory, {
-      recursive: true,
-      force: true,
-    });
+    if (projectDirectory) {
+      // Cleanup the test project
+      rmSync(projectDirectory, {
+        recursive: true,
+        force: true,
+      });
+    }
   });
 
 
@@ -53,7 +55,7 @@ function createTestProject() {
   });
 
   execSync(
-    `<%= packageManagerCommands.exec %> --yes create-nx-workspace@latest ${projectName} --preset apps --nxCloud=skip --no-interactive`,
+    `<%= packageManagerCommands.dlx %> create-nx-workspace@latest ${projectName} --preset apps --nxCloud=skip --no-interactive`,
     {
       cwd: dirname(projectDirectory),
       stdio: 'inherit',

package/src/generators/executor/executor.js

@@ -87,6 +87,8 @@ async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         name: options.name,
+        allowedFileExtensions: ['ts'],
+        fileExtension: 'ts',
     });
     const { className, propertyName } = (0, devkit_1.names)(name);
     const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);

package/src/generators/executor/schema.json

@@ -9,7 +9,7 @@
   "properties": {
     "path": {
       "type": "string",
-      "description": "The file path to the executor without the file extension. Relative to the current working directory.",
+      "description": "The file path to the executor. Relative to the current working directory.",
       "x-prompt": "What is the executor file path?",
       "$default": {
         "$source": "argv",

package/src/generators/generator/generator.js

@@ -14,6 +14,8 @@ async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         name: options.name,
+        allowedFileExtensions: ['ts'],
+        fileExtension: 'ts',
     });
     const { className, propertyName } = (0, devkit_1.names)(name);
     const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);

package/src/generators/generator/schema.json

@@ -8,6 +8,10 @@
   "examples": [
     {
       "description": "Generate a generator exported with the name matching the file name. It results in the generator `foo` at `mylib/src/generators/foo.ts`",
+      "command": "nx g @nx/plugin:generator mylib/src/generators/foo.ts"
+    },
+    {
+      "description": "Generate a generator without providing the file extension. It results in the generator `foo` at `mylib/src/generators/foo.ts`",
       "command": "nx g @nx/plugin:generator mylib/src/generators/foo"
     },
     {
@@ -18,7 +22,7 @@
   "properties": {
     "path": {
       "type": "string",
-      "description": "The file path to the generator without the file extension. Relative to the current working directory.",
+      "description": "The file path to the generator. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0

package/src/generators/migration/migration.js

@@ -13,6 +13,8 @@ async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         name: options.name,
+        allowedFileExtensions: ['ts'],
+        fileExtension: 'ts',
     });
     const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
     const description = options.description ?? `Migration for v${options.packageVersion}`;

package/src/generators/migration/schema.json

@@ -8,6 +8,10 @@
   "examples": [
     {
       "description": "Generate a migration exported with the name matching the file name, which will be triggered when migrating to version 1.0.0 or above from a previous version. It results in the migration `foo` at `mylib/src/migrations/foo.ts`",
+      "command": "nx g @nx/plugin:migration mylib/src/migrations/foo.ts -v=1.0.0"
+    },
+    {
+      "description": "Generate a migration without providing the file extension, which will be triggered when migrating to version 1.0.0 or above from a previous version. It results in the migration `foo` at `mylib/src/migrations/foo.ts`",
       "command": "nx g @nx/plugin:migration mylib/src/migrations/foo -v=1.0.0"
     },
     {