@nx/plugin 20.5.0-rc.2 → 20.5.0-rc.4

package/package.json

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

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

@@ -52,12 +52,14 @@ function validatePlugin(host, pluginName) {
 function addFiles(host, options) {
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.pluginName);
     const { name: pluginPackageName } = (0, devkit_1.readJson)(host, (0, path_1.join)(projectConfiguration.root, 'package.json'));
+    const simplePluginName = options.pluginName.split('/').pop();
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), options.projectRoot, {
         ...options,
         tmpl: '',
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
         packageManagerCommands: (0, devkit_1.getPackageManagerCommand)(),
         pluginPackageName,
+        simplePluginName,
     });
 }
 async function addJest(host, options) {
@@ -70,7 +72,7 @@ async function addJest(host, options) {
     };
     if (options.isTsSolutionSetup) {
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
-            name: (0, project_name_and_root_utils_1.resolveImportPath)(host, options.projectName, options.projectRoot),
+            name: options.projectName,
             version: '0.0.1',
             private: true,
         });

package/src/generators/plugin/plugin.js

@@ -57,7 +57,7 @@ async function pluginGeneratorInternal(host, schema) {
         config: 'project',
         bundler: options.bundler,
         publishable: options.publishable,
-        importPath: options.npmPackageName,
+        importPath: options.importPath,
         linter: options.linter,
         unitTestRunner: options.unitTestRunner,
         useProjectJson: options.useProjectJson,
@@ -91,8 +91,8 @@ async function pluginGeneratorInternal(host, schema) {
         tasks.push(await (0, e2e_1.e2eProjectGenerator)(host, {
             pluginName: options.projectName,
             projectDirectory: options.projectDirectory,
-            pluginOutputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.projectRoot),
-            npmPackageName: options.npmPackageName,
+            pluginOutputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.projectName : options.projectRoot),
+            npmPackageName: options.importPath,
             skipFormat: true,
             rootProject: options.rootProject,
             linter: options.linter,

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

@@ -2,13 +2,12 @@ import { type Tree } from '@nx/devkit';
 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;
     parsedTags: string[];
-    npmPackageName: string;
+    importPath: string;
     bundler: 'swc' | 'tsc';
     publishable: boolean;
     unitTestRunner: 'jest' | 'vitest' | 'none';

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

@@ -5,7 +5,6 @@ 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']);
@@ -15,8 +14,8 @@ async function normalizeOptions(host, options) {
         (isTsSolutionSetup &&
             process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false);
-    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, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
+    const { projectName, projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
@@ -32,14 +31,11 @@ async function normalizeOptions(host, options) {
         ...options,
         bundler: options.compiler ?? 'tsc',
         fileName: projectName,
-        name: projectName,
-        projectName: isTsSolutionSetup
-            ? (0, get_import_path_1.getImportPath)(host, projectName)
-            : projectName,
+        projectName: isTsSolutionSetup && !options.name ? importPath : projectName,
         projectRoot,
         projectDirectory,
         parsedTags,
-        npmPackageName,
+        importPath,
         publishable: options.publishable ?? false,
         linter,
         unitTestRunner,