@nx/vue 20.2.2 → 20.3.0-beta.1

package/package.json

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

package/src/generators/application/application.js

@@ -5,7 +5,6 @@ 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");
@@ -15,30 +14,49 @@ const add_vite_1 = require("./lib/add-vite");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+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");
 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 ??=
-        process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false;
     const tasks = [];
-    (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
-        root: options.appProjectRoot,
-        projectType: 'application',
-        sourceRoot: `${options.appProjectRoot}/src`,
-        targets: {},
-    });
     tasks.push(await (0, js_1.initGenerator)(tree, {
-        ...options,
-        tsConfigName: options.rootProject
+        ..._options,
+        tsConfigName: _options.rootProject
             ? 'tsconfig.json'
             : 'tsconfig.base.json',
         skipFormat: true,
+        addTsPlugin: _options.useTsSolution,
+        formatter: _options.formatter,
     }));
+    const options = await (0, normalize_options_1.normalizeOptions)(tree, _options);
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    options.addPlugin ??=
+        process.env.NX_ADD_PLUGINS !== 'false' &&
+            nxJson.useInferencePlugins !== false;
+    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),
+            version: '0.0.1',
+            private: true,
+            nx: {
+                name: options.name,
+                projectType: 'application',
+                sourceRoot: `${options.appProjectRoot}/src`,
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
+            root: options.appProjectRoot,
+            projectType: 'application',
+            sourceRoot: `${options.appProjectRoot}/src`,
+            tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            targets: {},
+        });
+    }
     tasks.push(await (0, init_1.vueInitGenerator)(tree, {
         ...options,
         skipFormat: true,
@@ -66,6 +84,17 @@ async function applicationGeneratorInternal(tree, _options) {
         (0, devkit_1.toJS)(tree);
     if (!options.skipFormat)
         await (0, devkit_1.formatFiles)(tree);
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+            jsx: 'preserve',
+            jsxImportSource: 'vue',
+            module: 'esnext',
+            moduleResolution: 'bundler',
+            resolveJsonModule: true,
+        }, options.linter === 'eslint'
+            ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+            : undefined);
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
     });

package/src/generators/application/files/common/src/vue-shims.d.ts.template

@@ -0,0 +1,5 @@
+declare module '*.vue' {
+  import { defineComponent } from 'vue';
+  const component: ReturnType<typeof defineComponent>;
+  export default component;
+}

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

@@ -2,6 +2,7 @@
 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");
+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, {
@@ -28,5 +29,6 @@ async function normalizeOptions(host, options) {
     normalized.routing = normalized.routing ?? false;
     normalized.unitTestRunner ??= 'vitest';
     normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';
+    normalized.isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     return normalized;
 }

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

@@ -10,6 +10,7 @@ export interface Schema {
   inSourceTests?: boolean;
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
   linter: Linter | LinterType;
+  formatter?: 'none' | 'prettier';
   routing?: boolean;
   js?: boolean;
   strict?: boolean;
@@ -18,6 +19,7 @@ export interface Schema {
   rootProject?: boolean;
   addPlugin?: boolean;
   nxCloudToken?: string;
+  useTsSolution?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {
@@ -27,4 +29,5 @@ export interface NormalizedSchema extends Schema {
   e2eProjectRoot: string;
   parsedTags: string[];
   devServerPort?: number;
+  isUsingTsSolutionConfig: boolean;
 }

package/src/generators/application/schema.json

@@ -60,12 +60,6 @@
         ]
       }
     },
-    "linter": {
-      "description": "The tool to use for running lint checks.",
-      "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
-    },
     "routing": {
       "type": "boolean",
       "description": "Generate application with routes.",
@@ -78,12 +72,21 @@
       "default": false,
       "x-priority": "internal"
     },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "none"],
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
+    },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "none"],
       "description": "Test runner to use for unit tests.",
       "x-prompt": "Which unit test runner would you like to use?",
-      "default": "vitest"
+      "default": "none",
+      "x-priority": "important"
     },
     "inSourceTests": {
       "type": "boolean",

package/src/generators/init/init.js

@@ -2,7 +2,6 @@
 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 = [];
@@ -11,7 +10,6 @@ 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/create-library-files.js

@@ -14,8 +14,21 @@ function createLibraryFiles(host, options) {
         fileName: options.fileName,
     };
     (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files'), options.projectRoot, substitutions);
-    if (!options.publishable && options.bundler === 'none') {
-        host.delete(`${options.projectRoot}/package.json`);
+    if (!options.isUsingTsSolutionConfig &&
+        (options.publishable || options.bundler !== 'none')) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
+            name: options.name,
+            version: '0.0.1',
+            main: './index.js',
+            types: './index.d.ts',
+            exports: {
+                '.': {
+                    import: './index.mjs',
+                    require: './index.js',
+                    types: './index.d.ts',
+                },
+            },
+        });
     }
     if (options.unitTestRunner !== 'vitest') {
         host.delete(`${options.projectRoot}/tsconfig.spec.json`);

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

@@ -3,6 +3,7 @@ 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, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -35,6 +36,7 @@ async function normalizeOptions(host, options) {
         projectRoot,
         parsedTags,
         importPath,
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
     // Libraries with a bundler or is publishable must also be buildable.
     normalized.bundler =

package/src/generators/library/library.js

@@ -4,7 +4,6 @@ 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");
@@ -16,24 +15,54 @@ 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");
+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 plugin_1 = require("@nx/js/src/utils/typescript/plugin");
 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 = [];
+    tasks.push(await (0, js_1.initGenerator)(tree, { ...schema, skipFormat: true }));
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     if (options.publishable === true && !schema.importPath) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
-    (0, devkit_1.addProjectConfiguration)(tree, options.name, {
-        root: options.projectRoot,
-        sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-        projectType: 'library',
-        tags: options.parsedTags,
-        targets: {},
-    });
-    tasks.push(await (0, js_1.initGenerator)(tree, { ...schema, skipFormat: true }));
+    if (options.isUsingTsSolutionConfig) {
+        const moduleFile = options.bundler === 'none'
+            ? options.js
+                ? './src/index.js'
+                : './src/index.ts'
+            : './dist/index.mjs';
+        const typesFile = options.bundler === 'none'
+            ? options.js
+                ? './src/index.js'
+                : './src/index.ts'
+            : './dist/index.d.ts';
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
+            name: (0, get_import_path_1.getImportPath)(tree, options.name),
+            version: '0.0.1',
+            private: true,
+            module: moduleFile,
+            types: typesFile,
+            files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
+            nx: {
+                name: options.name,
+                projectType: 'application',
+                sourceRoot: `${options.projectRoot}/src`,
+                tags: options.parsedTags?.length ? options.parsedTags : undefined,
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(tree, options.name, {
+            root: options.projectRoot,
+            sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
+            projectType: 'library',
+            tags: options.parsedTags,
+            targets: {},
+        });
+    }
     tasks.push(await (0, init_1.vueInitGenerator)(tree, {
         ...options,
         skipFormat: true,
@@ -59,13 +88,19 @@ async function libraryGeneratorInternal(tree, schema) {
             skipFormat: true,
         });
     }
-    if (options.publishable || options.bundler !== 'none') {
+    if (!options.isUsingTsSolutionConfig &&
+        (options.publishable || options.bundler !== 'none')) {
         (0, devkit_1.updateJson)(tree, `${options.projectRoot}/package.json`, (json) => {
             json.name = options.importPath;
             return json;
         });
     }
-    if (!options.skipTsConfig) {
+    if (options.bundler === 'none') {
+        const nxJson = (0, devkit_1.readNxJson)(tree);
+        (0, plugin_1.ensureProjectIsExcludedFromPluginRegistrations)(nxJson, options.projectRoot);
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    if (!options.skipTsConfig && !options.isUsingTsSolutionConfig) {
         (0, js_1.addTsConfigPath)(tree, options.importPath, [
             (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
         ]);
@@ -74,6 +109,21 @@ async function libraryGeneratorInternal(tree, schema) {
         (0, devkit_1.toJS)(tree);
     if (!options.skipFormat)
         await (0, devkit_1.formatFiles)(tree);
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.projectRoot, 'tsconfig.lib.json', {
+            jsx: 'preserve',
+            jsxImportSource: 'vue',
+            module: 'esnext',
+            moduleResolution: 'bundler',
+            resolveJsonModule: true,
+        }, options.linter === 'eslint'
+            ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+            : undefined);
+    }
+    // Always run install to link packages.
+    if (options.isUsingTsSolutionConfig) {
+        tasks.push(() => (0, devkit_1.installPackagesTask)(tree, true));
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.name);
     });

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

@@ -35,4 +35,5 @@ export interface NormalizedSchema extends Schema {
   appMain?: string;
   appSourceRoot?: string;
   unitTestRunner?: 'vitest' | 'none';
+  isUsingTsSolutionConfig: boolean;
 }

package/src/generators/library/schema.json

@@ -36,13 +36,17 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["vitest", "none"],
       "description": "Test runner to use for unit tests.",
-      "x-prompt": "What unit test runner should be used?"
+      "x-prompt": "What unit test runner should be used?",
+      "default": "none",
+      "x-priority": "important"
     },
     "inSourceTests": {
       "type": "boolean",

package/src/utils/create-ts-config.d.ts

@@ -1,5 +1,18 @@
 import { Tree } from '@nx/devkit';
 export declare function createTsConfig(host: Tree, projectRoot: string, type: 'app' | 'lib', options: {
+    strict?: boolean;
+    style?: string;
+    bundler?: string;
+    rootProject?: boolean;
+    unitTestRunner?: string;
+}, relativePathToRootTsConfig: string): void;
+export declare function createTsConfigForTsSolution(host: Tree, projectRoot: string, type: 'app' | 'lib', options: {
+    strict?: boolean;
+    style?: string;
+    rootProject?: boolean;
+    unitTestRunner?: string;
+}, relativePathToRootTsConfig: string): void;
+export declare function createTsConfigForNonTsSolution(host: Tree, projectRoot: string, type: 'app' | 'lib', options: {
     strict?: boolean;
     style?: string;
     rootProject?: boolean;

package/src/utils/create-ts-config.js

@@ -1,10 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTsConfig = createTsConfig;
+exports.createTsConfigForTsSolution = createTsConfigForTsSolution;
+exports.createTsConfigForNonTsSolution = createTsConfigForNonTsSolution;
 exports.extractTsConfigBase = extractTsConfigBase;
 const devkit_1 = require("@nx/devkit");
 const shared = require("@nx/js/src/utils/typescript/create-ts-config");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function createTsConfig(host, projectRoot, type, options, relativePathToRootTsConfig) {
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        createTsConfigForTsSolution(host, projectRoot, type, options, relativePathToRootTsConfig);
+    }
+    else {
+        createTsConfigForNonTsSolution(host, projectRoot, type, options, relativePathToRootTsConfig);
+    }
+}
+function createTsConfigForTsSolution(host, projectRoot, type, options, relativePathToRootTsConfig) {
+    const json = {
+        extends: relativePathToRootTsConfig,
+        files: [],
+        include: [],
+        references: [
+            {
+                path: type === 'app' ? './tsconfig.app.json' : './tsconfig.lib.json',
+            },
+        ],
+    };
+    (0, devkit_1.writeJson)(host, `${projectRoot}/tsconfig.json`, json);
+    const tsconfigProjectPath = `${projectRoot}/tsconfig.${type}.json`;
+    if (host.exists(tsconfigProjectPath)) {
+        (0, devkit_1.updateJson)(host, tsconfigProjectPath, (json) => {
+            json.compilerOptions ??= {};
+            const types = new Set(json.compilerOptions.types ?? []);
+            types.add('vite/client');
+            json.compilerOptions.types = Array.from(types);
+            return json;
+        });
+    }
+}
+function createTsConfigForNonTsSolution(host, projectRoot, type, options, relativePathToRootTsConfig) {
     const json = {
         compilerOptions: {
             allowJs: true,

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

@@ -1,12 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "0.0.1",
-  "main": "./index.js",
-  "types": "./index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./index.mjs",
-      "require": "./index.js"
-    }
-  }
-}