fg-devkit 1.7.1 → 1.7.3

package/README.md

@@ -136,3 +136,27 @@ export default {
   ...basePrettierConfig,
 }
 ```
+## 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/package.json

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

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.3",
     "start-server-and-test": "2.1.3",
     "tailwindcss": "4.2.4",
     "tsx": "4.21.0",

package/scripts/fg-devkit.mjs

@@ -440,7 +440,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)
@@ -576,7 +576,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'),
   },
 ]

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}`)