fg-devkit 1.16.0 → 1.16.2

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

@@ -30,7 +30,7 @@
       "content-disposition-header": "0.6.0",
       "date-fns": "4.4.0",
       "element-plus": "2.14.5",
-      "fds-vue-core": "8.6.4",
+      "fds-vue-core": "8.6.6",
       "imask": "7.6.1",
       "leaflet": "1.9.4",
       "lexical": "0.49.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.16.0",
+  "version": "1.16.2",
   "description": "Shared configs, scripts, and DX tooling for Vue / TypeScript frontend repos",
   "type": "module",
   "license": "UNLICENSED",

package/scaffold/vue/package.json

@@ -21,7 +21,7 @@
     "content-disposition-header": "0.6.0",
     "date-fns": "4.4.0",
     "dotenv": "16.4.5",
-    "fds-vue-core": "8.6.4",
+    "fds-vue-core": "8.6.6",
     "pinia": "3.0.4",
     "qrcode.vue": "3.11.0",
     "vue": "3.5.42",
@@ -33,7 +33,7 @@
     "@tanstack/vue-query-devtools": "6.1.48",
     "@types/node": "22.16.5",
     "@vitejs/plugin-vue": "6.0.8",
-    "fg-devkit": "1.16.0",
+    "fg-devkit": "1.16.2",
     "tailwindcss": "4.3.3",
     "tsx": "4.23.13",
     "vite": "7.3.5",

package/scripts/fg-devkit.mjs

@@ -540,7 +540,7 @@ Commands:
   sync-tooling-configs            Tooling sync only (overwrites config files)
   sync-vscode-settings            Copy shared VS Code settings into .vscode/settings.json
   sync-core-coding-standards      Copy .cursor core coding standards with consumer package name
-  sync-vite-plugin-vue-inspector  Add/pin vite-plugin-vue-inspector and wire it in vite.config
+  sync-vite-plugin-vue-inspector  Add/pin vite-plugin-vue-inspector, wire vite.config, install, commit
   sync-consumer-scripts           Enforce standard fgd scripts in consumer package.json
   setup-lefthook                  Setup lefthook and migrate from husky/lint-staged
   full-consumer-setup             Run: scripts -> lefthook -> step 3 -> step 2 -> pnpm install

package/scripts/sync-vite-plugin-vue-inspector.mjs

@@ -4,8 +4,10 @@
  *
  * - Adds/pins the package in package.json devDependencies (version from dependency policy)
  * - Ensures import + Inspector({ launchEditor: 'cursor', toggleComboKey: 'meta-alt' }) in vite.config.*
+ * - Runs pnpm install, then commits related files
  *
- * Does not overwrite the rest of vite.config. Idempotent.
+ * Does not overwrite the rest of vite.config. Idempotent when already up to date
+ * (skips install/commit).
  *
  * Usage:
  *   node node_modules/fg-devkit/scripts/sync-vite-plugin-vue-inspector.mjs
@@ -15,6 +17,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { spawnSync } from 'node:child_process'
 
 import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
 
@@ -24,6 +27,7 @@ const PLUGIN_OPTIONS = {
   launchEditor: 'cursor',
   toggleComboKey: 'meta-alt',
 }
+const COMMIT_MESSAGE = 'dep(vite-plugin-vue-inspector): add dependency and config'
 
 const VITE_CONFIG_CANDIDATES = [
   'vite.config.ts',
@@ -41,6 +45,50 @@ function fail(message) {
   process.exit(1)
 }
 
+function runPnpm(args) {
+  const result = spawnSync('pnpm', args, {
+    stdio: 'inherit',
+    cwd,
+    env: process.env,
+  })
+  if (result.error) {
+    fail(result.error.message)
+  }
+  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) {
+    fail(result.error.message)
+  }
+  return { status: result.status ?? 1, stdout: result.stdout ?? '' }
+}
+
+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 resolvePluginVersion(policy) {
   return (
     policy.managedDependencies?.devDependencies?.[PACKAGE_NAME] ??
@@ -252,10 +300,9 @@ function ensureImport(source) {
 function isCanonicalInspectorCall(callText) {
   const launchOk = /launchEditor\s*:\s*['"]cursor['"]/.test(callText)
   const toggleOk = /toggleComboKey\s*:\s*['"]meta-alt['"]/.test(callText)
-  const onlyExpectedKeys =
-    [...callText.matchAll(/(\w+)\s*:/g)].map((m) => m[1]).every((key) =>
-      ['launchEditor', 'toggleComboKey'].includes(key),
-    )
+  const onlyExpectedKeys = [...callText.matchAll(/(\w+)\s*:/g)]
+    .map((m) => m[1])
+    .every((key) => ['launchEditor', 'toggleComboKey'].includes(key))
   return launchOk && toggleOk && onlyExpectedKeys
 }
 
@@ -369,7 +416,34 @@ function syncViteConfig(projectRoot) {
     fs.writeFileSync(viteConfigPath, source, 'utf8')
   }
 
-  return changes
+  return { changes, configName }
+}
+
+function installAndCommit(viteConfigName) {
+  console.log('[sync-vite-plugin-vue-inspector] Running pnpm install…')
+  const installExitCode = runPnpm(['install'])
+  if (installExitCode !== 0) {
+    process.exit(installExitCode)
+  }
+
+  const candidateFiles = ['package.json', 'pnpm-lock.yaml', viteConfigName].filter(Boolean)
+  const filesToStage = candidateFiles.filter((filePath) => fileDiffersFromHead(filePath))
+  if (filesToStage.length === 0) {
+    console.log('[sync-vite-plugin-vue-inspector] No related changes to commit.')
+    return
+  }
+
+  const stageExitCode = stageExistingFiles(filesToStage)
+  if (stageExitCode !== 0) {
+    process.exit(stageExitCode)
+  }
+
+  console.log(`[sync-vite-plugin-vue-inspector] Staged ${filesToStage.length} file(s)`)
+  console.log(`[sync-vite-plugin-vue-inspector] Auto-committing: ${COMMIT_MESSAGE}`)
+  const commitExitCode = runGit(['commit', '-m', COMMIT_MESSAGE]).status
+  if (commitExitCode !== 0) {
+    process.exit(commitExitCode)
+  }
 }
 
 function main() {
@@ -386,7 +460,7 @@ function main() {
   }
 
   const pkgChanges = syncPackageJson(cwd, version)
-  const viteChanges = syncViteConfig(cwd)
+  const { changes: viteChanges, configName } = syncViteConfig(cwd)
   const allChanges = [...pkgChanges, ...viteChanges]
 
   if (allChanges.length === 0) {
@@ -398,9 +472,8 @@ function main() {
   for (const change of allChanges) {
     console.log(`  - ${change}`)
   }
-  console.log(
-    '[sync-vite-plugin-vue-inspector] Run pnpm install if the dependency was added or pinned.',
-  )
+
+  installAndCommit(configName)
 }
 
 main()