@nx/plugin 18.0.0-canary.20240202-ea5befb → 18.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "18.0.0-canary.20240202-ea5befb",
+  "version": "18.0.0",
   "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": {
@@ -31,11 +31,11 @@
     "@phenomnomnominal/tsquery": "~5.0.1",
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.0.0-canary.20240202-ea5befb",
-    "@nx/jest": "18.0.0-canary.20240202-ea5befb",
-    "@nx/js": "18.0.0-canary.20240202-ea5befb",
-    "@nx/eslint": "18.0.0-canary.20240202-ea5befb",
-    "@nrwl/nx-plugin": "18.0.0-canary.20240202-ea5befb"
+    "@nx/devkit": "18.0.0",
+    "@nx/jest": "18.0.0",
+    "@nx/js": "18.0.0",
+    "@nx/eslint": "18.0.0",
+    "@nrwl/nx-plugin": "18.0.0"
   },
   "publishConfig": {
     "access": "public"

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

@@ -11,6 +11,7 @@ const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
 async function normalizeOptions(host, options) {
     const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     let projectRoot;
     if (options.projectNameAndRootFormat === 'as-provided') {
         const projectNameAndRootOptions = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -72,26 +73,26 @@ async function addJest(host, options) {
     });
     const jestTask = await (0, jest_1.configurationGenerator)(host, {
         project: options.projectName,
+        targetName: 'e2e',
         setupFile: 'none',
         supportTsx: false,
         skipSerializers: true,
         skipFormat: true,
+        addPlugin: options.addPlugin,
     });
     const { startLocalRegistryPath, stopLocalRegistryPath } = (0, add_local_registry_scripts_1.addLocalRegistryScripts)(host);
     (0, jest_1.addPropertyToJestConfig)(host, (0, path_1.join)(options.projectRoot, 'jest.config.ts'), 'globalSetup', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), startLocalRegistryPath));
     (0, jest_1.addPropertyToJestConfig)(host, (0, path_1.join)(options.projectRoot, 'jest.config.ts'), 'globalTeardown', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), stopLocalRegistryPath));
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-    const testTarget = project.targets.test;
+    const e2eTarget = project.targets.e2e;
     project.targets.e2e = {
-        ...testTarget,
+        ...e2eTarget,
         dependsOn: [`^build`],
         options: {
-            ...testTarget.options,
+            ...e2eTarget.options,
             runInBand: true,
         },
     };
-    // remove the jest build target
-    delete project.targets.test;
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
     return jestTask;
 }
@@ -105,11 +106,13 @@ async function addLintingToApplication(tree, options) {
         unitTestRunner: 'jest',
         skipFormat: true,
         setParserOptionsProject: false,
+        addPlugin: options.addPlugin,
     });
     return lintTask;
 }
 async function e2eProjectGenerator(host, schema) {
     return await e2eProjectGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });

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

@@ -11,4 +11,5 @@ export interface Schema {
   linter?: Linter;
   skipFormat?: boolean;
   rootProject?: boolean;
+  addPlugin?: boolean;
 }

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

@@ -10,7 +10,7 @@ async function pluginLintCheckGenerator(host, options) {
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
     // This rule is eslint **only**
-    if (projectIsEsLintEnabled(project)) {
+    if (projectIsEsLintEnabled(host, project)) {
         updateRootEslintConfig(host);
         updateProjectEslintConfig(host, project, packageJson);
         updateProjectTarget(host, options, packageJson);
@@ -18,12 +18,6 @@ async function pluginLintCheckGenerator(host, options) {
         if (host.exists('.vscode')) {
             setupVsCodeLintingForJsonFiles(host);
         }
-        // Project contains migrations.json
-        const migrationsPath = (0, package_json_1.readNxMigrateConfig)(packageJson).migrations;
-        if (migrationsPath &&
-            host.exists((0, devkit_1.joinPathFragments)(project.root, migrationsPath))) {
-            addMigrationJsonChecks(host, options, packageJson);
-        }
     }
     else {
         devkit_1.logger.error(`${logger_1.NX_PREFIX} plugin lint checks can only be added to plugins which use eslint for linting`);
@@ -35,10 +29,10 @@ async function pluginLintCheckGenerator(host, options) {
 exports.default = pluginLintCheckGenerator;
 function addMigrationJsonChecks(host, options, packageJson) {
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-    if (!projectIsEsLintEnabled(projectConfiguration)) {
+    if (!projectIsEsLintEnabled(host, projectConfiguration)) {
         return;
     }
-    const [eslintTarget, eslintTargetConfiguration] = getEsLintOptions(projectConfiguration);
+    const [eslintTarget, eslintTargetConfiguration] = getEsLintOptions(projectConfiguration) ?? [];
     const relativeMigrationsJsonPath = (0, package_json_1.readNxMigrateConfig)(packageJson).migrations;
     if (!relativeMigrationsJsonPath) {
         return;
@@ -107,6 +101,7 @@ function updateProjectEslintConfig(host, options, packageJson) {
             packageJson.executors,
             packageJson.schematics,
             packageJson.builders,
+            (0, package_json_1.readNxMigrateConfig)(packageJson).migrations,
         ].filter((f) => !!f);
         const parser = (0, flat_config_1.useFlatConfig)(host)
             ? { languageOptions: { parser: 'jsonc-eslint-parser' } }
@@ -181,8 +176,8 @@ function setupVsCodeLintingForJsonFiles(host) {
     }
     (0, devkit_1.writeJson)(host, '.vscode/settings.json', existing);
 }
-function projectIsEsLintEnabled(project) {
-    return !!getEsLintOptions(project);
+function projectIsEsLintEnabled(tree, project) {
+    return !!(0, eslint_file_1.findEslintFile)(tree, project.root);
 }
 function getEsLintOptions(project) {
     return Object.entries(project.targets || {}).find(([, x]) => x.executor === '@nx/eslint:lint' ||

package/src/generators/migration/migration.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrationGeneratorInternal = exports.migrationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
+const path_1 = require("path");
 const generator_1 = require("../lint-checks/generator");
 const package_json_1 = require("nx/src/utils/package-json");
 const versions_1 = require("../../utils/versions");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const path_1 = require("path");
 async function normalizeOptions(tree, options) {
     let name;
     if (options.name) {