@nx/eslint 20.4.0-beta.0 → 20.4.0-beta.2

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

@@ -17,6 +17,7 @@ exports.generatePluginExtendsElement = generatePluginExtendsElement;
 exports.generatePluginExtendsElementWithCompatFixup = generatePluginExtendsElementWithCompatFixup;
 exports.stringifyNodeList = stringifyNodeList;
 exports.generateRequire = generateRequire;
+exports.generateESMImport = generateESMImport;
 exports.overrideNeedsCompat = overrideNeedsCompat;
 exports.generateFlatOverride = generateFlatOverride;
 exports.generateFlatPredefinedConfig = generateFlatPredefinedConfig;
@@ -35,7 +36,8 @@ const SPREAD_ELEMENTS_REGEXP = /\s*\.\.\.[a-zA-Z0-9_]+(\.[a-zA-Z0-9_]+)*,?\n?/g;
  */
 function removeOverridesFromLintConfig(content) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    const exportsArray = findAllBlocks(source);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
     if (!exportsArray) {
         return content;
     }
@@ -52,7 +54,16 @@ function removeOverridesFromLintConfig(content) {
     });
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
-function findAllBlocks(source) {
+// TODO Change name
+function findExportDefault(source) {
+    return ts.forEachChild(source, function analyze(node) {
+        if (ts.isExportAssignment(node) &&
+            ts.isArrayLiteralExpression(node.expression)) {
+            return node.expression.elements;
+        }
+    });
+}
+function findModuleExports(source) {
     return ts.forEachChild(source, function analyze(node) {
         if (ts.isExpressionStatement(node) &&
             ts.isBinaryExpression(node.expression) &&
@@ -74,7 +85,8 @@ function isOverride(node) {
 }
 function hasOverride(content, lookup) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    const exportsArray = findAllBlocks(source);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
     if (!exportsArray) {
         return false;
     }
@@ -105,14 +117,16 @@ function parseTextToJson(text) {
         .replace(/'/g, '"')
         .replace(/\s([a-zA-Z0-9_]+)\s*:/g, ' "$1": ')
         // stringify any require calls to avoid JSON parsing errors, turn them into just the string value being required
-        .replace(/require\(['"]([^'"]+)['"]\)/g, '"$1"'));
+        .replace(/require\(['"]([^'"]+)['"]\)/g, '"$1"')
+        .replace(/\(?await import\(['"]([^'"]+)['"]\)\)?/g, '"$1"'));
 }
 /**
  * Finds an override matching the lookup function and applies the update function to it
  */
 function replaceOverride(content, root, lookup, update) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    const exportsArray = findAllBlocks(source);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
     if (!exportsArray) {
         return content;
     }
@@ -145,19 +159,17 @@ function replaceOverride(content, root, lookup, update) {
                 let updatedData = update(data);
                 if (updatedData) {
                     updatedData = mapFilePaths(updatedData);
+                    const parserReplacement = format === 'mjs'
+                        ? (parser) => `(await import('${parser}'))`
+                        : (parser) => `require('${parser}')`;
                     changes.push({
                         type: devkit_1.ChangeType.Insert,
                         index: start,
-                        // NOTE: Indentation added to format without formatting tools like Prettier.
                         text: '    ' +
                             JSON.stringify(updatedData, null, 2)
-                                // restore any parser require calls that were stripped during JSON parsing
-                                .replace(/"parser": "([^"]+)"/g, (_, parser) => {
-                                return `"parser": require('${parser}')`;
-                            })
-                                .slice(2, -2) // remove curly braces and start/end line breaks since we are injecting just properties
-                                // Append indentation so file is formatted without Prettier
-                                .replaceAll(/\n/g, '\n    '),
+                                .replace(/"parser": "([^"]+)"/g, (_, parser) => `"parser": ${parserReplacement(parser)}`)
+                                .slice(2, -2) // Remove curly braces and start/end line breaks
+                                .replaceAll(/\n/g, '\n    '), // Maintain indentation
                     });
                 }
             }
@@ -166,11 +178,89 @@ function replaceOverride(content, root, lookup, update) {
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
 /**
- * Adding require statement to the top of the file
+ * Adding import statement to the top of the file
+ * The imports are added based on a few rules:
+ * 1. If it's a default import and matches the variable, return content unchanged.
+ * 2. If it's a named import and the variables are not part of the import object, add them.
+ * 3. If no existing import and variable is a string, add a default import.
+ * 4. If no existing import and variable is an array, add it as an object import.
  */
 function addImportToFlatConfig(content, variable, imp) {
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    if (format === 'mjs') {
+        return addESMImportToFlatConfig(source, printer, content, variable, imp);
+    }
+    return addCJSImportToFlatConfig(source, printer, content, variable, imp);
+}
+function addESMImportToFlatConfig(source, printer, content, variable, imp) {
+    let existingImport;
+    ts.forEachChild(source, (node) => {
+        if (ts.isImportDeclaration(node) &&
+            ts.isStringLiteral(node.moduleSpecifier) &&
+            node.moduleSpecifier.text === imp) {
+            existingImport = node;
+        }
+    });
+    // Rule 1:
+    if (existingImport &&
+        typeof variable === 'string' &&
+        existingImport.importClause?.name?.getText() === variable) {
+        return content;
+    }
+    // Rule 2:
+    if (existingImport &&
+        existingImport.importClause?.namedBindings &&
+        Array.isArray(variable)) {
+        const namedImports = existingImport.importClause
+            .namedBindings;
+        const existingElements = namedImports.elements;
+        // Filter out variables that are already imported
+        const newVariables = variable.filter((v) => !existingElements.some((e) => e.name.getText() === v));
+        if (newVariables.length === 0) {
+            return content;
+        }
+        const newImportSpecifiers = newVariables.map((v) => ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(v)));
+        const lastElement = existingElements[existingElements.length - 1];
+        const insertIndex = lastElement
+            ? lastElement.getEnd()
+            : namedImports.getEnd();
+        const insertText = printer.printList(ts.ListFormat.NamedImportsOrExportsElements, ts.factory.createNodeArray(newImportSpecifiers), source);
+        return (0, devkit_1.applyChangesToString)(content, [
+            {
+                type: devkit_1.ChangeType.Insert,
+                index: insertIndex,
+                text: `, ${insertText}`,
+            },
+        ]);
+    }
+    // Rule 3:
+    if (!existingImport && typeof variable === 'string') {
+        const defaultImport = ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(false, ts.factory.createIdentifier(variable), undefined), ts.factory.createStringLiteral(imp));
+        const insert = printer.printNode(ts.EmitHint.Unspecified, defaultImport, source);
+        return (0, devkit_1.applyChangesToString)(content, [
+            {
+                type: devkit_1.ChangeType.Insert,
+                index: 0,
+                text: `${insert}\n`,
+            },
+        ]);
+    }
+    // Rule 4:
+    if (!existingImport && Array.isArray(variable)) {
+        const objectImport = ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports(variable.map((v) => ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(v))))), ts.factory.createStringLiteral(imp));
+        const insert = printer.printNode(ts.EmitHint.Unspecified, objectImport, source);
+        return (0, devkit_1.applyChangesToString)(content, [
+            {
+                type: devkit_1.ChangeType.Insert,
+                index: 0,
+                text: `${insert}\n`,
+            },
+        ]);
+    }
+}
+function addCJSImportToFlatConfig(source, printer, content, variable, imp) {
     const foundBindingVars = ts.forEachChild(source, function analyze(node) {
         // we can only combine object binding patterns
         if (!Array.isArray(variable)) {
@@ -239,11 +329,48 @@ function addImportToFlatConfig(content, variable, imp) {
         },
     ]);
 }
+function existsAsNamedOrDefaultImport(node, variable) {
+    const isNamed = node.importClause.namedBindings &&
+        ts.isNamedImports(node.importClause.namedBindings);
+    if (Array.isArray(variable)) {
+        return isNamed || variable.includes(node.importClause?.name?.getText());
+    }
+    return ((node.importClause.namedBindings &&
+        ts.isNamedImports(node.importClause.namedBindings)) ||
+        node.importClause?.name?.getText() === variable);
+}
 /**
  * Remove an import from flat config
  */
 function removeImportFromFlatConfig(content, variable, imp) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    if (format === 'mjs') {
+        return removeImportFromFlatConfigESM(source, content, variable, imp);
+    }
+    else {
+        return removeImportFromFlatConfigCJS(source, content, variable, imp);
+    }
+}
+function removeImportFromFlatConfigESM(source, content, variable, imp) {
+    const changes = [];
+    ts.forEachChild(source, (node) => {
+        // we can only combine object binding patterns
+        if (ts.isImportDeclaration(node) &&
+            ts.isStringLiteral(node.moduleSpecifier) &&
+            node.moduleSpecifier.text === imp &&
+            node.importClause &&
+            existsAsNamedOrDefaultImport(node, variable)) {
+            changes.push({
+                type: devkit_1.ChangeType.Delete,
+                start: node.pos,
+                length: node.end - node.pos,
+            });
+        }
+    });
+    return (0, devkit_1.applyChangesToString)(content, changes);
+}
+function removeImportFromFlatConfigCJS(source, content, variable, imp) {
     const changes = [];
     ts.forEachChild(source, (node) => {
         // we can only combine object binding patterns
@@ -266,13 +393,44 @@ function removeImportFromFlatConfig(content, variable, imp) {
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
 /**
- * Injects new ts.expression to the end of the module.exports array.
+ * Injects new ts.expression to the end of the module.exports or export default array.
  */
 function addBlockToFlatConfigExport(content, config, options = {
     insertAtTheEnd: true,
 }) {
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    // find the export default array statement
+    if (format === 'mjs') {
+        return addBlockToFlatConfigExportESM(content, config, source, printer, options);
+    }
+    else {
+        return addBlockToFlatConfigExportCJS(content, config, source, printer, options);
+    }
+}
+function addBlockToFlatConfigExportESM(content, config, source, printer, options = {
+    insertAtTheEnd: true,
+}) {
+    const exportDefaultStatement = source.statements.find((statement) => ts.isExportAssignment(statement) &&
+        ts.isArrayLiteralExpression(statement.expression));
+    if (!exportDefaultStatement)
+        return content;
+    const exportArrayLiteral = exportDefaultStatement.expression;
+    const updatedArrayElements = options.insertAtTheEnd
+        ? [...exportArrayLiteral.elements, config]
+        : [config, ...exportArrayLiteral.elements];
+    const updatedExportDefault = ts.factory.createExportAssignment(undefined, false, ts.factory.createArrayLiteralExpression(updatedArrayElements, true));
+    // update the existing export default array
+    const updatedStatements = source.statements.map((statement) => statement === exportDefaultStatement ? updatedExportDefault : statement);
+    const updatedSource = ts.factory.updateSourceFile(source, updatedStatements);
+    return printer
+        .printFile(updatedSource)
+        .replace(/export default/, '\nexport default');
+}
+function addBlockToFlatConfigExportCJS(content, config, source, printer, options = {
+    insertAtTheEnd: true,
+}) {
     const exportsArray = ts.forEachChild(source, function analyze(node) {
         if (ts.isExpressionStatement(node) &&
             ts.isBinaryExpression(node.expression) &&
@@ -315,28 +473,47 @@ function addBlockToFlatConfigExport(content, config, options = {
 }
 function removePlugin(content, pluginName, pluginImport) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
     const changes = [];
+    if (format === 'mjs') {
+        ts.forEachChild(source, function analyze(node) {
+            if (ts.isImportDeclaration(node) &&
+                ts.isStringLiteral(node.moduleSpecifier) &&
+                node.moduleSpecifier.text === pluginImport) {
+                const importClause = node.importClause;
+                if ((importClause && importClause.name) ||
+                    (importClause.namedBindings &&
+                        ts.isNamedImports(importClause.namedBindings))) {
+                    changes.push({
+                        type: devkit_1.ChangeType.Delete,
+                        start: node.pos,
+                        length: node.end - node.pos,
+                    });
+                }
+            }
+        });
+    }
+    else {
+        ts.forEachChild(source, function analyze(node) {
+            if (ts.isVariableStatement(node) &&
+                ts.isVariableDeclaration(node.declarationList.declarations[0]) &&
+                ts.isCallExpression(node.declarationList.declarations[0].initializer) &&
+                node.declarationList.declarations[0].initializer.arguments.length &&
+                ts.isStringLiteral(node.declarationList.declarations[0].initializer.arguments[0]) &&
+                node.declarationList.declarations[0].initializer.arguments[0].text ===
+                    pluginImport) {
+                changes.push({
+                    type: devkit_1.ChangeType.Delete,
+                    start: node.pos,
+                    length: node.end - node.pos,
+                });
+            }
+        });
+    }
     ts.forEachChild(source, function analyze(node) {
-        if (ts.isVariableStatement(node) &&
-            ts.isVariableDeclaration(node.declarationList.declarations[0]) &&
-            ts.isCallExpression(node.declarationList.declarations[0].initializer) &&
-            node.declarationList.declarations[0].initializer.arguments.length &&
-            ts.isStringLiteral(node.declarationList.declarations[0].initializer.arguments[0]) &&
-            node.declarationList.declarations[0].initializer.arguments[0].text ===
-                pluginImport) {
-            changes.push({
-                type: devkit_1.ChangeType.Delete,
-                start: node.pos,
-                length: node.end - node.pos,
-            });
-        }
-    });
-    ts.forEachChild(source, function analyze(node) {
-        if (ts.isExpressionStatement(node) &&
-            ts.isBinaryExpression(node.expression) &&
-            node.expression.left.getText() === 'module.exports' &&
-            ts.isArrayLiteralExpression(node.expression.right)) {
-            const blockElements = node.expression.right.elements;
+        if (ts.isExportAssignment(node) &&
+            ts.isArrayLiteralExpression(node.expression)) {
+            const blockElements = node.expression.elements;
             blockElements.forEach((element) => {
                 if (ts.isObjectLiteralExpression(element)) {
                     const pluginsElem = element.properties.find((prop) => prop.name?.getText() === 'plugins');
@@ -426,7 +603,12 @@ function removePlugin(content, pluginName, pluginImport) {
 function removeCompatExtends(content, compatExtends) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
     const changes = [];
-    findAllBlocks(source)?.forEach((node) => {
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
+    if (!exportsArray) {
+        return content;
+    }
+    exportsArray.forEach((node) => {
         if (ts.isSpreadElement(node) &&
             ts.isCallExpression(node.expression) &&
             ts.isArrowFunction(node.expression.arguments[0]) &&
@@ -460,9 +642,14 @@ function removeCompatExtends(content, compatExtends) {
 }
 function removePredefinedConfigs(content, moduleImport, moduleVariable, configs) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
     const changes = [];
     let removeImport = true;
-    findAllBlocks(source)?.forEach((node) => {
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
+    if (!exportsArray) {
+        return content;
+    }
+    exportsArray.forEach((node) => {
         if (ts.isSpreadElement(node) &&
             ts.isElementAccessExpression(node.expression) &&
             ts.isPropertyAccessExpression(node.expression.expression) &&
@@ -507,14 +694,22 @@ function addPluginsToExportsBlock(content, plugins) {
  * Adds compat if missing to flat config
  */
 function addFlatCompatToFlatConfig(content) {
-    let result = content;
-    result = addImportToFlatConfig(result, 'js', '@eslint/js');
+    const result = addImportToFlatConfig(content, 'js', '@eslint/js');
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
     if (result.includes('const compat = new FlatCompat')) {
         return result;
     }
-    result = addImportToFlatConfig(result, ['FlatCompat'], '@eslint/eslintrc');
-    const index = result.indexOf('module.exports');
-    return (0, devkit_1.applyChangesToString)(result, [
+    if (format === 'mjs') {
+        return addFlatCompatToFlatConfigESM(result);
+    }
+    else {
+        return addFlatCompatToFlatConfigCJS(result);
+    }
+}
+function addFlatCompatToFlatConfigCJS(content) {
+    content = addImportToFlatConfig(content, ['FlatCompat'], '@eslint/eslintrc');
+    const index = content.indexOf('module.exports');
+    return (0, devkit_1.applyChangesToString)(content, [
         {
             type: devkit_1.ChangeType.Insert,
             index: index - 1,
@@ -527,25 +722,62 @@ const compat = new FlatCompat({
         },
     ]);
 }
+function addFlatCompatToFlatConfigESM(content) {
+    const importsToAdd = [
+        { variable: 'js', module: '@eslint/js' },
+        { variable: ['fileURLToPath'], module: 'url' },
+        { variable: ['dirname'], module: 'path' },
+        { variable: ['FlatCompat'], module: '@eslint/eslintrc' },
+    ];
+    for (const { variable, module } of importsToAdd) {
+        content = addImportToFlatConfig(content, variable, module);
+    }
+    const index = content.indexOf('export default');
+    return (0, devkit_1.applyChangesToString)(content, [
+        {
+            type: devkit_1.ChangeType.Insert,
+            index: index - 1,
+            text: `
+const compat = new FlatCompat({
+  baseDirectory: dirname(fileURLToPath(import.meta.url)),
+  recommendedConfig: js.configs.recommended,
+});\n
+`,
+        },
+    ]);
+}
 /**
  * Generate node list representing the imports and the exports blocks
  * Optionally add flat compat initialization
  */
-function createNodeList(importsMap, exportElements) {
+function createNodeList(importsMap, exportElements, format) {
     const importsList = [];
-    // generateRequire(varName, imp, ts.factory);
     Array.from(importsMap.entries()).forEach(([imp, varName]) => {
-        importsList.push(generateRequire(varName, imp));
+        if (format === 'mjs') {
+            importsList.push(generateESMImport(varName, imp));
+        }
+        else {
+            importsList.push(generateRequire(varName, imp));
+        }
     });
+    const exports = format === 'mjs'
+        ? generateESMExport(exportElements)
+        : generateCJSExport(exportElements);
     return ts.factory.createNodeArray([
         // add plugin imports
         ...importsList,
         ts.createSourceFile('', '', ts.ScriptTarget.Latest, false, ts.ScriptKind.JS),
-        // creates:
-        // module.exports = [ ... ];
-        ts.factory.createExpressionStatement(ts.factory.createBinaryExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('module'), ts.factory.createIdentifier('exports')), ts.factory.createToken(ts.SyntaxKind.EqualsToken), ts.factory.createArrayLiteralExpression(exportElements, true))),
+        exports,
     ]);
 }
+function generateESMExport(elements) {
+    // creates: export default = [...]
+    return ts.factory.createExportAssignment(undefined, false, ts.factory.createArrayLiteralExpression(elements, true));
+}
+function generateCJSExport(elements) {
+    // creates: module.exports = [...]
+    return ts.factory.createExpressionStatement(ts.factory.createBinaryExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('module'), ts.factory.createIdentifier('exports')), ts.factory.createToken(ts.SyntaxKind.EqualsToken), ts.factory.createArrayLiteralExpression(elements, true)));
+}
 function generateSpreadElement(name) {
     return ts.factory.createSpreadElement(ts.factory.createIdentifier(name));
 }
@@ -563,12 +795,17 @@ function generatePluginExtendsElementWithCompatFixup(plugin) {
 function stringifyNodeList(nodes) {
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
     const resultFile = ts.createSourceFile('', '', ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    return (printer
+    const result = printer
         .printList(ts.ListFormat.MultiLine, nodes, resultFile)
         // add new line before compat initialization
-        .replace(/const compat = new FlatCompat/, '\nconst compat = new FlatCompat')
-        // add new line before module.exports = ...
-        .replace(/module\.exports/, '\nmodule.exports'));
+        .replace(/const compat = new FlatCompat/, '\nconst compat = new FlatCompat');
+    if (result.includes('export default')) {
+        return result // add new line before export default = ...
+            .replace(/export default/, '\nexport default');
+    }
+    else {
+        return result.replace(/module.exports/, '\nmodule.exports');
+    }
 }
 /**
  * generates AST require statement
@@ -578,6 +815,26 @@ function generateRequire(variableName, imp) {
         ts.factory.createVariableDeclaration(variableName, undefined, undefined, ts.factory.createCallExpression(ts.factory.createIdentifier('require'), undefined, [ts.factory.createStringLiteral(imp)])),
     ], ts.NodeFlags.Const));
 }
+// Top level imports
+function generateESMImport(variableName, imp) {
+    let importClause;
+    if (typeof variableName === 'string') {
+        // For single variable import e.g import foo from 'module';
+        importClause = ts.factory.createImportClause(false, ts.factory.createIdentifier(variableName), undefined);
+    }
+    else {
+        // For object binding pattern import e.g import { a, b, c } from 'module';
+        importClause = ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports(variableName.elements.map((element) => {
+            const propertyName = element.propertyName
+                ? ts.isIdentifier(element.propertyName)
+                    ? element.propertyName
+                    : ts.factory.createIdentifier(element.propertyName.getText())
+                : undefined;
+            return ts.factory.createImportSpecifier(false, propertyName, element.name);
+        })));
+    }
+    return ts.factory.createImportDeclaration(undefined, importClause, ts.factory.createStringLiteral(imp));
+}
 /**
  * FROM: https://github.com/eslint/rewrite/blob/e2a7ec809db20e638abbad250d105ddbde88a8d5/packages/migrate-config/src/migrate-config.js#L222
  *
@@ -603,7 +860,7 @@ function overrideNeedsCompat(override) {
  * Generates an AST object or spread element representing a modern flat config entry,
  * based on a given legacy eslintrc JSON override object
  */
-function generateFlatOverride(_override) {
+function generateFlatOverride(_override, format) {
     const override = mapFilePaths(_override);
     // We do not need the compat tooling for this override
     if (!overrideNeedsCompat(override)) {
@@ -659,12 +916,10 @@ function generateFlatOverride(_override) {
                     return propertyAssignment;
                 }
                 else {
-                    // Change parser to require statement.
-                    return ts.factory.createPropertyAssignment('parser', ts.factory.createCallExpression(ts.factory.createIdentifier('require'), undefined, [
-                        ts.factory.createStringLiteral(override['languageOptions']?.['parserOptions']?.parser ??
-                            override['languageOptions']?.parser ??
-                            override.parser),
-                    ]));
+                    // Change parser to import statement.
+                    return format === 'mjs'
+                        ? generateESMParserImport(override)
+                        : generateCJSParserImport(override);
                 }
             },
         });
@@ -719,6 +974,20 @@ function generateFlatOverride(_override) {
         ], undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.factory.createParenthesizedExpression(ts.factory.createObjectLiteralExpression(objectLiteralElements, true))),
     ]));
 }
+function generateESMParserImport(override) {
+    return ts.factory.createPropertyAssignment('parser', ts.factory.createAwaitExpression(ts.factory.createCallExpression(ts.factory.createIdentifier('import'), undefined, [
+        ts.factory.createStringLiteral(override['languageOptions']?.['parserOptions']?.parser ??
+            override['languageOptions']?.parser ??
+            override.parser),
+    ])));
+}
+function generateCJSParserImport(override) {
+    return ts.factory.createPropertyAssignment('parser', ts.factory.createCallExpression(ts.factory.createIdentifier('require'), undefined, [
+        ts.factory.createStringLiteral(override['languageOptions']?.['parserOptions']?.parser ??
+            override['languageOptions']?.parser ??
+            override.parser),
+    ]));
+}
 function generateFlatPredefinedConfig(predefinedConfigName, moduleName = 'nx', spread = true) {
     const node = ts.factory.createElementAccessExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(moduleName), ts.factory.createIdentifier('configs')), ts.factory.createStringLiteral(predefinedConfigName));
     return spread ? ts.factory.createSpreadElement(node) : node;

package/src/generators/workspace-rules-project/workspace-rules-project.js

@@ -5,6 +5,7 @@ exports.lintWorkspaceRulesProjectGenerator = lintWorkspaceRulesProjectGenerator;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
 const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
@@ -47,7 +48,7 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
         supportTsx: false,
         skipSerializers: true,
         setupFile: 'none',
-        compiler: 'tsc',
+        compiler: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ? 'swc' : 'tsc',
         skipFormat: true,
     }));
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(workspace_lint_rules_1.workspaceLintPluginDir, 'tsconfig.spec.json'), (json) => {

package/src/plugins/plugin.js

@@ -230,7 +230,7 @@ function getRootForDirectory(directory, roots) {
 function getProjectUsingESLintConfig(configFilePath, projectRoot, eslintVersion, options, context) {
     const rootEslintConfig = [
         config_file_1.baseEsLintConfigFile,
-        config_file_1.baseEsLintFlatConfigFile,
+        ...config_file_1.BASE_ESLINT_CONFIG_FILENAMES,
         ...config_file_1.ESLINT_CONFIG_FILENAMES,
     ].find((f) => (0, node_fs_1.existsSync)((0, posix_1.join)(context.workspaceRoot, f)));
     // Add a lint target for each child project without an eslint config, with the root level config as an input

package/src/utils/config-file.d.ts

@@ -1,8 +1,9 @@
 export declare const ESLINT_FLAT_CONFIG_FILENAMES: string[];
 export declare const ESLINT_OLD_CONFIG_FILENAMES: string[];
 export declare const ESLINT_CONFIG_FILENAMES: string[];
+export declare const BASE_ESLINT_CONFIG_FILENAMES: string[];
 export declare const baseEsLintConfigFile = ".eslintrc.base.json";
-export declare const baseEsLintFlatConfigFile = "eslint.base.config.cjs";
+export declare const baseEsLintFlatConfigFile = "eslint.base.config.mjs";
 export declare const legacyBaseEsLintFlatConfigFile = "eslint.base.config.js";
 export declare function isFlatConfig(configFilePath: string): boolean;
 export declare function findFlatConfigFile(directory: string, workspaceRoot: string): string | null;

package/src/utils/config-file.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.legacyBaseEsLintFlatConfigFile = exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.ESLINT_CONFIG_FILENAMES = exports.ESLINT_OLD_CONFIG_FILENAMES = exports.ESLINT_FLAT_CONFIG_FILENAMES = void 0;
+exports.legacyBaseEsLintFlatConfigFile = exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.BASE_ESLINT_CONFIG_FILENAMES = exports.ESLINT_CONFIG_FILENAMES = exports.ESLINT_OLD_CONFIG_FILENAMES = exports.ESLINT_FLAT_CONFIG_FILENAMES = void 0;
 exports.isFlatConfig = isFlatConfig;
 exports.findFlatConfigFile = findFlatConfigFile;
 exports.findOldConfigFile = findOldConfigFile;
@@ -20,8 +20,9 @@ exports.ESLINT_CONFIG_FILENAMES = [
     ...exports.ESLINT_OLD_CONFIG_FILENAMES,
     ...exports.ESLINT_FLAT_CONFIG_FILENAMES,
 ];
+exports.BASE_ESLINT_CONFIG_FILENAMES = flat_config_1.baseEslintConfigFilenames;
 exports.baseEsLintConfigFile = '.eslintrc.base.json';
-exports.baseEsLintFlatConfigFile = 'eslint.base.config.cjs';
+exports.baseEsLintFlatConfigFile = 'eslint.base.config.mjs';
 // Make sure we can handle previous file extension as well for migrations or custom generators.
 exports.legacyBaseEsLintFlatConfigFile = 'eslint.base.config.js';
 function isFlatConfig(configFilePath) {

package/src/utils/flat-config.d.ts

@@ -1,4 +1,5 @@
 import { Tree } from '@nx/devkit';
 export declare const eslintFlatConfigFilenames: string[];
+export declare const baseEslintConfigFilenames: string[];
 export declare function getRootESLintFlatConfigFilename(tree: Tree): string;
 export declare function useFlatConfig(tree?: Tree): boolean;

package/src/utils/flat-config.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eslintFlatConfigFilenames = void 0;
+exports.baseEslintConfigFilenames = exports.eslintFlatConfigFilenames = void 0;
 exports.getRootESLintFlatConfigFilename = getRootESLintFlatConfigFilename;
 exports.useFlatConfig = useFlatConfig;
 const semver_1 = require("semver");
-// todo: add support for eslint.config.mjs,
 exports.eslintFlatConfigFilenames = [
     'eslint.config.cjs',
     'eslint.config.js',
+    'eslint.config.mjs',
+];
+exports.baseEslintConfigFilenames = [
+    'eslint.base.js',
+    'eslint.base.config.cjs',
+    'eslint.base.config.js',
+    'eslint.base.config.mjs',
 ];
 function getRootESLintFlatConfigFilename(tree) {
     for (const file of exports.eslintFlatConfigFilenames) {

package/src/utils/versions.d.ts

@@ -3,6 +3,6 @@ export declare const eslintVersion = "~8.57.0";
 export declare const eslintrcVersion = "^2.1.1";
 export declare const eslintConfigPrettierVersion = "^9.0.0";
 export declare const typescriptESLintVersion = "^7.16.0";
-export declare const eslint9__typescriptESLintVersion = "^8.13.0";
+export declare const eslint9__typescriptESLintVersion = "^8.19.0";
 export declare const eslint9__eslintVersion = "^9.8.0";
 export declare const eslintCompat = "^1.1.1";