@pnpm/lockfile.make-dedicated-lockfile 1100.0.40 → 1100.0.42

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @pnpm/make-dedicated-lockfile
 
+## 1100.0.42
+
+### Patch Changes
+
+- Fixed the `make-dedicated-lockfile` command failing to start with `ReferenceError: require is not defined in ES module scope`.
+
+- `make-dedicated-lockfile` now restores `package.json` when it cannot move the original `node_modules` back to its place. The error then names `.tmp_node_modules`, where the original `node_modules` was left. The command refuses to run while that directory exists, so a retry cannot overwrite it.
+
+- `make-dedicated-lockfile` no longer removes fields such as `main` and `types` from the `publishConfig` of the project's `package.json`.
+
+- `make-dedicated-lockfile` keeps workspace dependencies linked in the dedicated lockfile [#3442](https://github.com/pnpm/pnpm/issues/3442).
+
+- Updated dependencies:
+  - @pnpm/error@1100.2.0
+  - @pnpm/lockfile.fs@1100.2.9
+  - @pnpm/lockfile.pruner@1100.0.25
+  - @pnpm/releasing.exportable-manifest@1100.3.3
+  - @pnpm/types@1102.1.1
+  - @pnpm/workspace.project-manifest-reader@1100.1.0
+  - @pnpm/workspace.root-finder@1100.1.0
+
+## 1100.0.41
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/lockfile.fs@1100.2.8
+  - @pnpm/lockfile.pruner@1100.0.24
+  - @pnpm/releasing.exportable-manifest@1100.3.2
+  - @pnpm/workspace.project-manifest-reader@1100.0.29
+  - @pnpm/workspace.root-finder@1100.0.9
+
 ## 1100.0.40
 
 ### Patch Changes

package/bin/make-dedicated-lockfile.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../lib/bin')
+import {} from '../lib/bin.js'

package/lib/index.js

@@ -1,13 +1,21 @@
+import fs from 'node:fs';
 import path from 'node:path';
+import util from 'node:util';
+import { PnpmError } from '@pnpm/error';
 import { pnpmExec } from '@pnpm/exec';
 import { getLockfileImporterId, readWantedLockfile, writeWantedLockfile, } from '@pnpm/lockfile.fs';
 import { pruneSharedLockfile } from '@pnpm/lockfile.pruner';
 import { createExportableManifest } from '@pnpm/releasing.exportable-manifest';
 import { DEPENDENCIES_FIELDS } from '@pnpm/types';
 import { readProjectManifest } from '@pnpm/workspace.project-manifest-reader';
-import { pickBy } from 'ramda';
 import { renameOverwrite } from 'rename-overwrite';
 export async function makeDedicatedLockfile(lockfileDir, projectDir) {
+    const tempModulesDir = path.join(projectDir, '.tmp_node_modules');
+    if (fs.existsSync(tempModulesDir)) {
+        throw new PnpmError('STAGED_MODULES_DIR_EXISTS', `${tempModulesDir} already exists`, {
+            hint: 'It holds the node_modules of an earlier run that could not be moved back. Restore or remove it, then run the command again.',
+        });
+    }
     const lockfile = await readWantedLockfile(lockfileDir, { ignoreIncompatible: false });
     if (lockfile == null) {
         throw new Error('no lockfile found');
@@ -18,11 +26,11 @@ export async function makeDedicatedLockfile(lockfileDir, projectDir) {
     for (const [importerId, importer] of Object.entries(allImporters)) {
         if (importerId.startsWith(`${baseImporterId}/`)) {
             const newImporterId = importerId.slice(baseImporterId.length + 1);
-            lockfile.importers[newImporterId] = projectSnapshotWithoutLinkedDeps(importer);
+            lockfile.importers[newImporterId] = importer;
             continue;
         }
         if (importerId === baseImporterId) {
-            lockfile.importers['.'] = projectSnapshotWithoutLinkedDeps(importer);
+            lockfile.importers['.'] = importer;
         }
     }
     const dedicatedLockfile = pruneSharedLockfile(lockfile);
@@ -34,20 +42,18 @@ export async function makeDedicatedLockfile(lockfileDir, projectDir) {
         // intentionally.
         catalogs: {},
     });
-    await writeProjectManifest(publishManifest);
+    await writeProjectManifest(withWorkspaceDependencies(manifest, publishManifest));
     const modulesDir = path.join(projectDir, 'node_modules');
-    const tmp = path.join(projectDir, 'tmp_node_modules');
-    const tempModulesDir = path.join(projectDir, 'node_modules/.tmp');
     let modulesRenamed = false;
     try {
-        await renameOverwrite(modulesDir, tmp);
-        await renameOverwrite(tmp, tempModulesDir);
+        await renameOverwrite(modulesDir, tempModulesDir);
         modulesRenamed = true;
     }
     catch (err) { // eslint-disable-line
         if (err['code'] !== 'ENOENT')
             throw err;
     }
+    const errors = [];
     try {
         await pnpmExec([
             'install',
@@ -55,29 +61,67 @@ export async function makeDedicatedLockfile(lockfileDir, projectDir) {
             '--lockfile-dir=.',
             '--fix-lockfile',
             '--filter=.',
-            '--no-link-workspace-packages',
             '--config.dedupe-peer-dependents=false', // TODO: remove this. It should work without it
         ], {
             cwd: projectDir,
         });
     }
-    finally {
-        if (modulesRenamed) {
-            await renameOverwrite(tempModulesDir, tmp);
-            await renameOverwrite(tmp, modulesDir);
+    catch (err) {
+        errors.push(err);
+    }
+    let modulesRestored = !modulesRenamed;
+    if (modulesRenamed) {
+        try {
+            await renameOverwrite(tempModulesDir, modulesDir);
+            modulesRestored = true;
         }
+        catch (err) {
+            errors.push(err);
+        }
+    }
+    try {
         await writeProjectManifest(manifest);
     }
+    catch (err) {
+        errors.push(err);
+    }
+    if (errors.length === 1) {
+        throw errors[0];
+    }
+    if (errors.length > 1) {
+        const failures = errors.map((err) => util.types.isNativeError(err) ? err.message : String(err));
+        throw new PnpmError('MAKE_DEDICATED_LOCKFILE_FAILED', `Creating the dedicated lockfile in ${projectDir} failed:\n${failures.join('\n')}`, {
+            cause: new AggregateError(errors, undefined, { cause: errors[0] }),
+            hint: modulesRestored ? undefined : `The original node_modules is still in ${tempModulesDir}.`,
+        });
+    }
 }
-function projectSnapshotWithoutLinkedDeps(projectSnapshot) {
-    const newProjectSnapshot = {
-        specifiers: projectSnapshot.specifiers,
-    };
-    for (const depField of DEPENDENCIES_FIELDS) {
-        if (projectSnapshot[depField] == null)
+/**
+ * The exportable manifest replaces `workspace:` specifiers with the version
+ * range a published copy would use, which the install would then look up in
+ * the registry. The dedicated lockfile keeps the workspace project linked, so
+ * its specifier stays as declared.
+ */
+function withWorkspaceDependencies(manifest, publishManifest) {
+    const result = { ...publishManifest };
+    for (const depField of [...DEPENDENCIES_FIELDS, 'peerDependencies']) {
+        const deps = manifest[depField];
+        if (deps == null || result[depField] == null)
             continue;
-        newProjectSnapshot[depField] = pickBy((depVersion) => !depVersion.startsWith('link:'), projectSnapshot[depField]);
+        let updatedDeps;
+        for (const [depName, spec] of Object.entries(deps)) {
+            const isWorkspace = depField === 'peerDependencies' ? spec.includes('workspace:') : spec.startsWith('workspace:');
+            if (isWorkspace) {
+                if (updatedDeps == null) {
+                    updatedDeps = { ...result[depField] };
+                }
+                updatedDeps[depName] = spec;
+            }
+        }
+        if (updatedDeps != null) {
+            result[depField] = updatedDeps;
+        }
     }
-    return newProjectSnapshot;
+    return result;
 }
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/lockfile.make-dedicated-lockfile",
-  "version": "1100.0.40",
+  "version": "1100.0.42",
   "description": "Creates a dedicated lockfile for a subset of workspace projects",
   "keywords": [
     "pnpm",
@@ -32,23 +32,21 @@
     "lockfile.make-dedicated-lockfile": "./bin/make-dedicated-lockfile.js"
   },
   "dependencies": {
-    "@pnpm/error": "1100.1.4",
+    "@pnpm/error": "1100.2.0",
     "@pnpm/exec": "^4.0.0",
-    "@pnpm/lockfile.fs": "1100.2.7",
-    "@pnpm/lockfile.pruner": "1100.0.23",
+    "@pnpm/lockfile.fs": "1100.2.9",
+    "@pnpm/lockfile.pruner": "1100.0.25",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/releasing.exportable-manifest": "1100.3.1",
-    "@pnpm/types": "1102.1.0",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.28",
-    "@pnpm/workspace.root-finder": "1100.0.8",
-    "ramda": "npm:@pnpm/ramda@0.28.1",
+    "@pnpm/releasing.exportable-manifest": "1100.3.3",
+    "@pnpm/types": "1102.1.1",
+    "@pnpm/workspace.project-manifest-reader": "1100.1.0",
+    "@pnpm/workspace.root-finder": "1100.1.0",
     "rename-overwrite": "^7.0.1"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/lockfile.make-dedicated-lockfile": "1100.0.40",
+    "@pnpm/lockfile.make-dedicated-lockfile": "1100.0.42",
     "@pnpm/test-fixtures": "1100.0.1",
-    "@types/ramda": "0.32.0",
     "execa": "npm:safe-execa@0.3.0"
   },
   "engines": {