Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-17 11:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/build): allow explicitly disabling TypeScript incremental mode

Browse Source 
If the TypeScript `incremental` option is explicitly set to `false`, the
`application` builder will no longer attempt to enable and use incremental
compilation mode via stored TypeScript build file information. This prevents
an potential build time error that would otherwise occur due to the `tsBuildInfoFile`
option being set without the `incremental` option.
Behavior remains the same if the option is not present or set to `true`.
This commit is contained in:
Charles Lyding 2024-08-05 12:16:46 -04:00 committed by Charles
parent da2a6bdb48
commit 182ecbd188
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/angular/build/src/builders/application/tests/behavior/typescript-incremental_spec.ts Normal file
View File

@ -0,0 +1,32 @@
/**
* @license
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import { buildApplication } from '../../index';
import { APPLICATION_BUILDER_INFO, BASE_OPTIONS, describeBuilder } from '../setup';
describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
describe('Behavior: "TypeScript explicit incremental option usage"', () => {
it('should successfully build with incremental disabled', async () => {
// Disable tsconfig incremental option in tsconfig
await harness.modifyFile('tsconfig.json', (content) => {
const tsconfig = JSON.parse(content);
tsconfig.compilerOptions.incremental = false;
return JSON.stringify(tsconfig);
});
harness.useTarget('build', {
...BASE_OPTIONS,
});
const { result } = await harness.executeOnce();
expect(result?.success).toBe(true);
});
});
});

13
packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts
View File

@ -284,7 +284,7 @@ export function createCompilerPlugin(
location: null,
notes: [
{
text: error instanceof Error ? error.stack ?? error.message : `${error}`,
text: error instanceof Error ? (error.stack ?? error.message) : `${error}`,
location: null,
},
],
@ -315,7 +315,7 @@ export function createCompilerPlugin(
location: null,
notes: [
{
text: error instanceof Error ? error.stack ?? error.message : `${error}`,
text: error instanceof Error ? (error.stack ?? error.message) : `${error}`,
location: null,
},
],
@ -537,9 +537,12 @@ function createCompilerOptionsTransformer(
compilerOptions.compilationMode = 'full';
}
// Enable incremental compilation by default if caching is enabled
if (pluginOptions.sourceFileCache?.persistentCachePath) {
compilerOptions.incremental ??= true;
// Enable incremental compilation by default if caching is enabled and incremental is not explicitly disabled
if (
compilerOptions.incremental !== false &&
pluginOptions.sourceFileCache?.persistentCachePath
) {
compilerOptions.incremental = true;
// Set the build info file location to the configured cache directory
compilerOptions.tsBuildInfoFile = path.join(
pluginOptions.sourceFileCache?.persistentCachePath,