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

package/dist/src/generators/application/lib/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, {
         linter: options.linter,
         project: options.e2eProjectName,
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'tsconfig.app.json'),
         ],
-        skipFormat: true,
         enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
         addPlugin: options.addPlugin,
-    });
-    tasks.push(lintTask);
+        // Detox e2e specs are Jest; this is what enables the linter's Jest rules.
+        unitTestRunner: 'jest',
+    }));
+    // 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);
+    }
     if ((0, internal_1.isEslintConfigSupported)(host)) {
         if ((0, internal_1.useFlatConfig)(host)) {
             (0, internal_1.addPredefinedConfigToFlatLintConfig)(host, options.e2eProjectRoot, 'flat/react', { checkBaseConfig: true });

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

@@ -22,6 +22,9 @@ async function normalizeOptions(host, options) {
     const useProjectJson = options.useProjectJson ?? !isUsingTsSolutionConfig;
     return {
         ...options,
+        // The two guards downstream spell the check differently and disagree on
+        // `undefined`, so resolve it to a concrete linter here.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         appFileName,
         appClassName,
         appDisplayName: options.appDisplayName || appClassName,

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 {
   appProject: string; // name of the project app to be tested (directory + app name), case insensitive
@@ -6,7 +6,7 @@ export interface Schema {
   appName?: string; // name of app to be tested if different form appProject, case insensitive
   e2eDirectory: string; // the directory where e2e app going to be located
   e2eName?: string; // name of the e2e app
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   js?: boolean;
   skipFormat?: boolean;
   enableTypedLinting?: boolean;

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

@@ -40,10 +40,9 @@
       "x-prompt": "What app framework should detox test?"
     },
     "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": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "js": {
       "description": "Generate JavaScript files rather than TypeScript files.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/detox",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.7",
   "private": false,
   "description": "The Nx Plugin for Detox contains executors and generators for allowing your workspace to use the powerful Detox integration testing capabilities.",
   "keywords": [
@@ -37,14 +37,14 @@
   "dependencies": {
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.6",
-    "@nx/jest": "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/jest": "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"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.6"
+    "nx": "23.2.0-beta.7"
   },
   "peerDependencies": {
     "detox": "^20.0.0"