fg-devkit 1.14.2 → 1.14.3

package/configs/cliff.toml

@@ -5,7 +5,7 @@
 [changelog]
 body = """
 {% if version %}\
-    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d %H:%M") }}
+    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
 {% else %}\
     ## [unreleased]
 {% endif %}\

package/configs/cliff.user.toml

@@ -5,7 +5,7 @@
 [changelog]
 body = """
 {% if version %}\
-## Version {{ version | trim_start_matches(pat="v") }} - {{ timestamp | date(format="%Y-%m-%d %H:%M") }}
+## Version {{ version | trim_start_matches(pat="v") }} - {{ timestamp | date(format="%Y-%m-%d") }}
 {% else %}\
 ## [unreleased]
 {% endif %}\

package/package.json

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

package/release-notes/format.ts

@@ -1,22 +1,18 @@
 import type { ChangelogRelease } from './types'
 
+export const toChangelogDateOnly = (date: string): string => {
+  const dateMatch = date.match(/^(\d{4}-\d{2}-\d{2})(?: \d{2}:\d{2})?$/)
+  return dateMatch?.[1] ?? date
+}
+
 export const formatChangelogDate = (date: string): string => {
-  const dateTimeMatch = date.match(/^(\d{4}-\d{2}-\d{2})(?: (\d{2}:\d{2}))?$/)
-  if (!dateTimeMatch?.[1]) {
+  const datePart = toChangelogDateOnly(date)
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(datePart)) {
     return date
   }
 
-  const datePart = dateTimeMatch[1]
-  const timePart = dateTimeMatch[2]
-  const parsed = timePart ? new Date(`${datePart}T${timePart}:00`) : new Date(`${datePart}T12:00:00`)
-  const formattedDate = parsed.toLocaleDateString('sv-SE', { dateStyle: 'long' })
-
-  if (!timePart) {
-    return formattedDate
-  }
-
-  const formattedTime = parsed.toLocaleTimeString('sv-SE', { hour: '2-digit', minute: '2-digit' })
-  return `${formattedDate} ${formattedTime}`
+  const parsed = new Date(`${datePart}T12:00:00`)
+  return parsed.toLocaleDateString('sv-SE', { dateStyle: 'long' })
 }
 
 const CONVENTIONAL_COMMIT_RE = /^(feat|fix|perf|refactor|chore|dep|vuln)(\([^)]+\))?:\s/

package/release-notes/serializeUserChangelog.ts

@@ -1,8 +1,11 @@
-import { sortUserReleaseSections } from './format'
+import { sortUserReleaseSections, toChangelogDateOnly } from './format'
 import type { ChangelogRelease } from './types'
 
 export const serializeUserChangelogRelease = (release: ChangelogRelease): string => {
-  const lines: string[] = [`## Version ${release.version} - ${release.date}`, '']
+  const lines: string[] = [
+    `## Version ${release.version} - ${toChangelogDateOnly(release.date)}`,
+    '',
+  ]
 
   for (const section of sortUserReleaseSections(release.sections)) {
     if (section.items.length === 0) {

package/release-notes/sync-user-changelog.ts

@@ -3,7 +3,6 @@ import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { parseUserChangelog } from './parseChangelog.ts'
 import { serializeUserChangelogRelease } from './serializeUserChangelog.ts'
-import type { ChangelogRelease } from './types.ts'
 
 const rootDir = process.env.FG_DEVKIT_CWD
   ? path.resolve(process.env.FG_DEVKIT_CWD)
@@ -14,36 +13,6 @@ const contentPath = path.join(rootDir, 'CHANGELOG.user.md')
 const readMarkdown = (filePath: string): string =>
   existsSync(filePath) ? readFileSync(filePath, 'utf-8') : ''
 
-const updateVersionTimestamps = (
-  content: string,
-  draftReleases: ChangelogRelease[],
-): { content: string; versions: string[] } => {
-  const versions: string[] = []
-  let result = content
-
-  for (const release of draftReleases) {
-    const dateTimeMatch = release.date.match(/^(\d{4}-\d{2}-\d{2}) (\d{2}:\d{2})$/)
-    if (!dateTimeMatch) {
-      continue
-    }
-
-    const [, datePart, timePart] = dateTimeMatch
-    const headingWithoutTime = `## Version ${release.version} - ${datePart}`
-    const headingWithTime = `## Version ${release.version} - ${datePart} ${timePart}`
-
-    if (result.includes(headingWithTime)) {
-      continue
-    }
-
-    if (result.includes(headingWithoutTime)) {
-      result = result.replaceAll(headingWithoutTime, headingWithTime)
-      versions.push(release.version)
-    }
-  }
-
-  return { content: result, versions }
-}
-
 const draft = parseUserChangelog(readMarkdown(draftPath))
 const existingContent = readMarkdown(contentPath).trimEnd()
 const existing = existingContent.length > 0 ? parseUserChangelog(existingContent) : []
@@ -51,34 +20,17 @@ const existing = existingContent.length > 0 ? parseUserChangelog(existingContent
 const existingVersions = new Set(existing.map((release) => release.version))
 const newReleases = draft.filter((release) => !existingVersions.has(release.version))
 
-let mergedContent = existingContent
-
-if (newReleases.length > 0) {
-  const newBlocks = newReleases.map((release) => serializeUserChangelogRelease(release)).join('\n\n')
-  mergedContent =
-    existingContent.length > 0 ? `${newBlocks}\n\n${existingContent}` : newBlocks
-}
-
-const { content: contentWithTimestamps, versions: updatedTimestamps } = updateVersionTimestamps(
-  mergedContent,
-  draft,
-)
-
-if (newReleases.length === 0 && updatedTimestamps.length === 0) {
+if (newReleases.length === 0) {
   process.stdout.write('No user changelog changes to sync.\n')
   process.exit(0)
 }
 
-writeFileSync(contentPath, `${contentWithTimestamps.trimEnd()}\n`)
+const newBlocks = newReleases.map((release) => serializeUserChangelogRelease(release)).join('\n\n')
+const mergedContent =
+  existingContent.length > 0 ? `${newBlocks}\n\n${existingContent}` : newBlocks
 
-if (newReleases.length > 0) {
-  process.stdout.write(
-    `Added user changelog version(s): ${newReleases.map((release) => release.version).join(', ')}\n`,
-  )
-}
+writeFileSync(contentPath, `${mergedContent.trimEnd()}\n`)
 
-if (updatedTimestamps.length > 0) {
-  process.stdout.write(
-    `Updated timestamps in CHANGELOG.user.md for version(s): ${updatedTimestamps.join(', ')}\n`,
-  )
-}
+process.stdout.write(
+  `Added user changelog version(s): ${newReleases.map((release) => release.version).join(', ')}\n`,
+)

package/scaffold/vue/package.json

@@ -33,7 +33,7 @@
     "@tanstack/vue-query-devtools": "6.1.38",
     "@types/node": "22.16.5",
     "@vitejs/plugin-vue": "6.0.8",
-    "fg-devkit": "1.14.2",
+    "fg-devkit": "1.14.3",
     "tailwindcss": "4.3.3",
     "tsx": "4.23.12",
     "vite": "7.3.5"