fg-devkit 1.7.10 → 1.7.12

package/README.md

@@ -132,6 +132,12 @@ Upgrade policy versions interactively:
 pnpm exec fgd policy-upgrade
 ```
 
+Upgrade one package.json dependency and auto-commit (`dep(package): bump to version`):
+
+```bash
+pnpm exec fgd policy-upgrade-commit
+```
+
 ## tsconfig in consuming repos
 
 Use `fgd sync-project-configs` (or `fgd sync-tooling-configs`) to write the local `tsconfig.json` template from `fg-devkit`.
@@ -200,7 +206,7 @@ fgd() {
 EOF
 ```
 
-2) Reload shell config:
+1) Reload shell config:
 
 ```bash
 source ~/.zshrc

package/configs/fallowrc.sync-stub.json

@@ -10,5 +10,5 @@
     "index.html"
   ],
   "publicPackages": ["fds-vue-core"],
-  "ignoreDependencies": ["@intlify/unplugin-vue-i18n"]
+  "ignoreDependencies": ["fds-vue-core", "@intlify/unplugin-vue-i18n"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "description": "Shared configs, scripts, and DX tooling for Vue / TypeScript frontend repos",
   "type": "module",
   "license": "UNLICENSED",
@@ -35,6 +35,7 @@
     "./scripts/fleet-vulns.mjs": "./scripts/fleet-vulns.mjs",
     "./scripts/fleet-bump-fg-devkit.mjs": "./scripts/fleet-bump-fg-devkit.mjs",
     "./scripts/policy-upgrade.mjs": "./scripts/policy-upgrade.mjs",
+    "./scripts/policy-upgrade-commit.mjs": "./scripts/policy-upgrade-commit.mjs",
     "./scripts/check-dependency-policy.mjs": "./scripts/check-dependency-policy.mjs",
     "./scripts/sync-dependency-policy.mjs": "./scripts/sync-dependency-policy.mjs",
     "./scripts/resolve-dependency-policy-path.mjs": "./scripts/resolve-dependency-policy-path.mjs",

package/scaffold/vue/package.json

@@ -34,7 +34,7 @@
     "@tanstack/vue-query-devtools": "6.1.28",
     "@types/node": "22.16.5",
     "@vitejs/plugin-vue": "6.0.6",
-    "fg-devkit": "1.7.10",
+    "fg-devkit": "1.7.12",
     "start-server-and-test": "2.1.3",
     "tailwindcss": "4.2.4",
     "tsx": "4.21.0",

package/scripts/fg-devkit.mjs

@@ -11,6 +11,7 @@
  *   pnpm exec fg-devkit fleet-vulns [projects-root] [--summary-only] [--delay-ms=<ms>]
  *   pnpm exec fg-devkit fleet-bump-fg-devkit [projects-root] [--dry-run]
  *   pnpm exec fg-devkit policy-upgrade [policy-file] [ncu-args...]
+ *   pnpm exec fg-devkit policy-upgrade-commit [ncu-args...]
  *   pnpm exec fg-devkit sync-project-configs   (VS Code + tooling sync; overwrites config files)
  *   pnpm exec fg-devkit sync-tooling-configs   (tooling sync only; overwrites config files)
  *   pnpm exec fg-devkit sync-vscode-settings
@@ -164,106 +165,6 @@ function runFullConsumerSetup() {
   return runPnpmInstall()
 }
 
-function stageFiles(paths = []) {
-  const existing = paths.filter((p) => fs.existsSync(path.join(process.cwd(), p)))
-  if (existing.length === 0) return 0
-  const r = spawnSync('git', ['add', '--', ...existing], {
-    stdio: 'inherit',
-    cwd: process.cwd(),
-    env: process.env,
-  })
-  if (r.error) {
-    console.error('[fg-devkit]', r.error.message)
-    return 1
-  }
-  return r.status ?? 1
-}
-
-function commitStaged(message) {
-  const r = spawnSync('git', ['commit', '-m', message], {
-    stdio: 'inherit',
-    cwd: process.cwd(),
-    env: process.env,
-  })
-  if (r.error) {
-    console.error('[fg-devkit]', r.error.message)
-    return 1
-  }
-  return r.status ?? 1
-}
-
-function collectPolicyVersionChanges(beforePolicy, afterPolicy) {
-  const before = {
-    ...(beforePolicy.managedDependencies?.dependencies ?? {}),
-    ...(beforePolicy.managedDependencies?.devDependencies ?? {}),
-    ...(beforePolicy.managedAnywhere ?? {}),
-  }
-  const after = {
-    ...(afterPolicy.managedDependencies?.dependencies ?? {}),
-    ...(afterPolicy.managedDependencies?.devDependencies ?? {}),
-    ...(afterPolicy.managedAnywhere ?? {}),
-  }
-  const changed = []
-  for (const [name, newVersion] of Object.entries(after)) {
-    const prev = before[name]
-    if (prev !== undefined && prev !== newVersion) {
-      changed.push({ name, from: prev, to: newVersion })
-    }
-  }
-  return changed
-}
-
-/** Maintainer flow: run policy-upgrade, stage policy file, then auto-commit dep(package): bump to version. */
-function runMaintainerPolicyUpgradeAndCommit() {
-  const policyPath = path.join(process.cwd(), 'configs', 'dependency-policy.vue-workspace.json')
-  if (!fs.existsSync(policyPath)) {
-    console.error('[fg-devkit] Expected policy at configs/dependency-policy.vue-workspace.json')
-    return 1
-  }
-
-  let beforePolicy
-  try {
-    beforePolicy = JSON.parse(fs.readFileSync(policyPath, 'utf8'))
-  } catch (err) {
-    console.error(`[fg-devkit] Failed to read policy before upgrade: ${err.message}`)
-    return 1
-  }
-
-  const upgradeCode = runNode('policy-upgrade.mjs')
-  if (upgradeCode !== 0) return upgradeCode
-
-  let afterPolicy
-  try {
-    afterPolicy = JSON.parse(fs.readFileSync(policyPath, 'utf8'))
-  } catch (err) {
-    console.error(`[fg-devkit] Failed to read policy after upgrade: ${err.message}`)
-    return 1
-  }
-
-  const changed = collectPolicyVersionChanges(beforePolicy, afterPolicy)
-  if (changed.length === 0) {
-    console.log('[fg-devkit] No policy package version changes detected; skipping stage and commit flow.')
-    return 0
-  }
-  if (changed.length > 1) {
-    console.log('[fg-devkit] Multiple package changes detected in policy-upgrade:')
-    for (const item of changed) {
-      console.log(`  - ${item.name}: ${item.from} -> ${item.to}`)
-    }
-    console.log('[fg-devkit] Please commit manually (or rerun and select a single package).')
-    return 1
-  }
-
-  const [only] = changed
-  const stageCode = stageFiles(['configs/dependency-policy.vue-workspace.json', 'scaffold/vue/package.json'])
-  if (stageCode !== 0) return stageCode
-
-  const commitMessage = `dep(${only.name}): bump to ${only.to}`
-  console.log(`[fg-devkit] Staged policy change for ${only.name} -> ${only.to}`)
-  console.log(`[fg-devkit] Auto-committing: ${commitMessage}`)
-  return commitStaged(commitMessage)
-}
-
 /** Maintainer flow: run full repo vulnerability audit in fg-devkit root. */
 function runMaintainerAuditAll() {
   return runNode('repo-vulns.mjs')
@@ -462,6 +363,7 @@ const DIRECT_COMMANDS = {
   'fleet-vulns': 'fleet-vulns.mjs',
   'fleet-bump-fg-devkit': 'fleet-bump-fg-devkit.mjs',
   'policy-upgrade': 'policy-upgrade.mjs',
+  'policy-upgrade-commit': 'policy-upgrade-commit.mjs',
   'sync-project-configs': 'sync-project-configs.mjs',
   'sync-tooling-configs': 'sync-tooling-configs.mjs',
   'sync-vscode-settings': 'sync-vscode-settings.mjs',
@@ -490,6 +392,8 @@ Commands:
                                  Bump fg-devkit, run sync-deps, then pnpm install across Vue repos
   policy-upgrade [policy-file] [ncu-args...]
                                  Upgrade policy packages via npm-check-updates (default interactive)
+  policy-upgrade-commit [ncu-args...]
+                                 Upgrade one consumer package.json package and auto-commit
   sync-project-configs            VS Code + tooling sync (overwrites config files)
   sync-tooling-configs            Tooling sync only (overwrites config files)
   sync-vscode-settings            Copy shared VS Code settings into .vscode/settings.json
@@ -550,6 +454,7 @@ async function runInteractiveMenu() {
     return 1
   }
 
+
   const runSelectedAction = async (action) => {
     const out = action()
     if (typeof out === 'object' && out !== null && typeof out.then === 'function') {
@@ -697,15 +602,16 @@ async function runInteractiveMenu() {
         choices: [
           { name: 'Check', value: 'check' },
           { name: 'Sync', value: 'sync' },
+          { name: 'Upgrade one package.json package and auto-commit', value: 'upgrade-commit' },
           { name: 'Cancel', value: 'cancel' },
         ],
         default: 'check',
         loop: false,
       })
       if (choice === 'cancel') continue
-      return runSelectedAction(() =>
-        runNode(choice === 'check' ? 'check-dependency-policy.mjs' : 'sync-dependency-policy.mjs'),
-      )
+      if (choice === 'check') return runSelectedAction(() => runNode('check-dependency-policy.mjs'))
+      if (choice === 'sync') return runSelectedAction(() => runNode('sync-dependency-policy.mjs'))
+      return runSelectedAction(() => runNode('policy-upgrade-commit.mjs'))
     }
 
     if (group === 'sync-configs') {
@@ -764,11 +670,10 @@ async function runInteractiveMenu() {
           { name: 'Show outdated dependency policy packages', value: 'm1' },
           { name: 'Upgrade dependency policy (interactive)', value: 'm2' },
           { name: 'Refresh dependency policy from repos (and scaffold/vue package.json)', value: 'm3' },
-          { name: 'Upgrade one policy package, stage, and auto-commit', value: 'm4' },
-          { name: 'Check policy vulnerabilities (audit)', value: 'm5' },
-          { name: 'Check fg-devkit repo vulnerabilities', value: 'm6' },
-          { name: 'Check vulnerabilities across all Vue repos', value: 'm7' },
-          { name: 'Bump fg-devkit in all Vue repos, run sync-deps, and pnpm install', value: 'm8' },
+          { name: 'Check policy vulnerabilities (audit)', value: 'm4' },
+          { name: 'Check fg-devkit repo vulnerabilities', value: 'm5' },
+          { name: 'Check vulnerabilities across all Vue repos', value: 'm6' },
+          { name: 'Bump fg-devkit in all Vue repos, run sync-deps, and pnpm install', value: 'm7' },
           { name: 'Cancel', value: 'cancel' },
         ],
         default: 'm1',
@@ -780,11 +685,10 @@ async function runInteractiveMenu() {
       if (choice === 'm1') return runSelectedAction(() => runNode('policy-outdated.mjs'))
       if (choice === 'm2') return runSelectedAction(() => runNode('policy-upgrade.mjs'))
       if (choice === 'm3') return runSelectedAction(() => runNode('refresh-dependency-policy-from-repos.mjs'))
-      if (choice === 'm4') return runSelectedAction(() => runMaintainerPolicyUpgradeAndCommit())
-      if (choice === 'm5') return runSelectedAction(() => runNode('policy-vulns.mjs'))
-      if (choice === 'm6') return runSelectedAction(() => runMaintainerAuditAll())
-      if (choice === 'm7') return runSelectedAction(() => runNode('fleet-vulns.mjs'))
-      if (choice === 'm8') return runSelectedAction(() => runNode('fleet-bump-fg-devkit.mjs'))
+      if (choice === 'm4') return runSelectedAction(() => runNode('policy-vulns.mjs'))
+      if (choice === 'm5') return runSelectedAction(() => runMaintainerAuditAll())
+      if (choice === 'm6') return runSelectedAction(() => runNode('fleet-vulns.mjs'))
+      if (choice === 'm7') return runSelectedAction(() => runNode('fleet-bump-fg-devkit.mjs'))
       return 1
     }
   }

package/scripts/fleet-vulns.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Runs vulnerability audits across Vue repositories and prints both per-repo
+ * Runs vulnerability audits across local repositories and prints both per-repo
  * pnpm audit output and a combined summary.
  *
  * Usage:
@@ -38,8 +38,10 @@ function readJson(p) {
   return JSON.parse(fs.readFileSync(p, 'utf8'))
 }
 
-function isVueProject(pkg) {
-  return Boolean(pkg.dependencies?.vue || pkg.devDependencies?.vue)
+function isPnpmProject(pkg) {
+  return (
+    typeof pkg.packageManager === 'string' && pkg.packageManager.toLowerCase().startsWith('pnpm@')
+  )
 }
 
 function countTotal(severityMap = {}) {
@@ -52,7 +54,7 @@ for (const packageJsonPath of packageJsonFiles) {
   try {
     const pkg = readJson(packageJsonPath)
     const repoDir = path.dirname(packageJsonPath)
-    if (!isVueProject(pkg)) continue
+    if (!isPnpmProject(pkg)) continue
     if (pkg.name === 'fg-devkit') continue
     repos.push(repoDir)
   } catch {
@@ -62,7 +64,7 @@ for (const packageJsonPath of packageJsonFiles) {
 
 const uniqueRepos = [...new Set(repos)].sort((a, b) => a.localeCompare(b))
 if (uniqueRepos.length === 0) {
-  console.log(`[fleet-vulns] No Vue repositories found under ${projectsRoot}`)
+  console.log(`[fleet-vulns] No pnpm repositories found under ${projectsRoot}`)
   process.exit(0)
 }
 

package/scripts/policy-upgrade-commit.mjs

@@ -0,0 +1,137 @@
+#!/usr/bin/env node
+/**
+ * Upgrade one package in the consumer package.json, then auto-commit.
+ *
+ * Usage:
+ *   pnpm exec fg-devkit policy-upgrade-commit [ncu-args...]
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { createRequire } from 'node:module'
+
+const require = createRequire(import.meta.url)
+const packageJsonPath = path.join(process.cwd(), 'package.json')
+
+function runNcu(args = []) {
+  let ncuBin
+  try {
+    const ncuPkgPath = require.resolve('npm-check-updates/package.json')
+    ncuBin = path.join(path.dirname(ncuPkgPath), 'build', 'cli.js')
+  } catch {
+    console.error('[policy-upgrade-commit] Could not resolve npm-check-updates binary.')
+    return 1
+  }
+
+  const effectiveArgs =
+    args.length > 0
+      ? args
+      : ['--interactive', '--format', 'group', '--upgrade', '--packageManager', 'pnpm', '--install', 'never']
+
+  const result = spawnSync(process.execPath, [ncuBin, ...effectiveArgs], {
+    stdio: 'inherit',
+    cwd: process.cwd(),
+    env: process.env,
+  })
+  if (result.error) {
+    console.error('[policy-upgrade-commit]', result.error.message)
+    return 1
+  }
+  return result.status ?? 1
+}
+
+function runGit(args) {
+  const result = spawnSync('git', args, {
+    stdio: 'inherit',
+    cwd: process.cwd(),
+    env: process.env,
+  })
+  if (result.error) {
+    console.error('[policy-upgrade-commit]', result.error.message)
+    return 1
+  }
+  return result.status ?? 1
+}
+
+function readJson(jsonPath) {
+  return JSON.parse(fs.readFileSync(jsonPath, 'utf8'))
+}
+
+function collectPackageVersionChanges(beforePackage, afterPackage) {
+  const before = {
+    ...(beforePackage.dependencies ?? {}),
+    ...(beforePackage.devDependencies ?? {}),
+    ...(beforePackage.peerDependencies ?? {}),
+    ...(beforePackage.optionalDependencies ?? {}),
+  }
+  const after = {
+    ...(afterPackage.dependencies ?? {}),
+    ...(afterPackage.devDependencies ?? {}),
+    ...(afterPackage.peerDependencies ?? {}),
+    ...(afterPackage.optionalDependencies ?? {}),
+  }
+  const changed = []
+  for (const [name, newVersion] of Object.entries(after)) {
+    const previousVersion = before[name]
+    if (previousVersion !== undefined && previousVersion !== newVersion) {
+      changed.push({ name, from: previousVersion, to: newVersion })
+    }
+  }
+  return changed
+}
+
+function main() {
+  if (!fs.existsSync(packageJsonPath)) {
+    console.error(`[policy-upgrade-commit] package.json not found at ${packageJsonPath}`)
+    process.exit(1)
+  }
+
+  let beforePackage
+  try {
+    beforePackage = readJson(packageJsonPath)
+  } catch (err) {
+    console.error(`[policy-upgrade-commit] Failed to parse package.json before upgrade: ${err.message}`)
+    process.exit(1)
+  }
+
+  const upgradeExitCode = runNcu(process.argv.slice(2))
+  if (upgradeExitCode !== 0) {
+    process.exit(upgradeExitCode)
+  }
+
+  let afterPackage
+  try {
+    afterPackage = readJson(packageJsonPath)
+  } catch (err) {
+    console.error(`[policy-upgrade-commit] Failed to parse package.json after upgrade: ${err.message}`)
+    process.exit(1)
+  }
+
+  const changed = collectPackageVersionChanges(beforePackage, afterPackage)
+  if (changed.length === 0) {
+    console.log('[policy-upgrade-commit] No package version changes detected in package.json.')
+    process.exit(0)
+  }
+  if (changed.length > 1) {
+    console.log('[policy-upgrade-commit] Multiple package changes detected in package.json:')
+    for (const item of changed) {
+      console.log(`  - ${item.name}: ${item.from} -> ${item.to}`)
+    }
+    console.log('[policy-upgrade-commit] Auto-commit supports exactly one changed package. Commit manually.')
+    process.exit(1)
+  }
+
+  const [only] = changed
+  const stageExitCode = runGit(['add', '--', 'package.json'])
+  if (stageExitCode !== 0) {
+    process.exit(stageExitCode)
+  }
+
+  const commitMessage = `dep(${only.name}): bump to ${only.to}`
+  console.log(`[policy-upgrade-commit] Staged changes for ${only.name} -> ${only.to}`)
+  console.log(`[policy-upgrade-commit] Auto-committing: ${commitMessage}`)
+  process.exit(runGit(['commit', '-m', commitMessage]))
+}
+
+main()