fg-devkit 1.1.0 → 1.1.2

package/configs/tsconfig.base.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
-  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "extends": "./tsconfig.vue-dom.json",
   "compilerOptions": {
     "target": "ES2022",
     "lib": ["ES2022", "DOM", "DOM.Iterable"],
@@ -16,10 +16,7 @@
     "allowSyntheticDefaultImports": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "preserveSymlinks": false,
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "preserveSymlinks": false
   },
   "vueCompilerOptions": {
     "strictTemplates": true,

package/configs/tsconfig.vue-base.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    "noEmit": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "allowImportingTsExtensions": true,
+    "moduleDetection": "force",
+    "jsx": "preserve",
+    "jsxImportSource": "vue",
+    "noImplicitThis": true,
+    "strict": true,
+    "verbatimModuleSyntax": true,
+    "target": "ESNext",
+    "useDefineForClassFields": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "libReplacement": false,
+    "skipLibCheck": true
+  }
+}

package/configs/tsconfig.vue-dom.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "./tsconfig.vue-base.json",
+  "compilerOptions": {
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "types": []
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Shared configs, scripts, and DX tooling for Vue / TypeScript frontend repos",
   "type": "module",
   "license": "UNLICENSED",
@@ -48,12 +48,18 @@
     "typescript",
     "vue"
   ],
+  "config": {
+    "commitizen": {
+      "path": "./scripts/cz/cz-adapter.cjs"
+    }
+  },
   "dependencies": {
     "@intlify/eslint-plugin-vue-i18n": "4.3.0",
     "@typescript-eslint/eslint-plugin": "8.58.2",
     "@typescript-eslint/parser": "8.58.2",
     "@vitest/eslint-plugin": "1.6.16",
     "@vue/eslint-config-prettier": "10.2.0",
+    "@vue/tsconfig": "0.9.1",
     "commitizen": "4.3.1",
     "eslint": "10.2.1",
     "eslint-plugin-prettier": "5.5.5",

package/scripts/cz/cz-adapter.cjs

@@ -4,6 +4,7 @@
  */
 module.exports = {
   prompter(cz, commit) {
+    const defaultType = process.env.FG_DEVKIT_CZ_DEFAULT_TYPE;
     const types = [
       { value: "feat", name: "feat(scope): Added" },
       { value: "fix", name: "fix(scope): Fixed" },
@@ -22,6 +23,7 @@ module.exports = {
         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",

package/scripts/fg-devkit.mjs

@@ -9,7 +9,7 @@
  *   pnpm exec fg-devkit sync-tooling-configs   (tooling sync only; overwrites config files)
  *   pnpm exec fg-devkit sync-vscode-settings
  *   pnpm exec fg-devkit create-release [patch|minor|major]
- *   pnpm exec fg-devkit commit [cz-args...]   (Commitizen; uses package.json config.commitizen.path)
+ *   pnpm exec fg-devkit commit [cz-args...]   (Commitizen; uses fg-devkit bundled cz adapter)
  *   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)
@@ -102,21 +102,40 @@ async function promptReleaseType(rl) {
 
 /**
  * Run Commitizen from fg-devkit's bundled dependency set.
- * Uses the consuming repo's config.commitizen.path when present.
+ * Always forces fg-devkit's bundled cz adapter so it stays interactive.
  */
-function runCommitizen(args = []) {
-  let gitCzBin
+function runCommitizen(args = [], extraEnv = {}) {
+  let bootstrapBin
+  let commitizenPkgDir
+  const adapterPath = path.join(scriptDir, 'cz', 'cz-adapter.cjs')
   try {
-    gitCzBin = require.resolve('commitizen/bin/git-cz')
+    bootstrapBin = require.resolve('commitizen/dist/cli/git-cz.js')
+    commitizenPkgDir = path.dirname(require.resolve('commitizen/package.json'))
   } catch {
     console.error('[fg-devkit] Could not resolve bundled commitizen. Reinstall fg-devkit and retry.')
     return 1
   }
 
-  const r = spawnSync(process.execPath, [gitCzBin, ...args], {
+  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 r = spawnSync(process.execPath, ['-e', launcher], {
     stdio: 'inherit',
     cwd: process.cwd(),
-    env: process.env,
+    env: {
+      ...process.env,
+      FG_DEVKIT_CZ_ARGS: JSON.stringify(args),
+      ...extraEnv,
+    },
   })
   if (r.error) {
     console.error('[fg-devkit]', r.error.message)
@@ -214,7 +233,7 @@ Commands:
   sync-vscode-settings            Copy shared VS Code settings into .vscode/settings.json
   create-release [bump]         Version bump, git push, GitHub release (patch|minor|major; omit = prompt)
                                  (alias: createRelease)
-  commit [args...]              Commitizen (git-cz); uses config.commitizen.path in package.json
+  commit [args...]              Commitizen (git-cz) with fg-devkit bundled adapter
   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
@@ -259,7 +278,7 @@ const MENU = [
   {
     key: '6',
     label: 'Commit vulnerability (Commitizen)',
-    run: () => runNode('vuln-commit.mjs'),
+    run: () => runCommitizen([], { FG_DEVKIT_CZ_DEFAULT_TYPE: 'vuln' }),
   },
 ]
 
@@ -287,27 +306,29 @@ async function runInteractiveMenu() {
     return 1
   }
 
-  let exitCode = 0
-  try {
-    let out
-    if (item.key === '4') {
-      const bumpType = await promptReleaseType(rl)
-      if (!bumpType) {
-        return 0
-      }
-      out = runReleaseScript([bumpType])
-    } else {
-      out = item.run()
+  let out
+  if (item.key === '4') {
+    const bumpType = await promptReleaseType(rl)
+    if (!bumpType) {
+      rl.close()
+      return 0
     }
-    if (typeof out === 'object' && out !== null && typeof out.then === 'function') {
-      exitCode = await out
-    } else if (typeof out === 'number') {
-      exitCode = out
-    }
-  } finally {
+    // Close menu readline before spawning interactive child processes.
+    rl.close()
+    out = runReleaseScript([bumpType])
+  } else {
+    // Close menu readline before spawning interactive child processes.
     rl.close()
+    out = item.run()
+  }
+
+  if (typeof out === 'object' && out !== null && typeof out.then === 'function') {
+    return await out
+  }
+  if (typeof out === 'number') {
+    return out
   }
-  return exitCode
+  return 0
 }
 
 async function main() {