@nrwl/linter 15.3.0-beta.3 → 15.3.0-beta.5

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [15.3.0-beta.3](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.3) (2022-11-28)
+# [15.3.0-beta.5](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.5) (2022-11-29)
 
 **Note:** Version bump only for package @nrwl/linter

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/linter",
-  "version": "15.3.0-beta.3",
+  "version": "15.3.0-beta.5",
   "private": false,
   "description": "The Linter plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -33,10 +33,10 @@
     "eslint": "^8.0.0"
   },
   "dependencies": {
-    "@nrwl/devkit": "15.3.0-beta.3",
-    "@nrwl/jest": "15.3.0-beta.3",
+    "@nrwl/devkit": "15.3.0-beta.5",
+    "@nrwl/jest": "15.3.0-beta.5",
     "@phenomnomnominal/tsquery": "4.1.1",
-    "nx": "15.3.0-beta.3",
+    "nx": "15.3.0-beta.5",
     "tmp": "~0.2.1",
     "tslib": "^2.3.0"
   },
@@ -49,5 +49,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "61f6e2d7287beaac1993e32f3fe18703d2c63e41"
+  "gitHead": "fe062f42c366e9ed734208f5feaa1c623f696b67"
 }

package/src/generators/init/global-eslint-config.d.ts

@@ -0,0 +1,36 @@
+import { ESLint, Linter as LinterType } from 'eslint';
+/**
+ * This configuration is intended to apply to all TypeScript source files.
+ * See the eslint-plugin-nx package for what is in the referenced shareable config.
+ */
+export declare const globalTypeScriptOverrides: {
+    files: string[];
+    extends: string[];
+    /**
+     * Having an empty rules object present makes it more obvious to the user where they would
+     * extend things from if they needed to
+     */
+    rules: {};
+};
+/**
+ * This configuration is intended to apply to all JavaScript source files.
+ * See the eslint-plugin-nx package for what is in the referenced shareable config.
+ */
+export declare const globalJavaScriptOverrides: {
+    files: string[];
+    extends: string[];
+    /**
+     * Having an empty rules object present makes it more obvious to the user where they would
+     * extend things from if they needed to
+     */
+    rules: {};
+};
+/**
+ * This configuration is intended to apply to all "source code" (but not
+ * markup like HTML, or other custom file types like GraphQL)
+ */
+export declare const moduleBoundariesOverride: {
+    files: string[];
+    rules: LinterType.RulesRecord;
+};
+export declare const getGlobalEsLintConfiguration: (unitTestRunner?: string, rootProject?: boolean) => ESLint.ConfigData<LinterType.RulesRecord>;

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

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalEsLintConfiguration = exports.moduleBoundariesOverride = exports.globalJavaScriptOverrides = exports.globalTypeScriptOverrides = void 0;
+/**
+ * This configuration is intended to apply to all TypeScript source files.
+ * See the eslint-plugin-nx package for what is in the referenced shareable config.
+ */
+exports.globalTypeScriptOverrides = {
+    files: ['*.ts', '*.tsx'],
+    extends: ['plugin:@nrwl/nx/typescript'],
+    /**
+     * Having an empty rules object present makes it more obvious to the user where they would
+     * extend things from if they needed to
+     */
+    rules: {},
+};
+/**
+ * This configuration is intended to apply to all JavaScript source files.
+ * See the eslint-plugin-nx package for what is in the referenced shareable config.
+ */
+exports.globalJavaScriptOverrides = {
+    files: ['*.js', '*.jsx'],
+    extends: ['plugin:@nrwl/nx/javascript'],
+    /**
+     * Having an empty rules object present makes it more obvious to the user where they would
+     * extend things from if they needed to
+     */
+    rules: {},
+};
+/**
+ * This configuration is intended to apply to all "source code" (but not
+ * markup like HTML, or other custom file types like GraphQL)
+ */
+exports.moduleBoundariesOverride = {
+    files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+    rules: {
+        '@nrwl/nx/enforce-module-boundaries': [
+            'error',
+            {
+                enforceBuildableLibDependency: true,
+                allow: [],
+                depConstraints: [{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] }],
+            },
+        ],
+    },
+};
+const getGlobalEsLintConfiguration = (unitTestRunner, rootProject) => {
+    const config = {
+        root: true,
+        ignorePatterns: rootProject ? ['!**/*'] : ['**/*'],
+        plugins: ['@nrwl/nx'],
+        /**
+         * We leverage ESLint's "overrides" capability so that we can set up a root config which will support
+         * all permutations of Nx workspaces across all frameworks, libraries and tools.
+         *
+         * The key point is that we need entirely different ESLint config to apply to different types of files,
+         * but we still want to share common config where possible.
+         */
+        overrides: [
+            ...(rootProject ? [] : [exports.moduleBoundariesOverride]),
+            exports.globalTypeScriptOverrides,
+            exports.globalJavaScriptOverrides,
+        ],
+    };
+    if (unitTestRunner === 'jest') {
+        config.overrides.push({
+            files: ['*.spec.ts', '*.spec.tsx', '*.spec.js', '*.spec.jsx'],
+            env: {
+                jest: true,
+            },
+            rules: {},
+        });
+    }
+    return config;
+};
+exports.getGlobalEsLintConfiguration = getGlobalEsLintConfiguration;
+//# sourceMappingURL=global-eslint-config.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"global-eslint-config.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/init/global-eslint-config.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACU,QAAA,yBAAyB,GAAG;IACvC,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,CAAC,4BAA4B,CAAC;IACvC;;;OAGG;IACH,KAAK,EAAE,EAAE;CACV,CAAC;AAEF;;;GAGG;AACU,QAAA,yBAAyB,GAAG;IACvC,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,CAAC,4BAA4B,CAAC;IACvC;;;OAGG;IACH,KAAK,EAAE,EAAE;CACV,CAAC;AAEF;;;GAGG;AACU,QAAA,wBAAwB,GAAG;IACtC,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;IACzC,KAAK,EAAE;QACL,oCAAoC,EAAE;YACpC,OAAO;YACP;gBACE,6BAA6B,EAAE,IAAI;gBACnC,KAAK,EAAE,EAAE;gBACT,cAAc,EAAE,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;aACtE;SACF;KACwB;CAC5B,CAAC;AAEK,MAAM,4BAA4B,GAAG,CAC1C,cAAuB,EACvB,WAAqB,EACrB,EAAE;IACF,MAAM,MAAM,GAAsB;QAChC,IAAI,EAAE,IAAI;QACV,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAClD,OAAO,EAAE,CAAC,UAAU,CAAC;QACrB;;;;;;WAMG;QACH,SAAS,EAAE;YACT,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,gCAAwB,CAAC,CAAC;YAClD,iCAAyB;YACzB,iCAAyB;SAC1B;KACF,CAAC;IACF,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YACpB,KAAK,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,CAAC;YAC7D,GAAG,EAAE;gBACH,IAAI,EAAE,IAAI;aACX;YACD,KAAK,EAAE,EAAE;SACV,CAAC,CAAC;KACJ;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA/BW,QAAA,4BAA4B,gCA+BvC"}

package/src/generators/init/init-migration.d.ts

@@ -0,0 +1,3 @@
+import { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
+export declare function migrateConfigToMonorepoStyle(projects: ProjectConfiguration[], tree: Tree, unitTestRunner: string): void;
+export declare function findLintTarget(project: ProjectConfiguration): TargetConfiguration;

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

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findLintTarget = exports.migrateConfigToMonorepoStyle = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
+const eslint_file_1 = require("../utils/eslint-file");
+const global_eslint_config_1 = require("./global-eslint-config");
+function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner) {
+    (0, devkit_1.writeJson)(tree, '.eslintrc.base.json', (0, global_eslint_config_1.getGlobalEsLintConfiguration)(unitTestRunner));
+    // update extens in all projects' eslint configs
+    projects.forEach((project) => {
+        const lintTarget = findLintTarget(project);
+        if (lintTarget) {
+            const projectEslintPath = (0, devkit_1.joinPathFragments)(project.root, lintTarget.options.eslintConfig || (0, eslint_file_1.findEslintFile)(tree, project.root));
+            migrateEslintFile(projectEslintPath, tree);
+        }
+    });
+}
+exports.migrateConfigToMonorepoStyle = migrateConfigToMonorepoStyle;
+function findLintTarget(project) {
+    var _a;
+    return (_a = Object.entries(project.targets).find(([name, target]) => name === 'lint' || target.executor === '@nrwl/linter:eslint')) === null || _a === void 0 ? void 0 : _a[1];
+}
+exports.findLintTarget = findLintTarget;
+function migrateEslintFile(projectEslintPath, tree) {
+    if (projectEslintPath.endsWith('.json') ||
+        projectEslintPath.endsWith('.eslintrc')) {
+        (0, devkit_1.updateJson)(tree, projectEslintPath, (json) => {
+            // we have a new root now
+            delete json.root;
+            // remove nrwl/nx plugins
+            if (json.plugins) {
+                json.plugins = json.plugins.filter((p) => p !== '@nrwl/nx');
+                if (json.plugins.length === 0) {
+                    delete json.plugins;
+                }
+            }
+            // add extends
+            json.extends = json.extends || [];
+            const pathToRootConfig = `${(0, devkit_1.offsetFromRoot)((0, path_1.dirname)(projectEslintPath))}.eslintrc.base.json`;
+            if (json.extends.indexOf(pathToRootConfig) === -1) {
+                json.extends.push(pathToRootConfig);
+            }
+            // cleanup overrides
+            if (json.overrides) {
+                json.overrides.forEach((override) => {
+                    if (override.extends) {
+                        override.extends = override.extends.filter((ext) => ext !== 'plugin:@nrwl/nx/typescript' &&
+                            ext !== 'plugin:@nrwl/nx/javascript');
+                        if (override.extends.length === 0) {
+                            delete override.extends;
+                        }
+                    }
+                });
+            }
+            return json;
+        });
+        return;
+    }
+    if (projectEslintPath.endsWith('.yml') ||
+        projectEslintPath.endsWith('.yaml')) {
+        console.warn('YAML eslint config is not supported yet for migration');
+    }
+    if (projectEslintPath.endsWith('.js') || projectEslintPath.endsWith('.cjs')) {
+        console.warn('YAML eslint config is not supported yet for migration');
+    }
+}
+//# sourceMappingURL=init-migration.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"init-migration.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/init/init-migration.ts"],"names":[],"mappings":"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"}

package/src/generators/init/init.d.ts

@@ -4,5 +4,6 @@ export interface LinterInitOptions {
     linter?: Linter;
     unitTestRunner?: string;
     skipPackageJson?: boolean;
+    rootProject?: boolean;
 }
 export declare function lintInitGenerator(tree: Tree, options: LinterInitOptions): GeneratorCallback;

package/src/generators/init/init.js

@@ -4,77 +4,7 @@ exports.lintInitGenerator = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("../utils/eslint-file");
-const getGlobalEsLintConfiguration = (unitTestRunner) => {
-    const config = {
-        root: true,
-        ignorePatterns: ['**/*'],
-        plugins: ['@nrwl/nx'],
-        /**
-         * We leverage ESLint's "overrides" capability so that we can set up a root config which will support
-         * all permutations of Nx workspaces across all frameworks, libraries and tools.
-         *
-         * The key point is that we need entirely different ESLint config to apply to different types of files,
-         * but we still want to share common config where possible.
-         */
-        overrides: [
-            /**
-             * This configuration is intended to apply to all "source code" (but not
-             * markup like HTML, or other custom file types like GraphQL)
-             */
-            {
-                files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
-                rules: {
-                    '@nrwl/nx/enforce-module-boundaries': [
-                        'error',
-                        {
-                            enforceBuildableLibDependency: true,
-                            allow: [],
-                            depConstraints: [
-                                { sourceTag: '*', onlyDependOnLibsWithTags: ['*'] },
-                            ],
-                        },
-                    ],
-                },
-            },
-            /**
-             * This configuration is intended to apply to all TypeScript source files.
-             * See the eslint-plugin-nx package for what is in the referenced shareable config.
-             */
-            {
-                files: ['*.ts', '*.tsx'],
-                extends: ['plugin:@nrwl/nx/typescript'],
-                /**
-                 * Having an empty rules object present makes it more obvious to the user where they would
-                 * extend things from if they needed to
-                 */
-                rules: {},
-            },
-            /**
-             * This configuration is intended to apply to all JavaScript source files.
-             * See the eslint-plugin-nx package for what is in the referenced shareable config.
-             */
-            {
-                files: ['*.js', '*.jsx'],
-                extends: ['plugin:@nrwl/nx/javascript'],
-                /**
-                 * Having an empty rules object present makes it more obvious to the user where they would
-                 * extend things from if they needed to
-                 */
-                rules: {},
-            },
-        ],
-    };
-    if (unitTestRunner === 'jest') {
-        config.overrides.push({
-            files: ['*.spec.ts', '*.spec.tsx', '*.spec.js', '*.spec.jsx'],
-            env: {
-                jest: true,
-            },
-            rules: {},
-        });
-    }
-    return config;
-};
+const global_eslint_config_1 = require("./global-eslint-config");
 function addTargetDefaults(tree) {
     var _a, _b, _c, _d;
     var _e, _f;
@@ -101,7 +31,7 @@ function initEsLint(tree, options) {
     if (!options.skipPackageJson) {
         (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nrwl/linter'], []);
     }
-    (0, devkit_1.writeJson)(tree, '.eslintrc.json', getGlobalEsLintConfiguration(options.unitTestRunner));
+    (0, devkit_1.writeJson)(tree, '.eslintrc.json', (0, global_eslint_config_1.getGlobalEsLintConfiguration)(options.unitTestRunner, options.rootProject));
     addTargetDefaults(tree);
     if (tree.exists('.vscode/extensions.json')) {
         (0, devkit_1.updateJson)(tree, '.vscode/extensions.json', (json) => {

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/init/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/init/init.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AACtB,mDAK8B;AAG9B,sDAAsD;AACtD,iEAAsE;AAStE,SAAS,iBAAiB,CAAC,IAAU;;;IACnC,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,iBAAiB,GAAG,MAAA,sBAAsB,CAAC,WAAW,0CAAE,UAAU,CAAC;IACzE,IAAI,iBAAiB,EAAE;QACrB,wBAAwB;QACxB,iBAAiB,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QACxD,iBAAiB;QACjB,sBAAsB,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CACxD,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAC3B,CAAC;KACH;IAED,MAAA,sBAAsB,CAAC,cAAc,oCAArC,sBAAsB,CAAC,cAAc,GAAK,EAAE,EAAC;IAE7C,YAAA,sBAAsB,CAAC,cAAc,EAAC,IAAI,uCAAJ,IAAI,GAAK,EAAE,EAAC;IAClD,YAAA,sBAAsB,CAAC,cAAc,CAAC,IAAI,EAAC,MAAM,uCAAN,MAAM,GAAK;QACpD,SAAS;QACT,gCAAgC;KACjC,EAAC;IACF,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,OAA0B;IACxD,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,EAAE;QACxB,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;QAC5B,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;KAC/D;IAED,IAAA,kBAAS,EACP,IAAI,EACJ,gBAAgB,EAChB,IAAA,mDAA4B,EAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,CAC1E,CAAC;IACF,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAExB,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,yBAAyB,EAAE,CAAC,IAAI,EAAE,EAAE;YACnD,IAAI,CAAC,eAAe,KAApB,IAAI,CAAC,eAAe,GAAK,EAAE,EAAC;YAC5B,MAAM,SAAS,GAAG,wBAAwB,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAC7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACtC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,CAAC,OAAO,CAAC,eAAe;QAC7B,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;YACE,cAAc,EAAE,oBAAS;YACzB,wBAAwB,EAAE,oBAAS;YACnC,2BAA2B,EAAE,kCAAuB;YACpD,kCAAkC,EAAE,kCAAuB;YAC3D,MAAM,EAAE,wBAAa;YACrB,wBAAwB,EAAE,sCAA2B;SACtD,CACF;QACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;AACf,CAAC;AAED,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAA0B;IACtE,OAAO,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACnC,CAAC;AAFD,8CAEC"}

package/src/generators/lint-project/lint-project.d.ts

@@ -9,6 +9,8 @@ interface LintProjectOptions {
     setParserOptionsProject?: boolean;
     skipPackageJson?: boolean;
     unitTestRunner?: string;
+    rootProject?: boolean;
 }
+export declare function mapLintPattern(projectRoot: string, extension: string, rootProject?: boolean): string;
 export declare function lintProjectGenerator(tree: Tree, options: LintProjectOptions): Promise<import("@nrwl/devkit").GeneratorCallback>;
 export {};

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintProjectGenerator = void 0;
+exports.lintProjectGenerator = exports.mapLintPattern = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const eslint_file_1 = require("../utils/eslint-file");
 const path_1 = require("path");
 const init_1 = require("../init/init");
+const init_migration_1 = require("../init/init-migration");
+const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
 function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject) {
     const eslintConfig = (0, eslint_file_1.findEslintFile)(tree);
     (0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `.eslintrc.json`), {
@@ -52,12 +54,18 @@ function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject)
         ],
     });
 }
+function mapLintPattern(projectRoot, extension, rootProject) {
+    const infix = rootProject ? 'src/' : '';
+    return `${projectRoot}/${infix}**/*.${extension}`;
+}
+exports.mapLintPattern = mapLintPattern;
 function lintProjectGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const installTask = (0, init_1.lintInitGenerator)(tree, {
             linter: options.linter,
             unitTestRunner: options.unitTestRunner,
             skipPackageJson: options.skipPackageJson,
+            rootProject: options.rootProject,
         });
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
         projectConfig.targets['lint'] = {
@@ -67,7 +75,28 @@ function lintProjectGenerator(tree, options) {
                 lintFilePatterns: options.eslintFilePatterns,
             },
         };
-        createEsLintConfiguration(tree, projectConfig, options.setParserOptionsProject);
+        // we are adding new project which is not the root project or
+        // companion e2e app so we should check if migration to
+        // monorepo style is needed
+        if (!options.rootProject) {
+            const projects = (0, project_configuration_1.readWorkspace)(tree).projects;
+            if (isMigrationToMonorepoNeeded(projects, tree)) {
+                // we only migrate project configurations that have been created
+                const filteredProjects = [];
+                Object.entries(projects).forEach(([name, project]) => {
+                    if (name !== options.project) {
+                        filteredProjects.push(project);
+                    }
+                });
+                (0, init_migration_1.migrateConfigToMonorepoStyle)(filteredProjects, tree, options.unitTestRunner);
+            }
+        }
+        // our root `.eslintrc` is already the project config, so we should not override it
+        // 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);
+        }
         (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
@@ -76,4 +105,32 @@ function lintProjectGenerator(tree, options) {
     });
 }
 exports.lintProjectGenerator = lintProjectGenerator;
+/**
+ * Detect based on the state of lint target configuration of the root project
+ * if we should migrate eslint configs to monorepo style
+ *
+ * @param tree
+ * @returns
+ */
+function isMigrationToMonorepoNeeded(projects, tree) {
+    // the base config is already created, migration has been done
+    if (tree.exists('.eslintrc.base.json')) {
+        return false;
+    }
+    const configs = Object.values(projects);
+    if (configs.length === 1) {
+        return false;
+    }
+    // get root project
+    const rootProject = configs.find((p) => p.root === '.');
+    if (!rootProject || !rootProject.targets) {
+        return false;
+    }
+    // find if root project has lint target
+    const lintTarget = (0, init_migration_1.findLintTarget)(rootProject);
+    if (!lintTarget) {
+        return false;
+    }
+    return true;
+}
 //# sourceMappingURL=lint-project.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"lint-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAGtB,sDAAsD;AACtD,+BAA4B;AAC5B,uCAAiD;AAajD,SAAS,yBAAyB,CAChC,IAAU,EACV,aAAmC,EACnC,uBAAgC;IAEhC,MAAM,YAAY,GAAG,IAAA,4BAAc,EAAC,IAAI,CAAC,CAAC;IAC1C,IAAA,kBAAS,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE;QAC1D,OAAO,EAAE,YAAY;YACnB,CAAC,CAAC,CAAC,GAAG,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC,GAAG,YAAY,EAAE,CAAC;YAC1D,CAAC,CAAC,SAAS;QACb,8EAA8E;QAC9E,cAAc,EAAE,CAAC,OAAO,CAAC;QACzB,SAAS,EAAE;YACT;gBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;gBACzC;;;;;;;;;;;;mBAYG;gBACH,aAAa,EAAE,CAAC,uBAAuB;oBACrC,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC;wBACE,OAAO,EAAE,CAAC,GAAG,aAAa,CAAC,IAAI,mBAAmB,CAAC;qBACpD;gBACL;;;mBAGG;gBACH,KAAK,EAAE,EAAE;aACV;YACD;gBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;gBACxB,KAAK,EAAE,EAAE;aACV;YACD;gBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;gBACxB,KAAK,EAAE,EAAE;aACV;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAA2B;;QAE3B,MAAM,WAAW,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE;YAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG;YAC9B,QAAQ,EAAE,qBAAqB;YAC/B,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE;gBACP,gBAAgB,EAAE,OAAO,CAAC,kBAAkB;aAC7C;SACF,CAAC;QACF,yBAAyB,CACvB,IAAI,EACJ,aAAa,EACb,OAAO,CAAC,uBAAuB,CAChC,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEjE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AA/BD,oDA+BC"}
+{"version":3,"file":"lint-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":"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"}

package/src/generators/utils/eslint-file.d.ts

@@ -1,3 +1,4 @@
-import type { Tree } from '@nrwl/devkit';
+import { Tree } from '@nrwl/devkit';
 export declare const eslintConfigFileWhitelist: string[];
-export declare function findEslintFile(tree: Tree): string | null;
+export declare const baseEsLintConfigFile = ".eslintrc.base.json";
+export declare function findEslintFile(tree: Tree, projectRoot?: string): string | null;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findEslintFile = exports.eslintConfigFileWhitelist = void 0;
+exports.findEslintFile = exports.baseEsLintConfigFile = exports.eslintConfigFileWhitelist = void 0;
+const devkit_1 = require("@nrwl/devkit");
 exports.eslintConfigFileWhitelist = [
     '.eslintrc',
     '.eslintrc.js',
@@ -8,10 +9,15 @@ exports.eslintConfigFileWhitelist = [
     '.eslintrc.yaml',
     '.eslintrc.yml',
     '.eslintrc.json',
+    'eslint.config.js', // new format that requires `ESLINT_USE_FLAT_CONFIG=true`
 ];
-function findEslintFile(tree) {
+exports.baseEsLintConfigFile = '.eslintrc.base.json';
+function findEslintFile(tree, projectRoot = '') {
+    if (projectRoot === '' && tree.exists(exports.baseEsLintConfigFile)) {
+        return exports.baseEsLintConfigFile;
+    }
     for (const file of exports.eslintConfigFileWhitelist) {
-        if (tree.exists(file)) {
+        if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, file))) {
             return file;
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"eslint-file.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/utils/eslint-file.ts"],"names":[],"mappings":";;;AAEa,QAAA,yBAAyB,GAAG;IACvC,WAAW;IACX,cAAc;IACd,eAAe;IACf,gBAAgB;IAChB,eAAe;IACf,gBAAgB;CACjB,CAAC;AAEF,SAAgB,cAAc,CAAC,IAAU;IACvC,KAAK,MAAM,IAAI,IAAI,iCAAyB,EAAE;QAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AARD,wCAQC"}
+{"version":3,"file":"eslint-file.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/utils/eslint-file.ts"],"names":[],"mappings":";;;AAAA,yCAAuD;AAE1C,QAAA,yBAAyB,GAAG;IACvC,WAAW;IACX,cAAc;IACd,eAAe;IACf,gBAAgB;IAChB,eAAe;IACf,gBAAgB;IAChB,kBAAkB,EAAE,yDAAyD;CAC9E,CAAC;AAEW,QAAA,oBAAoB,GAAG,qBAAqB,CAAC;AAE1D,SAAgB,cAAc,CAAC,IAAU,EAAE,WAAW,GAAG,EAAE;IACzD,IAAI,WAAW,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,4BAAoB,CAAC,EAAE;QAC3D,OAAO,4BAAoB,CAAC;KAC7B;IACD,KAAK,MAAM,IAAI,IAAI,iCAAyB,EAAE;QAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC,EAAE;YACrD,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAXD,wCAWC"}