@nx/vue 19.7.4 → 19.8.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "19.7.4",
+  "version": "19.8.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": "19.7.4",
-    "@nx/js": "19.7.4",
-    "@nx/eslint": "19.7.4",
-    "@nx/vite": "19.7.4",
-    "@nx/web": "19.7.4"
+    "@nx/devkit": "19.8.0-beta.1",
+    "@nx/js": "19.8.0-beta.1",
+    "@nx/eslint": "19.8.0-beta.1",
+    "@nx/vite": "19.8.0-beta.1",
+    "@nx/web": "19.8.0-beta.1"
   },
   "publishConfig": {
     "access": "public"
@@ -51,4 +51,4 @@
   },
   "type": "commonjs",
   "types": "./index.d.ts"
-}
+}

package/src/utils/add-linting.d.ts

@@ -1,5 +1,6 @@
 import { Tree } from 'nx/src/generators/tree';
 import { Linter, LinterType } from '@nx/eslint';
+import { GeneratorCallback } from '@nx/devkit';
 export declare function addLinting(host: Tree, options: {
     linter: Linter | LinterType;
     name: string;
@@ -9,5 +10,4 @@ export declare function addLinting(host: Tree, options: {
     skipPackageJson?: boolean;
     rootProject?: boolean;
     addPlugin?: boolean;
-}, projectType: 'lib' | 'app'): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function editEslintConfigFiles(tree: Tree, projectRoot: string): void;
+}, projectType: 'lib' | 'app'): Promise<GeneratorCallback>;

package/src/utils/add-linting.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
-exports.editEslintConfigFiles = editEslintConfigFiles;
 const eslint_1 = require("@nx/eslint");
 const path_1 = require("nx/src/utils/path");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("./lint");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLinting(host, options, projectType) {
     if (options.linter === eslint_1.Linter.EsLint) {
+        const tasks = [];
         const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
             linter: options.linter,
             project: options.name,
@@ -21,18 +22,24 @@ async function addLinting(host, options, projectType) {
             rootProject: options.rootProject,
             addPlugin: options.addPlugin,
         });
-        (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, [
-            'plugin:vue/vue3-essential',
-            'eslint:recommended',
-            '@vue/eslint-config-typescript',
-            '@vue/eslint-config-prettier/skip-formatting',
-        ]);
+        tasks.push(lintTask);
+        if ((0, flat_config_1.useFlatConfig)(host)) {
+        }
+        else {
+            const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, [
+                'plugin:vue/vue3-essential',
+                'eslint:recommended',
+                '@vue/eslint-config-typescript',
+                '@vue/eslint-config-prettier/skip-formatting',
+            ].filter(Boolean));
+            tasks.push(addExtendsTask);
+        }
         editEslintConfigFiles(host, options.projectRoot);
-        let installTask = () => { };
         if (!options.skipPackageJson) {
-            installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
+            const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
+            tasks.push(installTask);
         }
-        return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
+        return (0, devkit_1.runTasksInSerial)(...tasks);
     }
     else {
         return () => { };
@@ -55,19 +62,39 @@ function editEslintConfigFiles(tree, projectRoot) {
         }
     };
     if ((0, eslint_file_1.isEslintConfigSupported)(tree, projectRoot)) {
-        if ((0, eslint_file_1.lintConfigHasOverride)(tree, projectRoot, (o) => o.parserOptions && !hasVueFiles(o), true)) {
-            (0, eslint_file_1.updateOverrideInLintConfig)(tree, projectRoot, (o) => !!o.parserOptions, (o) => {
-                addVueFiles(o);
-                return o;
+        if ((0, flat_config_1.useFlatConfig)(tree)) {
+            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, projectRoot, 'flat/recommended', 'vue', 'eslint-plugin-vue');
+            // This allows .vue files to be parsed
+            (0, eslint_file_1.addOverrideToLintConfig)(tree, projectRoot, {
+                files: ['**/*.vue'],
+                languageOptions: {
+                    parserOptions: {
+                        parser: '@typescript-eslint/parser',
+                    },
+                },
+            } // languageOptions is not present on eslintrc override, but it is for flat config
+            );
+            // Add an empty rules object to users know how to add/override rules
+            (0, eslint_file_1.addOverrideToLintConfig)(tree, projectRoot, {
+                files: ['*.ts', '*.tsx', '*.js', '*.jsx', '*.vue'],
+                rules: { 'vue/multi-word-component-names': 'off' },
             });
         }
         else {
-            (0, eslint_file_1.replaceOverridesInLintConfig)(tree, projectRoot, [
-                {
-                    files: ['*.ts', '*.tsx', '*.js', '*.jsx', '*.vue'],
-                    rules: { 'vue/multi-word-component-names': 'off' },
-                },
-            ]);
+            if ((0, eslint_file_1.lintConfigHasOverride)(tree, projectRoot, (o) => o.parserOptions && !hasVueFiles(o), true)) {
+                (0, eslint_file_1.updateOverrideInLintConfig)(tree, projectRoot, (o) => !!o.parserOptions, (o) => {
+                    addVueFiles(o);
+                    return o;
+                });
+            }
+            else {
+                (0, eslint_file_1.replaceOverridesInLintConfig)(tree, projectRoot, [
+                    {
+                        files: ['*.ts', '*.tsx', '*.js', '*.jsx', '*.vue'],
+                        rules: { 'vue/multi-word-component-names': 'off' },
+                    },
+                ]);
+            }
         }
     }
     // Edit root config too