@nx/react 23.2.0-beta.0 → 23.2.0-beta.10

package/dist/internal.d.ts

@@ -1,5 +1,6 @@
 export { addE2e } from './src/generators/application/lib/add-e2e';
 export { addRollupBuildTarget } from './src/generators/library/lib/add-rollup-build-target';
+export { assertPackageIsInstalled } from './src/utils/assert-package';
 export { isComponent } from './src/utils/ct-utils';
 export { suppressReactComposeHelperWarnings } from './src/utils/deprecation';
 export { hasWebpackPlugin } from './src/utils/has-webpack-plugin';

package/dist/internal.js

@@ -5,11 +5,13 @@
 // internal consumers and may change without semver protection. Mirrors
 // `@nx/devkit/internal`.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.babelPresetReactVersion = exports.babelCoreVersion = exports.testingLibraryReactVersion = exports.testingLibraryDomVersion = exports.isReact18 = exports.getReactDependenciesVersionsToInstall = exports.hasWebpackPlugin = exports.suppressReactComposeHelperWarnings = exports.isComponent = exports.addRollupBuildTarget = exports.addE2e = void 0;
+exports.babelPresetReactVersion = exports.babelCoreVersion = exports.testingLibraryReactVersion = exports.testingLibraryDomVersion = exports.isReact18 = exports.getReactDependenciesVersionsToInstall = exports.hasWebpackPlugin = exports.suppressReactComposeHelperWarnings = exports.isComponent = exports.assertPackageIsInstalled = exports.addRollupBuildTarget = exports.addE2e = void 0;
 var add_e2e_1 = require("./src/generators/application/lib/add-e2e");
 Object.defineProperty(exports, "addE2e", { enumerable: true, get: function () { return add_e2e_1.addE2e; } });
 var add_rollup_build_target_1 = require("./src/generators/library/lib/add-rollup-build-target");
 Object.defineProperty(exports, "addRollupBuildTarget", { enumerable: true, get: function () { return add_rollup_build_target_1.addRollupBuildTarget; } });
+var assert_package_1 = require("./src/utils/assert-package");
+Object.defineProperty(exports, "assertPackageIsInstalled", { enumerable: true, get: function () { return assert_package_1.assertPackageIsInstalled; } });
 var ct_utils_1 = require("./src/utils/ct-utils");
 Object.defineProperty(exports, "isComponent", { enumerable: true, get: function () { return ct_utils_1.isComponent; } });
 var deprecation_1 = require("./src/utils/deprecation");

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/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -4,18 +4,22 @@ exports.default = moduleFederationDevServer;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/js/internal");
-const internal_3 = require("@nx/module-federation/internal");
-const internal_4 = require("@nx/web/internal");
-const webpack_1 = require("@nx/webpack");
+const internal_3 = require("@nx/web/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const lib_1 = require("./lib");
+const assert_package_1 = require("../../utils/assert-package");
 const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
+const executorName = '@nx/react:module-federation-dev-server';
 async function* moduleFederationDevServer(schema, context) {
+    (0, assert_package_1.assertPackageIsInstalled)('@nx/module-federation', executorName);
+    (0, assert_package_1.assertPackageIsInstalled)('@nx/webpack', executorName);
+    const { startRemoteIterators } = await import('@nx/module-federation/internal');
+    const { devServerExecutor } = await import('@nx/webpack');
     (0, module_federation_deprecation_1.warnReactMfDevServerExecutorDeprecation)();
     const options = (0, lib_1.normalizeOptions)(schema);
     const currIter = options.static
-        ? (0, internal_4.fileServerExecutor)({
+        ? (0, internal_3.fileServerExecutor)({
             ...options,
             parallel: false,
             withDeps: false,
@@ -24,7 +28,7 @@ async function* moduleFederationDevServer(schema, context) {
             cacheSeconds: -1,
         }, context)
         : // TODO(JamesHenry): remove type assertion once the nx repo is updated to use https://github.com/nrwl/nx/pull/33095
-            (0, webpack_1.devServerExecutor)(options, context);
+            devServerExecutor(options, context);
     const p = context.projectsConfigurations.projects[context.projectName];
     let pathToManifestFile = (0, path_1.join)(context.root, (0, internal_2.getProjectSourceRoot)(p), 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
@@ -40,7 +44,7 @@ async function* moduleFederationDevServer(schema, context) {
     if (!options.isInitialHost) {
         return yield* currIter;
     }
-    const { staticRemotesIter, devRemoteIters, remotes } = await (0, internal_3.startRemoteIterators)(options, context, lib_1.startRemotes, pathToManifestFile, 'react');
+    const { staticRemotesIter, devRemoteIters, remotes } = await startRemoteIterators(options, context, lib_1.startRemotes, pathToManifestFile, 'react');
     return yield* (0, internal_1.combineAsyncIterables)(currIter, ...devRemoteIters, ...(staticRemotesIter ? [staticRemotesIter] : []), (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
@@ -56,7 +60,7 @@ async function* moduleFederationDevServer(schema, context) {
             const portsToWaitFor = staticRemotesIter && options.staticRemotesPort
                 ? [options.staticRemotesPort, ...remotes.remotePorts]
                 : [...remotes.remotePorts];
-            await Promise.all(portsToWaitFor.map((port) => (0, internal_4.waitForPortOpen)(port, {
+            await Promise.all(portsToWaitFor.map((port) => (0, internal_3.waitForPortOpen)(port, {
                 retries: 480,
                 retryDelay: 2500,
                 host: host,

package/dist/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js

@@ -4,18 +4,22 @@ exports.default = moduleFederationSsrDevServer;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/js/internal");
-const internal_3 = require("@nx/module-federation/internal");
-const internal_4 = require("@nx/web/internal");
-const internal_5 = require("@nx/webpack/internal");
+const internal_3 = require("@nx/web/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const lib_1 = require("./lib");
+const assert_package_1 = require("../../utils/assert-package");
 const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
+const executorName = '@nx/react:module-federation-ssr-dev-server';
 async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
+    (0, assert_package_1.assertPackageIsInstalled)('@nx/module-federation', executorName);
+    (0, assert_package_1.assertPackageIsInstalled)('@nx/webpack', executorName);
+    const { startRemoteIterators } = await import('@nx/module-federation/internal');
+    const { ssrDevServerExecutor } = await import('@nx/webpack/internal');
     (0, module_federation_deprecation_1.warnReactMfSsrDevServerExecutorDeprecation)();
     const options = (0, lib_1.normalizeOptions)(ssrDevServerOptions);
     // TODO(JamesHenry): remove type assertion once the nx repo is updated to use https://github.com/nrwl/nx/pull/33095
-    let iter = (0, internal_5.ssrDevServerExecutor)(options, context);
+    let iter = ssrDevServerExecutor(options, context);
     const projectConfig = context.projectsConfigurations.projects[context.projectName];
     let pathToManifestFile = (0, path_1.join)(context.root, (0, internal_2.getProjectSourceRoot)(projectConfig), 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
@@ -31,7 +35,7 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
     if (!options.isInitialHost) {
         return yield* iter;
     }
-    const { staticRemotesIter, devRemoteIters, remotes } = await (0, internal_3.startRemoteIterators)(options, context, lib_1.startRemotes, pathToManifestFile, 'react', true);
+    const { staticRemotesIter, devRemoteIters, remotes } = await startRemoteIterators(options, context, lib_1.startRemotes, pathToManifestFile, 'react', true);
     const combined = (0, internal_1.combineAsyncIterables)(staticRemotesIter, ...devRemoteIters);
     let refs = 1 + (devRemoteIters?.length ?? 0);
     for await (const result of combined) {
@@ -59,7 +63,7 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
             const portsToWaitFor = staticRemotesIter && options.staticRemotesPort
                 ? [options.staticRemotesPort, ...remotes.remotePorts]
                 : [...remotes.remotePorts];
-            await Promise.all(portsToWaitFor.map((port) => (0, internal_4.waitForPortOpen)(port, {
+            await Promise.all(portsToWaitFor.map((port) => (0, internal_3.waitForPortOpen)(port, {
                 retries: 480,
                 retryDelay: 2500,
                 host,

package/dist/src/executors/module-federation-static-server/module-federation-static-server.impl.d.ts

@@ -1,5 +1,5 @@
-import { StaticRemotesConfig } from '@nx/module-federation/internal';
-import { ExecutorContext } from 'nx/src/config/misc-interfaces';
+import { ExecutorContext } from '@nx/devkit';
+import type { StaticRemotesConfig } from '@nx/module-federation/internal';
 import { ModuleFederationDevServerOptions } from '../module-federation-dev-server/schema';
 import { ModuleFederationStaticServerSchema } from './schema';
 export declare function startProxies(staticRemotesConfig: StaticRemotesConfig, hostServeOptions: ModuleFederationDevServerOptions, mappedLocationOfHost: string, mappedLocationsOfRemotes: Record<string, string>, sslOptions?: {

package/dist/src/executors/module-federation-static-server/module-federation-static-server.impl.js

@@ -5,8 +5,8 @@ exports.default = moduleFederationStaticServer;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const internal_2 = require("@nx/js/internal");
-const internal_3 = require("@nx/module-federation/internal");
-const internal_4 = require("@nx/web/internal");
+const internal_3 = require("@nx/web/internal");
+const assert_package_1 = require("../../utils/assert-package");
 const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
@@ -157,21 +157,26 @@ function startProxies(staticRemotesConfig, hostServeOptions, mappedLocationOfHos
     devkit_1.logger.info('NX Static Consumer (host) proxy started successfully');
 }
 async function* moduleFederationStaticServer(schema, context) {
+    const executorName = '@nx/react:module-federation-static-server';
+    (0, assert_package_1.assertPackageIsInstalled)('@nx/module-federation', executorName);
+    (0, assert_package_1.assertPackageIsInstalled)('express', executorName);
+    (0, assert_package_1.assertPackageIsInstalled)('http-proxy-middleware', executorName);
+    const { buildStaticRemotes, getModuleFederationConfig, getRemotes, parseStaticRemotesConfig, } = await import('@nx/module-federation/internal');
     (0, module_federation_deprecation_1.warnReactMfStaticServerExecutorDeprecation)();
     // Force Node to resolve to look for the nx binary that is inside node_modules
     const nxBin = require.resolve('nx/bin/nx');
     // Get the remotes from the module federation config
     const p = context.projectsConfigurations.projects[context.projectName];
     const options = getBuildAndServeOptionsFromServeTarget(schema.serveTarget, context);
-    const moduleFederationConfig = (0, internal_3.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
-    const remotes = (0, internal_3.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
+    const moduleFederationConfig = getModuleFederationConfig(options.buildOptions.tsConfig, context.root, p.root, 'react');
+    const remotes = getRemotes([], options.serveOptions.skipRemotes, moduleFederationConfig, {
         projectName: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
     }, options.pathToManifestFile);
-    const staticRemotesConfig = (0, internal_3.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const staticRemotesConfig = parseStaticRemotesConfig([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     options.serveOptions.staticRemotesPort ??= remotes.staticRemotePort;
-    const mappedLocationsOfStaticRemotes = await (0, internal_3.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
+    const mappedLocationsOfStaticRemotes = await buildStaticRemotes(staticRemotesConfig, nxBin, context, options.serveOptions);
     // Build the host
     const hostUrlSegment = (0, path_1.basename)(options.buildOptions.outputPath);
     const mappedLocationOfHost = `http${options.serveOptions.ssl ? 's' : ''}://${options.serveOptions.host}:${options.serveOptions.staticRemotesPort}/${hostUrlSegment}`;
@@ -179,7 +184,7 @@ async function* moduleFederationStaticServer(schema, context) {
     // Move to a temporary directory
     const commonOutputDirectory = moveToTmpDirectory(staticRemotesConfig, options.buildOptions.outputPath, hostUrlSegment);
     // File Serve the temporary directory
-    const staticFileServerIter = (0, internal_4.fileServerExecutor)({
+    const staticFileServerIter = (0, internal_3.fileServerExecutor)({
         cors: true,
         watch: false,
         staticFilePath: commonOutputDirectory,
@@ -205,7 +210,7 @@ async function* moduleFederationStaticServer(schema, context) {
         const baseUrl = `http${options.serveOptions.ssl ? 's' : ''}://${host}:${options.serveOptions.port}`;
         if (remotes.remotePorts.length === 0) {
             const portsToWaitFor = [options.serveOptions.staticRemotesPort];
-            await Promise.all(portsToWaitFor.map((port) => (0, internal_4.waitForPortOpen)(port, {
+            await Promise.all(portsToWaitFor.map((port) => (0, internal_3.waitForPortOpen)(port, {
                 retries: 480,
                 retryDelay: 2500,
                 host: host,
@@ -219,7 +224,7 @@ async function* moduleFederationStaticServer(schema, context) {
             const portsToWaitFor = staticFileServerIter && options.serveOptions.staticRemotesPort
                 ? [options.serveOptions.staticRemotesPort, ...remotes.remotePorts]
                 : [...remotes.remotePorts];
-            await Promise.all(portsToWaitFor.map((port) => (0, internal_4.waitForPortOpen)(port, {
+            await Promise.all(portsToWaitFor.map((port) => (0, internal_3.waitForPortOpen)(port, {
                 retries: 480,
                 retryDelay: 2500,
                 host: host,

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,13 +34,12 @@ 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',
         skipFormat: true,
         addTsPlugin,
-        formatter: schema.formatter,
         platform: 'web',
     });
     tasks.push(jsInitTask);
@@ -49,22 +47,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 +63,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 +71,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 +95,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 +144,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/common/app/entry.server.tsx__tmpl__

@@ -20,7 +20,7 @@ export default function handleRequest(
   responseStatusCode: number,
   responseHeaders: Headers,
   routerContext: EntryContext,
-  loadContext: AppLoadContext
+  _loadContext: AppLoadContext
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;

package/dist/src/generators/application/files/react-router-ssr/common/tests/routes/_index.spec.tsx__tmpl__

@@ -1,5 +1,5 @@
 import { createRoutesStub } from 'react-router';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import App from '../../app/app';
 
 test('renders loader data', async () => {
@@ -12,5 +12,5 @@ test('renders loader data', async () => {
 
   render(<ReactRouterStub />);
 
-  await waitFor(() => screen.findByText('Hello there,'));
+  expect(await screen.findByText('Hello there,')).toBeTruthy();
 });

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-e2e.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
+const internal_1 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
 const web_1 = require("@nx/web");
 const versions_1 = require("../../../utils/versions");
@@ -92,6 +93,7 @@ async function addE2e(tree, options) {
                 baseUrl: e2eWebServerInfo.e2eWebServerAddress,
                 jsx: true,
                 rootProject: options.rootProject,
+                enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
                 webServerCommands: {
                     default: e2eWebServerInfo.e2eWebServerCommand,
                     production: e2eWebServerInfo.e2eCiWebServerCommand,
@@ -133,7 +135,7 @@ async function addE2e(tree, options) {
                 directory: 'src',
                 js: false,
                 linter: options.linter,
-                setParserOptionsProject: options.setParserOptionsProject,
+                enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
                 webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
                 webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
                 rootProject: options.rootProject,

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,30 +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,
-            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 });
@@ -40,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);
         }
@@ -48,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);
@@ -70,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,13 +12,13 @@ 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;
     skipNxJson?: boolean;
     globalCss?: boolean;
     strict?: boolean;
+    enableTypedLinting?: boolean;
     setParserOptionsProject?: boolean;
     compiler?: 'babel' | 'swc';
     remotes?: string[];
@@ -29,8 +29,9 @@ export declare function getDefaultTemplateVariables(host: Tree, options: Normali
     minimal?: boolean;
     nxCloudToken?: string;
     useTsSolution?: boolean;
-    formatter?: 'prettier' | 'none';
+    formatter?: 'prettier' | 'oxfmt' | 'none';
     useProjectJson?: boolean;
+    linter: import("@nx/js").LinterType;
     projectName: string;
     appProjectRoot: string;
     e2eProjectName: string;

package/dist/src/generators/application/lib/create-application-files.js

@@ -11,10 +11,10 @@ const get_in_source_vitest_tests_template_1 = require("../../../utils/get-in-sou
 const maybe_js_1 = require("../../../utils/maybe-js");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const get_app_tests_1 = require("./get-app-tests");
-const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 const has_rspack_plugin_1 = require("../../../utils/has-rspack-plugin");
 const internal_1 = require("@nx/js/internal");
 const versions_1 = require("../../../utils/versions");
+const internal_2 = require("@nx/devkit/internal");
 function getDefaultTemplateVariables(host, options) {
     const hasStyleFile = ['scss', 'css'].includes(options.style);
     const appTests = (0, get_app_tests_1.getAppTests)(options);
@@ -69,9 +69,9 @@ async function createApplicationFiles(host, options) {
     else {
         styleSolutionSpecificAppFiles = '../files/style-css-module';
     }
-    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(host, options.nxCloudToken);
+    const onBoardingStatus = await (0, internal_2.createNxCloudOnboardingURLForWelcomeApp)(host, options.nxCloudToken);
     const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
-        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
+        (await (0, internal_2.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     const relativePathToRootTsConfig = (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot);
     const templateVariables = getDefaultTemplateVariables(host, options);
     if (options.bundler === 'vite' && !options.useReactRouter) {

package/dist/src/generators/application/lib/find-free-port.d.ts

@@ -1,2 +1,2 @@
-import { Tree } from 'nx/src/generators/tree';
+import { Tree } from '@nx/devkit';
 export declare function findFreePort(host: Tree): number;

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;
 }