@pnpm/fetching.directory-fetcher 1100.0.34 → 1100.0.36

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @pnpm/directory-fetcher
 
+## 1100.0.36
+
+### Patch Changes
+
+- `pnpm deploy` with a shared lockfile now copies workspace dependencies into the deploy directory, even when `packageImportMethod` is set to `hardlink`. Previously, their files were hard-linked to the workspace sources, so editing a source file also changed the deployed copy [pnpm/pnpm#12176](https://github.com/pnpm/pnpm/issues/12176).
+
+- `pnpm install` no longer fails for an injected workspace dependency whose package publishes from a `publishConfig.directory` that its own `prepare` script builds. The injected copy now picks up that directory once `prepare` finishes building it. `pnpm install --frozen-lockfile` no longer reports the dependency as outdated while the directory has not been built yet. [pnpm/pnpm#7811](https://github.com/pnpm/pnpm/issues/7811)
+
+- `pnpm install` now works in StackBlitz WebContainers on projects without a lockfile. It used to fail there with `ENOENT ... pnpm-lock.yaml`, because pnpm did not recognize the errors that WebContainers return from asynchronous file system calls [#15649](https://github.com/pnpm/pnpm/issues/15649).
+
+- Updated dependencies:
+  - @pnpm/building.pkg-requires-build@1100.0.19
+  - @pnpm/error@1100.2.1
+  - @pnpm/fetching.fetcher-base@1100.2.12
+  - @pnpm/fs.packlist@1100.0.6
+  - @pnpm/resolving.resolver-base@1101.3.2
+  - @pnpm/store.cafs-types@1100.1.1
+  - @pnpm/workspace.project-manifest-reader@1100.1.1
+
+## 1100.0.35
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/building.pkg-requires-build@1100.0.18
+  - @pnpm/fetching.fetcher-base@1100.2.11
+  - @pnpm/fs.packlist@1100.0.5
+  - @pnpm/resolving.resolver-base@1101.3.1
+  - @pnpm/types@1102.1.1
+  - @pnpm/workspace.project-manifest-reader@1100.1.0
+
 ## 1100.0.34
 
 ### Patch Changes

package/lib/index.d.ts

@@ -1,9 +1,10 @@
 import { type Stats } from 'node:fs';
-import type { DirectoryFetcher, DirectoryFetcherOptions } from '@pnpm/fetching.fetcher-base';
+import type { DirectoryFetcher, DirectoryFetcherOptions, LocalDirPackageImportMethod } from '@pnpm/fetching.fetcher-base';
 import type { FilesMap } from '@pnpm/store.cafs-types';
 import type { DependencyManifest } from '@pnpm/types';
 export interface CreateDirectoryFetcherOptions {
     includeOnlyPackageFiles?: boolean;
+    localDirPackageImportMethod?: LocalDirPackageImportMethod;
     resolveSymlinks?: boolean;
 }
 export declare function createDirectoryFetcher(opts?: CreateDirectoryFetcherOptions): {
@@ -14,7 +15,7 @@ export interface FetchResult {
     local: true;
     filesMap: FilesMap;
     filesStats?: Record<string, Stats | null>;
-    packageImportMethod: 'hardlink';
+    packageImportMethod: LocalDirPackageImportMethod;
     manifest: DependencyManifest;
     requiresBuild: boolean;
 }

package/lib/index.js

@@ -1,33 +1,70 @@
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import util from 'node:util';
 import { pkgRequiresBuild } from '@pnpm/building.pkg-requires-build';
+import { isError } from '@pnpm/error';
 import { packlist } from '@pnpm/fs.packlist';
 import { logger } from '@pnpm/logger';
-import { safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader';
+import { safeReadParentPublishManifest, safeReadProjectManifestOnly } from '@pnpm/workspace.project-manifest-reader';
 const directoryFetcherLogger = logger('directory-fetcher');
 export function createDirectoryFetcher(opts) {
     const readFileStat = opts?.resolveSymlinks === true ? realFileStat : fileStat;
-    const fetchFromDir = opts?.includeOnlyPackageFiles ? fetchPackageFilesFromDir : fetchAllFilesFromDir.bind(null, readFileStat);
-    const directoryFetcher = (cafs, resolution, opts) => {
+    const packageImportMethod = opts?.localDirPackageImportMethod ?? 'hardlink';
+    const fetchFromDir = opts?.includeOnlyPackageFiles
+        ? fetchPackageFilesFromDir.bind(null, packageImportMethod)
+        : fetchAllFilesFromDir.bind(null, readFileStat, packageImportMethod);
+    const directoryFetcher = async (cafs, resolution, opts) => {
         // Use path.resolve so absolute directories (e.g. cross-drive Windows paths
         // stored by `file:` deps) are respected instead of being concatenated
         // onto lockfileDir.
         const dir = path.resolve(opts.lockfileDir, resolution.directory);
-        return fetchFromDir(dir);
+        // An injected dependency whose packed content is the output of its own
+        // lifecycle scripts (a project with `publishConfig.directory` built by
+        // `prepare`) has no source directory on a fresh install: the scripts run
+        // after linking, and the built output is imported afterwards. Inject an
+        // empty copy so the install can proceed instead of failing on the
+        // not-yet-built directory. Any other missing directory still fails.
+        if (!await dirExists(dir)) {
+            const manifest = await safeReadParentPublishManifest(dir);
+            if (manifest != null) {
+                return {
+                    local: true,
+                    filesMap: new Map(),
+                    packageImportMethod,
+                    manifest,
+                    requiresBuild: false,
+                    sourceExists: false,
+                };
+            }
+        }
+        return {
+            ...await fetchFromDir(dir),
+            sourceExists: true,
+        };
     };
     return {
         directory: directoryFetcher,
     };
 }
+async function dirExists(dir) {
+    try {
+        await fs.stat(dir);
+        return true;
+    }
+    catch (err) {
+        if (isError(err) && 'code' in err && err.code === 'ENOENT')
+            return false;
+        throw err;
+    }
+}
 export async function fetchFromDir(dir, opts) {
+    const packageImportMethod = opts.localDirPackageImportMethod ?? 'hardlink';
     if (opts.includeOnlyPackageFiles) {
-        return fetchPackageFilesFromDir(dir);
+        return fetchPackageFilesFromDir(packageImportMethod, dir);
     }
     const readFileStat = opts?.resolveSymlinks === true ? realFileStat : fileStat;
-    return fetchAllFilesFromDir(readFileStat, dir);
+    return fetchAllFilesFromDir(readFileStat, packageImportMethod, dir);
 }
-async function fetchAllFilesFromDir(readFileStat, dir) {
+async function fetchAllFilesFromDir(readFileStat, packageImportMethod, dir) {
     const { filesMap, filesStats } = await _fetchAllFilesFromDir(readFileStat, dir);
     // In a regular pnpm workspace it will probably never happen that a dependency has no package.json file.
     // Safe read was added to support the Bit workspace in which the components have no package.json files.
@@ -38,7 +75,7 @@ async function fetchAllFilesFromDir(readFileStat, dir) {
         local: true,
         filesMap,
         filesStats,
-        packageImportMethod: 'hardlink',
+        packageImportMethod,
         manifest,
         requiresBuild,
     };
@@ -81,7 +118,7 @@ async function realFileStat(filePath) {
     }
     catch (err) {
         // Broken symlinks are skipped
-        if (util.types.isNativeError(err) && 'code' in err && err.code === 'ENOENT') {
+        if (isError(err) && 'code' in err && err.code === 'ENOENT') {
             directoryFetcherLogger.debug({ brokenSymlink: filePath });
             return null;
         }
@@ -97,14 +134,14 @@ async function fileStat(filePath) {
     }
     catch (err) {
         // Broken symlinks are skipped
-        if (util.types.isNativeError(err) && 'code' in err && err.code === 'ENOENT') {
+        if (isError(err) && 'code' in err && err.code === 'ENOENT') {
             directoryFetcherLogger.debug({ brokenSymlink: filePath });
             return null;
         }
         throw err;
     }
 }
-async function fetchPackageFilesFromDir(dir) {
+async function fetchPackageFilesFromDir(packageImportMethod, dir) {
     const files = await packlist(dir);
     const filesMap = new Map(files.map((file) => [file, path.join(dir, file)]));
     // In a regular pnpm workspace it will probably never happen that a dependency has no package.json file.
@@ -115,7 +152,7 @@ async function fetchPackageFilesFromDir(dir) {
     return {
         local: true,
         filesMap,
-        packageImportMethod: 'hardlink',
+        packageImportMethod,
         manifest,
         requiresBuild,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/fetching.directory-fetcher",
-  "version": "1100.0.34",
+  "version": "1100.0.36",
   "description": "A fetcher for local directory packages",
   "keywords": [
     "pnpm",
@@ -28,20 +28,21 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/building.pkg-requires-build": "1100.0.17",
-    "@pnpm/fetching.fetcher-base": "1100.2.10",
-    "@pnpm/fs.packlist": "1100.0.4",
-    "@pnpm/resolving.resolver-base": "1101.3.0",
-    "@pnpm/store.cafs-types": "1100.1.0",
-    "@pnpm/types": "1102.1.0",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.29"
+    "@pnpm/building.pkg-requires-build": "1100.0.19",
+    "@pnpm/error": "1100.2.1",
+    "@pnpm/fetching.fetcher-base": "1100.2.12",
+    "@pnpm/fs.packlist": "1100.0.6",
+    "@pnpm/resolving.resolver-base": "1101.3.2",
+    "@pnpm/store.cafs-types": "1100.1.1",
+    "@pnpm/types": "1102.1.1",
+    "@pnpm/workspace.project-manifest-reader": "1100.1.1"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/fetching.directory-fetcher": "1100.0.34",
+    "@pnpm/fetching.directory-fetcher": "1100.0.36",
     "@pnpm/logger": "1100.0.0",
     "@pnpm/test-fixtures": "1100.0.1",
     "@pnpm/text.ordinal-comparator": "1100.0.0",