fix(linter): fix migrating projects with the eslint plugin

nrwl · May 2, 2024 · e3a517f · e3a517f
1 parent 2002a78
commit e3a517f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.spec.ts b/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.spec.ts
@@ -33,7 +33,7 @@ describe('convertToCypressTen', () => {
  mockedInstalledCypressVersion.mockReturnValue(9);
  });
 
- afterEach(() => {
+ afterAll(() => {
  jest.resetAllMocks();
  });
 

diff --git a/packages/eslint/src/generators/lint-project/lint-project.ts b/packages/eslint/src/generators/lint-project/lint-project.ts
@@ -1,7 +1,9 @@
-import type {
+import {
+ createProjectGraphAsync,
  GeneratorCallback,
  NxJsonConfiguration,
  ProjectConfiguration,
+ ProjectGraph,
  Tree,
 } from '@nx/devkit';
 import {
@@ -134,7 +136,8 @@ export async function lintProjectGeneratorInternal(
  if (!options.rootProject) {
  const projects = {} as any;
  getProjects(tree).forEach((v, k) => (projects[k] = v));
- if (isMigrationToMonorepoNeeded(projects, tree)) {
+ const graph = await createProjectGraphAsync();
+ if (isMigrationToMonorepoNeeded(tree, graph)) {
  // we only migrate project configurations that have been created
  const filteredProjects = [];
  Object.entries(projects).forEach(([name, project]) => {
@@ -295,10 +298,7 @@ function isBuildableLibraryProject(
  * Detect based on the state of lint target configuration of the root project
  * if we should migrate eslint configs to monorepo style
  */
-function isMigrationToMonorepoNeeded(
- projects: Record<string, ProjectConfiguration>,
- tree: Tree
-): boolean {
+function isMigrationToMonorepoNeeded(tree: Tree, graph: ProjectGraph): boolean {
  // the base config is already created, migration has been done
  if (
  tree.exists(baseEsLintConfigFile) ||
@@ -307,25 +307,28 @@ function isMigrationToMonorepoNeeded(
  return false;
  }
 
- const configs = Object.values(projects);
- if (configs.length === 1) {
+ const nodes = Object.values(graph.nodes);
+ if (nodes.length === 1) {
  return false;
  }
 
  // get root project
- const rootProject = configs.find((p) => p.root === '.');
- if (!rootProject || !rootProject.targets) {
+ const rootProject = nodes.find((p) => p.data.root === '.');
+ if (!rootProject || !rootProject.data.targets) {
  return false;
  }
- // check if we're inferring lint target from `@nx/eslint/plugin`
- if (hasEslintPlugin(tree)) {
- for (const f of ESLINT_CONFIG_FILENAMES) {
- if (tree.exists(f)) {
- return true;
- }
+
+ for (const targetConfig of Object.values(rootProject.data.targets ?? {})) {
+ if (
+ ['@nx/eslint:lint', '@nrwl/linter:eslint', '@nx/linter:eslint'].includes(
+ targetConfig.executor
+ ) ||
+ (targetConfig.executor === 'nx:run-commands' &&
+ targetConfig.options?.command.startsWith('eslint '))
+ ) {
+ return true;
  }
  }
- // find if root project has lint target
- const lintTarget = findLintTarget(rootProject);
- return !!lintTarget;
+
+ return false;
 }
diff --git a/packages/plugin/src/generators/e2e-project/__snapshots__/e2e.spec.ts.snap b/packages/plugin/src/generators/e2e-project/__snapshots__/e2e.spec.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`NxPlugin e2e-project Generator should setup the eslint builder 1`] = `
 "{
- "extends": ["../../.eslintrc.base.json"],
+ "extends": ["../../.eslintrc.json"],
  "ignorePatterns": ["!**/*"],
  "overrides": [
  {

diff --git a/...ct/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts b/...ct/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
@@ -50,7 +50,7 @@ describe('React:CypressComponentTestConfiguration', () => {
  tree = createTreeWithEmptyWorkspace();
  });
 
- afterEach(() => {
+ afterAll(() => {
  jest.clearAllMocks();
  });