@nx/react-native 23.2.0-beta.6 → 23.2.0-beta.7

package/dist/src/generators/application/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 Omit<Schema, 'useTsSolution'> {
+    linter: LinterType;
     className: string;
     fileName: string;
     projectName: string;

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

@@ -29,6 +29,10 @@ async function normalizeOptions(host, options) {
     const entryFile = options.js ? 'src/main.js' : 'src/main.tsx';
     return {
         ...options,
+        // Resolved after the spread: `undefined` is falsy, so the ESLint arm in
+        // add-linting would still run while the `=== 'eslint'` tsconfig excludes
+        // downstream are skipped.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         name: projectNames.projectSimpleName,
         className,
         fileName,

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: 'jest' | 'none'; // default is jest
   classComponent?: boolean;
   js?: boolean;
-  linter: Linter | LinterType;
+  linter?: LinterType;
   enableTypedLinting?: boolean;
   /**
    * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.

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

@@ -41,10 +41,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",
+      "enum": ["eslint", "oxlint", "none"],
       "x-priority": "important"
     },
     "unitTestRunner": {

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;
     name: string;
     fileName: string;
     projectRoot: string;

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

@@ -22,6 +22,10 @@ async function normalizeOptions(host, options) {
     const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     const normalized = {
         ...options,
+        // Resolved in the literal so the type guarantees it: `undefined` is falsy,
+        // so the ESLint arm would still run while the `=== 'eslint'` tsconfig
+        // excludes below are skipped.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         fileName: projectName,
         routePath: `/${projectNames.projectSimpleName}`,
         name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,

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';
 
 /**
  * Same as the @nx/react library schema, except it removes keys: style, component, routing, appProject
@@ -10,7 +10,7 @@ export interface Schema {
   skipFormat: boolean;
   tags?: string;
   unitTestRunner: 'jest' | 'none';
-  linter: Linter | LinterType;
+  linter?: LinterType;
   publishable?: boolean;
   buildable?: boolean;
   importPath?: string;

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

@@ -29,11 +29,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/utils/add-linting.d.ts

@@ -1,7 +1,7 @@
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 import { GeneratorCallback, Tree } from '@nx/devkit';
 interface NormalizedSchema {
-    linter?: Linter | LinterType;
+    linter?: LinterType;
     projectName: string;
     projectRoot: string;
     enableTypedLinting?: boolean;
@@ -10,6 +10,7 @@ interface NormalizedSchema {
      */
     setParserOptionsProject?: boolean;
     tsConfigPaths: string[];
+    unitTestRunner?: string;
     skipPackageJson?: boolean;
     addPlugin?: boolean;
     buildable?: boolean;

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

@@ -1,26 +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 internal_2 = require("@nx/js/internal");
 async function addLinting(host, options) {
-    if (options.linter === 'none') {
-        return () => { };
-    }
     const tasks = [];
-    const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
+    tasks.push(await (0, internal_2.addLintingToProject)(host, {
+        oxlintPlugins: ['react', 'react-perf'],
         linter: options.linter,
         project: options.projectName,
         tsConfigPaths: options.tsConfigPaths,
-        skipFormat: true,
+        unitTestRunner: options.unitTestRunner,
         skipPackageJson: options.skipPackageJson,
         enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
         addPlugin: options.addPlugin,
         addPackageJsonDependencyChecks: options.buildable,
-    });
-    tasks.push(lintTask);
+    }));
+    // Everything below configures ESLint — predefined configs, `extends`, ignore
+    // entries — which have no equivalent in other linters.
+    if (options.linter && options.linter !== 'eslint') {
+        return (0, devkit_1.runTasksInSerial)(...tasks);
+    }
     // Add ignored dependencies and files to dependency-checks rule
     if ((0, internal_1.isEslintConfigSupported)(host)) {
         (0, internal_1.updateOverrideInLintConfig)(host, options.projectRoot, (override) => Boolean(override.rules?.['@nx/dependency-checks']), (override) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.7",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -62,10 +62,10 @@
     "tinyglobby": "^0.2.12",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.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/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"
   },
   "peerDependencies": {
     "react-native": ">=0.83.0 <0.85.0",
@@ -78,12 +78,12 @@
     }
   },
   "devDependencies": {
-    "@nx/webpack": "23.2.0-beta.6",
-    "nx": "23.2.0-beta.6"
+    "@nx/webpack": "23.2.0-beta.7",
+    "nx": "23.2.0-beta.7"
   },
   "optionalDependencies": {
-    "@nx/detox": "23.2.0-beta.6",
-    "@nx/rollup": "23.2.0-beta.6"
+    "@nx/rollup": "23.2.0-beta.7",
+    "@nx/detox": "23.2.0-beta.7"
   },
   "executors": "./executors.json",
   "ng-update": {