fix(compiler): do not autoinclude components declared as entry points (#10898)

This commit is contained in:
Victor Savkin 2016-08-19 15:59:50 -07:00 committed by Kara
parent cc0e3d2296
commit c56f3f2246
24 changed files with 42 additions and 45 deletions

View File

@ -388,11 +388,8 @@ export class CompileMetadataResolver {
});
moduleMeta.entryComponents.forEach((entryComponentType) => {
if (!moduleMeta.transitiveModule.directivesSet.has(entryComponentType.runtime)) {
this._addDirectiveToModule(
this.getDirectiveMetadata(entryComponentType.runtime), moduleMeta.type.runtime,
moduleMeta.transitiveModule, moduleMeta.declaredDirectives);
this._console.warn(
`NgModule ${stringify(moduleMeta.type.runtime)} uses ${stringify(entryComponentType.runtime)} via "entryComponents" but it was neither declared nor imported! This warning will become an error after final.`);
throw new BaseException(
`NgModule ${stringify(moduleMeta.type.runtime)} uses ${stringify(entryComponentType.runtime)} via "entryComponents" but it was neither declared nor imported! If ${stringify(entryComponentType.runtime)} is declared in an imported module, make sure it is exported.`);
}
});
// Collect @Component.directives/pipes/entryComponents into our declared

View File

@ -263,27 +263,19 @@ function declareTests({useJit}: {useJit: boolean}) {
.toBe(SomeComp);
});
it('should warn and auto declare when using an entryComponent that was neither declared nor imported',
() => {
@Component({template: '', entryComponents: [SomeComp]})
class SomeCompWithEntryComponents {
}
it('should throw when using an entryComponent that was neither declared nor imported', () => {
@Component({template: '', entryComponents: [SomeComp]})
class SomeCompWithEntryComponents {
}
@NgModule({entryComponents: [SomeCompWithEntryComponents]})
class SomeModule {
}
@NgModule({entryComponents: [SomeCompWithEntryComponents]})
class SomeModule {
}
const ngModule = createModule(SomeModule);
expect(ngModule.componentFactoryResolver
.resolveComponentFactory(SomeCompWithEntryComponents)
.componentType)
.toBe(SomeCompWithEntryComponents);
expect(console.warnings).toEqual([
`NgModule ${stringify(SomeModule)} uses ${stringify(SomeCompWithEntryComponents)} via "entryComponents" but it was neither declared nor imported! This warning will become an error after final.`,
`Component ${stringify(SomeCompWithEntryComponents)} in NgModule ${stringify(SomeModule)} uses ${stringify(SomeComp)} via "entryComponents" but it was neither declared nor imported into the module! This warning will become an error after final.`
]);
});
expect(() => createModule(SomeModule))
.toThrowError(
`NgModule ${stringify(SomeModule)} uses ${stringify(SomeCompWithEntryComponents)} via "entryComponents" but it was neither declared nor imported! If ${stringify(SomeCompWithEntryComponents)} is declared in an imported module, make sure it is exported.`);
});
it('should create ComponentFactories via ANALYZE_FOR_ENTRY_COMPONENTS', () => {
@NgModule({

View File

@ -24,7 +24,7 @@ function writeBody(html: string): any {
class MyServerApp {
}
@NgModule({imports: [ServerModule], bootstrap: [MyServerApp]})
@NgModule({imports: [ServerModule], declarations: [MyServerApp], bootstrap: [MyServerApp]})
class ExampleModule {
}

View File

@ -11,7 +11,7 @@ import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
import {AnimateApp} from './app/animate-app';
@NgModule({bootstrap: [AnimateApp], imports: [BrowserModule]})
@NgModule({declarations: [AnimateApp], bootstrap: [AnimateApp], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -98,7 +98,8 @@ class AsyncApplication {
};
}
@NgModule({bootstrap: [AsyncApplication], imports: [BrowserModule]})
@NgModule(
{declarations: [AsyncApplication], bootstrap: [AsyncApplication], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -25,7 +25,7 @@ class GesturesCmp {
onRotate(event: any /** TODO #9100 */): void { this.rotateAngle = event.rotation; }
}
@NgModule({bootstrap: [GesturesCmp], imports: [BrowserModule]})
@NgModule({declarations: [GesturesCmp], bootstrap: [GesturesCmp], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -57,6 +57,6 @@ export class HelloCmp {
changeGreeting(): void { this.greeting = 'howdy'; }
}
@NgModule({bootstrap: [HelloCmp], declarations: [RedDec], imports: [BrowserModule]})
@NgModule({bootstrap: [HelloCmp], declarations: [HelloCmp, RedDec], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -13,7 +13,7 @@ import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
import {HttpCmp} from './app/http_comp';
@NgModule({bootstrap: [HttpCmp], imports: [BrowserModule, HttpModule]})
@NgModule({declarations: [HttpCmp], bootstrap: [HttpCmp], imports: [BrowserModule, HttpModule]})
class ExampleModule {
}

View File

@ -41,7 +41,7 @@ class KeyEventsApp {
resetShiftEnter(): void { this.shiftEnter = false; }
}
@NgModule({bootstrap: [KeyEventsApp], imports: [BrowserModule]})
@NgModule({declarations: [KeyEventsApp], bootstrap: [KeyEventsApp], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -158,7 +158,7 @@ class ReactiveForms {
@NgModule({
bootstrap: [ReactiveForms],
declarations: [ShowError],
declarations: [ReactiveForms, ShowError],
imports: [BrowserModule, ReactiveFormsModule]
})
class ExampleModule {

View File

@ -197,7 +197,8 @@ class OrderManagementApplication {
@NgModule({
bootstrap: [OrderManagementApplication],
declarations: [OrderListComponent, OrderDetailsComponent, OrderItemComponent],
declarations:
[OrderManagementApplication, OrderListComponent, OrderDetailsComponent, OrderItemComponent],
imports: [BrowserModule, FormsModule]
})
class ExampleModule {

View File

@ -198,7 +198,8 @@ class PersonManagementApplication {
@NgModule({
bootstrap: [PersonManagementApplication],
declarations: [FullNameComponent, PersonsComponent, PersonsDetailComponent],
declarations:
[PersonManagementApplication, FullNameComponent, PersonsComponent, PersonsDetailComponent],
imports: [BrowserModule, FormsModule]
})
class ExampleModule {

View File

@ -24,6 +24,6 @@ export function main() {
export class RelativeApp {
}
@NgModule({bootstrap: [RelativeApp], imports: [BrowserModule]})
@NgModule({declarations: [RelativeApp], bootstrap: [RelativeApp], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -20,7 +20,7 @@ export class ErrorComponent {
createError(): void { throw new BaseException('Sourcemap test'); }
}
@NgModule({bootstrap: [ErrorComponent], imports: [BrowserModule]})
@NgModule({declarations: [ErrorComponent], bootstrap: [ErrorComponent], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -23,7 +23,7 @@ class SvgGroup {
class SvgApp {
}
@NgModule({bootstrap: [SvgApp], declarations: [SvgGroup], imports: [BrowserModule]})
@NgModule({bootstrap: [SvgApp], declarations: [SvgApp, SvgGroup], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -169,7 +169,11 @@ class TemplateDrivenForms {
print(this.model);
}
}
@NgModule({bootstrap: [TemplateDrivenForms], imports: [BrowserModule]})
@NgModule({
declarations: [TemplateDrivenForms],
bootstrap: [TemplateDrivenForms],
imports: [BrowserModule]
})
class ExampleModule {
}

View File

@ -51,7 +51,7 @@ class TodoApp {
clearCompleted(): void { this.todoStore.removeBy((todo: Todo) => todo.completed); }
}
@NgModule({bootstrap: [TodoApp], imports: [BrowserModule]})
@NgModule({declarations: [TodoApp], bootstrap: [TodoApp], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';
import {ImageDemo} from './index_common';
@NgModule({imports: [WorkerAppModule], bootstrap: [ImageDemo]})
@NgModule({imports: [WorkerAppModule], bootstrap: [ImageDemo], declarations: [ImageDemo]})
class ExampleModule {
}

View File

@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';
import {InputCmp} from './index_common';
@NgModule({imports: [WorkerAppModule], bootstrap: [InputCmp]})
@NgModule({imports: [WorkerAppModule], bootstrap: [InputCmp], declarations: [InputCmp]})
class ExampleModule {
}

View File

@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';
import {HelloCmp} from './index_common';
@NgModule({imports: [WorkerAppModule], bootstrap: [HelloCmp]})
@NgModule({imports: [WorkerAppModule], bootstrap: [HelloCmp], declarations: [HelloCmp]})
class ExampleModule {
}

View File

@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';
import {App} from './index_common';
@NgModule({imports: [WorkerAppModule], bootstrap: [App]})
@NgModule({imports: [WorkerAppModule], bootstrap: [App], declarations: [App]})
class ExampleModule {
}

View File

@ -12,7 +12,7 @@ import {platformWorkerAppDynamic} from '@angular/platform-browser-dynamic';
import {TodoApp} from './index_common';
@NgModule({imports: [WorkerAppModule], bootstrap: [TodoApp]})
@NgModule({imports: [WorkerAppModule], bootstrap: [TodoApp], declarations: [TodoApp]})
class ExampleModule {
}

View File

@ -30,7 +30,7 @@ class ZippyApp {
pushLog(log: string) { this.logs.push(log); }
}
@NgModule({bootstrap: [ZippyApp], imports: [BrowserModule]})
@NgModule({declarations: [ZippyApp], bootstrap: [ZippyApp], imports: [BrowserModule]})
class ExampleModule {
}

View File

@ -15,6 +15,7 @@ class HelloWorldComponent {
}
@NgModule({
declarations: [HelloWorldComponent],
bootstrap: [HelloWorldComponent],
imports: [BrowserModule]
})