fg-devkit 1.22.0 → 1.24.0

package/scripts/sync-dependency-check-suppressions-commit.mjs

@@ -13,16 +13,16 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { spawnSync } from 'node:child_process'
 import { parseArgs } from 'node:util'
-import { filterSuppressions, normalizeAdvisories, parseAuditJson, parseSuppressions } from './audit-fix-plan.mjs'
+import { filterSuppressions, normalizeAdvisories, parseAuditJson, parseSuppressions } from './lib/audit-fix-plan.mjs'
+import { fileDiffersFromHead, findFgDevkitPackageRoot, runGit } from './lib/common.mjs'
 
 const TAG = '[sync-dependency-check-suppressions]'
 const FILE_NAME = 'dependency-check-suppressions.xml'
 const COMMIT_MESSAGE = 'chore(repo): sync dependency-check suppressions'
 const projectRoot = process.cwd()
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const GIT = { cwd: projectRoot, tag: TAG }
 
 const { values: args } = parseArgs({
   options: {
@@ -42,45 +42,6 @@ pnpm audit reports in this repo, and auto-commits it.
   process.exit(0)
 }
 
-function findFgDevkitPackageRoot() {
-  const candidates = [
-    path.resolve(scriptDir, '..'),
-    path.join(projectRoot, 'node_modules', 'fg-devkit'),
-    path.join(projectRoot, 'node_modules', 'fds-vue-core', 'node_modules', 'fg-devkit'),
-  ]
-  for (const candidate of candidates) {
-    if (fs.existsSync(path.join(candidate, 'package.json'))) {
-      return candidate
-    }
-  }
-  return null
-}
-
-function runGit(gitArgs, options = {}) {
-  const result = spawnSync('git', gitArgs, {
-    stdio: options.capture ? 'pipe' : 'inherit',
-    encoding: options.capture ? 'utf8' : undefined,
-    cwd: projectRoot,
-    env: process.env,
-  })
-  if (result.error) {
-    console.error(TAG, result.error.message)
-    return { status: 1, stdout: '' }
-  }
-  return { status: result.status ?? 1, stdout: result.stdout ?? '' }
-}
-
-function fileDiffersFromHead(filePath) {
-  const absolutePath = path.join(projectRoot, filePath)
-  if (!fs.existsSync(absolutePath)) return false
-
-  const tracked = runGit(['ls-files', '--error-unmatch', '--', filePath], { capture: true })
-  if (tracked.status !== 0) return true
-
-  const diff = runGit(['diff', '--quiet', 'HEAD', '--', filePath], { capture: true })
-  return diff.status !== 0
-}
-
 /** GHSA ids `pnpm audit` reports in this repo. Exits on audit failure so nothing is written blindly. */
 function reportedGhsas() {
   const result = spawnSync('pnpm', ['audit', '--json'], {
@@ -97,7 +58,7 @@ function reportedGhsas() {
   return new Set(normalizeAdvisories(parseAuditJson(result.stdout)).map((advisory) => advisory.ghsa))
 }
 
-const fgRoot = findFgDevkitPackageRoot()
+const fgRoot = findFgDevkitPackageRoot(projectRoot)
 if (!fgRoot) {
   console.error(`${TAG} Could not find fg-devkit (install fg-devkit or a package that bundles it, e.g. fds-vue-core).`)
   process.exit(1)
@@ -137,13 +98,13 @@ if (!args.all) {
 fs.writeFileSync(targetPath, content)
 console.log(`${TAG} Updated ${FILE_NAME}.`)
 
-if (!fileDiffersFromHead(FILE_NAME)) {
+if (!fileDiffersFromHead(FILE_NAME, GIT)) {
   console.log(`${TAG} No changes to commit.`)
   process.exit(0)
 }
 
-const stage = runGit(['add', '--', FILE_NAME])
+const stage = runGit(['add', '--', FILE_NAME], GIT)
 if (stage.status !== 0) process.exit(stage.status)
 
 console.log(`${TAG} Auto-committing: ${COMMIT_MESSAGE}`)
-process.exit(runGit(['commit', '-m', COMMIT_MESSAGE]).status)
+process.exit(runGit(['commit', '-m', COMMIT_MESSAGE], GIT).status)

package/scripts/sync-dependency-policy-commit.mjs

@@ -6,12 +6,13 @@
  *   pnpm exec fg-devkit sync-deps-commit [policy-file]
  */
 
-import fs from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { spawnSync } from 'node:child_process'
+import { fileDiffersFromHead, runGit, stageExistingFiles } from './lib/common.mjs'
 
 const cwd = process.cwd()
+const GIT = { cwd, tag: '[sync-deps-commit]' }
 const scriptDir = path.dirname(fileURLToPath(import.meta.url))
 const syncScriptPath = path.join(scriptDir, 'sync-dependency-policy.mjs')
 const commitMessage = 'chore(repo): sync dependency policy'
@@ -44,22 +45,8 @@ function runPnpm(args) {
   return result.status ?? 1
 }
 
-function runGit(args, options = {}) {
-  const result = spawnSync('git', args, {
-    stdio: options.capture ? 'pipe' : 'inherit',
-    encoding: options.capture ? 'utf8' : undefined,
-    cwd,
-    env: process.env,
-  })
-  if (result.error) {
-    console.error('[sync-deps-commit]', result.error.message)
-    return { status: 1, stdout: '' }
-  }
-  return { status: result.status ?? 1, stdout: result.stdout ?? '' }
-}
-
 function listTrackedFiles() {
-  const result = runGit(['ls-files', '-z'], { capture: true })
+  const result = runGit(['ls-files', '-z'], { ...GIT, capture: true })
   if (result.status !== 0) return []
   return result.stdout.split('\0').filter(Boolean)
 }
@@ -84,25 +71,6 @@ function isSyncRelatedPath(filePath) {
   return base.endsWith('.sh')
 }
 
-function fileDiffersFromHead(filePath) {
-  const absolutePath = path.join(cwd, filePath)
-  if (!fs.existsSync(absolutePath)) return false
-
-  const tracked = runGit(['ls-files', '--error-unmatch', '--', filePath], { capture: true })
-  if (tracked.status !== 0) {
-    return true
-  }
-
-  const diff = runGit(['diff', '--quiet', 'HEAD', '--', filePath], { capture: true })
-  return diff.status !== 0
-}
-
-function stageExistingFiles(files) {
-  const existingFiles = files.filter((filePath) => fs.existsSync(path.join(cwd, filePath)))
-  if (existingFiles.length === 0) return 0
-  return runGit(['add', '--', ...existingFiles]).status
-}
-
 function main() {
   const syncResult = runSync(process.argv.slice(2))
   if (syncResult.status !== 0) {
@@ -135,20 +103,20 @@ function main() {
     }
   }
 
-  const filesToStage = [...candidateFiles].filter((filePath) => fileDiffersFromHead(filePath))
+  const filesToStage = [...candidateFiles].filter((filePath) => fileDiffersFromHead(filePath, GIT))
   if (filesToStage.length === 0) {
     console.log('[sync-deps-commit] No sync-related changes to commit.')
     process.exit(0)
   }
 
-  const stageExitCode = stageExistingFiles(filesToStage)
+  const stageExitCode = stageExistingFiles(filesToStage, GIT)
   if (stageExitCode !== 0) {
     process.exit(stageExitCode)
   }
 
   console.log(`[sync-deps-commit] Staged ${filesToStage.length} file(s)`)
   console.log(`[sync-deps-commit] Auto-committing: ${commitMessage}`)
-  process.exit(runGit(['commit', '-m', commitMessage]).status)
+  process.exit(runGit(['commit', '-m', commitMessage], GIT).status)
 }
 
 main()

package/scripts/sync-dependency-policy.mjs

@@ -13,24 +13,23 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
 
-import { collectPinViolations } from './dependency-policy-pins.mjs'
+import { collectPinViolations } from './lib/dependency-policy-pins.mjs'
 import {
   collectNodeToolchainPolicyViolations,
   collectToolchainPolicyViolations,
   resolveExpectedPackageManager,
-} from './dependency-policy-toolchain.mjs'
-import { syncNodeToolchainInRepo } from './node-toolchain-sync.mjs'
-import { syncPnpmToolchainInRepo } from './pnpm-toolchain-sync.mjs'
-import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+} from './lib/dependency-policy-toolchain.mjs'
+import { syncNodeToolchainInRepo } from './lib/node-toolchain-sync.mjs'
+import { syncPnpmToolchainInRepo } from './lib/pnpm-toolchain-sync.mjs'
+import { resolveDependencyPolicyPath } from './lib/resolve-dependency-policy-path.mjs'
+import { getRelevantPolicyOverrides } from './lib/override-changes.mjs'
+import { fgDevkitRoot } from './lib/common.mjs'
 
 const cwd = process.cwd()
 const pkgPath = path.resolve(cwd, 'package.json')
 const lockfilePath = path.resolve(cwd, 'pnpm-lock.yaml')
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const fgDevkitRoot = path.resolve(scriptDir, '..')
-const policyPath = resolveDependencyPolicyPath(scriptDir, cwd, process.argv)
+const policyPath = resolveDependencyPolicyPath(cwd, process.argv)
 
 if (!fs.existsSync(pkgPath)) {
   console.error('[sync-deps] Could not find package.json in current working directory')
@@ -67,31 +66,6 @@ if (policyErrors.length > 0) {
 const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
 const changes = []
 
-function getOverridePackageName(overrideKey) {
-  const match = overrideKey.match(/^(@[^/]+\/[^@]+|[^@]+)@/)
-  return match ? match[1] : overrideKey
-}
-
-function getRelevantPolicyOverrides(policyOverrides) {
-  const entries = Object.entries(policyOverrides ?? {})
-  if (entries.length === 0) {
-    return {}
-  }
-  if (!fs.existsSync(lockfilePath)) {
-    return Object.fromEntries(entries)
-  }
-  const lockfile = fs.readFileSync(lockfilePath, 'utf8')
-  const relevant = {}
-  for (const [name, version] of entries) {
-    const pkgName = getOverridePackageName(name)
-    // Conservative: only apply overrides for packages present in lockfile.
-    if (lockfile.includes(`${pkgName}@`) || lockfile.includes(`/${pkgName}/`)) {
-      relevant[name] = version
-    }
-  }
-  return relevant
-}
-
 // Bump versions for managed dependencies / devDependencies where the key already exists.
 for (const [section, dependencies] of Object.entries(policy.managedDependencies ?? {})) {
   pkg[section] ||= {}
@@ -136,7 +110,7 @@ for (const [name, version] of Object.entries(policy.managedAnywhere ?? {})) {
 }
 
 // Apply policy-defined override versions when present in the policy.
-const relevantOverrides = getRelevantPolicyOverrides(policy.overrides ?? {})
+const relevantOverrides = getRelevantPolicyOverrides(policy.overrides, lockfilePath)
 for (const [name, version] of Object.entries(relevantOverrides)) {
   if (pkg.pnpm?.overrides?.[name] === version) {
     continue

package/scripts/sync-node-toolchain.mjs

@@ -13,22 +13,19 @@
  */
 
 import fs from 'node:fs'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
 
 import {
   collectNodeToolchainPolicyViolations,
   resolveExpectedNodePolicy,
-} from './dependency-policy-toolchain.mjs'
-import { syncNodeToolchainInRepo } from './node-toolchain-sync.mjs'
-import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+} from './lib/dependency-policy-toolchain.mjs'
+import { syncNodeToolchainInRepo } from './lib/node-toolchain-sync.mjs'
+import { resolveDependencyPolicyPath } from './lib/resolve-dependency-policy-path.mjs'
+import { fgDevkitRoot } from './lib/common.mjs'
 
 const cwd = process.cwd()
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const fgDevkitRoot = path.resolve(scriptDir, '..')
 const cliArgs = process.argv.slice(2).filter((a) => a !== '--dry-run')
 const dryRun = process.argv.includes('--dry-run')
-const policyPath = resolveDependencyPolicyPath(scriptDir, cwd, ['node', 'sync-node-toolchain.mjs', ...cliArgs])
+const policyPath = resolveDependencyPolicyPath(cwd, ['node', 'sync-node-toolchain.mjs', ...cliArgs])
 
 if (!fs.existsSync(policyPath)) {
   console.error(`[sync-node-toolchain] Could not find dependency policy: ${policyPath}`)

package/scripts/sync-pnpm-toolchain.mjs

@@ -7,22 +7,19 @@
  */
 
 import fs from 'node:fs'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
 
 import {
   collectToolchainPolicyViolations,
   resolveExpectedPackageManager,
-} from './dependency-policy-toolchain.mjs'
-import { syncPnpmToolchainInRepo } from './pnpm-toolchain-sync.mjs'
-import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+} from './lib/dependency-policy-toolchain.mjs'
+import { syncPnpmToolchainInRepo } from './lib/pnpm-toolchain-sync.mjs'
+import { resolveDependencyPolicyPath } from './lib/resolve-dependency-policy-path.mjs'
+import { fgDevkitRoot } from './lib/common.mjs'
 
 const cwd = process.cwd()
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const fgDevkitRoot = path.resolve(scriptDir, '..')
 const cliArgs = process.argv.slice(2).filter((a) => a !== '--dry-run')
 const dryRun = process.argv.includes('--dry-run')
-const policyPath = resolveDependencyPolicyPath(scriptDir, cwd, ['node', 'sync-pnpm-toolchain.mjs', ...cliArgs])
+const policyPath = resolveDependencyPolicyPath(cwd, ['node', 'sync-pnpm-toolchain.mjs', ...cliArgs])
 
 if (!fs.existsSync(policyPath)) {
   console.error(`[sync-pnpm-toolchain] Could not find dependency policy: ${policyPath}`)

package/scripts/sync-scaffold-vue-deps.mjs

@@ -12,15 +12,16 @@ import fs from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+import { resolveDependencyPolicyPath } from './lib/resolve-dependency-policy-path.mjs'
 import {
   extractPnpmVersion,
   resolveExpectedNodePolicy,
   resolveExpectedPackageManager,
   syncPolicyToolchainFromFgDevkit,
-} from './dependency-policy-toolchain.mjs'
-import { syncDockerfileNodeImages } from './node-toolchain-sync.mjs'
-import { syncDockerfilePnpmVersion } from './pnpm-toolchain-sync.mjs'
+} from './lib/dependency-policy-toolchain.mjs'
+import { syncDockerfileNodeImages } from './lib/node-toolchain-sync.mjs'
+import { syncDockerfilePnpmVersion } from './lib/pnpm-toolchain-sync.mjs'
+import { fgDevkitRoot } from './lib/common.mjs'
 
 /**
  * @param {{ fgDevkitRoot: string, policyPath: string }} options
@@ -97,12 +98,10 @@ export function syncScaffoldVueDepsFromPolicy(options) {
   console.log('[sync-scaffold-vue-deps] Updated', scaffoldPkgPath)
 }
 
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const fgDevkitRoot = path.resolve(scriptDir, '..')
 const invokedPath = path.resolve(process.argv[1] ?? '')
 const selfPath = path.resolve(fileURLToPath(import.meta.url))
 
 if (invokedPath === selfPath) {
-  const policyPath = resolveDependencyPolicyPath(scriptDir, process.cwd(), process.argv)
+  const policyPath = resolveDependencyPolicyPath(process.cwd(), process.argv)
   syncScaffoldVueDepsFromPolicy({ fgDevkitRoot, policyPath })
 }

package/scripts/sync-tooling-configs.mjs

@@ -4,7 +4,9 @@
  * - prettier.config.js — overwritten from fg-devkit prettier sync template
  * - eslint.config.js — overwritten from fg-devkit eslint sync template
  * - tsconfig.json — overwritten from fg-devkit tsconfig app sync template
- * - .fallowrc.json — overwritten from fg-devkit fallow sync template
+ *
+ * .fallowrc.json is not copied: `fgd dead-code` / `fgd fallow` use fg-devkit's config unless
+ * the repo has its own.
  *
  * This command is intentionally deterministic: each run rewrites files to the shared templates.
  *
@@ -17,26 +19,11 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
+import { findFgDevkitPackageRoot } from './lib/common.mjs'
 
 const projectRoot = process.cwd()
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-
-function findFgDevkitPackageRoot() {
-  const candidates = [
-    path.resolve(scriptDir, '..'),
-    path.join(projectRoot, 'node_modules', 'fg-devkit'),
-    path.join(projectRoot, 'node_modules', 'fds-vue-core', 'node_modules', 'fg-devkit'),
-  ]
-  for (const p of candidates) {
-    if (fs.existsSync(path.join(p, 'package.json'))) {
-      return p
-    }
-  }
-  return null
-}
 
-const fgRoot = findFgDevkitPackageRoot()
+const fgRoot = findFgDevkitPackageRoot(projectRoot)
 if (!fgRoot) {
   console.error(
     '[sync-tooling] Could not find fg-devkit (install fg-devkit or a package that bundles it, e.g. fds-vue-core).',
@@ -47,11 +34,10 @@ if (!fgRoot) {
 const prettierSrc = path.join(fgRoot, 'configs', 'prettier.sync-stub.js')
 const eslintStubSrc = path.join(fgRoot, 'configs', 'eslint.sync-stub.js')
 const tsconfigSrc = path.join(fgRoot, 'configs', 'tsconfig.app.sync.json')
-const fallowConfigSrc = path.join(fgRoot, 'configs', 'fallowrc.sync-stub.json')
 
-if (!fs.existsSync(prettierSrc) || !fs.existsSync(eslintStubSrc) || !fs.existsSync(tsconfigSrc) || !fs.existsSync(fallowConfigSrc)) {
+if (!fs.existsSync(prettierSrc) || !fs.existsSync(eslintStubSrc) || !fs.existsSync(tsconfigSrc)) {
   console.error(
-    '[sync-tooling] Missing prettier.sync-stub.js, eslint.sync-stub.js, tsconfig.app.sync.json, or fallowrc.sync-stub.json inside fg-devkit package.',
+    '[sync-tooling] Missing prettier.sync-stub.js, eslint.sync-stub.js, or tsconfig.app.sync.json inside fg-devkit package.',
   )
   process.exit(1)
 }
@@ -60,8 +46,7 @@ try {
   fs.copyFileSync(prettierSrc, path.join(projectRoot, 'prettier.config.js'))
   fs.copyFileSync(eslintStubSrc, path.join(projectRoot, 'eslint.config.js'))
   fs.copyFileSync(tsconfigSrc, path.join(projectRoot, 'tsconfig.json'))
-  fs.copyFileSync(fallowConfigSrc, path.join(projectRoot, '.fallowrc.json'))
-  console.log('[sync-tooling] Updated prettier.config.js, eslint.config.js, tsconfig.json, and .fallowrc.json.')
+  console.log('[sync-tooling] Updated prettier.config.js, eslint.config.js, and tsconfig.json.')
 } catch (err) {
   console.error(`[sync-tooling] ${err.message}`)
   process.exit(1)

package/scripts/sync-vite-plugin-vue-inspector.mjs

@@ -16,10 +16,10 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { spawnSync } from 'node:child_process'
 
-import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+import { resolveDependencyPolicyPath } from './lib/resolve-dependency-policy-path.mjs'
+import { fileDiffersFromHead, runGit, stageExistingFiles } from './lib/common.mjs'
 
 const PACKAGE_NAME = 'vite-plugin-vue-inspector'
 const IMPORT_LINE = `import Inspector from '${PACKAGE_NAME}'`
@@ -36,9 +36,9 @@ const VITE_CONFIG_CANDIDATES = [
   'vite.config.mjs',
 ]
 
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
 const cwd = process.cwd()
-const policyPath = resolveDependencyPolicyPath(scriptDir, cwd, process.argv)
+const GIT = { cwd, tag: '[sync-vite-plugin-vue-inspector]' }
+const policyPath = resolveDependencyPolicyPath(cwd, process.argv)
 
 function fail(message) {
   console.error(`[sync-vite-plugin-vue-inspector] ${message}`)
@@ -57,38 +57,6 @@ function runPnpm(args) {
   return result.status ?? 1
 }
 
-function runGit(args, options = {}) {
-  const result = spawnSync('git', args, {
-    stdio: options.capture ? 'pipe' : 'inherit',
-    encoding: options.capture ? 'utf8' : undefined,
-    cwd,
-    env: process.env,
-  })
-  if (result.error) {
-    fail(result.error.message)
-  }
-  return { status: result.status ?? 1, stdout: result.stdout ?? '' }
-}
-
-function fileDiffersFromHead(filePath) {
-  const absolutePath = path.join(cwd, filePath)
-  if (!fs.existsSync(absolutePath)) return false
-
-  const tracked = runGit(['ls-files', '--error-unmatch', '--', filePath], { capture: true })
-  if (tracked.status !== 0) {
-    return true
-  }
-
-  const diff = runGit(['diff', '--quiet', 'HEAD', '--', filePath], { capture: true })
-  return diff.status !== 0
-}
-
-function stageExistingFiles(files) {
-  const existingFiles = files.filter((filePath) => fs.existsSync(path.join(cwd, filePath)))
-  if (existingFiles.length === 0) return 0
-  return runGit(['add', '--', ...existingFiles]).status
-}
-
 function resolvePluginVersion(policy) {
   return (
     policy.managedDependencies?.devDependencies?.[PACKAGE_NAME] ??
@@ -427,20 +395,20 @@ function installAndCommit(viteConfigName) {
   }
 
   const candidateFiles = ['package.json', 'pnpm-lock.yaml', viteConfigName].filter(Boolean)
-  const filesToStage = candidateFiles.filter((filePath) => fileDiffersFromHead(filePath))
+  const filesToStage = candidateFiles.filter((filePath) => fileDiffersFromHead(filePath, GIT))
   if (filesToStage.length === 0) {
     console.log('[sync-vite-plugin-vue-inspector] No related changes to commit.')
     return
   }
 
-  const stageExitCode = stageExistingFiles(filesToStage)
+  const stageExitCode = stageExistingFiles(filesToStage, GIT)
   if (stageExitCode !== 0) {
     process.exit(stageExitCode)
   }
 
   console.log(`[sync-vite-plugin-vue-inspector] Staged ${filesToStage.length} file(s)`)
   console.log(`[sync-vite-plugin-vue-inspector] Auto-committing: ${COMMIT_MESSAGE}`)
-  const commitExitCode = runGit(['commit', '-m', COMMIT_MESSAGE]).status
+  const commitExitCode = runGit(['commit', '-m', COMMIT_MESSAGE], GIT).status
   if (commitExitCode !== 0) {
     process.exit(commitExitCode)
   }

package/scripts/verify-release-notes.mjs

@@ -18,7 +18,7 @@ import {
   hasReleaseNotesConfig,
   readPreviewFiles,
   runSyncUserChangelog,
-} from './release-notes-common.mjs'
+} from './lib/release-notes-common.mjs'
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url))
 const cwd = process.cwd()