@pnpm/store.create-cafs-store 1100.0.30 → 1100.0.32

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @pnpm/create-cafs-store
 
+## 1100.0.32
+
+### 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)
+
+- The side-effects cache now restores the symlinks that a build script creates inside a package. A warm install used to replace each of them with a copy of its target [#12859](https://github.com/pnpm/pnpm/issues/12859).
+
+  After upgrading, every package with a build script is built once more.
+
+- Updated dependencies:
+  - @pnpm/building.pkg-requires-build@1100.0.19
+  - @pnpm/fetching.fetcher-base@1100.2.12
+  - @pnpm/fs.indexed-pkg-importer@1100.0.31
+  - @pnpm/store.cafs@1100.3.5
+  - @pnpm/store.controller-types@1101.3.2
+
+## 1100.0.31
+
+### Patch Changes
+
+- `pnpm deploy` now respects `--package-import-method` passed on the command line and reports the package import method correctly [pnpm/pnpm#7593](https://github.com/pnpm/pnpm/issues/7593).
+
+- Updated dependencies:
+  - @pnpm/building.pkg-requires-build@1100.0.18
+  - @pnpm/fetching.fetcher-base@1100.2.11
+  - @pnpm/fs.indexed-pkg-importer@1100.0.30
+  - @pnpm/store.cafs@1100.3.4
+  - @pnpm/store.controller-types@1101.3.1
+
 ## 1100.0.30
 
 ### Patch Changes

package/lib/index.js

@@ -11,11 +11,12 @@ export function createPackageImporterAsync(opts) {
     const packageImportMethod = opts.packageImportMethod;
     const gfm = getFlatMap.bind(null, opts.storeDir);
     return async (to, opts) => {
-        const { filesMap, isBuilt } = gfm(opts.filesResponse, opts.sideEffectsCacheKey);
-        const willBeBuilt = !isBuilt && opts.requiresBuild;
-        const pkgImportMethod = willBeBuilt
-            ? 'clone-or-copy'
-            : (opts.filesResponse.packageImportMethod ?? packageImportMethod);
+        const { filesMap, isBuilt, symlinks } = gfm(opts.filesResponse, opts.sideEffectsCacheKey);
+        const pkgImportMethod = needsPrivateFiles(opts.filesResponse, !isBuilt && opts.requiresBuild === true)
+            ? (packageImportMethod === 'copy' ? 'copy' : 'clone-or-copy')
+            : (packageImportMethod && packageImportMethod !== 'auto'
+                ? packageImportMethod
+                : (opts.filesResponse.packageImportMethod ?? packageImportMethod));
         const impPkg = cachedImporterCreator(pkgImportMethod);
         const importMethod = await impPkg(to, {
             disableRelinkLocalDirDeps: opts.disableRelinkLocalDirDeps,
@@ -24,6 +25,8 @@ export function createPackageImporterAsync(opts) {
             force: opts.force,
             keepModulesDir: Boolean(opts.keepModulesDir),
             safeToSkip: opts.safeToSkip,
+            sourceExists: opts.filesResponse.sourceExists,
+            symlinks,
         });
         return { importMethod, isBuilt };
     };
@@ -35,11 +38,12 @@ function createPackageImporter(opts) {
     const packageImportMethod = opts.packageImportMethod;
     const gfm = getFlatMap.bind(null, opts.storeDir);
     return (to, opts) => {
-        const { filesMap, isBuilt } = gfm(opts.filesResponse, opts.sideEffectsCacheKey);
-        const willBeBuilt = !isBuilt && opts.requiresBuild;
-        const pkgImportMethod = willBeBuilt
-            ? 'clone-or-copy'
-            : (opts.filesResponse.packageImportMethod ?? packageImportMethod);
+        const { filesMap, isBuilt, symlinks } = gfm(opts.filesResponse, opts.sideEffectsCacheKey);
+        const pkgImportMethod = needsPrivateFiles(opts.filesResponse, !isBuilt && opts.requiresBuild === true)
+            ? (packageImportMethod === 'copy' ? 'copy' : 'clone-or-copy')
+            : (packageImportMethod && packageImportMethod !== 'auto'
+                ? packageImportMethod
+                : (opts.filesResponse.packageImportMethod ?? packageImportMethod));
         const impPkg = cachedImporterCreator(pkgImportMethod);
         const importMethod = impPkg(to, {
             disableRelinkLocalDirDeps: opts.disableRelinkLocalDirDeps,
@@ -48,10 +52,19 @@ function createPackageImporter(opts) {
             force: opts.force,
             keepModulesDir: Boolean(opts.keepModulesDir),
             safeToSkip: opts.safeToSkip,
+            sourceExists: opts.filesResponse.sourceExists,
+            symlinks,
         });
         return { importMethod, isBuilt };
     };
 }
+// A package that a build will still write to must not share inodes with its
+// source. Neither may a local directory whose fetcher asked for private copies
+// (`pnpm deploy`), even when a global `packageImportMethod` asks for hard links.
+function needsPrivateFiles(filesResponse, willBeBuilt) {
+    return willBeBuilt ||
+        (filesResponse.resolvedFrom === 'local-dir' && filesResponse.packageImportMethod === 'clone-or-copy');
+}
 function getFlatMap(storeDir, filesResponse, targetEngine) {
     if (targetEngine && filesResponse.sideEffectsMaps?.has(targetEngine)) {
         const sideEffectMap = filesResponse.sideEffectsMaps.get(targetEngine);
@@ -59,6 +72,7 @@ function getFlatMap(storeDir, filesResponse, targetEngine) {
         return {
             filesMap,
             isBuilt: true,
+            symlinks: sideEffectMap.symlinks,
         };
     }
     return {
@@ -67,7 +81,7 @@ function getFlatMap(storeDir, filesResponse, targetEngine) {
     };
 }
 // Apply side effects when we already have file location maps (fast path)
-function applySideEffectsDiffWithMaps(baseFiles, { added, deleted }) {
+function applySideEffectsDiffWithMaps(baseFiles, { added, deleted, symlinks }) {
     const filesWithSideEffects = new Map();
     // Add side effect files (already have file paths)
     if (added) {
@@ -75,9 +89,9 @@ function applySideEffectsDiffWithMaps(baseFiles, { added, deleted }) {
             filesWithSideEffects.set(name, filePath);
         }
     }
-    // Add base files that weren't deleted
+    // Add base files that weren't deleted or replaced by a symlink
     for (const [fileName, filePath] of baseFiles) {
-        if (!deleted?.includes(fileName) && !filesWithSideEffects.has(fileName)) {
+        if (!deleted?.includes(fileName) && !filesWithSideEffects.has(fileName) && !symlinks?.has(fileName)) {
             filesWithSideEffects.set(fileName, filePath);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/store.create-cafs-store",
-  "version": "1100.0.30",
+  "version": "1100.0.32",
   "description": "Create a CAFS store controller",
   "keywords": [
     "pnpm",
@@ -37,11 +37,11 @@
     "test": "test"
   },
   "dependencies": {
-    "@pnpm/building.pkg-requires-build": "1100.0.17",
-    "@pnpm/fetching.fetcher-base": "1100.2.10",
-    "@pnpm/fs.indexed-pkg-importer": "1100.0.29",
-    "@pnpm/store.cafs": "1100.3.3",
-    "@pnpm/store.controller-types": "1101.3.0",
+    "@pnpm/building.pkg-requires-build": "1100.0.19",
+    "@pnpm/fetching.fetcher-base": "1100.2.12",
+    "@pnpm/fs.indexed-pkg-importer": "1100.0.31",
+    "@pnpm/store.cafs": "1100.3.5",
+    "@pnpm/store.controller-types": "1101.3.2",
     "memoize": "^11.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1"
   },
@@ -50,9 +50,9 @@
   },
   "devDependencies": {
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/prepare": "1100.0.31",
-    "@pnpm/store.cafs-types": "1100.1.0",
-    "@pnpm/store.create-cafs-store": "1100.0.30",
+    "@pnpm/prepare": "1100.0.33",
+    "@pnpm/store.cafs-types": "1100.1.1",
+    "@pnpm/store.create-cafs-store": "1100.0.32",
     "@types/ramda": "0.32.0"
   },
   "engines": {