@nx/eslint 18.2.0-canary.20240320-64b2396 → 18.2.0-canary.20240322-61cb63d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "18.2.0-canary.20240320-64b2396",
+  "version": "18.2.0-canary.20240322-61cb63d",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -33,12 +33,12 @@
     "js-yaml": "4.1.0"
   },
   "dependencies": {
-    "@nx/devkit": "18.2.0-canary.20240320-64b2396",
-    "@nx/js": "18.2.0-canary.20240320-64b2396",
+    "@nx/devkit": "18.2.0-canary.20240322-61cb63d",
+    "@nx/js": "18.2.0-canary.20240322-61cb63d",
     "eslint": "^8.0.0",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "18.2.0-canary.20240320-64b2396"
+    "@nx/linter": "18.2.0-canary.20240322-61cb63d"
   },
   "peerDependenciesMeta": {
     "js-yaml": {

package/src/generators/init/init-migration.js

@@ -104,6 +104,10 @@ function migrateEslintFile(projectEslintPath, tree) {
                 }
                 // add extends
                 json.extends = json.extends || [];
+                // ensure extends is an array
+                if (typeof json.extends === 'string') {
+                    json.extends = [json.extends];
+                }
                 const pathToRootConfig = `${(0, devkit_1.offsetFromRoot)((0, path_1.dirname)(projectEslintPath))}${baseFile}`;
                 if (json.extends.indexOf(pathToRootConfig) === -1) {
                     json.extends.push(pathToRootConfig);

package/src/generators/utils/flat-config/ast-utils.js

@@ -502,15 +502,24 @@ function generateFlatOverride(override) {
         !override.extends &&
         !override.plugins &&
         !override.parser) {
+        if (override.parserOptions) {
+            const { parserOptions, ...rest } = override;
+            return generateAst({ ...rest, languageSettings: { parserOptions } });
+        }
         return generateAst(override);
     }
-    const { files, excludedFiles, rules, ...rest } = override;
+    const { files, excludedFiles, rules, parserOptions, ...rest } = override;
     const objectLiteralElements = [
         ts.factory.createSpreadAssignment(ts.factory.createIdentifier('config')),
     ];
     addTSObjectProperty(objectLiteralElements, 'files', files);
     addTSObjectProperty(objectLiteralElements, 'excludedFiles', excludedFiles);
     addTSObjectProperty(objectLiteralElements, 'rules', rules);
+    if (parserOptions) {
+        addTSObjectProperty(objectLiteralElements, 'languageSettings', {
+            parserOptions,
+        });
+    }
     return ts.factory.createSpreadElement(ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('compat'), ts.factory.createIdentifier('config')), undefined, [generateAst(rest)]), ts.factory.createIdentifier('map')), undefined, [
         ts.factory.createArrowFunction(undefined, undefined, [
             ts.factory.createParameterDeclaration(undefined, undefined, 'config'),