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

package/dist/src/generators/application/files/app/api/hello/route.ts__tmpl__

@@ -1,4 +1,4 @@
-export async function GET(request: Request) {
+export async function GET(_request: Request) {
     return new Response('Hello, from API!')
   }
   

package/dist/src/generators/application/files/app/page.tsx__tmpl__

@@ -1,3 +1,5 @@
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
 <%_ if (style !== 'none') { var wrapper = 'div'; _%>
 import styles from './page.module.<%= style %>';
 <% } else { var wrapper = 'div'; } %>

package/dist/src/generators/application/files/pages/__fileName__.tsx__tmpl__

@@ -1,3 +1,5 @@
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
 <%_ if (style !== 'none') { var wrapper = 'div'; _%>
 import styles from './<%= fileName %>.module.<%= style %>';
 <% } else { var wrapper = 'div'; } %>

package/dist/src/generators/application/lib/add-e2e.js

@@ -47,7 +47,6 @@ async function addE2e(host, options) {
         }
         const e2eTask = await configurationGenerator(host, {
             ...options,
-            linter: 'eslint',
             project: options.e2eProjectName,
             directory: 'src',
             skipFormat: true,

package/dist/src/generators/application/lib/add-linting.js

@@ -1,27 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
-const eslint_1 = require("@nx/eslint");
 const devkit_1 = require("@nx/devkit");
 const react_1 = require("@nx/react");
 const internal_1 = require("@nx/eslint/internal");
 const version_utils_1 = require("../../../utils/version-utils");
+const internal_2 = require("@nx/js/internal");
 async function addLinting(host, options) {
-    if (options.linter !== 'eslint')
-        return () => { };
     const tasks = [];
-    tasks.push(await (0, eslint_1.lintProjectGenerator)(host, {
+    tasks.push(await (0, internal_2.addLintingToProject)(host, {
+        oxlintPlugins: ['nextjs', 'react', 'react-perf', 'jsx-a11y'],
         linter: options.linter,
         project: options.projectName,
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
         ],
         unitTestRunner: options.unitTestRunner,
-        skipFormat: true,
         rootProject: options.rootProject,
         enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
         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' && (0, internal_1.isEslintConfigSupported)(host)) {
         if ((0, internal_1.useFlatConfig)(host)) {
             (0, internal_1.addPredefinedConfigToFlatLintConfig)(host, options.appProjectRoot, 'flat/react-typescript', { checkBaseConfig: true });
@@ -67,7 +68,7 @@ async function addLinting(host, options) {
             ...(options.isTsSolutionSetup ? ['**/out-tsc'] : []),
         ]);
     }
-    if (!options.skipPackageJson) {
+    if (options.linter === 'eslint' && !options.skipPackageJson) {
         const eslintConfigNextVersion = await (0, version_utils_1.getEslintConfigNextDependenciesVersionsToInstall)(host);
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, react_1.extraEslintDependencies.dependencies, {
             ...react_1.extraEslintDependencies.devDependencies,

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

@@ -39,7 +39,7 @@ async function normalizeOptions(host, options) {
         e2eProjectRoot,
         e2eTestRunner: options.e2eTestRunner || 'playwright',
         fileName,
-        linter: options.linter || 'eslint',
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         outputPath,
         parsedTags,
         projectName: appProjectName,

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';
 import type { SupportedStyles } from '@nx/react';
 
 export interface Schema {
@@ -9,7 +9,7 @@ export interface Schema {
   tags?: string;
   unitTestRunner?: 'jest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   js?: boolean;
   enableTypedLinting?: boolean;
   /**

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

@@ -48,11 +48,9 @@
       }
     },
     "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"
     },
     "skipFormat": {

package/dist/src/generators/library/lib/normalize-options.d.ts

@@ -1,6 +1,8 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
+import type { LinterType } from '@nx/js';
 export interface NormalizedSchema extends Schema {
+    linter: LinterType;
     importPath: string;
     projectRoot: string;
     isUsingTsSolutionConfig: boolean;

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

@@ -19,6 +19,9 @@ async function normalizeOptions(host, options) {
     const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     return {
         ...options,
+        // Resolved after the spread: the framework's ESLint shaping is guarded on
+        // `=== 'eslint'`, and an unresolved `undefined` would skip all of it.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         importPath,
         projectRoot,
         isUsingTsSolutionConfig,

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';
 import type { SupportedStyles } from '@nx/react';
 
 export interface Schema {
@@ -11,7 +11,7 @@ export interface Schema {
   routing?: boolean;
   appProject?: string;
   unitTestRunner: 'jest' | 'vitest' | 'none';
-  linter: Linter | LinterType;
+  linter?: LinterType;
   component?: boolean;
   publishable?: boolean;
   /** @deprecated Use bundler instead. */

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

@@ -56,11 +56,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.7",
   "private": false,
   "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -68,7 +68,7 @@
   },
   "peerDependencies": {
     "next": ">=14.0.0 <17.0.0",
-    "@nx/webpack": "23.2.0-beta.6"
+    "@nx/webpack": "23.2.0-beta.7"
   },
   "peerDependenciesMeta": {
     "@nx/webpack": {
@@ -83,17 +83,17 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@nx/devkit": "23.2.0-beta.6",
-    "@nx/js": "23.2.0-beta.6",
-    "@nx/eslint": "23.2.0-beta.6",
-    "@nx/react": "23.2.0-beta.6",
-    "@nx/web": "23.2.0-beta.6"
+    "@nx/devkit": "23.2.0-beta.7",
+    "@nx/js": "23.2.0-beta.7",
+    "@nx/eslint": "23.2.0-beta.7",
+    "@nx/react": "23.2.0-beta.7",
+    "@nx/web": "23.2.0-beta.7"
   },
   "devDependencies": {
-    "@nx/cypress": "23.2.0-beta.6",
-    "@nx/playwright": "23.2.0-beta.6",
-    "@nx/webpack": "23.2.0-beta.6",
-    "nx": "23.2.0-beta.6"
+    "@nx/cypress": "23.2.0-beta.7",
+    "@nx/playwright": "23.2.0-beta.7",
+    "@nx/webpack": "23.2.0-beta.7",
+    "nx": "23.2.0-beta.7"
   },
   "publishConfig": {
     "access": "public"