@nx/cypress 16.8.0-beta.3 → 16.8.0-beta.5

package/src/utils/find-target-options.js

@@ -1,46 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findBuildConfig = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const configuration_1 = require("nx/src/config/configuration");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
-function findBuildConfig(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            // attempt to use the provided target
-            const graph = yield (0, devkit_1.createProjectGraphAsync)();
-            if (options.buildTarget) {
-                return {
-                    target: options.buildTarget,
-                    config: findInTarget(tree, graph, options),
-                };
-            }
-            // check to see if there is a valid config in the given project
-            const selfProject = findTargetOptionsInProject(tree, graph, options.project, options);
-            if (selfProject) {
-                return selfProject;
-            }
-            // attempt to find any projects with the valid config in the graph that consumes this project
-            return yield findInGraph(tree, graph, options);
+async function findBuildConfig(tree, options) {
+    try {
+        // attempt to use the provided target
+        const graph = await (0, devkit_1.createProjectGraphAsync)();
+        if (options.buildTarget) {
+            return {
+                target: options.buildTarget,
+                config: findInTarget(tree, graph, options),
+            };
+        }
+        // check to see if there is a valid config in the given project
+        const selfProject = findTargetOptionsInProject(tree, graph, options.project, options);
+        if (selfProject) {
+            return selfProject;
         }
-        catch (e) {
-            devkit_1.logger.error(e);
-            throw new Error((0, devkit_1.stripIndents) `Error trying to find build configuration. ${options.buildTarget
-                ? 'Try using an app of the same framework for the --build-target.'
-                : 'Try manually specifying the build target with the --build-target flag.'}
+        // attempt to find any projects with the valid config in the graph that consumes this project
+        return await findInGraph(tree, graph, options);
+    }
+    catch (e) {
+        devkit_1.logger.error(e);
+        throw new Error((0, devkit_1.stripIndents) `Error trying to find build configuration. ${options.buildTarget
+            ? 'Try using an app of the same framework for the --build-target.'
+            : 'Try manually specifying the build target with the --build-target flag.'}
     Provided project? ${options.project}
     Provided build target? ${options.buildTarget}
     Provided Executors? ${[...options.validExecutorNames].join(', ')}`);
-        }
-    });
+    }
 }
 exports.findBuildConfig = findBuildConfig;
 function findInTarget(tree, graph, options) {
-    var _a, _b, _c, _d;
     const { project, target, configuration } = (0, devkit_1.parseTargetString)(options.buildTarget);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
-    const executorName = (_b = (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.executor;
+    const executorName = projectConfig?.targets?.[target]?.executor;
     if (!options.validExecutorNames.has(executorName)) {
         devkit_1.logger.error((0, devkit_1.stripIndents) `NX The provided build target, ${options.buildTarget}, uses the '${executorName}' executor.
 But only the follow executors are allowed
@@ -58,7 +54,7 @@ If you do not have an app in the workspace to you can make a new app with 'nx g
 `);
         throw new Error('The provided --build-target does not use an executor in the allow list of executors defined.');
     }
-    const foundConfig = configuration || ((_d = (_c = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _c === void 0 ? void 0 : _c[target]) === null || _d === void 0 ? void 0 : _d.defaultConfiguration);
+    const foundConfig = configuration || projectConfig?.targets?.[target]?.defaultConfiguration;
     return (0, devkit_1.readTargetOptions)({ project, target, configuration: foundConfig }, createExecutorContext(graph, projectConfig.targets, project, target, foundConfig));
 }
 function frameworkHelperMessage(validExecutorNames, executorName) {
@@ -84,24 +80,22 @@ Try using @nx/${buildTargetFramework} instead.`;
     }
     return '';
 }
-function findInGraph(tree, graph, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const parents = findParentsOfProject(graph, options.project);
-        const potentialTargets = [];
-        for (const parent of parents) {
-            const parentProject = findTargetOptionsInProject(tree, graph, parent.target, options);
-            if (parentProject) {
-                potentialTargets.push(parentProject);
-            }
+async function findInGraph(tree, graph, options) {
+    const parents = findParentsOfProject(graph, options.project);
+    const potentialTargets = [];
+    for (const parent of parents) {
+        const parentProject = findTargetOptionsInProject(tree, graph, parent.target, options);
+        if (parentProject) {
+            potentialTargets.push(parentProject);
         }
-        if (potentialTargets.length > 1) {
-            devkit_1.logger.warn((0, devkit_1.stripIndents) `Multiple potential targets found for ${options.project}. Found ${potentialTargets.length}.
+    }
+    if (potentialTargets.length > 1) {
+        devkit_1.logger.warn((0, devkit_1.stripIndents) `Multiple potential targets found for ${options.project}. Found ${potentialTargets.length}.
     Using ${potentialTargets[0].target}.
     To specify a different target use the --build-target flag.
     `);
-        }
-        return potentialTargets[0];
-    });
+    }
+    return potentialTargets[0];
 }
 function findParentsOfProject(graph, projectName) {
     const reversedGraph = (0, devkit_1.reverse)(graph);