@nx/vue 23.2.0-beta.6 → 23.2.0-beta.8

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

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

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

@@ -29,11 +29,14 @@ async function normalizeOptions(host, options) {
         parsedTags,
         isUsingTsSolutionConfig,
         useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
+        style: options.style ?? 'css',
+        routing: options.routing ?? false,
+        unitTestRunner: options.unitTestRunner ?? 'vitest',
+        e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+        bundler: options.bundler ?? 'vite',
+        // Resolved here rather than at the `addLinting` call, so the `=== 'eslint'`
+        // check that builds the tsconfig excludes reads the same value.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
     };
-    normalized.style = options.style ?? 'css';
-    normalized.routing = normalized.routing ?? false;
-    normalized.unitTestRunner ??= 'vitest';
-    normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';
-    normalized.bundler = normalized.bundler ?? 'vite';
     return normalized;
 }

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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface Schema {
   directory: string;
@@ -10,7 +10,7 @@ export interface Schema {
   unitTestRunner?: 'vitest' | 'none';
   inSourceTests?: boolean;
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
-  linter: Linter | LinterType;
+  linter?: LinterType;
   formatter?: 'none' | 'prettier';
   routing?: boolean;
   js?: boolean;
@@ -29,6 +29,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

@@ -78,11 +78,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/library/lib/normalize-options.js

@@ -27,11 +27,29 @@ async function normalizeOptions(host, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
+    let appMain;
+    let appSourceRoot;
+    if (options.appProject) {
+        const appProjectConfig = (0, devkit_1.getProjects)(host).get(options.appProject);
+        const appProjectType = (0, internal_2.getProjectType)(host, appProjectConfig.root, appProjectConfig.projectType);
+        if (appProjectType !== 'application') {
+            throw new Error(`appProject expected type of "application" but got "${appProjectType}"`);
+        }
+        const projectSourceRoot = (0, internal_2.getProjectSourceRoot)(appProjectConfig, host);
+        try {
+            appMain = appProjectConfig.targets.build.options.main;
+            appSourceRoot = (0, devkit_1.normalizePath)(projectSourceRoot);
+        }
+        catch (e) {
+            throw new Error(`Could not locate project main for ${options.appProject}`);
+        }
+    }
     const normalized = {
         addPlugin,
         ...options,
         projectName: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
-        bundler,
+        // Libraries with a bundler or that are publishable must also be buildable.
+        bundler: bundler !== 'none' || options.publishable ? 'vite' : 'none',
         fileName,
         routePath: `/${projectNames.projectFileName}`,
         name: projectName,
@@ -40,25 +58,12 @@ async function normalizeOptions(host, options) {
         importPath,
         isUsingTsSolutionConfig,
         useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
+        js: options.js ?? false,
+        appMain,
+        appSourceRoot,
+        // Framework-specific ESLint shaping is guarded on `=== 'eslint'`, so an
+        // unresolved `undefined` would create a bare config with none of it.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
     };
-    // Libraries with a bundler or is publishable must also be buildable.
-    normalized.bundler =
-        normalized.bundler !== 'none' || options.publishable ? 'vite' : 'none';
-    normalized.inSourceTests === normalized.minimal || normalized.inSourceTests;
-    if (options.appProject) {
-        const appProjectConfig = (0, devkit_1.getProjects)(host).get(options.appProject);
-        const appProjectType = (0, internal_2.getProjectType)(host, appProjectConfig.root, appProjectConfig.projectType);
-        if (appProjectType !== 'application') {
-            throw new Error(`appProject expected type of "application" but got "${appProjectType}"`);
-        }
-        const appSourceRoot = (0, internal_2.getProjectSourceRoot)(appProjectConfig, host);
-        try {
-            normalized.appMain = appProjectConfig.targets.build.options.main;
-            normalized.appSourceRoot = (0, devkit_1.normalizePath)(appSourceRoot);
-        }
-        catch (e) {
-            throw new Error(`Could not locate project main for ${options.appProject}`);
-        }
-    }
     return normalized;
 }

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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface Schema {
   appProject?: string;
@@ -8,7 +8,7 @@ export interface Schema {
   importPath?: string;
   inSourceTests?: boolean;
   js?: boolean;
-  linter: Linter | LinterType;
+  linter?: LinterType;
   name?: string;
   publishable?: boolean;
   routing?: boolean;
@@ -33,7 +33,7 @@ export interface NormalizedSchema extends Schema {
   js: boolean;
   name: string;
   projectName: string;
-  linter: Linter | LinterType;
+  linter: LinterType;
   fileName: string;
   projectRoot: string;
   routePath: string;

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

@@ -33,11 +33,9 @@
       "x-priority": "important"
     },
     "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 StorybookConfigureSchema {
   project: string;
@@ -6,7 +6,7 @@ export interface StorybookConfigureSchema {
   generateStories?: boolean;
   js?: boolean;
   tsConfiguration?: boolean;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   ignorePaths?: string[];
   configureStaticServe?: boolean;
   addPlugin?: 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 { GeneratorCallback, Tree } from '@nx/devkit';
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 export declare function addLinting(host: Tree, options: {
-    linter: Linter | LinterType;
+    linter: LinterType;
     name: string;
     projectRoot: string;
     unitTestRunner?: 'vitest' | 'none';

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

@@ -2,25 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
 const internal_1 = require("@nx/eslint/internal");
 const versions_1 = require("./versions");
+const internal_2 = require("@nx/js/internal");
 async function addLinting(host, options, projectType) {
+    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.${projectType}.json`),
+        ],
+        unitTestRunner: options.unitTestRunner,
+        enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
+        rootProject: options.rootProject,
+        addPlugin: options.addPlugin,
+        skipPackageJson: options.skipPackageJson,
+    }));
+    // Everything below configures ESLint — predefined configs, `extends`, ignore
+    // entries — which have no equivalent in other linters.
     if (options.linter === 'eslint') {
-        const tasks = [];
-        const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
-            linter: options.linter,
-            project: options.projectName,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, `tsconfig.${projectType}.json`),
-            ],
-            unitTestRunner: options.unitTestRunner,
-            skipFormat: true,
-            enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
-            rootProject: options.rootProject,
-            addPlugin: options.addPlugin,
-        });
-        tasks.push(lintTask);
         if ((0, internal_1.useFlatConfig)(host)) {
         }
         else {
@@ -47,11 +49,8 @@ async function addLinting(host, options, projectType) {
             const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies, undefined, true);
             tasks.push(installTask);
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    }
-    else {
-        return () => { };
     }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function editEslintConfigFiles(tree, projectRoot) {
     const hasVueFiles = (o) => o.files &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vue",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.8",
   "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": {
@@ -63,15 +63,15 @@
   "dependencies": {
     "picomatch": "4.0.4",
     "tslib": "^2.3.0",
-    "@nx/eslint": "23.2.0-beta.6",
-    "@nx/devkit": "23.2.0-beta.6",
-    "@nx/js": "23.2.0-beta.6",
-    "@nx/vite": "23.2.0-beta.6",
-    "@nx/vitest": "23.2.0-beta.6",
-    "@nx/web": "23.2.0-beta.6"
+    "@nx/js": "23.2.0-beta.8",
+    "@nx/eslint": "23.2.0-beta.8",
+    "@nx/vitest": "23.2.0-beta.8",
+    "@nx/vite": "23.2.0-beta.8",
+    "@nx/devkit": "23.2.0-beta.8",
+    "@nx/web": "23.2.0-beta.8"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.6"
+    "nx": "23.2.0-beta.8"
   },
   "publishConfig": {
     "access": "public"
@@ -81,10 +81,10 @@
     "vue-router": "^4.0.0",
     "vue-tsc": "^2.0.0",
     "@vitejs/plugin-vue": "^5.0.0 || ^6.0.0",
-    "@nx/cypress": "23.2.0-beta.6",
-    "@nx/rsbuild": "23.2.0-beta.6",
-    "@nx/playwright": "23.2.0-beta.6",
-    "@nx/storybook": "23.2.0-beta.6"
+    "@nx/cypress": "23.2.0-beta.8",
+    "@nx/playwright": "23.2.0-beta.8",
+    "@nx/storybook": "23.2.0-beta.8",
+    "@nx/rsbuild": "23.2.0-beta.8"
   },
   "peerDependenciesMeta": {
     "@nx/cypress": {