@pnpm/workspace.root-finder 1100.0.8 → 1100.0.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @pnpm/workspace.root-finder
 
+## 1100.0.9
+
+### Patch Changes
+
+- A command run in a project that the workspace does not include now acts on that project alone. A project is outside the workspace when it has a manifest of its own and no pattern in the `packages` setting selects it, or when a `!` pattern excludes it. A directory with no manifest of its own, such as a package's source directory, still belongs to the workspace. `pnpm install` in an excluded project used to install every project in the workspace [#3561](https://github.com/pnpm/pnpm/issues/3561).
+
 ## 1100.0.8
 
 ### Patch Changes

package/lib/index.js

@@ -1,7 +1,12 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import util from 'node:util';
+import { MANIFEST_BASE_NAMES } from '@pnpm/constants';
 import { PnpmError } from '@pnpm/error';
+import { isWorkspaceProjectDir } from '@pnpm/workspace.package-patterns';
+import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader';
 import * as find from 'empathic/find';
+const MANIFEST_BASE_NAMES_SET = new Set(MANIFEST_BASE_NAMES);
 const WORKSPACE_DIR_ENV_VAR = 'NPM_CONFIG_WORKSPACE_DIR';
 const WORKSPACE_MANIFEST_FILENAME = 'pnpm-workspace.yaml';
 const INVALID_WORKSPACE_MANIFEST_FILENAME = [
@@ -15,13 +20,47 @@ const INVALID_WORKSPACE_MANIFEST_FILENAME = [
 ];
 export async function findWorkspaceDir(cwd) {
     const workspaceManifestDirEnvVar = process.env[WORKSPACE_DIR_ENV_VAR] ?? process.env[WORKSPACE_DIR_ENV_VAR.toLowerCase()];
-    const workspaceManifestLocation = workspaceManifestDirEnvVar
-        ? path.join(workspaceManifestDirEnvVar, WORKSPACE_MANIFEST_FILENAME)
-        : find.any([WORKSPACE_MANIFEST_FILENAME, ...INVALID_WORKSPACE_MANIFEST_FILENAME], { cwd: await getRealPath(cwd) });
-    if (workspaceManifestLocation && path.basename(workspaceManifestLocation) !== WORKSPACE_MANIFEST_FILENAME) {
+    if (workspaceManifestDirEnvVar) {
+        return path.dirname(path.join(workspaceManifestDirEnvVar, WORKSPACE_MANIFEST_FILENAME));
+    }
+    const realCwd = await getRealPath(cwd);
+    const workspaceManifestLocation = find.any([WORKSPACE_MANIFEST_FILENAME, ...INVALID_WORKSPACE_MANIFEST_FILENAME], { cwd: realCwd });
+    if (!workspaceManifestLocation)
+        return undefined;
+    if (path.basename(workspaceManifestLocation) !== WORKSPACE_MANIFEST_FILENAME) {
         throw new PnpmError('BAD_WORKSPACE_MANIFEST_NAME', `The workspace manifest file should be named "pnpm-workspace.yaml". File found: ${workspaceManifestLocation}`);
     }
-    return workspaceManifestLocation && path.dirname(workspaceManifestLocation);
+    const workspaceDir = path.dirname(workspaceManifestLocation);
+    return await belongsToWorkspace(workspaceDir, realCwd) ? workspaceDir : undefined;
+}
+/**
+ * A project that the workspace does not include stands on its own, so pnpm
+ * runs it as a standalone project instead of acting on the whole workspace
+ * (https://github.com/pnpm/pnpm/issues/3561).
+ *
+ * A directory without a manifest of its own is not such a project. It is some
+ * place inside the workspace, like a package's source directory, and a command
+ * run from there still acts on the workspace.
+ */
+async function belongsToWorkspace(workspaceDir, dir) {
+    if (path.relative(workspaceDir, dir) === '' || !await hasProjectManifest(dir))
+        return true;
+    const workspaceManifest = await readWorkspaceManifest(workspaceDir);
+    return isWorkspaceProjectDir({ workspaceDir, dir, patterns: workspaceManifest?.packages ?? ['.'] });
+}
+async function hasProjectManifest(dir) {
+    let entries;
+    try {
+        entries = await fs.promises.readdir(dir);
+    }
+    catch (err) {
+        // The directory pnpm was pointed at may not exist. Reporting that is the
+        // job of the command that needs it, not of the workspace lookup.
+        if (util.types.isNativeError(err) && 'code' in err && (err.code === 'ENOENT' || err.code === 'ENOTDIR'))
+            return false;
+        throw err;
+    }
+    return entries.some((entry) => MANIFEST_BASE_NAMES_SET.has(entry));
 }
 async function getRealPath(path) {
     return new Promise((resolve) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/workspace.root-finder",
-  "version": "1100.0.8",
+  "version": "1100.0.9",
   "description": "Finds the root of a pnpm workspace",
   "keywords": [
     "pnpm",
@@ -27,12 +27,16 @@
     "!*.map"
   ],
   "dependencies": {
+    "@pnpm/constants": "1102.0.0",
     "@pnpm/error": "1100.1.4",
-    "empathic": "^2.0.1"
+    "@pnpm/workspace.package-patterns": "1100.0.0",
+    "@pnpm/workspace.workspace-manifest-reader": "1100.1.9",
+    "empathic": "^2.1.0"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/workspace.root-finder": "1100.0.8"
+    "@pnpm/workspace.root-finder": "1100.0.9",
+    "tempy": "3.0.0"
   },
   "engines": {
     "node": ">=22.13"