fix(linter): fix flat config migration (#19742)

(cherry picked from commit fc468a5)
nrwl · Nov 1, 2023 · 45c9867 · 45c9867
1 parent 5ab5362
commit 45c9867
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/eslint/src/generators/init/init-migration.ts b/packages/eslint/src/generators/init/init-migration.ts
@@ -99,7 +99,6 @@ function migrateEslintFile(projectEslintPath: string, tree: Tree) {
         'plugin:@nrwl/typescript',
         'plugin:@nrwl/javascript',
       ]);
-      console.warn('Flat eslint config is not supported yet for migration');
       tree.write(projectEslintPath, config);
     } else {
       updateJson(tree, projectEslintPath, (json) => {

diff --git a/packages/eslint/src/generators/utils/flat-config/ast-utils.ts b/packages/eslint/src/generators/utils/flat-config/ast-utils.ts
@@ -335,18 +335,24 @@ export function addBlockToFlatConfigExport(
   });
   const insert = printer.printNode(ts.EmitHint.Expression, config, source);
   if (options.insertAtTheEnd) {
+    const index =
+      exportsArray.length > 0
+        ? exportsArray.at(exportsArray.length - 1).end
+        : exportsArray.pos;
     return applyChangesToString(content, [
       {
         type: ChangeType.Insert,
-        index: exportsArray[exportsArray.length - 1].end,
+        index,
         text: `,\n${insert}`,
       },
     ]);
   } else {
+    const index =
+      exportsArray.length > 0 ? exportsArray.at(0).pos : exportsArray.pos;
     return applyChangesToString(content, [
       {
         type: ChangeType.Insert,
-        index: exportsArray[0].pos,
+        index,
         text: `\n${insert},`,
       },
     ]);