fix(misc): add back rootProject to e2e project for root project

nrwl · Sep 6, 2024 · f38db75 · f38db75
1 parent 20cf46e
commit f38db75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/packages/cypress/src/utils/add-linter.ts b/packages/cypress/src/utils/add-linter.ts
@@ -65,6 +65,7 @@ export async function addLinterToCyProject(
         tsConfigPaths: [joinPathFragments(projectConfig.root, 'tsconfig.json')],
         setParserOptionsProject: options.setParserOptionsProject,
         skipPackageJson: options.skipPackageJson,
+        rootProject: options.rootProject,
         addPlugin: options.addPlugin,
       })
     );
@@ -98,8 +99,10 @@ export async function addLinterToCyProject(
         'recommended',
         'cypress',
         'eslint-plugin-cypress/flat',
+        false,
         false
       );
+      addOverrideToLintConfig(tree, projectConfig.root, { rules: {} });
     } else {
       if (options.rootProject) {
         addPluginsToLintConfig(tree, projectConfig.root, '@nx');

diff --git a/packages/eslint/src/generators/utils/eslint-file.ts b/packages/eslint/src/generators/utils/eslint-file.ts
@@ -421,7 +421,8 @@ export function addPredefinedConfigToFlatLintConfig(
   predefinedConfigName: string,
   moduleName = 'nx',
   moduleImportPath = '@nx/eslint-plugin',
-  spread = true
+  spread = true,
+  insertAtTheEnd = true
 ): void {
   if (!useFlatConfig(tree))
     throw new Error('Predefined configs can only be used with flat configs');
@@ -435,7 +436,8 @@ export function addPredefinedConfigToFlatLintConfig(
   content = addImportToFlatConfig(content, moduleName, moduleImportPath);
   content = addBlockToFlatConfigExport(
     content,
-    generateFlatPredefinedConfig(predefinedConfigName, moduleName, spread)
+    generateFlatPredefinedConfig(predefinedConfigName, moduleName, spread),
+    { insertAtTheEnd }
   );
 
   tree.write(fileName, content);

diff --git a/packages/playwright/src/utils/add-linter.ts b/packages/playwright/src/utils/add-linter.ts
@@ -54,6 +54,7 @@ export async function addLinterToPlaywrightProject(
         tsConfigPaths: [joinPathFragments(projectConfig.root, 'tsconfig.json')],
         setParserOptionsProject: options.setParserOptionsProject,
         skipPackageJson: options.skipPackageJson,
+        rootProject: options.rootProject,
         addPlugin: options.addPlugin,
       })
     );
@@ -84,8 +85,10 @@ export async function addLinterToPlaywrightProject(
         'flat/recommended',
         'playwright',
         'eslint-plugin-playwright',
+        false,
         false
       );
+      addOverrideToLintConfig(tree, projectConfig.root, { rules: {} });
     } else {
       const addExtendsTask = addExtendsToLintConfig(
         tree,