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

package/dist/src/generators/create-package/create-package.js

@@ -5,6 +5,7 @@ exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const internal_1 = require("@nx/js/internal");
+const jest_1 = require("@nx/jest");
 const path_1 = require("path");
 const has_generator_1 = require("../../utils/has-generator");
 const generator_1 = require("../generator/generator");
@@ -13,7 +14,6 @@ const internal_2 = require("@nx/devkit/internal");
 async function createPackageGenerator(host, schema) {
     return await createPackageGeneratorInternal(host, {
         useProjectJson: true,
-        addPlugin: false,
         ...schema,
     });
 }
@@ -73,6 +73,13 @@ async function createCliPackage(host, options, pluginPackageName) {
         useTscExecutor: true,
     });
     host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'src'));
+    if (options.unitTestRunner === 'jest') {
+        // src and its spec are removed above, so the package has no tests yet.
+        const jestConfig = (0, jest_1.findJestConfig)(host, options.projectRoot);
+        if (jestConfig) {
+            (0, jest_1.addPropertyToJestConfig)(host, jestConfig, 'passWithNoTests', true);
+        }
+    }
     const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)(host);
     // Add the bin entry to the package.json
     (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (packageJson) => {

package/dist/src/generators/create-package/schema.d.ts

@@ -16,5 +16,4 @@ export interface CreatePackageSchema {
   e2eProject?: string;
 
   useProjectJson?: boolean;
-  addPlugin?: boolean;
 }

package/dist/src/generators/create-package/utils/normalize-schema.d.ts

@@ -8,7 +8,6 @@ export interface NormalizedSchema extends CreatePackageSchema {
     unitTestRunner: 'jest' | 'vitest' | 'none';
     linter: LinterType;
     useProjectJson: boolean;
-    addPlugin: boolean;
     isTsSolutionSetup: boolean;
 }
 export declare function normalizeSchema(host: Tree, schema: CreatePackageSchema): Promise<NormalizedSchema>;

package/dist/src/generators/create-package/utils/normalize-schema.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
-const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/js/internal");
 async function normalizeSchema(host, schema) {
@@ -19,13 +18,7 @@ async function normalizeSchema(host, schema) {
     // jsLibraryGenerator, so, if the TS solution setup is not configured, we
     // additionally check if the TS solution setup will be configured by the
     // jsLibraryGenerator
-    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(host) ||
-        (0, internal_2.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPlugin = schema.addPlugin ??
-        (isTsSolutionSetup &&
-            process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(host) || (0, internal_2.shouldConfigureTsSolutionSetup)(host);
     return {
         ...schema,
         bundler: schema.compiler ?? 'tsc',
@@ -36,7 +29,6 @@ async function normalizeSchema(host, schema) {
         unitTestRunner,
         // We default to generate a project.json file if the new setup is not being used
         useProjectJson: schema.useProjectJson ?? !isTsSolutionSetup,
-        addPlugin,
         isTsSolutionSetup,
     };
 }

package/dist/src/generators/e2e-project/e2e.js

@@ -12,10 +12,6 @@ const versions_1 = require("../../utils/versions");
 async function normalizeOptions(host, options) {
     const linter = await (0, internal_2.normalizeLinterOption)(host, options.linter);
     const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPlugin = options.addPlugin ??
-        (process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false);
     let projectRoot;
     const projectNameAndRootOptions = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: projectName,
@@ -33,7 +29,6 @@ async function normalizeOptions(host, options) {
         linter,
         pluginPropertyName,
         projectRoot,
-        addPlugin,
         useProjectJson: options.useProjectJson ?? !isTsSolutionSetup,
         isTsSolutionSetup,
     };
@@ -90,7 +85,6 @@ async function addJest(host, options) {
         supportTsx: false,
         skipSerializers: true,
         skipFormat: true,
-        addPlugin: options.addPlugin,
         compiler: options.isTsSolutionSetup ? 'swc' : undefined,
     });
     const { startLocalRegistryPath, stopLocalRegistryPath } = (0, internal_2.addLocalRegistryScripts)(host);
@@ -102,18 +96,17 @@ async function addJest(host, options) {
     (0, jest_1.addPropertyToJestConfig)(host, jestConfigPath, 'globalTeardown', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), stopLocalRegistryPath));
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     project.targets ??= {};
-    if (project.targets.e2e) {
-        const e2eTarget = project.targets.e2e;
-        project.targets.e2e = {
-            ...e2eTarget,
-            dependsOn: [`^build`],
-            options: {
-                ...e2eTarget.options,
-                runInBand: true,
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
-    }
+    // The e2e target is inferred, so this partial target merges onto it.
+    const e2eTarget = project.targets.e2e;
+    project.targets.e2e = {
+        ...e2eTarget,
+        dependsOn: [`^build`],
+        options: {
+            ...e2eTarget?.options,
+            runInBand: true,
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
     return jestTask;
 }
 async function addVitest(host, options) {
@@ -145,7 +138,6 @@ async function addVitest(host, options) {
         project: options.projectName,
         testTarget: 'e2e',
         skipFormat: true,
-        addPlugin: options.addPlugin,
         testEnvironment: 'node',
         coverageProvider: 'none',
     });
@@ -203,22 +195,21 @@ export { default as teardown } from './stop-local-registry';
     }
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     project.targets ??= {};
-    if (project.targets.e2e) {
-        const e2eTarget = project.targets.e2e;
-        // The suites share a single tmp/test-project directory, so they have to run
-        // one at a time. Vitest 4 removed `poolOptions`, and nested options do not
-        // survive the executor's argv round-trip anyway, so use the scalar options.
-        project.targets.e2e = {
-            ...e2eTarget,
-            dependsOn: [`^build`],
-            options: {
-                ...e2eTarget.options,
-                maxWorkers: 1,
-                isolate: false,
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
-    }
+    const e2eTarget = project.targets.e2e;
+    // The suites share a single tmp/test-project directory, so they have to run
+    // one at a time. Vitest 4 removed `poolOptions`, and nested options do not
+    // survive the argv round-trip anyway, so use the scalar options. The e2e
+    // target is inferred, so this partial target merges onto it.
+    project.targets.e2e = {
+        ...e2eTarget,
+        dependsOn: [`^build`],
+        options: {
+            ...e2eTarget?.options,
+            maxWorkers: 1,
+            isolate: false,
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
     return vitestTask;
 }
 async function addLintingToApplication(tree, options) {
@@ -230,7 +221,6 @@ async function addLintingToApplication(tree, options) {
         ],
         unitTestRunner: options.testRunner ?? 'jest',
         enableTypedLinting: false,
-        addPlugin: options.addPlugin,
     });
 }
 function updatePluginPackageJson(tree, options) {
@@ -243,7 +233,6 @@ function updatePluginPackageJson(tree, options) {
 }
 async function e2eProjectGenerator(host, schema) {
     return await e2eProjectGeneratorInternal(host, {
-        addPlugin: false,
         useProjectJson: true,
         ...schema,
     });

package/dist/src/generators/e2e-project/schema.d.ts

@@ -13,5 +13,4 @@ export interface Schema {
   skipFormat?: boolean;
   rootProject?: boolean;
   useProjectJson?: boolean;
-  addPlugin?: boolean;
 }

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,21 +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);
-    if (!eslintTarget) {
-        return;
-    }
-    // Add path to lintFilePatterns if different than default "{projectRoot}"
-    if (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) => {
@@ -67,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') ||
@@ -206,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/dist/src/generators/plugin/plugin.js

@@ -5,6 +5,7 @@ exports.pluginGeneratorInternal = pluginGeneratorInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
+const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
 const internal_2 = require("@nx/js/internal");
 const path = tslib_1.__importStar(require("path"));
@@ -42,7 +43,6 @@ function updatePluginConfig(host, options) {
 async function pluginGenerator(tree, schema) {
     return await pluginGeneratorInternal(tree, {
         useProjectJson: true,
-        addPlugin: false,
         ...schema,
     });
 }
@@ -60,7 +60,6 @@ async function pluginGeneratorInternal(host, schema) {
         linter: options.linter,
         unitTestRunner: options.unitTestRunner,
         useProjectJson: options.useProjectJson,
-        addPlugin: options.addPlugin,
         skipFormat: true,
         useTscExecutor: true,
     }));
@@ -106,6 +105,13 @@ async function pluginGeneratorInternal(host, schema) {
     tasks.push((0, internal_2.addSwcRegisterDependencies)(host));
     await addFiles(host, options);
     updatePluginConfig(host, options);
+    if (options.unitTestRunner === 'jest') {
+        // addFiles removes src/lib and its spec, so a fresh plugin has no tests yet.
+        const jestConfig = (0, jest_1.findJestConfig)(host, options.projectRoot);
+        if (jestConfig) {
+            (0, jest_1.addPropertyToJestConfig)(host, jestConfig, 'passWithNoTests', true);
+        }
+    }
     if (options.e2eTestRunner !== 'none') {
         tasks.push(await (0, e2e_1.e2eProjectGenerator)(host, {
             pluginName: options.projectName,
@@ -116,7 +122,6 @@ async function pluginGeneratorInternal(host, schema) {
             rootProject: options.rootProject,
             linter: options.linter,
             useProjectJson: options.useProjectJson,
-            addPlugin: options.addPlugin,
             testRunner: options.e2eTestRunner,
         }));
     }

package/dist/src/generators/plugin/schema.d.ts

@@ -21,5 +21,4 @@ export interface Schema {
   rootProject?: boolean;
   publishable?: boolean;
   useProjectJson?: boolean;
-  addPlugin?: boolean;
 }

package/dist/src/generators/plugin/utils/normalize-schema.d.ts

@@ -1,4 +1,4 @@
-import { type Tree } from '@nx/devkit';
+import type { Tree } from '@nx/devkit';
 import type { LinterType } from '@nx/js';
 import type { Schema } from '../schema';
 export interface NormalizedSchema extends Schema {
@@ -14,7 +14,6 @@ export interface NormalizedSchema extends Schema {
     unitTestRunner: 'jest' | 'vitest' | 'none';
     linter: LinterType;
     useProjectJson: boolean;
-    addPlugin: boolean;
     isTsSolutionSetup: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

package/dist/src/generators/plugin/utils/normalize-schema.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, options) {
@@ -10,13 +9,7 @@ async function normalizeOptions(host, options) {
     // this helper is called before the jsLibraryGenerator is called, so, if the
     // TS solution setup is not configured, we additionally check if the TS
     // solution setup will be configured by the jsLibraryGenerator
-    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(host) ||
-        (0, internal_2.shouldConfigureTsSolutionSetup)(host, options.addPlugin);
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPlugin = options.addPlugin ??
-        (isTsSolutionSetup &&
-            process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(host) || (0, internal_2.shouldConfigureTsSolutionSetup)(host);
     await (0, internal_1.ensureRootProjectName)(options, 'library');
     const { projectName, projectRoot, importPath } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
@@ -45,7 +38,6 @@ async function normalizeOptions(host, options) {
         unitTestRunner,
         // We default to generate a project.json file if the new setup is not being used
         useProjectJson: options.useProjectJson ?? !isTsSolutionSetup,
-        addPlugin,
         isTsSolutionSetup,
     };
 }

package/dist/src/generators/preset/generator.js

@@ -8,7 +8,6 @@ const plugin_1 = require("../plugin/plugin");
 const internal_1 = require("@nx/js/internal");
 async function presetGenerator(tree, rawOptions) {
     return await presetGeneratorInternal(tree, {
-        addPlugin: false,
         useProjectJson: true,
         ...rawOptions,
     });
@@ -30,7 +29,6 @@ async function presetGeneratorInternal(tree, rawOptions) {
             : options.pluginName,
         rootProject: options.createPackageName ? false : true,
         useProjectJson: options.useProjectJson,
-        addPlugin: options.addPlugin,
     });
     tasks.push(pluginTask);
     moveNxPluginToDevDeps(tree);
@@ -46,7 +44,6 @@ async function presetGeneratorInternal(tree, rawOptions) {
             linter: options.linter,
             compiler: 'tsc',
             useProjectJson: options.useProjectJson,
-            addPlugin: options.addPlugin,
         });
         tasks.push(cliTask);
     }

package/dist/src/generators/preset/schema.d.ts

@@ -4,7 +4,6 @@ export interface PresetGeneratorSchema {
   pluginName: string;
   createPackageName?: string;
   useProjectJson?: boolean;
-  addPlugin?: boolean;
   linter?: LinterType;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "24.0.0-beta.2",
+  "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.2",
-    "@nx/jest": "24.0.0-beta.2",
-    "@nx/js": "24.0.0-beta.2",
-    "@nx/eslint": "24.0.0-beta.2"
+    "@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.2"
+    "nx": "24.0.0-beta.4"
   },
   "peerDependencies": {
-    "@nx/vitest": "24.0.0-beta.2"
+    "@nx/vitest": "24.0.0-beta.4"
   },
   "peerDependenciesMeta": {
     "@nx/vitest": {