@pnpm/installing.commands 1100.7.3 → 1100.8.0

package/lib/install.d.ts

@@ -7,7 +7,7 @@ export declare const shorthands: Record<string, string>;
 export declare const commandNames: string[];
 export declare const recursiveByDefault = true;
 export declare function help(): string;
-export type InstallCommandOptions = Pick<Config, 'autoInstallPeers' | 'bail' | 'bin' | 'catalogs' | 'configDependencies' | 'dedupeInjectedDeps' | 'dedupeDirectDeps' | 'dedupePeerDependents' | 'dedupePeers' | 'deployAllFiles' | 'depth' | 'dev' | 'enableGlobalVirtualStore' | 'engineStrict' | 'excludeLinksFromLockfile' | 'frozenLockfile' | 'global' | 'globalPnpmfile' | 'hoistPattern' | 'hoistingLimits' | 'publicHoistPattern' | 'ignorePnpmfile' | 'ignoreScripts' | 'injectWorkspacePackages' | 'linkWorkspacePackages' | 'lockfileDir' | 'lockfileOnly' | 'modulesDir' | 'nodeLinker' | 'patchedDependencies' | 'preferFrozenLockfile' | 'preferWorkspacePackages' | 'production' | 'registries' | 'save' | 'saveDev' | 'saveExact' | 'saveOptional' | 'savePeer' | 'savePrefix' | 'saveProd' | 'saveCatalogName' | 'saveWorkspaceProtocol' | 'lockfileIncludeTarballUrl' | 'sideEffectsCache' | 'sideEffectsCacheReadonly' | 'sort' | 'sharedWorkspaceLockfile' | 'tag' | 'trustLockfile' | 'allowBuilds' | 'optional' | 'virtualStoreDir' | 'workspaceConcurrency' | 'workspaceDir' | 'workspacePackagePatterns' | 'extraEnv' | 'resolutionMode' | 'ignoreWorkspaceCycles' | 'disallowWorkspaceCycles' | 'updateConfig' | 'overrides' | 'packageExtensions' | 'pnprServer' | 'supportedArchitectures' | 'packageConfigs'> & Pick<ConfigContext, 'allProjects' | 'cliOptions' | 'hooks' | 'rootProjectManifest' | 'rootProjectManifestDir' | 'allProjectsGraph' | 'selectedProjectsGraph'> & CreateStoreControllerOptions & Partial<Pick<Config, 'globalPkgDir'>> & {
+export type InstallCommandOptions = Pick<Config, 'autoInstallPeers' | 'bail' | 'bin' | 'catalogs' | 'configDependencies' | 'dedupeInjectedDeps' | 'dedupeDirectDeps' | 'dedupePeerDependents' | 'dedupePeers' | 'deployAllFiles' | 'depth' | 'dev' | 'enableGlobalVirtualStore' | 'engineStrict' | 'excludeLinksFromLockfile' | 'frozenLockfile' | 'global' | 'globalPnpmfile' | 'hoistPattern' | 'hoistingLimits' | 'publicHoistPattern' | 'ignorePnpmfile' | 'ignoreScripts' | 'injectWorkspacePackages' | 'linkWorkspacePackages' | 'lockfileDir' | 'lockfileOnly' | 'optimisticRepeatInstall' | 'modulesDir' | 'nodeLinker' | 'patchedDependencies' | 'preferFrozenLockfile' | 'preferWorkspacePackages' | 'production' | 'registries' | 'save' | 'saveDev' | 'saveExact' | 'saveOptional' | 'savePeer' | 'savePrefix' | 'saveProd' | 'saveCatalogName' | 'saveWorkspaceProtocol' | 'lockfileIncludeTarballUrl' | 'sideEffectsCache' | 'sideEffectsCacheReadonly' | 'sort' | 'sharedWorkspaceLockfile' | 'tag' | 'trustLockfile' | 'allowBuilds' | 'optional' | 'virtualStoreDir' | 'workspaceConcurrency' | 'workspaceDir' | 'workspacePackagePatterns' | 'extraEnv' | 'resolutionMode' | 'ignoreWorkspaceCycles' | 'disallowWorkspaceCycles' | 'updateConfig' | 'overrides' | 'packageExtensions' | 'pnprServer' | 'supportedArchitectures' | 'packageConfigs'> & Pick<ConfigContext, 'allProjects' | 'cliOptions' | 'hooks' | 'rootProjectManifest' | 'rootProjectManifestDir' | 'allProjectsGraph' | 'selectedProjectsGraph'> & CreateStoreControllerOptions & Partial<Pick<Config, 'globalPkgDir'>> & {
     argv: {
         cooked?: string[];
         original: string[];

package/lib/installDeps.d.ts

@@ -48,5 +48,5 @@ export type InstallDepsOptions = Pick<Config, 'autoInstallPeers' | 'bail' | 'bin
      * subcommand — see `runPacquet.ts`'s `noRuntime` opt.
      */
     isInstallCommand?: boolean;
-} & Partial<Pick<Config, 'pnpmHomeDir' | 'strictDepBuilds'>>;
+} & Partial<Pick<Config, 'pnpmHomeDir' | 'strictDepBuilds' | 'useLockfile' | 'useGitBranchLockfile'>>;
 export declare function installDeps(opts: InstallDepsOptions, params: string[]): Promise<void>;

package/lib/installDeps.js

@@ -5,6 +5,7 @@ import { checkDepsStatus } from '@pnpm/deps.status';
 import { PnpmError } from '@pnpm/error';
 import { arrayOfWorkspacePackagesToMap } from '@pnpm/installing.context';
 import { install, mutateModulesInSingleProject, } from '@pnpm/installing.deps-installer';
+import { writeWantedLockfile } from '@pnpm/lockfile.fs';
 import { globalInfo, logger } from '@pnpm/logger';
 import { applyRuntimeOnFailOverride, filterDependenciesByType } from '@pnpm/pkg-manifest.utils';
 import { createStoreController } from '@pnpm/store.connection-manager';
@@ -28,11 +29,11 @@ const OVERWRITE_UPDATE_OPTIONS = {
 };
 export async function installDeps(opts, params) {
     if (!opts.update && !opts.dedupe && params.length === 0 && opts.optimisticRepeatInstall) {
-        const { upToDate } = await checkDepsStatus({
+        const { upToDate, wantedLockfileToRestore } = await checkDepsStatus({
             ...opts,
             ignoreFilteredInstallCache: true,
         });
-        if (upToDate) {
+        if (upToDate && await restoreWantedLockfileIfMissing(wantedLockfileToRestore, opts)) {
             if (opts.hooks?.customResolvers?.some(r => r.shouldRefreshResolution)) {
                 logger.warn({
                     message: 'shouldRefreshResolution hooks were skipped because optimisticRepeatInstall is enabled.',
@@ -416,4 +417,26 @@ function preferNonvulnerablePackageVersions(packageVulnerabilityAudit) {
     }
     return preferredVersions;
 }
+/**
+ * Restore a missing `pnpm-lock.yaml` from the current lockfile before the
+ * optimistic repeat-install short-circuit reports "Already up to date", so
+ * the fast path leaves the same on-disk contract a full install would.
+ * Returns `true` when the short-circuit may proceed: nothing to restore,
+ * lockfile writing is disabled (`useLockfile: false`), or the restore
+ * succeeded. A failed write returns `false` so the caller falls through to
+ * the full install instead of reporting up to date while `pnpm-lock.yaml`
+ * stays missing.
+ */
+async function restoreWantedLockfileIfMissing(wantedLockfileToRestore, opts) {
+    if (wantedLockfileToRestore == null || opts.useLockfile === false)
+        return true;
+    try {
+        await writeWantedLockfile(wantedLockfileToRestore.lockfileDir, wantedLockfileToRestore.lockfile);
+        return true;
+    }
+    catch (error) {
+        logger.debug({ msg: 'Failed to restore pnpm-lock.yaml from the current lockfile', error });
+        return false;
+    }
+}
 //# sourceMappingURL=installDeps.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.commands",
-  "version": "1100.7.3",
+  "version": "1100.8.0",
   "description": "Commands for installation",
   "keywords": [
     "pnpm",
@@ -47,51 +47,51 @@
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "render-help": "^2.0.0",
     "version-selector-type": "^3.0.0",
-    "@pnpm/building.policy": "1100.0.9",
+    "@pnpm/building.after-install": "1101.0.21",
     "@pnpm/cli.command": "1100.0.1",
     "@pnpm/catalogs.types": "1100.0.0",
     "@pnpm/cli.common-cli-options-help": "1100.0.2",
-    "@pnpm/cli.utils": "1101.0.10",
     "@pnpm/config.matcher": "1100.0.1",
+    "@pnpm/cli.utils": "1101.0.11",
     "@pnpm/config.pick-registry-for-package": "1100.0.8",
-    "@pnpm/config.writer": "1100.0.12",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/config.reader": "1101.7.0",
-    "@pnpm/deps.inspection.outdated": "1100.1.6",
-    "@pnpm/deps.status": "1100.0.23",
+    "@pnpm/config.reader": "1101.8.0",
+    "@pnpm/deps.inspection.outdated": "1100.1.7",
+    "@pnpm/config.writer": "1100.0.12",
     "@pnpm/deps.path": "1100.0.7",
-    "@pnpm/deps.security.signatures": "1101.2.0",
+    "@pnpm/deps.status": "1100.1.0",
     "@pnpm/error": "1100.0.0",
+    "@pnpm/deps.security.signatures": "1101.2.1",
     "@pnpm/fs.graceful-fs": "1100.1.0",
     "@pnpm/fs.read-modules-dir": "1100.0.1",
-    "@pnpm/global.commands": "1100.0.26",
-    "@pnpm/hooks.pnpmfile": "1100.0.13",
-    "@pnpm/installing.context": "1100.0.16",
+    "@pnpm/hooks.pnpmfile": "1100.0.14",
+    "@pnpm/installing.context": "1100.0.17",
     "@pnpm/installing.dedupe.check": "1100.0.10",
-    "@pnpm/building.after-install": "1101.0.20",
-    "@pnpm/installing.deps-installer": "1101.8.0",
+    "@pnpm/global.commands": "1100.0.27",
+    "@pnpm/installing.env-installer": "1101.1.8",
     "@pnpm/lockfile.fs": "1100.1.4",
-    "@pnpm/installing.env-installer": "1101.1.7",
-    "@pnpm/lockfile.types": "1100.0.10",
-    "@pnpm/network.fetch": "1100.1.1",
-    "@pnpm/network.auth-header": "1101.1.1",
-    "@pnpm/resolving.npm-resolver": "1101.5.1",
+    "@pnpm/network.fetch": "1100.1.2",
+    "@pnpm/pkg-manifest.reader": "1100.0.7",
+    "@pnpm/pkg-manifest.utils": "1100.2.4",
+    "@pnpm/resolving.npm-resolver": "1101.5.2",
+    "@pnpm/installing.deps-installer": "1101.9.0",
     "@pnpm/resolving.parse-wanted-dependency": "1100.0.1",
-    "@pnpm/pkg-manifest.utils": "1100.2.3",
     "@pnpm/resolving.resolver-base": "1100.4.1",
-    "@pnpm/store.controller": "1101.0.12",
+    "@pnpm/store.connection-manager": "1100.2.8",
+    "@pnpm/network.auth-header": "1101.1.1",
+    "@pnpm/store.controller": "1101.0.13",
     "@pnpm/types": "1101.3.1",
-    "@pnpm/store.connection-manager": "1100.2.7",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.11",
-    "@pnpm/workspace.projects-filter": "1100.0.19",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.12",
     "@pnpm/workspace.project-manifest-writer": "1100.0.7",
-    "@pnpm/workspace.projects-reader": "1101.0.10",
+    "@pnpm/workspace.projects-graph": "1100.0.17",
+    "@pnpm/workspace.projects-reader": "1101.0.11",
     "@pnpm/workspace.projects-sorter": "1100.0.6",
-    "@pnpm/workspace.projects-graph": "1100.0.16",
-    "@pnpm/workspace.state": "1100.0.20",
-    "@pnpm/workspace.workspace-manifest-writer": "1100.0.12",
     "@pnpm/workspace.root-finder": "1100.0.1",
-    "@pnpm/pkg-manifest.reader": "1100.0.7"
+    "@pnpm/workspace.state": "1100.0.21",
+    "@pnpm/workspace.workspace-manifest-writer": "1100.0.12",
+    "@pnpm/workspace.projects-filter": "1100.0.20",
+    "@pnpm/building.policy": "1100.0.9",
+    "@pnpm/lockfile.types": "1100.0.10"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1001.0.1"
@@ -113,19 +113,19 @@
     "write-json-file": "^7.0.0",
     "write-package": "7.2.0",
     "write-yaml-file": "^6.0.0",
-    "@pnpm/installing.commands": "1100.7.3",
-    "@pnpm/installing.modules-yaml": "1100.0.8",
+    "@pnpm/assert-project": "1100.0.15",
+    "@pnpm/installing.commands": "1100.8.0",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/prepare": "1100.0.14",
-    "@pnpm/assert-project": "1100.0.14",
+    "@pnpm/installing.modules-yaml": "1100.0.8",
     "@pnpm/store.index": "1100.1.0",
+    "@pnpm/prepare": "1100.0.15",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/testing.command-defaults": "1100.0.4",
-    "@pnpm/testing.registry-mock": "1100.0.4",
-    "@pnpm/testing.mock-agent": "1101.0.1",
     "@pnpm/test-ipc-server": "1100.0.0",
-    "@pnpm/workspace.projects-filter": "1100.0.19",
-    "@pnpm/worker": "1100.1.10"
+    "@pnpm/testing.mock-agent": "1101.0.2",
+    "@pnpm/testing.command-defaults": "1100.0.5",
+    "@pnpm/worker": "1100.1.11",
+    "@pnpm/workspace.projects-filter": "1100.0.20",
+    "@pnpm/testing.registry-mock": "1100.0.5"
   },
   "engines": {
     "node": ">=22.13"