@nx/detox 16.8.0-beta.4 → 16.8.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/detox",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.6",
   "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": [
@@ -25,12 +25,12 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nrwl/detox": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/jest": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
-    "@nx/linter": "16.8.0-beta.4",
-    "@nx/react": "16.8.0-beta.4",
+    "@nrwl/detox": "16.8.0-beta.6",
+    "@nx/devkit": "16.8.0-beta.6",
+    "@nx/jest": "16.8.0-beta.6",
+    "@nx/js": "16.8.0-beta.6",
+    "@nx/linter": "16.8.0-beta.6",
+    "@nx/react": "16.8.0-beta.6",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
@@ -46,5 +46,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "0cc6ba996f2ef09f00b932c8eacf42de642457f3"
 }

package/src/executors/build/build.impl.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCliBuild = void 0;
-const tslib_1 = require("tslib");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 let childProcess;
-function detoxBuildExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* detoxBuildExecutor_1() {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        try {
-            yield tslib_1.__await(runCliBuild(context.root, projectRoot, options));
-            yield yield tslib_1.__await({ success: true });
+async function* detoxBuildExecutor(options, context) {
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    try {
+        await runCliBuild(context.root, projectRoot, options);
+        yield { success: true };
+    }
+    finally {
+        if (childProcess) {
+            childProcess.kill();
         }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
-            }
-        }
-    });
+    }
 }
 exports.default = detoxBuildExecutor;
 function runCliBuild(workspaceRoot, projectRoot, options) {

package/src/executors/test/test.impl.js

@@ -1,30 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const devkit_2 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 const build_impl_1 = require("../build/build.impl");
 let childProcess;
-function detoxTestExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* detoxTestExecutor_1() {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        try {
-            if (!options.reuse && options.buildTarget) {
-                const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
-                const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
-                yield tslib_1.__await((0, build_impl_1.runCliBuild)(context.root, projectRoot, Object.assign(Object.assign({}, buildOptions), { detoxConfiguration: options.detoxConfiguration })));
-            }
-            yield tslib_1.__await(runCliTest(context.root, projectRoot, options));
-            yield yield tslib_1.__await({ success: true });
+async function* detoxTestExecutor(options, context) {
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    try {
+        if (!options.reuse && options.buildTarget) {
+            const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
+            const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
+            await (0, build_impl_1.runCliBuild)(context.root, projectRoot, {
+                ...buildOptions,
+                detoxConfiguration: options.detoxConfiguration,
+            });
         }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
-            }
+        await runCliTest(context.root, projectRoot, options);
+        yield { success: true };
+    }
+    finally {
+        if (childProcess) {
+            childProcess.kill();
         }
-    });
+    }
 }
 exports.default = detoxTestExecutor;
 function runCliTest(workspaceRoot, projectRoot, options) {

package/src/generators/application/application.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detoxApplicationSchematic = exports.detoxApplicationGeneratorInternal = exports.detoxApplicationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
@@ -9,25 +8,27 @@ const add_linting_1 = require("./lib/add-linting");
 const add_project_1 = require("./lib/add-project");
 const create_files_1 = require("./lib/create-files");
 const normalize_options_1 = require("./lib/normalize-options");
-function detoxApplicationGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield detoxApplicationGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function detoxApplicationGenerator(host, schema) {
+    return await detoxApplicationGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.detoxApplicationGenerator = detoxApplicationGenerator;
-function detoxApplicationGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
-        const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        (0, create_files_1.createFiles)(host, options);
-        (0, add_project_1.addProject)(host, options);
-        (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host, options);
-        const lintingTask = yield (0, add_linting_1.addLinting)(host, options);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(initTask, lintingTask);
+async function detoxApplicationGeneratorInternal(host, schema) {
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    const initTask = await (0, init_1.default)(host, {
+        ...options,
+        skipFormat: true,
     });
+    (0, create_files_1.createFiles)(host, options);
+    (0, add_project_1.addProject)(host, options);
+    (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host, options);
+    const lintingTask = await (0, add_linting_1.addLinting)(host, options);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(initTask, lintingTask);
 }
 exports.detoxApplicationGeneratorInternal = detoxApplicationGeneratorInternal;
 exports.default = detoxApplicationGenerator;

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

@@ -1,30 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = void 0;
-const tslib_1 = require("tslib");
 const linter_1 = require("@nx/linter");
 const devkit_1 = require("@nx/devkit");
 const react_1 = require("@nx/react");
 const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
-function addLinting(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.linter === linter_1.Linter.None) {
-            return () => { };
-        }
-        const lintTask = yield (0, linter_1.lintProjectGenerator)(host, {
-            linter: options.linter,
-            project: options.e2eProjectName,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'tsconfig.app.json'),
-            ],
-            eslintFilePatterns: [`${options.e2eProjectRoot}/**/*.{ts,tsx,js,jsx}`],
-            skipFormat: true,
-        });
-        if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-            (0, eslint_file_1.addExtendsToLintConfig)(host, options.e2eProjectRoot, 'plugin:@nx/react');
-        }
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, react_1.extraEslintDependencies.dependencies, react_1.extraEslintDependencies.devDependencies);
-        return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
+async function addLinting(host, options) {
+    if (options.linter === linter_1.Linter.None) {
+        return () => { };
+    }
+    const lintTask = await (0, linter_1.lintProjectGenerator)(host, {
+        linter: options.linter,
+        project: options.e2eProjectName,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'tsconfig.app.json'),
+        ],
+        eslintFilePatterns: [`${options.e2eProjectRoot}/**/*.{ts,tsx,js,jsx}`],
+        skipFormat: true,
     });
+    if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
+        (0, eslint_file_1.addExtendsToLintConfig)(host, options.e2eProjectRoot, 'plugin:@nx/react');
+    }
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, react_1.extraEslintDependencies.dependencies, react_1.extraEslintDependencies.devDependencies);
+    return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
 }
 exports.addLinting = addLinting;

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

@@ -8,7 +8,7 @@ function addProject(host, options) {
         root: options.e2eProjectRoot,
         sourceRoot: `${options.e2eProjectRoot}/src`,
         projectType: 'application',
-        targets: Object.assign({}, getTargets(options)),
+        targets: { ...getTargets(options) },
         tags: [],
         implicitDependencies: [options.appProject],
     });
@@ -16,17 +16,29 @@ function addProject(host, options) {
 exports.addProject = addProject;
 function getTargets(options) {
     const targets = {};
-    targets['build-ios'] = Object.assign({ executor: '@nx/detox:build' }, (options.framework === 'react-native'
-        ? (0, get_targets_1.reactNativeBuildTarget)('ios.sim')
-        : (0, get_targets_1.expoBuildTarget)('ios.sim')));
-    targets['test-ios'] = Object.assign({ executor: '@nx/detox:test' }, (options.framework === 'react-native'
-        ? (0, get_targets_1.reactNativeTestTarget)('ios.sim', options.e2eProjectName)
-        : (0, get_targets_1.expoTestTarget)('ios.sim', options.e2eProjectName)));
-    targets['build-android'] = Object.assign({ executor: '@nx/detox:build' }, (options.framework === 'react-native'
-        ? (0, get_targets_1.reactNativeBuildTarget)('android.emu')
-        : (0, get_targets_1.expoBuildTarget)('android.emu')));
-    targets['test-android'] = Object.assign({ executor: '@nx/detox:test' }, (options.framework === 'react-native'
-        ? (0, get_targets_1.reactNativeTestTarget)('android.emu', options.e2eProjectName)
-        : (0, get_targets_1.expoTestTarget)('android.emu', options.e2eProjectName)));
+    targets['build-ios'] = {
+        executor: '@nx/detox:build',
+        ...(options.framework === 'react-native'
+            ? (0, get_targets_1.reactNativeBuildTarget)('ios.sim')
+            : (0, get_targets_1.expoBuildTarget)('ios.sim')),
+    };
+    targets['test-ios'] = {
+        executor: '@nx/detox:test',
+        ...(options.framework === 'react-native'
+            ? (0, get_targets_1.reactNativeTestTarget)('ios.sim', options.e2eProjectName)
+            : (0, get_targets_1.expoTestTarget)('ios.sim', options.e2eProjectName)),
+    };
+    targets['build-android'] = {
+        executor: '@nx/detox:build',
+        ...(options.framework === 'react-native'
+            ? (0, get_targets_1.reactNativeBuildTarget)('android.emu')
+            : (0, get_targets_1.expoBuildTarget)('android.emu')),
+    };
+    targets['test-android'] = {
+        executor: '@nx/detox:test',
+        ...(options.framework === 'react-native'
+            ? (0, get_targets_1.reactNativeTestTarget)('android.emu', options.e2eProjectName)
+            : (0, get_targets_1.expoTestTarget)('android.emu', options.e2eProjectName)),
+    };
     return targets;
 }

package/src/generators/application/lib/create-files.js

@@ -5,7 +5,12 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
 function createFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), options.e2eProjectRoot, Object.assign(Object.assign({}, options), { exec: (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(host.root)).exec, offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot), rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.e2eProjectRoot) }));
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), options.e2eProjectRoot, {
+        ...options,
+        exec: (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(host.root)).exec,
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.e2eProjectRoot),
+    });
     if (options.js) {
         (0, devkit_1.toJS)(host);
     }

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

@@ -1,24 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-function normalizeOptions(host, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: options.e2eName,
-            projectType: 'application',
-            directory: options.e2eDirectory,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/detox:application',
-        });
-        const { fileName: appFileName, className: appClassName } = (0, devkit_1.names)(options.appName || options.appProject);
-        const { root: appRoot } = (0, devkit_1.readProjectConfiguration)(host, (0, devkit_1.names)(options.appProject).fileName);
-        return Object.assign(Object.assign({}, options), { appFileName,
-            appClassName, appDisplayName: options.appDisplayName || appClassName, appExpoName: ((_a = options.appDisplayName) === null || _a === void 0 ? void 0 : _a.replace(/\s/g, '')) || appClassName, appRoot, e2eName: e2eProjectName, e2eProjectName,
-            e2eProjectRoot });
+async function normalizeOptions(host, options) {
+    const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: options.e2eName,
+        projectType: 'application',
+        directory: options.e2eDirectory,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/detox:application',
     });
+    const { fileName: appFileName, className: appClassName } = (0, devkit_1.names)(options.appName || options.appProject);
+    const { root: appRoot } = (0, devkit_1.readProjectConfiguration)(host, (0, devkit_1.names)(options.appProject).fileName);
+    return {
+        ...options,
+        appFileName,
+        appClassName,
+        appDisplayName: options.appDisplayName || appClassName,
+        appExpoName: options.appDisplayName?.replace(/\s/g, '') || appClassName,
+        appRoot,
+        e2eName: e2eProjectName,
+        e2eProjectName,
+        e2eProjectRoot,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/init/init.js

@@ -1,28 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detoxInitSchematic = exports.updateDependencies = exports.detoxInitGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("@nx/jest/src/utils/versions");
 const versions_2 = require("../../utils/versions");
-function detoxInitGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        if (!schema.skipPackageJson) {
-            tasks.push(moveDependency(host));
-            tasks.push(updateDependencies(host, schema));
-        }
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function detoxInitGenerator(host, schema) {
+    const tasks = [];
+    if (!schema.skipPackageJson) {
+        tasks.push(moveDependency(host));
+        tasks.push(updateDependencies(host, schema));
+    }
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.detoxInitGenerator = detoxInitGenerator;
 function updateDependencies(host, schema) {
-    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, Object.assign({ '@nx/detox': versions_2.nxVersion, detox: versions_2.detoxVersion, '@testing-library/jest-dom': versions_2.testingLibraryJestDom, '@types/node': versions_1.typesNodeVersion, 'jest-circus': versions_1.jestVersion }, (schema.framework === 'expo'
-        ? { '@config-plugins/detox': versions_2.configPluginsDetoxVersion }
-        : {})));
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+        '@nx/detox': versions_2.nxVersion,
+        detox: versions_2.detoxVersion,
+        '@testing-library/jest-dom': versions_2.testingLibraryJestDom,
+        '@types/node': versions_1.typesNodeVersion,
+        'jest-circus': versions_1.jestVersion,
+        ...(schema.framework === 'expo'
+            ? { '@config-plugins/detox': versions_2.configPluginsDetoxVersion }
+            : {}),
+    });
 }
 exports.updateDependencies = updateDependencies;
 function moveDependency(host) {

package/src/migrations/update-13-10-3/add-verbose-jest-config-13-10-3.js

@@ -1,21 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 /**
  * Update jest.config.json under detox project, add key verbsoe: true
  */
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        projects.forEach((project) => {
-            var _a, _b;
-            if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a['test-ios']) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/detox:test')
-                return;
-            updateJestConfig(tree, project);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    projects.forEach((project) => {
+        if (project.targets?.['test-ios']?.executor !== '@nrwl/detox:test')
+            return;
+        updateJestConfig(tree, project);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;
 function updateJestConfig(host, project) {

package/src/migrations/update-13-5-0/add-build-target-test-13-5-0.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 /**
  * This function buildTarget to test-ios and test-android
  */
-function update(tree) {
-    var _a, _b, _c, _d;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [name, config] of projects.entries()) {
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a['test-ios']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/detox:test') {
-                config.targets['test-ios'].options.buildTarget = `${name}:build-ios`;
-                config.targets['test-ios'].configurations.production.buildTarget = `${name}:build-ios:prod`;
-            }
-            if (((_d = (_c = config.targets) === null || _c === void 0 ? void 0 : _c['test-android']) === null || _d === void 0 ? void 0 : _d.executor) === '@nrwl/detox:test') {
-                config.targets['test-android'].options.buildTarget = `${name}:build-android`;
-                config.targets['test-android'].configurations.production.buildTarget = `${name}:build-android:prod`;
-            }
-            (0, devkit_1.updateProjectConfiguration)(tree, name, config);
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [name, config] of projects.entries()) {
+        if (config.targets?.['test-ios']?.executor === '@nrwl/detox:test') {
+            config.targets['test-ios'].options.buildTarget = `${name}:build-ios`;
+            config.targets['test-ios'].configurations.production.buildTarget = `${name}:build-ios:prod`;
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+        if (config.targets?.['test-android']?.executor === '@nrwl/detox:test') {
+            config.targets['test-android'].options.buildTarget = `${name}:build-android`;
+            config.targets['test-android'].configurations.production.buildTarget = `${name}:build-android:prod`;
+        }
+        (0, devkit_1.updateProjectConfiguration)(tree, name, config);
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-13-8-2/remove-types-detox-13-8-2.js

@@ -1,24 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-        if (!packageJson.devDependencies['@types/detox']) {
-            return;
-        }
-        const projects = (0, devkit_1.getProjects)(tree);
-        const hasDetoxProject = Array.from(projects)
-            .map(([_, project]) => project)
-            .some((project) => { var _a, _b; return ((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a['test-ios']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/detox:test'; });
-        if (!hasDetoxProject) {
-            return;
-        }
-        (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
-            delete packageJson.devDependencies['@types/detox'];
-            return packageJson;
-        });
+async function update(tree) {
+    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+    if (!packageJson.devDependencies['@types/detox']) {
+        return;
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    const hasDetoxProject = Array.from(projects)
+        .map(([_, project]) => project)
+        .some((project) => project.targets?.['test-ios']?.executor === '@nrwl/detox:test');
+    if (!hasDetoxProject) {
+        return;
+    }
+    (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
+        delete packageJson.devDependencies['@types/detox'];
+        return packageJson;
     });
 }
 exports.default = update;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 /**
  * Update .detoxrc.json under detox project:
@@ -10,18 +9,15 @@ const devkit_1 = require("@nx/devkit");
  * - remove key: transform
  * - add key: rootDir, testMatch, reporter, globalSetup, globalTeardown, verbose
  */
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        projects.forEach((project) => {
-            var _a, _b;
-            if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a['test-ios']) === null || _b === void 0 ? void 0 : _b.executor) !== '@nx/detox:test')
-                return;
-            updateDetoxrcJson(tree, project);
-            updateJestConfigJson(tree, project);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+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);
 }
 exports.default = update;
 function updateDetoxrcJson(host, project) {

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

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

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 /**
  * Update .detoxrc.json under detox project for expo:
@@ -8,45 +7,40 @@ const devkit_1 = require("@nx/devkit");
  * - fix the local build command
  * - update project.json targets
  */
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        projects.forEach((project) => {
-            var _a, _b;
-            if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a['test-ios']) === null || _b === void 0 ? void 0 : _b.executor) !== '@nx/detox:test')
-                return;
-            updateDetoxrcJson(tree, project);
-            updateProjectJson(tree, project);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+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);
 }
 exports.default = update;
 function updateDetoxrcJson(host, project) {
-    var _a, _b;
     const detoxConfigPath = `${project.root}/.detoxrc.json`;
-    const projectName = ((_a = project.name) === null || _a === void 0 ? void 0 : _a.endsWith('-e2e'))
+    const projectName = project.name?.endsWith('-e2e')
         ? project.name.substring(0, project.name.indexOf('-e2e'))
         : project.name;
-    const appRoot = (_b = (0, devkit_1.getProjects)(host).get(projectName)) === null || _b === void 0 ? void 0 : _b.root;
+    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) => {
-        var _a, _b, _c, _d;
-        if ((_a = json.apps) === null || _a === void 0 ? void 0 : _a['ios.eas']) {
+        if (json.apps?.['ios.eas']) {
             json.apps['ios.eas'].build = `${exec} nx run ${projectName}:download --platform ios --distribution simulator --output=${offset}${appRoot}/dist/`;
         }
-        if ((_b = json.apps) === null || _b === void 0 ? void 0 : _b['android.eas']) {
+        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 ((_c = json.apps) === null || _c === void 0 ? void 0 : _c['ios.local']) {
+        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 ((_d = json.apps) === null || _d === void 0 ? void 0 : _d['android.local']) {
+        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';
         }
@@ -54,11 +48,10 @@ function updateDetoxrcJson(host, project) {
     });
 }
 function updateProjectJson(host, project) {
-    var _a, _b, _c, _d, _e, _f;
-    if (((_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a['test-ios']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.detoxConfiguration) == 'ios.sim.eas') {
+    if (project.targets?.['test-ios']?.options?.detoxConfiguration == 'ios.sim.eas') {
         project.targets['build-ios'].options.detoxConfiguration = 'ios.sim.eas';
     }
-    if (((_f = (_e = (_d = project.targets) === null || _d === void 0 ? void 0 : _d['test-android']) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.detoxConfiguration) ==
+    if (project.targets?.['test-android']?.options?.detoxConfiguration ==
         'android.sim.eas') {
         project.targets['build-android'].options.detoxConfiguration =
             'android.sim.eas';