fg-devkit 1.12.1 → 1.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "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.34",
     "@types/node": "22.16.5",
     "@vitejs/plugin-vue": "6.0.7",
-    "fg-devkit": "1.12.1",
+    "fg-devkit": "1.12.2",
     "start-server-and-test": "2.1.3",
     "tailwindcss": "4.3.1",
     "tsx": "4.22.4",

package/scripts/fg-devkit.mjs

@@ -673,11 +673,11 @@ async function runInteractiveMenu() {
       const releaseMode = await selectPrompt({
         message: 'Create release',
         choices: [
-          { name: 'Release + release notes', value: 'with-notes' },
           { name: 'Release', value: 'without-notes' },
+          { name: 'Release + release notes', value: 'with-notes' },
           { name: 'Cancel', value: 'cancel' },
         ],
-        default: 'with-notes',
+        default: 'without-notes',
         loop: false,
       })
       if (releaseMode === 'cancel') continue

package/scripts/generate-release-notes.mjs

@@ -10,7 +10,6 @@
 import { spawnSync } from 'node:child_process'
 import path from 'node:path'
 import {
-  hasReleaseNotesConfig,
   resolveCliffConfig,
   resolveGitCliffBin,
   runSyncUserChangelog,
@@ -45,13 +44,6 @@ function runGitCliff(configPath, outputPath) {
 }
 
 function main() {
-  if (!hasReleaseNotesConfig(cwd)) {
-    console.error(
-      '[fg-devkit] No release-notes config found. Run "pnpm exec fgd sync-release-notes-config" first.',
-    )
-    return 1
-  }
-
   const technicalConfig = resolveCliffConfig('cliff.toml', cwd)
   if (!technicalConfig) {
     console.error('[fg-devkit] Missing cliff.toml in repo and fg-devkit configs.')

package/scripts/release-notes-common.mjs

@@ -6,11 +6,9 @@
 import { spawnSync } from 'node:child_process'
 import fs from 'node:fs'
 import path from 'node:path'
-import { createRequire } from 'node:module'
 import { fileURLToPath } from 'node:url'
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const require = createRequire(import.meta.url)
 
 export const fgRoot = path.resolve(scriptDir, '..')
 
@@ -38,14 +36,19 @@ export function resolveCliffConfig(name, cwd = process.cwd()) {
   return null
 }
 
-export function resolveGitCliffBin() {
-  const candidates = [
-    path.join(fgRoot, 'node_modules', 'git-cliff', 'lib', 'cli', 'cli.js'),
-    path.join(process.cwd(), 'node_modules', 'git-cliff', 'lib', 'cli', 'cli.js'),
-    path.join(process.cwd(), 'node_modules', 'fg-devkit', 'node_modules', 'git-cliff', 'lib', 'cli', 'cli.js'),
-  ]
+function findInPnpmStore(baseDir, packageName, relativePath) {
+  const pnpmDir = path.join(baseDir, 'node_modules', '.pnpm')
+  if (!fs.existsSync(pnpmDir)) {
+    return null
+  }
+
+  const prefix = `${packageName}@`
+  for (const entry of fs.readdirSync(pnpmDir)) {
+    if (!entry.startsWith(prefix)) {
+      continue
+    }
 
-  for (const candidate of candidates) {
+    const candidate = path.join(pnpmDir, entry, 'node_modules', packageName, relativePath)
     if (fs.existsSync(candidate)) {
       return candidate
     }
@@ -54,25 +57,47 @@ export function resolveGitCliffBin() {
   return null
 }
 
-export function resolveTsxBin() {
-  const candidates = [
-    path.join(fgRoot, 'node_modules', 'tsx', 'dist', 'cli.mjs'),
-    path.join(fgRoot, 'node_modules', 'tsx', 'cli.mjs'),
-    path.join(process.cwd(), 'node_modules', 'tsx', 'dist', 'cli.mjs'),
-    path.join(process.cwd(), 'node_modules', 'fg-devkit', 'node_modules', 'tsx', 'dist', 'cli.mjs'),
-  ]
-
-  for (const candidate of candidates) {
-    if (fs.existsSync(candidate)) {
-      return candidate
+function resolvePackageFile(packageName, relativePaths, searchRoots) {
+  const roots = [...new Set(searchRoots.map((root) => path.resolve(root)))]
+
+  for (const root of roots) {
+    for (const relativePath of relativePaths) {
+      const nested = path.join(root, 'node_modules', packageName, relativePath)
+      if (fs.existsSync(nested)) {
+        return nested
+      }
     }
-  }
 
-  try {
-    return require.resolve('tsx/cli.mjs', { paths: [fgRoot, process.cwd()] })
-  } catch {
-    return null
+    let dir = root
+    for (let depth = 0; depth < 8; depth += 1) {
+      for (const relativePath of relativePaths) {
+        const fromStore = findInPnpmStore(dir, packageName, relativePath)
+        if (fromStore) {
+          return fromStore
+        }
+      }
+
+      const parent = path.dirname(dir)
+      if (parent === dir) {
+        break
+      }
+      dir = parent
+    }
   }
+
+  return null
+}
+
+function dependencySearchRoots() {
+  return [fgRoot, process.cwd(), path.join(process.cwd(), 'node_modules', 'fg-devkit')]
+}
+
+export function resolveGitCliffBin() {
+  return resolvePackageFile('git-cliff', ['lib/cli/cli.js'], dependencySearchRoots())
+}
+
+export function resolveTsxBin() {
+  return resolvePackageFile('tsx', ['dist/cli.mjs', 'cli.mjs'], dependencySearchRoots())
 }
 
 export function runSyncUserChangelog(cwd = process.cwd()) {