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

fix(bazel): produce named AMD modules for codegen (#20547)

Browse Source 
fixes #19422

Signed-off-by: Alex Eagle <alexeagle@google.com>

PR Close #20547
This commit is contained in:
Alex Eagle
2017-11-14 11:29:16 -08:00
committed by Miško Hevery
parent a53a040071
commit 6e83204238
6 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/compiler-cli/src/transformers/api.ts
View File

@ -192,6 +192,13 @@ export interface CompilerHost extends ts.CompilerHost {
* cause a diagnostics diagnostic error or an exception to be thrown.
*/
readResource?(fileName: string): Promise<string>|string;
/**
* Produce an AMD module name for the source file. Used in Bazel.
*
* An AMD module can have an arbitrary name, so that it is require'd by name
* rather than by path. See http://requirejs.org/docs/whyamd.html#namedmodules
*/
amdModuleName?(sf: ts.SourceFile): string|undefined;
}
export enum EmitFlags {

5
packages/compiler-cli/src/transformers/compiler_host.ts
View File

@ -303,6 +303,11 @@ export class TsCompilerAotCompilerTypeCheckHostAdapter implements ts.CompilerHos
/* emitSourceMaps */ false);
const sf = ts.createSourceFile(
genFile.genFileUrl, sourceText, this.options.target || ts.ScriptTarget.Latest);
if ((this.options.module === ts.ModuleKind.AMD || this.options.module === ts.ModuleKind.UMD) &&
this.context.amdModuleName) {
const moduleName = this.context.amdModuleName(sf);
if (moduleName) sf.moduleName = moduleName;
}
this.generatedSourceFiles.set(genFile.genFileUrl, {
sourceFile: sf,
emitCtx: context, externalReferences,