@nx/vue 19.8.0 → 20.0.0-beta.0

package/generators.json

@@ -23,7 +23,7 @@
       "description": "Create a Vue library."
     },
     "component": {
-      "factory": "./src/generators/component/component#componentGeneratorInternal",
+      "factory": "./src/generators/component/component",
       "schema": "./src/generators/component/schema.json",
       "aliases": ["c"],
       "x-type": "component",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "19.8.0",
+  "version": "20.0.0-beta.0",
   "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": "19.8.0",
-    "@nx/js": "19.8.0",
-    "@nx/eslint": "19.8.0",
-    "@nx/vite": "19.8.0",
-    "@nx/web": "19.8.0"
+    "@nx/devkit": "20.0.0-beta.0",
+    "@nx/js": "20.0.0-beta.0",
+    "@nx/eslint": "20.0.0-beta.0",
+    "@nx/vite": "20.0.0-beta.0",
+    "@nx/web": "20.0.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

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

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

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

@@ -2,14 +2,13 @@
 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, callingGenerator = '@nx/vue:application') {
+async function normalizeOptions(host, options) {
     const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator,
     });
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;

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

@@ -1,5 +1,4 @@
 import { Tree } from '@nx/devkit';
 import { ComponentGeneratorSchema } from './schema';
 export declare function componentGenerator(host: Tree, schema: ComponentGeneratorSchema): Promise<void>;
-export declare function componentGeneratorInternal(host: Tree, schema: ComponentGeneratorSchema): Promise<void>;
 export default componentGenerator;

package/src/generators/component/component.js

@@ -1,17 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
-exports.componentGeneratorInternal = componentGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const utils_1 = require("./lib/utils");
 async function componentGenerator(host, schema) {
-    return componentGeneratorInternal(host, {
-        nameAndDirectoryFormat: 'derived',
-        ...schema,
-    });
-}
-async function componentGeneratorInternal(host, schema) {
     const options = await (0, utils_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
     (0, utils_1.addExportsToBarrel)(host, options);

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

@@ -10,17 +10,10 @@ 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, {
-        artifactType: 'component',
-        callingGenerator: '@nx/vue:component',
         name: options.name,
         directory: options.directory,
-        derivedDirectory: options.directory,
-        flat: options.flat,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         fileExtension: 'vue',
-        pascalCaseFile: options.pascalCaseFiles,
-        pascalCaseDirectory: options.pascalCaseDirectory,
     });
     let { className } = (0, devkit_1.names)(fileName);
     const componentFileName = fileName;

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

@@ -1,3 +1,5 @@
+import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+
 export interface ComponentGeneratorSchema {
   name: string;
   skipTests?: boolean;
@@ -8,24 +10,7 @@ export interface ComponentGeneratorSchema {
   fileName?: string;
   inSourceTests?: boolean;
   skipFormat?: boolean;
-  nameAndDirectoryFormat?: 'as-provided' | 'derived';
-
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the desired `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  pascalCaseDirectory?: boolean;
-  /**
-   * @deprecated Provide the desired `name` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  pascalCaseFiles?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }
 
 export interface NormalizedSchema extends ComponentGeneratorSchema {

package/src/generators/component/schema.json

@@ -12,15 +12,6 @@
     }
   ],
   "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "name": {
       "type": "string",
       "description": "The name of the component.",
@@ -53,12 +44,6 @@
       "alias": "dir",
       "x-priority": "important"
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create component at the source root rather than its own directory.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "export": {
       "type": "boolean",
       "description": "When true, the component is exported from the project `index.ts` (if it exists).",
@@ -66,20 +51,6 @@
       "default": false,
       "x-prompt": "Should this component be exported in the project?"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. `App.tsx`).",
-      "alias": "P",
-      "default": false,
-      "x-deprecated": "Provide the desired `name` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
-    "pascalCaseDirectory": {
-      "type": "boolean",
-      "description": "Use pascal case directory name (e.g. `App/App.tsx`).",
-      "alias": "R",
-      "default": false,
-      "x-deprecated": "Provide the desired `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "routing": {
       "type": "boolean",
       "description": "Generate a library with routes."

package/src/generators/library/files/tsconfig.lib.json__tmpl__

@@ -3,25 +3,17 @@
   "compilerOptions": {
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [],
-  },
+  },<% if (unitTestRunner === 'vitest') { %>
   "exclude": [
-    "src/**/__tests__/*", 
-    "src/**/*.spec.ts", 
-    "src/**/*.test.ts", 
-    "src/**/*.spec.tsx", 
-    "src/**/*.test.tsx", 
-    "src/**/*.spec.js", 
-    "src/**/*.test.js", 
-    "src/**/*.spec.jsx", 
-    "src/**/*.test.jsx",
+    "src/**/__tests__/*",
     "src/**/*.spec.vue",
     "src/**/*.test.vue"
-    ],
+  ],<% } %>
   "include": [
-    "src/**/*.js", 
-    "src/**/*.jsx", 
-    "src/**/*.ts", 
-    "src/**/*.tsx", 
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.ts",
+    "src/**/*.tsx",
     "src/**/*.vue"
-    ]
+  ]
 }

package/src/generators/library/lib/add-vite.js

@@ -42,6 +42,7 @@ async function addVite(tree, options) {
             skipFormat: true,
             testEnvironment: 'jsdom',
             addPlugin: options.addPlugin,
+            runtimeTsconfigFileName: 'tsconfig.lib.json',
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(tree, {

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

@@ -10,7 +10,6 @@ async function normalizeOptions(host, options) {
         directory: options.directory,
         importPath: options.importPath,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/vue:library',
     });
     const fileName = projectNames.projectFileName;
     const parsedTags = options.tags

package/src/generators/library/library.js

@@ -13,6 +13,8 @@ const component_1 = require("../component/component");
 const add_vite_1 = require("./lib/add-vite");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const path_1 = require("path");
 function libraryGenerator(tree, schema) {
     return libraryGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
@@ -42,16 +44,16 @@ async function libraryGeneratorInternal(tree, schema) {
     (0, create_library_files_1.createLibraryFiles)(tree, options);
     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);
         await (0, component_1.default)(tree, {
-            name: options.name,
-            project: options.name,
-            flat: true,
+            name: relativeCwd ? (0, path_1.relative)(relativeCwd, name) : name,
+            nameAndDirectoryFormat: 'as-provided',
             skipTests: options.unitTestRunner === 'none' ||
                 (options.unitTestRunner === 'vitest' && options.inSourceTests == true),
             export: true,
             routing: options.routing,
             js: options.js,
-            pascalCaseFiles: options.pascalCaseFiles,
             inSourceTests: options.inSourceTests,
             skipFormat: true,
         });

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

@@ -13,7 +13,6 @@ export interface Schema {
   js?: boolean;
   linter: Linter | LinterType;
   name: string;
-  pascalCaseFiles?: boolean;
   publishable?: boolean;
   routing?: boolean;
   setParserOptionsProject?: boolean;

package/src/generators/library/schema.json

@@ -72,12 +72,6 @@
       "description": "Do not update `tsconfig.json` for development experience.",
       "x-priority": "internal"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. `App.tsx`).",
-      "alias": "P",
-      "default": false
-    },
     "routing": {
       "type": "boolean",
       "description": "Generate library with routes."