@nx/detox 20.0.0-beta.5 → 20.0.0-beta.7

package/migrations.json

@@ -1,69 +1,6 @@
 {
-  "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/detox with @nx/detox",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-16-0-0-update-detoxrc": {
-      "cli": "nx",
-      "version": "16.0.0-beta.3",
-      "description": "Update .detoxrc.json and jest.config.json for detox 20",
-      "implementation": "./src/migrations/update-16-0-0/update-detoxrc-json"
-    },
-    "update-detoxrc-json-expo-16-1-4": {
-      "cli": "nx",
-      "version": "16.1.4-beta.0",
-      "description": "Update .detoxrc.json for expo",
-      "implementation": "./src/migrations/update-16-1-4/update-detoxrc-json-expo"
-    }
-  },
+  "generators": {},
   "packageJsonUpdates": {
-    "16.0.0": {
-      "version": "16.0.0-beta.3",
-      "packages": {
-        "detox": {
-          "version": "~20.7.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.1.1": {
-      "version": "16.1.1-beta.0",
-      "packages": {
-        "detox": {
-          "version": "~20.8.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@config-plugins/detox": {
-          "version": "~5.0.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.1.5": {
-      "version": "16.1.5-beta.0",
-      "packages": {
-        "detox": {
-          "version": "^20.9.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.6.0": {
-      "version": "16.6.0-beta.6",
-      "packages": {
-        "detox": {
-          "version": "^20.11.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@config-plugins/detox": {
-          "version": "~6.0.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "18.0.0": {
       "version": "18.0.0-beta.0",
       "packages": {

package/package.json

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

package/src/generators/application/application.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.detoxApplicationGenerator = detoxApplicationGenerator;
 exports.detoxApplicationGeneratorInternal = detoxApplicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = require("../init/init");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
 const add_linting_1 = require("./lib/add-linting");
@@ -17,6 +18,7 @@ async function detoxApplicationGenerator(host, schema) {
     });
 }
 async function detoxApplicationGeneratorInternal(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'detox', 'application');
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     const initTask = await (0, init_1.default)(host, {
         ...options,

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

@@ -8,7 +8,6 @@ async function normalizeOptions(host, options) {
         name: options.e2eName,
         projectType: 'application',
         directory: options.e2eDirectory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/generators/application/schema.json

@@ -12,15 +12,18 @@
       },
       "x-prompt": "What is the name of the frontend project to test?"
     },
-    "e2eName": {
+    "e2eDirectory": {
       "type": "string",
-      "description": "Name of the E2E Project.",
+      "description": "A directory where the project is placed relative current working directory (CWD).",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the E2E project?",
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the E2E project in?"
+    },
+    "e2eName": {
+      "type": "string",
+      "description": "Name of the E2E Project."
     },
     "appName": {
       "type": "string",
@@ -36,15 +39,6 @@
       "enum": ["react-native", "expo"],
       "x-prompt": "What app framework should detox test?"
     },
-    "e2eDirectory": {
-      "type": "string",
-      "description": "A directory where the project is placed relative to apps directory."
-    },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
@@ -68,5 +62,5 @@
       "default": false
     }
   },
-  "required": ["e2eName", "appProject", "framework"]
+  "required": ["e2eDirectory", "appProject", "framework"]
 }

package/src/generators/init/init.js

@@ -5,12 +5,14 @@ exports.detoxInitGeneratorInternal = detoxInitGeneratorInternal;
 exports.updateDependencies = updateDependencies;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function detoxInitGenerator(host, schema) {
     return detoxInitGeneratorInternal(host, { addPlugin: false, ...schema });
 }
 async function detoxInitGeneratorInternal(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'detox', 'init');
     const tasks = [];
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/migrations/update-16-0-0/update-detoxrc-json.d.ts

@@ -1,10 +0,0 @@
-import { Tree } from '@nx/devkit';
-/**
- * Update .detoxrc.json under detox project:
- * - remove deprecated keys: testRunner
- * - update keys: runnerConfig
- * Update jest.config.json under detox project:
- * - remove key: transform
- * - add key: rootDir, testMatch, reporter, globalSetup, globalTeardown, verbose
- */
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0/update-detoxrc-json.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-/**
- * Update .detoxrc.json under detox project:
- * - remove deprecated keys: testRunner
- * - update keys: runnerConfig
- * Update jest.config.json under detox project:
- * - remove key: transform
- * - add key: rootDir, testMatch, reporter, globalSetup, globalTeardown, verbose
- */
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    projects.forEach((project) => {
-        if (project.targets?.['test-ios']?.executor !== '@nx/detox:test')
-            return;
-        updateDetoxrcJson(tree, project);
-        updateJestConfigJson(tree, project);
-    });
-    await (0, devkit_1.formatFiles)(tree);
-}
-function updateDetoxrcJson(host, project) {
-    const detoxConfigPath = `${project.root}/.detoxrc.json`;
-    if (!host.exists(detoxConfigPath))
-        return;
-    (0, devkit_1.updateJson)(host, detoxConfigPath, (json) => {
-        json.testRunner = {
-            args: {
-                $0: 'jest',
-                config: './jest.config.json',
-            },
-            jest: {
-                setupTimeout: 120000,
-            },
-        };
-        if (json.runnerConfig) {
-            delete json.runnerConfig;
-        }
-        return json;
-    });
-}
-function updateJestConfigJson(host, project) {
-    const jestConfigPath = `${project.root}/jest.config.json`;
-    if (!host.exists(jestConfigPath))
-        return;
-    (0, devkit_1.updateJson)(host, jestConfigPath, (json) => {
-        if (json.transform) {
-            delete json.transform;
-        }
-        if (!json.rootDir) {
-            json.rootDir = '.';
-        }
-        if (!json.testMatch) {
-            json.testMatch = [
-                '<rootDir>/src/**/*.test.ts?(x)',
-                '<rootDir>/src/**/*.spec.ts?(x)',
-            ];
-        }
-        json.reporter = ['detox/runners/jest/reporter'];
-        json.globalSetup = 'detox/runners/jest/globalSetup';
-        json.globalTeardown = 'detox/runners/jest/globalTeardown';
-        json.verbose = true;
-        return json;
-    });
-}

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/detox', '@nx/detox');
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-1-4/update-detoxrc-json-expo.d.ts

@@ -1,8 +0,0 @@
-import { Tree } from '@nx/devkit';
-/**
- * Update .detoxrc.json under detox project for expo:
- * - fix the eas build command
- * - fix the local build command
- * - update project.json targets
- */
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-1-4/update-detoxrc-json-expo.js

@@ -1,81 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-/**
- * Update .detoxrc.json under detox project for expo:
- * - fix the eas build command
- * - fix the local build command
- * - update project.json targets
- */
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    projects.forEach((project) => {
-        if (project.targets?.['test-ios']?.executor !== '@nx/detox:test')
-            return;
-        updateDetoxrcJson(tree, project);
-        updateProjectJson(tree, project);
-    });
-    await (0, devkit_1.formatFiles)(tree);
-}
-function updateDetoxrcJson(host, project) {
-    const detoxConfigPath = `${project.root}/.detoxrc.json`;
-    const projectName = project.name?.endsWith('-e2e')
-        ? project.name.substring(0, project.name.indexOf('-e2e'))
-        : project.name;
-    const appRoot = (0, devkit_1.getProjects)(host).get(projectName)?.root;
-    const appName = (0, devkit_1.names)(projectName).className;
-    const offset = (0, devkit_1.offsetFromRoot)(project.root);
-    const exec = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(host.root)).exec;
-    if (!host.exists(detoxConfigPath))
-        return;
-    (0, devkit_1.updateJson)(host, detoxConfigPath, (json) => {
-        if (json.apps?.['ios.eas']) {
-            json.apps['ios.eas'].build = `${exec} nx run ${projectName}:download --platform ios --distribution simulator --output=${offset}${appRoot}/dist/`;
-        }
-        if (json.apps?.['android.eas']) {
-            json.apps['android.eas'].build = `${exec} nx run ${projectName}:download --platform android --distribution simulator --output=${offset}${appRoot}/dist/`;
-            json.apps['android.eas'].type = 'android.apk';
-        }
-        if (json.apps?.['ios.local']) {
-            json.apps['ios.local'].build = `${exec} nx run ${projectName}:build --platform ios --profile preview --wait --local --no-interactive --output=${offset}${appRoot}/dist/${appName}.tar.gz`;
-        }
-        if (json.apps?.['android.local']) {
-            json.apps['android.local'].build = `${exec} nx run ${projectName}:build --platform android --profile preview --wait --local --no-interactive --output=${offset}${appRoot}/dist/${appName}.apk`;
-            json.apps['android.local'].type = 'android.apk';
-        }
-        return json;
-    });
-}
-function updateProjectJson(host, project) {
-    if (project.targets?.['test-ios']?.options?.detoxConfiguration == 'ios.sim.eas') {
-        project.targets['build-ios'].options.detoxConfiguration = 'ios.sim.eas';
-    }
-    if (project.targets?.['test-android']?.options?.detoxConfiguration ==
-        'android.sim.eas') {
-        project.targets['build-android'].options.detoxConfiguration =
-            'android.sim.eas';
-        project.targets['test-android'] = {
-            executor: '@nx/detox:test',
-            options: {
-                detoxConfiguration: 'android.sim.eas',
-                buildTarget: `${project.name}:build-android`,
-            },
-            configurations: {
-                local: {
-                    detoxConfiguration: 'android.emu.local',
-                    buildTarget: `${project.name}:build-android:local`,
-                },
-                bare: {
-                    detoxConfiguration: 'android.emu.debug',
-                    buildTarget: `${project.name}:build-android:bare`,
-                },
-                production: {
-                    detoxConfiguration: 'android.emu.release',
-                    buildTarget: `${project.name}:build-android:production`,
-                },
-            },
-        };
-    }
-    (0, devkit_1.updateProjectConfiguration)(host, project.name, project);
-}