@nx/nuxt 20.5.0-rc.3 → 20.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "20.5.0-rc.3",
+  "version": "20.5.0",
   "private": false,
   "description": "The Nuxt plugin for Nx contains executors and generators for managing Nuxt applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -31,11 +31,11 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "@nuxt/kit": "^3.10.0",
-    "@nx/devkit": "20.5.0-rc.3",
-    "@nx/js": "20.5.0-rc.3",
-    "@nx/eslint": "20.5.0-rc.3",
-    "@nx/vue": "20.5.0-rc.3",
-    "@nx/vite": "20.5.0-rc.3",
+    "@nx/devkit": "20.5.0",
+    "@nx/js": "20.5.0",
+    "@nx/eslint": "20.5.0",
+    "@nx/vue": "20.5.0",
+    "@nx/vite": "20.5.0",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "peerDependencies": {

package/src/generators/application/application.js

@@ -16,7 +16,6 @@ const ensure_dependencies_1 = require("./lib/ensure-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const node_child_process_1 = require("node:child_process");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function applicationGenerator(tree, schema) {
@@ -36,17 +35,19 @@ async function applicationGenerator(tree, schema) {
         (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, options));
     if (options.isUsingTsSolutionConfig) {
-        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
-            name: (0, get_import_path_1.getImportPath)(tree, options.name),
+        const packageJson = {
+            name: options.importPath,
             version: '0.0.1',
             private: true,
-            nx: {
-                name: options.name,
-                projectType: 'application',
-                sourceRoot: `${options.appProjectRoot}/src`,
-                tags: options.parsedTags?.length ? options.parsedTags : undefined,
-            },
-        });
+        };
+        if (options.projectName !== options.importPath) {
+            packageJson.nx = { name: options.projectName };
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
@@ -88,6 +89,11 @@ async function applicationGenerator(tree, schema) {
         isUsingTsSolutionConfig: options.isUsingTsSolutionConfig,
     }, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot));
     (0, update_gitignore_1.updateGitIgnore)(tree);
+    // 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.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+    }
     tasks.push(await (0, add_linting_1.addLinting)(tree, {
         projectName: options.projectName,
         projectRoot: options.appProjectRoot,
@@ -121,11 +127,6 @@ async function applicationGenerator(tree, schema) {
             ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
             : undefined);
     }
-    // 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.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
-    }
     (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat)
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/application/lib/add-e2e.js

@@ -16,8 +16,6 @@ async function addE2e(host, options) {
                 version: '0.0.1',
                 private: true,
                 nx: {
-                    projectType: 'application',
-                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     implicitDependencies: [options.projectName],
                 },
             });
@@ -64,8 +62,6 @@ async function addE2e(host, options) {
                 version: '0.0.1',
                 private: true,
                 nx: {
-                    projectType: 'application',
-                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     implicitDependencies: [options.projectName],
                 },
             });

package/src/generators/application/lib/normalize-options.js

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
-    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
         rootProject: options.rootProject,
     });
     options.rootProject = appProjectRoot === '.';
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags
@@ -20,14 +21,15 @@ async function normalizeOptions(host, options) {
         : [];
     const normalized = {
         ...options,
-        name: (0, devkit_1.names)(options.name).fileName,
+        name: projectNames.projectFileName,
         projectName: appProjectName,
         appProjectRoot,
+        importPath,
         e2eProjectName,
         e2eProjectRoot,
         parsedTags,
         style: options.style ?? 'none',
-        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionConfig,
     };
     normalized.unitTestRunner ??= 'vitest';
     normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';

package/src/generators/application/schema.d.ts

@@ -18,9 +18,10 @@ export interface Schema {
   useTsSolution?: boolean;
 }
 
-export interface NormalizedSchema extends Schema {
+export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
   projectName: string;
   appProjectRoot: string;
+  importPath: string;
   e2eProjectName: string;
   e2eProjectRoot: string;
   parsedTags: string[];