fg-devkit 1.7.14 → 1.8.0

package/configs/lefthook.yml

@@ -1,5 +1,7 @@
 pre-commit:
   commands:
+    audit:
+      run: zsh -lc "pnpm audit"
     lint-check:
       run: zsh -lc "node ./node_modules/fg-devkit/scripts/fg-devkit.mjs lint ."
     typecheck:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.7.14",
+  "version": "1.8.0",
   "description": "Shared configs, scripts, and DX tooling for Vue / TypeScript frontend repos",
   "type": "module",
   "license": "UNLICENSED",
@@ -19,7 +19,6 @@
     "./vscode-settings.json": "./configs/vscode-settings.json",
     "./dependency-policy.vue-workspace.json": "./configs/dependency-policy.vue-workspace.json",
     "./vuln-commit": "./scripts/vuln-commit.mjs",
-    "./cz-adapter": "./scripts/cz/cz-adapter.cjs",
     "./cz-config": "./scripts/cz/.cz-config.cjs",
     "./scripts/sync-peers-from-dev.mjs": "./scripts/sync-peers-from-dev.mjs",
     "./scripts/sync-vscode-settings.mjs": "./scripts/sync-vscode-settings.mjs",
@@ -47,7 +46,6 @@
     "./scripts/scaffold-vue.mjs": "./scripts/scaffold-vue.mjs",
     "./scripts/fg-devkit.mjs": "./scripts/fg-devkit.mjs",
     "./scripts/release.sh": "./scripts/release.sh",
-    "./scripts/cz/cz-adapter.cjs": "./scripts/cz/cz-adapter.cjs",
     "./scripts/cz/.cz-config.cjs": "./scripts/cz/.cz-config.cjs",
     "./cursor-rules/core-coding-standards.mdc": "./.cursor/rules/core-coding-standards.mdc"
   },
@@ -69,11 +67,13 @@
   ],
   "config": {
     "commitizen": {
-      "path": "./scripts/cz/cz-adapter.cjs"
+      "path": "node_modules/cz-git",
+      "czConfig": "./scripts/cz/.cz-config.cjs"
     }
   },
   "dependencies": {
     "@inquirer/confirm": "^6.0.12",
+    "@inquirer/input": "^5.0.12",
     "@inquirer/select": "^5.1.4",
     "@intlify/eslint-plugin-vue-i18n": "4.3.0",
     "@typescript-eslint/eslint-plugin": "8.58.2",
@@ -82,7 +82,6 @@
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/eslint-config-typescript": "14.7.0",
     "@vue/tsconfig": "0.9.1",
-    "commitizen": "4.3.1",
     "eslint": "10.2.1",
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-vue": "10.8.0",
@@ -94,5 +93,9 @@
     "vue-eslint-parser": "10.4.0",
     "vue-tsc": "3.2.7"
   },
+  "devDependencies": {
+    "cz-git": "^1.13.1",
+    "czg": "^1.13.1"
+  },
   "scripts": {}
 }

package/scaffold/vue/package.json

@@ -34,7 +34,7 @@
     "@tanstack/vue-query-devtools": "6.1.28",
     "@types/node": "22.16.5",
     "@vitejs/plugin-vue": "6.0.6",
-    "fg-devkit": "1.7.14",
+    "fg-devkit": "1.8.0",
     "start-server-and-test": "2.1.3",
     "tailwindcss": "4.2.4",
     "tsx": "4.21.0",

package/scripts/cz/.cz-config.cjs

@@ -1,6 +1,6 @@
 /**
- * Commitizen configuration (legacy path): commit types, prompts, and message limits.
- * Used when tooling points commitizen at this file instead of the cz-adapter prompter.
+ * cz-git config used by fg-devkit commit flows.
+ * Keep this in czrc-compatible shape for `czg --config`.
  */
 module.exports = {
   types: [
@@ -11,16 +11,19 @@ module.exports = {
     { value: 'chore', name: 'chore(scope): Changed' },
     { value: 'dep', name: 'dep(scope): Dependencies (single package or batch)' },
     { value: 'vuln', name: 'vuln(scope): Security dependency update (single package or batch)' },
-    { value: 'fix(security)', name: 'fix(security): Security' }
+    { value: 'fix(security)', name: 'fix(security): Security' },
   ],
   allowCustomScopes: true,
+  allowEmptyScopes: false,
   allowBreakingChanges: [],
-  skipQuestions: ['footer', 'breaking'],
-  subjectLimit: 120,
+  skipQuestions: ['breaking', 'footer', 'issues', 'issuePrefixes'],
+  maxSubjectLength: 120,
+  breaklineChar: '|',
+  useEmoji: false,
   messages: {
     type: 'Select the type of change you are committing:',
     customScope: 'Packages (for dep/vuln) or scope:',
     subject: 'Commit subject (imperative, no trailing period):',
-    body: "Optional body (use '|' for newline):"
-  }
+    body: "Optional body (use '|' for newline):",
+  },
 }

package/scripts/fg-devkit.mjs

@@ -21,7 +21,7 @@
  *   pnpm exec fg-devkit prune-consumer-deps [--dry-run]
  *   pnpm exec fg-devkit full-consumer-setup
  *   pnpm exec fg-devkit create-release [patch|minor|major]
- *   pnpm exec fg-devkit commit [cz-args...]   (Commitizen; uses fg-devkit bundled cz adapter)
+ *   pnpm exec fg-devkit commit [cz-args...]   (czg/cz-git with fg-devkit bundled config)
  *   pnpm exec fg-devkit commit-vuln           (staged package.json version bumps → vuln() commit)
  *   pnpm exec fg-devkit lint [eslint-args...]     (run ESLint with fg-devkit bundled packages)
  *   pnpm exec fg-devkit lint-fix [eslint-args...] (same as lint plus --fix)
@@ -171,41 +171,132 @@ function runMaintainerAuditAll() {
 }
 
 /**
- * Run Commitizen from fg-devkit's bundled dependency set.
- * Always forces fg-devkit's bundled cz adapter so it stays interactive.
+ * Prompt for a conventional commit message with fg-devkit's legacy question flow,
+ * then run `git commit` directly.
  */
-function runCommitizen(args = [], extraEnv = {}) {
-  let bootstrapBin
-  let commitizenPkgDir
-  const adapterPath = path.join(scriptDir, 'cz', 'cz-adapter.cjs')
+async function runCzg(args = [], extraEnv = {}) {
+  let selectPrompt
+  let inputPrompt
   try {
-    bootstrapBin = require.resolve('commitizen/dist/cli/git-cz.js')
-    commitizenPkgDir = path.dirname(require.resolve('commitizen/package.json'))
+    const inquirerSelect = await import('@inquirer/select')
+    const inquirerInput = await import('@inquirer/input')
+    selectPrompt = inquirerSelect.default
+    inputPrompt = inquirerInput.default
   } catch {
-    console.error('[fg-devkit] Could not resolve bundled commitizen. Reinstall fg-devkit and retry.')
+    console.error('[fg-devkit] Could not resolve @inquirer/select or @inquirer/input. Reinstall fg-devkit and retry.')
     return 1
   }
 
-  const launcher = `
-const { bootstrap } = require(${JSON.stringify(bootstrapBin)});
-const argv = ['node', 'git-cz', ...JSON.parse(process.env.FG_DEVKIT_CZ_ARGS || '[]')];
-bootstrap(
-  {
-    cliPath: ${JSON.stringify(commitizenPkgDir)},
-    config: { path: ${JSON.stringify(adapterPath)} },
-  },
-  argv
-);
-`
+  const types = [
+    { value: 'feat', name: 'feat(scope): Added' },
+    { value: 'fix', name: 'fix(scope): Fixed' },
+    { value: 'perf', name: 'perf(scope): Performance' },
+    { value: 'refactor', name: 'refactor(scope): Changed' },
+    { value: 'chore', name: 'chore(scope): Changed' },
+    { value: 'docs', name: 'docs(scope): Documentation' },
+    { value: 'dep', name: 'dep(scope): Dependencies (single package or batch)' },
+    { value: 'vuln', name: 'vuln(scope): Security dependency update (single package or batch)' },
+    { value: 'fix(security)', name: 'fix(security): Security' },
+  ]
+
+  const defaultType = process.env.FG_DEVKIT_CZ_DEFAULT_TYPE
+  const defaultPackages = process.env.FG_DEVKIT_CZ_DEFAULT_PACKAGES
+  const defaultDepVersion = process.env.FG_DEVKIT_CZ_DEFAULT_DEP_VERSION
+  const defaultDepChangeKind = process.env.FG_DEVKIT_CZ_DEFAULT_DEP_CHANGE_KIND
+
+  const ask = async (message, cfg = {}) => {
+    const value = await inputPrompt({
+      message,
+      default: cfg.defaultValue,
+      validate: cfg.validate,
+    })
+    return value.trim()
+  }
+
+  const selectedType = await selectPrompt({
+    message: 'Select the type of change you are committing',
+    choices: types,
+    default: defaultType && types.some((t) => t.value === defaultType) ? defaultType : undefined,
+  })
+
+  let scope = ''
+  let packages = ''
+  let depChangeKind = ''
+  let depVersion = ''
+  let vulnChangeKind = ''
+  let vulnTargetVersion = ''
+  let shortcutId = ''
+  let subject = ''
+  const isDepOrVuln = selectedType === 'dep' || selectedType === 'vuln'
+
+  if (isDepOrVuln) {
+    packages = await ask('Packages:', { defaultValue: selectedType === 'dep' ? defaultPackages : undefined })
+    if (!packages && selectedType === 'dep' && defaultPackages) {
+      packages = defaultPackages
+    }
+  } else {
+    scope = await ask('Scope:')
+  }
+
+  if (selectedType === 'vuln') {
+    vulnChangeKind = await selectPrompt({
+      message: 'Vulnerability change type:',
+      choices: [
+        { value: 'override', name: 'override' },
+        { value: 'bump', name: 'bump' },
+      ],
+      default: 'override',
+    })
+    while (!vulnTargetVersion) {
+      vulnTargetVersion = await ask('Target version/range (e.g. 5.2.2 or >=5.2.2):', {
+        validate: (value) => (value?.trim() ? true : 'Provide a target version/range'),
+      })
+    }
+  }
+
+  if (selectedType === 'dep') {
+    depChangeKind = await selectPrompt({
+      message: 'Dependency change type:',
+      choices: [
+        { value: 'new', name: 'new package' },
+        { value: 'update', name: 'updated package' },
+        { value: 'remove', name: 'removed package' },
+      ],
+      default:
+        defaultDepChangeKind && ['new', 'update', 'remove'].includes(defaultDepChangeKind)
+          ? defaultDepChangeKind
+          : 'update',
+    })
+    depVersion = await ask('Version (x.y.z):', {
+      defaultValue: defaultDepVersion,
+      validate: (value) => (/^\d+\.\d+\.\d+$/.test(value?.trim() ?? '') ? true : 'Use format x.y.z'),
+    })
+  }
+
+  if (!isDepOrVuln) {
+    shortcutId = await ask('Shortcut ID digits only (optional, e.g. 1234):')
+    subject = await ask('Commit subject (imperative, no trailing period):', {
+      validate: (value) => (value?.trim() ? true : 'Commit subject is required'),
+    })
+  }
 
-  const r = spawnSync(process.execPath, ['-e', launcher], {
+  const body = await ask("Optional body (use '|' for newline):")
+
+  const scopeValue = isDepOrVuln ? packages : scope
+  const needsEmptyParens = isDepOrVuln && !scopeValue
+  const scopePart = scopeValue ? `(${scopeValue})` : needsEmptyParens ? '()' : ''
+  const shortcutPart = shortcutId ? ` [sc-${shortcutId}]` : ''
+  const bodyPart = body ? `\n\n${body.split('|').join('\n')}` : ''
+  const depSubject =
+    depChangeKind === 'new' ? `add ${depVersion}` : depChangeKind === 'remove' ? `yeet ${depVersion}` : `bump to ${depVersion}`
+  const vulnSubject = vulnChangeKind === 'override' ? `override ${vulnTargetVersion}` : `bump to ${vulnTargetVersion}`
+  const finalSubject = selectedType === 'dep' ? depSubject : selectedType === 'vuln' ? vulnSubject : subject
+  const commitMessage = `${selectedType}${scopePart}: ${finalSubject}${shortcutPart}${bodyPart}`
+
+  const r = spawnSync('git', ['commit', ...args, '-m', commitMessage], {
     stdio: 'inherit',
     cwd: process.cwd(),
-    env: {
-      ...process.env,
-      FG_DEVKIT_CZ_ARGS: JSON.stringify(args),
-      ...extraEnv,
-    },
+    env: { ...process.env, ...extraEnv },
   })
   if (r.error) {
     console.error('[fg-devkit]', r.error.message)
@@ -404,7 +495,7 @@ Commands:
   full-consumer-setup             Run: step 7 -> scripts -> lefthook -> step 3 -> step 2 -> pnpm install
   create-release [bump]         Version bump, git push, GitHub release (patch|minor|major; omit = prompt)
                                  (alias: createRelease)
-  commit [args...]              Commitizen (git-cz) with fg-devkit bundled adapter
+  commit [args...]              czg/cz-git with fg-devkit bundled config
   commit-vuln                   Commit staged dependency bumps as vuln() (alias: vuln-commit)
   lint [eslint-args...]         Run ESLint using fg-devkit bundled ESLint stack
   lint-fix [eslint-args...]     Run ESLint with --fix using fg-devkit bundled ESLint stack
@@ -540,7 +631,7 @@ async function runInteractiveMenu() {
         loop: false,
       })
       if (choice === 'cancel') continue
-      return runSelectedAction(() => (choice === 'commit' ? runCommitizen() : runNode('vuln-commit.mjs')))
+      return runSelectedAction(() => (choice === 'commit' ? runCzg() : runNode('vuln-commit.mjs')))
     }
 
     if (group === 'release') {
@@ -718,7 +809,7 @@ async function main() {
       return
     }
     if (sub === 'commit') {
-      process.exitCode = runCommitizen(rest)
+      process.exitCode = await runCzg(rest)
       return
     }
     if (sub === 'commit-vuln' || sub === 'vuln-commit' || sub === 'commit:vuln') {

package/scripts/prune-consumer-deps.mjs

@@ -3,7 +3,7 @@
  * Removes tooling dependencies from a consuming repo that are now bundled by fg-devkit.
  *
  * By default this script edits package.json in the current working directory and removes
- * known ESLint/Prettier/TypeScript/Commitizen packages from dependencies/devDependencies.
+ * known ESLint/Prettier/TypeScript/cz-git tooling packages from dependencies/devDependencies.
  *
  * Usage:
  *   node node_modules/fg-devkit/scripts/prune-consumer-deps.mjs
@@ -24,6 +24,8 @@ const BUNDLED_TOOLING_PACKAGES = new Set([
   '@vue/tsconfig',
   '@rushstack/eslint-patch',
   'commitizen',
+  'cz-git',
+  'czg',
   'eslint',
   'eslint-plugin-prettier',
   'eslint-plugin-vue',

package/scripts/cz/cz-adapter.cjs

@@ -1,127 +0,0 @@
-/**
- * Custom Commitizen adapter: interactive prompts for type, scope, dep/vuln flows, and message body.
- * Builds the final conventional commit string and passes it to commit().
- */
-module.exports = {
-  prompter(cz, commit) {
-    const defaultType = process.env.FG_DEVKIT_CZ_DEFAULT_TYPE;
-    const defaultPackages = process.env.FG_DEVKIT_CZ_DEFAULT_PACKAGES;
-    const defaultDepVersion = process.env.FG_DEVKIT_CZ_DEFAULT_DEP_VERSION;
-    const defaultDepChangeKind = process.env.FG_DEVKIT_CZ_DEFAULT_DEP_CHANGE_KIND;
-    const types = [
-      { value: "feat", name: "feat(scope): Added" },
-      { value: "fix", name: "fix(scope): Fixed" },
-      { value: "perf", name: "perf(scope): Performance" },
-      { value: "refactor", name: "refactor(scope): Changed" },
-      { value: "chore", name: "chore(scope): Changed" },
-      { value: "docs", name: "docs(scope): Documentation" },
-      { value: "dep", name: "dep(scope): Dependencies (single package or batch)" },
-      { value: "vuln", name: "vuln(scope): Security dependency update (single package or batch)" },
-      { value: "fix(security)", name: "fix(security): Security" },
-    ];
-
-    const questions = [
-      {
-        type: "list",
-        name: "change_type",
-        message: "Select the type of change you are committing",
-        choices: types,
-        default: defaultType && types.some((t) => t.value === defaultType) ? defaultType : undefined,
-      },
-      {
-        type: "input",
-        name: "scope",
-        when: (answers) => !["dep", "vuln"].includes(answers.change_type),
-        message: "Scope:",
-      },
-      {
-        type: "input",
-        name: "packages",
-        when: (answers) => ["dep", "vuln"].includes(answers.change_type),
-        message: "Packages:",
-        default: defaultType === "dep" && defaultPackages ? defaultPackages : undefined,
-      },
-      {
-        type: "list",
-        name: "vuln_change_kind",
-        when: (answers) => answers.change_type === "vuln",
-        message: "Vulnerability change type:",
-        choices: [
-          { value: "override", name: "override" },
-          { value: "bump", name: "bump" },
-        ],
-      },
-      {
-        type: "input",
-        name: "vuln_target_version",
-        when: (answers) => answers.change_type === "vuln",
-        message: "Target version/range (e.g. 5.2.2 or >=5.2.2):",
-        validate: (value) => (value && value.trim() ? true : "Provide a target version/range"),
-      },
-      {
-        type: "list",
-        name: "dep_change_kind",
-        when: (answers) => answers.change_type === "dep",
-        message: "Dependency change type:",
-        choices: [
-          { value: "new", name: "new package" },
-          { value: "update", name: "updated package" },
-          { value: "remove", name: "removed package" },
-        ],
-        default:
-          defaultType === "dep" && ["new", "update", "remove"].includes(defaultDepChangeKind)
-            ? defaultDepChangeKind
-            : "update",
-      },
-      {
-        type: "input",
-        name: "dep_version",
-        when: (answers) => answers.change_type === "dep",
-        message: "Version (x.y.z):",
-        default: defaultType === "dep" && defaultDepVersion ? defaultDepVersion : undefined,
-        validate: (value) => (/^\d+\.\d+\.\d+$/.test(value) ? true : "Use format x.y.z"),
-      },
-      {
-        type: "input",
-        name: "shortcut_id",
-        when: (answers) => !["dep", "vuln"].includes(answers.change_type),
-        message: "Shortcut ID digits only (optional, e.g. 1234):",
-      },
-      {
-        type: "input",
-        name: "message",
-        when: (answers) => !["dep", "vuln"].includes(answers.change_type),
-        message: "Commit subject (imperative, no trailing period):",
-      },
-      {
-        type: "input",
-        name: "body",
-        message: "Optional body (use '|' for newline):",
-      },
-    ];
-
-    cz.prompt(questions).then((answers) => {
-      const type = answers.change_type;
-      const scopeValue = ["dep", "vuln"].includes(type) ? answers.packages : answers.scope;
-      const needsEmptyParens = ["dep", "vuln"].includes(type) && !scopeValue;
-      const scopePart = scopeValue ? `(${scopeValue})` : needsEmptyParens ? "()" : "";
-      const shortcutPart = answers.shortcut_id ? ` [sc-${answers.shortcut_id}]` : "";
-      const bodyPart = answers.body ? `\n\n${answers.body.split("|").join("\n")}` : "";
-      const depSubject =
-        answers.dep_change_kind === "new"
-          ? `add ${answers.dep_version}`
-          : answers.dep_change_kind === "remove"
-            ? `yeet ${answers.dep_version}`
-            : `bump to ${answers.dep_version}`;
-      const vulnSubject =
-        type === "vuln"
-          ? answers.vuln_change_kind === "override"
-            ? `override ${answers.vuln_target_version}`
-            : `bump to ${answers.vuln_target_version}`
-          : "";
-      const subject = type === "dep" ? depSubject : type === "vuln" ? vulnSubject : answers.message;
-      const commitMessage = `${type}${scopePart}: ${subject}${shortcutPart}${bodyPart}`;
-      commit(commitMessage);
-    });
-  },
-};