@nx/nuxt 19.7.4 → 19.8.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "19.7.4",
+  "version": "19.8.0-beta.1",
   "private": false,
   "description": "The Nuxt plugin for Nx contains executors and generators for managing Nuxt 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": {
     "tslib": "^2.3.0",
     "@nuxt/kit": "^3.10.0",
-    "@nx/devkit": "19.7.4",
-    "@nx/js": "19.7.4",
-    "@nx/eslint": "19.7.4",
-    "@nx/vue": "19.7.4",
-    "@nx/vite": "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/vue": "19.8.0-beta.1",
+    "@nx/vite": "19.8.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "peerDependencies": {},
@@ -51,4 +51,4 @@
   },
   "type": "commonjs",
   "types": "./index.d.ts"
-}
+}

package/src/utils/add-linting.js

@@ -4,8 +4,10 @@ exports.addLinting = addLinting;
 const eslint_1 = require("@nx/eslint");
 const path_1 = require("nx/src/utils/path");
 const devkit_1 = require("@nx/devkit");
-const vue_1 = require("@nx/vue");
+const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const versions_1 = require("./versions");
+const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
+// TODO(colum): Look into the recommended set up using `withNuxt` inside eslint.config.mjs. https://eslint.nuxt.com/packages/config
 async function addLinting(host, options) {
     const tasks = [];
     if (options.linter === 'eslint') {
@@ -19,20 +21,25 @@ async function addLinting(host, options) {
             addPlugin: true,
         });
         tasks.push(lintTask);
-        (0, vue_1.editEslintConfigFiles)(host, options.projectRoot);
-        (0, devkit_1.updateJson)(host, (0, path_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), (json) => {
-            const { extends: pluginExtends, ignorePatterns: pluginIgnorePatters, ...config } = json;
-            return {
-                extends: ['@nuxt/eslint-config', ...(pluginExtends || [])],
-                ignorePatterns: [
-                    ...(pluginIgnorePatters || []),
-                    '.nuxt/**',
-                    '.output/**',
-                    'node_modules',
-                ],
-                ...config,
-            };
-        });
+        if ((0, eslint_file_1.isEslintConfigSupported)(host, options.projectRoot)) {
+            editEslintConfigFiles(host, options.projectRoot);
+            const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, ['@nuxt/eslint-config'], true);
+            tasks.push(addExtendsTask);
+            if ((0, flat_config_1.useFlatConfig)(host)) {
+                (0, eslint_file_1.addOverrideToLintConfig)(host, options.projectRoot, {
+                    files: ['**/*.vue'],
+                    languageOptions: {
+                        parserOptions: { parser: '@typescript-eslint/parser' },
+                    },
+                } // languageOptions is not in eslintrc format but for flat config
+                );
+            }
+            (0, eslint_file_1.addIgnoresToLintConfig)(host, options.projectRoot, [
+                '.nuxt/**',
+                '.output/**',
+                'node_modules',
+            ]);
+        }
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
             '@nuxt/eslint-config': versions_1.nuxtEslintConfigVersion,
         });
@@ -40,3 +47,40 @@ async function addLinting(host, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+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.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: {},
+            },
+        ]);
+    }
+    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;
+        });
+    }
+}

package/src/utils/versions.d.ts

@@ -3,4 +3,4 @@ export declare const h3Version = "^1.8.2";
 export declare const nuxtVersion = "^3.10.0";
 export declare const nuxtDevtoolsVersion = "1.0.0";
 export declare const nuxtUiTemplatesVersion = "^1.3.1";
-export declare const nuxtEslintConfigVersion = "~0.3.6";
+export declare const nuxtEslintConfigVersion = "~0.5.6";

package/src/utils/versions.js

@@ -8,4 +8,4 @@ exports.nuxtVersion = '^3.10.0';
 exports.nuxtDevtoolsVersion = '1.0.0';
 exports.nuxtUiTemplatesVersion = '^1.3.1';
 // linting deps
-exports.nuxtEslintConfigVersion = '~0.3.6';
+exports.nuxtEslintConfigVersion = '~0.5.6';