From 91bcfc8d7c322d9e3af0be81dfeb77d1d281be2d Mon Sep 17 00:00:00 2001
From: Emily Xiong <xiongemi@gmail.com>
Date: Wed, 25 Oct 2023 14:34:38 -0400
Subject: [PATCH] fix(react): add e2e for root project should not add
 eslintrc.base

---
 packages/angular/src/generators/application/lib/add-e2e.ts     | 1 +
 packages/cypress/src/generators/configuration/configuration.ts | 3 ++-
 packages/react/src/generators/application/lib/add-e2e.ts       | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/angular/src/generators/application/lib/add-e2e.ts b/packages/angular/src/generators/application/lib/add-e2e.ts
index 545158e80ad89a..1e65de9dd27c96 100644
--- a/packages/angular/src/generators/application/lib/add-e2e.ts
+++ b/packages/angular/src/generators/application/lib/add-e2e.ts
@@ -31,6 +31,7 @@ export async function addE2e(tree: Tree, options: NormalizedSchema) {
       skipPackageJson: options.skipPackageJson,
       skipFormat: true,
       devServerTarget: `${options.name}:serve:development`,
+      rootProject: options.rootProject,
     });
   } else if (options.e2eTestRunner === 'playwright') {
     const { configurationGenerator: playwrightConfigurationGenerator } =
diff --git a/packages/cypress/src/generators/configuration/configuration.ts b/packages/cypress/src/generators/configuration/configuration.ts
index 60dc9fff45d9c7..fb203b27849576 100644
--- a/packages/cypress/src/generators/configuration/configuration.ts
+++ b/packages/cypress/src/generators/configuration/configuration.ts
@@ -36,6 +36,7 @@ export interface CypressE2EConfigSchema {
   linter?: Linter;
   port?: number | 'cypress-auto';
   jsx?: boolean;
+  rootProject?: boolean;
 }
 
 type NormalizedSchema = ReturnType<typeof normalizeOptions>;
@@ -91,7 +92,7 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
   return {
     ...options,
     bundler: options.bundler ?? 'webpack',
-    rootProject: projectConfig.root === '.',
+    rootProject: options.rootProject ?? projectConfig.root === '.',
     linter: options.linter ?? Linter.EsLint,
     devServerTarget:
       options.devServerTarget ??
diff --git a/packages/react/src/generators/application/lib/add-e2e.ts b/packages/react/src/generators/application/lib/add-e2e.ts
index 838fe4ce03ea76..f1678705874b76 100644
--- a/packages/react/src/generators/application/lib/add-e2e.ts
+++ b/packages/react/src/generators/application/lib/add-e2e.ts
@@ -43,6 +43,7 @@ export async function addE2e(
         skipFormat: true,
         devServerTarget: `${options.projectName}:serve`,
         jsx: true,
+        rootProject: options.rootProject,
       });
     }
     case 'playwright': {