@archpublicwebsite/eslint-config 1.0.23 → 1.0.30

package/README.md

@@ -2,21 +2,21 @@
 
 Reusable ESLint flat config and git-hook toolkit for Archipelago projects.
 
-## Update 1 Bulan Terakhir (Mei-Jun 2026)
+## Last Month Updates (May-Jun 2026)
 
-Ringkasan perubahan terbaru yang paling penting:
+Here are the most important recent changes:
 
-- Installer sekarang bisa membuat file setup utama otomatis saat belum ada.
-- Hook `pre-commit` lebih tahan error saat config belum lengkap.
-- Security scanner lebih akurat dan mengurangi false positive.
-- Ada opsi validasi akun/signature ketat lewat `REQUIRE_VERIFIED_ACCOUNT=1`.
+- The installer can now create key setup files automatically when they are missing.
+- The `pre-commit` hook is now more resilient when project config is incomplete.
+- The security scanner is more accurate and produces fewer false positives.
+- A strict account/signature validation mode is available via `REQUIRE_VERIFIED_ACCOUNT=1`.
 
-Jika `REQUIRE_VERIFIED_ACCOUNT=1` aktif:
+When `REQUIRE_VERIFIED_ACCOUNT=1` is enabled:
 
-- `pre-commit` akan cek `user.name`, `user.email`, dan `commit.gpgsign=true`.
-- `pre-push` akan menolak commit yang status signature-nya bukan `G`.
+- `pre-commit` checks `user.name`, `user.email`, and `commit.gpgsign=true`.
+- `pre-push` rejects commits whose signature status is not `G`.
 
-Cara pakai cepat:
+Quick start:
 
 ```bash
 pnpm install
@@ -25,7 +25,7 @@ pnpm lint:check
 pnpm typecheck
 ```
 
-Aktifkan strict verification hanya saat dibutuhkan:
+Enable strict verification only when needed:
 
 ```bash
 REQUIRE_VERIFIED_ACCOUNT=1 git commit
@@ -131,6 +131,43 @@ The setup merges ESLint-related settings into `.vscode/settings.json`:
 
 Existing settings are preserved. Only the ESLint-related keys are added or updated.
 
+## Troubleshooting (Nuxt)
+
+If you see errors like:
+
+- `Cannot find module '~/composables'`
+- `Cannot find name 'useRoute'`
+- `Cannot find name 'useRuntimeConfig'`
+- `'<script setup ...>' expected` in `.vue` files
+
+Use this checklist:
+
+1. Ensure root `tsconfig.json` extends Nuxt types:
+
+```json
+{
+  "extends": "./.nuxt/tsconfig.json"
+}
+```
+
+2. Generate Nuxt type files:
+
+```bash
+npx nuxi prepare
+```
+
+3. Confirm VS Code uses Volar for Vue files (disable Vetur).
+4. Re-run setup script:
+
+```bash
+node node_modules/@archpublicwebsite/eslint-config/tools/setup/install.mjs
+```
+
+Note:
+
+- The setup now writes workspace settings that disable Vetur validators to prevent false Vue/TS errors.
+- After running setup, restart VS Code (`Developer: Reload Window`) so the language server state is refreshed.
+
 ## Public API
 
 The package exports:

package/lint-staged.config.mjs

@@ -1,5 +1,7 @@
 const config = {
-  '*.{js,mjs,cjs,ts,tsx,vue}': ['eslint --fix', 'prettier --write'],
+  // Keep JS/TS/Vue formatting and lint fixes in one engine (ESLint)
+  // so save behavior and pre-commit output stay consistent.
+  '*.{js,mjs,cjs,ts,tsx,vue}': ['eslint --fix'],
   '*.{json,md,yml,yaml,css,scss,html}': ['prettier --write'],
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archpublicwebsite/eslint-config",
-  "version": "1.0.23",
+  "version": "1.0.30",
   "author": "Archipelago Hotels",
   "description": "Reusable ESLint flat config and git-hook toolkit for Archipelago projects",
   "type": "module",

package/tools/git-hooks/pre-commit.mjs

@@ -15,6 +15,66 @@ function runIfExists(scriptPath, command) {
   run(command, { stdio: 'inherit' })
 }
 
+function quoteShellArg(value) {
+  const escaped = String(value).replaceAll("'", '\'"\'"\'')
+  return `'${escaped}'`
+}
+
+function getStagedLintTargets() {
+  const output = runSafe('git diff --cached --name-only --diff-filter=ACMR')
+  if (!output) {
+    return []
+  }
+
+  return output
+    .split('\n')
+    .map(line => line.trim())
+    .filter(Boolean)
+    // Keep this check focused on app/source code files that should match
+    // editor save behavior. Tooling files are validated by lint-staged itself.
+    .filter(filePath => /\.(js|ts|tsx|vue)$/.test(filePath))
+}
+
+function ensureEslintFlatConfig() {
+  const hasFlatConfig =
+    existsSync('./eslint.config.mjs') || existsSync('./eslint.config.js') || existsSync('./eslint.config.cjs')
+
+  if (hasFlatConfig) {
+    return
+  }
+
+  const installerPath = join(__dirname, '..', 'setup', 'install.mjs')
+  console.log('\nMissing eslint.config.* detected. Running setup installer to auto-create required config...')
+  run(`node "${installerPath}"`, { stdio: 'inherit' })
+
+  const configCreated =
+    existsSync('./eslint.config.mjs') || existsSync('./eslint.config.js') || existsSync('./eslint.config.cjs')
+
+  if (!configCreated) {
+    console.error('\nCOMMIT FAILED: eslint.config.* is still missing after setup.')
+    console.error('Run: node node_modules/@archpublicwebsite/eslint-config/tools/setup/install.mjs')
+    process.exit(1)
+  }
+}
+
+function verifySaveEquivalentLintState() {
+  const lintTargets = getStagedLintTargets()
+  if (lintTargets.length === 0) {
+    return
+  }
+
+  const targetArgs = lintTargets.map(quoteShellArg).join(' ')
+  console.log('\nVerifying staged code with ESLint check...')
+
+  try {
+    run(`pnpm exec eslint --no-error-on-unmatched-pattern ${targetArgs}`, { stdio: 'inherit' })
+  } catch {
+    console.error('\nCOMMIT FAILED: staged code still has ESLint issues after auto-fix.')
+    console.error('Fix the remaining issues, stage again, then commit.')
+    process.exit(1)
+  }
+}
+
 if (!hasCommand('pnpm')) {
   console.error('\nCOMMIT FAILED: pnpm is required but not found.\n')
   process.exit(1)
@@ -58,6 +118,8 @@ if (process.env.SKIP_GLOBAL_SCAN === '1') {
 }
 
 // ── 3. Lint-staged — auto-fix & format staged files ───────────────────────────
+ensureEslintFlatConfig()
+
 console.log('\nRunning lint-staged (auto-fix staged files)...')
 if (existsSync('./lint-staged.config.mjs')) {
   run('pnpm exec lint-staged --config lint-staged.config.mjs', { stdio: 'inherit' })
@@ -66,4 +128,7 @@ if (existsSync('./lint-staged.config.mjs')) {
   run('pnpm exec lint-staged', { stdio: 'inherit' })
 }
 
+// ── 4. Save-equivalent verification (same lint result as editor save) ────────
+verifySaveEquivalentLintState()
+
 console.log('\nCOMMIT CHECKS PASSED\n')

package/tools/setup/install.mjs

@@ -27,6 +27,11 @@ function writeIfMissing(filePath, content) {
   return true
 }
 
+function isNuxtProject(projectRoot) {
+  const nuxtConfigNames = ['nuxt.config.ts', 'nuxt.config.js', 'nuxt.config.mjs', 'nuxt.config.cjs']
+  return nuxtConfigNames.some(fileName => existsSync(join(projectRoot, fileName)))
+}
+
 // ─── .editorconfig ──────────────────────────────────────────────────────────
 
 function ensureEditorConfig(projectRoot) {
@@ -174,20 +179,19 @@ function ensureTsConfigBase(projectRoot) {
 
 function ensureTsConfig(projectRoot) {
   const tsconfigPath = join(projectRoot, 'tsconfig.json')
-  const content = `{
+  const nonNuxtContent = `{
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "paths": {}
   },
   "include": [
-    "src/**/*.ts",
-    "src/**/*.vue",
-    "packages/**/*.ts",
-    "packages/**/*.vue",
+    "**/*.ts",
+    "**/*.tsx",
+    "**/*.vue",
+    "**/*.d.ts",
     "vite.config.ts"
   ],
   "exclude": [
-    "apps/**",
     "node_modules",
     "**/dist/**",
     "**/.nuxt/**",
@@ -195,7 +199,20 @@ function ensureTsConfig(projectRoot) {
   ]
 }
 `
-  if (writeIfMissing(tsconfigPath, content)) log('Created tsconfig.json')
+
+  // Nuxt projects must extend .nuxt/tsconfig.json so aliases (`~/`, `#imports`)
+  // and auto-imported composables (`useRoute`, `useRuntimeConfig`, etc.) resolve.
+  const nuxtContent = `{
+  "extends": "./.nuxt/tsconfig.json"
+}
+`
+
+  const nuxtProject = isNuxtProject(projectRoot)
+  const content = nuxtProject ? nuxtContent : nonNuxtContent
+
+  if (writeIfMissing(tsconfigPath, content)) {
+    log(nuxtProject ? 'Created tsconfig.json (Nuxt mode)' : 'Created tsconfig.json')
+  }
 }
 
 function ensureCommitlintConfig(projectRoot) {

package/tools/setup/vscode.mjs

@@ -20,7 +20,13 @@ const VSCODE_ESLINT_SETTINGS = {
 
   // Volar + TS integration for Vue 3 SFC template diagnostics
   'vue.server.hybridMode': true,
-  'volar.takeOverMode.enabled': true,
+
+  // Defensive guard: if Vetur is installed globally, disable its validators
+  // to avoid conflicting diagnostics like "'<script setup ...>' expected".
+  'vetur.validation.template': false,
+  'vetur.validation.script': false,
+  'vetur.validation.style': false,
+  'vetur.experimental.templateInterpolationService': false,
 
   // Prevent duplicate/broken diagnostics from built-in TS/JS validators
   // (vue-tsc + Volar remain the source of truth for Vue type diagnostics).
@@ -36,7 +42,7 @@ const VSCODE_ESLINT_SETTINGS = {
 
   // Auto-fix on save via ESLint
   'editor.codeActionsOnSave': {
-    'source.fixAll.eslint': 'explicit',
+    'source.fixAll.eslint': true,
     'source.organizeImports': 'never',
   },
 
@@ -57,7 +63,7 @@ const VSCODE_ESLINT_SETTINGS = {
     'editor.defaultFormatter': 'dbaeumer.vscode-eslint',
   },
   '[vue]': {
-    'editor.defaultFormatter': 'Vue.volar',
+    'editor.defaultFormatter': 'dbaeumer.vscode-eslint',
   },
   '[json]': {
     'editor.defaultFormatter': 'dbaeumer.vscode-eslint',