From c68b37e29f0737afc6f4fa680aa1e0a263b01a3f Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <sk.katherine@gmail.com>
Date: Fri, 5 Nov 2021 11:06:22 +0200
Subject: [PATCH] fix(storybook): install cypress packages if not installed for
 e2e apps

ISSUES CLOSED: #7158
---
 .../cypress-project/cypress-project.spec.ts   | 19 ++++++++++++
 .../cypress-project/cypress-project.ts        | 31 +++++++++++++++++--
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/packages/storybook/src/generators/cypress-project/cypress-project.spec.ts b/packages/storybook/src/generators/cypress-project/cypress-project.spec.ts
index 73212c4b22..6e891451ae 100644
--- a/packages/storybook/src/generators/cypress-project/cypress-project.spec.ts
+++ b/packages/storybook/src/generators/cypress-project/cypress-project.spec.ts
@@ -58,4 +58,23 @@ describe('@nrwl/storybook:cypress-project', () => {
       tree.exists('apps/one/two/test-ui-lib-e2e/cypress.json')
     ).toBeTruthy();
   });
+
+  it('should make sure the cypress packages are installed', async () => {
+    expect(
+      readJson(tree, 'package.json').devDependencies['cypress']
+    ).toBeFalsy();
+    await cypressProjectGenerator(tree, {
+      name: 'test-ui-lib',
+      directory: 'one/two',
+      linter: Linter.EsLint,
+      standaloneConfig: false,
+    });
+    expect(
+      readJson(tree, 'package.json').devDependencies['cypress']
+    ).toBeTruthy();
+
+    expect(
+      readJson(tree, 'package.json').devDependencies['@nrwl/cypress']
+    ).toBeTruthy();
+  });
 });
diff --git a/packages/storybook/src/generators/cypress-project/cypress-project.ts b/packages/storybook/src/generators/cypress-project/cypress-project.ts
index 916cad9783..cb78c932be 100644
--- a/packages/storybook/src/generators/cypress-project/cypress-project.ts
+++ b/packages/storybook/src/generators/cypress-project/cypress-project.ts
@@ -1,19 +1,25 @@
 import {
   convertNxGenerator,
   formatFiles,
+  GeneratorCallback,
+  readJson,
   readProjectConfiguration,
   Tree,
   updateJson,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-
 import { Linter } from '@nrwl/linter';
-import { cypressProjectGenerator as _cypressProjectGenerator } from '@nrwl/cypress';
+import {
+  cypressProjectGenerator as _cypressProjectGenerator,
+  cypressInitGenerator as _cypressInitGenerator,
+} from '@nrwl/cypress';
+
 import {
   getE2eProjectName,
   getUnscopedLibName,
 } from '@nrwl/cypress/src/utils/project-name';
 import { safeFileDelete } from '../../utils/utilities';
+import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
 
 export interface CypressConfigureSchema {
   name: string;
@@ -32,6 +38,13 @@ export async function cypressProjectGenerator(
   const cypressProjectName = `${
     schema.directory ? getUnscopedLibName(libRoot) : schema.name
   }-e2e`;
+
+  const tasks: GeneratorCallback[] = [];
+
+  if (!projectAlreadyHasCypress(tree)) {
+    tasks.push(_cypressInitGenerator(tree));
+  }
+
   const installTask = await _cypressProjectGenerator(tree, {
     name: cypressProjectName,
     project: schema.name,
@@ -40,6 +53,8 @@ export async function cypressProjectGenerator(
     directory: schema.directory,
     standaloneConfig: schema.standaloneConfig,
   });
+  tasks.push(installTask);
+
   const generatedCypressProjectName = getE2eProjectName(
     schema.name,
     libRoot,
@@ -51,7 +66,7 @@ export async function cypressProjectGenerator(
 
   await formatFiles(tree);
 
-  return installTask;
+  return runTasksInSerial(...tasks);
 }
 
 function removeUnneededFiles(tree: Tree, projectName: string, js: boolean) {
@@ -93,6 +108,16 @@ function updateAngularJsonBuilder(
   updateProjectConfiguration(tree, e2eProjectName, project);
 }
 
+function projectAlreadyHasCypress(tree: Tree): boolean {
+  const packageJsonContents = readJson(tree, 'package.json');
+  return (
+    (packageJsonContents?.['devDependencies']?.['@nrwl/cypress'] ||
+      packageJsonContents?.['dependencies']?.['@nrwl/cypress']) &&
+    (packageJsonContents?.['devDependencies']?.['cypress'] ||
+      packageJsonContents?.['dependencies']?.['cypress'])
+  );
+}
+
 export default cypressProjectGenerator;
 export const cypressProjectSchematic = convertNxGenerator(
   cypressProjectGenerator