iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(codegen): codegen all files in the program, not just roots 

fixes #8475
This commit is contained in:
Alex Eagle 2016-05-04 15:17:53 -06:00
parent f235454dd6
commit 0d71345b93
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/@angular/compiler_cli/integrationtest.sh
View File

@ -5,5 +5,7 @@ set -e -o pipefail
cd $(dirname $0) cd $(dirname $0)
cd $(pwd)/../../.. cd $(pwd)/../../..
export NODE_PATH=$NODE_PATH:$(pwd)/dist/all:$(pwd)/dist/tools export NODE_PATH=$NODE_PATH:$(pwd)/dist/all:$(pwd)/dist/tools
node dist/all/@angular/compiler_cli/src/main -p modules/@angular/compiler_cli/integrationtest readonly TESTDIR="modules/@angular/compiler_cli/integrationtest"
node dist/tools/cjs-jasmine -- @angular/compiler_cli/integrationtest/**/*_spec.js rm $TESTDIR/src/*.{ngfactory,css.shim}.ts
node dist/all/@angular/compiler_cli/src/main -p $TESTDIR
node dist/tools/cjs-jasmine -- $TESTDIR/**/*_spec.js

9
modules/@angular/compiler_cli/integrationtest/tsconfig.json
View File

@ -14,10 +14,15 @@
"outDir": "../../../../dist/all/@angular/compiler_cli/integrationtest", "outDir": "../../../../dist/all/@angular/compiler_cli/integrationtest",
"rootDir": "", "rootDir": "",
"declaration": true, "declaration": true,
"lib": ["es6", "dom"],
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {
"@angular/*": ["../../../../dist/all/@angular/*"] "@angular/*": ["../../../../dist/all/@angular/*"]
} }
} },
"files": [
"src/bootstrap.ts",
"typings.d.ts"
]
} }

2
modules/@angular/compiler_cli/integrationtest/typings.d.ts vendored
View File

@ -1,4 +1,2 @@
/// <reference path="../../typings/es6-collections/es6-collections.d.ts" />
/// <reference path="../../typings/es6-promise/es6-promise.d.ts" />
/// <reference path="../../typings/node/node.d.ts" /> /// <reference path="../../typings/node/node.d.ts" />
/// <reference path="../../typings/jasmine/jasmine.d.ts" /> /// <reference path="../../typings/jasmine/jasmine.d.ts" />

6
modules/@angular/compiler_cli/src/codegen.ts
View File

@ -155,8 +155,10 @@ export class CodeGenerator {
return Promise.all(stylesheetPromises); return Promise.all(stylesheetPromises);
}) })
.catch((e) => { console.error(e.stack); }); .catch((e) => { console.error(e.stack); });
return Promise.all( return Promise.all(this.program.getSourceFiles()
this.program.getRootFileNames().filter(f => !GENERATED_FILES.test(f)).map(generateOneFile)); .map(sf => sf.fileName)
.filter(f => !GENERATED_FILES.test(f))
.map(generateOneFile));
} }
static create(ngOptions: AngularCompilerOptions, program: ts.Program, options: ts.CompilerOptions, static create(ngOptions: AngularCompilerOptions, program: ts.Program, options: ts.CompilerOptions,