fix(vite): ensure angular tsconfig prefers .app.json and falls back to no suffix

NathanWalker · NathanWalker · commit d472881eadba · 2025-12-21T12:44:51.000-08:00
diff --git a/packages/vite/configuration/angular.ts b/packages/vite/configuration/angular.ts
@@ -1,5 +1,6 @@
 import { mergeConfig, type UserConfig, type Plugin } from 'vite';
 import path from 'path';
+import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import angular from '@analogjs/vite-plugin-angular';
 import { angularLinkerVitePlugin, angularLinkerVitePluginPost } from '../helpers/angular/angular-linker.js';
@@ -108,6 +109,14 @@ const cliFlags = getCliFlags();
 const isDevEnv = process.env.NODE_ENV !== 'production';
 const hmrActive = isDevEnv && !!cliFlags.hmr;
 
+const projectRoot = process.cwd();
+const tsConfigAppPath = path.resolve(projectRoot, 'tsconfig.app.json');
+const tsConfigPath = path.resolve(projectRoot, 'tsconfig.json');
+let tsConfig = tsConfigAppPath;
+if (!fs.existsSync(tsConfigAppPath) && fs.existsSync(tsConfigPath)) {
+	tsConfig = tsConfigPath;
+}
+
 const plugins = [
 	// Allow external html template changes to trigger hot reload: Make .ts files depend on their .html templates
 	{
@@ -132,6 +141,7 @@ const plugins = [
 	// angularRollupLinker(process.cwd()),
 	angular({
 		liveReload: false, // Disable live reload in favor of HMR
+		tsconfig: tsConfig,
 	}),
 	// Post-phase linker to catch any declarations introduced after other transforms (including project code)
 	angularLinkerVitePluginPost(process.cwd()),
