@nx/eslint 20.1.0-canary.20241030-62f58eb → 20.1.0-canary.20241101-d4f4dac

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "20.1.0-canary.20241030-62f58eb",
+  "version": "20.1.0-canary.20241101-d4f4dac",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -35,8 +35,8 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.1.0-canary.20241030-62f58eb",
-    "@nx/js": "20.1.0-canary.20241030-62f58eb",
+    "@nx/devkit": "20.1.0-canary.20241101-d4f4dac",
+    "@nx/js": "20.1.0-canary.20241101-d4f4dac",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2"

package/src/generators/lint-project/lint-project.js

@@ -184,7 +184,8 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
         });
         const nodeList = (0, ast_utils_1.createNodeList)(importMap, nodes);
         const content = (0, ast_utils_1.stringifyNodeList)(nodeList);
-        tree.write((0, path_1.join)(projectConfig.root, 'eslint.config.js'), content);
+        const ext = extendedRootConfig?.endsWith('.cjs') ? '.cjs' : '.js';
+        tree.write((0, path_1.join)(projectConfig.root, `eslint.config${ext}`), content);
     }
     else {
         (0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `.eslintrc.json`), {

package/src/generators/utils/eslint-file.js

@@ -40,7 +40,9 @@ function isEslintConfigSupported(tree, projectRoot = '') {
     if (!eslintFile) {
         return false;
     }
-    return eslintFile.endsWith('.json') || eslintFile.endsWith('.config.js');
+    return (eslintFile.endsWith('.json') ||
+        eslintFile.endsWith('.config.js') ||
+        eslintFile.endsWith('.config.cjs'));
 }
 function updateRelativePathsInConfig(tree, sourcePath, destinationPath) {
     if (sourcePath === destinationPath ||

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

@@ -729,14 +729,14 @@ function addTSObjectProperty(elements, key, value) {
  */
 function generateAst(input, propertyAssignmentReplacer) {
     if (Array.isArray(input)) {
-        return ts.factory.createArrayLiteralExpression(input.map((item) => generateAst(item, propertyAssignmentReplacer)), input.length > 1 // multiline only if more than one item
+        return ts.factory.createArrayLiteralExpression(input.map((item) => generateAst(item, propertyAssignmentReplacer)), true // Always treat as multiline, using item.length does not work in all cases
         );
     }
     if (input === null) {
         return ts.factory.createNull();
     }
     if (typeof input === 'object') {
-        return ts.factory.createObjectLiteralExpression(generatePropertyAssignmentsFromObjectEntries(input, propertyAssignmentReplacer), Object.keys(input).length > 1 // multiline only if more than one property
+        return ts.factory.createObjectLiteralExpression(generatePropertyAssignmentsFromObjectEntries(input, propertyAssignmentReplacer), true // Always treat as multiline, using  Object.keys(input).length > 1 does not work in all cases
         );
     }
     if (typeof input === 'string') {