@nx/eslint 0.0.0-pr-27404-f7ba497 → 0.0.0-pr-27404-00130f5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "0.0.0-pr-27404-f7ba497",
+  "version": "0.0.0-pr-27404-00130f5",
   "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,12 +35,12 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-27404-f7ba497",
-    "@nx/js": "0.0.0-pr-27404-f7ba497",
+    "@nx/devkit": "0.0.0-pr-27404-00130f5",
+    "@nx/js": "0.0.0-pr-27404-00130f5",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "0.0.0-pr-27404-f7ba497"
+    "@nx/linter": "0.0.0-pr-27404-00130f5"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

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

@@ -91,6 +91,11 @@ function migrateEslintFile(projectEslintPath, tree) {
                 'plugin:@nrwl/typescript',
                 'plugin:@nrwl/javascript',
             ]);
+            config = (0, ast_utils_1.removePredefinedConfigs)(config, '@nx/eslint-plugin', 'nx', [
+                'flat/base',
+                'flat/typescript',
+                'flat/javascript',
+            ]);
             tree.write(projectEslintPath, config);
         }
         else {

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

@@ -13,6 +13,10 @@ export declare function replaceOverride(content: string, root: string, lookup: (
  * Adding require statement to the top of the file
  */
 export declare function addImportToFlatConfig(content: string, variable: string | string[], imp: string): string;
+/**
+ * Remove an import from flat config
+ */
+export declare function removeImportFromFlatConfig(content: string, variable: string, imp: string): string;
 /**
  * Injects new ts.expression to the end of the module.exports array.
  */
@@ -22,6 +26,7 @@ export declare function addBlockToFlatConfigExport(content: string, config: ts.E
 }): string;
 export declare function removePlugin(content: string, pluginName: string, pluginImport: string): string;
 export declare function removeCompatExtends(content: string, compatExtends: string[]): string;
+export declare function removePredefinedConfigs(content: string, moduleImport: string, moduleVariable: string, configs: string[]): string;
 /**
  * Add plugins block to the top of the export blocks
  */

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

@@ -4,9 +4,11 @@ exports.removeOverridesFromLintConfig = removeOverridesFromLintConfig;
 exports.hasOverride = hasOverride;
 exports.replaceOverride = replaceOverride;
 exports.addImportToFlatConfig = addImportToFlatConfig;
+exports.removeImportFromFlatConfig = removeImportFromFlatConfig;
 exports.addBlockToFlatConfigExport = addBlockToFlatConfigExport;
 exports.removePlugin = removePlugin;
 exports.removeCompatExtends = removeCompatExtends;
+exports.removePredefinedConfigs = removePredefinedConfigs;
 exports.addPluginsToExportsBlock = addPluginsToExportsBlock;
 exports.addFlatCompatToFlatConfig = addFlatCompatToFlatConfig;
 exports.createNodeList = createNodeList;
@@ -233,6 +235,32 @@ function addImportToFlatConfig(content, variable, imp) {
         },
     ]);
 }
+/**
+ * Remove an import from flat config
+ */
+function removeImportFromFlatConfig(content, variable, imp) {
+    const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const changes = [];
+    ts.forEachChild(source, (node) => {
+        // we can only combine object binding patterns
+        if (ts.isVariableStatement(node) &&
+            ts.isVariableDeclaration(node.declarationList.declarations[0]) &&
+            ts.isIdentifier(node.declarationList.declarations[0].name) &&
+            node.declarationList.declarations[0].name.getText() === variable &&
+            ts.isCallExpression(node.declarationList.declarations[0].initializer) &&
+            node.declarationList.declarations[0].initializer.expression.getText() ===
+                'require' &&
+            ts.isStringLiteral(node.declarationList.declarations[0].initializer.arguments[0]) &&
+            node.declarationList.declarations[0].initializer.arguments[0].text === imp) {
+            changes.push({
+                type: devkit_1.ChangeType.Delete,
+                start: node.pos,
+                length: node.end - node.pos,
+            });
+        }
+    });
+    return (0, devkit_1.applyChangesToString)(content, changes);
+}
 /**
  * Injects new ts.expression to the end of the module.exports array.
  */
@@ -418,6 +446,38 @@ function removeCompatExtends(content, compatExtends) {
     });
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
+function removePredefinedConfigs(content, moduleImport, moduleVariable, configs) {
+    const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const changes = [];
+    let removeImport = true;
+    findAllBlocks(source).forEach((node) => {
+        if (ts.isSpreadElement(node) &&
+            ts.isElementAccessExpression(node.expression) &&
+            ts.isPropertyAccessExpression(node.expression.expression) &&
+            ts.isIdentifier(node.expression.expression.expression) &&
+            node.expression.expression.expression.getText() === moduleVariable &&
+            ts.isStringLiteral(node.expression.argumentExpression)) {
+            const config = node.expression.argumentExpression.getText();
+            // Check the text without quotes
+            if (configs.includes(config.substring(1, config.length - 1))) {
+                changes.push({
+                    type: devkit_1.ChangeType.Delete,
+                    start: node.pos,
+                    length: node.end - node.pos + 1, // trailing comma
+                });
+            }
+            else {
+                // If there is still a config used, do not remove import
+                removeImport = false;
+            }
+        }
+    });
+    let updated = (0, devkit_1.applyChangesToString)(content, changes);
+    if (removeImport) {
+        updated = removeImportFromFlatConfig(updated, moduleVariable, moduleImport);
+    }
+    return updated;
+}
 /**
  * Add plugins block to the top of the export blocks
  */