@pnpm/workspace.injected-deps-syncer 1100.0.37 → 1100.0.39

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @pnpm/workspace.injected-deps-syncer
 
+## 1100.0.39
+
+### Patch Changes
+
+- `syncInjectedDepsAfterScripts` now copies files into injected dependencies when `node_modules` is on another filesystem than the package sources. The sync previously failed with a cross-device link error and made the script run exit with an error [pnpm/pnpm#14703](https://github.com/pnpm/pnpm/issues/14703).
+
+- Fixed injected workspace dependency synchronization failing with `EPERM` on Windows when removing nested directories.
+
+- Updated dependencies:
+  - @pnpm/bins.linker@1100.0.33
+  - @pnpm/bins.remover@1100.0.25
+  - @pnpm/bins.resolver@1100.0.17
+  - @pnpm/error@1100.2.0
+  - @pnpm/fetching.directory-fetcher@1100.0.35
+  - @pnpm/fs.graceful-fs@1100.2.3
+  - @pnpm/installing.modules-yaml@1101.0.4
+  - @pnpm/pkg-manifest.reader@1100.0.20
+  - @pnpm/types@1102.1.1
+  - @pnpm/workspace.projects-reader@1101.1.0
+
+## 1100.0.38
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/bins.linker@1100.0.32
+  - @pnpm/bins.remover@1100.0.24
+  - @pnpm/fetching.directory-fetcher@1100.0.34
+  - @pnpm/installing.modules-yaml@1101.0.3
+  - @pnpm/workspace.projects-reader@1101.0.28
+
 ## 1100.0.37
 
 ### Patch Changes

package/lib/DirPatcher.js

@@ -2,6 +2,8 @@ import fs from 'node:fs';
 import path from 'node:path';
 import util from 'node:util';
 import { fetchFromDir } from '@pnpm/fetching.directory-fetcher';
+import { renameFileWithRetry } from '@pnpm/fs.graceful-fs';
+import { pathTemp } from 'path-temp';
 export const DIR = Symbol('Path is a directory');
 // length comparison should place every directory before the files it contains because
 // a directory path is always shorter than any file path it contains
@@ -39,12 +41,41 @@ export async function applyPatch(optimizedDirPatch, sourceDir, targetDir) {
         }
         else if (typeof value === 'string') {
             fs.mkdirSync(path.dirname(targetPath), { recursive: true });
-            await retryOverBlockingInode(targetPath, async () => fs.promises.link(sourcePath, targetPath));
+            await retryOverBlockingInode(targetPath, async () => linkOrCopy(sourcePath, targetPath));
         }
         else {
             const _ = value; // static type guard
         }
     }
+    async function linkOrCopy(sourcePath, targetPath) {
+        try {
+            await fs.promises.link(sourcePath, targetPath);
+        }
+        catch (error) {
+            if (util.types.isNativeError(error) && 'code' in error && error.code === 'EXDEV') {
+                await copyIntoPlace(sourcePath, targetPath);
+                return;
+            }
+            throw error;
+        }
+    }
+    /**
+     * Copy through a temp sibling, so that a reader of the target never sees a
+     * partial copy. The rename replaces a symlink at the target without following
+     * it.
+     */
+    async function copyIntoPlace(sourcePath, targetPath) {
+        // A random name, since concurrent syncs share the thread that writes it.
+        const tempPath = pathTemp(path.dirname(targetPath));
+        try {
+            await fs.promises.copyFile(sourcePath, tempPath, fs.constants.COPYFILE_EXCL);
+            renameFileWithRetry(tempPath, targetPath);
+        }
+        catch (error) {
+            await fs.promises.rm(tempPath, { force: true });
+            throw error;
+        }
+    }
     /**
      * The target may hold an inode that {@link extendFilesMap} skips — a FIFO, a
      * socket, a device. The diff cannot see it, so it is never scheduled for
@@ -93,9 +124,9 @@ export async function applyPatch(optimizedDirPatch, sourceDir, targetDir) {
     // files a sibling had already linked. A path the target holds as a file and
     // the source as a directory lands in `modified` rather than `added`, so both
     // arrays feed the directory pass.
-    await Promise.all(optimizedDirPatch.removed.map(async (item) => {
-        await removeRecursive(path.join(targetDir, item.path));
-    }));
+    for (const item of optimizedDirPatch.removed) {
+        await removeRecursive(path.join(targetDir, item.path)); // eslint-disable-line no-await-in-loop
+    }
     for (const item of newDirs) {
         await applyChange(item); // eslint-disable-line no-await-in-loop
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/workspace.injected-deps-syncer",
-  "version": "1100.0.37",
+  "version": "1100.0.39",
   "description": "Update all injected replica of a workspace package",
   "keywords": [
     "pnpm",
@@ -27,18 +27,20 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/bins.linker": "1100.0.31",
-    "@pnpm/bins.remover": "1100.0.23",
-    "@pnpm/bins.resolver": "1100.0.16",
-    "@pnpm/error": "1100.1.4",
-    "@pnpm/fetching.directory-fetcher": "1100.0.33",
-    "@pnpm/installing.modules-yaml": "1101.0.2",
-    "@pnpm/pkg-manifest.reader": "1100.0.19",
+    "@pnpm/bins.linker": "1100.0.33",
+    "@pnpm/bins.remover": "1100.0.25",
+    "@pnpm/bins.resolver": "1100.0.17",
+    "@pnpm/error": "1100.2.0",
+    "@pnpm/fetching.directory-fetcher": "1100.0.35",
+    "@pnpm/fs.graceful-fs": "1100.2.3",
+    "@pnpm/installing.modules-yaml": "1101.0.4",
+    "@pnpm/pkg-manifest.reader": "1100.0.20",
     "@pnpm/text.ordinal-comparator": "1100.0.0",
-    "@pnpm/types": "1102.1.0",
-    "@pnpm/workspace.projects-reader": "1101.0.27",
+    "@pnpm/types": "1102.1.1",
+    "@pnpm/workspace.projects-reader": "1101.1.0",
     "@types/normalize-path": "^3.0.2",
-    "normalize-path": "^3.0.0"
+    "normalize-path": "^3.0.0",
+    "path-temp": "^3.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
@@ -46,8 +48,8 @@
   "devDependencies": {
     "@jest/globals": "30.4.1",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/prepare": "1100.0.30",
-    "@pnpm/workspace.injected-deps-syncer": "1100.0.37",
+    "@pnpm/prepare": "1100.0.32",
+    "@pnpm/workspace.injected-deps-syncer": "1100.0.39",
     "@types/is-windows": "^1.0.2",
     "is-windows": "^1.0.2"
   },