@nx/plugin 0.0.0-pr-29720-6055188 → 0.0.0-pr-29705-bc2a0dd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "0.0.0-pr-29720-6055188",
+  "version": "0.0.0-pr-29705-bc2a0dd",
   "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-29720-6055188",
-    "@nx/jest": "0.0.0-pr-29720-6055188",
-    "@nx/js": "0.0.0-pr-29720-6055188",
-    "@nx/eslint": "0.0.0-pr-29720-6055188"
+    "@nx/devkit": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/jest": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/js": "0.0.0-pr-29705-bc2a0dd",
+    "@nx/eslint": "0.0.0-pr-29705-bc2a0dd"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/plugin/plugin.js

@@ -20,7 +20,7 @@ async function addFiles(host, options) {
     });
 }
 function updatePluginConfig(host, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(host, options.name);
+    const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (project.targets.build) {
         if (options.isTsSolutionSetup && options.bundler === 'tsc') {
             project.targets.build.options.rootDir = project.sourceRoot;
@@ -36,7 +36,7 @@ function updatePluginConfig(host, options) {
         else {
             project.targets.build.options.assets.push({ input: `${root}/src`, glob: '**/!(*.ts)', output: './src' }, { input: `${root}/src`, glob: '**/*.d.ts', output: './src' }, { input: root, glob: 'generators.json', output: '.' }, { input: root, glob: 'executors.json', output: '.' });
         }
-        (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
+        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
     }
 }
 async function pluginGenerator(tree, schema) {
@@ -82,7 +82,7 @@ async function pluginGeneratorInternal(host, schema) {
     updatePluginConfig(host, options);
     if (options.e2eTestRunner !== 'none') {
         tasks.push(await (0, e2e_1.e2eProjectGenerator)(host, {
-            pluginName: options.name,
+            pluginName: options.projectName,
             projectDirectory: options.projectDirectory,
             pluginOutputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.projectRoot),
             npmPackageName: options.npmPackageName,
@@ -94,7 +94,7 @@ async function pluginGeneratorInternal(host, schema) {
         }));
     }
     if (options.linter === eslint_1.Linter.EsLint && !options.skipLintChecks) {
-        await (0, generator_1.default)(host, { projectName: options.name });
+        await (0, generator_1.default)(host, { projectName: options.projectName });
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

package/src/generators/plugin/utils/normalize-schema.d.ts

@@ -3,6 +3,7 @@ import type { LinterType } from '@nx/eslint';
 import type { Schema } from '../schema';
 export interface NormalizedSchema extends Schema {
     name: string;
+    projectName: string;
     fileName: string;
     projectRoot: string;
     projectDirectory: string;

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

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function normalizeOptions(host, options) {
     const linter = await (0, generator_prompts_1.normalizeLinterOption)(host, options.linter);
     const unitTestRunner = await (0, generator_prompts_1.normalizeUnitTestRunnerOption)(host, options.unitTestRunner, ['jest', 'vitest']);
@@ -32,6 +33,9 @@ async function normalizeOptions(host, options) {
         bundler: options.compiler ?? 'tsc',
         fileName: projectName,
         name: projectName,
+        projectName: isTsSolutionSetup
+            ? (0, get_import_path_1.getImportPath)(host, projectName)
+            : projectName,
         projectRoot,
         projectDirectory,
         parsedTags,