fg-devkit 1.6.3 → 1.6.6

package/package.json

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

package/scaffold/vue/package.json

@@ -12,7 +12,7 @@
     "lint-check": "pnpm exec fgd lint .",
     "lint:all": "pnpm lint && pnpm lint:ts",
     "poeditor:download": "pnpm exec fg-devkit poeditor-download --format json",
-    "poeditor:upload": "pnpm exec fg-devkit poeditor-upload --language sv --file ./src/lang/sv.json"
+    "poeditor:upload": "pnpm exec fg-devkit poeditor-upload"
   },
   "dependencies": {
     "@tailwindcss/postcss": "4.2.4",
@@ -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.6.2",
+    "fg-devkit": "1.6.6",
     "start-server-and-test": "2.1.3",
     "tailwindcss": "4.2.4",
     "tsx": "4.21.0",

package/scaffold/vue/poeditor/.poeditor.json

@@ -4,5 +4,8 @@
   "languages": ["sv", "en"],
   "defaultLanguage": "sv",
   "defaultFormat": "json",
-  "uploadFile": "./src/lang/sv.json"
+  "uploadFiles": {
+    "sv": "./src/lang/sv.json",
+    "en": "./src/lang/en.json"
+  }
 }

package/scripts/fg-devkit.mjs

@@ -518,6 +518,16 @@ const MENU = [
     label: 'Setup lefthook (migrate from husky/lint-staged)',
     run: () => runSetupLefthook(),
   },
+  {
+    key: '10',
+    label: 'PoEditor: Download translations',
+    run: () => runNode('poeditor-download.mjs'),
+  },
+  {
+    key: '11',
+    label: 'PoEditor: Upload translations',
+    run: () => runNode('poeditor-upload.mjs'),
+  },
 ]
 
 const MAINTAINER_MENU = [

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

@@ -17,6 +17,14 @@ const dryRun = cliArgs.includes('--dry-run')
 const projectsRootArg = cliArgs.find((a) => !a.startsWith('-'))
 const projectsRoot = projectsRootArg ? path.resolve(process.cwd(), projectsRootArg) : path.resolve(scriptDir, '../..')
 
+function shouldSkipPackageJsonDir(relDir) {
+  const normalized = relDir.split(path.sep).join('/')
+  if (normalized === 'scaffold/vue' || normalized.endsWith('/scaffold/vue')) {
+    return true
+  }
+  return false
+}
+
 function walk(dir, acc = []) {
   for (const item of fs.readdirSync(dir, { withFileTypes: true })) {
     if (item.name === 'node_modules' || item.name === '.git') continue
@@ -47,6 +55,8 @@ const packageJsonFiles = walk(projectsRoot)
 const repos = []
 for (const packageJsonPath of packageJsonFiles) {
   try {
+    const relDir = path.relative(projectsRoot, path.dirname(packageJsonPath))
+    if (shouldSkipPackageJsonDir(relDir)) continue
     const pkg = readJson(packageJsonPath)
     if (!isVueProject(pkg)) continue
     if (isFgDevkitRepo(pkg)) continue

package/scripts/poeditor-common.mjs

@@ -33,6 +33,15 @@ function resolveLegacyConfig(raw) {
 function resolveObjectConfig(raw) {
   if (!raw || typeof raw !== 'object') return null
   if (typeof raw.projectId !== 'string') return null
+  const uploadFiles =
+    raw.uploadFiles && typeof raw.uploadFiles === 'object'
+      ? Object.entries(raw.uploadFiles).reduce((acc, [language, file]) => {
+          if (typeof language === 'string' && language.trim() !== '' && typeof file === 'string' && file.trim() !== '') {
+            acc[language] = file
+          }
+          return acc
+        }, {})
+      : undefined
   return {
     projectId: raw.projectId,
     downloadPath: typeof raw.downloadPath === 'string' ? raw.downloadPath : './src/lang/',
@@ -40,6 +49,7 @@ function resolveObjectConfig(raw) {
     defaultLanguage: typeof raw.defaultLanguage === 'string' ? raw.defaultLanguage : 'sv',
     defaultFormat: typeof raw.defaultFormat === 'string' ? raw.defaultFormat : 'json',
     uploadFile: typeof raw.uploadFile === 'string' ? raw.uploadFile : './src/lang/sv.json',
+    uploadFiles,
   }
 }
 
@@ -94,6 +104,7 @@ export function loadPoeditorConfig(flags) {
     defaultLanguage: resolved.defaultLanguage ?? 'sv',
     defaultFormat: resolved.defaultFormat ?? 'json',
     uploadFile: resolved.uploadFile ?? './src/lang/sv.json',
+    uploadFiles: resolved.uploadFiles ?? undefined,
   }
 }
 

package/scripts/poeditor-upload.mjs

@@ -44,12 +44,33 @@ async function main() {
   }
 
   const projectId = getFlagValue(flags, 'project-id', cfg.projectId)
-  const language = getFlagValue(flags, 'language', cfg.defaultLanguage)
-  const filePath = resolvePathFromCwd(getFlagValue(flags, 'file', cfg.uploadFile))
-  const updating = fs.readFileSync(filePath, 'utf8')
+  const hasExplicitLanguage = flags.has('language')
+  const hasExplicitFile = flags.has('file')
+  if (hasExplicitLanguage || hasExplicitFile) {
+    const language = getFlagValue(flags, 'language', cfg.defaultLanguage)
+    const filePath = resolvePathFromCwd(getFlagValue(flags, 'file', cfg.uploadFile))
+    const updating = fs.readFileSync(filePath, 'utf8')
+    await uploadFile({ token, projectId, language, updating })
+    console.log(`[poeditor-upload] Upload completed for ${language}: ${filePath}`)
+    return
+  }
 
+  const uploads = cfg.uploadFiles && typeof cfg.uploadFiles === 'object' ? Object.entries(cfg.uploadFiles) : []
+  if (uploads.length > 0) {
+    for (const [language, file] of uploads) {
+      const filePath = resolvePathFromCwd(file)
+      const updating = fs.readFileSync(filePath, 'utf8')
+      await uploadFile({ token, projectId, language, updating })
+      console.log(`[poeditor-upload] Upload completed for ${language}: ${filePath}`)
+    }
+    return
+  }
+
+  const language = cfg.defaultLanguage
+  const filePath = resolvePathFromCwd(cfg.uploadFile)
+  const updating = fs.readFileSync(filePath, 'utf8')
   await uploadFile({ token, projectId, language, updating })
-  console.log(`[poeditor-upload] Upload completed for ${filePath}`)
+  console.log(`[poeditor-upload] Upload completed for ${language}: ${filePath}`)
 }
 
 main().catch((err) => {

package/scripts/release.sh

@@ -50,11 +50,25 @@ fi
 
 previous_tag="$(git describe --tags --abbrev=0 2>/dev/null || true)"
 
-pnpm version "$bump_type"
+pnpm version "$bump_type" --no-git-tag-version
 
 new_version="$(node -p "require('./package.json').version")"
 new_tag="v${new_version}"
 
+is_fg_devkit_repo="$(
+  node -e "const fs=require('fs'); try { const p=JSON.parse(fs.readFileSync('./package.json','utf8')); process.stdout.write(p.name==='fg-devkit' ? 'yes' : 'no'); } catch { process.stdout.write('no'); }"
+)"
+
+if [[ "$is_fg_devkit_repo" == "yes" && -f "./scripts/sync-scaffold-vue-deps.mjs" && -f "./scaffold/vue/package.json" ]]; then
+  node ./scripts/sync-scaffold-vue-deps.mjs
+  git add package.json scaffold/vue/package.json
+else
+  git add package.json
+fi
+
+git commit -m "${new_tag}"
+git tag "${new_tag}"
+
 git push
 git push --tags