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

package/dist/module-federation.d.ts

@@ -1,5 +1,4 @@
-import { withModuleFederation } from '@nx/module-federation/webpack';
-import { withModuleFederationForSSR } from '@nx/module-federation/webpack';
+import { withModuleFederation, withModuleFederationForSSR } from '@nx/module-federation/webpack';
 /**
  * @deprecated Use `@nx/module-federation/webpack` instead. This will be removed in Nx v22.
  */

package/dist/module-federation.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederationForSSR = exports.withModuleFederation = void 0;
 const webpack_1 = require("@nx/module-federation/webpack");
 Object.defineProperty(exports, "withModuleFederation", { enumerable: true, get: function () { return webpack_1.withModuleFederation; } });
-const webpack_2 = require("@nx/module-federation/webpack");
-Object.defineProperty(exports, "withModuleFederationForSSR", { enumerable: true, get: function () { return webpack_2.withModuleFederationForSSR; } });
+Object.defineProperty(exports, "withModuleFederationForSSR", { enumerable: true, get: function () { return webpack_1.withModuleFederationForSSR; } });
 // Support for older generated code: `const withModuleFederation = require('@nx/react/module-federation')`
 /**
  * @deprecated Use `@nx/module-federation/webpack` instead. This will be removed in Nx v22.
@@ -18,4 +17,4 @@ module.exports.withModuleFederation = webpack_1.withModuleFederation;
 /**
  * @deprecated Use `@nx/module-federation/webpack` instead. This will be removed in Nx v22.
  */
-module.exports.withModuleFederationForSSR = webpack_2.withModuleFederationForSSR;
+module.exports.withModuleFederationForSSR = webpack_1.withModuleFederationForSSR;

package/dist/plugins/component-testing/webpack-fallback.js

@@ -78,6 +78,11 @@ const loaderModulesOptions = {
     modules: {
         mode: 'local',
         getLocalIdent: webpack_1.getCSSModuleLocalIdent,
+        // css-loader 7 defaults namedExport to true, and to camel-case-only
+        // locals when it is off. Generated components import the default
+        // export and reference class names as authored, so pin both.
+        namedExport: false,
+        exportLocalsConvention: 'asIs',
     },
     importLoaders: 1,
 };

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

@@ -6,9 +6,8 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const assert_supported_react_version_1 = require("../../utils/assert-supported-react-version");
 const devkit_1 = require("@nx/devkit");
-const internal_2 = require("@nx/devkit/internal");
 const js_1 = require("@nx/js");
-const internal_3 = require("@nx/js/internal");
+const internal_2 = require("@nx/js/internal");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const create_application_files_1 = require("./lib/create-application-files");
@@ -35,7 +34,7 @@ async function applicationGenerator(tree, schema) {
 async function applicationGeneratorInternal(tree, schema) {
     (0, assert_supported_react_version_1.assertSupportedReactVersion)(tree);
     const tasks = [];
-    const addTsPlugin = (0, internal_3.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
@@ -49,22 +48,11 @@ async function applicationGeneratorInternal(tree, schema) {
     options.useReactRouter =
         options.routing && options.bundler === 'vite'
             ? (options.useReactRouter ??
-                (await (0, internal_1.promptWhenInteractive)({
-                    name: 'response',
-                    message: 'Would you like to use react-router for server-side rendering?',
-                    type: 'autocomplete',
-                    choices: [
-                        {
-                            name: 'Yes',
-                            message: 'I want to use react-router   [ https://reactrouter.com/start/framework/routing   ]',
-                        },
-                        {
-                            name: 'No',
-                            message: 'I do not want to use react-router for server-side rendering',
-                        },
-                    ],
-                    initial: 0,
-                }, { response: 'No' }).then((r) => r.response === 'Yes')))
+                ((0, internal_1.isInteractive)()
+                    ? await (0, internal_1.confirmationPrompt)({
+                        message: 'Would you like to use react-router for server-side rendering?',
+                    })
+                    : false))
             : false;
     const initTask = await (0, init_1.default)(tree, {
         ...options,
@@ -76,7 +64,7 @@ async function applicationGeneratorInternal(tree, schema) {
         const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
         const existing = findBuildDefault(nxJson.targetDefaults);
         if (!existing) {
-            (0, internal_2.upsertTargetDefault)(tree, nxJson, {
+            (0, internal_1.upsertTargetDefault)(tree, nxJson, {
                 target: 'build',
                 cache: true,
                 dependsOn: ['^build'],
@@ -84,7 +72,7 @@ async function applicationGeneratorInternal(tree, schema) {
             (0, devkit_1.updateNxJson)(tree, nxJson);
         }
         else if (!existing.dependsOn) {
-            (0, internal_2.upsertTargetDefault)(tree, nxJson, {
+            (0, internal_1.upsertTargetDefault)(tree, nxJson, {
                 target: 'build',
                 dependsOn: ['^build'],
             });
@@ -108,7 +96,7 @@ async function applicationGeneratorInternal(tree, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
-        await (0, internal_3.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(tree, options);
     tasks.push(lintTask);
@@ -157,14 +145,14 @@ async function applicationGeneratorInternal(tree, schema) {
         });
     }
     // Only for the new TS solution
-    (0, internal_3.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+    (0, internal_2.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined, options.useReactRouter ? 'app' : 'src');
-    (0, internal_3.sortPackageJsonFields)(tree, options.appProjectRoot);
+    (0, internal_2.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/dist/src/generators/application/files/nx-welcome/claimed/src/app/nx-welcome.tsx__tmpl__

@@ -5,6 +5,8 @@
  Delete this file and get started with your project!
  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
  export function NxWelcome({ title }: { title: string }) {
   return (
     <>

package/dist/src/generators/application/files/nx-welcome/not-configured/src/app/nx-welcome.tsx__tmpl__

@@ -5,6 +5,8 @@
  Delete this file and get started with your project!
  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
 export function NxWelcome({ title }: { title: string }) {
   return (
     <>

package/dist/src/generators/application/files/nx-welcome/unclaimed/src/app/nx-welcome.tsx__tmpl__

@@ -5,6 +5,8 @@
  Delete this file and get started with your project!
  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
  export function NxWelcome({ title }: { title: string }) {
   return (
     <>

package/dist/src/generators/application/files/react-router-ssr/nx-welcome/claimed/app/nx-welcome.tsx__tmpl__

@@ -5,6 +5,8 @@
  Delete this file and get started with your project!
  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
 export function NxWelcome({ title }: { title: string }) {
   return (
     <>

package/dist/src/generators/application/files/react-router-ssr/nx-welcome/not-configured/app/nx-welcome.tsx__tmpl__

@@ -5,6 +5,8 @@
  Delete this file and get started with your project!
  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
 export function NxWelcome({ title }: { title: string }) {
   return (
     <>

package/dist/src/generators/application/files/react-router-ssr/nx-welcome/unclaimed/app/nx-welcome.tsx__tmpl__

@@ -5,6 +5,8 @@
  Delete this file and get started with your project!
  * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  */
+/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the icons below
+   are inline SVGs, which have no tag to swap the role for. */
  export function NxWelcome({ title }: { title: string }) {
   return (
     <>

package/dist/src/generators/application/lib/add-linting.d.ts

@@ -1,4 +1,3 @@
 import { type Tree, type GeneratorCallback } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function addLinting(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
-export declare function isEslintInstalled(tree: Tree): boolean;

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

@@ -1,31 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
-exports.isEslintInstalled = isEslintInstalled;
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
 const internal_1 = require("@nx/eslint/internal");
-const devkit_2 = require("@nx/devkit");
 const internal_2 = require("@nx/js/internal");
 const lint_1 = require("../../../utils/lint");
 const versions_1 = require("../../../utils/versions");
 async function addLinting(host, options) {
+    if (options.linter === 'none') {
+        return () => { };
+    }
     const tasks = [];
+    tasks.push(await (0, internal_2.addLintingToProject)(host, {
+        oxlintPlugins: ['react', 'react-perf', 'jsx-a11y'],
+        linter: options.linter,
+        project: options.projectName,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+        ],
+        unitTestRunner: options.unitTestRunner,
+        rootProject: options.rootProject,
+        skipPackageJson: options.skipPackageJson,
+        enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
+        addPlugin: options.addPlugin,
+    }));
+    // Predefined configs, `extends` and ignore entries are ESLint concepts with
+    // no equivalent in other linters.
     if (options.linter === 'eslint') {
-        const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
-            linter: options.linter,
-            project: options.projectName,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            ],
-            unitTestRunner: options.unitTestRunner,
-            skipFormat: true,
-            rootProject: options.rootProject,
-            skipPackageJson: options.skipPackageJson,
-            enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
-            addPlugin: options.addPlugin,
-        });
-        tasks.push(lintTask);
         if ((0, internal_1.isEslintConfigSupported)(host)) {
             if ((0, internal_1.useFlatConfig)(host)) {
                 (0, internal_1.addPredefinedConfigToFlatLintConfig)(host, options.appProjectRoot, 'flat/react', { checkBaseConfig: true });
@@ -41,7 +42,7 @@ async function addLinting(host, options) {
             }
         }
         if (!options.skipPackageJson) {
-            const installTask = (0, devkit_2.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies, undefined, true);
+            const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies, undefined, true);
             const addSwcTask = (0, internal_2.addSwcDependencies)(host);
             tasks.push(installTask, addSwcTask);
         }
@@ -49,10 +50,10 @@ async function addLinting(host, options) {
             await ignoreReactRouterFilesInEslintConfig(host, options.appProjectRoot);
         }
     }
-    return (0, devkit_2.runTasksInSerial)(...tasks);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function ignoreReactRouterFilesInEslintConfig(tree, projectRoot) {
-    if (!isEslintInstalled(tree)) {
+    if (!(0, internal_2.detectLinters)(tree).includes('eslint')) {
         return;
     }
     (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
@@ -71,15 +72,3 @@ async function ignoreReactRouterFilesInEslintConfig(tree, projectRoot) {
     const directory = isUsingFlatConfig ? '' : (projectRoot ?? '');
     addIgnoresToLintConfig(tree, directory, ['**/build', '**/.react-router']);
 }
-function isEslintInstalled(tree) {
-    try {
-        require('eslint');
-        return true;
-    }
-    catch { }
-    // it might not be installed yet, but it might be in the tree pending install
-    const { devDependencies, dependencies } = tree.exists('package.json')
-        ? (0, devkit_1.readJson)(tree, 'package.json')
-        : {};
-    return !!devDependencies?.['eslint'] || !!dependencies?.['eslint'];
-}

package/dist/src/generators/application/lib/create-application-files.d.ts

@@ -12,7 +12,6 @@ export declare function getDefaultTemplateVariables(host: Tree, options: Normali
     tags?: string;
     inSourceTests?: boolean;
     e2eTestRunner: 'cypress' | 'playwright' | 'none';
-    linter: import("@nx/eslint").Linter | import("@nx/eslint").LinterType;
     classComponent?: boolean;
     routing?: boolean;
     useReactRouter?: boolean;
@@ -32,6 +31,7 @@ export declare function getDefaultTemplateVariables(host: Tree, options: Normali
     useTsSolution?: boolean;
     formatter?: 'prettier' | 'none';
     useProjectJson?: boolean;
+    linter: import("@nx/js").LinterType;
     projectName: string;
     appProjectRoot: string;
     e2eProjectName: string;

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

@@ -46,17 +46,21 @@ async function normalizeOptions(host, options) {
         names: (0, devkit_1.names)(projectNames.projectSimpleName),
         isUsingTsSolutionConfig,
         useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
+        routing: options.routing ?? false,
+        useReactRouter: options.useReactRouter ?? false,
+        strict: options.strict ?? true,
+        classComponent: options.classComponent ?? false,
+        compiler: options.compiler ?? 'babel',
+        bundler: options.bundler ?? 'webpack',
+        unitTestRunner: options.unitTestRunner ?? 'jest',
+        e2eTestRunner: options.e2eTestRunner ?? 'playwright',
+        inSourceTests: options.minimal || options.inSourceTests,
+        devServerPort: options.devServerPort ?? options.port ?? (0, find_free_port_1.findFreePort)(host),
+        minimal: options.minimal ?? false,
+        // Programmatic callers such as the host and remote generators leave this
+        // unset; the guards downstream read an unresolved `undefined` as "not eslint"
+        // and would half-configure the project.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
     };
-    normalized.routing = normalized.routing ?? false;
-    normalized.useReactRouter = normalized.useReactRouter ?? false;
-    normalized.strict = normalized.strict ?? true;
-    normalized.classComponent = normalized.classComponent ?? false;
-    normalized.compiler = normalized.compiler ?? 'babel';
-    normalized.bundler = normalized.bundler ?? 'webpack';
-    normalized.unitTestRunner = normalized.unitTestRunner ?? 'jest';
-    normalized.e2eTestRunner = normalized.e2eTestRunner ?? 'playwright';
-    normalized.inSourceTests = normalized.minimal || normalized.inSourceTests;
-    normalized.devServerPort ??= options.port ?? (0, find_free_port_1.findFreePort)(host);
-    normalized.minimal = normalized.minimal ?? false;
     return normalized;
 }

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

@@ -1,5 +1,5 @@
 import type { names } from '@nx/devkit';
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import type { SupportedStyles } from '../../../typings/style';
 
 export interface Schema {
@@ -11,7 +11,7 @@ export interface Schema {
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   inSourceTests?: boolean;
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
-  linter: Linter | LinterType;
+  linter?: LinterType;
   classComponent?: boolean;
   routing?: boolean;
   useReactRouter?: boolean;
@@ -41,6 +41,8 @@ export interface Schema {
 }
 
 export interface NormalizedSchema<T extends Schema = Schema> extends T {
+  // `normalizeOptions` always resolves this, so it is no longer optional.
+  linter: LinterType;
   projectName: string;
   appProjectRoot: string;
   e2eProjectName: string;

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

@@ -97,11 +97,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/federate-module/schema.d.ts

@@ -1,4 +1,4 @@
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 
 export interface Schema {
   name: string;
@@ -7,7 +7,7 @@ export interface Schema {
   remoteDirectory?: string;
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   host?: string;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   skipFormat?: boolean;
   style?: SupportedStyles;
   unitTestRunner?: 'jest' | 'vitest' | 'none';

package/dist/src/generators/federate-module/schema.json

@@ -50,10 +50,9 @@
       "alias": "s"
     },
     "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"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "skipFormat": {
       "description": "Skip formatting files.",

package/dist/src/generators/host/lib/setup-ssr-for-host.js

@@ -2,16 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrForHost = setupSsrForHost;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 const create_application_files_1 = require("../../application/lib/create-application-files");
 async function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
     const tasks = [];
-    let project = (0, devkit_2.readProjectConfiguration)(tree, appName);
+    let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     if (options.bundler !== 'rspack') {
         project.targets.serve.executor =
             '@nx/react:module-federation-ssr-dev-server';
-        (0, devkit_2.updateProjectConfiguration)(tree, appName, project);
+        (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
     }
     const pathToModuleFederationSsrFiles = options.typescriptConfiguration
         ? `${options.bundler === 'rspack' ? 'rspack-' : 'webpack-'}module-federation-ssr-ts`
@@ -28,7 +27,7 @@ async function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
             static: !options?.dynamic,
             remotes: defaultRemoteManifest.map(({ name, port }) => {
                 return {
-                    ...(0, devkit_2.names)(name),
+                    ...(0, devkit_1.names)(name),
                     port,
                 };
             }),
@@ -42,13 +41,13 @@ async function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
             browserBuildOutputPath: project.targets.build?.options?.outputPath,
             remotes: defaultRemoteManifest.map(({ name, port }) => {
                 return {
-                    ...(0, devkit_2.names)(name),
+                    ...(0, devkit_1.names)(name),
                     port,
                 };
             }),
         };
-    (0, devkit_2.generateFiles)(tree, (0, devkit_2.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, templateVariables);
-    const installTask = (0, devkit_2.addDependenciesToPackageJson)(tree, {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, templateVariables);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@module-federation/node': versions_1.moduleFederationNodeVersion,
         cors: versions_1.corsVersion,
         isbot: versions_1.isbotVersion,
@@ -56,5 +55,5 @@ async function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
         '@types/express': versions_1.typesExpressVersion,
     }, {}, undefined, true);
     tasks.push(installTask);
-    return (0, devkit_2.runTasksInSerial)(...tasks);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }

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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import type { SupportedStyles } from '../../../typings/style';
 
 export interface Schema {
@@ -9,7 +9,7 @@ export interface Schema {
   e2eTestRunner: 'cypress' | 'playwright' | 'none';
   globalCss?: boolean;
   js?: boolean;
-  linter: Linter | LinterType;
+  linter?: LinterType;
   name?: string;
   remotes?: string[];
   enableTypedLinting?: boolean;
@@ -33,6 +33,8 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  // `normalizeOptions` always resolves this, so it is no longer optional.
+  linter: LinterType;
   appProjectRoot: string;
   e2eProjectName: string;
   projectName: string;

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

@@ -48,10 +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"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "dynamic": {
       "type": "boolean",

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

@@ -1,37 +1,41 @@
 "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/js/internal");
 const lint_1 = require("../../../utils/lint");
-const internal_1 = require("@nx/eslint/internal");
+const internal_2 = require("@nx/eslint/internal");
 async function addLinting(host, options) {
+    if (options.linter === 'none') {
+        return () => { };
+    }
+    const tasks = [];
+    tasks.push(await (0, internal_1.addLintingToProject)(host, {
+        oxlintPlugins: ['react', 'react-perf', 'jsx-a11y'],
+        linter: options.linter,
+        project: options.name,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
+        ],
+        unitTestRunner: options.unitTestRunner,
+        skipPackageJson: options.skipPackageJson,
+        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
+        addPlugin: options.addPlugin,
+    }));
+    // Predefined configs, `extends` and ignore entries are ESLint concepts with
+    // no equivalent in other linters.
     if (options.linter === 'eslint') {
-        const tasks = [];
-        const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
-            linter: options.linter,
-            project: options.name,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
-            ],
-            unitTestRunner: options.unitTestRunner,
-            skipFormat: true,
-            skipPackageJson: options.skipPackageJson,
-            enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
-            addPlugin: options.addPlugin,
-        });
-        tasks.push(lintTask);
-        if ((0, internal_1.isEslintConfigSupported)(host)) {
-            if ((0, internal_1.useFlatConfig)(host)) {
-                (0, internal_1.addPredefinedConfigToFlatLintConfig)(host, options.projectRoot, 'flat/react', { checkBaseConfig: true });
+        if ((0, internal_2.isEslintConfigSupported)(host)) {
+            if ((0, internal_2.useFlatConfig)(host)) {
+                (0, internal_2.addPredefinedConfigToFlatLintConfig)(host, options.projectRoot, 'flat/react', { checkBaseConfig: true });
                 // Add an empty rules object to users know how to add/override rules
-                (0, internal_1.addOverrideToLintConfig)(host, options.projectRoot, {
+                (0, internal_2.addOverrideToLintConfig)(host, options.projectRoot, {
                     files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
                     rules: {},
                 });
             }
             else {
-                const addExtendsTask = (0, internal_1.addExtendsToLintConfig)(host, options.projectRoot, {
+                const addExtendsTask = (0, internal_2.addExtendsToLintConfig)(host, options.projectRoot, {
                     name: 'plugin:@nx/react',
                     needCompatFixup: true,
                 });
@@ -39,17 +43,12 @@ async function addLinting(host, options) {
             }
             // Add out-tsc ignore pattern when using TS solution setup
             if (options.isUsingTsSolutionConfig) {
-                (0, internal_1.addIgnoresToLintConfig)(host, options.projectRoot, ['**/out-tsc']);
+                (0, internal_2.addIgnoresToLintConfig)(host, options.projectRoot, ['**/out-tsc']);
             }
         }
-        let installTask = () => { };
         if (!options.skipPackageJson) {
-            installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies, undefined, true);
-            tasks.push(installTask);
+            tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies, undefined, true));
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    }
-    else {
-        return () => { };
     }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }

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

@@ -33,39 +33,46 @@ async function normalizeOptions(host, options) {
             bundler = 'rollup';
         }
     }
-    const normalized = {
-        ...options,
-        compiler: options.compiler ?? 'babel',
-        bundler,
-        fileName,
-        routePath: `/${projectNames.projectSimpleName}`,
-        name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
-        projectRoot,
-        parsedTags,
-        importPath,
-        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
-    };
-    // Libraries with a bundler or is publishable must also be buildable.
-    normalized.buildable = Boolean(normalized.bundler !== 'none' || options.buildable || options.publishable);
-    normalized.inSourceTests === normalized.minimal || normalized.inSourceTests;
+    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 appSourceRoot = (0, internal_2.getProjectSourceRoot)(appProjectConfig, host);
-        normalized.appMain =
+        appMain =
             appProjectConfig.targets.build?.options?.main ??
                 findMainEntry(host, appProjectConfig.root);
-        normalized.appSourceRoot = (0, devkit_1.normalizePath)(appSourceRoot);
+        appSourceRoot = (0, devkit_1.normalizePath)((0, internal_2.getProjectSourceRoot)(appProjectConfig, host));
         // TODO(jack): We should use appEntryFile instead of appProject so users can directly set it rather than us inferring it.
-        if (!normalized.appMain) {
+        if (!appMain) {
             throw new Error(`Could not locate project main for ${options.appProject}`);
         }
     }
-    (0, assertion_1.assertValidStyle)(normalized.style);
-    normalized.isUsingTsSolutionConfig = isUsingTsSolutionConfig;
+    (0, assertion_1.assertValidStyle)(options.style);
+    const normalized = {
+        ...options,
+        compiler: options.compiler ?? 'babel',
+        bundler,
+        fileName,
+        routePath: `/${projectNames.projectSimpleName}`,
+        name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
+        projectRoot,
+        parsedTags,
+        importPath,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
+        isUsingTsSolutionConfig,
+        js: options.js ?? false,
+        unitTestRunner: options.unitTestRunner ?? 'none',
+        // Libraries with a bundler or that are publishable must also be buildable.
+        buildable: Boolean(bundler !== 'none' || options.buildable || options.publishable),
+        appMain,
+        appSourceRoot,
+        // The React-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),
+    };
     return normalized;
 }
 function findMainEntry(tree, projectRoot) {

package/dist/src/generators/library/lib/update-app-routes.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAppRoutes = updateAppRoutes;
 const devkit_1 = require("@nx/devkit");
 const ast_utils_1 = require("../../../utils/ast-utils");
-const ast_utils_2 = require("../../../utils/ast-utils");
 const maybe_js_1 = require("../../../utils/maybe-js");
 const versions_1 = require("../../../utils/versions");
 const internal_1 = require("@nx/js/internal");
@@ -32,7 +31,7 @@ function updateAppRoutes(host, options) {
         const { content: componentContent, source: componentSource } = readComponent(host, appComponentPath);
         const isComponentRouterPresent = componentContent.match(/react-router-dom/);
         if (!isComponentRouterPresent) {
-            const changes = (0, devkit_1.applyChangesToString)(componentContent, (0, ast_utils_2.addInitialRoutes)(appComponentPath, componentSource));
+            const changes = (0, devkit_1.applyChangesToString)(componentContent, (0, ast_utils_1.addInitialRoutes)(appComponentPath, componentSource));
             host.write(appComponentPath, changes);
         }
     }

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 '../../../typings/style';
 
 export interface Schema {
@@ -12,7 +12,7 @@ export interface Schema {
   importPath?: string;
   inSourceTests?: boolean;
   js?: boolean;
-  linter: Linter | LinterType;
+  linter?: LinterType;
   name?: string;
   publishable?: boolean;
   routing?: boolean;
@@ -34,6 +34,8 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  // `normalizeOptions` always resolves this, so it is no longer optional.
+  linter: LinterType;
   js: boolean;
   name: string;
   fileName: string;

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

@@ -65,11 +65,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/remote/lib/setup-ssr-for-remote.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrForRemote = setupSsrForRemote;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 const create_application_files_1 = require("../../application/lib/create-application-files");
 async function setupSsrForRemote(tree, options, appName) {
     const tasks = [];
-    const project = (0, devkit_2.readProjectConfiguration)(tree, appName);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     const pathToModuleFederationSsrFiles = options.typescriptConfiguration
         ? `${options.bundler === 'rspack' ? 'rspack-' : 'webpack-'}module-federation-ssr-ts`
         : `${options.bundler === 'rspack' ? 'rspack-' : 'webpack-'}module-federation-ssr`;
@@ -29,28 +28,28 @@ async function setupSsrForRemote(tree, options, appName) {
             browserBuildOutputPath: project.targets.build?.options?.outputPath,
             serverBuildOutputPath: project.targets.server?.options?.outputPath,
         };
-    (0, devkit_2.generateFiles)(tree, (0, devkit_2.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, templateVariables);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, templateVariables);
     // For hosts to use when running remotes in static mode.
     const originalOutputPath = (project.targets.build?.options?.outputPath ??
         options.isUsingTsSolutionConfig)
         ? 'dist'
-        : (0, devkit_2.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), 'dist', options.appProjectRoot != '.'
+        : (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), 'dist', options.appProjectRoot != '.'
             ? options.appProjectRoot
             : options.projectName);
     const serverOptions = project.targets.server?.options;
     const serverOutputPath = serverOptions?.outputPath ??
-        (0, devkit_2.joinPathFragments)(originalOutputPath, 'server');
+        (0, devkit_1.joinPathFragments)(originalOutputPath, 'server');
     const serverOutputName = serverOptions?.outputFileName ?? 'main.js';
     project.targets['serve-static'] = {
         dependsOn: ['build', 'server'],
         executor: 'nx:run-commands',
         defaultConfiguration: 'development',
         options: {
-            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_2.joinPathFragments)(serverOutputPath, serverOutputName)}`,
+            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_1.joinPathFragments)(serverOutputPath, serverOutputName)}`,
         },
     };
-    (0, devkit_2.updateProjectConfiguration)(tree, appName, project);
-    const installTask = (0, devkit_2.addDependenciesToPackageJson)(tree, {
+    (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@module-federation/node': versions_1.moduleFederationNodeVersion,
         cors: versions_1.corsVersion,
         isbot: versions_1.isbotVersion,
@@ -58,5 +57,5 @@ async function setupSsrForRemote(tree, options, appName) {
         '@types/express': versions_1.typesExpressVersion,
     }, {}, undefined, true);
     tasks.push(installTask);
-    return (0, devkit_2.runTasksInSerial)(...tasks);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }

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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import type { SupportedStyles } from '../../../typings/style';
 import type { NormalizedSchema as ApplicationNormalizedSchema } from '../application/schema';
 
@@ -11,7 +11,7 @@ export interface Schema {
   globalCss?: boolean;
   host?: string;
   js?: boolean;
-  linter: Linter | LinterType;
+  linter?: LinterType;
   name?: string;
   routing?: boolean;
   enableTypedLinting?: boolean;

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

@@ -54,10 +54,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"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "routing": {
       "type": "boolean",

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/ast-utils.js

@@ -257,12 +257,12 @@ function addInitialRoutes(sourcePath, source, addBrowserRouter) {
     <br/>
     <hr/>
     <br/>
-    <div role="navigation">
+    <nav>
       <ul>
         <li><Link to="/">Home</Link></li>
         <li><Link to="/page-2">Page 2</Link></li>
       </ul>
-    </div>
+    </nav>
     <Routes>
       <Route
         path="/"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.8",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -96,7 +96,7 @@
     "react-dom": ">=18.0.0 <20.0.0",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.7",
-    "@nx/module-federation": "23.2.0-beta.6"
+    "@nx/module-federation": "23.2.0-beta.8"
   },
   "peerDependenciesMeta": {
     "babel-plugin-react-compiler": {
@@ -118,27 +118,27 @@
     "minimatch": "10.2.5",
     "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/web": "23.2.0-beta.6"
+    "@nx/devkit": "23.2.0-beta.8",
+    "@nx/js": "23.2.0-beta.8",
+    "@nx/eslint": "23.2.0-beta.8",
+    "@nx/web": "23.2.0-beta.8"
   },
   "devDependencies": {
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.7",
-    "@nx/cypress": "23.2.0-beta.6",
-    "@nx/module-federation": "23.2.0-beta.6",
-    "@nx/playwright": "23.2.0-beta.6",
-    "@nx/rollup": "23.2.0-beta.6",
-    "@nx/rsbuild": "23.2.0-beta.6",
-    "@nx/vite": "23.2.0-beta.6",
-    "@nx/vitest": "23.2.0-beta.6",
-    "@nx/webpack": "23.2.0-beta.6",
-    "@nx/storybook": "23.2.0-beta.6",
-    "nx": "23.2.0-beta.6"
+    "@nx/cypress": "23.2.0-beta.8",
+    "@nx/module-federation": "23.2.0-beta.8",
+    "@nx/playwright": "23.2.0-beta.8",
+    "@nx/rollup": "23.2.0-beta.8",
+    "@nx/rsbuild": "23.2.0-beta.8",
+    "@nx/vite": "23.2.0-beta.8",
+    "@nx/vitest": "23.2.0-beta.8",
+    "@nx/webpack": "23.2.0-beta.8",
+    "@nx/storybook": "23.2.0-beta.8",
+    "nx": "23.2.0-beta.8"
   },
   "optionalDependencies": {
-    "@nx/vite": "23.2.0-beta.6"
+    "@nx/vite": "23.2.0-beta.8"
   },
   "publishConfig": {
     "access": "public"