@nx/plugin 0.0.0-pr-30418-4e2b721 → 0.0.0-pr-3-ec41644

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "0.0.0-pr-30418-4e2b721",
+  "version": "0.0.0-pr-3-ec41644",
   "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-30418-4e2b721",
-    "@nx/jest": "0.0.0-pr-30418-4e2b721",
-    "@nx/js": "0.0.0-pr-30418-4e2b721",
-    "@nx/eslint": "0.0.0-pr-30418-4e2b721"
+    "@nx/devkit": "0.0.0-pr-3-ec41644",
+    "@nx/jest": "0.0.0-pr-3-ec41644",
+    "@nx/js": "0.0.0-pr-3-ec41644",
+    "@nx/eslint": "0.0.0-pr-3-ec41644"
   },
   "publishConfig": {
     "access": "public"

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

@@ -52,14 +52,12 @@ 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) {
@@ -72,7 +70,7 @@ async function addJest(host, options) {
     };
     if (options.isTsSolutionSetup) {
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
-            name: options.projectName,
+            name: (0, project_name_and_root_utils_1.resolveImportPath)(host, options.projectName, options.projectRoot),
             version: '0.0.1',
             private: true,
         });
@@ -168,7 +166,7 @@ async function e2eProjectGeneratorInternal(host, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isTsSolutionSetup) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

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.importPath,
+        importPath: options.npmPackageName,
         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.projectName : options.projectRoot),
-            npmPackageName: options.importPath,
+            pluginOutputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.projectRoot),
+            npmPackageName: options.npmPackageName,
             skipFormat: true,
             rootProject: options.rootProject,
             linter: options.linter,

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

@@ -2,12 +2,13 @@ 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[];
-    importPath: string;
+    npmPackageName: string;
     bundler: 'swc' | 'tsc';
     publishable: boolean;
     unitTestRunner: 'jest' | 'vitest' | 'none';

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