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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "20.0.0-beta.5",
+  "version": "20.0.0-beta.7",
   "private": false,
   "description": "The Vue plugin for Nx contains executors and generators for managing Vue 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": {
     "minimatch": "9.0.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.0.0-beta.5",
-    "@nx/js": "20.0.0-beta.5",
-    "@nx/eslint": "20.0.0-beta.5",
-    "@nx/vite": "20.0.0-beta.5",
-    "@nx/web": "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/vite": "20.0.0-beta.7",
+    "@nx/web": "20.0.0-beta.7"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -5,6 +5,7 @@ exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const normalize_options_1 = require("./lib/normalize-options");
 const init_1 = require("../init/init");
 const add_linting_1 = require("../../utils/add-linting");
@@ -18,6 +19,7 @@ function applicationGenerator(tree, options) {
     return applicationGeneratorInternal(tree, { addPlugin: false, ...options });
 }
 async function applicationGeneratorInternal(tree, _options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'vue', 'application');
     const options = await (0, normalize_options_1.normalizeOptions)(tree, _options);
     const nxJson = (0, devkit_1.readNxJson)(tree);
     options.addPlugin ??=

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

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 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 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,12 +1,10 @@
-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;
+  name?: string;
   style: 'none' | 'css' | 'scss' | 'less';
   skipFormat?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner?: 'vitest' | 'none';
   inSourceTests?: boolean;

package/src/generators/application/schema.json

@@ -16,27 +16,22 @@
   ],
   "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-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"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -135,6 +130,6 @@
       "hidden": true
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }

package/src/generators/component/lib/utils.js

@@ -9,10 +9,9 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 const ast_utils_1 = require("../../../utils/ast-utils");
 let tsModule;
 async function normalizeOptions(host, options) {
-    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+    const { artifactName: name, fileName, filePath, directory, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         fileExtension: 'vue',
     });
     let { className } = (0, devkit_1.names)(fileName);
@@ -26,8 +25,8 @@ async function normalizeOptions(host, options) {
     options.inSourceTests = options.inSourceTests ?? false;
     return {
         ...options,
-        filePath,
         directory,
+        filePath,
         className,
         fileName: componentFileName,
         projectSourceRoot,

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

@@ -1,19 +1,17 @@
-import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface ComponentGeneratorSchema {
-  name: string;
+  path: string;
+  name?: string;
   skipTests?: boolean;
-  directory?: string;
   export?: boolean;
   routing?: boolean;
   js?: boolean;
   fileName?: string;
   inSourceTests?: boolean;
   skipFormat?: boolean;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }
 
 export interface NormalizedSchema extends ComponentGeneratorSchema {
+  directory: string;
   projectName: string;
   projectSourceRoot: string;
   fileName: string;

package/src/generators/component/schema.json

@@ -7,25 +7,29 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/vue:component --directory=my-app/src/app/one --name=one --nameAndDirectoryFormat=as-provided --unitTestRunner=vitest",
-      "description": "Generate a component in the `my-app` application"
+      "command": "nx g @nx/vue:component my-app/src/app/one --name=one --unitTestRunner=vitest",
+      "description": "Generate a component `one` in the `my-app` application at my-app/src/app/one"
+    },
+    {
+      "command": "nx g @nx/vue:component my-app/src/app/one",
+      "description": "Generate a component `one` in the `my-app` application at my-app/src/app/one"
     }
   ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the component.",
+      "description": "Path where the component will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the component?",
+      "x-prompt": "Where should the component be generated?",
       "x-priority": "important"
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
+    "name": {
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "description": "The name of the component.",
+      "x-prompt": "What name would you like to use for the component?"
     },
     "js": {
       "type": "boolean",
@@ -38,12 +42,6 @@
       "default": false,
       "x-priority": "internal"
     },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "alias": "dir",
-      "x-priority": "important"
-    },
     "export": {
       "type": "boolean",
       "description": "When true, the component is exported from the project `index.ts` (if it exists).",
@@ -71,5 +69,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/init/init.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vueInitGenerator = vueInitGenerator;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 function updateDependencies(host, schema) {
     const tasks = [];
@@ -10,6 +11,7 @@ function updateDependencies(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function vueInitGenerator(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'vue', 'init');
     let installTask = () => { };
     if (!schema.skipPackageJson) {
         installTask = updateDependencies(host, schema);

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

@@ -4,12 +4,12 @@ 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");
 async function normalizeOptions(host, options) {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
     const fileName = projectNames.projectFileName;
     const parsedTags = options.tags

package/src/generators/library/library.js

@@ -4,6 +4,7 @@ exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = require("../init/init");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_linting_1 = require("../../utils/add-linting");
@@ -19,6 +20,7 @@ function libraryGenerator(tree, schema) {
     return libraryGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function libraryGeneratorInternal(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'vue', 'library');
     const tasks = [];
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     if (options.publishable === true && !schema.importPath) {
@@ -45,10 +47,9 @@ async function libraryGeneratorInternal(tree, schema) {
     tasks.push(await (0, add_vite_1.addVite)(tree, options));
     if (options.component) {
         const relativeCwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
-        const name = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
+        const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
         await (0, component_1.default)(tree, {
-            name: relativeCwd ? (0, path_1.relative)(relativeCwd, name) : name,
-            nameAndDirectoryFormat: 'as-provided',
+            path: relativeCwd ? (0, path_1.relative)(relativeCwd, path) : path,
             skipTests: options.unitTestRunner === 'none' ||
                 (options.unitTestRunner === 'vitest' && options.inSourceTests == true),
             export: true,

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

@@ -1,18 +1,15 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
-import type { SupportedStyles } from '../../../typings/style';
 
 export interface Schema {
   appProject?: string;
   bundler?: 'none' | 'vite';
   component?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
   importPath?: string;
   inSourceTests?: boolean;
   js?: boolean;
   linter: Linter | LinterType;
-  name: string;
+  name?: string;
   publishable?: boolean;
   routing?: boolean;
   setParserOptionsProject?: boolean;

package/src/generators/library/schema.json

@@ -16,28 +16,22 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Library name",
+      "description": "A directory where the lib is placed.",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the library?",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
-      "x-priority": "important"
+      "x-prompt": "Which directory do you want to create the library in?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "A directory where the lib is placed.",
-      "alias": "dir",
+      "description": "Library name",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[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",
@@ -129,5 +123,5 @@
       "default": false
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/utils/test-utils.js

@@ -12,8 +12,7 @@ async function createApp(tree, appName) {
         skipFormat: true,
         style: 'css',
         unitTestRunner: 'none',
-        name: appName,
-        projectNameAndRootFormat: 'as-provided',
+        directory: appName,
     });
 }
 async function createLib(tree, libName) {