fg-devkit 1.12.12 → 1.12.14

package/README.md

@@ -132,6 +132,12 @@ Upgrade policy versions interactively:
 pnpm exec fgd policy-upgrade
 ```
 
+Sync dependency policy, run pnpm install, and auto-commit (`chore(repo): sync dependency policy`):
+
+```bash
+pnpm exec fgd sync-deps-commit
+```
+
 Upgrade one package.json dependency and auto-commit (`dep(package): bump to version`):
 
 ```bash

package/configs/dependency-policy.vue-workspace.json

@@ -32,7 +32,7 @@
       "content-disposition-header": "0.6.0",
       "date-fns": "4.4.0",
       "element-plus": "2.14.3",
-      "fds-vue-core": "8.4.1",
+      "fds-vue-core": "8.4.3",
       "imask": "7.6.1",
       "leaflet": "1.9.4",
       "lexical": "0.49.0",
@@ -69,7 +69,7 @@
       "@tsconfig/node22": "22.0.5",
       "@types/lodash-es": "4.17.12",
       "@types/node": "22.16.5",
-      "@vitest/browser": "3.2.4",
+      "@vitest/browser": "4.1.10",
       "@vue/compiler-dom": "3.5.41",
       "@vue/eslint-config-standard": "8.0.1",
       "@vue/server-renderer": "3.5.41",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.12.12",
+  "version": "1.12.14",
   "description": "Shared configs, scripts, and DX tooling for Vue / TypeScript frontend repos",
   "type": "module",
   "license": "UNLICENSED",
@@ -56,6 +56,7 @@
     "./scripts/audit-override-commit.mjs": "./scripts/audit-override-commit.mjs",
     "./scripts/check-dependency-policy.mjs": "./scripts/check-dependency-policy.mjs",
     "./scripts/sync-dependency-policy.mjs": "./scripts/sync-dependency-policy.mjs",
+    "./scripts/sync-dependency-policy-commit.mjs": "./scripts/sync-dependency-policy-commit.mjs",
     "./scripts/resolve-dependency-policy-path.mjs": "./scripts/resolve-dependency-policy-path.mjs",
     "./scripts/refresh-dependency-policy-from-repos.mjs": "./scripts/refresh-dependency-policy-from-repos.mjs",
     "./scripts/sync-scaffold-vue-deps.mjs": "./scripts/sync-scaffold-vue-deps.mjs",

package/scaffold/vue/package.json

@@ -22,7 +22,7 @@
     "content-disposition-header": "0.6.0",
     "date-fns": "4.4.0",
     "dotenv": "16.4.5",
-    "fds-vue-core": "8.4.1",
+    "fds-vue-core": "8.4.3",
     "pinia": "3.0.4",
     "qrcode.vue": "3.10.0",
     "vue": "3.5.41",
@@ -34,7 +34,7 @@
     "@tanstack/vue-query-devtools": "6.1.38",
     "@types/node": "22.16.5",
     "@vitejs/plugin-vue": "6.0.8",
-    "fg-devkit": "1.12.12",
+    "fg-devkit": "1.12.14",
     "tailwindcss": "4.3.3",
     "tsx": "4.23.9",
     "vite": "7.3.5"

package/scripts/fg-devkit.mjs

@@ -5,6 +5,7 @@
  * Non-interactive (for scripts and automation):
  *   pnpm exec fg-devkit check-deps [policy-file]
  *   pnpm exec fg-devkit sync-deps [policy-file]
+ *   pnpm exec fg-devkit sync-deps-commit [policy-file]
  *   pnpm exec fg-devkit policy-outdated [policy-file]
  *   pnpm exec fg-devkit policy-vulns [policy-file]
  *   pnpm exec fg-devkit repo-vulns
@@ -458,6 +459,7 @@ function runSyncConfigTarget(target) {
 const DIRECT_COMMANDS = {
   'check-deps': 'check-dependency-policy.mjs',
   'sync-deps': 'sync-dependency-policy.mjs',
+  'sync-deps-commit': 'sync-dependency-policy-commit.mjs',
   'policy-outdated': 'policy-outdated.mjs',
   'policy-vulns': 'policy-vulns.mjs',
   'repo-vulns': 'repo-vulns.mjs',
@@ -498,6 +500,7 @@ function printHelp() {
 Commands:
   check-deps [policy-file]        Validate package.json + pins + toolchain against policy
   sync-deps [policy-file]         Align declared versions, packageManager, and Node toolchain to policy
+  sync-deps-commit [policy-file]  Sync dependency policy, pnpm install, then auto-commit
   policy-outdated [policy-file]   Show outdated policy packages via pnpm outdated
   policy-vulns [policy-file]      Check all policy packages together (including transitives) via pnpm audit
   repo-vulns                      Check all repo dependencies for vulnerabilities via pnpm audit
@@ -781,7 +784,7 @@ async function runInteractiveMenu() {
         message: 'Dependecy policy',
         choices: [
           { name: 'Check', value: 'check' },
-          { name: 'Sync', value: 'sync' },
+          { name: 'Sync and auto-commit', value: 'sync-commit' },
           { name: 'Upgrade one package.json package and auto-commit', value: 'upgrade-commit' },
           { name: 'Fix one vulnerability override and auto-commit', value: 'audit-override-commit' },
           { name: 'Cancel', value: 'cancel' },
@@ -791,7 +794,9 @@ async function runInteractiveMenu() {
       })
       if (choice === 'cancel') continue
       if (choice === 'check') return runSelectedAction(() => runNode('check-dependency-policy.mjs'))
-      if (choice === 'sync') return runSelectedAction(() => runNode('sync-dependency-policy.mjs'))
+      if (choice === 'sync-commit') {
+        return runSelectedAction(() => runNode('sync-dependency-policy-commit.mjs'))
+      }
       if (choice === 'audit-override-commit') {
         return runSelectedAction(() => runNode('audit-override-commit.mjs'))
       }

package/scripts/policy-upgrade-commit.mjs

@@ -87,6 +87,21 @@ function collectPackageVersionChanges(beforePackage, afterPackage) {
   return changed
 }
 
+/** ncu can upgrade package.json `packageManager` (e.g. pnpm@x.y.z); treat as one bump. */
+function collectPackageManagerChange(beforePackage, afterPackage) {
+  const before = beforePackage.packageManager
+  const after = afterPackage.packageManager
+  if (after === undefined || after === before) {
+    return null
+  }
+  const match = typeof after === 'string' ? after.match(/^pnpm@(.+)$/i) : null
+  return {
+    name: 'pnpm',
+    from: before ?? '(missing)',
+    to: match ? match[1] : after,
+  }
+}
+
 function main() {
   if (!fs.existsSync(packageJsonPath)) {
     console.error(`[policy-upgrade-commit] package.json not found at ${packageJsonPath}`)
@@ -115,6 +130,11 @@ function main() {
   }
 
   const changed = collectPackageVersionChanges(beforePackage, afterPackage)
+  const packageManagerChange = collectPackageManagerChange(beforePackage, afterPackage)
+  if (packageManagerChange) {
+    changed.push(packageManagerChange)
+  }
+
   if (changed.length === 0) {
     console.log('[policy-upgrade-commit] No package version changes detected in package.json.')
     process.exit(0)

package/scripts/sync-dependency-policy-commit.mjs

@@ -0,0 +1,154 @@
+#!/usr/bin/env node
+/**
+ * Sync dependency policy into the consumer repo, run pnpm install, then auto-commit.
+ *
+ * Usage:
+ *   pnpm exec fg-devkit sync-deps-commit [policy-file]
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { spawnSync } from 'node:child_process'
+
+const cwd = process.cwd()
+const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const syncScriptPath = path.join(scriptDir, 'sync-dependency-policy.mjs')
+const commitMessage = 'chore(repo): sync dependency policy'
+
+function runSync(args) {
+  const result = spawnSync(process.execPath, [syncScriptPath, ...args], {
+    encoding: 'utf8',
+    cwd,
+    env: process.env,
+  })
+  if (result.stdout) process.stdout.write(result.stdout)
+  if (result.stderr) process.stderr.write(result.stderr)
+  if (result.error) {
+    console.error('[sync-deps-commit]', result.error.message)
+    return { status: 1, stdout: '' }
+  }
+  return { status: result.status ?? 1, stdout: result.stdout ?? '' }
+}
+
+function runPnpm(args) {
+  const result = spawnSync('pnpm', args, {
+    stdio: 'inherit',
+    cwd,
+    env: process.env,
+  })
+  if (result.error) {
+    console.error('[sync-deps-commit]', result.error.message)
+    return 1
+  }
+  return result.status ?? 1
+}
+
+function runGit(args, options = {}) {
+  const result = spawnSync('git', args, {
+    stdio: options.capture ? 'pipe' : 'inherit',
+    encoding: options.capture ? 'utf8' : undefined,
+    cwd,
+    env: process.env,
+  })
+  if (result.error) {
+    console.error('[sync-deps-commit]', result.error.message)
+    return { status: 1, stdout: '' }
+  }
+  return { status: result.status ?? 1, stdout: result.stdout ?? '' }
+}
+
+function listTrackedFiles() {
+  const result = runGit(['ls-files', '-z'], { capture: true })
+  if (result.status !== 0) return []
+  return result.stdout.split('\0').filter(Boolean)
+}
+
+function isSyncRelatedPath(filePath) {
+  const base = path.basename(filePath)
+  if (
+    base === 'package.json' ||
+    base === 'pnpm-lock.yaml' ||
+    base === 'pnpm-workspace.yaml' ||
+    base === '.nvmrc' ||
+    base === '.node-version' ||
+    base === 'Dockerfile' ||
+    base === 'Dockerfile.local' ||
+    base === 'Jenkinsfile'
+  ) {
+    return true
+  }
+  if (filePath.includes(`${path.sep}.github${path.sep}workflows${path.sep}`) || filePath.startsWith('.github/workflows/')) {
+    return /\.(ya?ml)$/i.test(base)
+  }
+  return base.endsWith('.sh')
+}
+
+function fileDiffersFromHead(filePath) {
+  const absolutePath = path.join(cwd, filePath)
+  if (!fs.existsSync(absolutePath)) return false
+
+  const tracked = runGit(['ls-files', '--error-unmatch', '--', filePath], { capture: true })
+  if (tracked.status !== 0) {
+    return true
+  }
+
+  const diff = runGit(['diff', '--quiet', 'HEAD', '--', filePath], { capture: true })
+  return diff.status !== 0
+}
+
+function stageExistingFiles(files) {
+  const existingFiles = files.filter((filePath) => fs.existsSync(path.join(cwd, filePath)))
+  if (existingFiles.length === 0) return 0
+  return runGit(['add', '--', ...existingFiles]).status
+}
+
+function main() {
+  const syncResult = runSync(process.argv.slice(2))
+  if (syncResult.status !== 0) {
+    process.exit(syncResult.status)
+  }
+
+  if (syncResult.stdout.includes('already match dependency policy')) {
+    console.log('[sync-deps-commit] Nothing to install or commit.')
+    process.exit(0)
+  }
+
+  const installExitCode = runPnpm(['install'])
+  if (installExitCode !== 0) {
+    process.exit(installExitCode)
+  }
+
+  const candidateFiles = new Set([
+    'package.json',
+    'pnpm-lock.yaml',
+    'pnpm-workspace.yaml',
+    '.nvmrc',
+    '.node-version',
+    'Dockerfile',
+    'Dockerfile.local',
+    'Jenkinsfile',
+  ])
+  for (const filePath of listTrackedFiles()) {
+    if (isSyncRelatedPath(filePath)) {
+      candidateFiles.add(filePath)
+    }
+  }
+
+  const filesToStage = [...candidateFiles].filter((filePath) => fileDiffersFromHead(filePath))
+  if (filesToStage.length === 0) {
+    console.log('[sync-deps-commit] No sync-related changes to commit.')
+    process.exit(0)
+  }
+
+  const stageExitCode = stageExistingFiles(filesToStage)
+  if (stageExitCode !== 0) {
+    process.exit(stageExitCode)
+  }
+
+  console.log(`[sync-deps-commit] Staged ${filesToStage.length} file(s)`)
+  console.log(`[sync-deps-commit] Auto-committing: ${commitMessage}`)
+  process.exit(runGit(['commit', '-m', commitMessage]).status)
+}
+
+main()