@vzn/vx 0.0.634 → 0.0.635

package/src/workspace/migration.ts

@@ -377,6 +377,18 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   // One reason, its tasks: on a Turbo template the same two-line cache TODO
   // printed five times and the persistent one eight (the first-five-minutes
   // walk, 2026-09-28), and the list read as noise.
+  // A file .gitignore drops is lost at the first commit, unnoticed: vueuse
+  // ignores `packages/**/*.mjs`, so `--mjs` wrote configs git never saw.
+  const ignored = gitIgnored(
+    root,
+    files.map((f) => f.relPath),
+  )
+  const ignoredNote =
+    ignored.length === 0
+      ? []
+      : [
+          `.gitignore drops ${ignored.length} file${ignored.length === 1 ? '' : 's'} this ${dry ? 'would write' : 'wrote'} (${ignored.slice(0, TODO_IDS_SHOWN).join(', ')}${ignored.length > TODO_IDS_SHOWN ? ', …' : ''}): add ${[...new Set(ignored.map((f) => `!${path.posix.basename(f)}`))].join(' and ')} to .gitignore, or commit them with git add -f`,
+        ]
   const todos = new Map<string, string[]>()
   let todoCount = 0
   let clean = 0
@@ -423,7 +435,7 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
       args.unmapped === true
         ? `${verb}: no package.json scripts became tasks.`
         : `${verb}: no package.json scripts to turn into tasks.`,
-      ...[...noMembers, ...(args.notes ?? [])].map((n) => `note: ${n}`),
+      ...[...noMembers, ...(args.notes ?? []), ...ignoredNote].map((n) => `note: ${n}`),
       hasWorkspaceFile
         ? `${workspaceName} already exists.`
         : dry
@@ -438,7 +450,7 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
     )
   } else {
     report.push(`${verb}: ${source} → ${configName}`)
-    for (const n of args.notes ?? []) report.push(`note: ${n}`)
+    for (const n of [...(args.notes ?? []), ...ignoredNote]) report.push(`note: ${n}`)
     for (const n of plan.headerNotes) report.push(`note: ${n}`)
     report.push(
       '',
@@ -470,7 +482,10 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   // A run of tasks none of which caches is never a hit, and a first try
   // that runs twice to see the cache work saw it run twice.
   if (!cached && [...todos.keys()].some(isCacheTodo)) {
-    report.push('', 'no task caches yet: add the cache block a TODO shows, and a second run hits')
+    report.push(
+      '',
+      'no task caches yet: uncomment the cache line in each TODO task with its real globs, and a second run hits',
+    )
   }
   const installed = existsSync(path.join(root, 'node_modules', '@vzn', 'vx', 'package.json'))
   // The line is the next thing to type, so it names what that run would
@@ -495,6 +510,7 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
           ...(empty && unreached.length > 0 ? [unreachedHint(unreached, root)] : []),
           ...(empty ? noMembers : []),
           ...(args.notes ?? []),
+          ...ignoredNote,
           ...plan.headerNotes,
           ...plan.notes,
         ],
@@ -508,6 +524,28 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   return 0
 }
 
+/** The paths (root-relative) git's ignore rules drop; none outside a work tree. */
+function gitIgnored(root: string, relPaths: readonly string[]): string[] {
+  if (relPaths.length === 0) return []
+  try {
+    const r = Bun.spawnSync({
+      cmd: [executablePath('git'), 'check-ignore', '--stdin', '-z'],
+      cwd: root,
+      stdin: Buffer.from(relPaths.map((p) => `${p}\0`).join('')),
+      stdout: 'pipe',
+      stderr: 'ignore',
+    })
+    // 0: some ignored; 1: none; anything else (no work tree): nothing to say.
+    if (r.exitCode !== 0) return []
+    return r.stdout
+      .toString()
+      .split('\0')
+      .filter((p) => p !== '')
+  } catch {
+    return []
+  }
+}
+
 function inGitWorkTree(root: string): boolean {
   try {
     return (
@@ -660,7 +698,16 @@ function renderConfigFile(p: GeneratedProject, format: MigrationFormat): string
         : IDENT.test(t.name)
           ? t.name
           : quoteTsLiteral(t.name)
-    lines.push(`    ${key}: ${renderValue(t.task, '    ')},`)
+    const rendered = renderValue(t.task, '    ')
+    // The suggested block sits in the task, commented: deleting `// `
+    // after setting the real globs caches it, no copying from the TODO.
+    const block =
+      t.task['cache'] === undefined
+        ? t.todos.find(isCacheTodo)?.match(/^cache: add `(.+?)`/)?.[1]
+        : undefined
+    lines.push(
+      `    ${key}: ${block === undefined ? rendered : rendered.replace('{\n', `{\n      // ${block},\n`)},`,
+    )
   }
   lines.push('  },', format === 'ts' ? '} satisfies ProjectConfig' : '}', '')
   return lines.join('\n')

package/src/workspace/project-loader.ts

@@ -2,7 +2,7 @@ import { existsSync, realpathSync, statSync } from 'node:fs'
 import path from 'node:path'
 import type { ProjectConfig, WorkspaceConfig } from '../config.js'
 import { UserError, xxh3hex } from '../util/index.js'
-import { validateProjectConfig, validateWorkspace } from './config-schema.js'
+import { isSkippedPlugin, validateProjectConfig, validateWorkspace } from './config-schema.js'
 import {
   beginEvalRound,
   builtinsChangedBy,
@@ -1163,6 +1163,8 @@ export async function loadWorkspaceConfig(root: string): Promise<WorkspaceConfig
     // config at all (D-6).
     assertDefaultObject(mod, 'Workspace', configPath)
     validateWorkspace(mod, configPath)
+    if (mod.plugins?.some(isSkippedPlugin) === true)
+      mod = { ...mod, plugins: mod.plugins.filter((p) => !isSkippedPlugin(p)) }
     // Set by a load that succeeded: a failed one may have left nothing in
     // the registry, and its fix must not be refused.
     if (since === undefined) workspaceLoadedAt.set(configPath, startedAt)