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

package/dist/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__

@@ -1,9 +1,72 @@
 #!/usr/bin/env node
 
+import { sep } from 'node:path';
 import { createWorkspace } from 'create-nx-workspace';
 
+const packageManagers = ['pnpm', 'yarn', 'npm', 'bun'] as const;
+type PackageManager = (typeof packageManagers)[number];
+
+/**
+ * Mirrors `create-nx-workspace`: an explicit `--packageManager` wins, otherwise
+ * the manager that invoked this CLI, otherwise npm. Choosing at run time keeps
+ * the published CLI usable under whichever manager the consumer actually has
+ * installed, rather than the one the plugin author generated it from.
+ */
+function determinePackageManager(explicit: string | undefined): PackageManager {
+  if (explicit) {
+    if (!(packageManagers as readonly string[]).includes(explicit)) {
+      throw new Error(
+        `Package manager must be one of ${packageManagers.join(', ')}`
+      );
+    }
+    return explicit as PackageManager;
+  }
+
+  const userAgent = process.env.npm_config_user_agent;
+  if (userAgent) {
+    const invoked = packageManagers.find((pm) =>
+      userAgent.startsWith(`${pm}/`)
+    );
+    if (invoked) {
+      return invoked;
+    }
+  }
+
+  const execPath = process.env.npm_execpath;
+  if (execPath) {
+    const segments = execPath.split(sep);
+    const invoked = packageManagers.find((pm) => segments.includes(pm));
+    if (invoked) {
+      return invoked;
+    }
+  }
+
+  return 'npm';
+}
+
+/** Reads the workspace name and `--packageManager`/`--pm` out of the argv tail. */
+function parseArgs(argv: string[]): {
+  name: string | undefined;
+  packageManager: string | undefined;
+} {
+  let name: string | undefined;
+  let packageManager: string | undefined;
+
+  for (let i = 0; i < argv.length; i++) {
+    const match = /^--(?:packageManager|pm)(?:=(.*))?$/.exec(argv[i]);
+    if (match) {
+      packageManager = match[1] ?? argv[++i];
+    } else if (name === undefined && !argv[i].startsWith('-')) {
+      name = argv[i];
+    }
+  }
+
+  return { name, packageManager };
+}
+
 async function main() {
-  const name = process.argv[2]; // TODO: use libraries like yargs, <%= unitTestRunner === 'jest' ? 'enquirer' : '@clack/prompts' %>, or another prompting library to set your workspace name
+  // TODO: use libraries like yargs, <%= unitTestRunner === 'jest' ? 'enquirer' : '@clack/prompts' %>, or another prompting library to set your workspace name
+  const { name, packageManager } = parseArgs(process.argv.slice(2));
   if (!name) {
     throw new Error('Please provide a name for the workspace');
   }
@@ -21,7 +84,7 @@ async function main() {
     {
       name,
       nxCloud: 'skip',
-      packageManager: 'npm',
+      packageManager: determinePackageManager(packageManager),
     }
   );
 

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

@@ -50,11 +50,15 @@ function addFiles(host, options) {
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.pluginName);
     const { name: pluginPackageName } = (0, devkit_1.readJson)(host, (0, path_1.join)(projectConfiguration.root, 'package.json'));
     const simplePluginName = options.pluginName.split('/').pop();
+    // One manager drives workspace creation, the install and the checks, so the
+    // generated e2e test cannot straddle two.
+    const packageManager = options.packageManager ?? (0, devkit_1.detectPackageManager)();
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), options.projectRoot, {
         ...options,
         tmpl: '',
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
-        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)(),
+        packageManagerCommands: (0, devkit_1.getPackageManagerCommand)(packageManager),
+        packageManager,
         pluginPackageName,
         simplePluginName,
     });

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

@@ -58,7 +58,7 @@ function createTestProject() {
   });
 
   execSync(
-    `<%= packageManagerCommands.dlx %> create-nx-workspace@latest ${projectName} --preset apps --nxCloud=skip --no-interactive`,
+    `<%= packageManagerCommands.dlx %> create-nx-workspace@latest ${projectName} --preset apps --nxCloud=skip --no-interactive --packageManager=<%= packageManager %>`,
     {
       cwd: dirname(projectDirectory),
       stdio: 'inherit',

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

@@ -1,8 +1,10 @@
+import type { PackageManager } from '@nx/devkit';
 import type { LinterType } from '@nx/js';
 
 export interface Schema {
   pluginName: string;
   npmPackageName: string;
+  packageManager?: PackageManager;
   projectDirectory?: string;
   pluginOutputPath?: string;
   jestConfig?: string;

package/dist/src/generators/e2e-project/schema.json

@@ -17,6 +17,11 @@
       "description": "the package name of the plugin as it would be published to NPM.",
       "x-priority": "important"
     },
+    "packageManager": {
+      "type": "string",
+      "enum": ["npm", "pnpm", "yarn", "bun"],
+      "description": "Package manager the generated e2e test uses to create the test workspace, install the plugin and run its checks. Defaults to the package manager the workspace already uses."
+    },
     "projectDirectory": {
       "type": "string",
       "description": "the directory where the plugin is placed."

package/package.json

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