@nx/eslint 17.2.0-beta.4 → 17.2.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "17.2.0-beta.4",
+  "version": "17.2.0-beta.6",
   "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,10 +35,10 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.2.0-beta.4",
-    "@nx/js": "17.2.0-beta.4",
+    "@nx/devkit": "17.2.0-beta.6",
+    "@nx/js": "17.2.0-beta.6",
     "typescript": "~5.2.2",
-    "@nx/linter": "17.2.0-beta.4"
+    "@nx/linter": "17.2.0-beta.6"
   },
   "peerDependenciesMeta": {
     "eslint": {

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

@@ -58,7 +58,7 @@ async function lintProjectGenerator(tree, options) {
     // additionally, the companion e2e app would have `rootProject: true`
     // so we need to check for the root path as well
     if (!options.rootProject || projectConfig.root !== '.') {
-        createEsLintConfiguration(tree, projectConfig, options.setParserOptionsProject);
+        createEsLintConfiguration(tree, projectConfig, options.setParserOptionsProject, options.rootProject);
     }
     // Buildable libs need source analysis enabled for linting `package.json`.
     if (isBuildableLibraryProject(projectConfig) &&
@@ -77,10 +77,11 @@ async function lintProjectGenerator(tree, options) {
     return installTask;
 }
 exports.lintProjectGenerator = lintProjectGenerator;
-function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject) {
-    const eslintConfig = (0, eslint_file_1.findEslintFile)(tree);
-    const pathToRootConfig = eslintConfig
-        ? `${(0, devkit_1.offsetFromRoot)(projectConfig.root)}${eslintConfig}`
+function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject, rootProject) {
+    // we are only extending root for non-standalone projects or their complementary e2e apps
+    const extendedRootConfig = rootProject ? undefined : (0, eslint_file_1.findEslintFile)(tree);
+    const pathToRootConfig = extendedRootConfig
+        ? `${(0, devkit_1.offsetFromRoot)(projectConfig.root)}${extendedRootConfig}`
         : undefined;
     const addDependencyChecks = isBuildableLibraryProject(projectConfig);
     const overrides = [
@@ -132,7 +133,7 @@ function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject)
         const isCompatNeeded = addDependencyChecks;
         const nodes = [];
         const importMap = new Map();
-        if (eslintConfig) {
+        if (extendedRootConfig) {
             importMap.set(pathToRootConfig, 'baseConfig');
             nodes.push((0, ast_utils_1.generateSpreadElement)('baseConfig'));
         }
@@ -145,7 +146,7 @@ function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject)
     }
     else {
         (0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `.eslintrc.json`), {
-            extends: eslintConfig ? [pathToRootConfig] : undefined,
+            extends: extendedRootConfig ? [pathToRootConfig] : undefined,
             // Include project files to be linted since the global one excludes all files.
             ignorePatterns: ['!**/*'],
             overrides,