fix(core): move generator should respect non-relative extends parts (#6427)

* fix(core): move generator should respect non-relative extends parts

* fix(core): fix broken test

Author: meeroslav

packages/workspace/src/generators/move/lib/update-eslintrc-json.spec.ts

@@ -1,12 +1,16 @@
-import { readJson, readProjectConfiguration, Tree } from '@nrwl/devkit';
+import {
+  readJson,
+  readProjectConfiguration,
+  Tree,
+  updateJson,
+} from '@nrwl/devkit';
 import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
 
 import { Linter } from '../../../utils/lint';
 
 import { Schema } from '../schema';
 import { updateEslintrcJson } from './update-eslintrc-json';
 import { libraryGenerator } from '../../library/library';
-import { executionAsyncId } from 'node:async_hooks';
 
 describe('updateEslint', () => {
   let tree: Tree;
@@ -58,7 +62,45 @@ describe('updateEslint', () => {
       readJson(tree, '/libs/shared/my-destination/.eslintrc.json')
     ).toEqual(
       expect.objectContaining({
-        extends: '../../../.eslintrc.json',
+        extends: ['../../../.eslintrc.json'],
+      })
+    );
+  });
+
+  it('should preserve .eslintrc.json non-relative extends when project is moved to subdirectory', async () => {
+    await libraryGenerator(tree, {
+      name: 'my-lib',
+      linter: Linter.EsLint,
+      standaloneConfig: false,
+    });
+    updateJson(tree, 'libs/my-lib/.eslintrc.json', (eslintRcJson) => {
+      eslintRcJson.extends = [
+        'plugin:@nrwl/nx/react',
+        '../../.eslintrc.json',
+        './customrc.json',
+      ];
+      return eslintRcJson;
+    });
+
+    // This step is usually handled elsewhere
+    tree.rename(
+      'libs/my-lib/.eslintrc.json',
+      'libs/shared/my-destination/.eslintrc.json'
+    );
+
+    const projectConfig = readProjectConfiguration(tree, 'my-lib');
+
+    updateEslintrcJson(tree, schema, projectConfig);
+
+    expect(
+      readJson(tree, '/libs/shared/my-destination/.eslintrc.json')
+    ).toEqual(
+      expect.objectContaining({
+        extends: [
+          'plugin:@nrwl/nx/react',
+          '../../../.eslintrc.json',
+          './customrc.json',
+        ],
       })
     );
   });

packages/workspace/src/generators/move/lib/update-eslintrc-json.ts

@@ -1,4 +1,4 @@
-import { join } from 'path';
+import { join, relative } from 'path';
 import {
   offsetFromRoot,
   ProjectConfiguration,
@@ -16,10 +16,23 @@ interface PartialEsLintrcOverride {
 }
 
 interface PartialEsLintRcJson {
-  extends: string;
+  extends: string | string[];
   overrides?: PartialEsLintrcOverride[];
 }
 
+function offsetFilePath(
+  project: ProjectConfiguration,
+  pathToFile: string,
+  offset: string
+): string {
+  if (!pathToFile.startsWith('..')) {
+    // not a relative path
+    return pathToFile;
+  }
+  const pathFromRoot = join(project.root, pathToFile);
+  return join(offset, pathFromRoot);
+}
+
 /**
  * Update the .eslintrc file of the project if it exists.
  *
@@ -41,7 +54,17 @@ export function updateEslintrcJson(
   const offset = offsetFromRoot(destination);
 
   updateJson<PartialEsLintRcJson>(tree, eslintRcPath, (eslintRcJson) => {
-    eslintRcJson.extends = `${offset}.eslintrc.json`;
+    if (typeof eslintRcJson.extends === 'string') {
+      eslintRcJson.extends = offsetFilePath(
+        project,
+        eslintRcJson.extends,
+        offset
+      );
+    } else {
+      eslintRcJson.extends = eslintRcJson.extends.map((extend: string) =>
+        offsetFilePath(project, extend, offset)
+      );
+    }
 
     eslintRcJson.overrides?.forEach((o) => {
       if (o.parserOptions?.project) {