Skip to content

Commit 0d71345

Browse files
committed
fix(codegen): codegen all files in the program, not just roots
fixes #8475
1 parent f235454 commit 0d71345

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

modules/@angular/compiler_cli/integrationtest.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ set -e -o pipefail
55
cd $(dirname $0)
66
cd $(pwd)/../../..
77
export NODE_PATH=$NODE_PATH:$(pwd)/dist/all:$(pwd)/dist/tools
8-
node dist/all/@angular/compiler_cli/src/main -p modules/@angular/compiler_cli/integrationtest
9-
node dist/tools/cjs-jasmine -- @angular/compiler_cli/integrationtest/**/*_spec.js
8+
readonly TESTDIR="modules/@angular/compiler_cli/integrationtest"
9+
rm $TESTDIR/src/*.{ngfactory,css.shim}.ts
10+
node dist/all/@angular/compiler_cli/src/main -p $TESTDIR
11+
node dist/tools/cjs-jasmine -- $TESTDIR/**/*_spec.js

modules/@angular/compiler_cli/integrationtest/tsconfig.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@
1414
"outDir": "../../../../dist/all/@angular/compiler_cli/integrationtest",
1515
"rootDir": "",
1616
"declaration": true,
17-
17+
"lib": ["es6", "dom"],
1818
"baseUrl": ".",
1919
"paths": {
2020
"@angular/*": ["../../../../dist/all/@angular/*"]
2121
}
22-
}
22+
},
23+
24+
"files": [
25+
"src/bootstrap.ts",
26+
"typings.d.ts"
27+
]
2328
}
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
/// <reference path="../../typings/es6-collections/es6-collections.d.ts" />
2-
/// <reference path="../../typings/es6-promise/es6-promise.d.ts" />
31
/// <reference path="../../typings/node/node.d.ts" />
42
/// <reference path="../../typings/jasmine/jasmine.d.ts" />

modules/@angular/compiler_cli/src/codegen.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,10 @@ export class CodeGenerator {
155155
return Promise.all(stylesheetPromises);
156156
})
157157
.catch((e) => { console.error(e.stack); });
158-
return Promise.all(
159-
this.program.getRootFileNames().filter(f => !GENERATED_FILES.test(f)).map(generateOneFile));
158+
return Promise.all(this.program.getSourceFiles()
159+
.map(sf => sf.fileName)
160+
.filter(f => !GENERATED_FILES.test(f))
161+
.map(generateOneFile));
160162
}
161163

162164
static create(ngOptions: AngularCompilerOptions, program: ts.Program, options: ts.CompilerOptions,

0 commit comments

Comments
 (0)