@nx/devkit 23.2.0-beta.2 → 23.2.0-beta.4

package/dist/src/generators/project-name-and-root-utils.js

@@ -51,6 +51,7 @@ async function determineProjectNameAndRootOptions(tree, options) {
     if (projectRoot.startsWith('..')) {
         throw new Error(`The resolved project root "${projectRoot}" is outside of the workspace root "${devkit_exports_1.workspaceRoot}".`);
     }
+    validateUniqueName(tree, name, projectRoot, options);
     const importPath = options.importPath ?? resolveImportPath(tree, name, projectRoot);
     return {
         projectName: name,
@@ -109,6 +110,18 @@ function validateOptions(providedName, derivedName, directory) {
         throw new Error(`The derived name from the provided directory should match the pattern "${pattern}". The derived name "${derivedName}" from the provided value "${directory}" does not match.`);
     }
 }
+function validateUniqueName(tree, name, projectRoot, options) {
+    const existingProject = (0, devkit_exports_1.getProjects)(tree).get(name);
+    // A project at the resolved root is handled elsewhere with a more
+    // accurate error, so only error when the name is taken by a project
+    // located somewhere else.
+    if (!existingProject || existingProject.root === projectRoot) {
+        return;
+    }
+    throw new Error(options.name
+        ? `The provided name "${name}" is already used by the project at "${existingProject.root}". Please provide a unique name for the new project.`
+        : `The name "${name}" was derived from the provided directory "${options.directory}", but it is already used by the project at "${existingProject.root}". Please provide a unique name for the new project with the "--name" option.`);
+}
 function getImportPath(npmScope, name) {
     return npmScope ? `${npmScope === '@' ? '' : '@'}${npmScope}/${name}` : name;
 }

package/dist/src/utils/add-plugin.js

@@ -61,8 +61,10 @@ async function _addPluginInternal(tree, graph, pluginName, pluginFactory, option
                 // Errors are okay for this because we're only running 1 plugin
                 if ((0, devkit_internals_1.isProjectConfigurationsError)(e)) {
                     projConfigs = e.partialProjectConfigurationsResult;
-                    // ignore errors from projects with no name
-                    if (!e.errors.every(devkit_internals_1.isProjectsWithNoNameError)) {
+                    // Ignore errors about project names: running a single plugin in
+                    // isolation cannot resolve the real project names, and they are
+                    // irrelevant for determining the plugin options.
+                    if (!e.errors.every(isProjectNameError)) {
                         throw e;
                     }
                 }
@@ -102,8 +104,10 @@ async function _addPluginInternal(tree, graph, pluginName, pluginFactory, option
             // Errors are okay for this because we're only running 1 plugin
             if ((0, devkit_internals_1.isProjectConfigurationsError)(e)) {
                 projConfigs = e.partialProjectConfigurationsResult;
-                // ignore errors from projects with no name
-                if (!e.errors.every(devkit_internals_1.isProjectsWithNoNameError)) {
+                // Ignore errors about project names: running a single plugin in
+                // isolation cannot resolve the real project names, and they are
+                // irrelevant for determining the plugin options.
+                if (!e.errors.every(isProjectNameError)) {
                     throw e;
                 }
             }
@@ -125,6 +129,9 @@ async function _addPluginInternal(tree, graph, pluginName, pluginFactory, option
         updatePackageScripts(tree, projConfigs);
     }
 }
+function isProjectNameError(e) {
+    return (0, devkit_internals_1.isProjectsWithNoNameError)(e) || (0, devkit_internals_1.isMultipleProjectsWithSameNameError)(e);
+}
 function updatePackageScripts(tree, projectConfigurations) {
     for (const projectConfig of Object.values(projectConfigurations.projects)) {
         const projectRoot = projectConfig.root;

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

@@ -3,9 +3,10 @@ import type { PackageJson, PackageJsonDependencySection } from 'nx/src/utils/pac
 /**
  * Get the resolved version of a dependency from package.json.
  *
- * Retrieves a package version and automatically resolves PNPM catalog references
- * (e.g., "catalog:default") to their actual version strings. By default, searches
- * `dependencies` first, then falls back to `devDependencies`.
+ * Retrieves a package version and automatically resolves package manager
+ * catalog references (e.g., "catalog:default") to their actual version
+ * strings. By default, searches `dependencies` first, then falls back to
+ * `devDependencies`.
  *
  * **Tree-based usage** (generators and migrations):
  * Use when you have a `Tree` object, which is typical in Nx generators and migrations.

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

@@ -442,7 +442,11 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
         return packageMapCache.get(pkg);
     }
     try {
-        return require(pkg);
+        // The workspace comes first so its installed version wins; `__dirname`
+        // keeps the old behaviour as a fallback. A bare `require` would only
+        // resolve from wherever `@nx/devkit` sits, which in a monorepo can be a
+        // different copy of the package than the workspace depends on.
+        return require(require.resolve(pkg, { paths: [devkit_exports_1.workspaceRoot, __dirname] }));
     }
     catch (e) {
         if (e.code === 'ERR_REQUIRE_ESM') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "23.2.0-beta.2",
+  "version": "23.2.0-beta.4",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "jest": "30.3.0",
-    "nx": "23.2.0-beta.2"
+    "nx": "23.2.0-beta.4"
   },
   "peerDependencies": {
     "nx": ">= 22 <= 24 || ^23.0.0-0"