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

fix(compiler): always emit ngfactories with reexports (#18788)

Browse Source 
Previously, we only did this when setting the `generateCodeForLibraries: false`.

This is needed so that libraries compiled with `generateCodeForLibraries: true` can be used as dependencies of other compilation units.

PR Close #18788
This commit is contained in:
Tobias Bosch
2017-08-22 16:17:44 -07:00
committed by Miško Hevery
parent 2fbc92fd2e
commit 0262e37301
3 changed files with 31 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,10 +263,7 @@ class AngularCompilerProgram implements Program {
}
private generateStubs() {
return this.options.skipTemplateCodegen ? [] :
this.options.generateCodeForLibraries === false ?
this.compiler.emitPartialStubs(this.analyzedModules) :
this.compiler.emitAllStubs(this.analyzedModules);
return this.options.skipTemplateCodegen ? [] : this.compiler.emitAllStubs(this.analyzedModules);
}
private generateFiles() {

24
packages/compiler-cli/test/ngc_spec.ts
View File

@ -716,11 +716,13 @@ describe('ngc transformer command-line', () => {
}
};
beforeEach(() => {
const writeConfig = (dir: string) => {
write(path.join(dir, 'tsconfig.json'), `
const writeConfig =
(dir: string, generateCodeForLibraries = false, includes: string[] = [],
excludes: string[] = []) => {
write(path.join(dir, 'tsconfig.json'), `
{
"angularCompilerOptions": {
"generateCodeForLibraries": true,
"generateCodeForLibraries": ${generateCodeForLibraries},
"enableSummariesForJit": true
},
"compilerOptions": {
@ -735,11 +737,18 @@ describe('ngc transformer command-line', () => {
"paths": { "lib1/*": ["../lib1/*"], "lib2/*": ["../lib2/*"] },
"typeRoots": []
}
${includes.length?',"include":["' + includes.join('","')+'"]':''}
${excludes.length?',"exclude":["' + excludes.join('","')+'"]':''}
}`);
};
};
// Angular
writeConfig(
'ng', /* generateCodeForLibraries */ true, ['../node_modules/@angular/core/**/*'],
['../node_modules/@angular/core/test/**', '../node_modules/@angular/core/testing/**']);
// Lib 1
writeConfig('lib1');
writeConfig('lib1', /* generateCodeForLibraries */ false);
write('lib1/module.ts', `
import {NgModule} from '@angular/core';
@ -752,7 +761,7 @@ describe('ngc transformer command-line', () => {
`);
// Lib 2
writeConfig('lib2');
writeConfig('lib2', /* generateCodeForLibraries */ false);
write('lib2/module.ts', `
export {Module} from 'lib1/module';
`);
@ -773,6 +782,7 @@ describe('ngc transformer command-line', () => {
});
it('should be able to compile library 1', () => {
expect(mainSync(['-p', path.join(basePath, 'ng')], errorSpy)).toBe(0);
expect(mainSync(['-p', path.join(basePath, 'lib1')], errorSpy)).toBe(0);
shouldExist('lib1/module.js');
shouldExist('lib1/module.ngsummary.json');
@ -783,6 +793,7 @@ describe('ngc transformer command-line', () => {
});
it('should be able to compile library 2', () => {
expect(mainSync(['-p', path.join(basePath, 'ng')], errorSpy)).toBe(0);
expect(mainSync(['-p', path.join(basePath, 'lib1')], errorSpy)).toBe(0);
expect(mainSync(['-p', path.join(basePath, 'lib2')], errorSpy)).toBe(0);
shouldExist('lib2/module.js');
@ -795,6 +806,7 @@ describe('ngc transformer command-line', () => {
describe('building an application', () => {
beforeEach(() => {
expect(mainSync(['-p', path.join(basePath, 'ng')], errorSpy)).toBe(0);
expect(mainSync(['-p', path.join(basePath, 'lib1')], errorSpy)).toBe(0);
expect(mainSync(['-p', path.join(basePath, 'lib2')], errorSpy)).toBe(0);
});