From 5e5ae3cde61e15cf613a9e0cf5b001ecaa5d10f4 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Thu, 1 Sep 2016 16:54:37 -0700 Subject: [PATCH] fix(ngc): propagate errors to main (#11214) --- modules/@angular/compiler-cli/src/codegen.ts | 30 ++++++++----------- .../@angular/compiler-cli/src/extract_i18n.ts | 3 +- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/modules/@angular/compiler-cli/src/codegen.ts b/modules/@angular/compiler-cli/src/codegen.ts index c48e51cf1c..cef1896337 100644 --- a/modules/@angular/compiler-cli/src/codegen.ts +++ b/modules/@angular/compiler-cli/src/codegen.ts @@ -108,23 +108,19 @@ export class CodeGenerator { return ngModules; }, []); const analyzedNgModules = this.compiler.analyzeModules(ngModules); - return Promise - .all(fileMetas.map( - (fileMeta) => this.compiler - .compile( - fileMeta.fileUrl, analyzedNgModules, fileMeta.components, - fileMeta.ngModules) - .then((generatedModules) => { - generatedModules.forEach((generatedModule) => { - const sourceFile = this.program.getSourceFile(fileMeta.fileUrl); - const emitPath = - this.calculateEmitPath(generatedModule.moduleUrl); - this.host.writeFile( - emitPath, PREAMBLE + generatedModule.source, false, () => {}, - [sourceFile]); - }); - }))) - .catch((e) => { console.error(e.stack); }); + return Promise.all(fileMetas.map( + (fileMeta) => + this.compiler + .compile( + fileMeta.fileUrl, analyzedNgModules, fileMeta.components, fileMeta.ngModules) + .then((generatedModules) => { + generatedModules.forEach((generatedModule) => { + const sourceFile = this.program.getSourceFile(fileMeta.fileUrl); + const emitPath = this.calculateEmitPath(generatedModule.moduleUrl); + this.host.writeFile( + emitPath, PREAMBLE + generatedModule.source, false, () => {}, [sourceFile]); + }); + }))); } static create( diff --git a/modules/@angular/compiler-cli/src/extract_i18n.ts b/modules/@angular/compiler-cli/src/extract_i18n.ts index 9693912826..d4c511d830 100644 --- a/modules/@angular/compiler-cli/src/extract_i18n.ts +++ b/modules/@angular/compiler-cli/src/extract_i18n.ts @@ -133,8 +133,7 @@ export class Extractor { }); })); })) - .then(_ => this.messageBundle) - .catch((e) => { console.error(e.stack); }); + .then(_ => this.messageBundle); if (errors.length) { throw new Error(errors.map(e => e.toString()).join('\n'));