fg-devkit 1.7.1 → 1.7.4

package/README.md

@@ -45,6 +45,24 @@ pnpm exec fgd typecheck
 pnpm exec fgd typecheck-watch
 ```
 
+## Bundled Fallow (dead code analysis)
+
+`fg-devkit` also ships Fallow for dead code analysis in consuming repos.
+
+Run dead code analysis via CLI:
+
+```bash
+pnpm exec fgd dead-code
+```
+
+Or run Fallow directly with custom args:
+
+```bash
+pnpm exec fgd fallow dead-code --json
+```
+
+When you run `fgd sync-tooling-configs` (or `fgd sync-project-configs`), fg-devkit also writes a shared `.fallowrc.json` to the consuming repo.
+
 To remove redundant tooling dependencies from a consuming repo:
 
 ```bash
@@ -136,3 +154,54 @@ export default {
   ...basePrettierConfig,
 }
 ```
+
+## Local development with pnpm link
+
+Use this flow to test local `fg-devkit` changes in a consuming repo.
+
+In this repo (`fg-devkit`):
+
+```bash
+pnpm install
+pnpm link --global
+```
+
+In the consuming repo:
+
+```bash
+pnpm link --global fg-devkit
+pnpm install
+pnpm exec fgd --help
+```
+
+To remove the global link in a consuming repo:
+
+```bash
+pnpm unlink fg-devkit
+pnpm install
+```
+
+## Install CLI in this repo
+
+1) Add this to your shell config (`~/.zshrc`) and update `FGD_DEVKIT_PATH`:
+
+```bash
+cat <<'EOF' >> ~/.zshrc
+# Smart fgd: use local project binary when available, otherwise fg-devkit script
+unalias fgd 2>/dev/null
+export FGD_DEVKIT_PATH="/Users/username/projects/fg-devkit"
+fgd() {
+  if [ -x "./node_modules/.bin/fgd" ]; then
+    pnpm exec fgd "$@"
+  else
+    node "$FGD_DEVKIT_PATH/scripts/fg-devkit.mjs" "$@"
+  fi
+}
+EOF
+```
+
+2) Reload shell config:
+
+```bash
+source ~/.zshrc
+```

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

@@ -6,10 +6,10 @@
       "@lexical/list": "0.30.0",
       "@lexical/rich-text": "0.30.0",
       "@piwikpro/vue-piwik-pro": "1.4.0",
-      "@sentry/browser": "7.67.0",
-      "@sentry/tracing": "7.37.2",
-      "@sentry/vue": "7.37.2",
-      "@sentry/wasm": "7.67.0",
+      "@sentry/browser": "10.50.0",
+      "@sentry/tracing": "7.120.4",
+      "@sentry/vue": "10.50.0",
+      "@sentry/wasm": "10.50.0",
       "@tailwindcss/postcss": "4.2.4",
       "@tanstack/vue-query": "5.99.2",
       "@types/leaflet": "1.5.7",

package/configs/fallowrc.sync-stub.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://raw.githubusercontent.com/fallow-rs/fallow/main/schema.json",
+  "ignorePatterns": [
+    "**/*.d.ts",
+    "**/*.generated.*",
+    "dist/**",
+    "build/**",
+    "coverage/**",
+    "src/style.css",
+    "index.html"
+  ],
+  "publicPackages": ["fds-vue-core"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.7.1",
+  "version": "1.7.4",
   "description": "Shared configs, scripts, and DX tooling for Vue / TypeScript frontend repos",
   "type": "module",
   "license": "UNLICENSED",
@@ -72,6 +72,8 @@
     }
   },
   "dependencies": {
+    "@inquirer/confirm": "^6.0.12",
+    "@inquirer/select": "^5.1.4",
     "@intlify/eslint-plugin-vue-i18n": "4.3.0",
     "@typescript-eslint/eslint-plugin": "8.58.2",
     "@typescript-eslint/parser": "8.58.2",
@@ -83,6 +85,7 @@
     "eslint": "10.2.1",
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-vue": "10.8.0",
+    "fallow": "^2.52.2",
     "lefthook": "2.1.6",
     "npm-check-updates": "21.0.3",
     "prettier": "3.8.3",

package/scaffold/vue/package.json

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

package/scripts/fg-devkit.mjs

@@ -28,6 +28,8 @@
  *   pnpm exec fg-devkit format-check [prettier-args...] (same as format plus --check)
  *   pnpm exec fg-devkit typecheck [vue-tsc-args...]   (run vue-tsc with fg-devkit bundled package)
  *   pnpm exec fg-devkit typecheck-watch [vue-tsc-args...] (same as typecheck plus --watch)
+ *   pnpm exec fg-devkit fallow [fallow-args...]   (run Fallow with fg-devkit bundled package)
+ *   pnpm exec fg-devkit dead-code [fallow-args...] (same as: fallow dead-code [args...])
  *   pnpm exec fg-devkit poeditor-download [args...] (download translations using poeditor/.poeditor.json + env token)
  *   pnpm exec fg-devkit poeditor-upload [args...]   (upload translations using poeditor/.poeditor.json + env token)
  * Interactive menu (no subcommand):
@@ -405,6 +407,37 @@ function runBundledTypeScript(args = []) {
   return r.status ?? 1
 }
 
+/** Run Fallow from fg-devkit's bundled dependency set. */
+function runBundledFallow(args = []) {
+  let fallowBin
+  try {
+    const fallowPkgJson = require.resolve('fallow/package.json', {
+      paths: [fgRoot, process.cwd()],
+    })
+    const fallowPkgRoot = path.dirname(fallowPkgJson)
+    fallowBin = path.join(fallowPkgRoot, 'bin', 'fallow')
+    if (!fs.existsSync(fallowBin)) {
+      throw new Error('fallow bin not found')
+    }
+  } catch {
+    console.error('[fg-devkit] Could not resolve bundled fallow.')
+    console.error('[fg-devkit] Run pnpm install in fg-devkit and in the linked consumer, then retry.')
+    return 1
+  }
+
+  const r = spawnSync(process.execPath, [fallowBin, ...args], {
+    stdio: 'inherit',
+    cwd: process.cwd(),
+    env: process.env,
+  })
+  if (r.error) {
+    console.error('[fg-devkit] Could not run bundled fallow.')
+    console.error('[fg-devkit]', r.error.message)
+    return 1
+  }
+  return r.status ?? 1
+}
+
 /** Map subcommand name → script file (extra argv after subcommand is forwarded). */
 const DIRECT_COMMANDS = {
   'check-deps': 'check-dependency-policy.mjs',
@@ -440,7 +473,7 @@ Commands:
   fleet-vulns [projects-root] [--summary-only] [--delay-ms=<ms>]
                                  Run pnpm audit across Vue repos (full output + combined summary)
   fleet-bump-fg-devkit [projects-root] [--dry-run]
-                                 Bump fg-devkit to latest across Vue repos, then run pnpm install
+                                 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)
   sync-project-configs            VS Code + tooling sync (overwrites config files)
@@ -461,6 +494,8 @@ Commands:
   format-check [prettier-args...] Run Prettier with --check using fg-devkit bundled package
   typecheck [vue-tsc-args...]       Run vue-tsc using fg-devkit bundled package
   typecheck-watch [vue-tsc-args...] Run vue-tsc with --watch using fg-devkit bundled package
+  fallow [fallow-args...]           Run Fallow using fg-devkit bundled package
+  dead-code [fallow-args...]        Run Fallow dead code analysis (shortcut for: fallow dead-code)
   poeditor-download [args...]       Download locale files via PoEditor (reads poeditor/.poeditor.json by default)
   poeditor-upload [args...]         Upload locale file via PoEditor (reads poeditor/.poeditor.json by default)
   scaffold-vue <target-dir> [--name …] [--slug …] [--force] …
@@ -488,7 +523,7 @@ const MENU = [
   },
   {
     key: '3',
-    label: 'Sync configs (vscode, eslint, prettier, tsconfig)',
+    label: 'Sync configs (vscode, eslint, prettier, tsconfig, fallow)',
     run: () => runNode('sync-project-configs.mjs'),
   },
   {
@@ -536,6 +571,11 @@ const MENU = [
     label: 'Sync .cursor core coding standards',
     run: () => runNode('sync-core-coding-standards.mjs'),
   },
+  {
+    key: '13',
+    label: 'Fallow analysis',
+    run: () => 0,
+  },
 ]
 
 const MAINTAINER_MENU = [
@@ -576,7 +616,7 @@ const MAINTAINER_MENU = [
   },
   {
     key: 'm8',
-    label: 'Maintainer: Bump fg-devkit in all Vue repos and run pnpm install',
+    label: 'Maintainer: Bump fg-devkit in all Vue repos, run sync-deps, and pnpm install',
     run: () => runNode('fleet-bump-fg-devkit.mjs'),
   },
 ]
@@ -633,6 +673,38 @@ async function runInteractiveMenu() {
     // Close menu readline before spawning interactive child processes.
     rl.close()
     out = runReleaseScript([bumpType])
+  } else if (item.key === '13') {
+    let subChoice = 'cancel'
+    let selectPrompt = null
+    try {
+      const inquirerSelect = await import('@inquirer/select')
+      selectPrompt = inquirerSelect.default
+    } catch {
+      // Optional dependency; fail with a clear message if not available.
+    }
+
+    if (selectPrompt) {
+      // Close menu readline before running interactive child prompt.
+      rl.close()
+      subChoice = await selectPrompt({
+        message: 'Fallow — choose analysis',
+        choices: [
+          { name: 'dead code', value: 'dead-code' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+        default: 'dead-code',
+      })
+    } else {
+      rl.close()
+      console.error('[fg-devkit] Option 13 requires @inquirer/select but it is not available.')
+      console.error('[fg-devkit] Run pnpm install in your project and try again.')
+      return 1
+    }
+
+    if (subChoice === 'cancel') {
+      return 0
+    }
+    out = runBundledFallow([subChoice])
   } else {
     // Close menu readline before spawning interactive child processes.
     rl.close()
@@ -705,6 +777,14 @@ async function main() {
       process.exitCode = runBundledTypeScript(rest.length > 0 ? ['--watch', ...rest] : ['--noEmit', '--watch', '-p', 'tsconfig.json'])
       return
     }
+    if (sub === 'fallow') {
+      process.exitCode = runBundledFallow(rest)
+      return
+    }
+    if (sub === 'dead-code') {
+      process.exitCode = runBundledFallow(['dead-code', ...rest])
+      return
+    }
     const script = DIRECT_COMMANDS[sub]
     if (!script) {
       console.error(`[fg-devkit] Unknown command: ${sub}`)

package/scripts/fleet-bump-fg-devkit.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Bumps fg-devkit to latest in Vue repositories and runs pnpm install.
+ * Bumps fg-devkit to latest in Vue repositories, syncs dependency policy, and runs pnpm install.
  *
  * Usage:
  *   pnpm exec fg-devkit fleet-bump-fg-devkit [projects-root] [--dry-run]
@@ -82,10 +82,12 @@ let updated = 0
 for (const repoDir of uniqueRepos) {
   const repoName = path.basename(repoDir)
   const bumpArgs = ['up', 'fg-devkit@latest']
+  const syncDepsArgs = ['exec', 'fg-devkit', 'sync-deps']
   const installArgs = ['install']
 
   if (dryRun) {
     console.log(`[fleet-bump-fg-devkit] DRY RUN ${repoName}: pnpm ${bumpArgs.join(' ')}`)
+    console.log(`[fleet-bump-fg-devkit] DRY RUN ${repoName}: pnpm ${syncDepsArgs.join(' ')}`)
     console.log(`[fleet-bump-fg-devkit] DRY RUN ${repoName}: pnpm ${installArgs.join(' ')}`)
     continue
   }
@@ -114,6 +116,29 @@ for (const repoDir of uniqueRepos) {
     continue
   }
 
+  const syncDeps = spawnSync('pnpm', syncDepsArgs, {
+    cwd: repoDir,
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      npm_config_save_prefix: '',
+      npm_config_save_exact: 'true',
+    },
+  })
+
+  if (syncDeps.error) {
+    failures += 1
+    console.error(`[fleet-bump-fg-devkit] FAIL ${repoName}: ${syncDeps.error.message}`)
+    continue
+  }
+
+  const syncDepsStatus = syncDeps.status ?? 1
+  if (syncDepsStatus !== 0) {
+    failures += 1
+    console.error(`[fleet-bump-fg-devkit] FAIL ${repoName}: sync-deps exited with code ${syncDepsStatus}`)
+    continue
+  }
+
   const install = spawnSync('pnpm', installArgs, {
     cwd: repoDir,
     stdio: 'inherit',

package/scripts/poeditor-upload.mjs

@@ -12,6 +12,29 @@ import path from 'node:path'
 
 import { getFlagValue, getPoeditorToken, loadPoeditorConfig, parseFlags, resolvePathFromCwd } from './poeditor-common.mjs'
 
+const MIN_UPLOAD_INTERVAL_MS = 20_000
+const MAX_UPLOAD_RETRIES = 3
+const RETRYABLE_UPLOAD_ERROR_CODES = new Set(['4048'])
+
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms)
+  })
+}
+
+function parsePoeditorError(err) {
+  const message = err instanceof Error ? err.message : String(err)
+  const match = message.match(/Upload failed:\s*(\{.*\})$/)
+  if (!match) return null
+  try {
+    const payload = JSON.parse(match[1])
+    const code = payload?.response?.code
+    return typeof code === 'string' ? code : null
+  } catch {
+    return null
+  }
+}
+
 function getUploadType(filePath) {
   const extension = path.extname(filePath).toLowerCase().replace('.', '')
   if (!extension) {
@@ -53,6 +76,30 @@ async function uploadFile({ token, projectId, language, filePath }) {
   )
 }
 
+async function uploadFileWithRetry({ token, projectId, language, filePath }) {
+  let attempt = 0
+  while (true) {
+    attempt += 1
+    try {
+      await uploadFile({ token, projectId, language, filePath })
+      return
+    } catch (err) {
+      const errorCode = parsePoeditorError(err)
+      const isRetryable = errorCode && RETRYABLE_UPLOAD_ERROR_CODES.has(errorCode)
+      const retriesLeft = MAX_UPLOAD_RETRIES - attempt
+      if (!isRetryable || retriesLeft < 0) {
+        throw err
+      }
+
+      const waitMs = MIN_UPLOAD_INTERVAL_MS
+      console.warn(
+        `[poeditor-upload] Received retryable POEditor error code ${errorCode}. Retrying in ${Math.ceil(waitMs / 1000)}s (${retriesLeft} retries left).`,
+      )
+      await sleep(waitMs)
+    }
+  }
+}
+
 async function main() {
   const { flags } = parseFlags(process.argv.slice(2))
   const cfg = loadPoeditorConfig(flags)
@@ -76,17 +123,26 @@ async function main() {
 
   const uploads = cfg.uploadFiles && typeof cfg.uploadFiles === 'object' ? Object.entries(cfg.uploadFiles) : []
   if (uploads.length > 0) {
+    let nextUploadAt = 0
     for (const [language, file] of uploads) {
+      const now = Date.now()
+      const waitBeforeUploadMs = Math.max(0, nextUploadAt - now)
+      if (waitBeforeUploadMs > 0) {
+        console.log(`[poeditor-upload] Waiting ${Math.ceil(waitBeforeUploadMs / 1000)}s before next upload...`)
+        await sleep(waitBeforeUploadMs)
+      }
+
       const filePath = resolvePathFromCwd(file)
-      await uploadFile({ token, projectId, language, filePath })
+      await uploadFileWithRetry({ token, projectId, language, filePath })
       console.log(`[poeditor-upload] Upload completed for ${language}: ${filePath}`)
+      nextUploadAt = Date.now() + MIN_UPLOAD_INTERVAL_MS
     }
     return
   }
 
   const language = cfg.defaultLanguage
   const filePath = resolvePathFromCwd(cfg.uploadFile)
-  await uploadFile({ token, projectId, language, filePath })
+  await uploadFileWithRetry({ token, projectId, language, filePath })
   console.log(`[poeditor-upload] Upload completed for ${language}: ${filePath}`)
 }
 

package/scripts/refresh-dependency-policy-from-repos.mjs

@@ -210,8 +210,6 @@ if (policyErrors.length > 0) {
 }
 
 fs.writeFileSync(policyPath, `${JSON.stringify(policy, null, 2)}\n`)
-
-const fgDevkitRoot = path.resolve(scriptDir, '..')
 syncScaffoldVueDepsFromPolicy({ fgDevkitRoot, policyPath })
 
 console.log(`[refresh-policy] projectsRoot=${projectsRoot}`)

package/scripts/sync-tooling-configs.mjs

@@ -4,6 +4,7 @@
  * - prettier.config.js — overwritten from fg-devkit prettier sync template
  * - eslint.config.js — overwritten from fg-devkit eslint sync template
  * - tsconfig.json — overwritten from fg-devkit tsconfig app sync template
+ * - .fallowrc.json — overwritten from fg-devkit fallow sync template
  *
  * This command is intentionally deterministic: each run rewrites files to the shared templates.
  *
@@ -46,10 +47,11 @@ if (!fgRoot) {
 const prettierSrc = path.join(fgRoot, 'configs', 'prettier.sync-stub.js')
 const eslintStubSrc = path.join(fgRoot, 'configs', 'eslint.sync-stub.js')
 const tsconfigSrc = path.join(fgRoot, 'configs', 'tsconfig.app.sync.json')
+const fallowConfigSrc = path.join(fgRoot, 'configs', 'fallowrc.sync-stub.json')
 
-if (!fs.existsSync(prettierSrc) || !fs.existsSync(eslintStubSrc) || !fs.existsSync(tsconfigSrc)) {
+if (!fs.existsSync(prettierSrc) || !fs.existsSync(eslintStubSrc) || !fs.existsSync(tsconfigSrc) || !fs.existsSync(fallowConfigSrc)) {
   console.error(
-    '[sync-tooling] Missing prettier.sync-stub.js, eslint.sync-stub.js, or tsconfig.app.sync.json inside fg-devkit package.',
+    '[sync-tooling] Missing prettier.sync-stub.js, eslint.sync-stub.js, tsconfig.app.sync.json, or fallowrc.sync-stub.json inside fg-devkit package.',
   )
   process.exit(1)
 }
@@ -58,7 +60,8 @@ try {
   fs.copyFileSync(prettierSrc, path.join(projectRoot, 'prettier.config.js'))
   fs.copyFileSync(eslintStubSrc, path.join(projectRoot, 'eslint.config.js'))
   fs.copyFileSync(tsconfigSrc, path.join(projectRoot, 'tsconfig.json'))
-  console.log('[sync-tooling] Updated prettier.config.js, eslint.config.js, and tsconfig.json.')
+  fs.copyFileSync(fallowConfigSrc, path.join(projectRoot, '.fallowrc.json'))
+  console.log('[sync-tooling] Updated prettier.config.js, eslint.config.js, tsconfig.json, and .fallowrc.json.')
 } catch (err) {
   console.error(`[sync-tooling] ${err.message}`)
   process.exit(1)