@nx/vue 19.2.0-rc.0 → 19.2.0

package/package.json

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

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

@@ -10,4 +10,4 @@ export declare function addLinting(host: Tree, options: {
     rootProject?: boolean;
     addPlugin?: boolean;
 }, projectType: 'lib' | 'app'): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function editEslintConfigFiles(tree: Tree, projectRoot: string, rootProject?: boolean): void;
+export declare function editEslintConfigFiles(tree: Tree, projectRoot: string): void;

package/src/utils/add-linting.js

@@ -20,15 +20,13 @@ async function addLinting(host, options, projectType) {
             rootProject: options.rootProject,
             addPlugin: options.addPlugin,
         });
-        if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-            (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, [
-                'plugin:vue/vue3-essential',
-                'eslint:recommended',
-                '@vue/eslint-config-typescript',
-                '@vue/eslint-config-prettier/skip-formatting',
-            ]);
-        }
-        editEslintConfigFiles(host, options.projectRoot, options.rootProject);
+        (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, [
+            'plugin:vue/vue3-essential',
+            'eslint:recommended',
+            '@vue/eslint-config-typescript',
+            '@vue/eslint-config-prettier/skip-formatting',
+        ]);
+        editEslintConfigFiles(host, options.projectRoot);
         let installTask = () => { };
         if (!options.skipPackageJson) {
             installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
@@ -40,78 +38,46 @@ async function addLinting(host, options, projectType) {
     }
 }
 exports.addLinting = addLinting;
-function editEslintConfigFiles(tree, projectRoot, rootProject) {
-    if (tree.exists((0, path_1.joinPathFragments)(projectRoot, 'eslint.config.js'))) {
-        const fileName = (0, path_1.joinPathFragments)(projectRoot, 'eslint.config.js');
-        (0, devkit_1.updateJson)(tree, fileName, (json) => {
-            let updated = false;
-            for (let override of json.overrides) {
-                if (override.parserOptions) {
-                    if (!override.files.includes('*.vue')) {
-                        override.files.push('*.vue');
-                    }
-                    updated = true;
-                }
-            }
-            if (!updated) {
-                json.overrides = [
-                    {
-                        files: ['*.ts', '*.tsx', '*.js', '*.jsx', '*.vue'],
-                        rules: { 'vue/multi-word-component-names': 'off' },
-                    },
-                ];
-            }
-            return json;
-        });
-    }
-    else {
-        const fileName = (0, path_1.joinPathFragments)(projectRoot, '.eslintrc.json');
-        (0, devkit_1.updateJson)(tree, fileName, (json) => {
-            let updated = false;
-            for (let override of json.overrides) {
-                if (override.parserOptions) {
-                    if (!override.files.includes('*.vue')) {
-                        override.files.push('*.vue');
-                    }
-                    updated = true;
-                }
-            }
-            if (!updated) {
-                json.overrides = [
-                    {
-                        files: ['*.ts', '*.tsx', '*.js', '*.jsx', '*.vue'],
-                        rules: { 'vue/multi-word-component-names': 'off' },
-                    },
-                ];
-            }
-            return json;
-        });
+function editEslintConfigFiles(tree, projectRoot) {
+    const hasVueFiles = (o) => o.files &&
+        (Array.isArray(o.files)
+            ? o.files.some((f) => f.endsWith('*.vue'))
+            : o.files.endsWith('*.vue'));
+    const addVueFiles = (o) => {
+        if (!o.files) {
+            o.files = ['*.vue'];
+        }
+        else if (Array.isArray(o.files)) {
+            o.files.push('*.vue');
+        }
+        else {
+            o.files = [o.files, '*.vue'];
+        }
+    };
+    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;
+            });
+        }
+        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
-    if (tree.exists('.eslintrc.base.json')) {
-        (0, devkit_1.updateJson)(tree, '.eslintrc.base.json', (json) => {
-            for (let override of json.overrides) {
-                if (override.rules &&
-                    '@nx/enforce-module-boundaries' in override.rules) {
-                    if (!override.files.includes('*.vue')) {
-                        override.files.push('*.vue');
-                    }
-                }
-            }
-            return json;
-        });
+    if (!(0, eslint_file_1.isEslintConfigSupported)(tree)) {
+        return;
     }
-    else if (tree.exists('.eslintrc.json') && !rootProject) {
-        (0, devkit_1.updateJson)(tree, '.eslintrc.json', (json) => {
-            for (let override of json.overrides) {
-                if (override.rules &&
-                    '@nx/enforce-module-boundaries' in override.rules) {
-                    if (!override.files.includes('*.vue')) {
-                        override.files.push('*.vue');
-                    }
-                }
-            }
-            return json;
+    if ((0, eslint_file_1.lintConfigHasOverride)(tree, '', (o) => o.rules?.['@nx/enforce-module-boundaries'] && !hasVueFiles(o), true)) {
+        (0, eslint_file_1.updateOverrideInLintConfig)(tree, '', (o) => !!o.rules?.['@nx/enforce-module-boundaries'], (o) => {
+            addVueFiles(o);
+            return o;
         });
     }
 }