Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat(vite-plugin-angular): add support for tsconfig as getter function #1892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2025
+62 −25
Merged

feat(vite-plugin-angular): add support for tsconfig as getter function #1892

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 62 additions & 25 deletions packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { CompilerHost, NgtscProgram } from '@angular/compiler-cli';
import { mkdirSync, writeFileSync } from 'node:fs';
import {
basename,
dirname,
Expand All @@ -7,23 +8,24 @@ import {
relative,
resolve,
} from 'node:path';
import { mkdirSync, writeFileSync } from 'node:fs';

import * as compilerCli from '@angular/compiler-cli';
import * as ts from 'typescript';
import { createRequire } from 'node:module';
import * as ts from 'typescript';

import * as ngCompiler from '@angular/compiler';
import {
defaultClientConditions,
ModuleNode,
normalizePath,
Plugin,
ViteDevServer,
preprocessCSS,
ResolvedConfig,
defaultClientConditions,
ViteDevServer,
} from 'vite';
import * as ngCompiler from '@angular/compiler';

import { buildOptimizerPlugin } from './angular-build-optimizer-plugin.js';
import { jitPlugin } from './angular-jit-plugin.js';
import { createCompilerPlugin } from './compiler-plugin.js';
import {
StyleUrlsResolver,
Expand All @@ -35,33 +37,31 @@ import {
augmentProgramWithVersioning,
mergeTransformers,
} from './host.js';
import { jitPlugin } from './angular-jit-plugin.js';
import { buildOptimizerPlugin } from './angular-build-optimizer-plugin.js';

import { angularStorybookPlugin } from './angular-storybook-plugin.js';
import { angularVitestPlugins } from './angular-vitest-plugin.js';
import {
angularMajor,
createJitResourceTransformer,
SourceFileCache,
angularMajor,
} from './utils/devkit.js';
import { angularVitestPlugins } from './angular-vitest-plugin.js';
import { angularStorybookPlugin } from './angular-storybook-plugin.js';

const require = createRequire(import.meta.url);

import { routerPlugin } from './router-plugin.js';
import { pendingTasksPlugin } from './angular-pending-tasks.plugin.js';
import { EmitFileResult } from './models.js';
import { liveReloadPlugin } from './live-reload-plugin.js';
import { EmitFileResult } from './models.js';
import { nxFolderPlugin } from './nx-folder-plugin.js';
import {
FileReplacement,
FileReplacementSSR,
FileReplacementWith,
replaceFiles,
} from './plugins/file-replacements.plugin.js';
import { routerPlugin } from './router-plugin.js';

export interface PluginOptions {
tsconfig?: string;
tsconfig?: string | (() => string);
workspaceRoot?: string;
inlineStylesExtension?: string;
jit?: boolean;
Expand Down Expand Up @@ -103,7 +103,7 @@ export function angular(options?: PluginOptions): Plugin[] {
* are used for values not provided.
*/
const pluginOptions = {
tsconfig: options?.tsconfig || '',
tsconfigGetter: createTsConfigGetter(options?.tsconfig),
workspaceRoot: options?.workspaceRoot ?? process.cwd(),
inlineStylesExtension: options?.inlineStylesExtension ?? 'css',
advanced: {
Expand All @@ -124,6 +124,14 @@ export function angular(options?: PluginOptions): Plugin[] {
};

let resolvedConfig: ResolvedConfig;
let resolvedTsConfigPath: string = '';
// Store config context needed for getTsConfigPath resolution
let tsConfigResolutionContext: {
root: string;
isProd: boolean;
isLib: boolean;
} | null = null;

let nextProgram: NgtscProgram | undefined | ts.Program;
let builderProgram: ts.EmitAndSemanticDiagnosticsBuilderProgram;
let watchMode = false;
Expand Down Expand Up @@ -170,12 +178,21 @@ export function angular(options?: PluginOptions): Plugin[] {
isProd =
config.mode === 'production' ||
process.env['NODE_ENV'] === 'production';
pluginOptions.tsconfig = getTsConfigPath(
config.root || '.',
pluginOptions,

// Store the config context for later resolution in configResolved
tsConfigResolutionContext = {
root: config.root || '.',
isProd,
isLib: !!config?.build?.lib,
};

// Do a preliminary resolution for esbuild plugin (before configResolved)
const preliminaryTsConfigPath = getTsConfigPath(
tsConfigResolutionContext.root,
pluginOptions.tsconfigGetter(),
tsConfigResolutionContext.isProd,
isTest,
!!config?.build?.lib,
tsConfigResolutionContext.isLib,
);

return {
Expand All @@ -187,7 +204,7 @@ export function angular(options?: PluginOptions): Plugin[] {
plugins: [
createCompilerPlugin(
{
tsconfig: pluginOptions.tsconfig,
tsconfig: preliminaryTsConfigPath,
sourcemap: !isProd,
advancedOptimizations: isProd,
jit,
Expand Down Expand Up @@ -215,6 +232,18 @@ export function angular(options?: PluginOptions): Plugin[] {
configResolved(config) {
resolvedConfig = config;

// resolve the tsconfig path after config is fully resolved
if (tsConfigResolutionContext) {
const tsconfigValue = pluginOptions.tsconfigGetter();
resolvedTsConfigPath = getTsConfigPath(
tsConfigResolutionContext.root,
tsconfigValue,
tsConfigResolutionContext.isProd,
isTest,
tsConfigResolutionContext.isLib,
);
}

if (isTest) {
// set test watch mode
// - vite override from vitest-angular
Expand Down Expand Up @@ -598,15 +627,23 @@ export function angular(options?: PluginOptions): Plugin[] {
});
}

function createTsConfigGetter(tsconfigOrGetter?: string | (() => string)) {
if (typeof tsconfigOrGetter === 'function') {
return tsconfigOrGetter;
}

return () => tsconfigOrGetter || '';
}

function getTsConfigPath(
root: string,
options: PluginOptions,
tsconfig: string,
isProd: boolean,
isTest: boolean,
isLib: boolean,
) {
if (options.tsconfig && isAbsolute(options.tsconfig)) {
return options.tsconfig;
if (tsconfig && isAbsolute(tsconfig)) {
return tsconfig;
}

let tsconfigFilePath = './tsconfig.app.json';
Expand All @@ -621,8 +658,8 @@ export function angular(options?: PluginOptions): Plugin[] {
tsconfigFilePath = './tsconfig.spec.json';
}

if (options.tsconfig) {
tsconfigFilePath = options.tsconfig;
if (tsconfig) {
tsconfigFilePath = tsconfig;
}

return resolve(root, tsconfigFilePath);
Expand All @@ -633,7 +670,7 @@ export function angular(options?: PluginOptions): Plugin[] {
const includeFiles = findIncludes();

let { options: tsCompilerOptions, rootNames } =
compilerCli.readConfiguration(pluginOptions.tsconfig, {
compilerCli.readConfiguration(resolvedTsConfigPath, {
suppressOutputPathCheck: true,
outDir: undefined,
sourceMap: false,
Expand Down