cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(compiler): return enableIvy true when using readConfiguration (#32234)

Browse Source 
PR Close #32234
This commit is contained in:
Alan 2019-08-21 08:46:40 +02:00 committed by Andrew Kushnir
parent 62f4140634
commit 424ab48672
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/compiler-cli/src/perform_compile.ts
View File

@ -120,10 +120,11 @@ export function calcProjectFileAndBasePath(project: string):
export function createNgCompilerOptions( export function createNgCompilerOptions(
basePath: string, config: any, tsOptions: ts.CompilerOptions): api.CompilerOptions { basePath: string, config: any, tsOptions: ts.CompilerOptions): api.CompilerOptions {
// enableIvy `ngtsc` is an alias for `true`. // enableIvy `ngtsc` is an alias for `true`.
if (config.angularCompilerOptions && config.angularCompilerOptions.enableIvy === 'ngtsc') { const {angularCompilerOptions = {}} = config;
config.angularCompilerOptions.enableIvy = true; const {enableIvy} = angularCompilerOptions;
} angularCompilerOptions.enableIvy = enableIvy !== false && enableIvy !== 'tsc';
return {...tsOptions, ...config.angularCompilerOptions, genDir: basePath, basePath};
return {...tsOptions, ...angularCompilerOptions, genDir: basePath, basePath};
} }
export function readConfiguration( export function readConfiguration(

22
packages/compiler-cli/test/perform_compile_spec.ts
View File

@ -55,4 +55,26 @@ describe('perform_compile', () => {
expect(options.skipMetadataEmit).toBe(true); expect(options.skipMetadataEmit).toBe(true);
}); });
it(`should return 'enableIvy: true' when enableIvy is not defined in "angularCompilerOptions"`,
() => {
writeSomeConfigs();
const {options} = readConfiguration(path.resolve(basePath, 'tsconfig-level-1.json'));
expect(options.enableIvy).toBe(true);
});
it(`should return 'enableIvy: false' when enableIvy is disabled in "angularCompilerOptions"`,
() => {
writeSomeConfigs();
support.writeFiles({
'tsconfig-level-3.json': `{
"angularCompilerOptions": {
"enableIvy": false
}
}
`,
});
const {options} = readConfiguration(path.resolve(basePath, 'tsconfig-level-1.json'));
expect(options.enableIvy).toBe(false);
});
}); });