@nx/nuxt 20.0.0-beta.5 → 20.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "20.0.0-beta.5",
+  "version": "20.0.0-beta.7",
   "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.0.0-beta.5",
-    "@nx/js": "20.0.0-beta.5",
-    "@nx/eslint": "20.0.0-beta.5",
-    "@nx/vue": "20.0.0-beta.5",
-    "@nx/vite": "20.0.0-beta.5",
+    "@nx/devkit": "20.0.0-beta.7",
+    "@nx/js": "20.0.0-beta.7",
+    "@nx/eslint": "20.0.0-beta.7",
+    "@nx/vue": "20.0.0-beta.7",
+    "@nx/vite": "20.0.0-beta.7",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "peerDependencies": {},

package/src/generators/application/application.js

@@ -6,6 +6,7 @@ const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const update_gitignore_1 = require("../../utils/update-gitignore");
 const eslint_1 = require("@nx/eslint");
 const add_e2e_1 = require("./lib/add-e2e");
@@ -17,6 +18,7 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const node_child_process_1 = require("node:child_process");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 async function applicationGenerator(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'nuxt', 'application');
     const tasks = [];
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,4 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema, Schema } from '../schema';
-export declare function normalizeDirectory(options: Schema): string;
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -1,27 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeDirectory = normalizeDirectory;
 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");
-function normalizeDirectory(options) {
-    options.directory = options.directory?.replace(/\\{1,2}/g, '/');
-    const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    return projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
-        : (0, devkit_1.names)(options.name).fileName;
-}
 async function normalizeOptions(host, options) {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    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, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
     });
     options.rootProject = appProjectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
-    const nxJson = (0, devkit_1.readNxJson)(host);
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags

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

@@ -1,10 +1,8 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
+  name?: string;
   linter?: Linter | LinterType;
   skipFormat?: boolean;
   unitTestRunner?: 'vitest' | 'none';

package/src/generators/application/schema.json

@@ -6,28 +6,22 @@
   "description": "Create a Nuxt Application for Nx.",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the application?",
-      "pattern": "^[a-zA-Z][^:]*$",
-      "x-priority": "important"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
-      "alias": "dir",
+      "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
@@ -86,7 +80,10 @@
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css", "label": "CSS" },
+          {
+            "value": "css",
+            "label": "CSS"
+          },
           {
             "value": "scss",
             "label": "SASS(.scss)       [ https://sass-lang.com          ]"
@@ -95,7 +92,10 @@
             "value": "less",
             "label": "LESS              [ https://lesscss.org            ]"
           },
-          { "value": "none", "label": "None" }
+          {
+            "value": "none",
+            "label": "None"
+          }
         ]
       }
     },
@@ -105,6 +105,6 @@
       "default": false
     }
   },
-  "required": [],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }

package/src/generators/init/init.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nuxtInitGenerator = nuxtInitGenerator;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
 const utils_1 = require("./lib/utils");
 async function nuxtInitGenerator(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'nuxt', 'init');
     await (0, add_plugin_1.addPluginV1)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/nuxt/plugin', plugin_1.createNodes, {
         buildTargetName: ['build', 'nuxt:build', 'nuxt-build'],
         serveTargetName: ['serve', 'nuxt:serve', 'nuxt-serve'],