@nx/nuxt 23.2.0-beta.6 → 23.2.0-beta.7

package/dist/src/generators/application/application.js

@@ -120,7 +120,7 @@ async function applicationGeneratorInternal(tree, schema) {
     tasks.push(await (0, add_linting_1.addLinting)(tree, {
         projectName: options.projectName,
         projectRoot: options.appProjectRoot,
-        linter: options.linter ?? 'eslint',
+        linter: options.linter,
         unitTestRunner: options.unitTestRunner,
         rootProject: options.rootProject,
         enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),

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

@@ -39,8 +39,11 @@ async function normalizeOptions(host, options) {
         useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
         useAppDir,
         nuxtMajorVersion,
+        unitTestRunner: options.unitTestRunner ?? 'vitest',
+        e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+        // Resolved here rather than at the `addLinting` call, so every later reader
+        // in this generator sees the same value.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
     };
-    normalized.unitTestRunner ??= 'vitest';
-    normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';
     return normalized;
 }

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

@@ -1,9 +1,9 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface Schema {
   directory: string;
   name?: string;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   formatter?: 'none' | 'prettier';
   skipFormat?: boolean;
   unitTestRunner?: 'vitest' | 'none';
@@ -25,6 +25,8 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
+  // `normalizeOptions` always resolves this, so it is no longer optional.
+  linter: LinterType;
   projectName: string;
   appProjectRoot: string;
   importPath: string;

package/dist/src/generators/application/schema.json

@@ -29,11 +29,9 @@
       "x-priority": "internal"
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "none",
-      "x-prompt": "Which linter would you like to use?",
+      "enum": ["eslint", "oxlint", "none"],
       "x-priority": "important"
     },
     "unitTestRunner": {

package/dist/src/generators/storybook-configuration/schema.d.ts

@@ -1,4 +1,4 @@
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 
 export interface Schema {
   project: string;
@@ -6,7 +6,7 @@ export interface Schema {
   generateStories?: boolean;
   js?: boolean;
   tsConfiguration?: boolean;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   ignorePaths?: string[];
   configureStaticServe?: boolean;
 }

package/dist/src/generators/storybook-configuration/schema.json

@@ -53,8 +53,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint"]
     },
     "ignorePaths": {
       "type": "array",

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

@@ -1,7 +1,7 @@
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 import { GeneratorCallback, Tree } from '@nx/devkit';
 export declare function addLinting(host: Tree, options: {
-    linter: Linter | LinterType;
+    linter: LinterType;
     projectName: string;
     projectRoot: string;
     unitTestRunner?: 'vitest' | 'none';

package/dist/src/utils/add-linting.js

@@ -1,25 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
-const eslint_1 = require("@nx/eslint");
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/eslint/internal");
 const versions_1 = require("./versions");
+const internal_2 = require("@nx/js/internal");
 async function addLinting(host, options) {
     const tasks = [];
+    tasks.push(await (0, internal_2.addLintingToProject)(host, {
+        oxlintPlugins: ['vue'],
+        linter: options.linter,
+        project: options.projectName,
+        tsConfigPaths: [(0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json')],
+        unitTestRunner: options.unitTestRunner,
+        rootProject: options.rootProject,
+        enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
+        addPlugin: true,
+    }));
+    // Everything below configures ESLint — predefined configs, `extends`, ignore
+    // entries — which have no equivalent in other linters.
     if (options.linter === 'eslint') {
         const enableTypedLinting = (0, internal_1.isTypedLintingEnabled)(options);
-        const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
-            linter: options.linter,
-            project: options.projectName,
-            tsConfigPaths: [(0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json')],
-            unitTestRunner: options.unitTestRunner,
-            skipFormat: true,
-            rootProject: options.rootProject,
-            enableTypedLinting,
-            addPlugin: true,
-        });
-        tasks.push(lintTask);
         const isFlatConfig = (0, internal_1.useFlatConfig)(host);
         // Version-aware dependencies:
         // - Flat config (v4+): use @nuxt/eslint-config ^1.10.0 with createConfigForNuxt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.7",
   "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": {
@@ -60,23 +60,23 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
-    "@nx/devkit": "23.2.0-beta.6",
-    "@nx/js": "23.2.0-beta.6",
-    "@nx/eslint": "23.2.0-beta.6",
-    "@nx/vite": "23.2.0-beta.6",
-    "@nx/vue": "23.2.0-beta.6",
-    "@nx/vitest": "23.2.0-beta.6"
+    "@nx/devkit": "23.2.0-beta.7",
+    "@nx/js": "23.2.0-beta.7",
+    "@nx/vite": "23.2.0-beta.7",
+    "@nx/eslint": "23.2.0-beta.7",
+    "@nx/vue": "23.2.0-beta.7",
+    "@nx/vitest": "23.2.0-beta.7"
   },
   "devDependencies": {
     "nuxt": "^3.21.10",
-    "nx": "23.2.0-beta.6"
+    "nx": "23.2.0-beta.7"
   },
   "peerDependencies": {
     "nuxt": ">=3.0.0 <5.0.0",
     "@nuxt/schema": "^3.0.0 || ^4.0.0",
     "@nuxt/kit": "^3.0.0 || ^4.0.0",
-    "@nx/playwright": "23.2.0-beta.6",
-    "@nx/cypress": "23.2.0-beta.6"
+    "@nx/playwright": "23.2.0-beta.7",
+    "@nx/cypress": "23.2.0-beta.7"
   },
   "peerDependenciesMeta": {
     "nuxt": {