@nx/plugin 24.0.0-beta.3 → 24.0.0-beta.4

package/dist/src/generators/lint-checks/generator.d.ts

@@ -1,7 +1,5 @@
-import { ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
-import type { Schema as EsLintExecutorOptions } from '@nx/eslint/internal';
+import { Tree } from '@nx/devkit';
 import { PluginLintChecksGeneratorSchema } from './schema';
 import { PackageJson } from '@nx/devkit/internal';
 export default function pluginLintCheckGenerator(host: Tree, options: PluginLintChecksGeneratorSchema): Promise<void>;
 export declare function addMigrationJsonChecks(host: Tree, options: PluginLintChecksGeneratorSchema, packageJson: PackageJson): void;
-export declare function getEsLintOptions(project: ProjectConfiguration): [target: string, configuration: TargetConfiguration<EsLintExecutorOptions>];

package/dist/src/generators/lint-checks/generator.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = pluginLintCheckGenerator;
 exports.addMigrationJsonChecks = addMigrationJsonChecks;
-exports.getEsLintOptions = getEsLintOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/eslint/internal");
 const internal_2 = require("@nx/devkit/internal");
@@ -13,7 +12,6 @@ async function pluginLintCheckGenerator(host, options) {
     if (projectIsEsLintEnabled(host, project)) {
         updateRootEslintConfig(host);
         updateProjectEslintConfig(host, project, packageJson);
-        updateProjectTarget(host, options, packageJson);
         // Project is setup for vscode
         if (host.exists('.vscode')) {
             setupVsCodeLintingForJsonFiles(host);
@@ -31,19 +29,10 @@ function addMigrationJsonChecks(host, options, packageJson) {
     if (!projectIsEsLintEnabled(host, projectConfiguration)) {
         return;
     }
-    const [eslintTarget, eslintTargetConfiguration] = getEsLintOptions(projectConfiguration) ?? [];
     const relativeMigrationsJsonPath = (0, internal_2.readNxMigrateConfig)(packageJson).migrations;
     if (!relativeMigrationsJsonPath) {
         return;
     }
-    const migrationsJsonPath = (0, devkit_1.joinPathFragments)(projectConfiguration.root, relativeMigrationsJsonPath);
-    // Add path to lintFilePatterns if different than default "{projectRoot}"
-    if (eslintTarget &&
-        eslintTargetConfiguration.options?.lintFilePatterns &&
-        !eslintTargetConfiguration.options.lintFilePatterns.includes(migrationsJsonPath)) {
-        eslintTargetConfiguration.options.lintFilePatterns.push(migrationsJsonPath);
-        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
-    }
     // Update project level eslintrc
     (0, internal_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => Object.keys(o.rules ?? {})?.includes('@nx/nx-plugin-checks') ||
         Object.keys(o.rules ?? {})?.includes('@nrwl/nx/nx-plugin-checks'), (o) => {
@@ -65,57 +54,6 @@ function formatFilesEntries(tree, files) {
     });
     return filesAfter;
 }
-function updateProjectTarget(host, options, packageJson) {
-    const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-    if (!project.targets) {
-        return;
-    }
-    for (const [target, configuration] of Object.entries(project.targets)) {
-        if (configuration.executor === '@nx/eslint:lint' &&
-            // only add patterns if there are already hardcoded ones
-            configuration.options?.lintFilePatterns) {
-            const opts = configuration.options ?? {};
-            opts.lintFilePatterns ??= [];
-            if (packageJson.generators) {
-                opts.lintFilePatterns.push((0, devkit_1.joinPathFragments)(project.root, packageJson.generators));
-            }
-            if (packageJson.schematics &&
-                packageJson.schematics !== packageJson.generators) {
-                opts.lintFilePatterns.push((0, devkit_1.joinPathFragments)(project.root, packageJson.schematics));
-            }
-            if (packageJson.executors) {
-                opts.lintFilePatterns.push((0, devkit_1.joinPathFragments)(project.root, packageJson.executors));
-            }
-            if (packageJson.builders &&
-                packageJson.builders !== packageJson.executors) {
-                opts.lintFilePatterns.push((0, devkit_1.joinPathFragments)(project.root, packageJson.builders));
-            }
-            opts.lintFilePatterns.push(`${project.root}/package.json`);
-            opts.lintFilePatterns = [...new Set(opts.lintFilePatterns)];
-            project.targets[target].options = opts;
-            // Plugin checks read schema/implementation files which may live in the
-            // project's build outputs (and migration prompt files copied as assets).
-            // Ensure lint runs after build and includes the relevant build outputs
-            // as inputs so the sandbox allows the reads and the cache invalidates
-            // when those outputs change.
-            const targetConfig = project.targets[target];
-            const dependsOn = new Set(targetConfig.dependsOn ?? []);
-            dependsOn.add('build');
-            targetConfig.dependsOn = Array.from(dependsOn);
-            const inputs = targetConfig.inputs ?? ['...'];
-            const hasDependentOutputs = inputs.some((input) => typeof input === 'object' &&
-                input !== null &&
-                'dependentTasksOutputFiles' in input);
-            if (!hasDependentOutputs) {
-                inputs.push({
-                    dependentTasksOutputFiles: '**/*.{json,d.ts,js,md}',
-                });
-            }
-            targetConfig.inputs = inputs;
-        }
-    }
-    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
-}
 function updateProjectEslintConfig(host, options, packageJson) {
     if ((0, internal_1.isEslintConfigSupported)(host, options.root)) {
         const lookup = (o) => Object.keys(o.rules ?? {}).includes('@nx/nx-plugin-checks') ||
@@ -204,8 +142,3 @@ function setupVsCodeLintingForJsonFiles(host) {
 function projectIsEsLintEnabled(tree, project) {
     return !!(0, internal_1.findEslintFile)(tree, project.root);
 }
-function getEsLintOptions(project) {
-    return Object.entries(project.targets || {}).find(([, x]) => x.executor === '@nx/eslint:lint' ||
-        x.executor === '@nx/linter:eslint' ||
-        x.executor === '@nrwl/linter:eslint');
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "24.0.0-beta.3",
+  "version": "24.0.0-beta.4",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -36,16 +36,16 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "24.0.0-beta.3",
-    "@nx/jest": "24.0.0-beta.3",
-    "@nx/js": "24.0.0-beta.3",
-    "@nx/eslint": "24.0.0-beta.3"
+    "@nx/devkit": "24.0.0-beta.4",
+    "@nx/jest": "24.0.0-beta.4",
+    "@nx/js": "24.0.0-beta.4",
+    "@nx/eslint": "24.0.0-beta.4"
   },
   "devDependencies": {
-    "nx": "24.0.0-beta.3"
+    "nx": "24.0.0-beta.4"
   },
   "peerDependencies": {
-    "@nx/vitest": "24.0.0-beta.3"
+    "@nx/vitest": "24.0.0-beta.4"
   },
   "peerDependenciesMeta": {
     "@nx/vitest": {