@vzn/vx-migrate 0.0.651 → 0.0.653

package/src/workspace-notes.ts

@@ -1,12 +1,13 @@
 // What the written configs leave to .vx/workspace.ts, said once by both
 // migrators: the adoption plugin `vx init` declared still reads the old
 // tool's file every run, and the old tool keyed each package on its own
-// lockfile entries where core keys every task on the whole lockfile.
-// Without a lockfile plugin a dependency bump re-ran every task (hey-api:
-// a `pnpm-lock.yaml` edit re-keyed all 42 builds, none with `pnpm()`).
+// lockfile entries where core keys no lockfile (#3562): without a
+// lockfile plugin a dependency bump re-runs nothing, and a cached task
+// replays output built on the old versions.
 
 import { existsSync } from 'node:fs'
 import path from 'node:path'
+import type { PackageManager } from './adopt.js'
 
 /** Each lockfile and the `@vzn/vx-lockfile` plugin that claims it. */
 const LOCKFILES: ReadonlyArray<readonly [file: string, plugin: string]> = [
@@ -18,9 +19,18 @@ const LOCKFILES: ReadonlyArray<readonly [file: string, plugin: string]> = [
   ['yarn.lock', 'yarn'],
 ]
 
-/** The lockfile at `root` and the `@vzn/vx-lockfile` factory that claims it. */
-export function lockfilePlugin(root: string): { file: string; factory: string } | undefined {
-  const lock = LOCKFILES.find(([file]) => existsSync(path.join(root, file)))
+/**
+ * The lockfile at `root` and the `@vzn/vx-lockfile` factory that claims it.
+ * With none there, `installer`'s: the manager this run installs with
+ * writes it, and the lock that follows needs its plugin for `^` edges.
+ */
+export function lockfilePlugin(
+  root: string,
+  installer?: PackageManager,
+): { file: string; factory: string } | undefined {
+  const lock =
+    LOCKFILES.find(([file]) => existsSync(path.join(root, file))) ??
+    LOCKFILES.find(([, factory]) => factory === installer)
   return lock === undefined ? undefined : { file: lock[0], factory: lock[1] }
 }
 
@@ -58,8 +68,9 @@ export async function adoptedToolNotes(root: string, tool: AdoptedTool): Promise
   const lock = lockfilePlugin(root)
   if (lock !== undefined && !new RegExp(`\\b${lock.factory}\\s*\\(`).test(declared))
     notes.push(
-      `${tool.keys(lock.file)}; vx keys every task on the whole ` +
-        `file, so a dependency bump re-runs them all. Declare ${lock.factory}() from @vzn/vx-lockfile ` +
+      `${tool.keys(lock.file)}; vx keys no lockfile by itself, so a dependency bump re-runs ` +
+        'nothing and a cached task replays output built on the old versions. ' +
+        `Declare ${lock.factory}() from @vzn/vx-lockfile ` +
         "in .vx/workspace.ts to key each task on its package's dependency closure",
     )
   return notes

package/src/workspace-plugins.ts

@@ -6,6 +6,7 @@
 
 import { existsSync } from 'node:fs'
 import path from 'node:path'
+import type { PackageManager } from './adopt.js'
 import { REMOTE_CACHE, remoteCacheSignal } from './remote-cache.js'
 import { lockfilePlugin } from './workspace-notes.js'
 
@@ -16,12 +17,19 @@ export interface WorkspacePlugin {
   readonly factory: string
 }
 
-/** `runner`: the Turbo or Nx repo's own remote cache, where the repo shows one. */
-export function workspacePlugins(root: string, runner?: 'turbo' | 'nx'): WorkspacePlugin[] {
+/**
+ * `runner`: the Turbo or Nx repo's own remote cache, where the repo shows
+ * one. `installer`: the manager this run installs with (`lockfilePlugin`).
+ */
+export function workspacePlugins(
+  root: string,
+  runner?: 'turbo' | 'nx',
+  installer?: PackageManager,
+): WorkspacePlugin[] {
   const out: WorkspacePlugin[] = []
   if (runner !== undefined && remoteCacheSignal(root, runner) !== undefined)
     out.push({ pkg: '@vzn/vx-migrate', factory: REMOTE_CACHE[runner] })
-  const lock = lockfilePlugin(root)
+  const lock = lockfilePlugin(root, installer)
   if (lock !== undefined) out.push({ pkg: '@vzn/vx-lockfile', factory: lock.factory })
   out.push({ pkg: '@vzn/vx-history', factory: 'vxHistory' })
   if (existsSync(path.join(root, '.github', 'workflows')))