@nx/eslint 0.0.0-pr-27404-ad15a9c → 0.0.0-pr-27404-9b7456c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "0.0.0-pr-27404-ad15a9c",
+  "version": "0.0.0-pr-27404-9b7456c",
   "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-ad15a9c",
-    "@nx/js": "0.0.0-pr-27404-ad15a9c",
+    "@nx/devkit": "0.0.0-pr-27404-9b7456c",
+    "@nx/js": "0.0.0-pr-27404-9b7456c",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "0.0.0-pr-27404-ad15a9c"
+    "@nx/linter": "0.0.0-pr-27404-9b7456c"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

package/src/generators/init/global-eslint-config.js

@@ -86,7 +86,25 @@ const getGlobalFlatEslintConfiguration = (rootProject) => {
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)('flat/typescript'));
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)('flat/javascript'));
     if (!rootProject) {
-        content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(moduleBoundariesOverride));
+        content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
+            files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+            rules: {
+                '@nx/enforce-module-boundaries': [
+                    'error',
+                    {
+                        enforceBuildableLibDependency: true,
+                        allow: [
+                            // This allows a root project to be present without causing lint errors
+                            // since all projects will depend on this base file.
+                            '^.*/eslint.base.config.[cm]?js$',
+                        ],
+                        depConstraints: [
+                            { sourceTag: '*', onlyDependOnLibsWithTags: ['*'] },
+                        ],
+                    },
+                ],
+            },
+        }));
     }
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
         files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],

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

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

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

@@ -164,7 +164,7 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
                     'error',
                     {
                         // With flat configs, we don't want to include imports in the eslint js/cjs/mjs files to be checked
-                        ignoredFiles: ['**/*/*eslint*'],
+                        ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs}'],
                     },
                 ],
             },

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

@@ -26,11 +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;
-/**
- * Removes the pre-defined configs that match `configs` array from the config export.
- * Also, removes the module matching `moduleImport` from imports if it is unused.
- */
-export declare function removePredefinedConfigs(content: string, moduleVariable: string, moduleImport: string, configs: 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

@@ -277,6 +277,11 @@ function addBlockToFlatConfigExport(content, config, options = {
             return node.expression.right.elements;
         }
     });
+    // The config is not in the format that we generate with, skip update.
+    // This could happen during `init-migration` when extracting config from the base, but
+    // base config was not generated by Nx.
+    if (!exportsArray)
+        return content;
     const insert = printer.printNode(ts.EmitHint.Expression, config, source);
     if (options.insertAtTheEnd) {
         const index = exportsArray.length > 0
@@ -414,7 +419,7 @@ 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) => {
+    findAllBlocks(source)?.forEach((node) => {
         if (ts.isSpreadElement(node) &&
             ts.isCallExpression(node.expression) &&
             ts.isArrowFunction(node.expression.arguments[0]) &&
@@ -446,15 +451,11 @@ function removeCompatExtends(content, compatExtends) {
     });
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
-/**
- * Removes the pre-defined configs that match `configs` array from the config export.
- * Also, removes the module matching `moduleImport` from imports if it is unused.
- */
-function removePredefinedConfigs(content, moduleVariable, moduleImport, configs) {
+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) => {
+    findAllBlocks(source)?.forEach((node) => {
         if (ts.isSpreadElement(node) &&
             ts.isElementAccessExpression(node.expression) &&
             ts.isPropertyAccessExpression(node.expression.expression) &&