@nx/detox 19.7.4 → 19.8.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/detox",
-  "version": "19.7.4",
+  "version": "19.8.0-beta.0",
   "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": [
@@ -27,13 +27,13 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "19.7.4",
-    "@nx/jest": "19.7.4",
-    "@nx/js": "19.7.4",
-    "@nx/eslint": "19.7.4",
-    "@nx/react": "19.7.4",
+    "@nx/devkit": "19.8.0-beta.0",
+    "@nx/jest": "19.8.0-beta.0",
+    "@nx/js": "19.8.0-beta.0",
+    "@nx/eslint": "19.8.0-beta.0",
+    "@nx/react": "19.8.0-beta.0",
     "tslib": "^2.3.0",
-    "@nrwl/detox": "19.7.4"
+    "@nrwl/detox": "19.8.0-beta.0"
   },
   "peerDependencies": {
     "detox": "^20.9.0"

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

@@ -1,3 +1,3 @@
-import { Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from './normalize-options';
-export declare function addLinting(host: Tree, options: NormalizedSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function addLinting(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;

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

@@ -5,10 +5,12 @@ const eslint_1 = require("@nx/eslint");
 const devkit_1 = require("@nx/devkit");
 const react_1 = require("@nx/react");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLinting(host, options) {
     if (options.linter === eslint_1.Linter.None) {
         return () => { };
     }
+    const tasks = [];
     const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
         linter: options.linter,
         project: options.e2eProjectName,
@@ -18,9 +20,22 @@ async function addLinting(host, options) {
         skipFormat: true,
         addPlugin: options.addPlugin,
     });
+    tasks.push(lintTask);
     if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-        (0, eslint_file_1.addExtendsToLintConfig)(host, options.e2eProjectRoot, 'plugin:@nx/react');
+        if ((0, flat_config_1.useFlatConfig)(host)) {
+            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(host, options.e2eProjectRoot, 'flat/react');
+            // Add an empty rules object to users know how to add/override rules
+            (0, eslint_file_1.addOverrideToLintConfig)(host, options.e2eProjectRoot, {
+                files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+                rules: {},
+            });
+        }
+        else {
+            const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(host, options.e2eProjectRoot, { name: 'plugin:@nx/react', needCompatFixup: true });
+            tasks.push(addExtendsTask);
+        }
     }
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, react_1.extraEslintDependencies.dependencies, react_1.extraEslintDependencies.devDependencies);
-    return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
+    tasks.push(installTask);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -67,7 +67,7 @@ async function convertToInferred(tree, options) {
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
     if (migratedProjects.size === 0) {
-        throw new Error('Could not find any targets to migrate.');
+        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);