fg-devkit 1.6.7 → 1.6.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.6.7",
+  "version": "1.6.9",
   "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.6.7",
+    "fg-devkit": "1.6.9",
     "start-server-and-test": "2.1.3",
     "tailwindcss": "4.2.4",
     "tsx": "4.21.0",

package/scripts/poeditor-common.mjs

@@ -10,6 +10,34 @@ function readJsonIfExists(filePath) {
   }
 }
 
+function readEnvValueFromFile(filePath, key) {
+  if (!fs.existsSync(filePath)) return ''
+  try {
+    const raw = fs.readFileSync(filePath, 'utf8')
+    const lines = raw.split(/\r?\n/)
+    for (const line of lines) {
+      const trimmed = line.trim()
+      if (!trimmed || trimmed.startsWith('#')) continue
+      const noExport = trimmed.startsWith('export ') ? trimmed.slice(7).trim() : trimmed
+      const eqIdx = noExport.indexOf('=')
+      if (eqIdx <= 0) continue
+      const k = noExport.slice(0, eqIdx).trim()
+      if (k !== key) continue
+      let value = noExport.slice(eqIdx + 1).trim()
+      if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+        value = value.slice(1, -1)
+      } else {
+        const hashIdx = value.indexOf(' #')
+        if (hashIdx >= 0) value = value.slice(0, hashIdx).trim()
+      }
+      return value
+    }
+  } catch {
+    return ''
+  }
+  return ''
+}
+
 function resolveFromCwd(p) {
   return path.isAbsolute(p) ? p : path.resolve(process.cwd(), p)
 }
@@ -112,6 +140,12 @@ export function getPoeditorToken(flags) {
   const fromFlag = getFlagValue(flags, 'api-token')
   if (fromFlag) return fromFlag
   if (process.env.POEDITOR_API_KEY) return process.env.POEDITOR_API_KEY
+  const plainEnvLocal = readEnvValueFromFile(resolveFromCwd('./env.local'), 'POEDITOR_API_KEY')
+  if (plainEnvLocal) return plainEnvLocal
+  const envLocal = readEnvValueFromFile(resolveFromCwd('./.env.local'), 'POEDITOR_API_KEY')
+  if (envLocal) return envLocal
+  const envFile = readEnvValueFromFile(resolveFromCwd('./.env'), 'POEDITOR_API_KEY')
+  if (envFile) return envFile
   const publicConfigPath = resolveFromCwd('./public/config.json')
   const publicConfig = readJsonIfExists(publicConfigPath)
   if (typeof publicConfig?.POEDITOR_API_KEY === 'string') {

package/scripts/poeditor-upload.mjs

@@ -8,21 +8,37 @@
  */
 
 import fs from 'node:fs'
+import path from 'node:path'
 
 import { getFlagValue, getPoeditorToken, loadPoeditorConfig, parseFlags, resolvePathFromCwd } from './poeditor-common.mjs'
 
-async function uploadFile({ token, projectId, language, updating }) {
-  const params = new URLSearchParams({
-    api_token: token,
-    id: String(projectId),
-    language,
-    updating,
-  })
+function getUploadType(filePath) {
+  const extension = path.extname(filePath).toLowerCase().replace('.', '')
+  if (!extension) {
+    throw new Error(`Cannot determine file type from "${filePath}"`)
+  }
+  if (extension === 'json') {
+    return 'key_value_json'
+  }
+  return extension
+}
+
+async function uploadFile({ token, projectId, language, filePath }) {
+  const fileBuffer = fs.readFileSync(filePath)
+  const fileName = path.basename(filePath)
+  const uploadType = getUploadType(filePath)
+  const form = new FormData()
+  form.append('api_token', token)
+  form.append('id', String(projectId))
+  form.append('updating', 'terms_translations')
+  form.append('language', language)
+  form.append('overwrite', '1')
+  form.append('type', uploadType)
+  form.append('file', new Blob([fileBuffer]), fileName)
 
   const res = await fetch('https://api.poeditor.com/v2/projects/upload', {
     method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body: params,
+    body: form,
   })
   if (!res.ok) {
     throw new Error(`PoEditor upload failed (${res.status})`)
@@ -31,6 +47,10 @@ async function uploadFile({ token, projectId, language, updating }) {
   if (data?.response?.status !== 'success') {
     throw new Error(`Upload failed: ${JSON.stringify(data)}`)
   }
+  const translations = data?.result?.translations
+  console.log(
+    `[poeditor-upload] Upload complete for "${language}" (parsed: ${translations?.parsed ?? 0}, updated: ${translations?.updated ?? 0}, added: ${translations?.added ?? 0})`,
+  )
 }
 
 async function main() {
@@ -49,8 +69,7 @@ async function main() {
   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 })
+    await uploadFile({ token, projectId, language, filePath })
     console.log(`[poeditor-upload] Upload completed for ${language}: ${filePath}`)
     return
   }
@@ -59,8 +78,7 @@ async function main() {
   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 })
+      await uploadFile({ token, projectId, language, filePath })
       console.log(`[poeditor-upload] Upload completed for ${language}: ${filePath}`)
     }
     return
@@ -68,8 +86,7 @@ async function main() {
 
   const language = cfg.defaultLanguage
   const filePath = resolvePathFromCwd(cfg.uploadFile)
-  const updating = fs.readFileSync(filePath, 'utf8')
-  await uploadFile({ token, projectId, language, updating })
+  await uploadFile({ token, projectId, language, filePath })
   console.log(`[poeditor-upload] Upload completed for ${language}: ${filePath}`)
 }