@nx/expo 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, 'name' | 'useTsSolution'> {
+    linter: LinterType;
     className: string;
     simpleName: string;
     projectName: string;

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

@@ -27,6 +27,10 @@ async function normalizeOptions(host, options) {
     const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     return {
         ...options,
+        // Resolved after the spread: `undefined` is falsy, so the ESLint arm in
+        // add-linting would still run while the `=== 'eslint'` tsconfig excludes
+        // below are skipped.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         unitTestRunner: options.unitTestRunner || 'jest',
         e2eTestRunner: options.e2eTestRunner || 'none',
         simpleName: projectNames.projectSimpleName,

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

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

@@ -41,11 +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",
-      "x-prompt": "Which linter would you like to use?",
+      "enum": ["eslint", "oxlint", "none"],
       "x-priority": "important"
     },
     "unitTestRunner": {

package/dist/src/generators/library/lib/normalize-options.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, 'name'> {
+    linter: LinterType;
     fileName: string;
     projectName: string;
     projectRoot: string;

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

@@ -23,6 +23,10 @@ async function normalizeOptions(host, options) {
     const useProjectJson = options.useProjectJson ?? !isUsingTsSolutionConfig;
     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}`,
         projectName: 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; // default is false
   tags?: string;
   unitTestRunner: 'jest' | 'none';
-  linter: Linter | LinterType; // default is eslint
+  linter?: LinterType;
   publishable?: boolean;
   buildable?: boolean;
   importPath?: string;

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

@@ -26,11 +26,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/expo",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.7",
   "private": false,
   "description": "The Expo Plugin for Nx contains executors and generators for managing and developing an expo application within your workspace. For example, you can directly build for different target platforms as well as generate projects and publish your code.",
   "keywords": [
@@ -61,18 +61,18 @@
     "semver": "^7.6.3",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.6",
-    "@nx/eslint": "23.2.0-beta.6",
-    "@nx/js": "23.2.0-beta.6",
-    "@nx/react": "23.2.0-beta.6"
+    "@nx/devkit": "23.2.0-beta.7",
+    "@nx/eslint": "23.2.0-beta.7",
+    "@nx/js": "23.2.0-beta.7",
+    "@nx/react": "23.2.0-beta.7"
   },
   "peerDependencies": {
     "expo": ">=53.0.0",
     "@expo/metro": ">= 55.0.0",
     "metro-config": ">= 0.82.0",
     "metro-resolver": ">= 0.82.0",
-    "@nx/cypress": "23.2.0-beta.6",
-    "@nx/playwright": "23.2.0-beta.6"
+    "@nx/cypress": "23.2.0-beta.7",
+    "@nx/playwright": "23.2.0-beta.7"
   },
   "peerDependenciesMeta": {
     "@nx/cypress": {
@@ -95,11 +95,11 @@
     }
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.6"
+    "nx": "23.2.0-beta.7"
   },
   "optionalDependencies": {
-    "@nx/detox": "23.2.0-beta.6",
-    "@nx/rollup": "23.2.0-beta.6"
+    "@nx/detox": "23.2.0-beta.7",
+    "@nx/rollup": "23.2.0-beta.7"
   },
   "executors": "./executors.json",
   "ng-update": {