@nx/plugin 23.2.0-beta.4 → 23.2.0-beta.6

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

@@ -5,11 +5,11 @@ exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const internal_1 = require("@nx/js/internal");
-const versions_1 = require("nx/src/utils/versions");
 const path_1 = require("path");
 const has_generator_1 = require("../../utils/has-generator");
 const generator_1 = require("../generator/generator");
 const normalize_schema_1 = require("./utils/normalize-schema");
+const internal_2 = require("@nx/devkit/internal");
 async function createPackageGenerator(host, schema) {
     return await createPackageGeneratorInternal(host, {
         useProjectJson: true,
@@ -25,7 +25,7 @@ async function createPackageGeneratorInternal(host, schema) {
         tasks.push((0, js_1.addTsLibDependencies)(host));
     }
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
-        'create-nx-workspace': versions_1.nxVersion,
+        'create-nx-workspace': internal_2.nxVersion,
     }, {});
     tasks.push(installTask);
     const cliPackageTask = await createCliPackage(host, options, pluginPackageName);
@@ -86,7 +86,7 @@ async function createCliPackage(host, options, pluginPackageName) {
             delete packageJson.exports;
         }
         packageJson.dependencies = {
-            'create-nx-workspace': versions_1.nxVersion,
+            'create-nx-workspace': internal_2.nxVersion,
             ...(options.bundler === 'tsc' && { tslib: internal_1.tsLibVersion }),
         };
         return packageJson;

package/dist/src/generators/create-package/files/e2e/__cliName__.spec.ts__tmpl__

@@ -16,6 +16,8 @@ describe('<%= cliName %>', () => {
   });
 
 
+  // This test shells out synchronously, so its budget has to cover a cold
+  // package manager cache. Otherwise work that succeeded still fails on return.
   it('should be installed', () => {
     projectDirectory = createTestProject();
 
@@ -24,7 +26,7 @@ describe('<%= cliName %>', () => {
       cwd: projectDirectory,
       stdio: 'inherit',
     });
-  });
+  }, 180_000);
 });
 
 /**

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

@@ -202,17 +202,16 @@ export { default as teardown } from './stop-local-registry';
     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,
-                pool: 'forks',
-                poolOptions: {
-                    forks: {
-                        singleFork: true,
-                    },
-                },
+                maxWorkers: 1,
+                isolate: false,
             },
         };
         (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);

package/dist/src/generators/e2e-project/files/src/__simplePluginName__.spec.ts__tmpl__

@@ -5,6 +5,9 @@ import { mkdirSync, rmSync } from 'fs';
 describe('<%= pluginName %>', () => {
   let projectDirectory: string;
 
+  // This hook shells out synchronously twice, so its budget has to cover both
+  // installs on a cold package manager cache. Otherwise work that succeeded
+  // still fails on return.
   beforeAll(() => {
     projectDirectory = createTestProject();
 
@@ -15,7 +18,7 @@ describe('<%= pluginName %>', () => {
       stdio: 'inherit',
       env: process.env,
     });
-  }, 30_000);
+  }, 300_000);
 
   afterAll(() => {
     if (projectDirectory) {

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

@@ -1,7 +1,7 @@
 import { ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
 import type { Schema as EsLintExecutorOptions } from '@nx/eslint/internal';
 import { PluginLintChecksGeneratorSchema } from './schema';
-import { PackageJson } from 'nx/src/utils/package-json';
+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

@@ -4,9 +4,8 @@ exports.default = pluginLintCheckGenerator;
 exports.addMigrationJsonChecks = addMigrationJsonChecks;
 exports.getEsLintOptions = getEsLintOptions;
 const devkit_1 = require("@nx/devkit");
-const logger_1 = require("nx/src/utils/logger");
-const package_json_1 = require("nx/src/utils/package-json");
 const internal_1 = require("@nx/eslint/internal");
+const internal_2 = require("@nx/devkit/internal");
 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'));
@@ -21,7 +20,7 @@ async function pluginLintCheckGenerator(host, options) {
         }
     }
     else {
-        devkit_1.logger.error(`${logger_1.NX_PREFIX} plugin lint checks can only be added to plugins which use eslint for linting`);
+        devkit_1.logger.error(`${internal_2.NX_PREFIX} plugin lint checks can only be added to plugins which use eslint for linting`);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -33,7 +32,7 @@ function addMigrationJsonChecks(host, options, packageJson) {
         return;
     }
     const [eslintTarget, eslintTargetConfiguration] = getEsLintOptions(projectConfiguration) ?? [];
-    const relativeMigrationsJsonPath = (0, package_json_1.readNxMigrateConfig)(packageJson).migrations;
+    const relativeMigrationsJsonPath = (0, internal_2.readNxMigrateConfig)(packageJson).migrations;
     if (!relativeMigrationsJsonPath) {
         return;
     }
@@ -129,7 +128,7 @@ function updateProjectEslintConfig(host, options, packageJson) {
             packageJson.executors,
             packageJson.schematics,
             packageJson.builders,
-            (0, package_json_1.readNxMigrateConfig)(packageJson).migrations,
+            (0, internal_2.readNxMigrateConfig)(packageJson).migrations,
         ].filter((f) => !!f);
         const parser = (0, internal_1.useFlatConfig)(host)
             ? { languageOptions: { parser: 'jsonc-eslint-parser' } }
@@ -195,7 +194,7 @@ function setupVsCodeLintingForJsonFiles(host) {
         existing = (0, devkit_1.readJson)(host, '.vscode/settings.json');
     }
     else {
-        devkit_1.logger.info(`${logger_1.NX_PREFIX} We've updated the vscode settings for this repository to ensure that plugin lint checks show up inside your IDE. This created .vscode/settings.json. To read more about this file, check vscode's documentation. It is frequently not committed, so other developers may need to add similar settings if they'd like to see the lint checks in the IDE rather than only during linting.`);
+        devkit_1.logger.info(`${internal_2.NX_PREFIX} We've updated the vscode settings for this repository to ensure that plugin lint checks show up inside your IDE. This created .vscode/settings.json. To read more about this file, check vscode's documentation. It is frequently not committed, so other developers may need to add similar settings if they'd like to see the lint checks in the IDE rather than only during linting.`);
     }
     // setup eslint validation for json files
     const eslintValidate = existing['eslint.validate'] ?? [];

package/dist/src/generators/migration/migration.js

@@ -5,7 +5,6 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const internal_2 = require("@nx/js/internal");
 const node_path_1 = require("node:path");
-const package_json_1 = require("nx/src/utils/package-json");
 const paths_1 = require("../../utils/paths");
 const versions_1 = require("../../utils/versions");
 const generator_1 = require("../lint-checks/generator");
@@ -38,7 +37,7 @@ function addFiles(host, options) {
     });
 }
 function updateMigrationsJson(host, options) {
-    const configuredMigrationPath = (0, package_json_1.readNxMigrateConfig)((0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'))).migrations;
+    const configuredMigrationPath = (0, internal_1.readNxMigrateConfig)((0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'))).migrations;
     const migrationsPath = (0, devkit_1.joinPathFragments)(options.projectRoot, configuredMigrationPath ?? 'migrations.json');
     const migrations = host.exists(migrationsPath)
         ? (0, devkit_1.readJson)(host, migrationsPath)

package/dist/src/utils/testing-utils/utils.d.ts

@@ -1,5 +1,5 @@
 import type { JsonParseOptions } from '@nx/devkit';
-import { directoryExists, fileExists } from 'nx/src/utils/fileutils';
+import { directoryExists, fileExists } from '@nx/devkit/internal';
 export { directoryExists, fileExists };
 /**
  * Copies module folders from the working directory to the e2e directory

package/dist/src/utils/testing-utils/utils.js

@@ -19,9 +19,9 @@ const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const paths_1 = require("./paths");
 const devkit_1 = require("@nx/devkit");
-const fileutils_1 = require("nx/src/utils/fileutils");
-Object.defineProperty(exports, "directoryExists", { enumerable: true, get: function () { return fileutils_1.directoryExists; } });
-Object.defineProperty(exports, "fileExists", { enumerable: true, get: function () { return fileutils_1.fileExists; } });
+const internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "directoryExists", { enumerable: true, get: function () { return internal_1.directoryExists; } });
+Object.defineProperty(exports, "fileExists", { enumerable: true, get: function () { return internal_1.fileExists; } });
 /**
  * Copies module folders from the working directory to the e2e directory
  * @param modules a list of module names or scopes to copy
@@ -136,7 +136,7 @@ function getCwd() {
  * @param path Path to file or directory
  */
 function exists(path) {
-    return (0, fileutils_1.directoryExists)(path) || (0, fileutils_1.fileExists)(path);
+    return (0, internal_1.directoryExists)(path) || (0, internal_1.fileExists)(path);
 }
 /**
  * Get the size of a file on disk

package/package.json

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